Commit f4b06d89615fe9bc6705b7033c0b156347d47102
1 parent
cdc5237c
修改WCS2接口
Showing
8 changed files
with
1207 additions
and
103 deletions
.idea/workspace.xml
| 1 | 1 | <?xml version="1.0" encoding="UTF-8"?> |
| 2 | 2 | <project version="4"> |
| 3 | 3 | <component name="ChangeListManager"> |
| 4 | - <list default="true" id="baeae966-16bb-4f97-a411-22fe5a65cefd" name="Default Changelist" comment=""> | |
| 4 | + <list default="true" id="29079676-ace5-434e-89a2-76a325e744a5" name="Default Changelist" comment="修改masada分支"> | |
| 5 | 5 | <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> |
| 6 | - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/check/checkingRegister/controller/CheckingRegisterController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/check/checkingRegister/controller/CheckingRegisterController.java" afterDir="false" /> | |
| 7 | - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/check/checkingRegister/service/CheckingRegisterService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/check/checkingRegister/service/CheckingRegisterService.java" afterDir="false" /> | |
| 8 | - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/statusFlow/controller/StatusFlowHeaderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/statusFlow/controller/StatusFlowHeaderController.java" afterDir="false" /> | |
| 9 | - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/config/filterConfigHeader/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/config/filterConfigHeader/add.html" afterDir="false" /> | |
| 10 | - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/config/receiptType/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/config/receiptType/add.html" afterDir="false" /> | |
| 11 | - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/config/statusFlowHeader/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/config/statusFlowHeader/add.html" afterDir="false" /> | |
| 12 | - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/config/statusFlowHeader/statusFlowHeader.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/config/statusFlowHeader/statusFlowHeader.html" afterDir="false" /> | |
| 13 | - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html" afterDir="false" /> | |
| 6 | + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/domain/WcsTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/domain/WcsTask.java" afterDir="false" /> | |
| 7 | + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/taskAssignService/TaskAssignServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/taskAssignService/TaskAssignServiceImpl.java" afterDir="false" /> | |
| 8 | + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/taskCancel/TaskCancelServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/taskCancel/TaskCancelServiceImpl.java" afterDir="false" /> | |
| 9 | + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/taskFinish/TaskFinishServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/taskFinish/TaskFinishServiceImpl.java" afterDir="false" /> | |
| 10 | + <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" /> | |
| 11 | + <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" /> | |
| 12 | + <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" /> | |
| 14 | 13 | </list> |
| 14 | + <ignored path="$PROJECT_DIR$/target/" /> | |
| 15 | 15 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> |
| 16 | 16 | <option name="SHOW_DIALOG" value="false" /> |
| 17 | 17 | <option name="HIGHLIGHT_CONFLICTS" value="true" /> |
| ... | ... | @@ -32,22 +32,436 @@ |
| 32 | 32 | <expand /> |
| 33 | 33 | <select /> |
| 34 | 34 | </component> |
| 35 | + <component name="FileEditorManager"> | |
| 36 | + <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> | |
| 37 | + <file pinned="false" current-in-tab="false"> | |
| 38 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java"> | |
| 39 | + <provider selected="true" editor-type-id="text-editor"> | |
| 40 | + <state relative-caret-position="225"> | |
| 41 | + <caret line="71" selection-start-line="71" selection-end-line="71" /> | |
| 42 | + </state> | |
| 43 | + </provider> | |
| 44 | + </entry> | |
| 45 | + </file> | |
| 46 | + <file pinned="false" current-in-tab="false"> | |
| 47 | + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/taskHeader.html"> | |
| 48 | + <provider selected="true" editor-type-id="text-editor"> | |
| 49 | + <state relative-caret-position="350"> | |
| 50 | + <caret line="26" column="112" selection-start-line="26" selection-start-column="112" selection-end-line="26" selection-end-column="112" /> | |
| 51 | + <folding> | |
| 52 | + <element signature="n#style#0;n#i#0;n#a#0;n#!!top" expanded="true" /> | |
| 53 | + </folding> | |
| 54 | + </state> | |
| 55 | + </provider> | |
| 56 | + </entry> | |
| 57 | + </file> | |
| 58 | + <file pinned="false" current-in-tab="false"> | |
| 59 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/taskCancel/TaskCancelServiceImpl.java"> | |
| 60 | + <provider selected="true" editor-type-id="text-editor"> | |
| 61 | + <state relative-caret-position="239"> | |
| 62 | + <caret line="42" column="66" selection-start-line="42" selection-start-column="66" selection-end-line="42" selection-end-column="66" /> | |
| 63 | + </state> | |
| 64 | + </provider> | |
| 65 | + </entry> | |
| 66 | + </file> | |
| 67 | + <file pinned="false" current-in-tab="false"> | |
| 68 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/taskFinish/TaskFinishServiceImpl.java"> | |
| 69 | + <provider selected="true" editor-type-id="text-editor"> | |
| 70 | + <state relative-caret-position="792"> | |
| 71 | + <caret line="42" column="9" selection-start-line="42" selection-start-column="9" selection-end-line="42" selection-end-column="9" /> | |
| 72 | + </state> | |
| 73 | + </provider> | |
| 74 | + </entry> | |
| 75 | + </file> | |
| 76 | + <file pinned="false" current-in-tab="true"> | |
| 77 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java"> | |
| 78 | + <provider selected="true" editor-type-id="text-editor"> | |
| 79 | + <state relative-caret-position="91"> | |
| 80 | + <caret line="435" column="12" selection-start-line="435" selection-start-column="12" selection-end-line="435" selection-end-column="12" /> | |
| 81 | + </state> | |
| 82 | + </provider> | |
| 83 | + </entry> | |
| 84 | + </file> | |
| 85 | + <file pinned="false" current-in-tab="false"> | |
| 86 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/taskAssignService/TaskAssignServiceImpl.java"> | |
| 87 | + <provider selected="true" editor-type-id="text-editor"> | |
| 88 | + <state relative-caret-position="267"> | |
| 89 | + <caret line="127" column="13" selection-start-line="127" selection-start-column="13" selection-end-line="127" selection-end-column="13" /> | |
| 90 | + </state> | |
| 91 | + </provider> | |
| 92 | + </entry> | |
| 93 | + </file> | |
| 94 | + <file pinned="false" current-in-tab="false"> | |
| 95 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/domain/WcsTask.java"> | |
| 96 | + <provider selected="true" editor-type-id="text-editor"> | |
| 97 | + <state relative-caret-position="342"> | |
| 98 | + <caret line="21" column="29" selection-start-line="21" selection-start-column="29" selection-end-line="21" selection-end-column="29" /> | |
| 99 | + </state> | |
| 100 | + </provider> | |
| 101 | + </entry> | |
| 102 | + </file> | |
| 103 | + </leaf> | |
| 104 | + </component> | |
| 35 | 105 | <component name="FileTemplateManagerImpl"> |
| 36 | 106 | <option name="RECENT_TEMPLATES"> |
| 37 | 107 | <list> |
| 38 | 108 | <option value="Interface" /> |
| 39 | - <option value="Class" /> | |
| 40 | 109 | <option value="Enum" /> |
| 41 | 110 | <option value="HTML File" /> |
| 111 | + <option value="Class" /> | |
| 42 | 112 | </list> |
| 43 | 113 | </option> |
| 44 | 114 | </component> |
| 115 | + <component name="FindInProjectRecents"> | |
| 116 | + <findStrings> | |
| 117 | + <find>20</find> | |
| 118 | + <find>30</find> | |
| 119 | + <find>3</find> | |
| 120 | + <find>40</find> | |
| 121 | + <find>50</find> | |
| 122 | + <find>0</find> | |
| 123 | + <find>1</find> | |
| 124 | + <find>5</find> | |
| 125 | + <find>10</find> | |
| 126 | + </findStrings> | |
| 127 | + <dirStrings> | |
| 128 | + <dir>C:\Users\Administrator\IdeaProjects\wms2\src\main\resources\static\img\icon</dir> | |
| 129 | + </dirStrings> | |
| 130 | + </component> | |
| 45 | 131 | <component name="Git.Settings"> |
| 46 | 132 | <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> |
| 133 | + <option name="RECENT_BRANCH_BY_REPOSITORY"> | |
| 134 | + <map> | |
| 135 | + <entry key="$PROJECT_DIR$" value="develop" /> | |
| 136 | + </map> | |
| 137 | + </option> | |
| 138 | + <option name="PUSH_TAGS"> | |
| 139 | + <GitPushTagMode /> | |
| 140 | + </option> | |
| 141 | + </component> | |
| 142 | + <component name="IdeDocumentHistory"> | |
| 143 | + <option name="CHANGED_PATHS"> | |
| 144 | + <list> | |
| 145 | + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/configValue/service/ConfigValueService.java" /> | |
| 146 | + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/containerType/service/ContainerTypeServiceImpl.java" /> | |
| 147 | + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/locationType/service/LocationTypeServiceImpl.java" /> | |
| 148 | + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zone/service/ZoneServiceImpl.java" /> | |
| 149 | + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/cycleCountPreference/service/CycleCountPreferenceService.java" /> | |
| 150 | + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/receiptPreference/service/ReceiptPreferenceService.java" /> | |
| 151 | + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/shipmentPreference/service/ShipmentPreferenceServiceImpl.java" /> | |
| 152 | + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/receiptType/service/ReceiptTypeServiceImpl.java" /> | |
| 153 | + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/shipmentType/service/ShipmentTypeServiceImpl.java" /> | |
| 154 | + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/role/service/RoleServiceImpl.java" /> | |
| 155 | + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/dict/service/DictTypeServiceImpl.java" /> | |
| 156 | + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/menu/service/MenuServiceImpl.java" /> | |
| 157 | + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/FilterConfigHeader/service/FilterConfigHeaderService.java" /> | |
| 158 | + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/waveMaster/service/WaveMasterService.java" /> | |
| 159 | + <option value="$PROJECT_DIR$/src/main/resources/mybatis/config/WarehouseMapper.xml" /> | |
| 160 | + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/warehouse/service/WarehouseServiceImpl.java" /> | |
| 161 | + <option value="$PROJECT_DIR$/src/main/resources/mybatis/system/MenuMapper.xml" /> | |
| 162 | + <option value="$PROJECT_DIR$/src/main/resources/templates/config/warehouse/edit.html" /> | |
| 163 | + <option value="$PROJECT_DIR$/src/main/resources/templates/config/warehouse/add.html" /> | |
| 164 | + <option value="$PROJECT_DIR$/src/main/resources/templates/config/containerType/containerType.html" /> | |
| 165 | + <option value="$PROJECT_DIR$/src/main/resources/templates/config/locationType/locationType.html" /> | |
| 166 | + <option value="$PROJECT_DIR$/src/main/resources/templates/config/zone/zone.html" /> | |
| 167 | + <option value="$PROJECT_DIR$/src/main/resources/templates/config/materialType/materialType.html" /> | |
| 168 | + <option value="$PROJECT_DIR$/src/main/resources/templates/config/materialUnit/materialUnit.html" /> | |
| 169 | + <option value="$PROJECT_DIR$/src/main/resources/templates/config/material/material.html" /> | |
| 170 | + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/materialType/controller/MaterialTypeController.java" /> | |
| 171 | + <option value="$PROJECT_DIR$/src/main/resources/templates/config/material/add.html" /> | |
| 172 | + <option value="$PROJECT_DIR$/src/main/resources/templates/config/materialType/edit.html" /> | |
| 173 | + <option value="$PROJECT_DIR$/src/main/resources/templates/config/materialType/add.html" /> | |
| 174 | + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/FilterConfigDetail/service/FilterConfigDetailService.java" /> | |
| 175 | + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/statusFlow/service/StatusFlowHeaderService.java" /> | |
| 176 | + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/materialUnit/controller/MaterialUnitController.java" /> | |
| 177 | + <option value="$PROJECT_DIR$/src/main/resources/templates/config/materialMultiple/add.html" /> | |
| 178 | + <option value="$PROJECT_DIR$/src/main/resources/templates/config/materialMultiple/materialMultiple.html" /> | |
| 179 | + <option value="$PROJECT_DIR$/src/main/resources/application-dev.yml" /> | |
| 180 | + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/materialMultiple/controller/MaterialMultipleController.java" /> | |
| 181 | + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/bom/controller/BomHeaderController.java" /> | |
| 182 | + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/excelTemplate/controller/excelTemplateController.java" /> | |
| 183 | + <option value="$PROJECT_DIR$/src/main/resources/templates/config/company/edit.html" /> | |
| 184 | + <option value="$PROJECT_DIR$/src/main/resources/templates/config/bomHeader/add.html" /> | |
| 185 | + <option value="$PROJECT_DIR$/src/main/resources/templates/config/bomHeader/edit.html" /> | |
| 186 | + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/company/service/CompanyServiceImpl.java" /> | |
| 187 | + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/material/controller/MaterialController.java" /> | |
| 188 | + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/taskInfo/TaskInfoServiceImpl.java" /> | |
| 189 | + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java" /> | |
| 190 | + <option value="$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/taskHeader.html" /> | |
| 191 | + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/domain/WcsTask.java" /> | |
| 192 | + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/taskAssignService/TaskAssignServiceImpl.java" /> | |
| 193 | + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/taskCancel/TaskCancelServiceImpl.java" /> | |
| 194 | + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/taskFinish/TaskFinishServiceImpl.java" /> | |
| 195 | + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java" /> | |
| 196 | + </list> | |
| 197 | + </option> | |
| 198 | + </component> | |
| 199 | + <component name="MavenImportPreferences"> | |
| 200 | + <option name="importingSettings"> | |
| 201 | + <MavenImportingSettings> | |
| 202 | + <option name="importAutomatically" value="true" /> | |
| 203 | + </MavenImportingSettings> | |
| 204 | + </option> | |
| 205 | + </component> | |
| 206 | + <component name="MavenProjectNavigator"> | |
| 207 | + <treeState> | |
| 208 | + <expand> | |
| 209 | + <path> | |
| 210 | + <item name="" type="16c1761:MavenProjectsStructure$RootNode" /> | |
| 211 | + <item name="huaheng" type="9519ce18:MavenProjectsStructure$ProjectNode" /> | |
| 212 | + </path> | |
| 213 | + </expand> | |
| 214 | + <select /> | |
| 215 | + </treeState> | |
| 216 | + </component> | |
| 217 | + <component name="ProjectFrameBounds" extendedState="6"> | |
| 218 | + <option name="x" value="41" /> | |
| 219 | + <option name="y" value="138" /> | |
| 220 | + <option name="width" value="1939" /> | |
| 221 | + <option name="height" value="1040" /> | |
| 47 | 222 | </component> |
| 48 | 223 | <component name="ProjectId" id="1QOzUtfkdeRmYuw3MIDHXXMLsFH" /> |
| 49 | 224 | <component name="ProjectLevelVcsManager"> |
| 50 | 225 | <OptionsSetting value="false" id="Update" /> |
| 226 | + <ConfirmationsSetting value="2" id="Add" /> | |
| 227 | + </component> | |
| 228 | + <component name="ProjectView"> | |
| 229 | + <navigator proportions="" version="1"> | |
| 230 | + <foldersAlwaysOnTop value="true" /> | |
| 231 | + </navigator> | |
| 232 | + <panes> | |
| 233 | + <pane id="Scope" /> | |
| 234 | + <pane id="PackagesPane" /> | |
| 235 | + <pane id="ProjectPane"> | |
| 236 | + <subPane> | |
| 237 | + <expand> | |
| 238 | + <path> | |
| 239 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 240 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 241 | + </path> | |
| 242 | + <path> | |
| 243 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 244 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 245 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 246 | + </path> | |
| 247 | + <path> | |
| 248 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 249 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 250 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 251 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
| 252 | + </path> | |
| 253 | + <path> | |
| 254 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 255 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 256 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 257 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
| 258 | + <item name="java" type="462c0819:PsiDirectoryNode" /> | |
| 259 | + </path> | |
| 260 | + <path> | |
| 261 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 262 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 263 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 264 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
| 265 | + <item name="java" type="462c0819:PsiDirectoryNode" /> | |
| 266 | + <item name="com" type="462c0819:PsiDirectoryNode" /> | |
| 267 | + </path> | |
| 268 | + <path> | |
| 269 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 270 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 271 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 272 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
| 273 | + <item name="java" type="462c0819:PsiDirectoryNode" /> | |
| 274 | + <item name="com" type="462c0819:PsiDirectoryNode" /> | |
| 275 | + <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
| 276 | + </path> | |
| 277 | + <path> | |
| 278 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 279 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 280 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 281 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
| 282 | + <item name="java" type="462c0819:PsiDirectoryNode" /> | |
| 283 | + <item name="com" type="462c0819:PsiDirectoryNode" /> | |
| 284 | + <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
| 285 | + <item name="api" type="462c0819:PsiDirectoryNode" /> | |
| 286 | + </path> | |
| 287 | + <path> | |
| 288 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 289 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 290 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 291 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
| 292 | + <item name="java" type="462c0819:PsiDirectoryNode" /> | |
| 293 | + <item name="com" type="462c0819:PsiDirectoryNode" /> | |
| 294 | + <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
| 295 | + <item name="api" type="462c0819:PsiDirectoryNode" /> | |
| 296 | + <item name="wcs" type="462c0819:PsiDirectoryNode" /> | |
| 297 | + </path> | |
| 298 | + <path> | |
| 299 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 300 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 301 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 302 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
| 303 | + <item name="java" type="462c0819:PsiDirectoryNode" /> | |
| 304 | + <item name="com" type="462c0819:PsiDirectoryNode" /> | |
| 305 | + <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
| 306 | + <item name="api" type="462c0819:PsiDirectoryNode" /> | |
| 307 | + <item name="wcs" 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="api" type="462c0819:PsiDirectoryNode" /> | |
| 319 | + <item name="wcs" type="462c0819:PsiDirectoryNode" /> | |
| 320 | + <item name="service" type="462c0819:PsiDirectoryNode" /> | |
| 321 | + </path> | |
| 322 | + <path> | |
| 323 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 324 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 325 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 326 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
| 327 | + <item name="java" type="462c0819:PsiDirectoryNode" /> | |
| 328 | + <item name="com" type="462c0819:PsiDirectoryNode" /> | |
| 329 | + <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
| 330 | + <item name="api" type="462c0819:PsiDirectoryNode" /> | |
| 331 | + <item name="wcs" type="462c0819:PsiDirectoryNode" /> | |
| 332 | + <item name="service" type="462c0819:PsiDirectoryNode" /> | |
| 333 | + <item name="taskCancel" 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="api" type="462c0819:PsiDirectoryNode" /> | |
| 344 | + <item name="wcs" type="462c0819:PsiDirectoryNode" /> | |
| 345 | + <item name="service" type="462c0819:PsiDirectoryNode" /> | |
| 346 | + <item name="taskFinish" 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 | + </path> | |
| 358 | + <path> | |
| 359 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 360 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 361 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 362 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
| 363 | + <item name="java" type="462c0819:PsiDirectoryNode" /> | |
| 364 | + <item name="com" type="462c0819:PsiDirectoryNode" /> | |
| 365 | + <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
| 366 | + <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
| 367 | + <item name="task" type="462c0819:PsiDirectoryNode" /> | |
| 368 | + </path> | |
| 369 | + <path> | |
| 370 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 371 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 372 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 373 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
| 374 | + <item name="java" type="462c0819:PsiDirectoryNode" /> | |
| 375 | + <item name="com" type="462c0819:PsiDirectoryNode" /> | |
| 376 | + <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
| 377 | + <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
| 378 | + <item name="task" type="462c0819:PsiDirectoryNode" /> | |
| 379 | + <item name="taskHeader" type="462c0819:PsiDirectoryNode" /> | |
| 380 | + </path> | |
| 381 | + <path> | |
| 382 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 383 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 384 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 385 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
| 386 | + <item name="java" type="462c0819:PsiDirectoryNode" /> | |
| 387 | + <item name="com" type="462c0819:PsiDirectoryNode" /> | |
| 388 | + <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
| 389 | + <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
| 390 | + <item name="task" type="462c0819:PsiDirectoryNode" /> | |
| 391 | + <item name="taskHeader" type="462c0819:PsiDirectoryNode" /> | |
| 392 | + <item name="controller" type="462c0819:PsiDirectoryNode" /> | |
| 393 | + </path> | |
| 394 | + <path> | |
| 395 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 396 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 397 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 398 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
| 399 | + <item name="java" type="462c0819:PsiDirectoryNode" /> | |
| 400 | + <item name="com" type="462c0819:PsiDirectoryNode" /> | |
| 401 | + <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
| 402 | + <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
| 403 | + <item name="task" type="462c0819:PsiDirectoryNode" /> | |
| 404 | + <item name="taskHeader" type="462c0819:PsiDirectoryNode" /> | |
| 405 | + <item name="service" type="462c0819:PsiDirectoryNode" /> | |
| 406 | + </path> | |
| 407 | + <path> | |
| 408 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 409 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 410 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 411 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
| 412 | + <item name="resources" type="462c0819:PsiDirectoryNode" /> | |
| 413 | + </path> | |
| 414 | + <path> | |
| 415 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 416 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 417 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 418 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
| 419 | + <item name="resources" type="462c0819:PsiDirectoryNode" /> | |
| 420 | + <item name="templates" type="462c0819:PsiDirectoryNode" /> | |
| 421 | + </path> | |
| 422 | + <path> | |
| 423 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 424 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 425 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 426 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
| 427 | + <item name="resources" type="462c0819:PsiDirectoryNode" /> | |
| 428 | + <item name="templates" type="462c0819:PsiDirectoryNode" /> | |
| 429 | + <item name="config" type="462c0819:PsiDirectoryNode" /> | |
| 430 | + </path> | |
| 431 | + <path> | |
| 432 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 433 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 434 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 435 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
| 436 | + <item name="resources" type="462c0819:PsiDirectoryNode" /> | |
| 437 | + <item name="templates" type="462c0819:PsiDirectoryNode" /> | |
| 438 | + <item name="config" type="462c0819:PsiDirectoryNode" /> | |
| 439 | + <item name="bomHeader" type="462c0819:PsiDirectoryNode" /> | |
| 440 | + </path> | |
| 441 | + <path> | |
| 442 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 443 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 444 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 445 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
| 446 | + <item name="resources" type="462c0819:PsiDirectoryNode" /> | |
| 447 | + <item name="templates" type="462c0819:PsiDirectoryNode" /> | |
| 448 | + <item name="task" type="462c0819:PsiDirectoryNode" /> | |
| 449 | + </path> | |
| 450 | + <path> | |
| 451 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 452 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 453 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 454 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
| 455 | + <item name="resources" type="462c0819:PsiDirectoryNode" /> | |
| 456 | + <item name="templates" type="462c0819:PsiDirectoryNode" /> | |
| 457 | + <item name="task" type="462c0819:PsiDirectoryNode" /> | |
| 458 | + <item name="taskHeader" type="462c0819:PsiDirectoryNode" /> | |
| 459 | + </path> | |
| 460 | + </expand> | |
| 461 | + <select /> | |
| 462 | + </subPane> | |
| 463 | + </pane> | |
| 464 | + </panes> | |
| 51 | 465 | </component> |
| 52 | 466 | <component name="PropertiesComponent"> |
| 53 | 467 | <property name="ASKED_ADD_EXTERNAL_FILES" value="true" /> |
| ... | ... | @@ -58,8 +472,9 @@ |
| 58 | 472 | <property name="RequestMappingsPanelWidth1" value="75" /> |
| 59 | 473 | <property name="WebServerToolWindowFactoryState" value="false" /> |
| 60 | 474 | <property name="aspect.path.notification.shown" value="true" /> |
| 475 | + <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1572915159662" /> | |
| 61 | 476 | <property name="full.screen.before.presentation.mode" value="false" /> |
| 62 | - <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/resources/static/ajax/libs/bootstrap-table/extensions/editable" /> | |
| 477 | + <property name="last_opened_file_path" value="$PROJECT_DIR$/../wms-small" /> | |
| 63 | 478 | <property name="node.js.detected.package.eslint" value="true" /> |
| 64 | 479 | <property name="node.js.detected.package.tslint" value="true" /> |
| 65 | 480 | <property name="node.js.path.for.package.eslint" value="project" /> |
| ... | ... | @@ -74,8 +489,12 @@ |
| 74 | 489 | </component> |
| 75 | 490 | <component name="RecentsManager"> |
| 76 | 491 | <key name="CopyFile.RECENT_KEYS"> |
| 492 | + <recent name="C:\Users\Administrator\IdeaProjects\wms2\src\main\resources\static\js" /> | |
| 77 | 493 | <recent name="E:\code\wms2\src\main\resources\static\ajax\libs\bootstrap-table\extensions\editable" /> |
| 78 | 494 | </key> |
| 495 | + <key name="MoveFile.RECENT_KEYS"> | |
| 496 | + <recent name="C:\Users\Administrator\Desktop" /> | |
| 497 | + </key> | |
| 79 | 498 | </component> |
| 80 | 499 | <component name="RunDashboard"> |
| 81 | 500 | <option name="configurationTypes"> |
| ... | ... | @@ -93,6 +512,7 @@ |
| 93 | 512 | </RuleState> |
| 94 | 513 | </list> |
| 95 | 514 | </option> |
| 515 | + <option name="contentProportion" value="0.15846995" /> | |
| 96 | 516 | </component> |
| 97 | 517 | <component name="RunManager" selected="Spring Boot.HuaHengApplication"> |
| 98 | 518 | <configuration name="ReceiptContainerHeaderServiceImpl" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true"> |
| ... | ... | @@ -124,8 +544,69 @@ |
| 124 | 544 | <option name="Make" enabled="true" /> |
| 125 | 545 | </method> |
| 126 | 546 | </configuration> |
| 547 | + <configuration name="HuaHengApplication (1)" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" temporary="true" nameIsGenerated="true"> | |
| 548 | + <module name="wms2" /> | |
| 549 | + <extension name="coverage"> | |
| 550 | + <pattern> | |
| 551 | + <option name="PATTERN" value="com.huaheng.*" /> | |
| 552 | + <option name="ENABLED" value="true" /> | |
| 553 | + </pattern> | |
| 554 | + </extension> | |
| 555 | + <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" /> | |
| 556 | + <method v="2"> | |
| 557 | + <option name="Make" enabled="true" /> | |
| 558 | + </method> | |
| 559 | + </configuration> | |
| 127 | 560 | <configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" temporary="true" nameIsGenerated="true"> |
| 128 | - <module name="huaheng" /> | |
| 561 | + <module name="wms2" /> | |
| 562 | + <extension name="coverage"> | |
| 563 | + <pattern> | |
| 564 | + <option name="PATTERN" value="com.huaheng.*" /> | |
| 565 | + <option name="ENABLED" value="true" /> | |
| 566 | + </pattern> | |
| 567 | + </extension> | |
| 568 | + <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" /> | |
| 569 | + <option name="ALTERNATIVE_JRE_PATH" /> | |
| 570 | + <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" /> | |
| 571 | + <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" /> | |
| 572 | + <method v="2"> | |
| 573 | + <option name="Make" enabled="true" /> | |
| 574 | + </method> | |
| 575 | + </configuration> | |
| 576 | + <configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" temporary="true" nameIsGenerated="true"> | |
| 577 | + <module name="wms2" /> | |
| 578 | + <extension name="coverage"> | |
| 579 | + <pattern> | |
| 580 | + <option name="PATTERN" value="com.huaheng.*" /> | |
| 581 | + <option name="ENABLED" value="true" /> | |
| 582 | + </pattern> | |
| 583 | + </extension> | |
| 584 | + <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" /> | |
| 585 | + <option name="ALTERNATIVE_JRE_PATH" /> | |
| 586 | + <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" /> | |
| 587 | + <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" /> | |
| 588 | + <method v="2"> | |
| 589 | + <option name="Make" enabled="true" /> | |
| 590 | + </method> | |
| 591 | + </configuration> | |
| 592 | + <configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" temporary="true" nameIsGenerated="true"> | |
| 593 | + <module name="wms2" /> | |
| 594 | + <extension name="coverage"> | |
| 595 | + <pattern> | |
| 596 | + <option name="PATTERN" value="com.huaheng.*" /> | |
| 597 | + <option name="ENABLED" value="true" /> | |
| 598 | + </pattern> | |
| 599 | + </extension> | |
| 600 | + <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" /> | |
| 601 | + <option name="ALTERNATIVE_JRE_PATH" /> | |
| 602 | + <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" /> | |
| 603 | + <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" /> | |
| 604 | + <method v="2"> | |
| 605 | + <option name="Make" enabled="true" /> | |
| 606 | + </method> | |
| 607 | + </configuration> | |
| 608 | + <configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" temporary="true" nameIsGenerated="true"> | |
| 609 | + <module name="wms2" /> | |
| 129 | 610 | <extension name="coverage"> |
| 130 | 611 | <pattern> |
| 131 | 612 | <option name="PATTERN" value="com.huaheng.*" /> |
| ... | ... | @@ -143,13 +624,16 @@ |
| 143 | 624 | <list> |
| 144 | 625 | <item itemvalue="Application.ReceiptContainerHeaderServiceImpl" /> |
| 145 | 626 | <item itemvalue="JUnit.ServiceTest.sendSimpleMail" /> |
| 627 | + <item itemvalue="Spring Boot.HuaHengApplication (1)" /> | |
| 146 | 628 | <item itemvalue="Spring Boot.HuaHengApplication" /> |
| 147 | 629 | </list> |
| 148 | 630 | <recent_temporary> |
| 149 | 631 | <list> |
| 150 | 632 | <item itemvalue="Spring Boot.HuaHengApplication" /> |
| 151 | - <item itemvalue="Application.ReceiptContainerHeaderServiceImpl" /> | |
| 633 | + <item itemvalue="Spring Boot.HuaHengApplication (1)" /> | |
| 152 | 634 | <item itemvalue="JUnit.ServiceTest.sendSimpleMail" /> |
| 635 | + <item itemvalue="Application.ReceiptContainerHeaderServiceImpl" /> | |
| 636 | + <item itemvalue="Spring Boot.HuaHengApplication" /> | |
| 153 | 637 | </list> |
| 154 | 638 | </recent_temporary> |
| 155 | 639 | </component> |
| ... | ... | @@ -179,7 +663,7 @@ |
| 179 | 663 | </component> |
| 180 | 664 | <component name="TaskManager"> |
| 181 | 665 | <task active="true" id="Default" summary="Default task"> |
| 182 | - <changelist id="baeae966-16bb-4f97-a411-22fe5a65cefd" name="Default Changelist" comment="" /> | |
| 666 | + <changelist id="29079676-ace5-434e-89a2-76a325e744a5" name="Default Changelist" comment="添加根据容器编码查找容器的方法 配置规则添加自动添加模块类型 添加是否自动生成临时容器" /> | |
| 183 | 667 | <created>1567656449978</created> |
| 184 | 668 | <option name="number" value="Default" /> |
| 185 | 669 | <option name="presentableId" value="Default" /> |
| ... | ... | @@ -272,48 +756,24 @@ |
| 272 | 756 | <workItem from="1569748443357" duration="438000" /> |
| 273 | 757 | <workItem from="1569803438585" duration="13789000" /> |
| 274 | 758 | <workItem from="1570581146682" duration="9295000" /> |
| 275 | - </task> | |
| 276 | - <task id="LOCAL-00001" summary="修改添加物料时使用物料类别生成物料编码"> | |
| 277 | - <created>1567664306836</created> | |
| 278 | - <option name="number" value="00001" /> | |
| 279 | - <option name="presentableId" value="LOCAL-00001" /> | |
| 280 | - <option name="project" value="LOCAL" /> | |
| 281 | - <updated>1567664306836</updated> | |
| 282 | - </task> | |
| 283 | - <task id="LOCAL-00002" summary="修改添加物料时使用物料类别生成物料编码"> | |
| 284 | - <created>1567936901056</created> | |
| 285 | - <option name="number" value="00002" /> | |
| 286 | - <option name="presentableId" value="LOCAL-00002" /> | |
| 287 | - <option name="project" value="LOCAL" /> | |
| 288 | - <updated>1567936901056</updated> | |
| 289 | - </task> | |
| 290 | - <task id="LOCAL-00003" summary="修改质检页面、添加完成质检"> | |
| 291 | - <created>1568025230030</created> | |
| 292 | - <option name="number" value="00003" /> | |
| 293 | - <option name="presentableId" value="LOCAL-00003" /> | |
| 294 | - <option name="project" value="LOCAL" /> | |
| 295 | - <updated>1568025230030</updated> | |
| 296 | - </task> | |
| 297 | - <task id="LOCAL-00004" summary="修改质检页面、添加完成质检"> | |
| 298 | - <created>1568110494128</created> | |
| 299 | - <option name="number" value="00004" /> | |
| 300 | - <option name="presentableId" value="LOCAL-00004" /> | |
| 301 | - <option name="project" value="LOCAL" /> | |
| 302 | - <updated>1568110494128</updated> | |
| 303 | - </task> | |
| 304 | - <task id="LOCAL-00005" summary="修复入库质检请求地址冲突"> | |
| 305 | - <created>1568162392627</created> | |
| 306 | - <option name="number" value="00005" /> | |
| 307 | - <option name="presentableId" value="LOCAL-00005" /> | |
| 308 | - <option name="project" value="LOCAL" /> | |
| 309 | - <updated>1568162392627</updated> | |
| 310 | - </task> | |
| 311 | - <task id="LOCAL-00006" summary="添加入库单打印"> | |
| 312 | - <created>1568174134623</created> | |
| 313 | - <option name="number" value="00006" /> | |
| 314 | - <option name="presentableId" value="LOCAL-00006" /> | |
| 315 | - <option name="project" value="LOCAL" /> | |
| 316 | - <updated>1568174134623</updated> | |
| 759 | + <workItem from="1571185601359" duration="15893000" /> | |
| 760 | + <workItem from="1571273749726" duration="10559000" /> | |
| 761 | + <workItem from="1571358765147" duration="13125000" /> | |
| 762 | + <workItem from="1571618321321" duration="24837000" /> | |
| 763 | + <workItem from="1571704409088" duration="5386000" /> | |
| 764 | + <workItem from="1571791080420" duration="2000" /> | |
| 765 | + <workItem from="1571791109916" duration="12667000" /> | |
| 766 | + <workItem from="1571877371520" duration="18025000" /> | |
| 767 | + <workItem from="1571909533980" duration="1083000" /> | |
| 768 | + <workItem from="1571963848874" duration="13664000" /> | |
| 769 | + <workItem from="1572222704814" duration="8052000" /> | |
| 770 | + <workItem from="1572309302624" duration="19352000" /> | |
| 771 | + <workItem from="1572396103535" duration="16947000" /> | |
| 772 | + <workItem from="1572481930051" duration="8552000" /> | |
| 773 | + <workItem from="1572493319144" duration="8880000" /> | |
| 774 | + <workItem from="1572568169800" duration="13626000" /> | |
| 775 | + <workItem from="1572827775923" duration="16176000" /> | |
| 776 | + <workItem from="1572913575221" duration="1583000" /> | |
| 317 | 777 | </task> |
| 318 | 778 | <task id="LOCAL-00007" summary="修改入库单审核移动到入库单头表"> |
| 319 | 779 | <created>1568186231357</created> |
| ... | ... | @@ -511,9 +971,208 @@ |
| 511 | 971 | <option name="project" value="LOCAL" /> |
| 512 | 972 | <updated>1570582333467</updated> |
| 513 | 973 | </task> |
| 514 | - <option name="localTasksCounter" value="35" /> | |
| 974 | + <task id="LOCAL-00035" summary="wcs接口修改"> | |
| 975 | + <created>1571122379988</created> | |
| 976 | + <option name="number" value="00035" /> | |
| 977 | + <option name="presentableId" value="LOCAL-00035" /> | |
| 978 | + <option name="project" value="LOCAL" /> | |
| 979 | + <updated>1571122379988</updated> | |
| 980 | + </task> | |
| 981 | + <task id="LOCAL-00036" summary="页面格式和排版更改"> | |
| 982 | + <created>1571207162953</created> | |
| 983 | + <option name="number" value="00036" /> | |
| 984 | + <option name="presentableId" value="LOCAL-00036" /> | |
| 985 | + <option name="project" value="LOCAL" /> | |
| 986 | + <updated>1571207162954</updated> | |
| 987 | + </task> | |
| 988 | + <task id="LOCAL-00037" summary="接口地址修改，入库生成任务时字段添加"> | |
| 989 | + <created>1571214245114</created> | |
| 990 | + <option name="number" value="00037" /> | |
| 991 | + <option name="presentableId" value="LOCAL-00037" /> | |
| 992 | + <option name="project" value="LOCAL" /> | |
| 993 | + <updated>1571214245114</updated> | |
| 994 | + </task> | |
| 995 | + <task id="LOCAL-00038" summary="常量代替数字"> | |
| 996 | + <created>1571648535594</created> | |
| 997 | + <option name="number" value="00038" /> | |
| 998 | + <option name="presentableId" value="LOCAL-00038" /> | |
| 999 | + <option name="project" value="LOCAL" /> | |
| 1000 | + <updated>1571648535594</updated> | |
| 1001 | + </task> | |
| 1002 | + <task id="LOCAL-00039" summary="复制角色，字典数据，菜单"> | |
| 1003 | + <created>1571825499862</created> | |
| 1004 | + <option name="number" value="00039" /> | |
| 1005 | + <option name="presentableId" value="LOCAL-00039" /> | |
| 1006 | + <option name="project" value="LOCAL" /> | |
| 1007 | + <updated>1571825499862</updated> | |
| 1008 | + </task> | |
| 1009 | + <task id="LOCAL-00040" summary="复制流程，规则配置，波次，菜单"> | |
| 1010 | + <created>1571886888136</created> | |
| 1011 | + <option name="number" value="00040" /> | |
| 1012 | + <option name="presentableId" value="LOCAL-00040" /> | |
| 1013 | + <option name="project" value="LOCAL" /> | |
| 1014 | + <updated>1571886888136</updated> | |
| 1015 | + </task> | |
| 1016 | + <task id="LOCAL-00041" summary="修改masada分支"> | |
| 1017 | + <created>1571973935036</created> | |
| 1018 | + <option name="number" value="00041" /> | |
| 1019 | + <option name="presentableId" value="LOCAL-00041" /> | |
| 1020 | + <option name="project" value="LOCAL" /> | |
| 1021 | + <updated>1571973935037</updated> | |
| 1022 | + </task> | |
| 1023 | + <task id="LOCAL-00042" summary="修改权限"> | |
| 1024 | + <created>1571985219873</created> | |
| 1025 | + <option name="number" value="00042" /> | |
| 1026 | + <option name="presentableId" value="LOCAL-00042" /> | |
| 1027 | + <option name="project" value="LOCAL" /> | |
| 1028 | + <updated>1571985219873</updated> | |
| 1029 | + </task> | |
| 1030 | + <task id="LOCAL-00043" summary="界面修改"> | |
| 1031 | + <created>1572259123124</created> | |
| 1032 | + <option name="number" value="00043" /> | |
| 1033 | + <option name="presentableId" value="LOCAL-00043" /> | |
| 1034 | + <option name="project" value="LOCAL" /> | |
| 1035 | + <updated>1572259123124</updated> | |
| 1036 | + </task> | |
| 1037 | + <task id="LOCAL-00044" summary="修改权限"> | |
| 1038 | + <created>1572318327154</created> | |
| 1039 | + <option name="number" value="00044" /> | |
| 1040 | + <option name="presentableId" value="LOCAL-00044" /> | |
| 1041 | + <option name="project" value="LOCAL" /> | |
| 1042 | + <updated>1572318327154</updated> | |
| 1043 | + </task> | |
| 1044 | + <task id="LOCAL-00045" summary="添加复制仓库时，复制用户仓库关系表"> | |
| 1045 | + <created>1572319632042</created> | |
| 1046 | + <option name="number" value="00045" /> | |
| 1047 | + <option name="presentableId" value="LOCAL-00045" /> | |
| 1048 | + <option name="project" value="LOCAL" /> | |
| 1049 | + <updated>1572319632042</updated> | |
| 1050 | + </task> | |
| 1051 | + <task id="LOCAL-00046" summary="优化库位和容器的插入功能"> | |
| 1052 | + <created>1572339639431</created> | |
| 1053 | + <option name="number" value="00046" /> | |
| 1054 | + <option name="presentableId" value="LOCAL-00046" /> | |
| 1055 | + <option name="project" value="LOCAL" /> | |
| 1056 | + <updated>1572339639431</updated> | |
| 1057 | + </task> | |
| 1058 | + <task id="LOCAL-00047" summary="界面修改"> | |
| 1059 | + <created>1572404247104</created> | |
| 1060 | + <option name="number" value="00047" /> | |
| 1061 | + <option name="presentableId" value="LOCAL-00047" /> | |
| 1062 | + <option name="project" value="LOCAL" /> | |
| 1063 | + <updated>1572404247104</updated> | |
| 1064 | + </task> | |
| 1065 | + <task id="LOCAL-00048" summary="界面修改"> | |
| 1066 | + <created>1572430513551</created> | |
| 1067 | + <option name="number" value="00048" /> | |
| 1068 | + <option name="presentableId" value="LOCAL-00048" /> | |
| 1069 | + <option name="project" value="LOCAL" /> | |
| 1070 | + <updated>1572430513551</updated> | |
| 1071 | + </task> | |
| 1072 | + <task id="LOCAL-00049" summary="界面修改"> | |
| 1073 | + <created>1572485193959</created> | |
| 1074 | + <option name="number" value="00049" /> | |
| 1075 | + <option name="presentableId" value="LOCAL-00049" /> | |
| 1076 | + <option name="project" value="LOCAL" /> | |
| 1077 | + <updated>1572485193959</updated> | |
| 1078 | + </task> | |
| 1079 | + <task id="LOCAL-00050" summary="修改界面以及删除物料如果有库存无法删除的修改"> | |
| 1080 | + <created>1572514806738</created> | |
| 1081 | + <option name="number" value="00050" /> | |
| 1082 | + <option name="presentableId" value="LOCAL-00050" /> | |
| 1083 | + <option name="project" value="LOCAL" /> | |
| 1084 | + <updated>1572514806739</updated> | |
| 1085 | + </task> | |
| 1086 | + <task id="LOCAL-00051" summary="物料单位转换"> | |
| 1087 | + <created>1572521475402</created> | |
| 1088 | + <option name="number" value="00051" /> | |
| 1089 | + <option name="presentableId" value="LOCAL-00051" /> | |
| 1090 | + <option name="project" value="LOCAL" /> | |
| 1091 | + <updated>1572521475402</updated> | |
| 1092 | + </task> | |
| 1093 | + <task id="LOCAL-00052" summary="模糊查询"> | |
| 1094 | + <created>1572592205859</created> | |
| 1095 | + <option name="number" value="00052" /> | |
| 1096 | + <option name="presentableId" value="LOCAL-00052" /> | |
| 1097 | + <option name="project" value="LOCAL" /> | |
| 1098 | + <updated>1572592205859</updated> | |
| 1099 | + </task> | |
| 1100 | + <task id="LOCAL-00053" summary="商品界面和货主界面修改"> | |
| 1101 | + <created>1572599577946</created> | |
| 1102 | + <option name="number" value="00053" /> | |
| 1103 | + <option name="presentableId" value="LOCAL-00053" /> | |
| 1104 | + <option name="project" value="LOCAL" /> | |
| 1105 | + <updated>1572599577946</updated> | |
| 1106 | + </task> | |
| 1107 | + <task id="LOCAL-00054" summary="任务抛异常"> | |
| 1108 | + <created>1572601218998</created> | |
| 1109 | + <option name="number" value="00054" /> | |
| 1110 | + <option name="presentableId" value="LOCAL-00054" /> | |
| 1111 | + <option name="project" value="LOCAL" /> | |
| 1112 | + <updated>1572601218998</updated> | |
| 1113 | + </task> | |
| 1114 | + <task id="LOCAL-00055" summary="wcs2接口修改"> | |
| 1115 | + <created>1572866228413</created> | |
| 1116 | + <option name="number" value="00055" /> | |
| 1117 | + <option name="presentableId" value="LOCAL-00055" /> | |
| 1118 | + <option name="project" value="LOCAL" /> | |
| 1119 | + <updated>1572866228414</updated> | |
| 1120 | + </task> | |
| 1121 | + <option name="localTasksCounter" value="56" /> | |
| 515 | 1122 | <servers /> |
| 516 | 1123 | </component> |
| 1124 | + <component name="TimeTrackingManager"> | |
| 1125 | + <option name="totallyTimeSpent" value="218499000" /> | |
| 1126 | + </component> | |
| 1127 | + <component name="TodoView"> | |
| 1128 | + <todo-panel id="selected-file"> | |
| 1129 | + <is-autoscroll-to-source value="true" /> | |
| 1130 | + </todo-panel> | |
| 1131 | + <todo-panel id="all"> | |
| 1132 | + <are-packages-shown value="true" /> | |
| 1133 | + <is-autoscroll-to-source value="true" /> | |
| 1134 | + </todo-panel> | |
| 1135 | + </component> | |
| 1136 | + <component name="ToolWindowManager"> | |
| 1137 | + <frame x="-7" y="-7" width="1550" height="838" extended-state="6" /> | |
| 1138 | + <editor active="true" /> | |
| 1139 | + <layout> | |
| 1140 | + <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.31903484" /> | |
| 1141 | + <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> | |
| 1142 | + <window_info id="Designer" order="2" /> | |
| 1143 | + <window_info id="Image Layers" order="3" /> | |
| 1144 | + <window_info id="Capture Tool" order="4" /> | |
| 1145 | + <window_info id="UI Designer" order="5" /> | |
| 1146 | + <window_info id="Favorites" order="6" side_tool="true" /> | |
| 1147 | + <window_info id="Web" order="7" side_tool="true" /> | |
| 1148 | + <window_info anchor="bottom" id="Message" order="0" /> | |
| 1149 | + <window_info anchor="bottom" id="Find" order="1" weight="0.3286119" /> | |
| 1150 | + <window_info anchor="bottom" id="Run" order="2" /> | |
| 1151 | + <window_info anchor="bottom" id="Debug" order="3" weight="0.4" /> | |
| 1152 | + <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> | |
| 1153 | + <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> | |
| 1154 | + <window_info anchor="bottom" id="TODO" order="6" weight="0.32904148" /> | |
| 1155 | + <window_info anchor="bottom" id="Spring" order="7" weight="0.32904148" /> | |
| 1156 | + <window_info anchor="bottom" id="Terminal" order="8" weight="0.32904148" /> | |
| 1157 | + <window_info anchor="bottom" id="Docker" order="9" show_stripe_button="false" /> | |
| 1158 | + <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.5013405" side_tool="true" weight="0.31444758" /> | |
| 1159 | + <window_info anchor="bottom" id="Messages" order="11" weight="0.3286119" /> | |
| 1160 | + <window_info anchor="bottom" id="Java Enterprise" order="12" weight="0.32904148" /> | |
| 1161 | + <window_info anchor="bottom" id="Database Changes" order="13" weight="0.32761088" /> | |
| 1162 | + <window_info active="true" anchor="bottom" id="Version Control" order="14" sideWeight="0.49865952" visible="true" weight="0.3696884" /> | |
| 1163 | + <window_info anchor="bottom" id="Run Dashboard" order="15" sideWeight="0.49932975" weight="0.34844193" /> | |
| 1164 | + <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> | |
| 1165 | + <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> | |
| 1166 | + <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> | |
| 1167 | + <window_info anchor="right" id="Maven" order="3" weight="0.3297587" /> | |
| 1168 | + <window_info anchor="right" id="Palette" order="4" /> | |
| 1169 | + <window_info anchor="right" id="Capture Analysis" order="5" /> | |
| 1170 | + <window_info anchor="right" id="Database" order="6" /> | |
| 1171 | + <window_info anchor="right" id="Palette	" order="7" /> | |
| 1172 | + <window_info anchor="right" id="Theme Preview" order="8" /> | |
| 1173 | + <window_info anchor="right" id="Bean Validation" order="9" /> | |
| 1174 | + </layout> | |
| 1175 | + </component> | |
| 517 | 1176 | <component name="TypeScriptGeneratedFilesManager"> |
| 518 | 1177 | <option name="version" value="1" /> |
| 519 | 1178 | </component> |
| ... | ... | @@ -523,32 +1182,58 @@ |
| 523 | 1182 | <entry key="MAIN"> |
| 524 | 1183 | <value> |
| 525 | 1184 | <State> |
| 526 | - <option name="COLUMN_ORDER" /> | |
| 1185 | + <option name="RECENTLY_FILTERED_USER_GROUPS"> | |
| 1186 | + <collection /> | |
| 1187 | + </option> | |
| 1188 | + <option name="RECENTLY_FILTERED_BRANCH_GROUPS"> | |
| 1189 | + <collection /> | |
| 1190 | + </option> | |
| 1191 | + <option name="FILTERS"> | |
| 1192 | + <map> | |
| 1193 | + <entry key="branch"> | |
| 1194 | + <value> | |
| 1195 | + <list> | |
| 1196 | + <option value="origin/develop" /> | |
| 1197 | + </list> | |
| 1198 | + </value> | |
| 1199 | + </entry> | |
| 1200 | + </map> | |
| 1201 | + </option> | |
| 1202 | + <option name="COLUMN_ORDER"> | |
| 1203 | + <list> | |
| 1204 | + <option value="0" /> | |
| 1205 | + <option value="1" /> | |
| 1206 | + <option value="2" /> | |
| 1207 | + <option value="3" /> | |
| 1208 | + </list> | |
| 1209 | + </option> | |
| 527 | 1210 | </State> |
| 528 | 1211 | </value> |
| 529 | 1212 | </entry> |
| 530 | 1213 | </map> |
| 531 | 1214 | </option> |
| 1215 | + <option name="RECENT_FILTERS"> | |
| 1216 | + <map> | |
| 1217 | + <entry key="Branch"> | |
| 1218 | + <value> | |
| 1219 | + <list> | |
| 1220 | + <RecentGroup> | |
| 1221 | + <option name="FILTER_VALUES"> | |
| 1222 | + <option value="origin/develop" /> | |
| 1223 | + </option> | |
| 1224 | + </RecentGroup> | |
| 1225 | + </list> | |
| 1226 | + </value> | |
| 1227 | + </entry> | |
| 1228 | + <entry key="User"> | |
| 1229 | + <value> | |
| 1230 | + <list /> | |
| 1231 | + </value> | |
| 1232 | + </entry> | |
| 1233 | + </map> | |
| 1234 | + </option> | |
| 532 | 1235 | </component> |
| 533 | 1236 | <component name="VcsManagerConfiguration"> |
| 534 | - <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" /> | |
| 535 | - <MESSAGE value="修改入库单页面" /> | |
| 536 | - <MESSAGE value="修改入库单页面，入库单审核，质检页面后台跳转接口" /> | |
| 537 | - <MESSAGE value="修改 入库收货，生成上架任务自动执行定位" /> | |
| 538 | - <MESSAGE value="修复商品管理、物料类别种bug" /> | |
| 539 | - <MESSAGE value="修改入库明细添加加载定位规则的错误" /> | |
| 540 | - <MESSAGE value="添加入库质检行内编辑" /> | |
| 541 | - <MESSAGE value="行内编辑完成后更新数据库" /> | |
| 542 | - <MESSAGE value="修改质检登记使用bootstarp boot原生方法初始化" /> | |
| 543 | - <MESSAGE value="表单头创建时间添加默认创建时间 开始时间默认提前一周，结束时间默认当天" /> | |
| 544 | - <MESSAGE value="配置中所有页面添加重置按钮" /> | |
| 545 | - <MESSAGE value="收货添加定位、取消定位、取消组盘按钮" /> | |
| 546 | - <MESSAGE value="修改入库单数量使用BigDecimal类型，修改入库单添加、修改、物理类型添加和修改页面" /> | |
| 547 | - <MESSAGE value="修改物料管理中物料类型使用物料类别表，不在使用数据字典" /> | |
| 548 | - <MESSAGE value="修改波次主表、波次流程头表、波次流程明细页面" /> | |
| 549 | - <MESSAGE value="修改入库首选项修改添加模块为select" /> | |
| 550 | - <MESSAGE value="修改任务取消入库组盘状态不回滚，修改任务完成入库单状态不完成" /> | |
| 551 | - <MESSAGE value="添加自动生成容器编码" /> | |
| 552 | 1237 | <MESSAGE value="修改入库首选项页面，规则查询使用数据字典值，表格值显示修改" /> |
| 553 | 1238 | <MESSAGE value="入库单添加重置按钮，入库单历史添加上游单号搜索" /> |
| 554 | 1239 | <MESSAGE value="添加取消入库组盘时容器为临时容器，删除容器" /> |
| ... | ... | @@ -557,7 +1242,24 @@ |
| 557 | 1242 | <MESSAGE value="修改入库组盘页面中任务类型的显示问题 修改任务完成不修改入库组盘状态的问题" /> |
| 558 | 1243 | <MESSAGE value="添加根据code查询物料" /> |
| 559 | 1244 | <MESSAGE value="添加根据容器编码查找容器的方法 配置规则添加自动添加模块类型 添加是否自动生成临时容器" /> |
| 560 | - <option name="LAST_COMMIT_MESSAGE" value="添加根据容器编码查找容器的方法 配置规则添加自动添加模块类型 添加是否自动生成临时容器" /> | |
| 1245 | + <MESSAGE value="wcs接口修改" /> | |
| 1246 | + <MESSAGE value="页面格式和排版更改" /> | |
| 1247 | + <MESSAGE value="接口地址修改，入库生成任务时字段添加" /> | |
| 1248 | + <MESSAGE value="常量代替数字" /> | |
| 1249 | + <MESSAGE value="复制角色，字典数据，菜单" /> | |
| 1250 | + <MESSAGE value="复制流程，规则配置，波次，菜单" /> | |
| 1251 | + <MESSAGE value="修改masada分支" /> | |
| 1252 | + <MESSAGE value="修改权限" /> | |
| 1253 | + <MESSAGE value="添加复制仓库时，复制用户仓库关系表" /> | |
| 1254 | + <MESSAGE value="优化库位和容器的插入功能" /> | |
| 1255 | + <MESSAGE value="界面修改" /> | |
| 1256 | + <MESSAGE value="修改界面以及删除物料如果有库存无法删除的修改" /> | |
| 1257 | + <MESSAGE value="物料单位转换" /> | |
| 1258 | + <MESSAGE value="模糊查询" /> | |
| 1259 | + <MESSAGE value="商品界面和货主界面修改" /> | |
| 1260 | + <MESSAGE value="任务抛异常" /> | |
| 1261 | + <MESSAGE value="wcs2接口修改" /> | |
| 1262 | + <option name="LAST_COMMIT_MESSAGE" value="wcs2接口修改" /> | |
| 561 | 1263 | </component> |
| 562 | 1264 | <component name="XDebuggerManager"> |
| 563 | 1265 | <breakpoint-manager> |
| ... | ... | @@ -565,42 +1267,49 @@ |
| 565 | 1267 | <line-breakpoint enabled="true" type="java-line"> |
| 566 | 1268 | <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/bom/controller/BomHeaderController.java</url> |
| 567 | 1269 | <line>164</line> |
| 1270 | + <properties /> | |
| 568 | 1271 | <option name="timeStamp" value="24" /> |
| 569 | 1272 | </line-breakpoint> |
| 570 | 1273 | <line-breakpoint enabled="true" type="java-line"> |
| 571 | - <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/material/controller/MaterialController.java</url> | |
| 572 | - <line>150</line> | |
| 573 | - <option name="timeStamp" value="26" /> | |
| 574 | - </line-breakpoint> | |
| 575 | - <line-breakpoint enabled="true" type="java-line"> | |
| 576 | 1274 | <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/check/checkingRegister/controller/CheckingRegisterController.java</url> |
| 577 | - <line>174</line> | |
| 1275 | + <line>175</line> | |
| 1276 | + <properties /> | |
| 578 | 1277 | <option name="timeStamp" value="28" /> |
| 579 | 1278 | </line-breakpoint> |
| 580 | 1279 | <line-breakpoint enabled="true" type="java-line"> |
| 581 | - <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java</url> | |
| 582 | - <line>631</line> | |
| 583 | - <option name="timeStamp" value="48" /> | |
| 584 | - </line-breakpoint> | |
| 585 | - <line-breakpoint enabled="true" type="java-line"> | |
| 586 | 1280 | <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerDetail/service/ReceiptContainerDetailServiceImpl.java</url> |
| 587 | - <line>56</line> | |
| 1281 | + <line>57</line> | |
| 1282 | + <properties /> | |
| 588 | 1283 | <option name="timeStamp" value="49" /> |
| 589 | 1284 | </line-breakpoint> |
| 590 | 1285 | <line-breakpoint enabled="true" type="java-line"> |
| 591 | 1286 | <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerDetail/service/ReceiptContainerDetailServiceImpl.java</url> |
| 592 | - <line>84</line> | |
| 1287 | + <line>85</line> | |
| 1288 | + <properties /> | |
| 593 | 1289 | <option name="timeStamp" value="51" /> |
| 594 | 1290 | </line-breakpoint> |
| 595 | 1291 | <line-breakpoint enabled="true" type="java-line"> |
| 596 | - <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/statusFlow/controller/StatusFlowHeaderController.java</url> | |
| 597 | - <line>86</line> | |
| 598 | - <option name="timeStamp" value="57" /> | |
| 1292 | + <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/emptyOutHandle/EmptyOutHandleServiceImpl.java</url> | |
| 1293 | + <line>31</line> | |
| 1294 | + <properties /> | |
| 1295 | + <option name="timeStamp" value="63" /> | |
| 599 | 1296 | </line-breakpoint> |
| 600 | 1297 | <line-breakpoint enabled="true" type="java-line"> |
| 601 | - <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/check/checkingRegister/controller/CheckingRegisterController.java</url> | |
| 602 | - <line>145</line> | |
| 603 | - <option name="timeStamp" value="62" /> | |
| 1298 | + <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/overrideHandle/OverrideHandleServiceImpl.java</url> | |
| 1299 | + <line>108</line> | |
| 1300 | + <properties /> | |
| 1301 | + <option name="timeStamp" value="70" /> | |
| 1302 | + </line-breakpoint> | |
| 1303 | + <line-breakpoint enabled="true" type="java-line"> | |
| 1304 | + <url>jar://$MAVEN_REPOSITORY$/com/alibaba/fastjson/1.2.59/fastjson-1.2.59.jar!/com/alibaba/fastjson/JSONException.class</url> | |
| 1305 | + <properties /> | |
| 1306 | + <option name="timeStamp" value="71" /> | |
| 1307 | + </line-breakpoint> | |
| 1308 | + <line-breakpoint enabled="true" type="java-line"> | |
| 1309 | + <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/materialMultiple/controller/MaterialMultipleController.java</url> | |
| 1310 | + <line>105</line> | |
| 1311 | + <properties /> | |
| 1312 | + <option name="timeStamp" value="90" /> | |
| 604 | 1313 | </line-breakpoint> |
| 605 | 1314 | <line-breakpoint enabled="true" type="javascript"> |
| 606 | 1315 | <url>file://$PROJECT_DIR$/src/main/resources/templates/check/checkingRegister/checkingRegister.html</url> |
| ... | ... | @@ -617,6 +1326,7 @@ |
| 617 | 1326 | <watches-manager> |
| 618 | 1327 | <configuration name="SpringBootApplicationConfigurationType"> |
| 619 | 1328 | <watch expression="receiptDetailService.getById(receiptContainerDetail.getReceiptDetailId()).getLocatingRule()" language="JAVA" /> |
| 1329 | + <watch expression="dictDataList" /> | |
| 620 | 1330 | </configuration> |
| 621 | 1331 | </watches-manager> |
| 622 | 1332 | </component> |
| ... | ... | @@ -625,4 +1335,358 @@ |
| 625 | 1335 | <FILTER>com.huaheng.*</FILTER> |
| 626 | 1336 | </SUITE> |
| 627 | 1337 | </component> |
| 1338 | + <component name="editorHistoryManager"> | |
| 1339 | + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/material/edit.html"> | |
| 1340 | + <provider selected="true" editor-type-id="text-editor"> | |
| 1341 | + <state relative-caret-position="-1650" /> | |
| 1342 | + </provider> | |
| 1343 | + </entry> | |
| 1344 | + <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/5.1.5.RELEASE/spring-expression-5.1.5.RELEASE.jar!/org/springframework/expression/spel/support/ReflectiveMethodExecutor.class"> | |
| 1345 | + <provider selected="true" editor-type-id="text-editor"> | |
| 1346 | + <state relative-caret-position="137"> | |
| 1347 | + <caret line="80" selection-start-line="80" selection-end-line="80" /> | |
| 1348 | + </state> | |
| 1349 | + </provider> | |
| 1350 | + </entry> | |
| 1351 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/FilterConfigDetail/service/FilterConfigDetailService.java"> | |
| 1352 | + <provider selected="true" editor-type-id="text-editor"> | |
| 1353 | + <state relative-caret-position="137"> | |
| 1354 | + <caret line="20" column="80" lean-forward="true" selection-start-line="20" selection-start-column="80" selection-end-line="20" selection-end-column="80" /> | |
| 1355 | + </state> | |
| 1356 | + </provider> | |
| 1357 | + </entry> | |
| 1358 | + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/materialType/add.html"> | |
| 1359 | + <provider selected="true" editor-type-id="text-editor"> | |
| 1360 | + <state relative-caret-position="225"> | |
| 1361 | + <caret line="51" column="115" lean-forward="true" selection-start-line="51" selection-start-column="115" selection-end-line="51" selection-end-column="115" /> | |
| 1362 | + </state> | |
| 1363 | + </provider> | |
| 1364 | + </entry> | |
| 1365 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/statusFlow/service/StatusFlowHeaderService.java"> | |
| 1366 | + <provider selected="true" editor-type-id="text-editor"> | |
| 1367 | + <state relative-caret-position="212"> | |
| 1368 | + <caret line="28" column="84" selection-start-line="28" selection-start-column="84" selection-end-line="28" selection-end-column="84" /> | |
| 1369 | + </state> | |
| 1370 | + </provider> | |
| 1371 | + </entry> | |
| 1372 | + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/materialType/edit.html"> | |
| 1373 | + <provider selected="true" editor-type-id="text-editor"> | |
| 1374 | + <state relative-caret-position="50"> | |
| 1375 | + <caret line="74" column="137" selection-start-line="74" selection-start-column="123" selection-end-line="74" selection-end-column="137" /> | |
| 1376 | + </state> | |
| 1377 | + </provider> | |
| 1378 | + </entry> | |
| 1379 | + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/material/add.html"> | |
| 1380 | + <provider selected="true" editor-type-id="text-editor"> | |
| 1381 | + <state relative-caret-position="50"> | |
| 1382 | + <caret line="62" column="167" selection-start-line="62" selection-start-column="155" selection-end-line="62" selection-end-column="167" /> | |
| 1383 | + </state> | |
| 1384 | + </provider> | |
| 1385 | + </entry> | |
| 1386 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/materialType/controller/MaterialTypeController.java"> | |
| 1387 | + <provider selected="true" editor-type-id="text-editor"> | |
| 1388 | + <state relative-caret-position="-619"> | |
| 1389 | + <caret line="70" column="64" selection-start-line="70" selection-start-column="64" selection-end-line="70" selection-end-column="64" /> | |
| 1390 | + </state> | |
| 1391 | + </provider> | |
| 1392 | + </entry> | |
| 1393 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/materialUnit/controller/MaterialUnitController.java"> | |
| 1394 | + <provider selected="true" editor-type-id="text-editor"> | |
| 1395 | + <state relative-caret-position="-887"> | |
| 1396 | + <caret line="115" column="67" lean-forward="true" selection-start-line="115" selection-start-column="67" selection-end-line="115" selection-end-column="67" /> | |
| 1397 | + </state> | |
| 1398 | + </provider> | |
| 1399 | + </entry> | |
| 1400 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/materialMultiple/domain/MaterialMultiple.java"> | |
| 1401 | + <provider selected="true" editor-type-id="text-editor"> | |
| 1402 | + <state relative-caret-position="1375"> | |
| 1403 | + <caret line="63" column="19" selection-start-line="63" selection-start-column="19" selection-end-line="63" selection-end-column="19" /> | |
| 1404 | + </state> | |
| 1405 | + </provider> | |
| 1406 | + </entry> | |
| 1407 | + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/materialMultiple/materialMultiple.html"> | |
| 1408 | + <provider selected="true" editor-type-id="text-editor"> | |
| 1409 | + <state relative-caret-position="2275"> | |
| 1410 | + <caret line="91" column="44" selection-start-line="91" selection-start-column="44" selection-end-line="91" selection-end-column="44" /> | |
| 1411 | + </state> | |
| 1412 | + </provider> | |
| 1413 | + </entry> | |
| 1414 | + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/materialMultiple/add.html"> | |
| 1415 | + <provider selected="true" editor-type-id="text-editor"> | |
| 1416 | + <state relative-caret-position="625"> | |
| 1417 | + <caret line="25" column="49" selection-start-line="25" selection-start-column="42" selection-end-line="25" selection-end-column="49" /> | |
| 1418 | + </state> | |
| 1419 | + </provider> | |
| 1420 | + </entry> | |
| 1421 | + <entry file="file://$PROJECT_DIR$/src/main/resources/application-druid.properties"> | |
| 1422 | + <provider selected="true" editor-type-id="text-editor" /> | |
| 1423 | + </entry> | |
| 1424 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/materialMultiple/controller/MaterialMultipleController.java"> | |
| 1425 | + <provider selected="true" editor-type-id="text-editor"> | |
| 1426 | + <state relative-caret-position="75"> | |
| 1427 | + <caret line="61" column="50" lean-forward="true" selection-start-line="61" selection-start-column="50" selection-end-line="61" selection-end-column="50" /> | |
| 1428 | + </state> | |
| 1429 | + </provider> | |
| 1430 | + </entry> | |
| 1431 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/bom/controller/BomHeaderController.java"> | |
| 1432 | + <provider selected="true" editor-type-id="text-editor"> | |
| 1433 | + <state relative-caret-position="162"> | |
| 1434 | + <caret line="72" column="80" selection-start-line="72" selection-start-column="80" selection-end-line="72" selection-end-column="80" /> | |
| 1435 | + </state> | |
| 1436 | + </provider> | |
| 1437 | + </entry> | |
| 1438 | + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/bomHeader/bomHeader.html"> | |
| 1439 | + <provider selected="true" editor-type-id="text-editor"> | |
| 1440 | + <state relative-caret-position="-1950" /> | |
| 1441 | + </provider> | |
| 1442 | + </entry> | |
| 1443 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/warehouse/service/WarehouseService.java"> | |
| 1444 | + <provider selected="true" editor-type-id="text-editor"> | |
| 1445 | + <state relative-caret-position="125"> | |
| 1446 | + <caret line="10" column="29" selection-start-line="10" selection-start-column="29" selection-end-line="10" selection-end-column="29" /> | |
| 1447 | + </state> | |
| 1448 | + </provider> | |
| 1449 | + </entry> | |
| 1450 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java"> | |
| 1451 | + <provider selected="true" editor-type-id="text-editor"> | |
| 1452 | + <state relative-caret-position="225"> | |
| 1453 | + <caret line="17" column="27" selection-start-line="17" selection-start-column="27" selection-end-line="17" selection-end-column="27" /> | |
| 1454 | + </state> | |
| 1455 | + </provider> | |
| 1456 | + </entry> | |
| 1457 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/taskAssignService/TaskAssignService.java"> | |
| 1458 | + <provider selected="true" editor-type-id="text-editor"> | |
| 1459 | + <state relative-caret-position="325"> | |
| 1460 | + <caret line="14" column="15" selection-start-line="14" selection-start-column="15" selection-end-line="14" selection-end-column="15" /> | |
| 1461 | + </state> | |
| 1462 | + </provider> | |
| 1463 | + </entry> | |
| 1464 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/role/mapper/RoleMapper.java"> | |
| 1465 | + <provider selected="true" editor-type-id="text-editor"> | |
| 1466 | + <state relative-caret-position="2325"> | |
| 1467 | + <caret line="95" selection-start-line="95" selection-end-line="95" /> | |
| 1468 | + </state> | |
| 1469 | + </provider> | |
| 1470 | + </entry> | |
| 1471 | + <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/system/RoleMapper.xml"> | |
| 1472 | + <provider selected="true" editor-type-id="text-editor"> | |
| 1473 | + <state relative-caret-position="3275"> | |
| 1474 | + <caret line="131" selection-start-line="131" selection-end-line="131" /> | |
| 1475 | + </state> | |
| 1476 | + </provider> | |
| 1477 | + </entry> | |
| 1478 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/common/utils/StringUtils.java"> | |
| 1479 | + <provider selected="true" editor-type-id="text-editor"> | |
| 1480 | + <state relative-caret-position="225"> | |
| 1481 | + <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" /> | |
| 1482 | + </state> | |
| 1483 | + </provider> | |
| 1484 | + </entry> | |
| 1485 | + <entry file="file://$PROJECT_DIR$/src/main/resources/application-dev.yml"> | |
| 1486 | + <provider selected="true" editor-type-id="text-editor"> | |
| 1487 | + <state relative-caret-position="56"> | |
| 1488 | + <caret line="15" column="12" lean-forward="true" selection-start-line="15" selection-start-column="12" selection-end-line="15" selection-end-column="12" /> | |
| 1489 | + </state> | |
| 1490 | + </provider> | |
| 1491 | + </entry> | |
| 1492 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/controller/OverrideHandle.java"> | |
| 1493 | + <provider selected="true" editor-type-id="text-editor"> | |
| 1494 | + <state relative-caret-position="140"> | |
| 1495 | + <caret line="34" column="60" selection-start-line="34" selection-start-column="60" selection-end-line="34" selection-end-column="60" /> | |
| 1496 | + </state> | |
| 1497 | + </provider> | |
| 1498 | + </entry> | |
| 1499 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/overrideHandle/OverrideHandleService.java"> | |
| 1500 | + <provider selected="true" editor-type-id="text-editor"> | |
| 1501 | + <state relative-caret-position="175"> | |
| 1502 | + <caret line="9" column="15" selection-start-line="9" selection-start-column="15" selection-end-line="9" selection-end-column="15" /> | |
| 1503 | + </state> | |
| 1504 | + </provider> | |
| 1505 | + </entry> | |
| 1506 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/overrideHandle/OverrideHandleServiceImpl.java"> | |
| 1507 | + <provider selected="true" editor-type-id="text-editor"> | |
| 1508 | + <state relative-caret-position="-3296"> | |
| 1509 | + <caret line="59" column="22" selection-start-line="59" selection-start-column="22" selection-end-line="59" selection-end-column="22" /> | |
| 1510 | + </state> | |
| 1511 | + </provider> | |
| 1512 | + </entry> | |
| 1513 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/emptyOutHandle/EmptyOutHandleService.java"> | |
| 1514 | + <provider selected="true" editor-type-id="text-editor"> | |
| 1515 | + <state relative-caret-position="150"> | |
| 1516 | + <caret line="7" column="15" selection-start-line="7" selection-start-column="15" selection-end-line="7" selection-end-column="15" /> | |
| 1517 | + </state> | |
| 1518 | + </provider> | |
| 1519 | + </entry> | |
| 1520 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/controller/TaskFinish.java"> | |
| 1521 | + <provider selected="true" editor-type-id="text-editor"> | |
| 1522 | + <state relative-caret-position="164"> | |
| 1523 | + <caret line="35" column="53" selection-start-line="35" selection-start-column="53" selection-end-line="35" selection-end-column="53" /> | |
| 1524 | + </state> | |
| 1525 | + </provider> | |
| 1526 | + </entry> | |
| 1527 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/taskFinish/TaskFinishService.java"> | |
| 1528 | + <provider selected="true" editor-type-id="text-editor"> | |
| 1529 | + <state relative-caret-position="175"> | |
| 1530 | + <caret line="8" column="15" selection-start-line="8" selection-start-column="15" selection-end-line="8" selection-end-column="15" /> | |
| 1531 | + </state> | |
| 1532 | + </provider> | |
| 1533 | + </entry> | |
| 1534 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/emptyOutHandle/EmptyOutHandleServiceImpl.java"> | |
| 1535 | + <provider selected="true" editor-type-id="text-editor"> | |
| 1536 | + <state relative-caret-position="229"> | |
| 1537 | + <caret line="49" column="9" lean-forward="true" selection-start-line="45" selection-start-column="7" selection-end-line="49" selection-end-column="9" /> | |
| 1538 | + </state> | |
| 1539 | + </provider> | |
| 1540 | + </entry> | |
| 1541 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/controller/EmptyOutHandle.java"> | |
| 1542 | + <provider selected="true" editor-type-id="text-editor"> | |
| 1543 | + <state relative-caret-position="571"> | |
| 1544 | + <caret line="35" column="59" selection-start-line="35" selection-start-column="59" selection-end-line="35" selection-end-column="59" /> | |
| 1545 | + </state> | |
| 1546 | + </provider> | |
| 1547 | + </entry> | |
| 1548 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/taskInfo/TaskInfoService.java"> | |
| 1549 | + <provider selected="true" editor-type-id="text-editor"> | |
| 1550 | + <state relative-caret-position="175"> | |
| 1551 | + <caret line="7" column="15" selection-start-line="7" selection-start-column="15" selection-end-line="7" selection-end-column="15" /> | |
| 1552 | + </state> | |
| 1553 | + </provider> | |
| 1554 | + </entry> | |
| 1555 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/taskInfo/TaskInfoServiceImpl.java"> | |
| 1556 | + <provider selected="true" editor-type-id="text-editor"> | |
| 1557 | + <state relative-caret-position="357"> | |
| 1558 | + <caret line="44" selection-start-line="44" selection-end-line="44" /> | |
| 1559 | + </state> | |
| 1560 | + </provider> | |
| 1561 | + </entry> | |
| 1562 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/bom/domain/BomHeader.java"> | |
| 1563 | + <provider selected="true" editor-type-id="text-editor"> | |
| 1564 | + <state relative-caret-position="175"> | |
| 1565 | + <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" /> | |
| 1566 | + </state> | |
| 1567 | + </provider> | |
| 1568 | + </entry> | |
| 1569 | + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/company/edit.html"> | |
| 1570 | + <provider selected="true" editor-type-id="text-editor"> | |
| 1571 | + <state relative-caret-position="6825"> | |
| 1572 | + <caret line="273" column="9" selection-start-line="273" selection-start-column="9" selection-end-line="273" selection-end-column="9" /> | |
| 1573 | + </state> | |
| 1574 | + </provider> | |
| 1575 | + </entry> | |
| 1576 | + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/bomHeader/add.html"> | |
| 1577 | + <provider selected="true" editor-type-id="text-editor"> | |
| 1578 | + <state relative-caret-position="2500"> | |
| 1579 | + <caret line="100" column="77" selection-start-line="100" selection-start-column="77" selection-end-line="100" selection-end-column="77" /> | |
| 1580 | + </state> | |
| 1581 | + </provider> | |
| 1582 | + </entry> | |
| 1583 | + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/bomHeader/edit.html"> | |
| 1584 | + <provider selected="true" editor-type-id="text-editor"> | |
| 1585 | + <state relative-caret-position="925"> | |
| 1586 | + <caret line="37" column="32" selection-start-line="37" selection-start-column="32" selection-end-line="37" selection-end-column="32" /> | |
| 1587 | + </state> | |
| 1588 | + </provider> | |
| 1589 | + </entry> | |
| 1590 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/warehouse/service/WarehouseServiceImpl.java"> | |
| 1591 | + <provider selected="true" editor-type-id="text-editor"> | |
| 1592 | + <state relative-caret-position="1350"> | |
| 1593 | + <caret line="85" column="102" selection-start-line="85" selection-start-column="68" selection-end-line="85" selection-end-column="102" /> | |
| 1594 | + </state> | |
| 1595 | + </provider> | |
| 1596 | + </entry> | |
| 1597 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/company/service/CompanyService.java"> | |
| 1598 | + <provider selected="true" editor-type-id="text-editor"> | |
| 1599 | + <state relative-caret-position="300"> | |
| 1600 | + <caret line="17" column="22" selection-start-line="17" selection-start-column="22" selection-end-line="17" selection-end-column="22" /> | |
| 1601 | + </state> | |
| 1602 | + </provider> | |
| 1603 | + </entry> | |
| 1604 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/company/service/CompanyServiceImpl.java"> | |
| 1605 | + <provider selected="true" editor-type-id="text-editor"> | |
| 1606 | + <state relative-caret-position="1850"> | |
| 1607 | + <caret line="89" selection-start-line="89" selection-end-line="89" /> | |
| 1608 | + </state> | |
| 1609 | + </provider> | |
| 1610 | + </entry> | |
| 1611 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/excelTemplate/controller/excelTemplateController.java"> | |
| 1612 | + <provider selected="true" editor-type-id="text-editor"> | |
| 1613 | + <state relative-caret-position="2400"> | |
| 1614 | + <caret line="125" column="51" selection-start-line="125" selection-start-column="51" selection-end-line="125" selection-end-column="51" /> | |
| 1615 | + </state> | |
| 1616 | + </provider> | |
| 1617 | + </entry> | |
| 1618 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/material/controller/MaterialController.java"> | |
| 1619 | + <provider selected="true" editor-type-id="text-editor"> | |
| 1620 | + <state relative-caret-position="129"> | |
| 1621 | + <caret line="72" column="89" selection-start-line="72" selection-start-column="89" selection-end-line="72" selection-end-column="89" /> | |
| 1622 | + </state> | |
| 1623 | + </provider> | |
| 1624 | + </entry> | |
| 1625 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/company/controller/CompanyController.java"> | |
| 1626 | + <provider selected="true" editor-type-id="text-editor"> | |
| 1627 | + <state relative-caret-position="357"> | |
| 1628 | + <caret line="126" selection-start-line="126" selection-end-line="126" /> | |
| 1629 | + </state> | |
| 1630 | + </provider> | |
| 1631 | + </entry> | |
| 1632 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/taskCancel/TaskCancelService.java"> | |
| 1633 | + <provider selected="true" editor-type-id="text-editor"> | |
| 1634 | + <state relative-caret-position="175"> | |
| 1635 | + <caret line="8" column="15" selection-start-line="8" selection-start-column="15" selection-end-line="8" selection-end-column="15" /> | |
| 1636 | + </state> | |
| 1637 | + </provider> | |
| 1638 | + </entry> | |
| 1639 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java"> | |
| 1640 | + <provider selected="true" editor-type-id="text-editor"> | |
| 1641 | + <state relative-caret-position="225"> | |
| 1642 | + <caret line="71" selection-start-line="71" selection-end-line="71" /> | |
| 1643 | + </state> | |
| 1644 | + </provider> | |
| 1645 | + </entry> | |
| 1646 | + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/taskHeader.html"> | |
| 1647 | + <provider selected="true" editor-type-id="text-editor"> | |
| 1648 | + <state relative-caret-position="350"> | |
| 1649 | + <caret line="26" column="112" selection-start-line="26" selection-start-column="112" selection-end-line="26" selection-end-column="112" /> | |
| 1650 | + <folding> | |
| 1651 | + <element signature="n#style#0;n#i#0;n#a#0;n#!!top" expanded="true" /> | |
| 1652 | + </folding> | |
| 1653 | + </state> | |
| 1654 | + </provider> | |
| 1655 | + </entry> | |
| 1656 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/domain/WcsTask.java"> | |
| 1657 | + <provider selected="true" editor-type-id="text-editor"> | |
| 1658 | + <state relative-caret-position="342"> | |
| 1659 | + <caret line="21" column="29" selection-start-line="21" selection-start-column="29" selection-end-line="21" selection-end-column="29" /> | |
| 1660 | + </state> | |
| 1661 | + </provider> | |
| 1662 | + </entry> | |
| 1663 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/taskAssignService/TaskAssignServiceImpl.java"> | |
| 1664 | + <provider selected="true" editor-type-id="text-editor"> | |
| 1665 | + <state relative-caret-position="267"> | |
| 1666 | + <caret line="127" column="13" selection-start-line="127" selection-start-column="13" selection-end-line="127" selection-end-column="13" /> | |
| 1667 | + </state> | |
| 1668 | + </provider> | |
| 1669 | + </entry> | |
| 1670 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/taskCancel/TaskCancelServiceImpl.java"> | |
| 1671 | + <provider selected="true" editor-type-id="text-editor"> | |
| 1672 | + <state relative-caret-position="239"> | |
| 1673 | + <caret line="42" column="66" selection-start-line="42" selection-start-column="66" selection-end-line="42" selection-end-column="66" /> | |
| 1674 | + </state> | |
| 1675 | + </provider> | |
| 1676 | + </entry> | |
| 1677 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/taskFinish/TaskFinishServiceImpl.java"> | |
| 1678 | + <provider selected="true" editor-type-id="text-editor"> | |
| 1679 | + <state relative-caret-position="792"> | |
| 1680 | + <caret line="42" column="9" selection-start-line="42" selection-start-column="9" selection-end-line="42" selection-end-column="9" /> | |
| 1681 | + </state> | |
| 1682 | + </provider> | |
| 1683 | + </entry> | |
| 1684 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java"> | |
| 1685 | + <provider selected="true" editor-type-id="text-editor"> | |
| 1686 | + <state relative-caret-position="91"> | |
| 1687 | + <caret line="435" column="12" selection-start-line="435" selection-start-column="12" selection-end-line="435" selection-end-column="12" /> | |
| 1688 | + </state> | |
| 1689 | + </provider> | |
| 1690 | + </entry> | |
| 1691 | + </component> | |
| 628 | 1692 | </project> |
| 629 | 1693 | \ No newline at end of file |
| ... | ... |
src/main/java/com/huaheng/api/wcs/domain/WcsTask.java
src/main/java/com/huaheng/api/wcs/service/taskAssignService/TaskAssignServiceImpl.java
| ... | ... | @@ -90,12 +90,21 @@ public class TaskAssignServiceImpl implements TaskAssignService { |
| 90 | 90 | //3、转换实体，初始化wcs任务实体 |
| 91 | 91 | WcsTask wcsTask = new WcsTask(); |
| 92 | 92 | wcsTask.setTaskNo(taskHeader.getId().toString()); |
| 93 | + wcsTask.setPreTaskNo("0"); | |
| 93 | 94 | wcsTask.setTaskType(taskHeader.getTaskType().toString()); |
| 94 | 95 | wcsTask.setFromPort("0"); |
| 95 | 96 | wcsTask.setToPort("0"); |
| 96 | 97 | wcsTask.setContainerCode(taskHeader.getContainerCode()); |
| 97 | - wcsTask.setFromLocationCode(taskHeader.getFromLocation()); | |
| 98 | - wcsTask.setToLocationCode(taskHeader.getToLocation()); | |
| 98 | + if(StringUtils.isEmpty(taskHeader.getFromLocation())){ | |
| 99 | + wcsTask.setFromLocationCode("0"); | |
| 100 | + }else { | |
| 101 | + wcsTask.setFromLocationCode(taskHeader.getFromLocation()); | |
| 102 | + } | |
| 103 | + if(StringUtils.isEmpty(taskHeader.getToLocation())){ | |
| 104 | + wcsTask.setToLocationCode("0"); | |
| 105 | + }else { | |
| 106 | + wcsTask.setToLocationCode(taskHeader.getToLocation()); | |
| 107 | + } | |
| 99 | 108 | wcsTask.setPriority(100); |
| 100 | 109 | wcsTask.setRemark("0"); |
| 101 | 110 | wcsTask.setPlatform(platform); |
| ... | ... | @@ -112,7 +121,11 @@ public class TaskAssignServiceImpl implements TaskAssignService { |
| 112 | 121 | TaskDetails details = new TaskDetails(); |
| 113 | 122 | details.setMaterialCode(item.getMaterialCode()); |
| 114 | 123 | details.setMaterialName(item.getMaterialName()); |
| 115 | - details.setUnit(item.getMaterialUnit()); | |
| 124 | + if(StringUtils.isEmpty(item.getMaterialUnit())){ | |
| 125 | + details.setUnit("PCS"); | |
| 126 | + }else { | |
| 127 | + details.setUnit(item.getMaterialUnit()); | |
| 128 | + } | |
| 116 | 129 | details.setQty(item.getQty()); |
| 117 | 130 | details.setReferLineNo(item.getId().toString()); |
| 118 | 131 | taskDetails.add(details); |
| ... | ... | @@ -130,6 +143,9 @@ public class TaskAssignServiceImpl implements TaskAssignService { |
| 130 | 143 | throw new ServiceException("接口地址错误"); |
| 131 | 144 | } |
| 132 | 145 | AjaxResult ajaxResult = JSON.parseObject(result, AjaxResult.class); |
| 146 | + if(ajaxResult.getCode()!=200){ | |
| 147 | + throw new ServiceException(ajaxResult.getMsg()); | |
| 148 | + } | |
| 133 | 149 | return ajaxResult; |
| 134 | 150 | } |
| 135 | 151 | } |
| ... | ... |
src/main/java/com/huaheng/api/wcs/service/taskCancel/TaskCancelServiceImpl.java
| ... | ... | @@ -40,7 +40,7 @@ public class TaskCancelServiceImpl implements TaskCancelService { |
| 40 | 40 | |
| 41 | 41 | //3、发送数据 |
| 42 | 42 | String param="wcs"; |
| 43 | - String url=addressService.selectAddress(param)+"TaskCance"; | |
| 43 | + String url=addressService.selectAddress(param)+"TaskCancel"; | |
| 44 | 44 | String JsonParam = JSON.toJSONString(wcsTask); |
| 45 | 45 | String result = HttpUtils.bodypost(url, JsonParam); |
| 46 | 46 | if(StringUtils.isEmpty(result)){ |
| ... | ... |
src/main/java/com/huaheng/api/wcs/service/taskFinish/TaskFinishServiceImpl.java
| 1 | 1 | package com.huaheng.api.wcs.service.taskFinish; |
| 2 | 2 | |
| 3 | +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; | |
| 4 | +import com.baomidou.mybatisplus.core.toolkit.Wrappers; | |
| 3 | 5 | import com.huaheng.api.wcs.domain.TaskFinishDomain; |
| 4 | 6 | import com.huaheng.common.support.Convert; |
| 5 | 7 | import com.huaheng.common.utils.StringUtils; |
| 6 | 8 | import com.huaheng.framework.web.domain.AjaxResult; |
| 9 | +import com.huaheng.pc.task.taskHeader.domain.TaskHeader; | |
| 7 | 10 | import com.huaheng.pc.task.taskHeader.service.TaskHeaderService; |
| 8 | 11 | import org.springframework.beans.factory.annotation.Autowired; |
| 9 | 12 | import org.springframework.stereotype.Service; |
| ... | ... | @@ -21,6 +24,23 @@ public class TaskFinishServiceImpl implements TaskFinishService { |
| 21 | 24 | if(StringUtils.isEmpty(taskFinishDomain.getTaskNo())){ |
| 22 | 25 | return AjaxResult.error("任务号为空"); |
| 23 | 26 | } |
| 27 | + | |
| 28 | + if(taskFinishDomain.getIsEmptyOut() == 1){ | |
| 29 | + LambdaQueryWrapper<TaskHeader> lam = Wrappers.lambdaQuery(); | |
| 30 | + lam.eq(TaskHeader::getId,Integer.valueOf(taskFinishDomain.getTaskNo())); | |
| 31 | + TaskHeader taskHeader = taskHeaderService.getOne(lam); | |
| 32 | + if(taskHeader == null){ | |
| 33 | + return AjaxResult.error("wms系统没有此任务号"); | |
| 34 | + } | |
| 35 | + if(StringUtils.isEmpty(taskHeader.getExceptionCode())) { | |
| 36 | + taskHeader.setExceptionCode("空托出库"); | |
| 37 | + Boolean flag = taskHeaderService.updateById(taskHeader); | |
| 38 | + if (flag == false) { | |
| 39 | + return AjaxResult.error("修改任务失败，空出处理失败"); | |
| 40 | + } | |
| 41 | + } | |
| 42 | + return AjaxResult.success("成功"); | |
| 43 | + } | |
| 24 | 44 | try{ |
| 25 | 45 | ajaxResult=taskHeaderService.completeTaskByWMS(Convert.toIntArray(taskFinishDomain.getTaskNo())); |
| 26 | 46 | } catch (Exception e) { |
| ... | ... |
src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java
| ... | ... | @@ -69,7 +69,6 @@ public class TaskHeaderController extends BaseController { |
| 69 | 69 | lambdaQueryWrapper.eq(TaskHeader::getWarehouseCode,ShiroUtils.getWarehouseCode()) |
| 70 | 70 | .in(TaskHeader::getCompanyCode,ShiroUtils.getCompanyCodeList()) |
| 71 | 71 | .eq(StringUtils.isNotNull(InternalTaskType),TaskHeader::getInternalTaskType,InternalTaskType) |
| 72 | - .eq(StringUtils.isNotNull(taskHeader.getInternalTaskType()),TaskHeader::getInternalTaskType,taskHeader.getInternalTaskType()) | |
| 73 | 72 | .eq(StringUtils.isNotNull(taskHeader.getId()),TaskHeader::getId,taskHeader.getId()) |
| 74 | 73 | .eq(StringUtils.isNotEmpty(taskHeader.getContainerCode()),TaskHeader::getContainerCode,taskHeader.getContainerCode()) |
| 75 | 74 | .eq(StringUtils.isNotEmpty(taskHeader.getToLocation()),TaskHeader::getToLocation,taskHeader.getToLocation()) |
| ... | ... |
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
| ... | ... | @@ -365,6 +365,9 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea |
| 365 | 365 | if (task.getStatus() >= QuantityConstant.TASK_STATUS_RELEASE) { |
| 366 | 366 | return AjaxResult.error("任务" + taskId + "已经下发，请不要重复下发，操作中止"); |
| 367 | 367 | } |
| 368 | + // 给wcs传递任务 | |
| 369 | + taskAssignService.wcsTaskAssign(task); | |
| 370 | + | |
| 368 | 371 | //修改任务头表 |
| 369 | 372 | task.setId(taskId); |
| 370 | 373 | task.setStatus(QuantityConstant.TASK_STATUS_RELEASE); |
| ... | ... | @@ -431,8 +434,6 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea |
| 431 | 434 | // } |
| 432 | 435 | // } |
| 433 | 436 | |
| 434 | -// 给wcs传递任务 | |
| 435 | - taskAssignService.wcsTaskAssign(task); | |
| 436 | 437 | } |
| 437 | 438 | return AjaxResult.success("执行下发任务成功", task); |
| 438 | 439 | } |
| ... | ... |
src/main/resources/templates/task/taskHeader/taskHeader.html