Commit e731b6387a78e37fc531c2e36369f8c04ec31bd7
xml
Showing
8 changed files
with
899 additions
and
704 deletions
.idea/workspace.xml
| @@ -2,88 +2,70 @@ | @@ -2,88 +2,70 @@ | ||
| 2 | <project version="4"> | 2 | <project version="4"> |
| 3 | <component name="ChangeListManager"> | 3 | <component name="ChangeListManager"> |
| 4 | <list default="true" id="908d8a6f-e3e4-4fdc-b674-e523a3e2b520" name="Default Changelist" comment=""> | 4 | <list default="true" id="908d8a6f-e3e4-4fdc-b674-e523a3e2b520" name="Default Changelist" comment=""> |
| 5 | - <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" /> | 5 | + <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/materialType/controller/MaterialTypeController.java" afterDir="false" /> |
| 6 | + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/materialType/add.html" afterDir="false" /> | ||
| 7 | + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/materialType/edit.html" afterDir="false" /> | ||
| 8 | + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/materialType/materialType.html" afterDir="false" /> | ||
| 6 | <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> | 9 | <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> |
| 7 | - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/adjustDetail/controller/adjustDetailController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/adjustDetail/controller/adjustDetailController.java" afterDir="false" /> | ||
| 8 | - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/adjustDetail/domain/AdjustDetail.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/adjustDetail/domain/AdjustDetail.java" afterDir="false" /> | ||
| 9 | - <change beforePath="$PROJECT_DIR$/src/main/resources/mybatis/inventory/AdjustDetailMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mybatis/inventory/AdjustDetailMapper.xml" afterDir="false" /> | ||
| 10 | - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/adjustDetail/adjustDetail.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/adjustDetail/adjustDetail.html" afterDir="false" /> | ||
| 11 | - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/adjustHeader/adjustHeader.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/adjustHeader/adjustHeader.html" afterDir="false" /> | ||
| 12 | - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountDetail/cycleCountDetail.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountDetail/cycleCountDetail.html" afterDir="false" /> | ||
| 13 | - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html" afterDir="false" /> | 10 | + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/statusFlow/domain/StatusFlowDetail.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/statusFlow/domain/StatusFlowDetail.java" afterDir="false" /> |
| 11 | + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/domain/ReceiptDetail.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/domain/ReceiptDetail.java" afterDir="false" /> | ||
| 12 | + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java" afterDir="false" /> | ||
| 14 | </list> | 13 | </list> |
| 15 | - <ignored path="$PROJECT_DIR$/target/" /> | ||
| 16 | - <ignored path="$PROJECT_DIR$/out/" /> | ||
| 17 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> | 14 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> |
| 18 | <option name="SHOW_DIALOG" value="false" /> | 15 | <option name="SHOW_DIALOG" value="false" /> |
| 19 | <option name="HIGHLIGHT_CONFLICTS" value="true" /> | 16 | <option name="HIGHLIGHT_CONFLICTS" value="true" /> |
| 20 | <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> | 17 | <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> |
| 21 | <option name="LAST_RESOLUTION" value="IGNORE" /> | 18 | <option name="LAST_RESOLUTION" value="IGNORE" /> |
| 22 | </component> | 19 | </component> |
| 23 | - <component name="FileEditorManager"> | ||
| 24 | - <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> | ||
| 25 | - <file pinned="false" current-in-tab="true"> | ||
| 26 | - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/adjustHeader/adjustHeader.html"> | ||
| 27 | - <provider selected="true" editor-type-id="text-editor"> | ||
| 28 | - <state relative-caret-position="192"> | ||
| 29 | - <caret line="38" column="32" lean-forward="true" selection-start-line="38" selection-start-column="32" selection-end-line="38" selection-end-column="32" /> | ||
| 30 | - <folding> | ||
| 31 | - <element signature="n#style#0;n#a#0;n#!!top" expanded="true" /> | ||
| 32 | - </folding> | ||
| 33 | - </state> | ||
| 34 | - </provider> | ||
| 35 | - </entry> | ||
| 36 | - </file> | ||
| 37 | - <file pinned="false" current-in-tab="false"> | ||
| 38 | - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/adjustDetail/adjustDetail.html"> | ||
| 39 | - <provider selected="true" editor-type-id="text-editor"> | ||
| 40 | - <state relative-caret-position="740"> | ||
| 41 | - <caret line="37" column="33" selection-start-line="37" selection-start-column="33" selection-end-line="37" selection-end-column="33" /> | ||
| 42 | - <folding> | ||
| 43 | - <element signature="e#6574#12020#0" /> | ||
| 44 | - <element signature="e#11542#11950#0" /> | ||
| 45 | - <element signature="e#11954#12938#0" /> | ||
| 46 | - </folding> | ||
| 47 | - </state> | ||
| 48 | - </provider> | ||
| 49 | - </entry> | ||
| 50 | - </file> | ||
| 51 | - </leaf> | 20 | + <component name="DatabaseView"> |
| 21 | + <option name="SHOW_INTERMEDIATE" value="false" /> | ||
| 22 | + <option name="GROUP_DATA_SOURCES" value="true" /> | ||
| 23 | + <option name="GROUP_SCHEMA" value="true" /> | ||
| 24 | + <option name="GROUP_CONTENTS" value="false" /> | ||
| 25 | + <option name="SORT_POSITIONED" value="false" /> | ||
| 26 | + <option name="SHOW_EMPTY_GROUPS" value="false" /> | ||
| 27 | + <option name="AUTO_SCROLL_FROM_SOURCE" value="true" /> | ||
| 28 | + <option name="HIDDEN_KINDS"> | ||
| 29 | + <set /> | ||
| 30 | + </option> | ||
| 31 | + <expand> | ||
| 32 | + <path> | ||
| 33 | + <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" /> | ||
| 34 | + <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" /> | ||
| 35 | + </path> | ||
| 36 | + <path> | ||
| 37 | + <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" /> | ||
| 38 | + <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" /> | ||
| 39 | + <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" /> | ||
| 40 | + </path> | ||
| 41 | + <path> | ||
| 42 | + <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" /> | ||
| 43 | + <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" /> | ||
| 44 | + <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" /> | ||
| 45 | + <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" /> | ||
| 46 | + </path> | ||
| 47 | + <path> | ||
| 48 | + <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" /> | ||
| 49 | + <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" /> | ||
| 50 | + <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" /> | ||
| 51 | + <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" /> | ||
| 52 | + <item name="status_flow_detail: table" type="285a2a93:MysqlImplModel$Table" /> | ||
| 53 | + </path> | ||
| 54 | + </expand> | ||
| 55 | + <select /> | ||
| 52 | </component> | 56 | </component> |
| 53 | <component name="FileTemplateManagerImpl"> | 57 | <component name="FileTemplateManagerImpl"> |
| 54 | <option name="RECENT_TEMPLATES"> | 58 | <option name="RECENT_TEMPLATES"> |
| 55 | <list> | 59 | <list> |
| 56 | <option value="Class" /> | 60 | <option value="Class" /> |
| 61 | + <option value="CSS File" /> | ||
| 62 | + <option value="HTML File" /> | ||
| 57 | </list> | 63 | </list> |
| 58 | </option> | 64 | </option> |
| 59 | </component> | 65 | </component> |
| 60 | <component name="Git.Settings"> | 66 | <component name="Git.Settings"> |
| 61 | <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> | 67 | <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> |
| 62 | </component> | 68 | </component> |
| 63 | - <component name="IdeDocumentHistory"> | ||
| 64 | - <option name="CHANGED_PATHS"> | ||
| 65 | - <list> | ||
| 66 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/domain/CycleCountDetail.java" /> | ||
| 67 | - <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html" /> | ||
| 68 | - <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryTransaction/inventoryTransaction.html" /> | ||
| 69 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/domain/InventoryTransaction.java" /> | ||
| 70 | - <option value="$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryTransactionMapper.xml" /> | ||
| 71 | - <option value="$PROJECT_DIR$/src/main/resources/mybatis/inventory/CycleCountDetailMapper.xml" /> | ||
| 72 | - <option value="$PROJECT_DIR$/src/main/resources/mybatis/inventory/AdjustHeaderMapper.xml" /> | ||
| 73 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/adjustHeader/domain/AdjustHeader.java" /> | ||
| 74 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/adjustHeader/controller/adjustHeaderController.java" /> | ||
| 75 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java" /> | ||
| 76 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/controller/CycleCountHeaderController.java" /> | ||
| 77 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/adjustDetail/domain/AdjustDetail.java" /> | ||
| 78 | - <option value="$PROJECT_DIR$/src/main/resources/mybatis/inventory/AdjustDetailMapper.xml" /> | ||
| 79 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/adjustDetail/controller/adjustDetailController.java" /> | ||
| 80 | - <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html" /> | ||
| 81 | - <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountDetail/cycleCountDetail.html" /> | ||
| 82 | - <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/adjustHeader/adjustHeader.html" /> | ||
| 83 | - <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/adjustDetail/adjustDetail.html" /> | ||
| 84 | - </list> | ||
| 85 | - </option> | ||
| 86 | - </component> | ||
| 87 | <component name="MavenImportPreferences"> | 69 | <component name="MavenImportPreferences"> |
| 88 | <option name="importingSettings"> | 70 | <option name="importingSettings"> |
| 89 | <MavenImportingSettings> | 71 | <MavenImportingSettings> |
| @@ -91,223 +73,36 @@ | @@ -91,223 +73,36 @@ | ||
| 91 | </MavenImportingSettings> | 73 | </MavenImportingSettings> |
| 92 | </option> | 74 | </option> |
| 93 | </component> | 75 | </component> |
| 94 | - <component name="MavenProjectNavigator"> | ||
| 95 | - <treeState> | ||
| 96 | - <expand> | ||
| 97 | - <path> | ||
| 98 | - <item name="" type="16c1761:MavenProjectsStructure$RootNode" /> | ||
| 99 | - <item name="huaheng" type="9519ce18:MavenProjectsStructure$ProjectNode" /> | ||
| 100 | - </path> | ||
| 101 | - </expand> | ||
| 102 | - <select /> | ||
| 103 | - </treeState> | ||
| 104 | - </component> | ||
| 105 | - <component name="ProjectFrameBounds" extendedState="6"> | ||
| 106 | - <option name="x" value="-9" /> | ||
| 107 | - <option name="y" value="-9" /> | ||
| 108 | - <option name="width" value="1938" /> | ||
| 109 | - <option name="height" value="1048" /> | ||
| 110 | - </component> | 76 | + <component name="ProjectId" id="1Q2nhRM7LRz3yFWhpclOKgTjxn0" /> |
| 111 | <component name="ProjectLevelVcsManager"> | 77 | <component name="ProjectLevelVcsManager"> |
| 112 | <ConfirmationsSetting value="2" id="Add" /> | 78 | <ConfirmationsSetting value="2" id="Add" /> |
| 113 | </component> | 79 | </component> |
| 114 | - <component name="ProjectView"> | ||
| 115 | - <navigator proportions="" version="1"> | ||
| 116 | - <foldersAlwaysOnTop value="true" /> | ||
| 117 | - </navigator> | ||
| 118 | - <panes> | ||
| 119 | - <pane id="ProjectPane"> | ||
| 120 | - <subPane> | ||
| 121 | - <expand> | ||
| 122 | - <path> | ||
| 123 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | ||
| 124 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | ||
| 125 | - </path> | ||
| 126 | - <path> | ||
| 127 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | ||
| 128 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | ||
| 129 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | ||
| 130 | - </path> | ||
| 131 | - <path> | ||
| 132 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | ||
| 133 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | ||
| 134 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | ||
| 135 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | ||
| 136 | - </path> | ||
| 137 | - <path> | ||
| 138 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | ||
| 139 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | ||
| 140 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | ||
| 141 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | ||
| 142 | - <item name="java" type="462c0819:PsiDirectoryNode" /> | ||
| 143 | - </path> | ||
| 144 | - <path> | ||
| 145 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | ||
| 146 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | ||
| 147 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | ||
| 148 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | ||
| 149 | - <item name="java" type="462c0819:PsiDirectoryNode" /> | ||
| 150 | - <item name="com" type="462c0819:PsiDirectoryNode" /> | ||
| 151 | - </path> | ||
| 152 | - <path> | ||
| 153 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | ||
| 154 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | ||
| 155 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | ||
| 156 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | ||
| 157 | - <item name="java" type="462c0819:PsiDirectoryNode" /> | ||
| 158 | - <item name="com" type="462c0819:PsiDirectoryNode" /> | ||
| 159 | - <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | ||
| 160 | - </path> | ||
| 161 | - <path> | ||
| 162 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | ||
| 163 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | ||
| 164 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | ||
| 165 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | ||
| 166 | - <item name="java" type="462c0819:PsiDirectoryNode" /> | ||
| 167 | - <item name="com" type="462c0819:PsiDirectoryNode" /> | ||
| 168 | - <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | ||
| 169 | - <item name="pc" type="462c0819:PsiDirectoryNode" /> | ||
| 170 | - </path> | ||
| 171 | - <path> | ||
| 172 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | ||
| 173 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | ||
| 174 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | ||
| 175 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | ||
| 176 | - <item name="java" type="462c0819:PsiDirectoryNode" /> | ||
| 177 | - <item name="com" type="462c0819:PsiDirectoryNode" /> | ||
| 178 | - <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | ||
| 179 | - <item name="pc" type="462c0819:PsiDirectoryNode" /> | ||
| 180 | - <item name="inventory" type="462c0819:PsiDirectoryNode" /> | ||
| 181 | - </path> | ||
| 182 | - <path> | ||
| 183 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | ||
| 184 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | ||
| 185 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | ||
| 186 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | ||
| 187 | - <item name="java" type="462c0819:PsiDirectoryNode" /> | ||
| 188 | - <item name="com" type="462c0819:PsiDirectoryNode" /> | ||
| 189 | - <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | ||
| 190 | - <item name="pc" type="462c0819:PsiDirectoryNode" /> | ||
| 191 | - <item name="inventory" type="462c0819:PsiDirectoryNode" /> | ||
| 192 | - <item name="adjustDetail" type="462c0819:PsiDirectoryNode" /> | ||
| 193 | - </path> | ||
| 194 | - <path> | ||
| 195 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | ||
| 196 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | ||
| 197 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | ||
| 198 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | ||
| 199 | - <item name="java" type="462c0819:PsiDirectoryNode" /> | ||
| 200 | - <item name="com" type="462c0819:PsiDirectoryNode" /> | ||
| 201 | - <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | ||
| 202 | - <item name="pc" type="462c0819:PsiDirectoryNode" /> | ||
| 203 | - <item name="inventory" type="462c0819:PsiDirectoryNode" /> | ||
| 204 | - <item name="adjustDetail" type="462c0819:PsiDirectoryNode" /> | ||
| 205 | - <item name="domain" type="462c0819:PsiDirectoryNode" /> | ||
| 206 | - </path> | ||
| 207 | - <path> | ||
| 208 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | ||
| 209 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | ||
| 210 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | ||
| 211 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | ||
| 212 | - <item name="java" type="462c0819:PsiDirectoryNode" /> | ||
| 213 | - <item name="com" type="462c0819:PsiDirectoryNode" /> | ||
| 214 | - <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | ||
| 215 | - <item name="pc" type="462c0819:PsiDirectoryNode" /> | ||
| 216 | - <item name="inventory" type="462c0819:PsiDirectoryNode" /> | ||
| 217 | - <item name="adjustDetail" type="462c0819:PsiDirectoryNode" /> | ||
| 218 | - <item name="mapper" type="462c0819:PsiDirectoryNode" /> | ||
| 219 | - </path> | ||
| 220 | - <path> | ||
| 221 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | ||
| 222 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | ||
| 223 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | ||
| 224 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | ||
| 225 | - <item name="resources" type="462c0819:PsiDirectoryNode" /> | ||
| 226 | - </path> | ||
| 227 | - <path> | ||
| 228 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | ||
| 229 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | ||
| 230 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | ||
| 231 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | ||
| 232 | - <item name="resources" type="462c0819:PsiDirectoryNode" /> | ||
| 233 | - <item name="templates" type="462c0819:PsiDirectoryNode" /> | ||
| 234 | - </path> | ||
| 235 | - <path> | ||
| 236 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | ||
| 237 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | ||
| 238 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | ||
| 239 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | ||
| 240 | - <item name="resources" type="462c0819:PsiDirectoryNode" /> | ||
| 241 | - <item name="templates" type="462c0819:PsiDirectoryNode" /> | ||
| 242 | - <item name="inventory" type="462c0819:PsiDirectoryNode" /> | ||
| 243 | - </path> | ||
| 244 | - <path> | ||
| 245 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | ||
| 246 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | ||
| 247 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | ||
| 248 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | ||
| 249 | - <item name="resources" type="462c0819:PsiDirectoryNode" /> | ||
| 250 | - <item name="templates" type="462c0819:PsiDirectoryNode" /> | ||
| 251 | - <item name="inventory" type="462c0819:PsiDirectoryNode" /> | ||
| 252 | - <item name="adjustDetail" type="462c0819:PsiDirectoryNode" /> | ||
| 253 | - </path> | ||
| 254 | - <path> | ||
| 255 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | ||
| 256 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | ||
| 257 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | ||
| 258 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | ||
| 259 | - <item name="resources" type="462c0819:PsiDirectoryNode" /> | ||
| 260 | - <item name="templates" type="462c0819:PsiDirectoryNode" /> | ||
| 261 | - <item name="inventory" type="462c0819:PsiDirectoryNode" /> | ||
| 262 | - <item name="adjustHeader" type="462c0819:PsiDirectoryNode" /> | ||
| 263 | - </path> | ||
| 264 | - <path> | ||
| 265 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | ||
| 266 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | ||
| 267 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | ||
| 268 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | ||
| 269 | - <item name="resources" type="462c0819:PsiDirectoryNode" /> | ||
| 270 | - <item name="templates" type="462c0819:PsiDirectoryNode" /> | ||
| 271 | - <item name="inventory" type="462c0819:PsiDirectoryNode" /> | ||
| 272 | - <item name="cycleCountDetail" type="462c0819:PsiDirectoryNode" /> | ||
| 273 | - </path> | ||
| 274 | - <path> | ||
| 275 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | ||
| 276 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | ||
| 277 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | ||
| 278 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | ||
| 279 | - <item name="resources" type="462c0819:PsiDirectoryNode" /> | ||
| 280 | - <item name="templates" type="462c0819:PsiDirectoryNode" /> | ||
| 281 | - <item name="inventory" type="462c0819:PsiDirectoryNode" /> | ||
| 282 | - <item name="inventoryDetail" type="462c0819:PsiDirectoryNode" /> | ||
| 283 | - </path> | ||
| 284 | - <path> | ||
| 285 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | ||
| 286 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | ||
| 287 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | ||
| 288 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | ||
| 289 | - <item name="resources" type="462c0819:PsiDirectoryNode" /> | ||
| 290 | - <item name="templates" type="462c0819:PsiDirectoryNode" /> | ||
| 291 | - <item name="inventory" type="462c0819:PsiDirectoryNode" /> | ||
| 292 | - <item name="inventoryTransaction" type="462c0819:PsiDirectoryNode" /> | ||
| 293 | - </path> | ||
| 294 | - </expand> | ||
| 295 | - <select /> | ||
| 296 | - </subPane> | ||
| 297 | - </pane> | ||
| 298 | - <pane id="Scope" /> | ||
| 299 | - <pane id="PackagesPane" /> | ||
| 300 | - </panes> | ||
| 301 | - </component> | ||
| 302 | <component name="PropertiesComponent"> | 80 | <component name="PropertiesComponent"> |
| 81 | + <property name="ASKED_ADD_EXTERNAL_FILES" value="true" /> | ||
| 82 | + <property name="DefaultHtmlFileTemplate" value="HTML File" /> | ||
| 83 | + <property name="ExpandSpringBootJavaOptionsPanel" value="true" /> | ||
| 303 | <property name="RequestMappingsPanelOrder0" value="0" /> | 84 | <property name="RequestMappingsPanelOrder0" value="0" /> |
| 304 | <property name="RequestMappingsPanelOrder1" value="1" /> | 85 | <property name="RequestMappingsPanelOrder1" value="1" /> |
| 305 | <property name="RequestMappingsPanelWidth0" value="75" /> | 86 | <property name="RequestMappingsPanelWidth0" value="75" /> |
| 306 | <property name="RequestMappingsPanelWidth1" value="75" /> | 87 | <property name="RequestMappingsPanelWidth1" value="75" /> |
| 307 | <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" /> | 88 | <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" /> |
| 89 | + <property name="WebServerToolWindowFactoryState" value="false" /> | ||
| 90 | + <property name="aspect.path.notification.shown" value="true" /> | ||
| 91 | + <property name="list.type.of.created.stylesheet" value="CSS" /> | ||
| 92 | + <property name="node.js.detected.package.eslint" value="true" /> | ||
| 93 | + <property name="node.js.path.for.package.eslint" value="project" /> | ||
| 94 | + <property name="node.js.path.for.package.tslint" value="project" /> | ||
| 95 | + <property name="node.js.selected.package.eslint" value="(autodetect)" /> | ||
| 96 | + <property name="node.js.selected.package.tslint" value="(autodetect)" /> | ||
| 308 | <property name="nodejs_package_manager_path" value="npm" /> | 97 | <property name="nodejs_package_manager_path" value="npm" /> |
| 98 | + <property name="settings.editor.selected.configurable" value="preferences.fileTypes" /> | ||
| 309 | </component> | 99 | </component> |
| 310 | <component name="RunDashboard"> | 100 | <component name="RunDashboard"> |
| 101 | + <option name="configurationTypes"> | ||
| 102 | + <set> | ||
| 103 | + <option value="SpringBootApplicationConfigurationType" /> | ||
| 104 | + </set> | ||
| 105 | + </option> | ||
| 311 | <option name="ruleStates"> | 106 | <option name="ruleStates"> |
| 312 | <list> | 107 | <list> |
| 313 | <RuleState> | 108 | <RuleState> |
| @@ -321,51 +116,74 @@ | @@ -321,51 +116,74 @@ | ||
| 321 | </component> | 116 | </component> |
| 322 | <component name="RunManager"> | 117 | <component name="RunManager"> |
| 323 | <configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot"> | 118 | <configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot"> |
| 324 | - <module name="wms2" /> | 119 | + <module name="huaheng" /> |
| 325 | <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" /> | 120 | <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" /> |
| 326 | <option name="ALTERNATIVE_JRE_PATH" /> | 121 | <option name="ALTERNATIVE_JRE_PATH" /> |
| 122 | + <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" /> | ||
| 123 | + <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" /> | ||
| 327 | <method v="2"> | 124 | <method v="2"> |
| 328 | <option name="Make" enabled="true" /> | 125 | <option name="Make" enabled="true" /> |
| 329 | </method> | 126 | </method> |
| 330 | </configuration> | 127 | </configuration> |
| 331 | </component> | 128 | </component> |
| 129 | + <component name="ServiceViewManager"> | ||
| 130 | + <option name="allServicesViewState"> | ||
| 131 | + <serviceView> | ||
| 132 | + <option name="contentProportion" value="0.20779221" /> | ||
| 133 | + <treeState> | ||
| 134 | + <expand> | ||
| 135 | + <path> | ||
| 136 | + <item name="services root" type="e789fda9:ObjectUtils$Sentinel" /> | ||
| 137 | + <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@c44696ca" type="7427dc5b:ServiceModel$ServiceGroupNode" /> | ||
| 138 | + </path> | ||
| 139 | + <path> | ||
| 140 | + <item name="services root" type="e789fda9:ObjectUtils$Sentinel" /> | ||
| 141 | + <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@c44696ca" type="7427dc5b:ServiceModel$ServiceGroupNode" /> | ||
| 142 | + <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@fcf19045" type="7427dc5b:ServiceModel$ServiceGroupNode" /> | ||
| 143 | + </path> | ||
| 144 | + </expand> | ||
| 145 | + <select /> | ||
| 146 | + </treeState> | ||
| 147 | + </serviceView> | ||
| 148 | + </option> | ||
| 149 | + </component> | ||
| 332 | <component name="SvnConfiguration"> | 150 | <component name="SvnConfiguration"> |
| 333 | <configuration /> | 151 | <configuration /> |
| 334 | </component> | 152 | </component> |
| 335 | - <component name="ToolWindowManager"> | ||
| 336 | - <frame x="-7" y="-7" width="1550" height="838" extended-state="6" /> | ||
| 337 | - <editor active="true" /> | ||
| 338 | - <layout> | ||
| 339 | - <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.28686327" /> | ||
| 340 | - <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> | ||
| 341 | - <window_info id="Web" order="2" side_tool="true" /> | ||
| 342 | - <window_info id="Designer" order="3" /> | ||
| 343 | - <window_info id="UI Designer" order="4" /> | ||
| 344 | - <window_info id="Favorites" order="5" side_tool="true" /> | ||
| 345 | - <window_info anchor="bottom" id="Message" order="0" /> | ||
| 346 | - <window_info anchor="bottom" id="Find" order="1" weight="0.3286119" /> | ||
| 347 | - <window_info anchor="bottom" id="Run" order="2" /> | ||
| 348 | - <window_info anchor="bottom" id="Debug" order="3" visible="true" weight="0.29036826" /> | ||
| 349 | - <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> | ||
| 350 | - <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> | ||
| 351 | - <window_info anchor="bottom" id="TODO" order="6" /> | ||
| 352 | - <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> | ||
| 353 | - <window_info anchor="bottom" id="Version Control" order="8" weight="0.14164306" /> | ||
| 354 | - <window_info anchor="bottom" id="Database Changes" order="9" /> | ||
| 355 | - <window_info anchor="bottom" id="Spring" order="10" /> | ||
| 356 | - <window_info anchor="bottom" id="MyBatis Log" order="11" /> | ||
| 357 | - <window_info anchor="bottom" id="Event Log" order="12" side_tool="true" /> | ||
| 358 | - <window_info anchor="bottom" id="Messages" order="13" weight="0.12606232" /> | ||
| 359 | - <window_info anchor="bottom" id="Java Enterprise" order="14" /> | ||
| 360 | - <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> | ||
| 361 | - <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> | ||
| 362 | - <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> | ||
| 363 | - <window_info anchor="right" id="Palette" order="3" /> | ||
| 364 | - <window_info anchor="right" id="Database" order="4" /> | ||
| 365 | - <window_info anchor="right" id="Maven" order="5" weight="0.097184986" /> | ||
| 366 | - <window_info anchor="right" id="Bean Validation" order="6" /> | ||
| 367 | - <window_info anchor="right" id="Palette	" order="7" /> | ||
| 368 | - </layout> | 153 | + <component name="TaskManager"> |
| 154 | + <task active="true" id="Default" summary="Default task"> | ||
| 155 | + <changelist id="908d8a6f-e3e4-4fdc-b674-e523a3e2b520" name="Default Changelist" comment="" /> | ||
| 156 | + <created>1566977677142</created> | ||
| 157 | + <option name="number" value="Default" /> | ||
| 158 | + <option name="presentableId" value="Default" /> | ||
| 159 | + <updated>1566977677142</updated> | ||
| 160 | + <workItem from="1566977678336" duration="306000" /> | ||
| 161 | + <workItem from="1566978429560" duration="9246000" /> | ||
| 162 | + <workItem from="1567038752582" duration="8156000" /> | ||
| 163 | + </task> | ||
| 164 | + <task id="LOCAL-00001" summary="入库单添加时添加流程标记，审核入库单"> | ||
| 165 | + <created>1566983055587</created> | ||
| 166 | + <option name="number" value="00001" /> | ||
| 167 | + <option name="presentableId" value="LOCAL-00001" /> | ||
| 168 | + <option name="project" value="LOCAL" /> | ||
| 169 | + <updated>1566983055587</updated> | ||
| 170 | + </task> | ||
| 171 | + <task id="LOCAL-00002" summary="添加入库单历史"> | ||
| 172 | + <created>1566987011007</created> | ||
| 173 | + <option name="number" value="00002" /> | ||
| 174 | + <option name="presentableId" value="LOCAL-00002" /> | ||
| 175 | + <option name="project" value="LOCAL" /> | ||
| 176 | + <updated>1566987011007</updated> | ||
| 177 | + </task> | ||
| 178 | + <task id="LOCAL-00003" summary="修复入库历史controller冲突"> | ||
| 179 | + <created>1567039165473</created> | ||
| 180 | + <option name="number" value="00003" /> | ||
| 181 | + <option name="presentableId" value="LOCAL-00003" /> | ||
| 182 | + <option name="project" value="LOCAL" /> | ||
| 183 | + <updated>1567039165473</updated> | ||
| 184 | + </task> | ||
| 185 | + <option name="localTasksCounter" value="4" /> | ||
| 186 | + <servers /> | ||
| 369 | </component> | 187 | </component> |
| 370 | <component name="TypeScriptGeneratedFilesManager"> | 188 | <component name="TypeScriptGeneratedFilesManager"> |
| 371 | <option name="version" value="1" /> | 189 | <option name="version" value="1" /> |
| @@ -376,20 +194,7 @@ | @@ -376,20 +194,7 @@ | ||
| 376 | <entry key="MAIN"> | 194 | <entry key="MAIN"> |
| 377 | <value> | 195 | <value> |
| 378 | <State> | 196 | <State> |
| 379 | - <option name="RECENTLY_FILTERED_USER_GROUPS"> | ||
| 380 | - <collection /> | ||
| 381 | - </option> | ||
| 382 | - <option name="RECENTLY_FILTERED_BRANCH_GROUPS"> | ||
| 383 | - <collection /> | ||
| 384 | - </option> | ||
| 385 | - <option name="COLUMN_ORDER"> | ||
| 386 | - <list> | ||
| 387 | - <option value="0" /> | ||
| 388 | - <option value="1" /> | ||
| 389 | - <option value="2" /> | ||
| 390 | - <option value="3" /> | ||
| 391 | - </list> | ||
| 392 | - </option> | 197 | + <option name="COLUMN_ORDER" /> |
| 393 | </State> | 198 | </State> |
| 394 | </value> | 199 | </value> |
| 395 | </entry> | 200 | </entry> |
| @@ -411,305 +216,38 @@ | @@ -411,305 +216,38 @@ | ||
| 411 | </option> | 216 | </option> |
| 412 | </component> | 217 | </component> |
| 413 | <component name="VcsManagerConfiguration"> | 218 | <component name="VcsManagerConfiguration"> |
| 219 | + <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" /> | ||
| 414 | <MESSAGE value="盘点明细页面" /> | 220 | <MESSAGE value="盘点明细页面" /> |
| 415 | - <MESSAGE value="调整主页和明细页" /> | ||
| 416 | - <option name="LAST_COMMIT_MESSAGE" value="调整主页和明细页" /> | 221 | + <MESSAGE value="入库单添加时添加流程标记，审核入库单" /> |
| 222 | + <MESSAGE value="添加入库单历史" /> | ||
| 223 | + <MESSAGE value="修复入库历史controller冲突" /> | ||
| 224 | + <option name="LAST_COMMIT_MESSAGE" value="修复入库历史controller冲突" /> | ||
| 417 | </component> | 225 | </component> |
| 418 | <component name="XDebuggerManager"> | 226 | <component name="XDebuggerManager"> |
| 419 | <breakpoint-manager> | 227 | <breakpoint-manager> |
| 420 | <breakpoints> | 228 | <breakpoints> |
| 421 | - <line-breakpoint enabled="true" type="java-line"> | 229 | + <line-breakpoint type="java-line"> |
| 422 | <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/mapper/CycleCountHeaderMapper.java</url> | 230 | <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/mapper/CycleCountHeaderMapper.java</url> |
| 423 | <line>5</line> | 231 | <line>5</line> |
| 424 | - <properties /> | ||
| 425 | <option name="timeStamp" value="1" /> | 232 | <option name="timeStamp" value="1" /> |
| 426 | </line-breakpoint> | 233 | </line-breakpoint> |
| 234 | + <line-breakpoint enabled="true" type="java-line"> | ||
| 235 | + <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java</url> | ||
| 236 | + <line>84</line> | ||
| 237 | + <option name="timeStamp" value="3" /> | ||
| 238 | + </line-breakpoint> | ||
| 239 | + <line-breakpoint enabled="true" type="java-line"> | ||
| 240 | + <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/statusFlow/controller/StatusFlowDetailController.java</url> | ||
| 241 | + <line>60</line> | ||
| 242 | + <option name="timeStamp" value="4" /> | ||
| 243 | + </line-breakpoint> | ||
| 244 | + <line-breakpoint type="java-field"> | ||
| 245 | + <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java</url> | ||
| 246 | + <line>35</line> | ||
| 247 | + <properties field="receiptHeaderService" class="com.huaheng.pc.receipt.receiptDetail.service.ReceiptDetailServiceImpl" /> | ||
| 248 | + <option name="timeStamp" value="2" /> | ||
| 249 | + </line-breakpoint> | ||
| 427 | </breakpoints> | 250 | </breakpoints> |
| 428 | </breakpoint-manager> | 251 | </breakpoint-manager> |
| 429 | - <watches-manager> | ||
| 430 | - <configuration name="SpringBootApplicationConfigurationType"> | ||
| 431 | - <watch expression="pageDomain" /> | ||
| 432 | - <watch expression="pageDomain" language="JAVA" /> | ||
| 433 | - <watch expression="pageDomain" language="JAVA" /> | ||
| 434 | - </configuration> | ||
| 435 | - </watches-manager> | ||
| 436 | - </component> | ||
| 437 | - <component name="editorHistoryManager"> | ||
| 438 | - <entry file="file://$PROJECT_DIR$/.idea/workspace.xml"> | ||
| 439 | - <provider selected="true" editor-type-id="text-editor" /> | ||
| 440 | - </entry> | ||
| 441 | - <entry file="file://$PROJECT_DIR$/.idea/WMSV1.iml" /> | ||
| 442 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/domain/CycleCountDetail.java"> | ||
| 443 | - <provider selected="true" editor-type-id="text-editor"> | ||
| 444 | - <state relative-caret-position="287"> | ||
| 445 | - <caret line="607" column="5" lean-forward="true" selection-start-line="607" selection-start-column="5" selection-end-line="607" selection-end-column="5" /> | ||
| 446 | - <folding> | ||
| 447 | - <element signature="e#11035#11036#0" expanded="true" /> | ||
| 448 | - <element signature="e#11064#11065#0" expanded="true" /> | ||
| 449 | - <element signature="e#17291#17292#0" expanded="true" /> | ||
| 450 | - <element signature="e#17330#17331#0" expanded="true" /> | ||
| 451 | - <element signature="e#17395#17396#0" expanded="true" /> | ||
| 452 | - <element signature="e#17451#17452#0" expanded="true" /> | ||
| 453 | - </folding> | ||
| 454 | - </state> | ||
| 455 | - </provider> | ||
| 456 | - </entry> | ||
| 457 | - <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryTransactionMapper.xml"> | ||
| 458 | - <provider selected="true" editor-type-id="text-editor"> | ||
| 459 | - <state relative-caret-position="880"> | ||
| 460 | - <caret line="44" column="53" selection-start-line="44" selection-start-column="53" selection-end-line="44" selection-end-column="53" /> | ||
| 461 | - </state> | ||
| 462 | - </provider> | ||
| 463 | - </entry> | ||
| 464 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/mapper/InventoryTransactionMapper.java"> | ||
| 465 | - <provider selected="true" editor-type-id="text-editor"> | ||
| 466 | - <state relative-caret-position="80"> | ||
| 467 | - <caret line="5" column="17" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="17" /> | ||
| 468 | - </state> | ||
| 469 | - </provider> | ||
| 470 | - </entry> | ||
| 471 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/domain/InventoryTransaction.java"> | ||
| 472 | - <provider selected="true" editor-type-id="text-editor"> | ||
| 473 | - <state relative-caret-position="4068"> | ||
| 474 | - <caret line="278" column="32" lean-forward="true" selection-start-line="278" selection-start-column="32" selection-end-line="278" selection-end-column="32" /> | ||
| 475 | - </state> | ||
| 476 | - </provider> | ||
| 477 | - </entry> | ||
| 478 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/mapper/InventoryHeaderMapper.java"> | ||
| 479 | - <provider selected="true" editor-type-id="text-editor"> | ||
| 480 | - <state relative-caret-position="80"> | ||
| 481 | - <caret line="5" column="17" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="17" /> | ||
| 482 | - </state> | ||
| 483 | - </provider> | ||
| 484 | - </entry> | ||
| 485 | - <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryHeaderMapper.xml"> | ||
| 486 | - <provider selected="true" editor-type-id="text-editor"> | ||
| 487 | - <state relative-caret-position="-68"> | ||
| 488 | - <caret line="2" selection-start-line="2" selection-end-line="2" /> | ||
| 489 | - </state> | ||
| 490 | - </provider> | ||
| 491 | - </entry> | ||
| 492 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/domain/InventoryHeader.java"> | ||
| 493 | - <provider selected="true" editor-type-id="text-editor"> | ||
| 494 | - <state relative-caret-position="140"> | ||
| 495 | - <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" /> | ||
| 496 | - </state> | ||
| 497 | - </provider> | ||
| 498 | - </entry> | ||
| 499 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/mapper/InventoryDetailMapper.java"> | ||
| 500 | - <provider selected="true" editor-type-id="text-editor"> | ||
| 501 | - <state relative-caret-position="80"> | ||
| 502 | - <caret line="5" selection-start-line="5" selection-end-line="5" /> | ||
| 503 | - </state> | ||
| 504 | - </provider> | ||
| 505 | - </entry> | ||
| 506 | - <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryDetailMapper.xml"> | ||
| 507 | - <provider selected="true" editor-type-id="text-editor"> | ||
| 508 | - <state relative-caret-position="40"> | ||
| 509 | - <caret line="2" selection-start-line="2" selection-end-line="2" /> | ||
| 510 | - </state> | ||
| 511 | - </provider> | ||
| 512 | - </entry> | ||
| 513 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/mapper/CycleCountHeaderMapper.java"> | ||
| 514 | - <provider selected="true" editor-type-id="text-editor"> | ||
| 515 | - <state relative-caret-position="80"> | ||
| 516 | - <caret line="5" selection-start-line="5" selection-end-line="5" /> | ||
| 517 | - </state> | ||
| 518 | - </provider> | ||
| 519 | - </entry> | ||
| 520 | - <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/inventory/CycleCountHeaderMapper.xml"> | ||
| 521 | - <provider selected="true" editor-type-id="text-editor"> | ||
| 522 | - <state relative-caret-position="40"> | ||
| 523 | - <caret line="2" selection-start-line="2" selection-end-line="2" /> | ||
| 524 | - </state> | ||
| 525 | - </provider> | ||
| 526 | - </entry> | ||
| 527 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/mapper/CycleCountDetailMapper.java"> | ||
| 528 | - <provider selected="true" editor-type-id="text-editor"> | ||
| 529 | - <state relative-caret-position="80"> | ||
| 530 | - <caret line="5" column="17" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="17" /> | ||
| 531 | - </state> | ||
| 532 | - </provider> | ||
| 533 | - </entry> | ||
| 534 | - <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/inventory/CycleCountDetailMapper.xml"> | ||
| 535 | - <provider selected="true" editor-type-id="text-editor"> | ||
| 536 | - <state relative-caret-position="960"> | ||
| 537 | - <caret line="48" column="60" selection-start-line="48" selection-start-column="60" selection-end-line="48" selection-end-column="60" /> | ||
| 538 | - </state> | ||
| 539 | - </provider> | ||
| 540 | - </entry> | ||
| 541 | - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html"> | ||
| 542 | - <provider selected="true" editor-type-id="text-editor"> | ||
| 543 | - <state relative-caret-position="564"> | ||
| 544 | - <caret line="46" column="36" selection-start-line="46" selection-start-column="36" selection-end-line="53" selection-end-column="41" /> | ||
| 545 | - </state> | ||
| 546 | - </provider> | ||
| 547 | - </entry> | ||
| 548 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/adjustDetail/service/AdjustDetailService.java"> | ||
| 549 | - <provider selected="true" editor-type-id="text-editor"> | ||
| 550 | - <state relative-caret-position="80"> | ||
| 551 | - <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" /> | ||
| 552 | - </state> | ||
| 553 | - </provider> | ||
| 554 | - </entry> | ||
| 555 | - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryTransaction/inventoryTransaction.html"> | ||
| 556 | - <provider selected="true" editor-type-id="text-editor"> | ||
| 557 | - <state relative-caret-position="20"> | ||
| 558 | - <caret line="1" column="102" lean-forward="true" selection-start-line="1" selection-start-column="52" selection-end-line="1" selection-end-column="102" /> | ||
| 559 | - </state> | ||
| 560 | - </provider> | ||
| 561 | - </entry> | ||
| 562 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/HuaHengApplication.java"> | ||
| 563 | - <provider selected="true" editor-type-id="text-editor"> | ||
| 564 | - <state relative-caret-position="181"> | ||
| 565 | - <caret line="14" selection-start-line="14" selection-end-line="14" /> | ||
| 566 | - </state> | ||
| 567 | - </provider> | ||
| 568 | - </entry> | ||
| 569 | - <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/inventory/AdjustHeaderMapper.xml"> | ||
| 570 | - <provider selected="true" editor-type-id="text-editor"> | ||
| 571 | - <state relative-caret-position="360"> | ||
| 572 | - <caret line="18" column="54" lean-forward="true" selection-start-line="18" selection-start-column="54" selection-end-line="18" selection-end-column="54" /> | ||
| 573 | - </state> | ||
| 574 | - </provider> | ||
| 575 | - </entry> | ||
| 576 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/adjustHeader/domain/AdjustHeader.java"> | ||
| 577 | - <provider selected="true" editor-type-id="text-editor"> | ||
| 578 | - <state relative-caret-position="36"> | ||
| 579 | - <caret line="89" selection-start-line="89" selection-end-line="89" /> | ||
| 580 | - </state> | ||
| 581 | - </provider> | ||
| 582 | - </entry> | ||
| 583 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/adjustHeader/service/AdjustHeaderService.java"> | ||
| 584 | - <provider selected="true" editor-type-id="text-editor"> | ||
| 585 | - <state relative-caret-position="140"> | ||
| 586 | - <caret line="7" selection-start-line="7" selection-end-line="7" /> | ||
| 587 | - <folding> | ||
| 588 | - <element signature="imports" expanded="true" /> | ||
| 589 | - </folding> | ||
| 590 | - </state> | ||
| 591 | - </provider> | ||
| 592 | - </entry> | ||
| 593 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/adjustHeader/mapper/AdjustHeaderMapper.java"> | ||
| 594 | - <provider selected="true" editor-type-id="text-editor"> | ||
| 595 | - <state relative-caret-position="100"> | ||
| 596 | - <caret line="5" column="17" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="17" /> | ||
| 597 | - <folding> | ||
| 598 | - <element signature="imports" expanded="true" /> | ||
| 599 | - </folding> | ||
| 600 | - </state> | ||
| 601 | - </provider> | ||
| 602 | - </entry> | ||
| 603 | - <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.1.5.RELEASE/spring-core-5.1.5.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class"> | ||
| 604 | - <provider selected="true" editor-type-id="text-editor"> | ||
| 605 | - <state relative-caret-position="129"> | ||
| 606 | - <caret line="102" selection-start-line="102" selection-end-line="102" /> | ||
| 607 | - </state> | ||
| 608 | - </provider> | ||
| 609 | - </entry> | ||
| 610 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/adjustHeader/controller/adjustHeaderController.java"> | ||
| 611 | - <provider selected="true" editor-type-id="text-editor"> | ||
| 612 | - <state relative-caret-position="664"> | ||
| 613 | - <caret line="72" selection-start-line="72" selection-end-line="72" /> | ||
| 614 | - <folding> | ||
| 615 | - <element signature="imports" expanded="true" /> | ||
| 616 | - </folding> | ||
| 617 | - </state> | ||
| 618 | - </provider> | ||
| 619 | - </entry> | ||
| 620 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java"> | ||
| 621 | - <provider selected="true" editor-type-id="text-editor"> | ||
| 622 | - <state relative-caret-position="240"> | ||
| 623 | - <caret line="68" column="16" lean-forward="true" selection-start-line="68" selection-start-column="16" selection-end-line="68" selection-end-column="16" /> | ||
| 624 | - </state> | ||
| 625 | - </provider> | ||
| 626 | - </entry> | ||
| 627 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/controller/CycleCountHeaderController.java"> | ||
| 628 | - <provider selected="true" editor-type-id="text-editor"> | ||
| 629 | - <state relative-caret-position="116"> | ||
| 630 | - <caret line="68" column="45" lean-forward="true" selection-start-line="68" selection-start-column="45" selection-end-line="68" selection-end-column="45" /> | ||
| 631 | - </state> | ||
| 632 | - </provider> | ||
| 633 | - </entry> | ||
| 634 | - <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/inventory/AdjustDetailMapper.xml"> | ||
| 635 | - <provider selected="true" editor-type-id="text-editor"> | ||
| 636 | - <state relative-caret-position="320"> | ||
| 637 | - <caret line="16" column="4" selection-start-line="16" selection-start-column="4" selection-end-line="16" selection-end-column="4" /> | ||
| 638 | - </state> | ||
| 639 | - </provider> | ||
| 640 | - </entry> | ||
| 641 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/adjustDetail/mapper/AdjustDetailMapper.java"> | ||
| 642 | - <provider selected="true" editor-type-id="text-editor"> | ||
| 643 | - <state relative-caret-position="80"> | ||
| 644 | - <caret line="5" selection-start-line="5" selection-end-line="5" /> | ||
| 645 | - </state> | ||
| 646 | - </provider> | ||
| 647 | - </entry> | ||
| 648 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/adjustDetail/domain/AdjustDetail.java"> | ||
| 649 | - <provider selected="true" editor-type-id="text-editor"> | ||
| 650 | - <state relative-caret-position="1176"> | ||
| 651 | - <caret line="245" column="8" selection-start-line="245" selection-start-column="8" selection-end-line="245" selection-end-column="8" /> | ||
| 652 | - </state> | ||
| 653 | - </provider> | ||
| 654 | - </entry> | ||
| 655 | - <entry file="file://$PROJECT_DIR$/src/main/resources/static/huaheng/js/huahengUI.js"> | ||
| 656 | - <provider selected="true" editor-type-id="text-editor"> | ||
| 657 | - <state relative-caret-position="260"> | ||
| 658 | - <caret line="49" column="12" lean-forward="true" selection-start-line="49" selection-start-column="12" selection-end-line="58" selection-end-column="14" /> | ||
| 659 | - </state> | ||
| 660 | - </provider> | ||
| 661 | - </entry> | ||
| 662 | - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountDetail/cycleCountDetail.html"> | ||
| 663 | - <provider selected="true" editor-type-id="text-editor"> | ||
| 664 | - <state relative-caret-position="292"> | ||
| 665 | - <caret line="137" column="26" selection-start-line="137" selection-start-column="26" selection-end-line="137" selection-end-column="26" /> | ||
| 666 | - <folding> | ||
| 667 | - <element signature="e#12798#13206#0" /> | ||
| 668 | - </folding> | ||
| 669 | - </state> | ||
| 670 | - </provider> | ||
| 671 | - </entry> | ||
| 672 | - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html"> | ||
| 673 | - <provider selected="true" editor-type-id="text-editor"> | ||
| 674 | - <state relative-caret-position="278"> | ||
| 675 | - <caret line="114" column="26" lean-forward="true" selection-start-line="114" selection-start-column="26" selection-end-line="114" selection-end-column="26" /> | ||
| 676 | - <folding> | ||
| 677 | - <element signature="e#11043#11630#0" /> | ||
| 678 | - </folding> | ||
| 679 | - </state> | ||
| 680 | - </provider> | ||
| 681 | - </entry> | ||
| 682 | - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/adjustDetail/adjustDetail.html"> | ||
| 683 | - <provider selected="true" editor-type-id="text-editor"> | ||
| 684 | - <state relative-caret-position="740"> | ||
| 685 | - <caret line="37" column="33" selection-start-line="37" selection-start-column="33" selection-end-line="37" selection-end-column="33" /> | ||
| 686 | - <folding> | ||
| 687 | - <element signature="e#6574#12020#0" /> | ||
| 688 | - <element signature="e#11542#11950#0" /> | ||
| 689 | - <element signature="e#11954#12938#0" /> | ||
| 690 | - </folding> | ||
| 691 | - </state> | ||
| 692 | - </provider> | ||
| 693 | - </entry> | ||
| 694 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/adjustDetail/controller/adjustDetailController.java"> | ||
| 695 | - <provider selected="true" editor-type-id="text-editor"> | ||
| 696 | - <state relative-caret-position="265"> | ||
| 697 | - <caret line="69" lean-forward="true" selection-start-line="69" selection-end-line="69" /> | ||
| 698 | - <folding> | ||
| 699 | - <element signature="imports" expanded="true" /> | ||
| 700 | - </folding> | ||
| 701 | - </state> | ||
| 702 | - </provider> | ||
| 703 | - </entry> | ||
| 704 | - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/adjustHeader/adjustHeader.html"> | ||
| 705 | - <provider selected="true" editor-type-id="text-editor"> | ||
| 706 | - <state relative-caret-position="192"> | ||
| 707 | - <caret line="38" column="32" lean-forward="true" selection-start-line="38" selection-start-column="32" selection-end-line="38" selection-end-column="32" /> | ||
| 708 | - <folding> | ||
| 709 | - <element signature="n#style#0;n#a#0;n#!!top" expanded="true" /> | ||
| 710 | - </folding> | ||
| 711 | - </state> | ||
| 712 | - </provider> | ||
| 713 | - </entry> | ||
| 714 | </component> | 252 | </component> |
| 715 | </project> | 253 | </project> |
| 716 | \ No newline at end of file | 254 | \ No newline at end of file |
src/main/java/com/huaheng/pc/config/materialType/controller/MaterialTypeController.java
0 → 100644
| 1 | +package com.huaheng.pc.config.materialType.controller; | ||
| 2 | + | ||
| 3 | +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; | ||
| 4 | +import com.baomidou.mybatisplus.core.metadata.IPage; | ||
| 5 | +import com.baomidou.mybatisplus.core.toolkit.Wrappers; | ||
| 6 | +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; | ||
| 7 | +import com.huaheng.common.support.Convert; | ||
| 8 | +import com.huaheng.common.utils.StringUtils; | ||
| 9 | +import com.huaheng.common.utils.security.ShiroUtils; | ||
| 10 | +import com.huaheng.framework.aspectj.lang.annotation.Log; | ||
| 11 | +import com.huaheng.framework.aspectj.lang.constant.BusinessType; | ||
| 12 | +import com.huaheng.framework.web.controller.BaseController; | ||
| 13 | +import com.huaheng.framework.web.domain.AjaxResult; | ||
| 14 | +import com.huaheng.framework.web.page.PageDomain; | ||
| 15 | +import com.huaheng.framework.web.page.TableDataInfo; | ||
| 16 | +import com.huaheng.framework.web.page.TableSupport; | ||
| 17 | +import com.huaheng.pc.config.material.domain.Material; | ||
| 18 | +import com.huaheng.pc.config.material.service.MaterialService; | ||
| 19 | +import com.huaheng.pc.config.materialType.domain.MaterialType; | ||
| 20 | +import com.huaheng.pc.config.materialType.service.MaterialTypeService; | ||
| 21 | +import io.swagger.annotations.Api; | ||
| 22 | +import io.swagger.annotations.ApiOperation; | ||
| 23 | +import io.swagger.annotations.ApiParam; | ||
| 24 | +import org.apache.shiro.authz.annotation.RequiresPermissions; | ||
| 25 | +import org.springframework.stereotype.Controller; | ||
| 26 | +import org.springframework.ui.ModelMap; | ||
| 27 | +import org.springframework.web.bind.annotation.*; | ||
| 28 | + | ||
| 29 | +import javax.annotation.Resource; | ||
| 30 | +import java.util.ArrayList; | ||
| 31 | +import java.util.List; | ||
| 32 | + | ||
| 33 | +@Api(tags = "物料类别") | ||
| 34 | +@Controller | ||
| 35 | +@RequestMapping("/config/materialType") | ||
| 36 | +public class MaterialTypeController extends BaseController { | ||
| 37 | + | ||
| 38 | + @Resource | ||
| 39 | + private MaterialTypeService materialTypeService; | ||
| 40 | + @Resource | ||
| 41 | + private MaterialService materialService; | ||
| 42 | + | ||
| 43 | + private String prefix = "config/materialType"; | ||
| 44 | + | ||
| 45 | + @RequiresPermissions("config:materialType:view") | ||
| 46 | + @GetMapping() | ||
| 47 | + public String materialType() | ||
| 48 | + { | ||
| 49 | + return prefix + "/materialType"; | ||
| 50 | + } | ||
| 51 | + | ||
| 52 | + /** | ||
| 53 | + * 查询物料类别 | ||
| 54 | + */ | ||
| 55 | + @ApiOperation(value="查询物料类别列表", notes="根据编码、名字、创建时间查询物料类别列表", httpMethod = "POST") | ||
| 56 | + @RequiresPermissions("config:materialType:list") | ||
| 57 | + @Log(title = "配置-物料类别", operating = "查看物料类别列表", action = BusinessType.GRANT) | ||
| 58 | + @PostMapping("/list") | ||
| 59 | + @ResponseBody | ||
| 60 | + public TableDataInfo list(@ApiParam(name="materialType",value="物料类别") MaterialType materialType, | ||
| 61 | + @ApiParam(name = "createdBegin", value = "起止时间") String createdBegin, | ||
| 62 | + @ApiParam(name = "createdEnd", value = "结束时间") String createdEnd) { | ||
| 63 | + LambdaQueryWrapper<MaterialType> lambdaQueryWrapper = Wrappers.lambdaQuery(); | ||
| 64 | + PageDomain pageDomain = TableSupport.buildPageRequest(); | ||
| 65 | + Integer pageNum = pageDomain.getPageNum(); | ||
| 66 | + Integer pageSize = pageDomain.getPageSize(); | ||
| 67 | + | ||
| 68 | + lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin), MaterialType::getCreated, createdBegin) | ||
| 69 | + .le(StringUtils.isNotEmpty(createdEnd), MaterialType::getCreated, createdEnd) | ||
| 70 | + .in(MaterialType::getCompanyCode, ShiroUtils.getCompanyCodeList()) | ||
| 71 | + .eq(MaterialType::getWarehouseCode, ShiroUtils.getWarehouseCode()) | ||
| 72 | + .eq(StringUtils.isNotEmpty(materialType.getCode()), | ||
| 73 | + MaterialType::getCode, materialType.getCode()) | ||
| 74 | + .eq(StringUtils.isNotEmpty(materialType.getName()), MaterialType::getName, materialType.getName()); | ||
| 75 | + | ||
| 76 | + if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){ | ||
| 77 | + /** | ||
| 78 | + * 使用分页查询 | ||
| 79 | + */ | ||
| 80 | + Page<MaterialType> page = new Page<>(pageNum, pageSize); | ||
| 81 | + IPage<MaterialType> iPage = materialTypeService.page(page, lambdaQueryWrapper); | ||
| 82 | + return getMpDataTable(iPage.getRecords(),iPage.getTotal()); | ||
| 83 | + } else { | ||
| 84 | + List<MaterialType> list = materialTypeService.list(lambdaQueryWrapper); | ||
| 85 | + return getDataTable(list); | ||
| 86 | + } | ||
| 87 | + } | ||
| 88 | + | ||
| 89 | + /** | ||
| 90 | + * 新增物料类别 | ||
| 91 | + */ | ||
| 92 | + @GetMapping("/add") | ||
| 93 | + public String add() { | ||
| 94 | + return prefix + "/add"; | ||
| 95 | + } | ||
| 96 | + | ||
| 97 | + /** | ||
| 98 | + * 新增保存物料类别 | ||
| 99 | + */ | ||
| 100 | + @ApiOperation(value="新增物料类别 ", notes="新增物料类别 ", httpMethod = "POST") | ||
| 101 | + @RequiresPermissions("config:materialType:add") | ||
| 102 | + @Log(title = "配置-物料类别 ",operating = "新增物料类别 ", action = BusinessType.INSERT) | ||
| 103 | + @PostMapping("/add") | ||
| 104 | + @ResponseBody | ||
| 105 | + public AjaxResult addSave(MaterialType materialType) { | ||
| 106 | + return toAjax(materialTypeService.save(materialType)); | ||
| 107 | + } | ||
| 108 | + | ||
| 109 | + /** | ||
| 110 | + * 修改物料类别 | ||
| 111 | + */ | ||
| 112 | + @GetMapping("/edit/{id}") | ||
| 113 | + public String edit(@PathVariable("id") Integer id, ModelMap mmap) { | ||
| 114 | + MaterialType materialType = materialTypeService.getById(id); | ||
| 115 | + mmap.put("materialType", materialType); | ||
| 116 | + return prefix + "/edit"; | ||
| 117 | + } | ||
| 118 | + | ||
| 119 | + /** | ||
| 120 | + * 修改保存物料类别 | ||
| 121 | + */ | ||
| 122 | + @ApiOperation(value="修改物料类别", notes="修改物料类别", httpMethod = "POST") | ||
| 123 | + @RequiresPermissions("config:materialType:edit") | ||
| 124 | + @Log(title = "配置-物料类别 ",operating = "修改物料类别 ", action = BusinessType.UPDATE) | ||
| 125 | + @PostMapping("/edit") | ||
| 126 | + @ResponseBody | ||
| 127 | + public AjaxResult editSave(MaterialType materialType) { | ||
| 128 | + materialType.setLastUpdatedBy(ShiroUtils.getLoginName()); | ||
| 129 | + return toAjax(materialTypeService.updateById(materialType)); | ||
| 130 | + } | ||
| 131 | + | ||
| 132 | + /** | ||
| 133 | + * 删除物料类别 | ||
| 134 | + */ | ||
| 135 | + @RequiresPermissions("config:materialType:remove") | ||
| 136 | + @Log(title = "配置-物料类别", operating = "删除物料类别", action = BusinessType.DELETE) | ||
| 137 | + @PostMapping( "/remove") | ||
| 138 | + @ResponseBody | ||
| 139 | + public AjaxResult remove(String ids) { | ||
| 140 | + if (StringUtils.isEmpty(ids)) { | ||
| 141 | + return AjaxResult.error("id不能为空"); | ||
| 142 | + } | ||
| 143 | + List<Integer> listMaterialType = new ArrayList<>(); | ||
| 144 | + for (Integer id : Convert.toIntArray(ids)) { | ||
| 145 | + MaterialType materialType = materialTypeService.getById(id); | ||
| 146 | + LambdaQueryWrapper<Material> lambdaQueryWrapper = Wrappers.lambdaQuery(); | ||
| 147 | + lambdaQueryWrapper.eq(Material::getType, materialType.getCode()); | ||
| 148 | + List<Material> list = materialService.list(lambdaQueryWrapper); | ||
| 149 | + if (list != null){ | ||
| 150 | + return AjaxResult.error("该物料类别正在被使用，无法删除"); | ||
| 151 | + } else { | ||
| 152 | + listMaterialType.add(id); | ||
| 153 | + } | ||
| 154 | + } | ||
| 155 | + return toAjax(materialTypeService.removeByIds(listMaterialType)); | ||
| 156 | + } | ||
| 157 | +} |
src/main/java/com/huaheng/pc/config/statusFlow/domain/StatusFlowDetail.java
| @@ -27,7 +27,7 @@ public class StatusFlowDetail implements Serializable { | @@ -27,7 +27,7 @@ public class StatusFlowDetail implements Serializable { | ||
| 27 | 27 | ||
| 28 | @TableField(value = "headerCode") | 28 | @TableField(value = "headerCode") |
| 29 | @ApiModelProperty(value="头表编码") | 29 | @ApiModelProperty(value="头表编码") |
| 30 | - private Integer headerCode; | 30 | + private String headerCode; |
| 31 | 31 | ||
| 32 | /** | 32 | /** |
| 33 | * 状态流 | 33 | * 状态流 |
src/main/java/com/huaheng/pc/receipt/receiptDetail/domain/ReceiptDetail.java
| 1 | package com.huaheng.pc.receipt.receiptDetail.domain; | 1 | package com.huaheng.pc.receipt.receiptDetail.domain; |
| 2 | 2 | ||
| 3 | -import com.baomidou.mybatisplus.annotation.IdType; | ||
| 4 | -import com.baomidou.mybatisplus.annotation.TableField; | ||
| 5 | -import com.baomidou.mybatisplus.annotation.TableId; | ||
| 6 | -import com.baomidou.mybatisplus.annotation.TableName; | 3 | +import com.baomidou.mybatisplus.annotation.*; |
| 7 | import io.swagger.annotations.ApiModel; | 4 | import io.swagger.annotations.ApiModel; |
| 8 | import io.swagger.annotations.ApiModelProperty; | 5 | import io.swagger.annotations.ApiModelProperty; |
| 9 | import java.io.Serializable; | 6 | import java.io.Serializable; |
| @@ -335,6 +332,7 @@ public class ReceiptDetail implements Serializable { | @@ -335,6 +332,7 @@ public class ReceiptDetail implements Serializable { | ||
| 335 | */ | 332 | */ |
| 336 | @TableField(value = "processStamp") | 333 | @TableField(value = "processStamp") |
| 337 | @ApiModelProperty(value = "处理标记") | 334 | @ApiModelProperty(value = "处理标记") |
| 335 | + @TableLogic | ||
| 338 | private String processStamp; | 336 | private String processStamp; |
| 339 | 337 | ||
| 340 | /** | 338 | /** |
| @@ -344,97 +342,4 @@ public class ReceiptDetail implements Serializable { | @@ -344,97 +342,4 @@ public class ReceiptDetail implements Serializable { | ||
| 344 | @ApiModelProperty(value = "是否删除") | 342 | @ApiModelProperty(value = "是否删除") |
| 345 | private Boolean deleted; | 343 | private Boolean deleted; |
| 346 | 344 | ||
| 347 | - private static final long serialVersionUID = 1L; | ||
| 348 | - | ||
| 349 | - public static final String COL_RECEIPTID = "receiptId"; | ||
| 350 | - | ||
| 351 | - public static final String COL_RECEIPTCODE = "receiptCode"; | ||
| 352 | - | ||
| 353 | - public static final String COL_WAREHOUSECODE = "warehouseCode"; | ||
| 354 | - | ||
| 355 | - public static final String COL_COMPANYCODE = "companyCode"; | ||
| 356 | - | ||
| 357 | - public static final String COL_MATERIALCODE = "materialCode"; | ||
| 358 | - | ||
| 359 | - public static final String COL_MATERIALNAME = "materialName"; | ||
| 360 | - | ||
| 361 | - public static final String COL_MATERIALSPEC = "materialSpec"; | ||
| 362 | - | ||
| 363 | - public static final String COL_MATERIALUNIT = "materialUnit"; | ||
| 364 | - | ||
| 365 | - public static final String COL_SUPPLIERCODE = "supplierCode"; | ||
| 366 | - | ||
| 367 | - public static final String COL_BATCH = "batch"; | ||
| 368 | - | ||
| 369 | - public static final String COL_LOT = "lot"; | ||
| 370 | - | ||
| 371 | - public static final String COL_QCCHECK = "qcCheck"; | ||
| 372 | - | ||
| 373 | - public static final String COL_PROJECTNO = "projectNo"; | ||
| 374 | - | ||
| 375 | - public static final String COL_MANUFACTUREDATE = "manufactureDate"; | ||
| 376 | - | ||
| 377 | - public static final String COL_EXPIRATIONDATE = "expirationDate"; | ||
| 378 | - | ||
| 379 | - public static final String COL_AGINGDATE = "agingDate"; | ||
| 380 | - | ||
| 381 | - public static final String COL_ATTRIBUTETEMPLATECODE = "attributeTemplateCode"; | ||
| 382 | - | ||
| 383 | - public static final String COL_ATTRIBUTE1 = "attribute1"; | ||
| 384 | - | ||
| 385 | - public static final String COL_ATTRIBUTE2 = "attribute2"; | ||
| 386 | - | ||
| 387 | - public static final String COL_ATTRIBUTE3 = "attribute3"; | ||
| 388 | - | ||
| 389 | - public static final String COL_ATTRIBUTE4 = "attribute4"; | ||
| 390 | - | ||
| 391 | - public static final String COL_TOTALQTY = "totalQty"; | ||
| 392 | - | ||
| 393 | - public static final String COL_OPENQTY = "openQty"; | ||
| 394 | - | ||
| 395 | - public static final String COL_REFERCODE = "referCode"; | ||
| 396 | - | ||
| 397 | - public static final String COL_REFERID = "referId"; | ||
| 398 | - | ||
| 399 | - public static final String COL_REFERLINENUM = "referLineNum"; | ||
| 400 | - | ||
| 401 | - public static final String COL_LOCATINGRULE = "locatingRule"; | ||
| 402 | - | ||
| 403 | - public static final String COL_INVENTORYSTS = "inventorySts"; | ||
| 404 | - | ||
| 405 | - public static final String COL_ITEMLISTPRICE = "itemListPrice"; | ||
| 406 | - | ||
| 407 | - public static final String COL_ITEMNETPRICE = "itemNetPrice"; | ||
| 408 | - | ||
| 409 | - public static final String COL_ISVIRTUALBOM = "isVirtualBom"; | ||
| 410 | - | ||
| 411 | - public static final String COL_CREATED = "created"; | ||
| 412 | - | ||
| 413 | - public static final String COL_CREATEDBY = "createdBy"; | ||
| 414 | - | ||
| 415 | - public static final String COL_LASTUPDATED = "lastUpdated"; | ||
| 416 | - | ||
| 417 | - public static final String COL_LASTUPDATEDBY = "lastUpdatedBy"; | ||
| 418 | - | ||
| 419 | - public static final String COL_VERSION = "version"; | ||
| 420 | - | ||
| 421 | - public static final String COL_USERDEF1 = "userDef1"; | ||
| 422 | - | ||
| 423 | - public static final String COL_USERDEF2 = "userDef2"; | ||
| 424 | - | ||
| 425 | - public static final String COL_USERDEF3 = "userDef3"; | ||
| 426 | - | ||
| 427 | - public static final String COL_USERDEF4 = "userDef4"; | ||
| 428 | - | ||
| 429 | - public static final String COL_USERDEF5 = "userDef5"; | ||
| 430 | - | ||
| 431 | - public static final String COL_USERDEF6 = "userDef6"; | ||
| 432 | - | ||
| 433 | - public static final String COL_USERDEF7 = "userDef7"; | ||
| 434 | - | ||
| 435 | - public static final String COL_USERDEF8 = "userDef8"; | ||
| 436 | - | ||
| 437 | - public static final String COL_PROCESSSTAMP = "processStamp"; | ||
| 438 | - | ||
| 439 | - public static final String COL_DELETED = "deleted"; | ||
| 440 | } | 345 | } |
| 441 | \ No newline at end of file | 346 | \ No newline at end of file |
src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java
| @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; | @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; | ||
| 4 | import com.baomidou.mybatisplus.core.metadata.IPage; | 4 | import com.baomidou.mybatisplus.core.metadata.IPage; |
| 5 | import com.baomidou.mybatisplus.core.toolkit.Wrappers; | 5 | import com.baomidou.mybatisplus.core.toolkit.Wrappers; |
| 6 | import com.baomidou.mybatisplus.extension.plugins.pagination.Page; | 6 | import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
| 7 | +import com.huaheng.common.support.Convert; | ||
| 7 | import com.huaheng.common.utils.StringUtils; | 8 | import com.huaheng.common.utils.StringUtils; |
| 8 | import com.huaheng.common.utils.security.ShiroUtils; | 9 | import com.huaheng.common.utils.security.ShiroUtils; |
| 9 | import com.huaheng.framework.aspectj.lang.annotation.Log; | 10 | import com.huaheng.framework.aspectj.lang.annotation.Log; |
| @@ -15,6 +16,8 @@ import com.huaheng.framework.web.page.TableDataInfo; | @@ -15,6 +16,8 @@ import com.huaheng.framework.web.page.TableDataInfo; | ||
| 15 | import com.huaheng.framework.web.page.TableSupport; | 16 | import com.huaheng.framework.web.page.TableSupport; |
| 16 | import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader; | 17 | import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader; |
| 17 | import com.huaheng.pc.receipt.receiptHeader.service.ReceiptHeaderService; | 18 | import com.huaheng.pc.receipt.receiptHeader.service.ReceiptHeaderService; |
| 19 | +import com.huaheng.pc.receipt.receiptHeaderHistory.domain.ReceiptHeaderHistory; | ||
| 20 | +import com.huaheng.pc.receipt.receiptHeaderHistory.service.ReceiptHeaderHistoryService; | ||
| 18 | import io.swagger.annotations.Api; | 21 | import io.swagger.annotations.Api; |
| 19 | import io.swagger.annotations.ApiModel; | 22 | import io.swagger.annotations.ApiModel; |
| 20 | import io.swagger.annotations.ApiOperation; | 23 | import io.swagger.annotations.ApiOperation; |
| @@ -25,6 +28,7 @@ import org.springframework.ui.ModelMap; | @@ -25,6 +28,7 @@ import org.springframework.ui.ModelMap; | ||
| 25 | import org.springframework.web.bind.annotation.*; | 28 | import org.springframework.web.bind.annotation.*; |
| 26 | 29 | ||
| 27 | import javax.annotation.Resource; | 30 | import javax.annotation.Resource; |
| 31 | +import java.util.ArrayList; | ||
| 28 | import java.util.List; | 32 | import java.util.List; |
| 29 | 33 | ||
| 30 | @Api(tags = "入库单") | 34 | @Api(tags = "入库单") |
| @@ -36,6 +40,8 @@ public class ReceiptHeaderController extends BaseController { | @@ -36,6 +40,8 @@ public class ReceiptHeaderController extends BaseController { | ||
| 36 | 40 | ||
| 37 | @Resource | 41 | @Resource |
| 38 | private ReceiptHeaderService receiptHeaderService; | 42 | private ReceiptHeaderService receiptHeaderService; |
| 43 | + @Resource | ||
| 44 | + private ReceiptHeaderHistoryService receiptHeaderHistoryService; | ||
| 39 | 45 | ||
| 40 | @RequiresPermissions("receipt:receiptHeader:view") | 46 | @RequiresPermissions("receipt:receiptHeader:view") |
| 41 | @GetMapping() | 47 | @GetMapping() |
| @@ -163,4 +169,19 @@ public class ReceiptHeaderController extends BaseController { | @@ -163,4 +169,19 @@ public class ReceiptHeaderController extends BaseController { | ||
| 163 | receiptHeader.setLastStatus(5); | 169 | receiptHeader.setLastStatus(5); |
| 164 | return toAjax(receiptHeaderService.updateById(receiptHeader)); | 170 | return toAjax(receiptHeaderService.updateById(receiptHeader)); |
| 165 | } | 171 | } |
| 172 | + | ||
| 173 | + /** | ||
| 174 | + * 删除入库单 | ||
| 175 | + */ | ||
| 176 | + @ApiOperation(value="提交审核入库单", notes="提交审核入库单", httpMethod = "POST") | ||
| 177 | + @RequiresPermissions("receipt:receiptHeader:remove") | ||
| 178 | + @Log(title = "入库-入库单 ",operating = "提交审核入库单 ", action = BusinessType.UPDATE) | ||
| 179 | + @PostMapping("/remove") | ||
| 180 | + @ResponseBody | ||
| 181 | + public AjaxResult remove(@ApiParam(name = "id", value = "入库头表id字符串")Integer id){ | ||
| 182 | + if (StringUtils.isNotNull(id)){ | ||
| 183 | + return AjaxResult.error("id为空"); | ||
| 184 | + } | ||
| 185 | + return receiptHeaderHistoryService.add(id); | ||
| 186 | + } | ||
| 166 | } | 187 | } |
src/main/resources/templates/config/materialType/add.html
0 → 100644
| 1 | +<!DOCTYPE HTML> | ||
| 2 | +<html lang="zh" xmlns:th="http://www.thymeleaf.org"> | ||
| 3 | +<meta charset="utf-8"> | ||
| 4 | +<head th:include="include :: header"></head> | ||
| 5 | +<body class="white-bg"> | ||
| 6 | +<div class="wrapper wrapper-content animated fadeInRight ibox-content"> | ||
| 7 | + <form class="form-horizontal m" id="form-materialType-add"> | ||
| 8 | + <div class="form-group"> | ||
| 9 | + <label class="col-sm-3 control-label">编码：</label> | ||
| 10 | + <div class="col-sm-8"> | ||
| 11 | + <input id="code" name="code" class="form-control" type="text"> | ||
| 12 | + </div> | ||
| 13 | + </div> | ||
| 14 | + <div class="form-group"> | ||
| 15 | + <label class="col-sm-3 control-label">名字：</label> | ||
| 16 | + <div class="col-sm-8"> | ||
| 17 | + <input id="name" name="name" class="form-control" type="text"> | ||
| 18 | + </div> | ||
| 19 | + </div> | ||
| 20 | + <div class="form-group"> | ||
| 21 | + <label class="col-sm-3 control-label">货主编码：</label> | ||
| 22 | + <div class="col-sm-8"> | ||
| 23 | + <select id="companyCode" name="companyCode" class="form-control" th:with="companyList=${@companyService.selectCompanyByCurrentUserId()}"> | ||
| 24 | + <option th:each="company : ${companyList}" th:text="${company['name']}" th:value="${company['code']}"></option> | ||
| 25 | + </select> | ||
| 26 | + </div> | ||
| 27 | + </div> | ||
| 28 | + <div class="form-group"> | ||
| 29 | + <label class="col-sm-3 control-label">ABC分类：</label> | ||
| 30 | + <div class="col-sm-8"> | ||
| 31 | + <input id="abcClass" name="abcClass" class="form-control" type="text"> | ||
| 32 | + </div> | ||
| 33 | + </div> | ||
| 34 | + <div class="form-group"> | ||
| 35 | + <label class="col-sm-3 control-label">保质期（天）：</label> | ||
| 36 | + <div class="col-sm-8"> | ||
| 37 | + <input id="daysToExpire" name="daysToExpire" class="form-control" type="number"> | ||
| 38 | + </div> | ||
| 39 | + </div> | ||
| 40 | + <div class="form-group"> | ||
| 41 | + <label class="col-sm-3 control-label">入库流程：</label> | ||
| 42 | + <div class="col-sm-8"> | ||
| 43 | + <select id="receivingFlow" name="receivingFlow" class="form-control" th:with="list=${@StatusFlow.flowList()}"> | ||
| 44 | + <option value="">请选择</option> | ||
| 45 | + <option th:each="flow : ${list}" th:text="${flow['name']}" th:value="${flow['code']}"></option> | ||
| 46 | + </select> | ||
| 47 | + </div> | ||
| 48 | + </div> | ||
| 49 | + <div class="form-group"> | ||
| 50 | + <label class="col-sm-3 control-label">出库流程：</label> | ||
| 51 | + <div class="col-sm-8"> | ||
| 52 | + <select id="shippingFlow" name="shippingFlow" class="form-control" th:with="list=${@StatusFlow.flowList()}"> | ||
| 53 | + <option value="">请选择</option> | ||
| 54 | + <option th:each="flow : ${list}" th:text="${flow['name']}" th:value="${flow['code']}"></option> | ||
| 55 | + </select> | ||
| 56 | + </div> | ||
| 57 | + </div> | ||
| 58 | + <div class="form-group"> | ||
| 59 | + <label class="col-sm-3 control-label">定位规则：</label> | ||
| 60 | + <div class="col-sm-8"> | ||
| 61 | + <input id="locatingRule" name="locatingRule" class="form-control" type="text"> | ||
| 62 | + </div> | ||
| 63 | + </div> | ||
| 64 | + <div class="form-group"> | ||
| 65 | + <label class="col-sm-3 control-label">分配规则：</label> | ||
| 66 | + <div class="col-sm-8"> | ||
| 67 | + <input id="allocationRule" name="allocationRule" class="form-control" type="text"> | ||
| 68 | + </div> | ||
| 69 | + </div> | ||
| 70 | + <div class="form-group"> | ||
| 71 | + <label class="col-sm-3 control-label">补货规则：</label> | ||
| 72 | + <div class="col-sm-8"> | ||
| 73 | + <input id="replenishmentRule" name="replenishmentRule" class="form-control" type="text"> | ||
| 74 | + </div> | ||
| 75 | + </div> | ||
| 76 | + <div class="form-group"> | ||
| 77 | + <label class="col-sm-3 control-label">空货位规则：</label> | ||
| 78 | + <div class="col-sm-8"> | ||
| 79 | + <input id="emptyLocRule" name="emptyLocRule" class="form-control" type="text"> | ||
| 80 | + </div> | ||
| 81 | + </div> | ||
| 82 | + <div class="form-group"> | ||
| 83 | + <label class="col-sm-3 control-label">拣货规则：</label> | ||
| 84 | + <div class="col-sm-8"> | ||
| 85 | + <input id="pickingRule" name="pickingRule" class="form-control" type="text"> | ||
| 86 | + </div> | ||
| 87 | + </div> | ||
| 88 | + <div class="form-group"> | ||
| 89 | + <label class="col-sm-3 control-label">属性模版：</label> | ||
| 90 | + <div class="col-sm-8"> | ||
| 91 | + <input id="attributeTemplateCode" name="attributeTemplateCode" class="form-control" type="text"> | ||
| 92 | + </div> | ||
| 93 | + </div> | ||
| 94 | + <div class="form-group"> | ||
| 95 | + <label class="col-sm-3 control-label">记录序列号：</label> | ||
| 96 | + <div class="col-sm-8"> | ||
| 97 | + <input id="trackSerialNum" name="trackSerialNum" class="form-control" type="text"> | ||
| 98 | + </div> | ||
| 99 | + </div> | ||
| 100 | + <div class="form-group"> | ||
| 101 | + <label class="col-sm-3 control-label">自动生成序列号：</label> | ||
| 102 | + <div class="col-sm-8"> | ||
| 103 | + <input id="autoGenSerialNum" name="autoGenSerialNum" class="form-control" type="text"> | ||
| 104 | + </div> | ||
| 105 | + </div> | ||
| 106 | + <div class="form-group"> | ||
| 107 | + <label class="col-sm-3 control-label">自动生成序列号表达式：</label> | ||
| 108 | + <div class="col-sm-8"> | ||
| 109 | + <input id="autoGenSerialNumFormat" name="autoGenSerialNumFormat" class="form-control" type="text"> | ||
| 110 | + </div> | ||
| 111 | + </div> | ||
| 112 | + <div class="form-group"> | ||
| 113 | + <label class="col-sm-3 control-label">序列号模版：</label> | ||
| 114 | + <div class="col-sm-8"> | ||
| 115 | + <input id="snTemplateCode" name="snTemplateCode" class="form-control" type="text"> | ||
| 116 | + </div> | ||
| 117 | + </div> | ||
| 118 | + <div class="form-group"> | ||
| 119 | + <label class="col-sm-3 control-label">临期预警天数：</label> | ||
| 120 | + <div class="col-sm-8"> | ||
| 121 | + <input id="expiringDays" name="expiringDays" class="form-control" type="number"> | ||
| 122 | + </div> | ||
| 123 | + </div> | ||
| 124 | + <div class="form-group"> | ||
| 125 | + <label class="col-sm-3 control-label">收货预警天数：</label> | ||
| 126 | + <div class="col-sm-8"> | ||
| 127 | + <input id="minShelfLifeDays" name="minShelfLifeDays" class="form-control" type="number"> | ||
| 128 | + </div> | ||
| 129 | + </div> | ||
| 130 | + <div class="form-group"> | ||
| 131 | + <label class="col-sm-3 control-label">是否AGV区域发货：</label> | ||
| 132 | + <div class="col-sm-8"> | ||
| 133 | + <input id="userDef1" name="userDef1" class="form-control" type="text"> | ||
| 134 | + </div> | ||
| 135 | + </div> | ||
| 136 | + <div class="form-group"> | ||
| 137 | + <label class="col-sm-3 control-label">是否有效：</label> | ||
| 138 | + <div class="col-sm-8"> | ||
| 139 | + <!--<input id="enable" name="enable" class="form-control" type="text">--> | ||
| 140 | + <select id="enable" name="enable" class="form-control"> | ||
| 141 | + <option value="1">正常</option> | ||
| 142 | + <option value="0">禁用</option> | ||
| 143 | + </select> | ||
| 144 | + </div> | ||
| 145 | + </div> | ||
| 146 | + <div class="form-group"> | ||
| 147 | + <div class="form-control-static col-sm-offset-9"> | ||
| 148 | + <button type="submit" class="btn btn-primary">提交</button> | ||
| 149 | + <button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button> | ||
| 150 | + </div> | ||
| 151 | + </div> | ||
| 152 | + </form> | ||
| 153 | +</div> | ||
| 154 | +<div th:include="include::footer"></div> | ||
| 155 | +<script type="text/javascript"> | ||
| 156 | + var prefix = ctx + "config/materialUnit"; | ||
| 157 | + $("#form-materialType-add").validate({ | ||
| 158 | + rules:{ | ||
| 159 | + materialCode:{ | ||
| 160 | + required:true, | ||
| 161 | + }, | ||
| 162 | + }, | ||
| 163 | + submitHandler: function(form) { | ||
| 164 | + // $.operate.save(prefix + "/add", $('#form-locationType-add').serialize()); | ||
| 165 | + var tableValue = $.common.getTableValue("#form-materialType-add"); | ||
| 166 | + tableValue = formValueReplace(tableValue, "enable", $("#enable option:selected").val()); | ||
| 167 | + tableValue = formValueReplace(tableValue, "companyCode", $("#companyCode option:selected").val()); | ||
| 168 | + tableValue = formValueReplace(tableValue, "receivingFlow", $("#receivingFlow option:selected").val()); | ||
| 169 | + tableValue = formValueReplace(tableValue, "shippingFlow", $("#shippingFlow option:selected").val()); | ||
| 170 | + $.operate.save(prefix + "/add", tableValue); | ||
| 171 | + } | ||
| 172 | + }); | ||
| 173 | +</script> | ||
| 174 | +</body> | ||
| 175 | +</html> |
src/main/resources/templates/config/materialType/edit.html
0 → 100644
| 1 | +<!DOCTYPE HTML> | ||
| 2 | +<html lang="zh" xmlns:th="http://www.thymeleaf.org"> | ||
| 3 | +<meta charset="utf-8"> | ||
| 4 | +<head th:include="include :: header"></head> | ||
| 5 | +<body class="white-bg"> | ||
| 6 | +<div class="wrapper wrapper-content animated fadeInRight ibox-content"> | ||
| 7 | + <form class="form-horizontal m" id="form-materialType-edit" th:object="${materialType}"> | ||
| 8 | + <input name="id" th:field="*{id}" type="hidden"> | ||
| 9 | + <div class="form-group"> | ||
| 10 | + <label class="col-sm-3 control-label">编码：</label> | ||
| 11 | + <div class="col-sm-8"> | ||
| 12 | + <input id="code" name="code" class="form-control" type="text" th:field="*{code}"> | ||
| 13 | + </div> | ||
| 14 | + </div> | ||
| 15 | + <div class="form-group"> | ||
| 16 | + <label class="col-sm-3 control-label">名字：</label> | ||
| 17 | + <div class="col-sm-8"> | ||
| 18 | + <input id="name" name="name" class="form-control" type="text" th:field="*{name}"> | ||
| 19 | + </div> | ||
| 20 | + </div> | ||
| 21 | + <div class="form-group"> | ||
| 22 | + <label class="col-sm-3 control-label">货主编码：</label> | ||
| 23 | + <div class="col-sm-8"> | ||
| 24 | + <select id="companyCode" name="companyCode" class="form-control" th:field="*{companyCode}" | ||
| 25 | + th:with="companyList=${@companyService.selectCompanyByCurrentUserId()}"> | ||
| 26 | + | ||
| 27 | + <option th:each="company : ${companyList}" th:text="${company['name']}" th:value="${company['code']}"></option> | ||
| 28 | + </select> | ||
| 29 | + </div> | ||
| 30 | + </div> | ||
| 31 | + <div class="form-group"> | ||
| 32 | + <label class="col-sm-3 control-label">ABC分类：</label> | ||
| 33 | + <div class="col-sm-8"> | ||
| 34 | + <input id="abcClass" name="abcClass" class="form-control" type="text" th:field="*{abcClass}"> | ||
| 35 | + </div> | ||
| 36 | + </div> | ||
| 37 | + <div class="form-group"> | ||
| 38 | + <label class="col-sm-3 control-label">保质期（天）：</label> | ||
| 39 | + <div class="col-sm-8"> | ||
| 40 | + <input id="daysToExpire" name="daysToExpire" class="form-control" type="number" th:field="*{daysToExpire}"> | ||
| 41 | + </div> | ||
| 42 | + </div> | ||
| 43 | + <div class="form-group"> | ||
| 44 | + <label class="col-sm-3 control-label">入库流程：</label> | ||
| 45 | + <div class="col-sm-8"> | ||
| 46 | + <select id="receivingFlow" name="receivingFlow" class="form-control" th:with="list=${@StatusFlow.flowList()}" th:field="*{receivingFlow}"> | ||
| 47 | + <option value="">请选择</option> | ||
| 48 | + <option th:each="flow : ${list}" th:text="${flow['name']}" th:value="${flow['code']}"></option> | ||
| 49 | + </select> | ||
| 50 | + </div> | ||
| 51 | + </div> | ||
| 52 | + <div class="form-group"> | ||
| 53 | + <label class="col-sm-3 control-label">出库流程：</label> | ||
| 54 | + <div class="col-sm-8"> | ||
| 55 | + <select id="shippingFlow" name="shippingFlow" class="form-control" th:with="list=${@StatusFlow.flowList()}" th:field="*{shippingFlow}"> | ||
| 56 | + <option value="">请选择</option> | ||
| 57 | + <option th:each="flow : ${list}" th:text="${flow['name']}" th:value="${flow['code']}"></option> | ||
| 58 | + </select> | ||
| 59 | + </div> | ||
| 60 | + </div> | ||
| 61 | + <div class="form-group"> | ||
| 62 | + <label class="col-sm-3 control-label">定位规则：</label> | ||
| 63 | + <div class="col-sm-8"> | ||
| 64 | + <input id="locatingRule" name="locatingRule" class="form-control" type="text" th:field="*{locatingRule}"> | ||
| 65 | + </div> | ||
| 66 | + </div> | ||
| 67 | + <div class="form-group"> | ||
| 68 | + <label class="col-sm-3 control-label">分配规则：</label> | ||
| 69 | + <div class="col-sm-8"> | ||
| 70 | + <input id="allocationRule" name="allocationRule" class="form-control" type="text" th:field="*{allocationRule}"> | ||
| 71 | + </div> | ||
| 72 | + </div> | ||
| 73 | + <div class="form-group"> | ||
| 74 | + <label class="col-sm-3 control-label">补货规则：</label> | ||
| 75 | + <div class="col-sm-8"> | ||
| 76 | + <input id="replenishmentRule" name="replenishmentRule" class="form-control" type="text" th:field="*{replenishmentRule}"> | ||
| 77 | + </div> | ||
| 78 | + </div> | ||
| 79 | + <div class="form-group"> | ||
| 80 | + <label class="col-sm-3 control-label">空货位规则：</label> | ||
| 81 | + <div class="col-sm-8"> | ||
| 82 | + <input id="emptyLocRule" name="emptyLocRule" class="form-control" type="text" th:field="*{emptyLocRule}"> | ||
| 83 | + </div> | ||
| 84 | + </div> | ||
| 85 | + <div class="form-group"> | ||
| 86 | + <label class="col-sm-3 control-label">拣货规则：</label> | ||
| 87 | + <div class="col-sm-8"> | ||
| 88 | + <input id="pickingRule" name="pickingRule" class="form-control" type="text" th:field="*{pickingRule}"> | ||
| 89 | + </div> | ||
| 90 | + </div> | ||
| 91 | + <div class="form-group"> | ||
| 92 | + <label class="col-sm-3 control-label">属性模版：</label> | ||
| 93 | + <div class="col-sm-8"> | ||
| 94 | + <input id="attributeTemplateCode" name="attributeTemplateCode" class="form-control" type="text" th:field="*{attributeTemplateCode}"> | ||
| 95 | + </div> | ||
| 96 | + </div> | ||
| 97 | + <div class="form-group"> | ||
| 98 | + <label class="col-sm-3 control-label">记录序列号：</label> | ||
| 99 | + <div class="col-sm-8"> | ||
| 100 | + <input id="trackSerialNum" name="trackSerialNum" class="form-control" type="text" th:field="*{trackSerialNum}"> | ||
| 101 | + </div> | ||
| 102 | + </div> | ||
| 103 | + <div class="form-group"> | ||
| 104 | + <label class="col-sm-3 control-label">自动生成序列号：</label> | ||
| 105 | + <div class="col-sm-8"> | ||
| 106 | + <input id="autoGenSerialNum" name="autoGenSerialNum" class="form-control" type="text" th:field="*{autoGenSerialNum}"> | ||
| 107 | + </div> | ||
| 108 | + </div> | ||
| 109 | + <div class="form-group"> | ||
| 110 | + <label class="col-sm-3 control-label">自动生成序列号表达式：</label> | ||
| 111 | + <div class="col-sm-8"> | ||
| 112 | + <input id="autoGenSerialNumFormat" name="autoGenSerialNumFormat" class="form-control" type="text" th:field="*{autoGenSerialNumFormat}"> | ||
| 113 | + </div> | ||
| 114 | + </div> | ||
| 115 | + <div class="form-group"> | ||
| 116 | + <label class="col-sm-3 control-label">序列号模版：</label> | ||
| 117 | + <div class="col-sm-8"> | ||
| 118 | + <input id="snTemplateCode" name="snTemplateCode" class="form-control" type="text" th:field="*{snTemplateCode}"> | ||
| 119 | + </div> | ||
| 120 | + </div> | ||
| 121 | + <div class="form-group"> | ||
| 122 | + <label class="col-sm-3 control-label">临期预警天数：</label> | ||
| 123 | + <div class="col-sm-8"> | ||
| 124 | + <input id="expiringDays" name="expiringDays" class="form-control" type="number" th:field="*{expiringDays}"> | ||
| 125 | + </div> | ||
| 126 | + </div> | ||
| 127 | + <div class="form-group"> | ||
| 128 | + <label class="col-sm-3 control-label">收货预警天数：</label> | ||
| 129 | + <div class="col-sm-8"> | ||
| 130 | + <input id="minShelfLifeDays" name="minShelfLifeDays" class="form-control" type="number" th:field="*{minShelfLifeDays}"> | ||
| 131 | + </div> | ||
| 132 | + </div> | ||
| 133 | + <div class="form-group"> | ||
| 134 | + <label class="col-sm-3 control-label">是否AGV区域发货：</label> | ||
| 135 | + <div class="col-sm-8"> | ||
| 136 | + <input id="userDef1" name="userDef1" class="form-control" type="text" th:field="*{userDef1}"> | ||
| 137 | + </div> | ||
| 138 | + </div> | ||
| 139 | + <div class="form-group"> | ||
| 140 | + <label class="col-sm-3 control-label">是否有效：</label> | ||
| 141 | + <div class="col-sm-8"> | ||
| 142 | + <!--<input id="enable" name="enable" class="form-control" type="text">--> | ||
| 143 | + <select id="enable" name="enable" class="form-control" th:field="*{enable}"> | ||
| 144 | + <option value="1">正常</option> | ||
| 145 | + <option value="0">禁用</option> | ||
| 146 | + </select> | ||
| 147 | + </div> | ||
| 148 | + </div> | ||
| 149 | + <div class="form-group"> | ||
| 150 | + <div class="form-control-static col-sm-offset-9"> | ||
| 151 | + <button type="submit" class="btn btn-primary">提交</button> | ||
| 152 | + <button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button> | ||
| 153 | + </div> | ||
| 154 | + </div> | ||
| 155 | + </form> | ||
| 156 | +</div> | ||
| 157 | +<div th:include="include::footer"></div> | ||
| 158 | +<script type="text/javascript"> | ||
| 159 | + var prefix = ctx + "config/materialType"; | ||
| 160 | + $("#form-materialType-edit").validate({ | ||
| 161 | + rules:{ | ||
| 162 | + code:{ | ||
| 163 | + required:true, | ||
| 164 | + }, | ||
| 165 | + }, | ||
| 166 | + submitHandler: function(form) { | ||
| 167 | + // $.operate.save(prefix + "/add", $('#form-locationType-add').serialize()); | ||
| 168 | + var tableValue = $.common.getTableValue("#form-materialType-edit"); | ||
| 169 | + tableValue = formValueReplace(tableValue, "enable", $("#enable option:selected").val()); | ||
| 170 | + tableValue = formValueReplace(tableValue, "companyCode", $("#companyCode option:selected").val()); | ||
| 171 | + tableValue = formValueReplace(tableValue, "receivingFlow", $("#receivingFlow option:selected").val()); | ||
| 172 | + tableValue = formValueReplace(tableValue, "shippingFlow", $("#shippingFlow option:selected").val()); | ||
| 173 | + $.operate.save(prefix + "/edit", tableValue); | ||
| 174 | + } | ||
| 175 | + }); | ||
| 176 | +</script> | ||
| 177 | +</body> | ||
| 178 | +</html> |
src/main/resources/templates/config/materialType/materialType.html
0 → 100644
| 1 | +<!DOCTYPE HTML> | ||
| 2 | +<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro"> | ||
| 3 | +<meta charset="utf-8"> | ||
| 4 | +<head th:include="include :: header"></head> | ||
| 5 | +<body class="gray-bg"> | ||
| 6 | + <div class="container-div"> | ||
| 7 | + <div class="row"> | ||
| 8 | + <div class="col-sm-12 select-info"> | ||
| 9 | + <form id="locationType-form"> | ||
| 10 | + <div class="select-list"> | ||
| 11 | + <ul> | ||
| 12 | + <li> | ||
| 13 | + 编码：<input type="text" name="materialCode"/> | ||
| 14 | + </li> | ||
| 15 | + <li> | ||
| 16 | + 名称：<input type="text" name="materialName"/> | ||
| 17 | + </li> | ||
| 18 | + <li class="time"> | ||
| 19 | + <label>创建时间： </label> | ||
| 20 | + <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="createdBegin"/> | ||
| 21 | + <span>-</span> | ||
| 22 | + <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="createdEnd"/> | ||
| 23 | + </li> | ||
| 24 | + <li> | ||
| 25 | + <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a> | ||
| 26 | + <!--<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="system:role:export"><i class="fa fa-download"></i> 导出</a>--> | ||
| 27 | + </li> | ||
| 28 | + </ul> | ||
| 29 | + </div> | ||
| 30 | + </form> | ||
| 31 | + </div> | ||
| 32 | + | ||
| 33 | + <div class="btn-group hidden-xs" id="toolbar" role="group"> | ||
| 34 | + <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="config:materialType:add"> | ||
| 35 | + <i class="fa fa-plus"></i> 新增 | ||
| 36 | + </a> | ||
| 37 | + <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()" shiro:hasPermission="config:materialType:remove"> | ||
| 38 | + <i class="fa fa-trash-o"></i> 删除 | ||
| 39 | + </a> | ||
| 40 | + </div> | ||
| 41 | + | ||
| 42 | + <div class="col-sm-12 select-info"> | ||
| 43 | + <table id="bootstrap-table" data-mobile-responsive="true" class="table table-bordered table-hover"></table> | ||
| 44 | + </div> | ||
| 45 | + </div> | ||
| 46 | + </div> | ||
| 47 | + <div th:include="include :: footer"></div> | ||
| 48 | + <script th:inline="javascript"> | ||
| 49 | + var editFlag = [[${@permission.hasPermi('config:materialType:edit')}]]; | ||
| 50 | + var removeFlag = [[${@permission.hasPermi('config:materialType:remove')}]]; | ||
| 51 | + var prefix = ctx + "config/materialType"; | ||
| 52 | + var datas = [[${@dict.getType('sys_normal_disable')}]]; | ||
| 53 | + $(function() { | ||
| 54 | + var options = { | ||
| 55 | + url: prefix + "/list", | ||
| 56 | + createUrl: prefix + "/add", | ||
| 57 | + updateUrl: prefix + "/edit/{id}", | ||
| 58 | + removeUrl: prefix + "/remove", | ||
| 59 | + modalName: "wu", | ||
| 60 | + search: false, | ||
| 61 | + columns: [{ | ||
| 62 | + checkbox: true | ||
| 63 | + }, | ||
| 64 | + { | ||
| 65 | + field : 'id', | ||
| 66 | + title : '编码' | ||
| 67 | + }, | ||
| 68 | + { | ||
| 69 | + field : 'code', | ||
| 70 | + title : '物料编码' | ||
| 71 | + }, | ||
| 72 | + { | ||
| 73 | + field : 'name', | ||
| 74 | + title : '物料名称' | ||
| 75 | + }, | ||
| 76 | + { | ||
| 77 | + field : 'companyCode', | ||
| 78 | + title : '货主编码' | ||
| 79 | + }, | ||
| 80 | + { | ||
| 81 | + field : 'warehouseCode', | ||
| 82 | + title : '仓库编码' | ||
| 83 | + }, | ||
| 84 | + { | ||
| 85 | + field : 'abcClass', | ||
| 86 | + title : 'ABC分类' | ||
| 87 | + }, | ||
| 88 | + { | ||
| 89 | + field : 'daysToExpire', | ||
| 90 | + title : '保质期(天)' | ||
| 91 | + }, | ||
| 92 | + { | ||
| 93 | + field : 'receivingFlow', | ||
| 94 | + title : '入库流程' | ||
| 95 | + }, | ||
| 96 | + { | ||
| 97 | + field : 'shippingFlow', | ||
| 98 | + title : '出库流程' | ||
| 99 | + }, | ||
| 100 | + { | ||
| 101 | + field : 'locatingRule', | ||
| 102 | + title : '定位规则' | ||
| 103 | + }, | ||
| 104 | + { | ||
| 105 | + field : 'allocationRule', | ||
| 106 | + title : '分配规则' | ||
| 107 | + }, | ||
| 108 | + { | ||
| 109 | + field : 'replenishmentRule', | ||
| 110 | + title : '补货规则' | ||
| 111 | + }, | ||
| 112 | + { | ||
| 113 | + field : 'emptyLocRule', | ||
| 114 | + title : '空货位规则' | ||
| 115 | + }, | ||
| 116 | + { | ||
| 117 | + field : 'pickingRule', | ||
| 118 | + title : '拣货规则' | ||
| 119 | + }, | ||
| 120 | + { | ||
| 121 | + field : 'attributeTemplateCode', | ||
| 122 | + title : '属性模版' | ||
| 123 | + }, | ||
| 124 | + { | ||
| 125 | + field : 'trackSerialNum', | ||
| 126 | + title : '记录序列号' | ||
| 127 | + }, | ||
| 128 | + { | ||
| 129 | + field : 'autoGenSerialNum', | ||
| 130 | + title : '自动生成序列号' | ||
| 131 | + }, | ||
| 132 | + { | ||
| 133 | + field : 'autoGenSerialNumFormat', | ||
| 134 | + title : '自动生成序列号表达式', | ||
| 135 | + visible : false | ||
| 136 | + }, | ||
| 137 | + { | ||
| 138 | + field : 'snTemplateCode', | ||
| 139 | + title : '序列号模版' | ||
| 140 | + }, | ||
| 141 | + { | ||
| 142 | + field : 'expiringDays', | ||
| 143 | + title : '临期预警天数' | ||
| 144 | + }, | ||
| 145 | + { | ||
| 146 | + field : 'minShelfLifeDays', | ||
| 147 | + title : '收货预警天数' | ||
| 148 | + }, | ||
| 149 | + { | ||
| 150 | + field : 'enable', | ||
| 151 | + title : '是否启用', | ||
| 152 | + formatter: function(value, row, index) { | ||
| 153 | + return $.table.selectDictLabel(datas, value); | ||
| 154 | + }, | ||
| 155 | + align: 'center', | ||
| 156 | + }, | ||
| 157 | + { | ||
| 158 | + field : 'created', | ||
| 159 | + title : '创建时间' | ||
| 160 | + }, | ||
| 161 | + { | ||
| 162 | + field : 'createdBy', | ||
| 163 | + title : '创建用户' | ||
| 164 | + }, | ||
| 165 | + { | ||
| 166 | + field : 'lastUpdated', | ||
| 167 | + title : '更新时间' | ||
| 168 | + }, | ||
| 169 | + { | ||
| 170 | + field : 'lastUpdatedBy', | ||
| 171 | + title : '更新用户' | ||
| 172 | + }, | ||
| 173 | + { | ||
| 174 | + field : 'enable', | ||
| 175 | + title : '是否有效', | ||
| 176 | + formatter: function(value, row, index) { | ||
| 177 | + return $.table.selectDictLabel(datas, value); | ||
| 178 | + }, | ||
| 179 | + align: 'center', | ||
| 180 | + }, | ||
| 181 | + { | ||
| 182 | + field : 'userDef1', | ||
| 183 | + title : '是否AGV区域发货' | ||
| 184 | + }, | ||
| 185 | + { | ||
| 186 | + field : 'userDef2', | ||
| 187 | + title : '自定义字段2' , | ||
| 188 | + visible:false | ||
| 189 | + }, | ||
| 190 | + { | ||
| 191 | + field : 'userDef3', | ||
| 192 | + title : '自定义字段3' , | ||
| 193 | + visible:false | ||
| 194 | + }, | ||
| 195 | + { | ||
| 196 | + field : 'userDef4', | ||
| 197 | + title : '自定义字段4' , | ||
| 198 | + visible:false | ||
| 199 | + }, | ||
| 200 | + { | ||
| 201 | + field : 'userDef5', | ||
| 202 | + title : '自定义字段5' , | ||
| 203 | + visible:false | ||
| 204 | + }, | ||
| 205 | + { | ||
| 206 | + title: '操作', | ||
| 207 | + align: 'center', | ||
| 208 | + formatter: function(value, row, index) { | ||
| 209 | + var actions = []; | ||
| 210 | + actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')" ><i class="fa fa-edit"></i>编辑</a> '); | ||
| 211 | + actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')" ><i class="fa fa-trash-o"></i>删除</a>'); | ||
| 212 | + return actions.join(''); | ||
| 213 | + } | ||
| 214 | + }] | ||
| 215 | + }; | ||
| 216 | + $.table.init(options); | ||
| 217 | + }); | ||
| 218 | + </script> | ||
| 219 | +</body> | ||
| 220 | + | ||
| 221 | +</html> | ||
| 0 | \ No newline at end of file | 222 | \ No newline at end of file |