Commit a6f995a4f1a188978b106488df86ada2aad84ab7
1 parent
e7b16291
任务-执行任务
Showing
5 changed files
with
202 additions
and
816 deletions
.idea/workspace.xml
| ... | ... | @@ -2,20 +2,11 @@ |
| 2 | 2 | <project version="4"> |
| 3 | 3 | <component name="ChangeListManager"> |
| 4 | 4 | <list default="true" id="29079676-ace5-434e-89a2-76a325e744a5" name="Default Changelist" comment=""> |
| 5 | - <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java" afterDir="false" /> | |
| 6 | - <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/mapper/CycleCountDetailMapper.java" afterDir="false" /> | |
| 7 | - <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/CycleCountDetailServiceImpl.java" afterDir="false" /> | |
| 8 | - <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/ICycleCountDetailService.java" afterDir="false" /> | |
| 9 | - <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/controller/CycleCountHeaderController.java" afterDir="false" /> | |
| 10 | - <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/mapper/CycleCountHeaderMapper.java" afterDir="false" /> | |
| 11 | - <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/service/CycleCountHeaderServiceImpl.java" afterDir="false" /> | |
| 12 | - <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/service/ICycleCountHeaderService.java" afterDir="false" /> | |
| 13 | - <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" /> | |
| 14 | 5 | <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> |
| 15 | - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/cyclecountAdjustDetail/cyclecountAdjustDetail.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/cyclecountAdjustDetail/cyclecountAdjustDetail.html" afterDir="false" /> | |
| 16 | - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/cyclecountDetail/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/cyclecountDetail/add.html" afterDir="false" /> | |
| 17 | - <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" /> | |
| 18 | - <change beforePath="$PROJECT_DIR$/src/test/java/com.huaheng.test/CreateCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com.huaheng.test/CreateCode.java" afterDir="false" /> | |
| 6 | + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java" afterDir="false" /> | |
| 7 | + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java" afterDir="false" /> | |
| 8 | + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java" afterDir="false" /> | |
| 9 | + <change beforePath="$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/taskHeader.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/taskHeader.html" afterDir="false" /> | |
| 19 | 10 | </list> |
| 20 | 11 | <ignored path="$PROJECT_DIR$/target/" /> |
| 21 | 12 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> |
| ... | ... | @@ -51,66 +42,59 @@ |
| 51 | 42 | <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" /> |
| 52 | 43 | <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" /> |
| 53 | 44 | </path> |
| 45 | + <path> | |
| 46 | + <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" /> | |
| 47 | + <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" /> | |
| 48 | + <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" /> | |
| 49 | + <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" /> | |
| 50 | + <item name="location: table" type="285a2a93:MysqlImplModel$Table" /> | |
| 51 | + </path> | |
| 54 | 52 | </expand> |
| 55 | 53 | <select /> |
| 56 | 54 | </component> |
| 57 | 55 | <component name="FileEditorManager"> |
| 58 | - <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> | |
| 59 | - <file pinned="false" current-in-tab="true"> | |
| 60 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/service/CycleCountHeaderServiceImpl.java"> | |
| 61 | - <provider selected="true" editor-type-id="text-editor"> | |
| 62 | - <state relative-caret-position="1340"> | |
| 63 | - <caret line="67" column="5" lean-forward="true" selection-start-line="67" selection-start-column="5" selection-end-line="67" selection-end-column="5" /> | |
| 64 | - <folding> | |
| 65 | - <element signature="e#0#16496#0" expanded="true" /> | |
| 66 | - </folding> | |
| 67 | - </state> | |
| 68 | - </provider> | |
| 56 | + <leaf> | |
| 57 | + <file pinned="false" current-in-tab="false"> | |
| 58 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/domain/TaskHeader.java"> | |
| 59 | + <provider selected="true" editor-type-id="text-editor" /> | |
| 69 | 60 | </entry> |
| 70 | 61 | </file> |
| 71 | 62 | <file pinned="false" current-in-tab="false"> |
| 72 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/controller/CycleCountHeaderController.java"> | |
| 63 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java"> | |
| 73 | 64 | <provider selected="true" editor-type-id="text-editor"> |
| 74 | - <state relative-caret-position="200"> | |
| 75 | - <caret line="10" selection-start-line="10" selection-end-line="10" /> | |
| 65 | + <state relative-caret-position="409"> | |
| 66 | + <caret line="103" column="57" lean-forward="true" selection-start-line="103" selection-start-column="57" selection-end-line="103" selection-end-column="57" /> | |
| 76 | 67 | </state> |
| 77 | 68 | </provider> |
| 78 | 69 | </entry> |
| 79 | 70 | </file> |
| 80 | 71 | <file pinned="false" current-in-tab="false"> |
| 81 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/service/ICycleCountHeaderService.java"> | |
| 82 | - <provider selected="true" editor-type-id="text-editor" /> | |
| 83 | - </entry> | |
| 84 | - </file> | |
| 85 | - <file pinned="false" current-in-tab="false"> | |
| 86 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/CycleCountDetailServiceImpl.java"> | |
| 72 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java"> | |
| 87 | 73 | <provider selected="true" editor-type-id="text-editor"> |
| 88 | - <state relative-caret-position="100"> | |
| 89 | - <caret line="31" column="40" lean-forward="true" selection-start-line="31" selection-start-column="40" selection-end-line="31" selection-end-column="40" /> | |
| 90 | - <folding> | |
| 91 | - <element signature="e#0#15820#0" expanded="true" /> | |
| 92 | - </folding> | |
| 74 | + <state relative-caret-position="152"> | |
| 75 | + <caret line="11" column="27" selection-start-line="11" selection-start-column="27" selection-end-line="11" selection-end-column="27" /> | |
| 93 | 76 | </state> |
| 94 | 77 | </provider> |
| 95 | 78 | </entry> |
| 96 | 79 | </file> |
| 97 | - <file pinned="false" current-in-tab="false"> | |
| 98 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java"> | |
| 80 | + <file pinned="false" current-in-tab="true"> | |
| 81 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java"> | |
| 99 | 82 | <provider selected="true" editor-type-id="text-editor"> |
| 100 | - <state relative-caret-position="-244"> | |
| 101 | - <caret line="13" column="49" selection-start-line="13" selection-start-column="49" selection-end-line="13" selection-end-column="49" /> | |
| 83 | + <state relative-caret-position="-173"> | |
| 84 | + <caret line="161" column="34" selection-start-line="161" selection-start-column="34" selection-end-line="161" selection-end-column="34" /> | |
| 102 | 85 | </state> |
| 103 | 86 | </provider> |
| 104 | 87 | </entry> |
| 105 | 88 | </file> |
| 106 | 89 | <file pinned="false" current-in-tab="false"> |
| 107 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/ICycleCountDetailService.java"> | |
| 108 | - <provider selected="true" editor-type-id="text-editor" /> | |
| 109 | - </entry> | |
| 110 | - </file> | |
| 111 | - <file pinned="false" current-in-tab="false"> | |
| 112 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/mapper/CycleCountDetailMapper.java"> | |
| 113 | - <provider selected="true" editor-type-id="text-editor" /> | |
| 90 | + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/taskHeader.html"> | |
| 91 | + <provider selected="true" editor-type-id="text-editor"> | |
| 92 | + <state relative-caret-position="-513"> | |
| 93 | + <folding> | |
| 94 | + <element signature="n#style#0;n#i#0;n#a#0;n#!!top" expanded="true" /> | |
| 95 | + </folding> | |
| 96 | + </state> | |
| 97 | + </provider> | |
| 114 | 98 | </entry> |
| 115 | 99 | </file> |
| 116 | 100 | </leaf> |
| ... | ... | @@ -118,18 +102,10 @@ |
| 118 | 102 | <component name="FileTemplateManagerImpl"> |
| 119 | 103 | <option name="RECENT_TEMPLATES"> |
| 120 | 104 | <list> |
| 121 | - <option value="FxmlFile" /> | |
| 122 | - <option value="Interface" /> | |
| 123 | - <option value="HTML File" /> | |
| 124 | 105 | <option value="Class" /> |
| 125 | 106 | </list> |
| 126 | 107 | </option> |
| 127 | 108 | </component> |
| 128 | - <component name="FindInProjectRecents"> | |
| 129 | - <findStrings> | |
| 130 | - <find>configuration</find> | |
| 131 | - </findStrings> | |
| 132 | - </component> | |
| 133 | 109 | <component name="Git.Settings"> |
| 134 | 110 | <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> |
| 135 | 111 | <option name="RECENT_BRANCH_BY_REPOSITORY"> |
| ... | ... | @@ -137,45 +113,6 @@ |
| 137 | 113 | <entry key="$PROJECT_DIR$" value="master" /> |
| 138 | 114 | </map> |
| 139 | 115 | </option> |
| 140 | - <option name="RESET_MODE" value="HARD" /> | |
| 141 | - </component> | |
| 142 | - <component name="IdeDocumentHistory"> | |
| 143 | - <option name="CHANGED_PATHS"> | |
| 144 | - <list> | |
| 145 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailService.java" /> | |
| 146 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java" /> | |
| 147 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java" /> | |
| 148 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java" /> | |
| 149 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/service/ShippingCombinationService.java" /> | |
| 150 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/mapper/ShippingCombinationMapper.java" /> | |
| 151 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/controller/WareHouseController.java" /> | |
| 152 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/controller/ShippingCombinationController.java" /> | |
| 153 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java" /> | |
| 154 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/domain/InventoryDetail.java" /> | |
| 155 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/monitor/logExecption/domain/LogExecption.java" /> | |
| 156 | - <option value="$PROJECT_DIR$/pom.xml" /> | |
| 157 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/IndexController.java" /> | |
| 158 | - <option value="$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryHeaderMapper.xml" /> | |
| 159 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/domain/InventoryHeader.java" /> | |
| 160 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java" /> | |
| 161 | - <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html" /> | |
| 162 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/HuaHengApplication.java" /> | |
| 163 | - <option value="$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/task.html" /> | |
| 164 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskDetail/controller/TaskDetailController.java" /> | |
| 165 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java" /> | |
| 166 | - <option value="$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/taskHeader.html" /> | |
| 167 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/controller/InventoryTransactionController.java" /> | |
| 168 | - <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html" /> | |
| 169 | - <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryTransaction/inventoryTransaction.html" /> | |
| 170 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cyclecountHeader/mapper/CyclecountHeaderMapperAuto.java" /> | |
| 171 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cyclecountDetail/mapper/CyclecountDetailMapper.java" /> | |
| 172 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/mapper/CyclecountDetailMapperAuto.java" /> | |
| 173 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java" /> | |
| 174 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/CycleCountDetailServiceImpl.java" /> | |
| 175 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/controller/CycleCountHeaderController.java" /> | |
| 176 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/service/CycleCountHeaderServiceImpl.java" /> | |
| 177 | - </list> | |
| 178 | - </option> | |
| 179 | 116 | </component> |
| 180 | 117 | <component name="IgnoredFileRootStore"> |
| 181 | 118 | <option name="generatedRoots"> |
| ... | ... | @@ -191,11 +128,21 @@ |
| 191 | 128 | </MavenImportingSettings> |
| 192 | 129 | </option> |
| 193 | 130 | </component> |
| 131 | + <component name="MavenProjectNavigator"> | |
| 132 | + <treeState> | |
| 133 | + <expand> | |
| 134 | + <path> | |
| 135 | + <item name="" type="16c1761:MavenProjectsStructure$RootNode" /> | |
| 136 | + <item name="huaheng" type="9519ce18:MavenProjectsStructure$ProjectNode" /> | |
| 137 | + </path> | |
| 138 | + </expand> | |
| 139 | + <select /> | |
| 140 | + </treeState> | |
| 141 | + </component> | |
| 194 | 142 | <component name="ProjectFrameBounds" extendedState="6"> |
| 195 | - <option name="x" value="-9" /> | |
| 196 | - <option name="y" value="-9" /> | |
| 197 | - <option name="width" value="1938" /> | |
| 198 | - <option name="height" value="1048" /> | |
| 143 | + <option name="x" value="470" /> | |
| 144 | + <option name="width" value="980" /> | |
| 145 | + <option name="height" value="1030" /> | |
| 199 | 146 | </component> |
| 200 | 147 | <component name="ProjectId" id="1P5Ngjh73HToCarlEZkqMxrL7pm" /> |
| 201 | 148 | <component name="ProjectLevelVcsManager"> |
| ... | ... | @@ -263,119 +210,6 @@ |
| 263 | 210 | <item name="wms2" type="462c0819:PsiDirectoryNode" /> |
| 264 | 211 | <item name="src" type="462c0819:PsiDirectoryNode" /> |
| 265 | 212 | <item name="main" type="462c0819:PsiDirectoryNode" /> |
| 266 | - <item name="java" type="462c0819:PsiDirectoryNode" /> | |
| 267 | - <item name="com" type="462c0819:PsiDirectoryNode" /> | |
| 268 | - <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
| 269 | - <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
| 270 | - <item name="inventory" type="462c0819:PsiDirectoryNode" /> | |
| 271 | - </path> | |
| 272 | - <path> | |
| 273 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 274 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 275 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 276 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | |
| 277 | - <item name="java" type="462c0819:PsiDirectoryNode" /> | |
| 278 | - <item name="com" type="462c0819:PsiDirectoryNode" /> | |
| 279 | - <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
| 280 | - <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
| 281 | - <item name="inventory" type="462c0819:PsiDirectoryNode" /> | |
| 282 | - <item name="cycleCountDetail" 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="java" type="462c0819:PsiDirectoryNode" /> | |
| 290 | - <item name="com" type="462c0819:PsiDirectoryNode" /> | |
| 291 | - <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
| 292 | - <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
| 293 | - <item name="inventory" type="462c0819:PsiDirectoryNode" /> | |
| 294 | - <item name="cycleCountDetail" type="462c0819:PsiDirectoryNode" /> | |
| 295 | - <item name="controller" type="462c0819:PsiDirectoryNode" /> | |
| 296 | - </path> | |
| 297 | - <path> | |
| 298 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 299 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 300 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 301 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | |
| 302 | - <item name="java" type="462c0819:PsiDirectoryNode" /> | |
| 303 | - <item name="com" type="462c0819:PsiDirectoryNode" /> | |
| 304 | - <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
| 305 | - <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
| 306 | - <item name="inventory" type="462c0819:PsiDirectoryNode" /> | |
| 307 | - <item name="cycleCountDetail" type="462c0819:PsiDirectoryNode" /> | |
| 308 | - <item name="domain" type="462c0819:PsiDirectoryNode" /> | |
| 309 | - </path> | |
| 310 | - <path> | |
| 311 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 312 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 313 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 314 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | |
| 315 | - <item name="java" type="462c0819:PsiDirectoryNode" /> | |
| 316 | - <item name="com" type="462c0819:PsiDirectoryNode" /> | |
| 317 | - <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
| 318 | - <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
| 319 | - <item name="inventory" type="462c0819:PsiDirectoryNode" /> | |
| 320 | - <item name="cycleCountDetail" type="462c0819:PsiDirectoryNode" /> | |
| 321 | - <item name="service" type="462c0819:PsiDirectoryNode" /> | |
| 322 | - </path> | |
| 323 | - <path> | |
| 324 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 325 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 326 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 327 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | |
| 328 | - <item name="java" type="462c0819:PsiDirectoryNode" /> | |
| 329 | - <item name="com" type="462c0819:PsiDirectoryNode" /> | |
| 330 | - <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
| 331 | - <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
| 332 | - <item name="inventory" type="462c0819:PsiDirectoryNode" /> | |
| 333 | - <item name="cycleCountHeader" type="462c0819:PsiDirectoryNode" /> | |
| 334 | - </path> | |
| 335 | - <path> | |
| 336 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 337 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 338 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 339 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | |
| 340 | - <item name="java" type="462c0819:PsiDirectoryNode" /> | |
| 341 | - <item name="com" type="462c0819:PsiDirectoryNode" /> | |
| 342 | - <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
| 343 | - <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
| 344 | - <item name="inventory" type="462c0819:PsiDirectoryNode" /> | |
| 345 | - <item name="cycleCountHeader" type="462c0819:PsiDirectoryNode" /> | |
| 346 | - <item name="controller" type="462c0819:PsiDirectoryNode" /> | |
| 347 | - </path> | |
| 348 | - <path> | |
| 349 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 350 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 351 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 352 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | |
| 353 | - <item name="java" type="462c0819:PsiDirectoryNode" /> | |
| 354 | - <item name="com" type="462c0819:PsiDirectoryNode" /> | |
| 355 | - <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
| 356 | - <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
| 357 | - <item name="inventory" type="462c0819:PsiDirectoryNode" /> | |
| 358 | - <item name="cycleCountHeader" type="462c0819:PsiDirectoryNode" /> | |
| 359 | - <item name="domain" type="462c0819:PsiDirectoryNode" /> | |
| 360 | - </path> | |
| 361 | - <path> | |
| 362 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 363 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 364 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 365 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | |
| 366 | - <item name="java" type="462c0819:PsiDirectoryNode" /> | |
| 367 | - <item name="com" type="462c0819:PsiDirectoryNode" /> | |
| 368 | - <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
| 369 | - <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
| 370 | - <item name="inventory" type="462c0819:PsiDirectoryNode" /> | |
| 371 | - <item name="cycleCountHeader" type="462c0819:PsiDirectoryNode" /> | |
| 372 | - <item name="service" type="462c0819:PsiDirectoryNode" /> | |
| 373 | - </path> | |
| 374 | - <path> | |
| 375 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 376 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 377 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 378 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | |
| 379 | 213 | <item name="resources" type="462c0819:PsiDirectoryNode" /> |
| 380 | 214 | </path> |
| 381 | 215 | <path> |
| ... | ... | @@ -393,7 +227,7 @@ |
| 393 | 227 | <item name="main" type="462c0819:PsiDirectoryNode" /> |
| 394 | 228 | <item name="resources" type="462c0819:PsiDirectoryNode" /> |
| 395 | 229 | <item name="templates" type="462c0819:PsiDirectoryNode" /> |
| 396 | - <item name="inventory" type="462c0819:PsiDirectoryNode" /> | |
| 230 | + <item name="task" type="462c0819:PsiDirectoryNode" /> | |
| 397 | 231 | </path> |
| 398 | 232 | <path> |
| 399 | 233 | <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> |
| ... | ... | @@ -402,28 +236,8 @@ |
| 402 | 236 | <item name="main" type="462c0819:PsiDirectoryNode" /> |
| 403 | 237 | <item name="resources" type="462c0819:PsiDirectoryNode" /> |
| 404 | 238 | <item name="templates" type="462c0819:PsiDirectoryNode" /> |
| 405 | - <item name="inventory" type="462c0819:PsiDirectoryNode" /> | |
| 406 | - <item name="cyclecountHeader" type="462c0819:PsiDirectoryNode" /> | |
| 407 | - </path> | |
| 408 | - <path> | |
| 409 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 410 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 411 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 412 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | |
| 413 | - <item name="resources" type="462c0819:PsiDirectoryNode" /> | |
| 414 | - <item name="templates" type="462c0819:PsiDirectoryNode" /> | |
| 415 | - <item name="inventory" type="462c0819:PsiDirectoryNode" /> | |
| 416 | - <item name="inventoryDetail" type="462c0819:PsiDirectoryNode" /> | |
| 417 | - </path> | |
| 418 | - <path> | |
| 419 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 420 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 421 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 422 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | |
| 423 | - <item name="resources" type="462c0819:PsiDirectoryNode" /> | |
| 424 | - <item name="templates" type="462c0819:PsiDirectoryNode" /> | |
| 425 | - <item name="inventory" type="462c0819:PsiDirectoryNode" /> | |
| 426 | - <item name="inventoryHeader" type="462c0819:PsiDirectoryNode" /> | |
| 239 | + <item name="task" type="462c0819:PsiDirectoryNode" /> | |
| 240 | + <item name="taskHeader" type="462c0819:PsiDirectoryNode" /> | |
| 427 | 241 | </path> |
| 428 | 242 | </expand> |
| 429 | 243 | <select /> |
| ... | ... | @@ -436,8 +250,6 @@ |
| 436 | 250 | <component name="PropertiesComponent"> |
| 437 | 251 | <property name="ASKED_ADD_EXTERNAL_FILES" value="true" /> |
| 438 | 252 | <property name="DatabaseDriversLRU" value="mysql" /> |
| 439 | - <property name="DefaultHtmlFileTemplate" value="HTML File" /> | |
| 440 | - <property name="ExpandSpringBootJavaOptionsPanel" value="true" /> | |
| 441 | 253 | <property name="RequestMappingsPanelOrder0" value="0" /> |
| 442 | 254 | <property name="RequestMappingsPanelOrder1" value="1" /> |
| 443 | 255 | <property name="RequestMappingsPanelWidth0" value="75" /> |
| ... | ... | @@ -445,43 +257,23 @@ |
| 445 | 257 | <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" /> |
| 446 | 258 | <property name="WebServerToolWindowFactoryState" value="false" /> |
| 447 | 259 | <property name="aspect.path.notification.shown" value="true" /> |
| 448 | - <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1566462677598" /> | |
| 449 | - <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory" /> | |
| 260 | + <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1566803879583" /> | |
| 261 | + <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/resources/mybatis" /> | |
| 450 | 262 | <property name="node.js.detected.package.eslint" value="true" /> |
| 451 | 263 | <property name="node.js.detected.package.tslint" value="true" /> |
| 452 | 264 | <property name="node.js.path.for.package.eslint" value="project" /> |
| 453 | 265 | <property name="node.js.path.for.package.tslint" value="project" /> |
| 454 | 266 | <property name="node.js.selected.package.eslint" value="(autodetect)" /> |
| 455 | 267 | <property name="node.js.selected.package.tslint" value="(autodetect)" /> |
| 456 | - <property name="nodejs_package_manager_path" value="npm" /> | |
| 457 | - <property name="project.structure.last.edited" value="Project" /> | |
| 458 | - <property name="project.structure.proportion" value="0.0" /> | |
| 459 | - <property name="project.structure.side.proportion" value="0.0" /> | |
| 460 | 268 | <property name="settings.editor.selected.configurable" value="preferences.pluginManager" /> |
| 461 | 269 | </component> |
| 462 | 270 | <component name="RecentsManager"> |
| 463 | - <key name="CopyFile.RECENT_KEYS"> | |
| 464 | - <recent name="C:\Project\wms2\src\main\java\com\huaheng\pc\inventory" /> | |
| 465 | - <recent name="F:\wms2\src\main\resources\templates\task\taskHeader" /> | |
| 466 | - <recent name="E:\code\wms2\src\main\resources\mybatis\config" /> | |
| 467 | - <recent name="E:\code\wms2\src\main\java\com\huaheng\pc\config" /> | |
| 468 | - <recent name="E:\code\wms2\src\main\resources\static\ajax\libs\layui\lay\modules" /> | |
| 469 | - </key> | |
| 470 | - <key name="CopyClassDialog.RECENTS_KEY"> | |
| 471 | - <recent name="com.huaheng.pc.task.taskDetail.controller" /> | |
| 472 | - </key> | |
| 473 | 271 | <key name="MoveFile.RECENT_KEYS"> |
| 474 | - <recent name="E:\code\wms2\src\main\resources\templates\general\carrier" /> | |
| 475 | 272 | <recent name="E:\code\wms2\src\main\resources\mybatis\general" /> |
| 476 | 273 | <recent name="E:\code\wms2\src\main\resources\mybatis\config" /> |
| 477 | 274 | </key> |
| 478 | 275 | </component> |
| 479 | 276 | <component name="RunDashboard"> |
| 480 | - <option name="configurationTypes"> | |
| 481 | - <set> | |
| 482 | - <option value="SpringBootApplicationConfigurationType" /> | |
| 483 | - </set> | |
| 484 | - </option> | |
| 485 | 277 | <option name="ruleStates"> |
| 486 | 278 | <list> |
| 487 | 279 | <RuleState> |
| ... | ... | @@ -492,14 +284,12 @@ |
| 492 | 284 | </RuleState> |
| 493 | 285 | </list> |
| 494 | 286 | </option> |
| 495 | - <option name="contentProportion" value="0.012987013" /> | |
| 496 | 287 | </component> |
| 497 | 288 | <component name="RunManager"> |
| 498 | 289 | <configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot"> |
| 499 | - <module name="wms2" /> | |
| 290 | + <module name="huaheng" /> | |
| 500 | 291 | <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" /> |
| 501 | - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" /> | |
| 502 | - <option name="ALTERNATIVE_JRE_PATH" value="C:\Program Files\Java\jdk1.8.0_202\jre" /> | |
| 292 | + <option name="ALTERNATIVE_JRE_PATH" /> | |
| 503 | 293 | <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" /> |
| 504 | 294 | <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" /> |
| 505 | 295 | <method v="2"> |
| ... | ... | @@ -518,12 +308,11 @@ |
| 518 | 308 | <component name="ServiceViewManager"> |
| 519 | 309 | <option name="allServicesViewState"> |
| 520 | 310 | <serviceView> |
| 521 | - <option name="contentProportion" value="0.18875067" /> | |
| 522 | 311 | <treeState> |
| 523 | 312 | <expand> |
| 524 | 313 | <path> |
| 525 | 314 | <item name="services root" type="e789fda9:ObjectUtils$Sentinel" /> |
| 526 | - <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@dbb4d4b" type="7427dc5b:ServiceModel$ServiceGroupNode" /> | |
| 315 | + <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@fe9f505" type="7427dc5b:ServiceModel$ServiceGroupNode" /> | |
| 527 | 316 | </path> |
| 528 | 317 | </expand> |
| 529 | 318 | <select /> |
| ... | ... | @@ -536,7 +325,7 @@ |
| 536 | 325 | </component> |
| 537 | 326 | <component name="TaskManager"> |
| 538 | 327 | <task active="true" id="Default" summary="Default task"> |
| 539 | - <changelist id="9ff7b25e-dc1a-4859-8a0c-00039489e359" name="Default Changelist" comment="" /> | |
| 328 | + <changelist id="29079676-ace5-434e-89a2-76a325e744a5" name="Default Changelist" comment="" /> | |
| 540 | 329 | <created>1565160110910</created> |
| 541 | 330 | <option name="number" value="Default" /> |
| 542 | 331 | <option name="presentableId" value="Default" /> |
| ... | ... | @@ -547,28 +336,7 @@ |
| 547 | 336 | <workItem from="1565259513116" duration="148000" /> |
| 548 | 337 | <workItem from="1565311988064" duration="7176000" /> |
| 549 | 338 | <workItem from="1565328536669" duration="797000" /> |
| 550 | - <workItem from="1565345715376" duration="452000" /> | |
| 551 | - <workItem from="1565570424829" duration="11663000" /> | |
| 552 | - <workItem from="1565587737758" duration="12961000" /> | |
| 553 | - <workItem from="1565657307503" duration="115000" /> | |
| 554 | - <workItem from="1565657439247" duration="2447000" /> | |
| 555 | - <workItem from="1565662229227" duration="20296000" /> | |
| 556 | - <workItem from="1565691345079" duration="6000" /> | |
| 557 | - <workItem from="1565743087352" duration="10121000" /> | |
| 558 | - <workItem from="1565760941070" duration="6738000" /> | |
| 559 | - <workItem from="1565768341327" duration="2970000" /> | |
| 560 | - <workItem from="1565771864886" duration="599000" /> | |
| 561 | - <workItem from="1565772469694" duration="23000" /> | |
| 562 | - <workItem from="1565772518459" duration="4348000" /> | |
| 563 | - <workItem from="1565829438280" duration="3502000" /> | |
| 564 | - <workItem from="1565832950552" duration="86000" /> | |
| 565 | - <workItem from="1565833039573" duration="288000" /> | |
| 566 | - <workItem from="1565833342181" duration="13946000" /> | |
| 567 | - <workItem from="1565936336169" duration="3845000" /> | |
| 568 | - <workItem from="1565941296716" duration="6217000" /> | |
| 569 | - <workItem from="1566175534262" duration="11146000" /> | |
| 570 | - <workItem from="1566433893313" duration="21834000" /> | |
| 571 | - <workItem from="1566463230092" duration="4987000" /> | |
| 339 | + <workItem from="1566803530593" duration="266000" /> | |
| 572 | 340 | </task> |
| 573 | 341 | <task id="LOCAL-00001" summary="添加库位、库位类型增删改查接口"> |
| 574 | 342 | <created>1565226427512</created> |
| ... | ... | @@ -591,144 +359,47 @@ |
| 591 | 359 | <option name="project" value="LOCAL" /> |
| 592 | 360 | <updated>1565259481656</updated> |
| 593 | 361 | </task> |
| 594 | - <task id="LOCAL-00004" summary="Merge branch 'develop' of http://172.16.29.40:8010/wms/wms2 into develop # Conflicts: #	.idea/workspace.xml"> | |
| 595 | - <created>1565342188814</created> | |
| 596 | - <option name="number" value="00004" /> | |
| 597 | - <option name="presentableId" value="LOCAL-00004" /> | |
| 598 | - <option name="project" value="LOCAL" /> | |
| 599 | - <updated>1565342188814</updated> | |
| 600 | - </task> | |
| 601 | - <task id="LOCAL-00005" summary="添加userWarehouse"> | |
| 602 | - <created>1565571202923</created> | |
| 603 | - <option name="number" value="00005" /> | |
| 604 | - <option name="presentableId" value="LOCAL-00005" /> | |
| 605 | - <option name="project" value="LOCAL" /> | |
| 606 | - <updated>1565571202923</updated> | |
| 607 | - </task> | |
| 608 | - <task id="LOCAL-00006" summary="添加containerCapacity"> | |
| 609 | - <created>1565578920011</created> | |
| 610 | - <option name="number" value="00006" /> | |
| 611 | - <option name="presentableId" value="LOCAL-00006" /> | |
| 612 | - <option name="project" value="LOCAL" /> | |
| 613 | - <updated>1565578920011</updated> | |
| 614 | - </task> | |
| 615 | - <task id="LOCAL-00007" summary="添加物料页面"> | |
| 616 | - <created>1565593159103</created> | |
| 617 | - <option name="number" value="00007" /> | |
| 618 | - <option name="presentableId" value="LOCAL-00007" /> | |
| 619 | - <option name="project" value="LOCAL" /> | |
| 620 | - <updated>1565593159103</updated> | |
| 621 | - </task> | |
| 622 | - <task id="LOCAL-00008" summary="添加商品详情"> | |
| 623 | - <created>1565598117104</created> | |
| 624 | - <option name="number" value="00008" /> | |
| 625 | - <option name="presentableId" value="LOCAL-00008" /> | |
| 626 | - <option name="project" value="LOCAL" /> | |
| 627 | - <updated>1565598117104</updated> | |
| 628 | - </task> | |
| 629 | - <task id="LOCAL-00009" summary="添加物料时判断单位是否存在，不存在则添加物料单位"> | |
| 630 | - <created>1565659672152</created> | |
| 631 | - <option name="number" value="00009" /> | |
| 632 | - <option name="presentableId" value="LOCAL-00009" /> | |
| 633 | - <option name="project" value="LOCAL" /> | |
| 634 | - <updated>1565659672152</updated> | |
| 635 | - </task> | |
| 636 | - <task id="LOCAL-00010" summary="添加task实体类"> | |
| 637 | - <created>1565665525508</created> | |
| 638 | - <option name="number" value="00010" /> | |
| 639 | - <option name="presentableId" value="LOCAL-00010" /> | |
| 640 | - <option name="project" value="LOCAL" /> | |
| 641 | - <updated>1565665525508</updated> | |
| 642 | - </task> | |
| 643 | - <task id="LOCAL-00011" summary="添加商品、商品详情页面"> | |
| 644 | - <created>1565686619774</created> | |
| 645 | - <option name="number" value="00011" /> | |
| 646 | - <option name="presentableId" value="LOCAL-00011" /> | |
| 647 | - <option name="project" value="LOCAL" /> | |
| 648 | - <updated>1565686619774</updated> | |
| 649 | - </task> | |
| 650 | - <task id="LOCAL-00012" summary="添加承运商"> | |
| 651 | - <created>1565745258070</created> | |
| 652 | - <option name="number" value="00012" /> | |
| 653 | - <option name="presentableId" value="LOCAL-00012" /> | |
| 654 | - <option name="project" value="LOCAL" /> | |
| 655 | - <updated>1565745258070</updated> | |
| 656 | - </task> | |
| 657 | - <task id="LOCAL-00013" summary="添加物料导入、导出模板，添加Excel导入导出配置文件"> | |
| 658 | - <created>1565833218584</created> | |
| 659 | - <option name="number" value="00013" /> | |
| 660 | - <option name="presentableId" value="LOCAL-00013" /> | |
| 661 | - <option name="project" value="LOCAL" /> | |
| 662 | - <updated>1565833218584</updated> | |
| 663 | - </task> | |
| 664 | - <task id="LOCAL-00014" summary="添加仓库配置"> | |
| 665 | - <created>1566176469173</created> | |
| 666 | - <option name="number" value="00014" /> | |
| 667 | - <option name="presentableId" value="LOCAL-00014" /> | |
| 668 | - <option name="project" value="LOCAL" /> | |
| 669 | - <updated>1566176469173</updated> | |
| 670 | - </task> | |
| 671 | - <task id="LOCAL-00015" summary="上架任务查询"> | |
| 672 | - <created>1566439482539</created> | |
| 673 | - <option name="number" value="00015" /> | |
| 674 | - <option name="presentableId" value="LOCAL-00015" /> | |
| 675 | - <option name="project" value="LOCAL" /> | |
| 676 | - <updated>1566439482539</updated> | |
| 677 | - </task> | |
| 678 | - <option name="localTasksCounter" value="16" /> | |
| 362 | + <option name="localTasksCounter" value="4" /> | |
| 679 | 363 | <servers /> |
| 680 | 364 | </component> |
| 681 | 365 | <component name="TimeTrackingManager"> |
| 682 | - <option name="totallyTimeSpent" value="38616000" /> | |
| 683 | - </component> | |
| 684 | - <component name="TodoView"> | |
| 685 | - <todo-panel id="selected-file"> | |
| 686 | - <is-autoscroll-to-source value="true" /> | |
| 687 | - </todo-panel> | |
| 688 | - <todo-panel id="all"> | |
| 689 | - <are-packages-shown value="true" /> | |
| 690 | - <is-autoscroll-to-source value="true" /> | |
| 691 | - </todo-panel> | |
| 366 | + <option name="totallyTimeSpent" value="266000" /> | |
| 692 | 367 | </component> |
| 693 | 368 | <component name="ToolWindowManager"> |
| 694 | 369 | <frame x="-7" y="-7" width="1550" height="838" extended-state="6" /> |
| 695 | - <editor active="true" /> | |
| 696 | 370 | <layout> |
| 697 | - <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49832776" visible="true" weight="0.37533513" /> | |
| 698 | - <window_info id="Structure" order="1" sideWeight="0.50167227" side_tool="true" weight="0.23793566" /> | |
| 699 | - <window_info id="Web" order="2" sideWeight="0.50167227" side_tool="true" weight="0.23793566" /> | |
| 700 | - <window_info id="Designer" order="3" /> | |
| 701 | - <window_info id="UI Designer" order="4" /> | |
| 702 | - <window_info id="Favorites" order="5" sideWeight="0.50167227" side_tool="true" weight="0.23793566" /> | |
| 703 | - <window_info id="Image Layers" order="6" /> | |
| 704 | - <window_info id="Capture Tool" order="7" /> | |
| 371 | + <window_info id="Designer" /> | |
| 372 | + <window_info id="Image Layers" /> | |
| 373 | + <window_info id="Capture Tool" /> | |
| 374 | + <window_info id="UI Designer" /> | |
| 375 | + <window_info id="Favorites" side_tool="true" /> | |
| 376 | + <window_info id="Web" side_tool="true" /> | |
| 377 | + <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25" /> | |
| 378 | + <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> | |
| 379 | + <window_info anchor="bottom" id="Spring" /> | |
| 380 | + <window_info anchor="bottom" id="Terminal" /> | |
| 381 | + <window_info anchor="bottom" id="Docker" show_stripe_button="false" /> | |
| 382 | + <window_info anchor="bottom" id="Event Log" side_tool="true" /> | |
| 383 | + <window_info anchor="bottom" id="Java Enterprise" /> | |
| 384 | + <window_info anchor="bottom" id="Database Changes" /> | |
| 385 | + <window_info anchor="bottom" id="Version Control" /> | |
| 705 | 386 | <window_info anchor="bottom" id="Message" order="0" /> |
| 706 | - <window_info anchor="bottom" id="Find" order="1" weight="0.3286119" /> | |
| 387 | + <window_info anchor="bottom" id="Find" order="1" /> | |
| 707 | 388 | <window_info anchor="bottom" id="Run" order="2" /> |
| 708 | 389 | <window_info anchor="bottom" id="Debug" order="3" weight="0.4" /> |
| 709 | 390 | <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> |
| 710 | 391 | <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> |
| 711 | - <window_info anchor="bottom" id="TODO" order="6" weight="0.3275488" /> | |
| 712 | - <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> | |
| 713 | - <window_info anchor="bottom" id="Version Control" order="8" weight="0.059490085" /> | |
| 714 | - <window_info anchor="bottom" id="Run Dashboard" order="9" sideWeight="0.91152817" weight="0.09206799" /> | |
| 715 | - <window_info anchor="bottom" id="Spring" order="10" weight="0.3286119" /> | |
| 716 | - <window_info anchor="bottom" id="Database Changes" order="11" weight="0.3275488" /> | |
| 717 | - <window_info anchor="bottom" id="Event Log" order="12" sideWeight="0.08847185" side_tool="true" weight="0.34560907" /> | |
| 718 | - <window_info anchor="bottom" id="Java Enterprise" order="13" weight="0.3275488" /> | |
| 719 | - <window_info anchor="bottom" id="Messages" order="14" visible="true" weight="0.16005665" /> | |
| 720 | - <window_info anchor="bottom" id="MyBatis Log" order="15" /> | |
| 721 | - <window_info anchor="bottom" id="Terminal" order="16" /> | |
| 392 | + <window_info anchor="bottom" id="TODO" order="6" /> | |
| 393 | + <window_info anchor="right" id="Maven" weight="0.3297587" /> | |
| 394 | + <window_info anchor="right" id="Palette" /> | |
| 395 | + <window_info anchor="right" id="Capture Analysis" /> | |
| 396 | + <window_info anchor="right" id="Database" /> | |
| 397 | + <window_info anchor="right" id="Palette	" /> | |
| 398 | + <window_info anchor="right" id="Theme Preview" /> | |
| 399 | + <window_info anchor="right" id="Bean Validation" /> | |
| 722 | 400 | <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> |
| 723 | 401 | <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> |
| 724 | 402 | <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> |
| 725 | - <window_info anchor="right" id="Palette" order="3" /> | |
| 726 | - <window_info anchor="right" id="Maven" order="4" /> | |
| 727 | - <window_info anchor="right" id="Bean Validation" order="5" /> | |
| 728 | - <window_info anchor="right" id="Database" order="6" /> | |
| 729 | - <window_info anchor="right" id="Palette	" order="7" /> | |
| 730 | - <window_info anchor="right" id="Capture Analysis" order="8" /> | |
| 731 | - <window_info anchor="right" id="Theme Preview" order="9" /> | |
| 732 | 403 | </layout> |
| 733 | 404 | </component> |
| 734 | 405 | <component name="TypeScriptGeneratedFilesManager"> |
| ... | ... | @@ -746,14 +417,7 @@ |
| 746 | 417 | <option name="RECENTLY_FILTERED_BRANCH_GROUPS"> |
| 747 | 418 | <collection /> |
| 748 | 419 | </option> |
| 749 | - <option name="COLUMN_ORDER"> | |
| 750 | - <list> | |
| 751 | - <option value="0" /> | |
| 752 | - <option value="1" /> | |
| 753 | - <option value="2" /> | |
| 754 | - <option value="3" /> | |
| 755 | - </list> | |
| 756 | - </option> | |
| 420 | + <option name="COLUMN_ORDER" /> | |
| 757 | 421 | </State> |
| 758 | 422 | </value> |
| 759 | 423 | </entry> |
| ... | ... | @@ -778,399 +442,39 @@ |
| 778 | 442 | <MESSAGE value="添加库位、库位类型增删改查接口" /> |
| 779 | 443 | <MESSAGE value="添加入库、出库表实体类 添加客户、供应商增删改查接口 添加库位、容器、供应商页面" /> |
| 780 | 444 | <MESSAGE value="修改库区service" /> |
| 781 | - <MESSAGE value="Merge branch 'develop' of http://172.16.29.40:8010/wms/wms2 into develop # Conflicts: #	.idea/workspace.xml" /> | |
| 782 | - <MESSAGE value="添加userWarehouse" /> | |
| 783 | - <MESSAGE value="添加containerCapacity" /> | |
| 784 | - <MESSAGE value="添加物料页面" /> | |
| 785 | - <MESSAGE value="添加商品详情" /> | |
| 786 | - <MESSAGE value="添加物料时判断单位是否存在，不存在则添加物料单位" /> | |
| 787 | - <MESSAGE value="添加task实体类" /> | |
| 788 | - <MESSAGE value="添加商品、商品详情页面" /> | |
| 789 | - <MESSAGE value="添加承运商" /> | |
| 790 | - <MESSAGE value="添加物料导入、导出模板，添加Excel导入导出配置文件" /> | |
| 791 | - <MESSAGE value="添加仓库配置" /> | |
| 792 | - <MESSAGE value="代码错误，库存导包" /> | |
| 793 | - <MESSAGE value="代码错误，导包" /> | |
| 794 | - <MESSAGE value="上架任务查询" /> | |
| 795 | - <MESSAGE value="库存交易搜索" /> | |
| 796 | - <MESSAGE value="库存状态搜索" /> | |
| 797 | - <option name="LAST_COMMIT_MESSAGE" value="库存状态搜索" /> | |
| 798 | - </component> | |
| 799 | - <component name="XDebuggerManager"> | |
| 800 | - <breakpoint-manager> | |
| 801 | - <breakpoints> | |
| 802 | - <line-breakpoint enabled="true" type="java-line"> | |
| 803 | - <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/common/utils/poi/ExcelUtil.java</url> | |
| 804 | - <line>302</line> | |
| 805 | - <properties /> | |
| 806 | - <option name="timeStamp" value="12" /> | |
| 807 | - </line-breakpoint> | |
| 808 | - <line-breakpoint enabled="true" type="java-line"> | |
| 809 | - <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/service/MaterialServiceImpl.java</url> | |
| 810 | - <line>66</line> | |
| 811 | - <properties /> | |
| 812 | - <option name="timeStamp" value="24" /> | |
| 813 | - </line-breakpoint> | |
| 814 | - <line-breakpoint enabled="true" type="java-line"> | |
| 815 | - <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/monitor/logExecption/controllerAdvice/MyControllerAdvice.java</url> | |
| 816 | - <line>26</line> | |
| 817 | - <properties /> | |
| 818 | - <option name="timeStamp" value="25" /> | |
| 819 | - </line-breakpoint> | |
| 820 | - </breakpoints> | |
| 821 | - </breakpoint-manager> | |
| 822 | - <watches-manager> | |
| 823 | - <configuration name="SpringBootApplicationConfigurationType"> | |
| 824 | - <watch expression="receiptTotal" /> | |
| 825 | - <watch expression="this.h" custom="java.lang.reflect.Proxy" /> | |
| 826 | - <watch expression="((MybatisMapperProxy)this.h).methodCache" custom="java.lang.reflect.Proxy,com.baomidou.mybatisplus.core.override.MybatisMapperProxy" /> | |
| 827 | - </configuration> | |
| 828 | - </watches-manager> | |
| 445 | + <option name="LAST_COMMIT_MESSAGE" value="修改库区service" /> | |
| 829 | 446 | </component> |
| 830 | 447 | <component name="editorHistoryManager"> |
| 831 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/HuaHengApplication.java"> | |
| 832 | - <provider selected="true" editor-type-id="text-editor"> | |
| 833 | - <state relative-caret-position="232"> | |
| 834 | - <caret line="26" column="42" selection-start-line="26" selection-start-column="42" selection-end-line="26" selection-end-column="42" /> | |
| 835 | - </state> | |
| 836 | - </provider> | |
| 837 | - </entry> | |
| 838 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller.java" /> | |
| 839 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java"> | |
| 840 | - <provider selected="true" editor-type-id="text-editor"> | |
| 841 | - <state relative-caret-position="300"> | |
| 842 | - <caret line="36" column="22" selection-start-line="36" selection-start-column="22" selection-end-line="36" selection-end-column="22" /> | |
| 843 | - <folding> | |
| 844 | - <element signature="imports" expanded="true" /> | |
| 845 | - </folding> | |
| 846 | - </state> | |
| 847 | - </provider> | |
| 848 | - </entry> | |
| 849 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java"> | |
| 850 | - <provider selected="true" editor-type-id="text-editor"> | |
| 851 | - <state relative-caret-position="209"> | |
| 852 | - <caret line="14" column="22" selection-start-line="14" selection-start-column="22" selection-end-line="14" selection-end-column="22" /> | |
| 853 | - </state> | |
| 854 | - </provider> | |
| 855 | - </entry> | |
| 856 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java"> | |
| 857 | - <provider selected="true" editor-type-id="text-editor"> | |
| 858 | - <state relative-caret-position="76"> | |
| 859 | - <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" /> | |
| 860 | - </state> | |
| 861 | - </provider> | |
| 862 | - </entry> | |
| 863 | - <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/task/TaskHeaderMapper.xml"> | |
| 864 | - <provider selected="true" editor-type-id="text-editor"> | |
| 865 | - <state relative-caret-position="48"> | |
| 866 | - <caret line="3" column="30" selection-start-line="3" selection-start-column="17" selection-end-line="3" selection-end-column="30" /> | |
| 867 | - </state> | |
| 868 | - </provider> | |
| 869 | - </entry> | |
| 870 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/mapper/TaskHeaderMapper.java"> | |
| 871 | - <provider selected="true" editor-type-id="text-editor"> | |
| 872 | - <state relative-caret-position="76"> | |
| 873 | - <caret line="5" column="17" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="17" /> | |
| 874 | - </state> | |
| 875 | - </provider> | |
| 876 | - </entry> | |
| 877 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/material/controller/MaterialController.java"> | |
| 878 | - <provider selected="true" editor-type-id="text-editor"> | |
| 879 | - <state relative-caret-position="-114"> | |
| 880 | - <caret line="38" selection-start-line="38" selection-end-line="41" selection-end-column="44" /> | |
| 881 | - </state> | |
| 882 | - </provider> | |
| 448 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/domain/TaskHeader.java"> | |
| 449 | + <provider selected="true" editor-type-id="text-editor" /> | |
| 883 | 450 | </entry> |
| 884 | - <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.1.2/mybatis-plus-extension-3.1.2.jar!/com/baomidou/mybatisplus/extension/service/IService.class"> | |
| 451 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java"> | |
| 885 | 452 | <provider selected="true" editor-type-id="text-editor"> |
| 886 | - <state relative-caret-position="226"> | |
| 887 | - <caret line="92" column="12" selection-start-line="92" selection-start-column="12" selection-end-line="92" selection-end-column="12" /> | |
| 453 | + <state relative-caret-position="409"> | |
| 454 | + <caret line="103" column="57" lean-forward="true" selection-start-line="103" selection-start-column="57" selection-end-line="103" selection-end-column="57" /> | |
| 888 | 455 | </state> |
| 889 | 456 | </provider> |
| 890 | 457 | </entry> |
| 891 | 458 | <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java"> |
| 892 | 459 | <provider selected="true" editor-type-id="text-editor"> |
| 893 | - <state relative-caret-position="57"> | |
| 894 | - <caret line="4" column="17" selection-start-line="4" selection-start-column="17" selection-end-line="4" selection-end-column="17" /> | |
| 895 | - </state> | |
| 896 | - </provider> | |
| 897 | - </entry> | |
| 898 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/warehouse/controller/WareHouseController.java"> | |
| 899 | - <provider selected="true" editor-type-id="text-editor"> | |
| 900 | - <state relative-caret-position="38"> | |
| 901 | - <caret line="61" column="49" selection-start-line="61" selection-start-column="40" selection-end-line="61" selection-end-column="49" /> | |
| 902 | - </state> | |
| 903 | - </provider> | |
| 904 | - </entry> | |
| 905 | - <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/5.1.5.RELEASE/spring-aop-5.1.5.RELEASE.jar!/org/springframework/aop/framework/CglibAopProxy.class"> | |
| 906 | - <provider selected="true" editor-type-id="text-editor"> | |
| 907 | - <state relative-caret-position="145"> | |
| 908 | - <caret line="472" selection-start-line="472" selection-end-line="472" /> | |
| 909 | - </state> | |
| 910 | - </provider> | |
| 911 | - </entry> | |
| 912 | - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/container/container.html"> | |
| 913 | - <provider selected="true" editor-type-id="text-editor"> | |
| 914 | - <state relative-caret-position="965"> | |
| 915 | - <caret line="69" column="29" selection-start-line="69" selection-start-column="28" selection-end-line="69" selection-end-column="29" /> | |
| 916 | - </state> | |
| 917 | - </provider> | |
| 918 | - </entry> | |
| 919 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/controller/ContainerController.java"> | |
| 920 | - <provider selected="true" editor-type-id="text-editor"> | |
| 921 | - <state relative-caret-position="-332"> | |
| 922 | - <caret line="114" column="27" selection-start-line="114" selection-start-column="23" selection-end-line="114" selection-end-column="27" /> | |
| 923 | - </state> | |
| 924 | - </provider> | |
| 925 | - </entry> | |
| 926 | - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/bomDetail/bomDetail.html"> | |
| 927 | - <provider selected="true" editor-type-id="text-editor"> | |
| 928 | - <state relative-caret-position="266"> | |
| 929 | - <caret line="32" column="52" lean-forward="true" selection-start-line="32" selection-start-column="11" selection-end-line="32" selection-end-column="52" /> | |
| 930 | - </state> | |
| 931 | - </provider> | |
| 932 | - </entry> | |
| 933 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/bom/controller/BomDetailController.java"> | |
| 934 | - <provider selected="true" editor-type-id="text-editor"> | |
| 935 | - <state relative-caret-position="304"> | |
| 936 | - <caret line="58" column="80" lean-forward="true" selection-start-line="58" selection-start-column="30" selection-end-line="58" selection-end-column="80" /> | |
| 937 | - </state> | |
| 938 | - </provider> | |
| 939 | - </entry> | |
| 940 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/dict/controller/DictDataController.java"> | |
| 941 | - <provider selected="true" editor-type-id="text-editor"> | |
| 942 | - <state relative-caret-position="-1435"> | |
| 943 | - <caret line="30" column="13" selection-start-line="30" selection-start-column="13" selection-end-line="30" selection-end-column="13" /> | |
| 944 | - </state> | |
| 945 | - </provider> | |
| 946 | - </entry> | |
| 947 | - <entry file="file://$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external/lib.dom.d.ts"> | |
| 948 | - <provider selected="true" editor-type-id="text-editor"> | |
| 949 | - <state relative-caret-position="161"> | |
| 950 | - <caret line="10712" column="13" selection-start-line="10712" selection-start-column="13" selection-end-line="10712" selection-end-column="13" /> | |
| 951 | - </state> | |
| 952 | - </provider> | |
| 953 | - </entry> | |
| 954 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/dict/mapper/DictTypeMapper.java"> | |
| 955 | - <provider selected="true" editor-type-id="text-editor"> | |
| 956 | - <state relative-caret-position="161"> | |
| 957 | - <caret line="29" column="26" selection-start-line="29" selection-start-column="26" selection-end-line="29" selection-end-column="26" /> | |
| 958 | - </state> | |
| 959 | - </provider> | |
| 960 | - </entry> | |
| 961 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/dict/service/DictTypeServiceImpl.java"> | |
| 962 | - <provider selected="true" editor-type-id="text-editor"> | |
| 963 | - <state relative-caret-position="199"> | |
| 964 | - <caret line="52" column="41" selection-start-line="52" selection-start-column="41" selection-end-line="52" selection-end-column="41" /> | |
| 965 | - </state> | |
| 966 | - </provider> | |
| 967 | - </entry> | |
| 968 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/dict/service/IDictTypeService.java"> | |
| 969 | - <provider selected="true" editor-type-id="text-editor"> | |
| 970 | - <state relative-caret-position="161"> | |
| 971 | - <caret line="28" column="26" selection-start-line="28" selection-start-column="26" selection-end-line="28" selection-end-column="26" /> | |
| 972 | - </state> | |
| 973 | - </provider> | |
| 974 | - </entry> | |
| 975 | - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/task/task/task.html"> | |
| 976 | - <provider selected="true" editor-type-id="text-editor"> | |
| 977 | - <state relative-caret-position="19"> | |
| 978 | - <caret line="141" column="36" selection-start-line="141" selection-start-column="32" selection-end-line="141" selection-end-column="36" /> | |
| 979 | - </state> | |
| 980 | - </provider> | |
| 981 | - </entry> | |
| 982 | - <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/system/DictTypeMapper.xml"> | |
| 983 | - <provider selected="true" editor-type-id="text-editor"> | |
| 984 | - <state relative-caret-position="931"> | |
| 985 | - <caret line="49" column="43" selection-start-line="49" selection-start-column="43" selection-end-line="49" selection-end-column="43" /> | |
| 986 | - </state> | |
| 987 | - </provider> | |
| 988 | - </entry> | |
| 989 | - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/system/dict/data/data.html"> | |
| 990 | - <provider selected="true" editor-type-id="text-editor"> | |
| 991 | - <state relative-caret-position="1653"> | |
| 992 | - <caret line="87" column="31" selection-start-line="87" selection-start-column="23" selection-end-line="87" selection-end-column="31" /> | |
| 993 | - </state> | |
| 994 | - </provider> | |
| 995 | - </entry> | |
| 996 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/dict/controller/DictTypeController.java"> | |
| 997 | - <provider selected="true" editor-type-id="text-editor"> | |
| 998 | - <state relative-caret-position="243"> | |
| 999 | - <caret line="144" column="55" selection-start-line="144" selection-start-column="55" selection-end-line="144" selection-end-column="55" /> | |
| 1000 | - </state> | |
| 1001 | - </provider> | |
| 1002 | - </entry> | |
| 1003 | - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/system/dict/type/type.html"> | |
| 1004 | - <provider selected="true" editor-type-id="text-editor"> | |
| 1005 | - <state relative-caret-position="153"> | |
| 1006 | - <caret line="218" column="15" selection-start-line="218" selection-start-column="12" selection-end-line="218" selection-end-column="15" /> | |
| 1007 | - </state> | |
| 1008 | - </provider> | |
| 1009 | - </entry> | |
| 1010 | - <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"> | |
| 1011 | - <provider selected="true" editor-type-id="text-editor"> | |
| 1012 | - <state relative-caret-position="67"> | |
| 1013 | - <caret line="102" selection-start-line="102" selection-end-line="102" /> | |
| 460 | + <state relative-caret-position="152"> | |
| 461 | + <caret line="11" column="27" selection-start-line="11" selection-start-column="27" selection-end-line="11" selection-end-column="27" /> | |
| 1014 | 462 | </state> |
| 1015 | 463 | </provider> |
| 1016 | 464 | </entry> |
| 1017 | 465 | <entry file="file://$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/taskHeader.html"> |
| 1018 | 466 | <provider selected="true" editor-type-id="text-editor"> |
| 1019 | - <state relative-caret-position="248"> | |
| 1020 | - <caret line="43" column="123" lean-forward="true" selection-start-line="43" selection-start-column="123" selection-end-line="43" selection-end-column="123" /> | |
| 467 | + <state relative-caret-position="-513"> | |
| 1021 | 468 | <folding> |
| 1022 | 469 | <element signature="n#style#0;n#i#0;n#a#0;n#!!top" expanded="true" /> |
| 1023 | - <element signature="n#style#0;n#a#0;n#!!top" expanded="true" /> | |
| 1024 | - </folding> | |
| 1025 | - </state> | |
| 1026 | - </provider> | |
| 1027 | - </entry> | |
| 1028 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskDetail/controller/TaskDetailController.java"> | |
| 1029 | - <provider selected="true" editor-type-id="text-editor"> | |
| 1030 | - <state relative-caret-position="-185"> | |
| 1031 | - <caret line="43" column="48" lean-forward="true" selection-start-line="43" selection-start-column="48" selection-end-line="43" selection-end-column="48" /> | |
| 1032 | - <folding> | |
| 1033 | - <element signature="imports" expanded="true" /> | |
| 1034 | 470 | </folding> |
| 1035 | 471 | </state> |
| 1036 | 472 | </provider> |
| 1037 | 473 | </entry> |
| 1038 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java"> | |
| 1039 | - <provider selected="true" editor-type-id="text-editor"> | |
| 1040 | - <state relative-caret-position="40"> | |
| 1041 | - <caret line="55" column="48" lean-forward="true" selection-start-line="55" selection-start-column="48" selection-end-line="55" selection-end-column="48" /> | |
| 1042 | - <folding> | |
| 1043 | - <element signature="imports" expanded="true" /> | |
| 1044 | - </folding> | |
| 1045 | - </state> | |
| 1046 | - </provider> | |
| 1047 | - </entry> | |
| 1048 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java"> | |
| 1049 | - <provider selected="true" editor-type-id="text-editor"> | |
| 1050 | - <state relative-caret-position="178"> | |
| 1051 | - <caret line="66" lean-forward="true" selection-start-line="66" selection-end-line="66" /> | |
| 1052 | - </state> | |
| 1053 | - </provider> | |
| 1054 | - </entry> | |
| 1055 | - <entry file="file://$PROJECT_DIR$/src/main/resources/static/huaheng/js/huahengUI.js"> | |
| 1056 | - <provider selected="true" editor-type-id="text-editor"> | |
| 1057 | - <state relative-caret-position="213"> | |
| 1058 | - <caret line="119" column="12" selection-start-line="119" selection-start-column="12" selection-end-line="119" selection-end-column="12" /> | |
| 1059 | - </state> | |
| 1060 | - </provider> | |
| 1061 | - </entry> | |
| 1062 | - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html"> | |
| 1063 | - <provider selected="true" editor-type-id="text-editor"> | |
| 1064 | - <state relative-caret-position="1167"> | |
| 1065 | - <caret line="87" column="26" lean-forward="true" selection-start-line="87" selection-start-column="26" selection-end-line="87" selection-end-column="26" /> | |
| 1066 | - </state> | |
| 1067 | - </provider> | |
| 1068 | - </entry> | |
| 1069 | - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html"> | |
| 1070 | - <provider selected="true" editor-type-id="text-editor"> | |
| 1071 | - <state relative-caret-position="-99"> | |
| 1072 | - <caret line="50" column="54" lean-forward="true" selection-start-line="50" selection-start-column="54" selection-end-line="50" selection-end-column="54" /> | |
| 1073 | - </state> | |
| 1074 | - </provider> | |
| 1075 | - </entry> | |
| 1076 | - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryTransaction/inventoryTransaction.html"> | |
| 1077 | - <provider selected="true" editor-type-id="text-editor"> | |
| 1078 | - <state relative-caret-position="312"> | |
| 1079 | - <caret line="39" column="41" lean-forward="true" selection-start-line="39" selection-start-column="41" selection-end-line="39" selection-end-column="41" /> | |
| 1080 | - </state> | |
| 1081 | - </provider> | |
| 1082 | - </entry> | |
| 1083 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/domain/InventoryTransaction.java"> | |
| 1084 | - <provider selected="true" editor-type-id="text-editor"> | |
| 1085 | - <state relative-caret-position="322"> | |
| 1086 | - <caret line="60" column="20" lean-forward="true" selection-start-line="60" selection-start-column="20" selection-end-line="60" selection-end-column="35" /> | |
| 1087 | - </state> | |
| 1088 | - </provider> | |
| 1089 | - </entry> | |
| 1090 | - <entry file="jar://C:/Program Files/Java/jdk1.8.0_202/src.zip!/java/util/function/Function.java"> | |
| 1091 | - <provider selected="true" editor-type-id="text-editor"> | |
| 1092 | - <state relative-caret-position="-7"> | |
| 1093 | - <caret line="45" column="16" lean-forward="true" selection-start-line="45" selection-start-column="16" selection-end-line="45" selection-end-column="16" /> | |
| 1094 | - </state> | |
| 1095 | - </provider> | |
| 1096 | - </entry> | |
| 1097 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/controller/InventoryTransactionController.java"> | |
| 1098 | - <provider selected="true" editor-type-id="text-editor"> | |
| 1099 | - <state relative-caret-position="226"> | |
| 1100 | - <caret line="77" column="143" selection-start-line="77" selection-start-column="143" selection-end-line="77" selection-end-column="143" /> | |
| 1101 | - </state> | |
| 1102 | - </provider> | |
| 1103 | - </entry> | |
| 1104 | - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/cyclecountHeader/cyclecountHeader.html"> | |
| 1105 | - <provider selected="true" editor-type-id="text-editor"> | |
| 1106 | - <state relative-caret-position="428"> | |
| 1107 | - <caret line="79" lean-forward="true" selection-start-line="79" selection-end-line="79" /> | |
| 1108 | - </state> | |
| 1109 | - </provider> | |
| 1110 | - </entry> | |
| 1111 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/domain/CycleCountHeader.java"> | |
| 1112 | - <provider selected="true" editor-type-id="text-editor" /> | |
| 1113 | - </entry> | |
| 1114 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/mapper/CycleCountHeaderMapper.java"> | |
| 1115 | - <provider selected="true" editor-type-id="text-editor" /> | |
| 1116 | - </entry> | |
| 1117 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/service/ICycleCountHeaderService.java"> | |
| 1118 | - <provider selected="true" editor-type-id="text-editor" /> | |
| 1119 | - </entry> | |
| 1120 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/mapper/CyclecountHeaderMapperAuto.java"> | |
| 1121 | - <provider selected="true" editor-type-id="text-editor" /> | |
| 1122 | - </entry> | |
| 1123 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/ICycleCountDetailService.java"> | |
| 1124 | - <provider selected="true" editor-type-id="text-editor" /> | |
| 1125 | - </entry> | |
| 1126 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/mapper/CycleCountDetailMapper.java"> | |
| 1127 | - <provider selected="true" editor-type-id="text-editor" /> | |
| 1128 | - </entry> | |
| 1129 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/mapper/CyclecountDetailMapperAuto.java"> | |
| 1130 | - <provider selected="true" editor-type-id="text-editor"> | |
| 1131 | - <state relative-caret-position="40"> | |
| 1132 | - <caret line="2" column="55" selection-start-line="2" selection-start-column="55" selection-end-line="2" selection-end-column="55" /> | |
| 1133 | - </state> | |
| 1134 | - </provider> | |
| 1135 | - </entry> | |
| 1136 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/domain/CycleCountDetail.java"> | |
| 1137 | - <provider selected="true" editor-type-id="text-editor"> | |
| 1138 | - <state relative-caret-position="420"> | |
| 1139 | - <caret line="25" column="15" lean-forward="true" selection-start-line="25" selection-start-column="15" selection-end-line="25" selection-end-column="15" /> | |
| 1140 | - </state> | |
| 1141 | - </provider> | |
| 1142 | - </entry> | |
| 1143 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java"> | |
| 1144 | - <provider selected="true" editor-type-id="text-editor"> | |
| 1145 | - <state relative-caret-position="-244"> | |
| 1146 | - <caret line="13" column="49" selection-start-line="13" selection-start-column="49" selection-end-line="13" selection-end-column="49" /> | |
| 1147 | - </state> | |
| 1148 | - </provider> | |
| 1149 | - </entry> | |
| 1150 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/CycleCountDetailServiceImpl.java"> | |
| 1151 | - <provider selected="true" editor-type-id="text-editor"> | |
| 1152 | - <state relative-caret-position="100"> | |
| 1153 | - <caret line="31" column="40" lean-forward="true" selection-start-line="31" selection-start-column="40" selection-end-line="31" selection-end-column="40" /> | |
| 1154 | - <folding> | |
| 1155 | - <element signature="e#0#15820#0" expanded="true" /> | |
| 1156 | - </folding> | |
| 1157 | - </state> | |
| 1158 | - </provider> | |
| 1159 | - </entry> | |
| 1160 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/controller/CycleCountHeaderController.java"> | |
| 1161 | - <provider selected="true" editor-type-id="text-editor"> | |
| 1162 | - <state relative-caret-position="200"> | |
| 1163 | - <caret line="10" selection-start-line="10" selection-end-line="10" /> | |
| 1164 | - </state> | |
| 1165 | - </provider> | |
| 1166 | - </entry> | |
| 1167 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/service/CycleCountHeaderServiceImpl.java"> | |
| 474 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java"> | |
| 1168 | 475 | <provider selected="true" editor-type-id="text-editor"> |
| 1169 | - <state relative-caret-position="1340"> | |
| 1170 | - <caret line="67" column="5" lean-forward="true" selection-start-line="67" selection-start-column="5" selection-end-line="67" selection-end-column="5" /> | |
| 1171 | - <folding> | |
| 1172 | - <element signature="e#0#16496#0" expanded="true" /> | |
| 1173 | - </folding> | |
| 476 | + <state relative-caret-position="-173"> | |
| 477 | + <caret line="161" column="34" selection-start-line="161" selection-start-column="34" selection-end-line="161" selection-end-column="34" /> | |
| 1174 | 478 | </state> |
| 1175 | 479 | </provider> |
| 1176 | 480 | </entry> |
| ... | ... |
src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java
| ... | ... | @@ -4,11 +4,13 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
| 4 | 4 | import com.baomidou.mybatisplus.core.metadata.IPage; |
| 5 | 5 | import com.baomidou.mybatisplus.core.toolkit.Wrappers; |
| 6 | 6 | import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
| 7 | +import com.huaheng.common.support.Convert; | |
| 7 | 8 | import com.huaheng.common.utils.StringUtils; |
| 8 | 9 | import com.huaheng.common.utils.security.ShiroUtils; |
| 9 | 10 | import com.huaheng.framework.aspectj.lang.annotation.Log; |
| 10 | 11 | import com.huaheng.framework.aspectj.lang.constant.BusinessType; |
| 11 | 12 | import com.huaheng.framework.web.controller.BaseController; |
| 13 | +import com.huaheng.framework.web.domain.AjaxResult; | |
| 12 | 14 | import com.huaheng.framework.web.page.PageDomain; |
| 13 | 15 | import com.huaheng.framework.web.page.TableDataInfo; |
| 14 | 16 | import com.huaheng.framework.web.page.TableSupport; |
| ... | ... | @@ -50,6 +52,7 @@ public class TaskHeaderController extends BaseController { |
| 50 | 52 | |
| 51 | 53 | |
| 52 | 54 | |
| 55 | + | |
| 53 | 56 | /** |
| 54 | 57 | * 查询任务列表 |
| 55 | 58 | */ |
| ... | ... | @@ -57,7 +60,8 @@ public class TaskHeaderController extends BaseController { |
| 57 | 60 | @Log(title = "任务-上架任务", operating = "查看任务列表", action = BusinessType.GRANT) |
| 58 | 61 | @PostMapping("/list") |
| 59 | 62 | @ResponseBody |
| 60 | - public TableDataInfo list(TaskHeader taskHeader,@ApiParam(name="InternalTaskType",value="类型") String InternalTaskType) { | |
| 63 | + public TableDataInfo list(TaskHeader taskHeader,@ApiParam(name="InternalTaskType",value="类型") String InternalTaskType, | |
| 64 | + @ApiParam(name="createdBegin",value="类型") String createdBegin,@ApiParam(name="createdEnd",value="类型") String createdEnd) { | |
| 61 | 65 | LambdaQueryWrapper<TaskHeader> lambdaQueryWrapper = Wrappers.lambdaQuery(); |
| 62 | 66 | lambdaQueryWrapper.eq(TaskHeader::getWarehouseCode,ShiroUtils.getWarehouseCode()) |
| 63 | 67 | .in(TaskHeader::getCompanyCode,ShiroUtils.getCompanyCodeList()) |
| ... | ... | @@ -65,7 +69,10 @@ public class TaskHeaderController extends BaseController { |
| 65 | 69 | .eq(StringUtils.isNotEmpty(taskHeader.getInternalTaskType()),TaskHeader::getInternalTaskType,taskHeader.getInternalTaskType()) |
| 66 | 70 | .eq(StringUtils.isNotNull(taskHeader.getId()),TaskHeader::getId,taskHeader.getId()) |
| 67 | 71 | .eq(StringUtils.isNotEmpty(taskHeader.getContainerCode()),TaskHeader::getContainerCode,taskHeader.getContainerCode()) |
| 68 | - .eq(StringUtils.isNotEmpty(taskHeader.getLocationCode()),TaskHeader::getLocationCode,taskHeader.getLocationCode()); | |
| 72 | + .eq(StringUtils.isNotEmpty(taskHeader.getLocationCode()),TaskHeader::getLocationCode,taskHeader.getLocationCode()) | |
| 73 | + .gt(StringUtils.isNotEmpty(createdBegin),TaskHeader::getCreated,createdBegin) | |
| 74 | + .lt(StringUtils.isNotEmpty(createdEnd),TaskHeader::getCreated,createdEnd); | |
| 75 | + | |
| 69 | 76 | PageDomain pageDomain = TableSupport.buildPageRequest(); |
| 70 | 77 | Integer pageNum = pageDomain.getPageNum(); |
| 71 | 78 | Integer pageSize = pageDomain.getPageSize(); |
| ... | ... | @@ -83,5 +90,21 @@ public class TaskHeaderController extends BaseController { |
| 83 | 90 | } |
| 84 | 91 | |
| 85 | 92 | |
| 93 | + /** | |
| 94 | + * 下发任务 | |
| 95 | + */ | |
| 96 | + @RequiresPermissions("task:task:execute") | |
| 97 | + @Log(title = "任务-任务管理", operating = "下发立库任务", action = BusinessType.UPDATE) | |
| 98 | + @PostMapping( "/execute") | |
| 99 | + @ResponseBody | |
| 100 | + public AjaxResult execute(String taskId) | |
| 101 | + { | |
| 102 | + if (StringUtils.isEmpty(taskId)) | |
| 103 | + return AjaxResult.error("taskId不能为空"); | |
| 104 | + AjaxResult ajaxResult = taskHeaderService.sendTaskToWcs(Convert.toIntArray(taskId)); | |
| 105 | + return ajaxResult; | |
| 106 | + } | |
| 107 | + | |
| 108 | + | |
| 86 | 109 | |
| 87 | 110 | } |
| ... | ... |
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
| 1 | 1 | package com.huaheng.pc.task.taskHeader.service; |
| 2 | 2 | |
| 3 | 3 | import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
| 4 | +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; | |
| 4 | 5 | import com.baomidou.mybatisplus.core.toolkit.Wrappers; |
| 6 | +import com.huaheng.common.utils.DataUtils; | |
| 5 | 7 | import com.huaheng.common.utils.security.ShiroUtils; |
| 6 | 8 | import com.huaheng.framework.web.domain.AjaxResult; |
| 7 | 9 | import com.huaheng.pc.config.location.domain.Location; |
| ... | ... | @@ -13,13 +15,17 @@ import com.huaheng.pc.shipment.shipmentContainerDetail.service.ShipmentContainer |
| 13 | 15 | import com.huaheng.pc.shipment.shipmentContainerHeader.domain.ShipmentContainerHeader; |
| 14 | 16 | import com.huaheng.pc.shipment.shipmentContainerHeader.service.ShipmentContainerHeaderService; |
| 15 | 17 | import com.huaheng.pc.task.taskDetail.domain.TaskDetail; |
| 18 | +import com.huaheng.pc.task.taskDetail.mapper.TaskDetailMapper; | |
| 16 | 19 | import com.huaheng.pc.task.taskDetail.service.TaskDetailService; |
| 17 | 20 | import com.huaheng.pc.task.taskHeader.domain.ShipmentTaskCreateModel; |
| 21 | +import com.sun.jmx.snmp.tasks.Task; | |
| 18 | 22 | import org.springframework.beans.factory.annotation.Autowired; |
| 19 | 23 | import org.springframework.stereotype.Service; |
| 20 | 24 | import java.math.BigDecimal; |
| 21 | 25 | import java.util.Date; |
| 22 | 26 | import java.util.List; |
| 27 | +import java.util.Map; | |
| 28 | + | |
| 23 | 29 | import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
| 24 | 30 | import com.huaheng.pc.task.taskHeader.domain.TaskHeader; |
| 25 | 31 | import com.huaheng.pc.task.taskHeader.mapper.TaskHeaderMapper; |
| ... | ... | @@ -39,6 +45,8 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea |
| 39 | 45 | private InventoryDetailService inventoryDetailService; |
| 40 | 46 | @Autowired |
| 41 | 47 | private TaskDetailService taskDetailService; |
| 48 | + @Autowired | |
| 49 | + private TaskHeaderService taskHeaderService; | |
| 42 | 50 | |
| 43 | 51 | /** |
| 44 | 52 | * 生成出库任务 |
| ... | ... | @@ -149,4 +157,63 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea |
| 149 | 157 | return AjaxResult.success(task.getId()); |
| 150 | 158 | |
| 151 | 159 | } |
| 160 | + | |
| 161 | + @Override | |
| 162 | + public AjaxResult<TaskHeader> sendTaskToWcs(Integer[] taskIds) { | |
| 163 | + TaskHeader task=null; | |
| 164 | + for(Integer taskId:taskIds){ | |
| 165 | + task = taskHeaderService.getById(taskId); | |
| 166 | + if(task.getStatus() > 9){ | |
| 167 | + return AjaxResult.error("任务" + taskId + "已经下发，请不要重复下发，操作中止"); | |
| 168 | + } | |
| 169 | + //修改任务头表 | |
| 170 | + task.setStatus(10); | |
| 171 | + task.setStartPickDateTime(new Date()); //生成时间 | |
| 172 | + task.setLastUpdated(new Date()); | |
| 173 | + task.setLastUpdatedBy(ShiroUtils.getLoginName()); | |
| 174 | + LambdaUpdateWrapper<TaskHeader> HeaderUpdateWrapper=Wrappers.lambdaUpdate(); | |
| 175 | + HeaderUpdateWrapper.eq(TaskHeader::getId,taskId); | |
| 176 | + taskHeaderService.update(task,HeaderUpdateWrapper); | |
| 177 | + //修改任务明细状态 | |
| 178 | + TaskDetail record = new TaskDetail(); | |
| 179 | + record.setStatus(10); | |
| 180 | + record.setLastUpdated(new Date()); | |
| 181 | + record.setLastUpdatedBy(ShiroUtils.getLoginName()); | |
| 182 | + LambdaUpdateWrapper<TaskDetail> lambdaUpdateWrapper=Wrappers.lambdaUpdate(); | |
| 183 | + lambdaUpdateWrapper.eq(TaskDetail::getTaskId,task.getId()); | |
| 184 | + taskDetailService.update(record,lambdaUpdateWrapper); | |
| 185 | + | |
| 186 | + | |
| 187 | +// if (task.getInternalTaskType().equals("100")) | |
| 188 | +// { | |
| 189 | +// List<Map<String, Object>> maps = taskDetailService.selectListMapByEqual("billId, billDetailId", condition); | |
| 190 | +// for (Map<String, Object> item : maps){ | |
| 191 | +// Integer billDetailId = DataUtils.getInteger(item.get("billDetailId")); | |
| 192 | +// receiptHeaderService.updateDetailStatus(billDetailId, (short)300); | |
| 193 | +// } | |
| 194 | +// maps.stream().map(X -> X.get("billId")).distinct().forEach(X -> receiptHeaderService.receiptStatusUpdate(DataUtils.getInteger(X), (short)300)); | |
| 195 | +// } | |
| 196 | +// //盘点单执行 | |
| 197 | +// if(task.getType() == 700){ | |
| 198 | +// CyclecountDetail cyclecountDetai = cyclecountDetailService.selectEntityById( | |
| 199 | +// task.getAllocationHeadId()); | |
| 200 | +// cyclecountDetai.setStatus(10); | |
| 201 | +// cyclecountDetailService.updateByModel(cyclecountDetai); | |
| 202 | +// } | |
| 203 | +//// //如果是单排人工库，那么出入库都是先完成，在下发AGV任务 | |
| 204 | +//// if (task.getType().intValue() == 300 || task.getType().intValue() == 600) { | |
| 205 | +//// if (task.getSourceLocation().startsWith("L03") == false ) { | |
| 206 | +//// taskAgvService.createTaskAgv(task); | |
| 207 | +//// } | |
| 208 | +//// } | |
| 209 | +//// else { | |
| 210 | +//// taskAgvService.createTaskAgv(task); | |
| 211 | +//// } | |
| 212 | +// //任务类型是出库，那就完成任务在叫agv | |
| 213 | +// if (task.getType().intValue() == 100 || task.getType().intValue() == 500) { | |
| 214 | +// taskAgvService.createTaskAgv(task); | |
| 215 | +// } | |
| 216 | + } | |
| 217 | + return AjaxResult.success("下发任务成功",task); | |
| 218 | + } | |
| 152 | 219 | } |
| ... | ... |
src/main/resources/templates/task/taskHeader/taskHeader.html
| ... | ... | @@ -36,12 +36,12 @@ |
| 36 | 36 | </li> |
| 37 | 37 | <li class="time" style="height: 30px"> |
| 38 | 38 | <label>创建时间： </label> |
| 39 | - <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[createdBegin]"/> | |
| 39 | + <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="createdBegin"/> | |
| 40 | 40 | <span>-</span> |
| 41 | - <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[createdEnd]"/> | |
| 41 | + <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="createdEnd"/> | |
| 42 | 42 | </li> |
| 43 | 43 | <li> |
| 44 | - 任务类型：<input type="hidden" name="internalTaskType" th:value="${InternalTaskType}"/> | |
| 44 | + <input type="hidden" name="internalTaskType" th:value="${InternalTaskType}"/> | |
| 45 | 45 | </li> |
| 46 | 46 | |
| 47 | 47 | <!--<li>--> |
| ... | ... | @@ -228,20 +228,15 @@ |
| 228 | 228 | align: 'center', |
| 229 | 229 | formatter: function(value, row, index) { |
| 230 | 230 | var actions = []; |
| 231 | - // actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> '); | |
| 232 | 231 | actions.push('<a class="btn btn-info btn-xs " href="#" onclick="detail(\'' + row.id + '\')"><i class="fa fa-list-ul"></i>明细</a> '); |
| 233 | - if (row.lastStatus < 10) { | |
| 234 | - if(row.zoneCode != "AGV"){ | |
| 235 | - actions.push('<a class="btn btn-success btn-xs ' + executeFlag + '" href="#" onclick="execute(\'' + row.id + '\')"><i class="fa fa-send" style="padding-right: 1px;"></i>执行</a> '); | |
| 236 | - } | |
| 232 | + if (row.status < 10) { | |
| 233 | + actions.push('<a class="btn btn-success btn-xs ' + executeFlag + '" href="#" onclick="execute(\'' + row.id + '\')"><i class="fa fa-send" style="padding-right: 1px;"></i>执行</a> '); | |
| 237 | 234 | actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>取消</a> '); |
| 238 | - if(row.zoneCode != "AGV"){ | |
| 239 | 235 | actions.push('<a class="btn btn-primary btn-xs ' + completeFlag + '" href="#" onclick="complete(\'' + row.id + '\')"><i class="fa fa-check"></i>完成</a>'); |
| 240 | - } | |
| 241 | - } | |
| 242 | - if(row.lastStatus < 10 && row.zoneCode == "AGV"){ | |
| 243 | - actions.push('<a style="background-color: #f59e00;border: #f59e00" class="btn btn-primary btn-xs ' + agvFlag + '" href="#" onclick="complete(\'' + row.id + '\')"><i class="fa fa-check"></i>AGV完成</a>'); | |
| 244 | 236 | } |
| 237 | + if (row.status > 10) { | |
| 238 | + actions.push('<a class="btn btn-primary btn-xs ' + completeFlag + '" href="#" onclick="complete(\'' + row.id + '\')"><i class="fa fa-check"></i>完成</a>'); | |
| 239 | + } | |
| 245 | 240 | return actions.join(''); |
| 246 | 241 | } |
| 247 | 242 | } |
| ... | ... | @@ -287,11 +282,6 @@ |
| 287 | 282 | title : '单据编码', |
| 288 | 283 | }, |
| 289 | 284 | { |
| 290 | - field : 'allocationId', | |
| 291 | - title : '容器物料表ID' , | |
| 292 | - sortable: true | |
| 293 | - }, | |
| 294 | - { | |
| 295 | 285 | field : 'materialCode', |
| 296 | 286 | title : '存货编码', |
| 297 | 287 | sortable: true |
| ... | ... | @@ -311,12 +301,12 @@ |
| 311 | 301 | sortable:true |
| 312 | 302 | }, |
| 313 | 303 | { |
| 314 | - field : 'sourceLocation', | |
| 304 | + field : 'fromLocation', | |
| 315 | 305 | title : '源库位', |
| 316 | 306 | sortable:true |
| 317 | 307 | }, |
| 318 | 308 | { |
| 319 | - field : 'destinationLocation', | |
| 309 | + field : 'toLocation', | |
| 320 | 310 | title : '目的库位', |
| 321 | 311 | sortable:true |
| 322 | 312 | }, |
| ... | ... | @@ -333,8 +323,8 @@ |
| 333 | 323 | } |
| 334 | 324 | }, |
| 335 | 325 | { |
| 336 | - field : 'endTime', | |
| 337 | - title : '子任务完成时间' , | |
| 326 | + field : 'created', | |
| 327 | + title : '创建时间' , | |
| 338 | 328 | visible:false, |
| 339 | 329 | sortable:true |
| 340 | 330 | }, |
| ... | ... |