wms / wms_changshabiyadi · Commits

Commit 850393c403c5d2a2c5bcb791f8712c0342d2ed33

Authored by mahuandong
2 parents 2c217775 b1c71d1e

Merge remote-tracking branch 'origin/develop' into develop 

# Conflicts:
#	.idea/workspace.xml
#	src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java
#	src/main/java/com/huaheng/pc/task/taskHeader/domain/TaskHeader.java
#	src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
#	src/main/resources/mybatis/task/TaskHeaderMapper.xml
Inline Side-by-side
Showing 29 changed files with 1292 additions and 352 deletions
.idea/compiler.xml
  View file @850393c
... ... @@ -7,13 +7,15 @@
7 7 <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
8 8 <outputRelativeToContentRoot value="true" />
9 9 <module name="huaheng" />
  10 + <module name="wms2" />
10 11 </profile>
11 12 </annotationProcessing>
12 13 </component>
13 14 <component name="JavacSettings">
14   - <option name="ADDITIONAL_OPTIONS_STRING" value="-encoding utf-8" />
15 15 <option name="ADDITIONAL_OPTIONS_OVERRIDE">
  16 + <module name="WMSV1" options="-parameters" />
16 17 <module name="huaheng" options="-parameters" />
  18 + <module name="wms2" options="-parameters" />
17 19 </option>
18 20 </component>
19 21 </project>
20 22 \ No newline at end of file
... ...
.idea/misc.xml
  View file @850393c
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <project version="4">
3 3 <component name="ExternalStorageConfigurationManager" enabled="true" />
  4 + <component name="JavaScriptSettings">
  5 + <option name="languageLevel" value="ES6" />
  6 + </component>
4 7 <component name="MavenProjectsManager">
5 8 <option name="originalFiles">
6 9 <list>
... ...
.idea/workspace.xml
  View file @850393c
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <project version="4">
3 3 <component name="ChangeListManager">
4   - <list default="true" id="4d9bac65-d8f6-4ced-8855-0db48f39a5f2" name="Default Changelist" comment="">
5   - <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerDetail/controller/ReceiptContainerDetailController.java" afterDir="false" />
6   - <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/controller/ReceiptContainerHeaderController.java" afterDir="false" />
7   - <change beforePath="$PROJECT_DIR$/.idea/dataSources.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources.xml" afterDir="false" />
  4 + <list default="true" id="908d8a6f-e3e4-4fdc-b674-e523a3e2b520" name="Default Changelist" comment="">
  5 + <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
  6 + <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
8 7 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
9   - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java" afterDir="false" />
10   - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiving/service/ReceivingService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiving/service/ReceivingService.java" afterDir="false" />
11   - <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" />
12   - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/domain/TaskHeader.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/domain/TaskHeader.java" afterDir="false" />
  8 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java" afterDir="false" />
  9 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailService.java" afterDir="false" />
  10 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java" afterDir="false" />
  11 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java" afterDir="false" />
  12 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java" afterDir="false" />
  13 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java" afterDir="false" />
13 14 <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java" afterDir="false" />
14 15 <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" />
15   - <change beforePath="$PROJECT_DIR$/src/main/resources/mybatis/task/TaskHeaderMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mybatis/task/TaskHeaderMapper.xml" afterDir="false" />
16   - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptContainerDetail/receiptContainerDetail.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptContainerDetail/receiptContainerDetail.html" afterDir="false" />
17   - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptContainerHeader/receiptContainerHeader.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptContainerHeader/receiptContainerHeader.html" afterDir="false" />
  16 + <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html" afterDir="false" />
18 17 </list>
19 18 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
20 19 <option name="SHOW_DIALOG" value="false" />
... ... @@ -49,44 +48,103 @@
49 48 <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
50 49 <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" />
51 50 </path>
52   - <path>
53   - <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
54   - <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
55   - <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
56   - <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" />
57   - <item name="receipt_container_detail: table" type="285a2a93:MysqlImplModel$Table" />
58   - </path>
59   - <path>
60   - <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
61   - <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
62   - <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
63   - <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" />
64   - <item name="receipt_container_header: table" type="285a2a93:MysqlImplModel$Table" />
65   - </path>
66   - <path>
67   - <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
68   - <item name="@localhost" type="feb32156:DbDataSourceImpl" />
69   - </path>
70   - <path>
71   - <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
72   - <item name="@localhost" type="feb32156:DbDataSourceImpl" />
73   - <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
74   - </path>
75 51 </expand>
76 52 <select />
77 53 </component>
  54 + <component name="FileEditorManager">
  55 + <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
  56 + <file pinned="false" current-in-tab="false">
  57 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java">
  58 + <provider selected="true" editor-type-id="text-editor">
  59 + <state relative-caret-position="869">
  60 + <caret line="58" lean-forward="true" selection-start-line="58" selection-end-line="58" />
  61 + </state>
  62 + </provider>
  63 + </entry>
  64 + </file>
  65 + <file pinned="false" current-in-tab="true">
  66 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java">
  67 + <provider selected="true" editor-type-id="text-editor">
  68 + <state relative-caret-position="80">
  69 + <caret line="44" column="22" selection-start-line="44" selection-start-column="22" selection-end-line="44" selection-end-column="22" />
  70 + </state>
  71 + </provider>
  72 + </entry>
  73 + </file>
  74 + <file pinned="false" current-in-tab="false">
  75 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java">
  76 + <provider selected="true" editor-type-id="text-editor">
  77 + <state relative-caret-position="173">
  78 + <caret line="104" column="25" selection-start-line="104" selection-start-column="25" selection-end-line="104" selection-end-column="25" />
  79 + </state>
  80 + </provider>
  81 + </entry>
  82 + </file>
  83 + <file pinned="false" current-in-tab="false">
  84 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html">
  85 + <provider selected="true" editor-type-id="text-editor">
  86 + <state relative-caret-position="185">
  87 + <caret line="335" column="16" lean-forward="true" selection-start-line="335" selection-start-column="16" selection-end-line="335" selection-end-column="16" />
  88 + <folding>
  89 + <element signature="e#4822#10729#0" />
  90 + </folding>
  91 + </state>
  92 + </provider>
  93 + </entry>
  94 + </file>
  95 + </leaf>
  96 + </component>
78 97 <component name="FileTemplateManagerImpl">
79 98 <option name="RECENT_TEMPLATES">
80 99 <list>
81 100 <option value="CSS File" />
82   - <option value="HTML File" />
83 101 <option value="Class" />
  102 + <option value="HTML File" />
84 103 </list>
85 104 </option>
86 105 </component>
  106 + <component name="FindInProjectRecents">
  107 + <findStrings>
  108 + <find>a</find>
  109 + </findStrings>
  110 + </component>
87 111 <component name="Git.Settings">
88 112 <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
89 113 </component>
  114 + <component name="IdeDocumentHistory">
  115 + <option name="CHANGED_PATHS">
  116 + <list>
  117 + <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/transfer.html" />
  118 + <option value="$PROJECT_DIR$/src/main/resources/application-druid.properties" />
  119 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/service/LocationService.java" />
  120 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/mapper/InventoryHeaderMapper.java" />
  121 + <option value="$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryHeaderMapper.xml" />
  122 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskDetail/domain/TaskDetail.java" />
  123 + <option value="$PROJECT_DIR$/src/main/resources/mybatis/task/TaskDetailMapper.xml" />
  124 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/domain/TaskHeader.java" />
  125 + <option value="$PROJECT_DIR$/src/main/resources/mybatis/task/TaskHeaderMapper.xml" />
  126 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/domain/InventoryTransaction.java" />
  127 + <option value="$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryTransactionMapper.xml" />
  128 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java" />
  129 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/containerType/service/ContainerTypeServiceImpl.java" />
  130 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java" />
  131 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java" />
  132 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailService.java" />
  133 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java" />
  134 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java" />
  135 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java" />
  136 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java" />
  137 + <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html" />
  138 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java" />
  139 + </list>
  140 + </option>
  141 + </component>
  142 + <component name="JsFlowSettings">
  143 + <service-enabled>true</service-enabled>
  144 + <exe-path />
  145 + <other-services-enabled>true</other-services-enabled>
  146 + <auto-save>true</auto-save>
  147 + </component>
90 148 <component name="MavenImportPreferences">
91 149 <option name="importingSettings">
92 150 <MavenImportingSettings>
... ... @@ -94,15 +152,385 @@
94 152 </MavenImportingSettings>
95 153 </option>
96 154 </component>
  155 + <component name="ProjectFrameBounds" extendedState="6">
  156 + <option name="x" value="-9" />
  157 + <option name="y" value="-9" />
  158 + <option name="width" value="1938" />
  159 + <option name="height" value="1048" />
  160 + </component>
97 161 <component name="ProjectId" id="1Q2nhRM7LRz3yFWhpclOKgTjxn0" />
98 162 <component name="ProjectLevelVcsManager">
99 163 <ConfirmationsSetting value="2" id="Add" />
100 164 </component>
  165 + <component name="ProjectView">
  166 + <navigator proportions="" version="1">
  167 + <foldersAlwaysOnTop value="true" />
  168 + </navigator>
  169 + <panes>
  170 + <pane id="ProjectPane">
  171 + <subPane>
  172 + <expand>
  173 + <path>
  174 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  175 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  176 + </path>
  177 + <path>
  178 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  179 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  180 + <item name=".idea" type="462c0819:PsiDirectoryNode" />
  181 + </path>
  182 + <path>
  183 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  184 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  185 + <item name="src" type="462c0819:PsiDirectoryNode" />
  186 + </path>
  187 + <path>
  188 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  189 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  190 + <item name="src" type="462c0819:PsiDirectoryNode" />
  191 + <item name="main" type="462c0819:PsiDirectoryNode" />
  192 + </path>
  193 + <path>
  194 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  195 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  196 + <item name="src" type="462c0819:PsiDirectoryNode" />
  197 + <item name="main" type="462c0819:PsiDirectoryNode" />
  198 + <item name="java" type="462c0819:PsiDirectoryNode" />
  199 + </path>
  200 + <path>
  201 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  202 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  203 + <item name="src" type="462c0819:PsiDirectoryNode" />
  204 + <item name="main" type="462c0819:PsiDirectoryNode" />
  205 + <item name="java" type="462c0819:PsiDirectoryNode" />
  206 + <item name="com" type="462c0819:PsiDirectoryNode" />
  207 + </path>
  208 + <path>
  209 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  210 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  211 + <item name="src" type="462c0819:PsiDirectoryNode" />
  212 + <item name="main" type="462c0819:PsiDirectoryNode" />
  213 + <item name="java" type="462c0819:PsiDirectoryNode" />
  214 + <item name="com" type="462c0819:PsiDirectoryNode" />
  215 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  216 + </path>
  217 + <path>
  218 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  219 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  220 + <item name="src" type="462c0819:PsiDirectoryNode" />
  221 + <item name="main" type="462c0819:PsiDirectoryNode" />
  222 + <item name="java" type="462c0819:PsiDirectoryNode" />
  223 + <item name="com" type="462c0819:PsiDirectoryNode" />
  224 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  225 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  226 + </path>
  227 + <path>
  228 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  229 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  230 + <item name="src" type="462c0819:PsiDirectoryNode" />
  231 + <item name="main" type="462c0819:PsiDirectoryNode" />
  232 + <item name="java" type="462c0819:PsiDirectoryNode" />
  233 + <item name="com" type="462c0819:PsiDirectoryNode" />
  234 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  235 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  236 + <item name="config" type="462c0819:PsiDirectoryNode" />
  237 + </path>
  238 + <path>
  239 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  240 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  241 + <item name="src" type="462c0819:PsiDirectoryNode" />
  242 + <item name="main" type="462c0819:PsiDirectoryNode" />
  243 + <item name="java" type="462c0819:PsiDirectoryNode" />
  244 + <item name="com" type="462c0819:PsiDirectoryNode" />
  245 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  246 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  247 + <item name="config" type="462c0819:PsiDirectoryNode" />
  248 + <item name="containerType" type="462c0819:PsiDirectoryNode" />
  249 + </path>
  250 + <path>
  251 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  252 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  253 + <item name="src" type="462c0819:PsiDirectoryNode" />
  254 + <item name="main" type="462c0819:PsiDirectoryNode" />
  255 + <item name="java" type="462c0819:PsiDirectoryNode" />
  256 + <item name="com" type="462c0819:PsiDirectoryNode" />
  257 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  258 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  259 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  260 + </path>
  261 + <path>
  262 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  263 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  264 + <item name="src" type="462c0819:PsiDirectoryNode" />
  265 + <item name="main" type="462c0819:PsiDirectoryNode" />
  266 + <item name="java" type="462c0819:PsiDirectoryNode" />
  267 + <item name="com" type="462c0819:PsiDirectoryNode" />
  268 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  269 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  270 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  271 + <item name="inventoryDetail" type="462c0819:PsiDirectoryNode" />
  272 + </path>
  273 + <path>
  274 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  275 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  276 + <item name="src" type="462c0819:PsiDirectoryNode" />
  277 + <item name="main" type="462c0819:PsiDirectoryNode" />
  278 + <item name="java" type="462c0819:PsiDirectoryNode" />
  279 + <item name="com" type="462c0819:PsiDirectoryNode" />
  280 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  281 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  282 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  283 + <item name="inventoryDetail" type="462c0819:PsiDirectoryNode" />
  284 + <item name="controller" type="462c0819:PsiDirectoryNode" />
  285 + </path>
  286 + <path>
  287 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  288 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  289 + <item name="src" type="462c0819:PsiDirectoryNode" />
  290 + <item name="main" type="462c0819:PsiDirectoryNode" />
  291 + <item name="java" type="462c0819:PsiDirectoryNode" />
  292 + <item name="com" type="462c0819:PsiDirectoryNode" />
  293 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  294 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  295 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  296 + <item name="inventoryDetail" type="462c0819:PsiDirectoryNode" />
  297 + <item name="service" type="462c0819:PsiDirectoryNode" />
  298 + </path>
  299 + <path>
  300 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  301 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  302 + <item name="src" type="462c0819:PsiDirectoryNode" />
  303 + <item name="main" type="462c0819:PsiDirectoryNode" />
  304 + <item name="java" type="462c0819:PsiDirectoryNode" />
  305 + <item name="com" type="462c0819:PsiDirectoryNode" />
  306 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  307 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  308 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  309 + <item name="inventoryHeader" type="462c0819:PsiDirectoryNode" />
  310 + </path>
  311 + <path>
  312 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  313 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  314 + <item name="src" type="462c0819:PsiDirectoryNode" />
  315 + <item name="main" type="462c0819:PsiDirectoryNode" />
  316 + <item name="java" type="462c0819:PsiDirectoryNode" />
  317 + <item name="com" type="462c0819:PsiDirectoryNode" />
  318 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  319 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  320 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  321 + <item name="inventoryHeader" type="462c0819:PsiDirectoryNode" />
  322 + <item name="controller" type="462c0819:PsiDirectoryNode" />
  323 + </path>
  324 + <path>
  325 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  326 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  327 + <item name="src" type="462c0819:PsiDirectoryNode" />
  328 + <item name="main" type="462c0819:PsiDirectoryNode" />
  329 + <item name="java" type="462c0819:PsiDirectoryNode" />
  330 + <item name="com" type="462c0819:PsiDirectoryNode" />
  331 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  332 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  333 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  334 + <item name="inventoryHeader" type="462c0819:PsiDirectoryNode" />
  335 + <item name="service" type="462c0819:PsiDirectoryNode" />
  336 + </path>
  337 + <path>
  338 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  339 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  340 + <item name="src" type="462c0819:PsiDirectoryNode" />
  341 + <item name="main" type="462c0819:PsiDirectoryNode" />
  342 + <item name="java" type="462c0819:PsiDirectoryNode" />
  343 + <item name="com" type="462c0819:PsiDirectoryNode" />
  344 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  345 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  346 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  347 + <item name="inventoryTransaction" type="462c0819:PsiDirectoryNode" />
  348 + </path>
  349 + <path>
  350 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  351 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  352 + <item name="src" type="462c0819:PsiDirectoryNode" />
  353 + <item name="main" type="462c0819:PsiDirectoryNode" />
  354 + <item name="java" type="462c0819:PsiDirectoryNode" />
  355 + <item name="com" type="462c0819:PsiDirectoryNode" />
  356 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  357 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  358 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  359 + <item name="inventoryTransaction" type="462c0819:PsiDirectoryNode" />
  360 + <item name="domain" type="462c0819:PsiDirectoryNode" />
  361 + </path>
  362 + <path>
  363 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  364 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  365 + <item name="src" type="462c0819:PsiDirectoryNode" />
  366 + <item name="main" type="462c0819:PsiDirectoryNode" />
  367 + <item name="java" type="462c0819:PsiDirectoryNode" />
  368 + <item name="com" type="462c0819:PsiDirectoryNode" />
  369 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  370 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  371 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  372 + <item name="inventoryTransaction" type="462c0819:PsiDirectoryNode" />
  373 + <item name="mapper" type="462c0819:PsiDirectoryNode" />
  374 + </path>
  375 + <path>
  376 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  377 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  378 + <item name="src" type="462c0819:PsiDirectoryNode" />
  379 + <item name="main" type="462c0819:PsiDirectoryNode" />
  380 + <item name="java" type="462c0819:PsiDirectoryNode" />
  381 + <item name="com" type="462c0819:PsiDirectoryNode" />
  382 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  383 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  384 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  385 + <item name="inventoryTransaction" type="462c0819:PsiDirectoryNode" />
  386 + <item name="service" type="462c0819:PsiDirectoryNode" />
  387 + </path>
  388 + <path>
  389 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  390 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  391 + <item name="src" type="462c0819:PsiDirectoryNode" />
  392 + <item name="main" type="462c0819:PsiDirectoryNode" />
  393 + <item name="java" type="462c0819:PsiDirectoryNode" />
  394 + <item name="com" type="462c0819:PsiDirectoryNode" />
  395 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  396 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  397 + <item name="task" type="462c0819:PsiDirectoryNode" />
  398 + </path>
  399 + <path>
  400 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  401 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  402 + <item name="src" type="462c0819:PsiDirectoryNode" />
  403 + <item name="main" type="462c0819:PsiDirectoryNode" />
  404 + <item name="java" type="462c0819:PsiDirectoryNode" />
  405 + <item name="com" type="462c0819:PsiDirectoryNode" />
  406 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  407 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  408 + <item name="task" type="462c0819:PsiDirectoryNode" />
  409 + <item name="taskHeader" type="462c0819:PsiDirectoryNode" />
  410 + </path>
  411 + <path>
  412 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  413 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  414 + <item name="src" type="462c0819:PsiDirectoryNode" />
  415 + <item name="main" type="462c0819:PsiDirectoryNode" />
  416 + <item name="java" type="462c0819:PsiDirectoryNode" />
  417 + <item name="com" type="462c0819:PsiDirectoryNode" />
  418 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  419 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  420 + <item name="task" type="462c0819:PsiDirectoryNode" />
  421 + <item name="taskHeader" type="462c0819:PsiDirectoryNode" />
  422 + <item name="controller" type="462c0819:PsiDirectoryNode" />
  423 + </path>
  424 + <path>
  425 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  426 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  427 + <item name="src" type="462c0819:PsiDirectoryNode" />
  428 + <item name="main" type="462c0819:PsiDirectoryNode" />
  429 + <item name="java" type="462c0819:PsiDirectoryNode" />
  430 + <item name="com" type="462c0819:PsiDirectoryNode" />
  431 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  432 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  433 + <item name="task" type="462c0819:PsiDirectoryNode" />
  434 + <item name="taskHeader" type="462c0819:PsiDirectoryNode" />
  435 + <item name="service" type="462c0819:PsiDirectoryNode" />
  436 + </path>
  437 + <path>
  438 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  439 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  440 + <item name="src" type="462c0819:PsiDirectoryNode" />
  441 + <item name="main" type="462c0819:PsiDirectoryNode" />
  442 + <item name="resources" type="462c0819:PsiDirectoryNode" />
  443 + </path>
  444 + <path>
  445 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  446 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  447 + <item name="src" type="462c0819:PsiDirectoryNode" />
  448 + <item name="main" type="462c0819:PsiDirectoryNode" />
  449 + <item name="resources" type="462c0819:PsiDirectoryNode" />
  450 + <item name="templates" type="462c0819:PsiDirectoryNode" />
  451 + </path>
  452 + <path>
  453 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  454 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  455 + <item name="src" type="462c0819:PsiDirectoryNode" />
  456 + <item name="main" type="462c0819:PsiDirectoryNode" />
  457 + <item name="resources" type="462c0819:PsiDirectoryNode" />
  458 + <item name="templates" type="462c0819:PsiDirectoryNode" />
  459 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  460 + </path>
  461 + <path>
  462 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  463 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  464 + <item name="src" type="462c0819:PsiDirectoryNode" />
  465 + <item name="main" type="462c0819:PsiDirectoryNode" />
  466 + <item name="resources" type="462c0819:PsiDirectoryNode" />
  467 + <item name="templates" type="462c0819:PsiDirectoryNode" />
  468 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  469 + <item name="adjustHeader" type="462c0819:PsiDirectoryNode" />
  470 + </path>
  471 + <path>
  472 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  473 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  474 + <item name="src" type="462c0819:PsiDirectoryNode" />
  475 + <item name="main" type="462c0819:PsiDirectoryNode" />
  476 + <item name="resources" type="462c0819:PsiDirectoryNode" />
  477 + <item name="templates" type="462c0819:PsiDirectoryNode" />
  478 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  479 + <item name="cycleCountDetail" type="462c0819:PsiDirectoryNode" />
  480 + </path>
  481 + <path>
  482 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  483 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  484 + <item name="src" type="462c0819:PsiDirectoryNode" />
  485 + <item name="main" type="462c0819:PsiDirectoryNode" />
  486 + <item name="resources" type="462c0819:PsiDirectoryNode" />
  487 + <item name="templates" type="462c0819:PsiDirectoryNode" />
  488 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  489 + <item name="cycleCountHeader" type="462c0819:PsiDirectoryNode" />
  490 + </path>
  491 + <path>
  492 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  493 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  494 + <item name="src" type="462c0819:PsiDirectoryNode" />
  495 + <item name="main" type="462c0819:PsiDirectoryNode" />
  496 + <item name="resources" type="462c0819:PsiDirectoryNode" />
  497 + <item name="templates" type="462c0819:PsiDirectoryNode" />
  498 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  499 + <item name="inventoryDetail" type="462c0819:PsiDirectoryNode" />
  500 + </path>
  501 + <path>
  502 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  503 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  504 + <item name="src" type="462c0819:PsiDirectoryNode" />
  505 + <item name="main" type="462c0819:PsiDirectoryNode" />
  506 + <item name="resources" type="462c0819:PsiDirectoryNode" />
  507 + <item name="templates" type="462c0819:PsiDirectoryNode" />
  508 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  509 + <item name="inventoryHeader" type="462c0819:PsiDirectoryNode" />
  510 + </path>
  511 + <path>
  512 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  513 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  514 + <item name="src" type="462c0819:PsiDirectoryNode" />
  515 + <item name="main" type="462c0819:PsiDirectoryNode" />
  516 + <item name="resources" type="462c0819:PsiDirectoryNode" />
  517 + <item name="templates" type="462c0819:PsiDirectoryNode" />
  518 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  519 + <item name="inventoryTransaction" type="462c0819:PsiDirectoryNode" />
  520 + </path>
  521 + </expand>
  522 + <select />
  523 + </subPane>
  524 + </pane>
  525 + <pane id="PackagesPane" />
  526 + <pane id="Scope" />
  527 + </panes>
  528 + </component>
101 529 <component name="PropertiesComponent">
102 530 <property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
103   - <property name="DatabaseDriversLRU" value="mysql" />
104 531 <property name="DefaultHtmlFileTemplate" value="HTML File" />
105 532 <property name="ExpandSpringBootJavaOptionsPanel" value="true" />
  533 + <property name="JavaScriptWeakerCompletionTypeGuess" value="true" />
106 534 <property name="RequestMappingsPanelOrder0" value="0" />
107 535 <property name="RequestMappingsPanelOrder1" value="1" />
108 536 <property name="RequestMappingsPanelWidth0" value="75" />
... ... @@ -110,7 +538,6 @@
110 538 <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
111 539 <property name="WebServerToolWindowFactoryState" value="false" />
112 540 <property name="aspect.path.notification.shown" value="true" />
113   - <property name="last_opened_file_path" value="$PROJECT_DIR$/../WMS_NingXiang" />
114 541 <property name="list.type.of.created.stylesheet" value="CSS" />
115 542 <property name="node.js.detected.package.eslint" value="true" />
116 543 <property name="node.js.path.for.package.eslint" value="project" />
... ... @@ -118,7 +545,7 @@
118 545 <property name="node.js.selected.package.eslint" value="(autodetect)" />
119 546 <property name="node.js.selected.package.tslint" value="(autodetect)" />
120 547 <property name="nodejs_package_manager_path" value="npm" />
121   - <property name="settings.editor.selected.configurable" value="preferences.fileTypes" />
  548 + <property name="settings.editor.selected.configurable" value="Settings.JavaScript" />
122 549 </component>
123 550 <component name="RunDashboard">
124 551 <option name="configurationTypes">
... ... @@ -140,7 +567,7 @@
140 567 </component>
141 568 <component name="RunManager">
142 569 <configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
143   - <module name="huaheng" />
  570 + <module name="wms2" />
144 571 <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" />
145 572 <option name="ALTERNATIVE_JRE_PATH" />
146 573 <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" />
... ... @@ -158,12 +585,12 @@
158 585 <expand>
159 586 <path>
160 587 <item name="services root" type="e789fda9:ObjectUtils$Sentinel" />
161   - <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@f4197d44" type="7427dc5b:ServiceModel$ServiceGroupNode" />
  588 + <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@b9e1b2d7" type="7427dc5b:ServiceModel$ServiceGroupNode" />
162 589 </path>
163 590 <path>
164 591 <item name="services root" type="e789fda9:ObjectUtils$Sentinel" />
165   - <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@f4197d44" type="7427dc5b:ServiceModel$ServiceGroupNode" />
166   - <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@6909ea06" type="7427dc5b:ServiceModel$ServiceGroupNode" />
  592 + <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@b9e1b2d7" type="7427dc5b:ServiceModel$ServiceGroupNode" />
  593 + <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@67b24c63" type="7427dc5b:ServiceModel$ServiceGroupNode" />
167 594 </path>
168 595 </expand>
169 596 <select />
... ... @@ -176,7 +603,7 @@
176 603 </component>
177 604 <component name="TaskManager">
178 605 <task active="true" id="Default" summary="Default task">
179   - <changelist id="4d9bac65-d8f6-4ced-8855-0db48f39a5f2" name="Default Changelist" comment="" />
  606 + <changelist id="908d8a6f-e3e4-4fdc-b674-e523a3e2b520" name="Default Changelist" comment="" />
180 607 <created>1566977677142</created>
181 608 <option name="number" value="Default" />
182 609 <option name="presentableId" value="Default" />
... ... @@ -186,9 +613,6 @@
186 613 <workItem from="1567038752582" duration="12361000" />
187 614 <workItem from="1567057373550" duration="15293000" />
188 615 <workItem from="1567125196953" duration="16752000" />
189   - <workItem from="1567470830253" duration="15946000" />
190   - <workItem from="1567557546256" duration="159000" />
191   - <workItem from="1567557719885" duration="770000" />
192 616 </task>
193 617 <task id="LOCAL-00001" summary="入库单添加时添加流程标记，审核入库单">
194 618 <created>1566983055587</created>
... ... @@ -249,6 +673,74 @@
249 673 <option name="localTasksCounter" value="9" />
250 674 <servers />
251 675 </component>
  676 + <component name="ToolWindowManager">
  677 + <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
  678 + <editor active="true" />
  679 + <layout>
  680 + <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.308311" />
  681 + <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
  682 + <window_info id="Web" order="2" side_tool="true" />
  683 + <window_info id="Designer" order="3" />
  684 + <window_info id="UI Designer" order="4" />
  685 + <window_info id="Favorites" order="5" side_tool="true" />
  686 + <window_info anchor="bottom" id="Message" order="0" />
  687 + <window_info anchor="bottom" id="Find" order="1" weight="0.3286119" />
  688 + <window_info anchor="bottom" id="Run" order="2" />
  689 + <window_info anchor="bottom" id="Debug" order="3" weight="0.29036826" />
  690 + <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
  691 + <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
  692 + <window_info anchor="bottom" id="TODO" order="6" />
  693 + <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
  694 + <window_info anchor="bottom" id="Version Control" order="8" weight="0.04249292" />
  695 + <window_info anchor="bottom" id="Database Changes" order="9" weight="0.3286119" />
  696 + <window_info anchor="bottom" id="Spring" order="10" />
  697 + <window_info anchor="bottom" id="MyBatis Log" order="11" weight="0.3286119" />
  698 + <window_info anchor="bottom" id="Event Log" order="12" sideWeight="0.50067025" side_tool="true" weight="0.23796034" />
  699 + <window_info anchor="bottom" id="Messages" order="13" weight="0.4362606" />
  700 + <window_info anchor="bottom" id="Java Enterprise" order="14" />
  701 + <window_info active="true" anchor="bottom" id="Run Dashboard" order="15" sideWeight="0.49932975" visible="true" weight="0.4348442" />
  702 + <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
  703 + <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
  704 + <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
  705 + <window_info anchor="right" id="Palette" order="3" />
  706 + <window_info anchor="right" id="Database" order="4" />
  707 + <window_info anchor="right" id="Maven" order="5" weight="0.097184986" />
  708 + <window_info anchor="right" id="Bean Validation" order="6" />
  709 + <window_info anchor="right" id="Palette&#9;" order="7" />
  710 + </layout>
  711 + <layout-to-restore>
  712 + <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.26340482" />
  713 + <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
  714 + <window_info id="Web" order="2" side_tool="true" />
  715 + <window_info id="Designer" order="3" />
  716 + <window_info id="UI Designer" order="4" />
  717 + <window_info id="Favorites" order="5" side_tool="true" />
  718 + <window_info anchor="bottom" id="Message" order="0" />
  719 + <window_info anchor="bottom" id="Find" order="1" weight="0.3286119" />
  720 + <window_info anchor="bottom" id="Run" order="2" />
  721 + <window_info anchor="bottom" id="Debug" order="3" weight="0.29036826" />
  722 + <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
  723 + <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
  724 + <window_info anchor="bottom" id="TODO" order="6" />
  725 + <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
  726 + <window_info anchor="bottom" id="Version Control" order="8" weight="0.45042494" />
  727 + <window_info anchor="bottom" id="Database Changes" order="9" />
  728 + <window_info anchor="bottom" id="Spring" order="10" />
  729 + <window_info anchor="bottom" id="MyBatis Log" order="11" weight="0.3286119" />
  730 + <window_info anchor="bottom" id="Event Log" order="12" sideWeight="0.50067025" side_tool="true" weight="0.23796034" />
  731 + <window_info anchor="bottom" id="Messages" order="13" weight="0.12606232" />
  732 + <window_info anchor="bottom" id="Java Enterprise" order="14" />
  733 + <window_info active="true" anchor="bottom" id="Run Dashboard" order="15" sideWeight="0.49932975" visible="true" weight="0.18838526" />
  734 + <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
  735 + <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
  736 + <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
  737 + <window_info anchor="right" id="Palette" order="3" />
  738 + <window_info anchor="right" id="Database" order="4" />
  739 + <window_info anchor="right" id="Maven" order="5" weight="0.097184986" />
  740 + <window_info anchor="right" id="Bean Validation" order="6" />
  741 + <window_info anchor="right" id="Palette&#9;" order="7" />
  742 + </layout-to-restore>
  743 + </component>
252 744 <component name="TypeScriptGeneratedFilesManager">
253 745 <option name="version" value="1" />
254 746 </component>
... ... @@ -258,7 +750,20 @@
258 750 <entry key="MAIN">
259 751 <value>
260 752 <State>
261   - <option name="COLUMN_ORDER" />
  753 + <option name="RECENTLY_FILTERED_USER_GROUPS">
  754 + <collection />
  755 + </option>
  756 + <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
  757 + <collection />
  758 + </option>
  759 + <option name="COLUMN_ORDER">
  760 + <list>
  761 + <option value="0" />
  762 + <option value="1" />
  763 + <option value="2" />
  764 + <option value="3" />
  765 + </list>
  766 + </option>
262 767 </State>
263 768 </value>
264 769 </entry>
... ... @@ -290,7 +795,10 @@
290 795 <MESSAGE value="删除入库单" />
291 796 <MESSAGE value="自动生成盘点首选项表" />
292 797 <MESSAGE value="添加逻辑删除配置" />
293   - <option name="LAST_COMMIT_MESSAGE" value="添加逻辑删除配置" />
  798 + <MESSAGE value="库存和任务移库相关" />
  799 + <MESSAGE value="库存移库生成和完成逻辑" />
  800 + <MESSAGE value="xml" />
  801 + <option name="LAST_COMMIT_MESSAGE" value="xml" />
294 802 </component>
295 803 <component name="XDebuggerManager">
296 804 <breakpoint-manager>
... ... @@ -298,44 +806,358 @@
298 806 <line-breakpoint type="java-line">
299 807 <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/mapper/CycleCountHeaderMapper.java</url>
300 808 <line>5</line>
  809 + <properties />
301 810 <option name="timeStamp" value="1" />
302 811 </line-breakpoint>
303 812 <line-breakpoint type="java-line">
304 813 <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/statusFlow/controller/StatusFlowDetailController.java</url>
305 814 <line>60</line>
  815 + <properties />
306 816 <option name="timeStamp" value="4" />
307 817 </line-breakpoint>
308 818 <line-breakpoint enabled="true" type="java-line">
309 819 <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeaderHistory/service/ReceiptHeaderHistoryService.java</url>
310 820 <line>49</line>
  821 + <properties />
311 822 <option name="timeStamp" value="16" />
312 823 </line-breakpoint>
313 824 <line-breakpoint enabled="true" type="java-line">
314 825 <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java</url>
315   - <line>219</line>
  826 + <line>216</line>
  827 + <properties />
316 828 <option name="timeStamp" value="19" />
317 829 </line-breakpoint>
318 830 <line-breakpoint enabled="true" type="java-line">
319 831 <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java</url>
320   - <line>244</line>
  832 + <line>241</line>
  833 + <properties />
321 834 <option name="timeStamp" value="20" />
322 835 </line-breakpoint>
323 836 <line-breakpoint enabled="true" type="java-line">
324 837 <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java</url>
325 838 <line>163</line>
  839 + <properties />
326 840 <option name="timeStamp" value="22" />
327 841 </line-breakpoint>
328 842 <line-breakpoint enabled="true" type="java-line">
329 843 <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java</url>
330 844 <line>181</line>
  845 + <properties />
331 846 <option name="timeStamp" value="23" />
332 847 </line-breakpoint>
333 848 <line-breakpoint enabled="true" type="java-line">
334 849 <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeader/service/ReceiptHeaderService.java</url>
335 850 <line>92</line>
  851 + <properties />
336 852 <option name="timeStamp" value="24" />
337 853 </line-breakpoint>
  854 + <line-breakpoint enabled="true" type="java-line">
  855 + <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/containerType/service/ContainerTypeServiceImpl.java</url>
  856 + <line>31</line>
  857 + <properties />
  858 + <option name="timeStamp" value="26" />
  859 + </line-breakpoint>
  860 + <line-breakpoint enabled="true" type="java-line">
  861 + <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java</url>
  862 + <line>47</line>
  863 + <properties />
  864 + <option name="timeStamp" value="37" />
  865 + </line-breakpoint>
338 866 </breakpoints>
339 867 </breakpoint-manager>
340 868 </component>
  869 + <component name="editorHistoryManager">
  870 + <entry file="file://$PROJECT_DIR$/.idea/WMSV1.iml">
  871 + <provider selected="true" editor-type-id="text-editor" />
  872 + </entry>
  873 + <entry file="file://$PROJECT_DIR$/.idea/uiDesigner.xml">
  874 + <provider selected="true" editor-type-id="text-editor">
  875 + <state relative-caret-position="-828" />
  876 + </provider>
  877 + </entry>
  878 + <entry file="file://$PROJECT_DIR$/.idea/MyBatisCodeHelperDatasource.xml" />
  879 + <entry file="file://$PROJECT_DIR$/.idea/misc.xml">
  880 + <provider selected="true" editor-type-id="text-editor" />
  881 + </entry>
  882 + <entry file="file://$PROJECT_DIR$/src/main/resources/application-druid.properties">
  883 + <provider selected="true" editor-type-id="text-editor">
  884 + <state relative-caret-position="164">
  885 + <caret line="10" column="45" lean-forward="true" selection-start-line="10" selection-start-column="45" selection-end-line="10" selection-end-column="45" />
  886 + </state>
  887 + </provider>
  888 + </entry>
  889 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html">
  890 + <provider selected="true" editor-type-id="text-editor">
  891 + <state relative-caret-position="332">
  892 + <caret line="283" column="13" selection-start-line="283" selection-start-column="13" selection-end-line="283" selection-end-column="13" />
  893 + </state>
  894 + </provider>
  895 + </entry>
  896 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/domain/Location.java">
  897 + <provider selected="true" editor-type-id="text-editor">
  898 + <state relative-caret-position="-456">
  899 + <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
  900 + </state>
  901 + </provider>
  902 + </entry>
  903 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/service/LocationService.java">
  904 + <provider selected="true" editor-type-id="text-editor">
  905 + <state relative-caret-position="160">
  906 + <caret line="9" column="4" selection-start-line="9" selection-start-column="4" selection-end-line="9" selection-end-column="4" />
  907 + </state>
  908 + </provider>
  909 + </entry>
  910 + <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryHeaderMapper.xml">
  911 + <provider selected="true" editor-type-id="text-editor">
  912 + <state relative-caret-position="472">
  913 + <caret line="48" lean-forward="true" selection-start-line="48" selection-end-line="48" />
  914 + </state>
  915 + </provider>
  916 + </entry>
  917 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/mapper/InventoryHeaderMapper.java">
  918 + <provider selected="true" editor-type-id="text-editor">
  919 + <state relative-caret-position="260">
  920 + <caret line="15" lean-forward="true" selection-start-line="15" selection-end-line="15" />
  921 + </state>
  922 + </provider>
  923 + </entry>
  924 + <entry file="jar://C:/Program Files/Java/jdk1.8.0_202/src.zip!/com/sun/jmx/snmp/tasks/Task.java">
  925 + <provider selected="true" editor-type-id="text-editor">
  926 + <state relative-caret-position="330">
  927 + <caret line="57" column="17" selection-start-line="57" selection-start-column="17" selection-end-line="57" selection-end-column="17" />
  928 + </state>
  929 + </provider>
  930 + </entry>
  931 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerDetail/service/ReceiptContainerDetailServiceImpl.java">
  932 + <provider selected="true" editor-type-id="text-editor">
  933 + <state relative-caret-position="80">
  934 + <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
  935 + </state>
  936 + </provider>
  937 + </entry>
  938 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerDetail/service/ReceiptContainerDetailService.java">
  939 + <provider selected="true" editor-type-id="text-editor">
  940 + <state relative-caret-position="60">
  941 + <caret line="4" column="62" selection-start-line="4" selection-start-column="62" selection-end-line="4" selection-end-column="62" />
  942 + </state>
  943 + </provider>
  944 + </entry>
  945 + <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.1.2/mybatis-plus-core-3.1.2.jar!/com/baomidou/mybatisplus/core/mapper/BaseMapper.class">
  946 + <provider selected="true" editor-type-id="text-editor">
  947 + <state relative-caret-position="80">
  948 + <caret line="13" column="43" lean-forward="true" selection-start-line="13" selection-start-column="43" selection-end-line="13" selection-end-column="43" />
  949 + </state>
  950 + </provider>
  951 + </entry>
  952 + <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/task/TaskDetailMapper.xml">
  953 + <provider selected="true" editor-type-id="text-editor">
  954 + <state relative-caret-position="464">
  955 + <caret line="54" column="25" lean-forward="true" selection-start-line="54" selection-start-column="25" selection-end-line="54" selection-end-column="25" />
  956 + </state>
  957 + </provider>
  958 + </entry>
  959 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskDetail/mapper/TaskDetailMapper.java">
  960 + <provider selected="true" editor-type-id="text-editor">
  961 + <state relative-caret-position="100">
  962 + <caret line="6" column="1" lean-forward="true" selection-start-line="6" selection-start-column="1" selection-end-line="6" selection-end-column="1" />
  963 + </state>
  964 + </provider>
  965 + </entry>
  966 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskDetail/domain/TaskDetail.java">
  967 + <provider selected="true" editor-type-id="text-editor">
  968 + <state relative-caret-position="304">
  969 + <caret line="43" column="19" selection-start-line="43" selection-start-column="19" selection-end-line="43" selection-end-column="19" />
  970 + </state>
  971 + </provider>
  972 + </entry>
  973 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskDetail/service/TaskDetailServiceImpl.java">
  974 + <provider selected="true" editor-type-id="text-editor">
  975 + <state relative-caret-position="80">
  976 + <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
  977 + </state>
  978 + </provider>
  979 + </entry>
  980 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskDetail/service/TaskDetailService.java">
  981 + <provider selected="true" editor-type-id="text-editor">
  982 + <state relative-caret-position="60">
  983 + <caret line="4" column="17" selection-start-line="4" selection-start-column="17" selection-end-line="4" selection-end-column="17" />
  984 + </state>
  985 + </provider>
  986 + </entry>
  987 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/service/LocationServiceImpl.java">
  988 + <provider selected="true" editor-type-id="text-editor">
  989 + <state relative-caret-position="416">
  990 + <caret line="101" column="16" selection-start-line="101" selection-start-column="16" selection-end-line="101" selection-end-column="16" />
  991 + </state>
  992 + </provider>
  993 + </entry>
  994 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/domain/ShipmentTaskCreateModel.java">
  995 + <provider selected="true" editor-type-id="text-editor">
  996 + <state relative-caret-position="-12">
  997 + <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
  998 + </state>
  999 + </provider>
  1000 + </entry>
  1001 + <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/task/TaskHeaderMapper.xml">
  1002 + <provider selected="true" editor-type-id="text-editor">
  1003 + <state relative-caret-position="322">
  1004 + <caret line="18" column="4" selection-start-line="18" selection-start-column="4" selection-end-line="18" selection-end-column="4" />
  1005 + </state>
  1006 + </provider>
  1007 + </entry>
  1008 + <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryTransactionMapper.xml">
  1009 + <provider selected="true" editor-type-id="text-editor">
  1010 + <state relative-caret-position="308">
  1011 + <caret line="28" column="50" selection-start-line="28" selection-start-column="50" selection-end-line="28" selection-end-column="50" />
  1012 + </state>
  1013 + </provider>
  1014 + </entry>
  1015 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/mapper/InventoryTransactionMapper.java">
  1016 + <provider selected="true" editor-type-id="text-editor">
  1017 + <state relative-caret-position="80">
  1018 + <caret line="5" column="17" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="17" />
  1019 + </state>
  1020 + </provider>
  1021 + </entry>
  1022 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/domain/TaskHeader.java">
  1023 + <provider selected="true" editor-type-id="text-editor">
  1024 + <state relative-caret-position="1048">
  1025 + <caret line="316" column="69" selection-start-line="316" selection-start-column="69" selection-end-line="316" selection-end-column="69" />
  1026 + </state>
  1027 + </provider>
  1028 + </entry>
  1029 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/domain/InventoryTransaction.java">
  1030 + <provider selected="true" editor-type-id="text-editor">
  1031 + <state relative-caret-position="324">
  1032 + <caret line="179" column="18" selection-start-line="179" selection-start-column="18" selection-end-line="179" selection-end-column="18" />
  1033 + </state>
  1034 + </provider>
  1035 + </entry>
  1036 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/containerType/service/ContainerTypeServiceImpl.java">
  1037 + <provider selected="true" editor-type-id="text-editor">
  1038 + <state relative-caret-position="400">
  1039 + <caret line="31" selection-start-line="31" selection-end-line="31" />
  1040 + </state>
  1041 + </provider>
  1042 + </entry>
  1043 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/container/add.html">
  1044 + <provider selected="true" editor-type-id="text-editor">
  1045 + <state relative-caret-position="164">
  1046 + <caret line="10" column="95" selection-start-line="10" selection-start-column="95" selection-end-line="10" selection-end-column="95" />
  1047 + </state>
  1048 + </provider>
  1049 + </entry>
  1050 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/mapper/TaskHeaderMapper.java">
  1051 + <provider selected="true" editor-type-id="text-editor">
  1052 + <state relative-caret-position="120">
  1053 + <caret line="11" column="78" selection-start-line="11" selection-start-column="78" selection-end-line="11" selection-end-column="78" />
  1054 + </state>
  1055 + </provider>
  1056 + </entry>
  1057 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/transfer.html">
  1058 + <provider selected="true" editor-type-id="text-editor">
  1059 + <state relative-caret-position="-264">
  1060 + <caret line="13" column="54" selection-start-line="13" selection-start-column="54" selection-end-line="13" selection-end-column="54" />
  1061 + </state>
  1062 + </provider>
  1063 + </entry>
  1064 + <entry file="jar://C:/Program Files/Java/jdk1.8.0_202/src.zip!/java/util/function/Function.java">
  1065 + <provider selected="true" editor-type-id="text-editor">
  1066 + <state relative-caret-position="460">
  1067 + <caret line="46" column="32" selection-start-line="46" selection-start-column="32" selection-end-line="46" selection-end-column="32" />
  1068 + </state>
  1069 + </provider>
  1070 + </entry>
  1071 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/service/InventoryTransactionService.java">
  1072 + <provider selected="true" editor-type-id="text-editor">
  1073 + <state relative-caret-position="60">
  1074 + <caret line="4" column="17" selection-start-line="4" selection-start-column="17" selection-end-line="4" selection-end-column="17" />
  1075 + </state>
  1076 + </provider>
  1077 + </entry>
  1078 + <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.1.2/mybatis-plus-extension-3.1.2.jar!/com/baomidou/mybatisplus/extension/service/IService.class">
  1079 + <provider selected="true" editor-type-id="text-editor">
  1080 + <state relative-caret-position="216">
  1081 + <caret line="37" column="20" selection-start-line="37" selection-start-column="20" selection-end-line="37" selection-end-column="20" />
  1082 + <folding>
  1083 + <element signature="e#1400#1401#0" expanded="true" />
  1084 + <element signature="e#1463#1464#0" expanded="true" />
  1085 + </folding>
  1086 + </state>
  1087 + </provider>
  1088 + </entry>
  1089 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java">
  1090 + <provider selected="true" editor-type-id="text-editor">
  1091 + <state relative-caret-position="100">
  1092 + <caret line="8" column="61" selection-start-line="8" selection-start-column="61" selection-end-line="8" selection-end-column="61" />
  1093 + </state>
  1094 + </provider>
  1095 + </entry>
  1096 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java">
  1097 + <provider selected="true" editor-type-id="text-editor">
  1098 + <state relative-caret-position="448">
  1099 + <caret line="117" column="41" lean-forward="true" selection-start-line="117" selection-start-column="41" selection-end-line="117" selection-end-column="41" />
  1100 + </state>
  1101 + </provider>
  1102 + </entry>
  1103 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java">
  1104 + <provider selected="true" editor-type-id="text-editor">
  1105 + <state relative-caret-position="220">
  1106 + <caret line="18" column="15" selection-start-line="18" selection-start-column="15" selection-end-line="18" selection-end-column="15" />
  1107 + </state>
  1108 + </provider>
  1109 + </entry>
  1110 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java">
  1111 + <provider selected="true" editor-type-id="text-editor">
  1112 + <state relative-caret-position="869">
  1113 + <caret line="58" lean-forward="true" selection-start-line="58" selection-end-line="58" />
  1114 + </state>
  1115 + </provider>
  1116 + </entry>
  1117 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java">
  1118 + <provider selected="true" editor-type-id="text-editor">
  1119 + <state relative-caret-position="583">
  1120 + <caret line="773" lean-forward="true" selection-start-line="773" selection-end-line="773" />
  1121 + </state>
  1122 + </provider>
  1123 + </entry>
  1124 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java">
  1125 + <provider selected="true" editor-type-id="text-editor">
  1126 + <state relative-caret-position="408">
  1127 + <caret line="105" column="37" lean-forward="true" selection-start-line="105" selection-start-column="37" selection-end-line="105" selection-end-column="37" />
  1128 + </state>
  1129 + </provider>
  1130 + </entry>
  1131 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html">
  1132 + <provider selected="true" editor-type-id="text-editor">
  1133 + <state relative-caret-position="185">
  1134 + <caret line="335" column="16" lean-forward="true" selection-start-line="335" selection-start-column="16" selection-end-line="335" selection-end-column="16" />
  1135 + <folding>
  1136 + <element signature="e#4822#10729#0" />
  1137 + </folding>
  1138 + </state>
  1139 + </provider>
  1140 + </entry>
  1141 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailService.java">
  1142 + <provider selected="true" editor-type-id="text-editor">
  1143 + <state relative-caret-position="140">
  1144 + <caret line="9" selection-start-line="9" selection-end-line="9" />
  1145 + </state>
  1146 + </provider>
  1147 + </entry>
  1148 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java">
  1149 + <provider selected="true" editor-type-id="text-editor">
  1150 + <state relative-caret-position="173">
  1151 + <caret line="104" column="25" selection-start-line="104" selection-start-column="25" selection-end-line="104" selection-end-column="25" />
  1152 + </state>
  1153 + </provider>
  1154 + </entry>
  1155 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java">
  1156 + <provider selected="true" editor-type-id="text-editor">
  1157 + <state relative-caret-position="80">
  1158 + <caret line="44" column="22" selection-start-line="44" selection-start-column="22" selection-end-line="44" selection-end-column="22" />
  1159 + </state>
  1160 + </provider>
  1161 + </entry>
  1162 + </component>
341 1163 </project>
342 1164 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/config/containerType/service/ContainerTypeServiceImpl.java
  View file @850393c
... ... @@ -28,7 +28,7 @@ public class ContainerTypeServiceImpl extends ServiceImpl&lt;ContainerTypeMapper, C
28 28 LambdaQueryWrapper<ContainerType> lambda = Wrappers.lambdaQuery();
29 29 lambda.select(ContainerType::getCode,ContainerType::getId,ContainerType::getName)
30 30 .eq(ContainerType::getWarehouseCode, ShiroUtils.getWarehouseCode())
31   - .eq(ContainerType::getEnable, 0);
  31 + .eq(ContainerType::getEnable, 1);
32 32 List<Map<String, Object>> result= this.listMaps(lambda);
33 33 return result;
34 34 }
... ...
src/main/java/com/huaheng/pc/config/shipmentPreference/service/ShipmentPreferenceServiceImpl.java
  View file @850393c
... ... @@ -5,7 +5,7 @@ import com.huaheng.pc.config.shipmentPreference.domain.ShipmentPreference;
5 5 import com.huaheng.pc.config.shipmentPreference.mapper.ShipmentPreferenceMapper;
6 6 import org.springframework.stereotype.Service;
7 7  
8   -@Service
  8 +@Service("shipmentPreference")
9 9 public class ShipmentPreferenceServiceImpl extends ServiceImpl<ShipmentPreferenceMapper, ShipmentPreference> implements ShipmentPreferenceService {
10 10  
11 11 }
... ...
src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java
  View file @850393c
... ... @@ -97,15 +97,16 @@ public class InventoryDetailController extends BaseController
97 97 }
98 98 }
99 99  
100   - /**出库查看*/
  100 + /**库存明细出库查看*/
101 101 //@RequiresPermissions("inventory:inventoryHeader:seeOut")
102   - @PostMapping("/createCheckOutTask")
  102 + @PostMapping("/detailcreateCheckOutTask")
103 103 @ResponseBody
104   - public AjaxResult createCheckOutTask(String ids){
  104 + public AjaxResult detailcreateCheckOutTask(String ids){
105 105 if(StringUtils.isEmpty(ids)){
106   - return AjaxResult.error("ids不能为空");
  106 + return AjaxResult.error("库存明细ID不能为空");
107 107 }
108   - return inventoryHeaderService.createCheckOutTask(ids);
  108 + Integer id = Integer.valueOf(ids);
  109 + return inventoryDetailService.detailcreateCheckOutTask(id);
109 110 }
110 111  
111 112  
... ...
src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailService.java
  View file @850393c
... ... @@ -7,7 +7,7 @@ import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail;
7 7 public interface InventoryDetailService extends IService<InventoryDetail> {
8 8  
9 9  
10   - public AjaxResult createCheckOutTask (String ids);
  10 + AjaxResult detailcreateCheckOutTask (Integer id);
11 11  
12 12 }
13 13  
... ...
src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java
  View file @850393c
1 1 package com.huaheng.pc.inventory.inventoryDetail.service;
2 2  
  3 +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
  4 +import com.baomidou.mybatisplus.core.toolkit.Wrappers;
  5 +import com.huaheng.common.exception.service.ServiceException;
  6 +import com.huaheng.common.utils.StringUtils;
  7 +import com.huaheng.common.utils.security.ShiroUtils;
3 8 import com.huaheng.framework.web.domain.AjaxResult;
  9 +import com.huaheng.pc.config.location.domain.Location;
  10 +import com.huaheng.pc.config.location.service.LocationService;
4 11 import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail;
  12 +import com.huaheng.pc.task.taskDetail.domain.TaskDetail;
5 13 import com.huaheng.pc.task.taskDetail.service.TaskDetailService;
  14 +import com.huaheng.pc.task.taskHeader.domain.TaskHeader;
6 15 import com.huaheng.pc.task.taskHeader.service.TaskHeaderService;
7 16 import org.springframework.stereotype.Service;
8 17 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
9 18 import com.huaheng.pc.inventory.inventoryDetail.mapper.InventoryDetailMapper;
10 19  
11 20 import javax.annotation.Resource;
  21 +import java.util.ArrayList;
  22 +import java.util.Date;
  23 +import java.util.List;
12 24  
13 25 @Service
14 26 public class InventoryDetailServiceImpl extends ServiceImpl<InventoryDetailMapper, InventoryDetail> implements InventoryDetailService {
... ... @@ -19,16 +31,79 @@ public class InventoryDetailServiceImpl extends ServiceImpl&lt;InventoryDetailMappe
19 31 private TaskHeaderService taskHeaderService;
20 32 @Resource
21 33 private TaskDetailService taskDetailService;
  34 + @Resource
  35 + private InventoryDetailMapper inventoryDetailMapper;
  36 + @Resource
  37 + private LocationService locationService;
  38 +
  39 +
22 40  
23 41 /**
24   - * 出库查看
  42 + * 库存明细出库查看
25 43 * */
26 44 @Override
27   - public AjaxResult createCheckOutTask(String ids) {
28   - //生成出库查看任务
  45 + public AjaxResult detailcreateCheckOutTask(Integer id) {
  46 + /*传入库存明细ID，通过该ID找到明细条码确定库位容器，再生成任务*/
29 47  
30   - return AjaxResult.success("出库查看任务生成成功！");
  48 + InventoryDetail inventoryDetail = inventoryDetailMapper.selectById(id);
  49 + //检查库位容器
  50 + Location temp = new Location();
  51 + temp.setCode(inventoryDetail.getLocationCode());
  52 + temp.setWarehouseCode(inventoryDetail.getWarehouseCode());
  53 + LambdaQueryWrapper<Location> lambdaQueryWrapper = Wrappers.lambdaQuery(temp);
  54 + Location loc = locationService.getOne(lambdaQueryWrapper);
  55 + if(loc == null){
  56 + throw new ServiceException("库存没有库位！");
  57 + }
  58 + if(!loc.getStatus().equals("empty")){
  59 + throw new ServiceException(inventoryDetail.getLocationCode()+"状态非空闲，操作失败");
  60 + }
  61 + if(StringUtils.isEmpty(loc.getContainerCode())){
  62 + throw new ServiceException(inventoryDetail.getLocationCode()+"没有容器，操作失败");
  63 + }
  64 + //写入任务主表
  65 + TaskHeader taskHeader = new TaskHeader();
  66 + taskHeader.setWarehouseCode(inventoryDetail.getWarehouseCode());
  67 + taskHeader.setCompanyCode(inventoryDetail.getCompanyCode());
  68 + taskHeader.setInternalTaskType(900);
  69 + taskHeader.setTaskType(900);
  70 + taskHeader.setContainerCode(inventoryDetail.getContainerCode());
  71 + taskHeader.setStatus(1);
  72 + taskHeader.setFromLocation(inventoryDetail.getLocationCode());
  73 + taskHeader.setToLocation(inventoryDetail.getLocationCode());
  74 + taskHeader.setCreated(new Date());
  75 + taskHeader.setCreatedBy(ShiroUtils.getLoginName());
  76 + taskHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
  77 + taskHeader.setLastUpdated(new Date());
  78 + if(taskHeaderService.save(taskHeader)){
  79 + //锁定库位状态
  80 + locationService.updateStatus(loc.getContainerCode(),"lock");
  81 + }else{
  82 + throw new ServiceException("出库查看任务主表生成失败！");
  83 + }
  84 + //写入任务细表
  85 + TaskDetail taskDetail = new TaskDetail();
  86 + taskDetail.setTaskId(taskHeader.getId());//主单ID
  87 + taskDetail.setTaskType(taskHeader.getTaskType());
  88 + taskDetail.setInternalTaskType(taskHeader.getTaskType());
  89 + taskDetail.setWarehouseCode(taskHeader.getWarehouseCode());
  90 + taskDetail.setCompanyCode(inventoryDetail.getCompanyCode());
  91 + taskDetail.setFromLocation(taskHeader.getFromLocation());
  92 + taskDetail.setToLocation(taskHeader.getToLocation());
  93 + taskDetail.setContainerCode(taskHeader.getContainerCode());
  94 + taskDetail.setCreated(new Date());
  95 + taskDetail.setCreatedBy(ShiroUtils.getLoginName());
  96 + taskDetail.setLastUpdated(new Date());
  97 + taskDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
  98 + if(taskDetailService.save(taskDetail) == false){
  99 + throw new ServiceException("出库查看任务明细生成失败！");
  100 + }
  101 +
  102 + return AjaxResult.success("库存明细出库查看任务下发成功！");
31 103 }
  104 +
  105 +
  106 +
32 107 }
33 108  
34 109  
... ...
src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java
  View file @850393c
... ... @@ -95,17 +95,16 @@ public class InventoryHeaderController extends BaseController
95 95 @PostMapping("/transfer")
96 96 @ResponseBody
97 97 public AjaxResult transfer(String sourceLocation, String destinationLocation){
98   - String companyCode="";
99   - return inventoryHeaderService.transfer(sourceLocation,destinationLocation,companyCode);
  98 + return inventoryHeaderService.transfer(sourceLocation,destinationLocation);
100 99 }
101 100  
102 101 /**出库查看*/
103 102 //@RequiresPermissions("inventory:inventoryHeader:seeOut")
104 103 @PostMapping("/createCheckOutTask")
105 104 @ResponseBody
106   - public AjaxResult createCheckOutTask(String ids){
  105 + public AjaxResult createCheckOutTask(String[] ids){
107 106 if(StringUtils.isEmpty(ids)){
108   - return AjaxResult.error("ids不能为空");
  107 + return AjaxResult.error("库存ID不能为空！");
109 108 }
110 109 return inventoryHeaderService.createCheckOutTask(ids);
111 110 }
... ...
src/main/java/com/huaheng/pc/inventory/inventoryHeader/mapper/InventoryHeaderMapper.java
  View file @850393c
... ... @@ -2,6 +2,17 @@ package com.huaheng.pc.inventory.inventoryHeader.mapper;
2 2  
3 3 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4 4 import com.huaheng.pc.inventory.inventoryHeader.domain.InventoryHeader;
  5 +import org.apache.ibatis.annotations.Param;
5 6  
6 7 public interface InventoryHeaderMapper extends BaseMapper<InventoryHeader> {
  8 +
  9 +
  10 +
  11 + int getUncompleteReceiptContainer(@Param("locationCode") String locationCode, @Param("warehouseCode") String warehouseCode);
  12 +
  13 + int getUncompleteShipmentContainer(@Param("locationCode") String locationCode,@Param("warehouseCode") String warehouseCode);
  14 +
  15 +
  16 +
  17 +
7 18 }
8 19 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java
  View file @850393c
... ... @@ -10,10 +10,16 @@ public interface InventoryHeaderService extends IService&lt;InventoryHeader&gt; {
10 10  
11 11  
12 12  
13   - public AjaxResult createCheckOutTask (String ids);
  13 + AjaxResult createCheckOutTask (String[] ids);
14 14  
15 15  
16   - public AjaxResult transfer(String sourceLocation, String destinationLocation, String companyCode);
  16 + AjaxResult transfer(String sourceLocation, String destinationLocation);
  17 +
  18 + //移库查询入库组盘
  19 + int getUncompleteReceiptContainer(String locationCode,String warehouseCode);
  20 + //移库查询出库组盘
  21 + int getUncompleteShipmentContainer(String sourceLocation, String warehouseCode);
  22 +
17 23  
18 24 }
19 25  
... ...
src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java
  View file @850393c
... ... @@ -9,6 +9,7 @@ import com.huaheng.pc.task.taskHeader.service.TaskHeaderServiceImpl;
9 9 import org.springframework.stereotype.Service;
10 10 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
11 11 import com.huaheng.pc.inventory.inventoryHeader.mapper.InventoryHeaderMapper;
  12 +import org.springframework.transaction.annotation.Transactional;
12 13  
13 14 import javax.annotation.Resource;
14 15  
... ... @@ -17,31 +18,44 @@ public class InventoryHeaderServiceImpl extends ServiceImpl&lt;InventoryHeaderMappe
17 18  
18 19  
19 20 @Resource
20   - private TaskHeaderServiceImpl taskHeaderServiceImpl;
  21 + private TaskHeaderService taskHeaderService;
21 22 @Resource
22   - private TaskDetailServiceImpl taskDetailServiceImpl;
  23 + private InventoryHeaderMapper inventoryHeaderMapper;
  24 +
23 25  
24 26  
25 27 /**
26 28 * 移库
27 29 * */
28   -
29   - public AjaxResult transfer(String sourceLocation, String destinationLocation, String companyCode) {
  30 + @Override
  31 + public AjaxResult transfer(String sourceLocation, String destinationLocation) {
30 32 //生成移库任务
31   - taskHeaderServiceImpl.createTransferTask(sourceLocation,destinationLocation,companyCode);
  33 + taskHeaderService.createTransferTask(sourceLocation,destinationLocation);
32 34 return AjaxResult.success("移库任务生成成功！");
33 35 }
34 36  
35 37 /**
36 38 * 出库查看
37 39 * */
38   -
39   - public AjaxResult createCheckOutTask(String ids) {
  40 + @Override
  41 + public AjaxResult createCheckOutTask(String[] ids) {
40 42 //生成出库查看任务
  43 + taskHeaderService.createCheckOutTask(ids);
  44 + return AjaxResult.success("出库查看任务正在生成！");
  45 + }
41 46  
42   - return AjaxResult.success("出库查看任务生成成功！");
  47 + @Override
  48 + public int getUncompleteReceiptContainer(String locationCode, String warehouseCode) {
  49 + return inventoryHeaderMapper.getUncompleteReceiptContainer(locationCode,warehouseCode);
43 50 }
44 51  
  52 + @Override
  53 + public int getUncompleteShipmentContainer(String locationCode, String warehouseCode) {
  54 + return inventoryHeaderMapper.getUncompleteShipmentContainer(locationCode,warehouseCode);
  55 + }
  56 +
  57 +
  58 +
45 59  
46 60  
47 61  
... ...
src/main/java/com/huaheng/pc/inventory/inventoryTransaction/domain/InventoryTransaction.java
  View file @850393c
... ... @@ -177,7 +177,7 @@ public class InventoryTransaction implements Serializable {
177 177 */
178 178 @TableField(value = "attributeId")
179 179 @ApiModelProperty(value="属性号")
180   - private Integer attributeId;
  180 + private String attributeId;
181 181  
182 182 /**
183 183 * 属性1
... ...
src/main/java/com/huaheng/pc/shipment/shipmentContainerDetail/domain/ShipmentContainerDetail.java
  View file @850393c
... ... @@ -114,9 +114,9 @@ public class ShipmentContainerDetail implements Serializable {
114 114 /**
115 115 * 状态
116 116 */
117   - @TableField(value = "enable")
  117 + @TableField(value = "status")
118 118 @ApiModelProperty(value="状态")
119   - private Integer enable;
  119 + private Integer status;
120 120  
121 121 /**
122 122 * 重量
... ... @@ -153,12 +153,6 @@ public class ShipmentContainerDetail implements Serializable {
153 153 @ApiModelProperty(value="高")
154 154 private BigDecimal itemHeight;
155 155  
156   - /**
157   - * 价值
158   - */
159   - @TableField(value = "itemValue")
160   - @ApiModelProperty(value="价值")
161   - private BigDecimal itemValue;
162 156  
163 157 /**
164 158 * 数量
... ... @@ -189,13 +183,6 @@ public class ShipmentContainerDetail implements Serializable {
189 183 private Integer attributeId;
190 184  
191 185 /**
192   - * 原始拣货位
193   - */
194   - @TableField(value = "originalPickLoc")
195   - @ApiModelProperty(value="原始拣货位")
196   - private String originalPickLoc;
197   -
198   - /**
199 186 * 属性1
200 187 */
201 188 @TableField(value = "attribute1")
... ... @@ -282,16 +269,10 @@ public class ShipmentContainerDetail implements Serializable {
282 269 /**
283 270 * 周转箱号
284 271 */
285   - @TableField(value = "transContCode")
  272 + @TableField(value = "transContainerCode")
286 273 @ApiModelProperty(value="周转箱号")
287   - private String transContCode;
  274 + private String transContainerCode;
288 275  
289   - /**
290   - * 扫描数量
291   - */
292   - @TableField(value = "scannedQty")
293   - @ApiModelProperty(value="扫描数量")
294   - private Integer scannedQty;
295 276  
296 277 /**
297 278 * 创建时间
... ... @@ -384,7 +365,7 @@ public class ShipmentContainerDetail implements Serializable {
384 365  
385 366 public static final String COL_MATERIALUNIT = "materialUnit";
386 367  
387   - public static final String COL_ENABLE = "enable";
  368 + public static final String COL_STATUS= "status";
388 369  
389 370 public static final String COL_ITEMWEIGHT = "itemWeight";
390 371  
... ... @@ -396,8 +377,6 @@ public class ShipmentContainerDetail implements Serializable {
396 377  
397 378 public static final String COL_ITEMHEIGHT = "itemHeight";
398 379  
399   - public static final String COL_ITEMVALUE = "itemValue";
400   -
401 380 public static final String COL_QTY = "qty";
402 381  
403 382 public static final String COL_WAVEID = "waveId";
... ... @@ -406,8 +385,6 @@ public class ShipmentContainerDetail implements Serializable {
406 385  
407 386 public static final String COL_ATTRIBUTEID = "attributeId";
408 387  
409   - public static final String COL_ORIGINALPICKLOC = "originalPickLoc";
410   -
411 388 public static final String COL_ATTRIBUTE1 = "attribute1";
412 389  
413 390 public static final String COL_ATTRIBUTE2 = "attribute2";
... ... @@ -432,9 +409,7 @@ public class ShipmentContainerDetail implements Serializable {
432 409  
433 410 public static final String COL_PACKINGCLASS = "packingClass";
434 411  
435   - public static final String COL_TRANSCONTCODE = "transContCode";
436   -
437   - public static final String COL_SCANNEDQTY = "scannedQty";
  412 + public static final String COL_TRANSCONTAINERCODE = "transContainerCode";
438 413  
439 414 public static final String COL_CREATED = "created";
440 415  
... ... @@ -687,22 +662,13 @@ public class ShipmentContainerDetail implements Serializable {
687 662 this.materialUnit = materialUnit;
688 663 }
689 664  
690   - /**
691   - * 获取状态
692   - *
693   - * @return enable - 状态
694   - */
695   - public Integer getEnable() {
696   - return enable;
  665 +
  666 + public Integer getStatus() {
  667 + return status;
697 668 }
698 669  
699   - /**
700   - * 设置状态
701   - *
702   - * @param enable 状态
703   - */
704   - public void setEnable(Integer enable) {
705   - this.enable = enable;
  670 + public void setStatus(Integer status) {
  671 + this.status = status;
706 672 }
707 673  
708 674 /**
... ... @@ -795,23 +761,6 @@ public class ShipmentContainerDetail implements Serializable {
795 761 this.itemHeight = itemHeight;
796 762 }
797 763  
798   - /**
799   - * 获取价值
800   - *
801   - * @return itemValue - 价值
802   - */
803   - public BigDecimal getItemValue() {
804   - return itemValue;
805   - }
806   -
807   - /**
808   - * 设置价值
809   - *
810   - * @param itemValue 价值
811   - */
812   - public void setItemValue(BigDecimal itemValue) {
813   - this.itemValue = itemValue;
814   - }
815 764  
816 765 public BigDecimal getQty() {
817 766 return qty;
... ... @@ -875,23 +824,6 @@ public class ShipmentContainerDetail implements Serializable {
875 824 this.attributeId = attributeId;
876 825 }
877 826  
878   - /**
879   - * 获取原始拣货位
880   - *
881   - * @return originalPickLoc - 原始拣货位
882   - */
883   - public String getOriginalPickLoc() {
884   - return originalPickLoc;
885   - }
886   -
887   - /**
888   - * 设置原始拣货位
889   - *
890   - * @param originalPickLoc 原始拣货位
891   - */
892   - public void setOriginalPickLoc(String originalPickLoc) {
893   - this.originalPickLoc = originalPickLoc;
894   - }
895 827  
896 828 /**
897 829 * 获取属性1
... ... @@ -1109,41 +1041,14 @@ public class ShipmentContainerDetail implements Serializable {
1109 1041 this.packingClass = packingClass;
1110 1042 }
1111 1043  
1112   - /**
1113   - * 获取周转箱号
1114   - *
1115   - * @return transContCode - 周转箱号
1116   - */
1117   - public String getTransContCode() {
1118   - return transContCode;
  1044 + public String getTransContainerCode() {
  1045 + return transContainerCode;
1119 1046 }
1120 1047  
1121   - /**
1122   - * 设置周转箱号
1123   - *
1124   - * @param transContCode 周转箱号
1125   - */
1126   - public void setTransContCode(String transContCode) {
1127   - this.transContCode = transContCode;
1128   - }
1129   -
1130   - /**
1131   - * 获取扫描数量
1132   - *
1133   - * @return scannedQty - 扫描数量
1134   - */
1135   - public Integer getScannedQty() {
1136   - return scannedQty;
  1048 + public void setTransContainerCode(String transContainerCode) {
  1049 + this.transContainerCode = transContainerCode;
1137 1050 }
1138 1051  
1139   - /**
1140   - * 设置扫描数量
1141   - *
1142   - * @param scannedQty 扫描数量
1143   - */
1144   - public void setScannedQty(Integer scannedQty) {
1145   - this.scannedQty = scannedQty;
1146   - }
1147 1052  
1148 1053 /**
1149 1054 * 获取创建时间
... ...
src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java
  View file @850393c
... ... @@ -182,6 +182,7 @@ public class ShipmentContainerHeaderServiceImpl extends ServiceImpl&lt;ShipmentCont
182 182 if (shipmentContainerHeader == null) {
183 183 shipmentContainerHeader = new ShipmentContainerHeader();
184 184 shipmentContainerHeader.setContainerCode(location.getContainerCode());
  185 + shipmentContainerHeader.setLocationCode(location.getCode());
185 186 shipmentContainerHeader.setWarehouseCode(ShiroUtils.getWarehouseCode());
186 187 //赋值u8仓库
187 188 shipmentContainerHeader.setCompanyCode(shipmentDetail.getCompanyCode());
... ... @@ -226,12 +227,19 @@ public class ShipmentContainerHeaderServiceImpl extends ServiceImpl&lt;ShipmentCont
226 227 if (material == null)
227 228 throw new ServiceException("出库单(" + shipmentDetail.getShipmentCode() + ")的物料("+ shipmentDetail.getMaterialCode() +")不存在！");
228 229 shipmentContainerDetail = new ShipmentContainerDetail();
  230 + shipmentContainerDetail.setWarehouseCode(shipmentContainerHeader.getWarehouseCode());
  231 + shipmentContainerDetail.setCompanyCode(shipmentContainerHeader.getCompanyCode());
  232 + shipmentContainerDetail.setContainerCode(shipmentContainerHeader.getContainerCode());
  233 + shipmentContainerDetail.setLocationCode(shipmentContainerHeader.getLocationCode());
  234 + shipmentContainerDetail.setInventoryId(shipmentCombinationModel.getInventoryDetailId());
  235 + shipmentContainerDetail.setInventorySts(shipmentDetail.getInventorySts());
229 236 shipmentContainerDetail.setShippingContainerId(shipmentContainerHeader.getId());
230 237 shipmentContainerDetail.setShipmentCode(shipmentDetail.getShipmentCode());
231 238 shipmentContainerDetail.setShipmentId(shipmentDetail.getShipmentId());
232 239 shipmentContainerDetail.setShipmentDetailId(shipmentCombinationModel.getShipmentDetailId());
233 240 shipmentContainerDetail.setMaterialCode(material.getCode());
234 241 shipmentContainerDetail.setMaterialName(material.getName());
  242 + shipmentContainerDetail.setMaterialSpec(material.getSpec());
235 243 shipmentContainerDetail.setQty(shipmentCombinationModel.getShipQty());
236 244 shipmentContainerDetail.setCreated(null);
237 245 shipmentContainerDetail.setCreatedBy(ShiroUtils.getLoginName());
... ...
src/main/java/com/huaheng/pc/shipment/shippingCombination/controller/ShippingCombinationController.java
  View file @850393c
... ... @@ -8,7 +8,11 @@ import com.huaheng.common.utils.security.ShiroUtils;
8 8 import com.huaheng.framework.web.controller.BaseController;
9 9 import com.huaheng.framework.web.domain.AjaxResult;
10 10 import com.huaheng.framework.web.page.TableDataInfo;
  11 +import com.huaheng.pc.config.configValue.domain.ConfigValue;
  12 +import com.huaheng.pc.config.configValue.service.ConfigValueService;
  13 +import com.huaheng.pc.config.material.domain.Material;
11 14 import com.huaheng.pc.config.material.service.MaterialServiceImpl;
  15 +import com.huaheng.pc.config.shipmentPreference.domain.ShipmentPreference;
12 16 import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail;
13 17 import com.huaheng.pc.inventory.inventoryDetail.service.InventoryDetailService;
14 18 import com.huaheng.pc.shipment.shipmentContainerDetail.service.ShipmentContainerDetailService;
... ... @@ -48,6 +52,8 @@ public class ShippingCombinationController extends BaseController {
48 52 ShipmentHeaderService shipmentHeaderService;
49 53 @Autowired
50 54 InventoryDetailService inventoryDetailService;
  55 + @Autowired
  56 + ConfigValueService configValueService;
51 57  
52 58  
53 59 /**
... ... @@ -91,7 +97,7 @@ public class ShippingCombinationController extends BaseController {
91 97 @PostMapping("/getInventory")
92 98 @ResponseBody
93 99 public TableDataInfo getInventory(String code, Integer id){
94   - //找到主单的账套和u8仓库
  100 + //找到主单的账套
95 101 LambdaQueryWrapper<ShipmentHeader> lambdaQueryWrapper = Wrappers.lambdaQuery();
96 102 lambdaQueryWrapper.eq(ShipmentHeader::getCode,code)
97 103 .eq(ShipmentHeader::getWarehouseCode,ShiroUtils.getWarehouseCode());
... ... @@ -108,13 +114,77 @@ public class ShippingCombinationController extends BaseController {
108 114 LambdaQueryWrapper<InventoryDetail> lam = Wrappers.lambdaQuery();
109 115 lam.eq(InventoryDetail::getWarehouseCode,shipmentHeader.getWarehouseCode())
110 116 .eq(InventoryDetail::getCompanyCode,shipmentHeader.getCompanyCode())
111   - .eq(InventoryDetail::getMaterialName,shipmentDetail.getMaterialCode());
  117 + .eq(InventoryDetail::getMaterialCode,shipmentDetail.getMaterialCode());
112 118  
113 119 List<InventoryDetail> list= inventoryDetailService.list(lam);
114 120 return getDataTable(list);
115 121 }
116 122  
117 123  
  124 +// /**
  125 +// * 获取能出库的库存列表
  126 +// * @param code,id
  127 +// * @return
  128 +// */
  129 +// @PostMapping("/getInventory")
  130 +// @ResponseBody
  131 +// public TableDataInfo getInventory(String code, Integer id){
  132 +// //找到主单的账套
  133 +// LambdaQueryWrapper<ShipmentHeader> lambdaQueryWrapper = Wrappers.lambdaQuery();
  134 +// lambdaQueryWrapper.eq(ShipmentHeader::getCode,code)
  135 +// .eq(ShipmentHeader::getWarehouseCode,ShiroUtils.getWarehouseCode());
  136 +// ShipmentHeader shipmentHeader=shipmentHeaderService.getOne(lambdaQueryWrapper);
  137 +// if(shipmentHeader==null){
  138 +// throw new ServiceException("找不到主单");
  139 +// }
  140 +// //找到子单物料
  141 +// ShipmentDetail shipmentDetail=new ShipmentDetail();
  142 +// shipmentDetail=shipmentDetailService.getById(id);
  143 +// if(shipmentDetail==null){
  144 +// throw new ServiceException("找不到子单");
  145 +// }
  146 +//
  147 +// //出库首选项
  148 +// LambdaQueryWrapper<ShipmentPreference> shipmentPreferenceLambdaQueryWrapper=Wrappers.lambdaQuery();
  149 +//
  150 +// //出库规则
  151 +// //出库子单的分配规则
  152 +// if(StringUtils.isNotEmpty(shipmentDetail.getAllocationRule())){
  153 +//
  154 +//
  155 +// }
  156 +//
  157 +// //物料的分+配规则
  158 +// LambdaQueryWrapper<Material> materialLambdaQueryWrapper=Wrappers.lambdaQuery();
  159 +// materialLambdaQueryWrapper.eq(Material::getCode,shipmentDetail.getMaterialCode())
  160 +// .eq(Material::getWarehouseCode,shipmentDetail.getWarehouseCode());
  161 +// Material material=materialService.getOne(materialLambdaQueryWrapper);
  162 +// if(StringUtils.isNotEmpty(material.getAllocationRule())){
  163 +//
  164 +//
  165 +// }
  166 +//
  167 +// //仓库的分配规则
  168 +// LambdaQueryWrapper<ConfigValue> configValueLambdaQueryWrapper=Wrappers.lambdaQuery();
  169 +// configValueLambdaQueryWrapper.eq(ConfigValue::getModuleType,"shipment")
  170 +// .eq(ConfigValue::getWarehouseCode,shipmentDetail.getWarehouseCode());
  171 +// ConfigValue configValue=configValueService.getOne(configValueLambdaQueryWrapper);
  172 +// //查找出库首选项
  173 +//
  174 +// configValue.getIdentifier();
  175 +//
  176 +//
  177 +//
  178 +// LambdaQueryWrapper<InventoryDetail> lam = Wrappers.lambdaQuery();
  179 +// lam.eq(InventoryDetail::getWarehouseCode,shipmentHeader.getWarehouseCode())
  180 +// .eq(InventoryDetail::getCompanyCode,shipmentHeader.getCompanyCode())
  181 +// .eq(InventoryDetail::getMaterialName,shipmentDetail.getMaterialCode());
  182 +//
  183 +// List<InventoryDetail> list= inventoryDetailService.list(lam);
  184 +// return getDataTable(list);
  185 +// }
  186 +
  187 +
118 188 /**
119 189 * 保存组盘
120 190 * @param shipmentCombinationModel
... ...
src/main/java/com/huaheng/pc/task/taskDetail/domain/TaskDetail.java
  View file @850393c
... ... @@ -30,25 +30,18 @@ public class TaskDetail implements Serializable {
30 30 private Integer taskId;
31 31  
32 32 /**
33   - * 任务号
34   - */
35   - @TableField(value = "taskCode")
36   - @ApiModelProperty(value="任务号")
37   - private String taskCode;
38   -
39   - /**
40 33 * 任务类型
41 34 */
42 35 @TableField(value = "taskType")
43 36 @ApiModelProperty(value="任务类型")
44   - private String taskType;
  37 + private Integer taskType;
45 38  
46 39 /**
47 40 * 任务类型
48 41 */
49 42 @TableField(value = "internalTaskType")
50 43 @ApiModelProperty(value="任务类型")
51   - private String internalTaskType;
  44 + private Integer internalTaskType;
52 45  
53 46 /**
54 47 * 仓库
... ... @@ -65,24 +58,17 @@ public class TaskDetail implements Serializable {
65 58 private String companyCode;
66 59  
67 60 /**
68   - * 单据号
  61 + * 单据编码
69 62 */
70 63 @TableField(value = "billCode")
71   - @ApiModelProperty(value="货主")
  64 + @ApiModelProperty(value="单据编码")
72 65 private String billCode;
73 66  
74 67 /**
75   - * 主单Id
76   - */
77   - @TableField(value = "billId")
78   - @ApiModelProperty(value="货主")
79   - private Integer billId;
80   -
81   - /**
82 68 * 子单ID
83 69 */
84 70 @TableField(value = "billDetailId")
85   - @ApiModelProperty(value="货主")
  71 + @ApiModelProperty(value="子单ID")
86 72 private Integer billDetailId;
87 73  
88 74 /**
... ... @@ -395,8 +381,6 @@ public class TaskDetail implements Serializable {
395 381  
396 382 public static final String COL_BILLCODE= "billCode";
397 383  
398   - public static final String COL_BILLID= "billId";
399   -
400 384 public static final String COL_BILLDETAILID= "billDetailId";
401 385  
402 386  
... ...
src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java
  View file @850393c
... ... @@ -69,6 +69,7 @@ public class TaskHeaderController extends BaseController {
69 69 .eq(StringUtils.isNotNull(taskHeader.getInternalTaskType()),TaskHeader::getInternalTaskType,taskHeader.getInternalTaskType())
70 70 .eq(StringUtils.isNotNull(taskHeader.getId()),TaskHeader::getId,taskHeader.getId())
71 71 .eq(StringUtils.isNotEmpty(taskHeader.getContainerCode()),TaskHeader::getContainerCode,taskHeader.getContainerCode())
  72 + .eq(StringUtils.isNotEmpty(taskHeader.getLocationCode()),TaskHeader::getLocationCode,taskHeader.getLocationCode())
72 73 .gt(StringUtils.isNotEmpty(createdBegin),TaskHeader::getCreated,createdBegin)
73 74 .lt(StringUtils.isNotEmpty(createdEnd),TaskHeader::getCreated,createdEnd);
74 75  
... ...
src/main/java/com/huaheng/pc/task/taskHeader/domain/TaskHeader.java
  View file @850393c
... ... @@ -10,7 +10,7 @@ import java.io.Serializable;
10 10 import java.util.Date;
11 11 import lombok.Data;
12 12  
13   -@ApiModel(value="com.huaheng.pc.task.taskHeader.TaskHeader")
  13 +@ApiModel(value="com.huaheng.pc.task.taskHeader.domain.TaskHeader")
14 14 @Data
15 15 @TableName(value = "task_header")
16 16 public class TaskHeader implements Serializable {
... ... @@ -22,6 +22,13 @@ public class TaskHeader implements Serializable {
22 22 private Integer id;
23 23  
24 24 /**
  25 + * 任务
  26 + */
  27 + @TableField(value = "code")
  28 + @ApiModelProperty(value="任务")
  29 + private String code;
  30 +
  31 + /**
25 32 * 仓库
26 33 */
27 34 @TableField(value = "warehouseCode")
... ... @@ -50,27 +57,6 @@ public class TaskHeader implements Serializable {
50 57 private Integer internalTaskType;
51 58  
52 59 /**
53   - * 容器号
54   - */
55   - @TableField(value = "containerCode")
56   - @ApiModelProperty(value="容器号")
57   - private String containerCode;
58   -
59   - /**
60   - * 从货位，源库位
61   - */
62   - @TableField(value = "fromLocation")
63   - @ApiModelProperty(value="从货位，源库位")
64   - private String fromLocation;
65   -
66   - /**
67   - * 到货位，目的库位
68   - */
69   - @TableField(value = "toLocation")
70   - @ApiModelProperty(value="到货位，目的库位")
71   - private String toLocation;
72   -
73   - /**
74 60 * 参考单内部号
75 61 */
76 62 @TableField(value = "referenceId")
... ... @@ -127,6 +113,20 @@ public class TaskHeader implements Serializable {
127 113 private String pickingCartPos;
128 114  
129 115 /**
  116 + * 容器号
  117 + */
  118 + @TableField(value = "locationCode")
  119 + @ApiModelProperty(value="容器号")
  120 + private String locationCode;
  121 +
  122 + /**
  123 + * 容器号
  124 + */
  125 + @TableField(value = "containerCode")
  126 + @ApiModelProperty(value="容器号")
  127 + private String containerCode;
  128 +
  129 + /**
130 130 * 开始拣货时间
131 131 */
132 132 @TableField(value = "startPickDateTime")
... ... @@ -280,6 +280,7 @@ public class TaskHeader implements Serializable {
280 280 @ApiModelProperty(value="同步标志 0：需要同步 10：同步成功 20：同步失败")
281 281 private String userDef3;
282 282  
  283 +
283 284 /**
284 285 * 处理标记
285 286 */
... ... @@ -288,4 +289,82 @@ public class TaskHeader implements Serializable {
288 289 private String processStamp;
289 290  
290 291 private static final long serialVersionUID = 1L;
  292 +
  293 + public static final String COL_ID = "id";
  294 +
  295 + public static final String COL_CODE = "code";
  296 +
  297 + public static final String COL_WAREHOUSECODE = "warehouseCode";
  298 +
  299 + public static final String COL_COMPANYCODE = "companyCode";
  300 +
  301 + public static final String COL_TASKTYPE = "taskType";
  302 +
  303 + public static final String COL_INTERNALTASKTYPE = "internalTaskType";
  304 +
  305 + public static final String COL_REFERENCEID = "referenceId";
  306 +
  307 + public static final String COL_REFERENCECODE = "referenceCode";
  308 +
  309 + public static final String COL_ASSIGNEDUSER = "assignedUser";
  310 +
  311 + public static final String COL_CONFIRMEDBY = "confirmedBy";
  312 +
  313 + public static final String COL_STATUS = "status";
  314 +
  315 + public static final String COL_WAVEID = "waveId";
  316 +
  317 + public static final String COL_PICKINGCARTCODE = "pickingCartCode";
  318 +
  319 + public static final String COL_PICKINGCARTPOS = "pickingCartPos";
  320 +
  321 + public static final String COL_LOCATIONCODE = "locationCode";
  322 +
  323 + public static final String COL_CONTAINERCODE = "containerCode";
  324 +
  325 + public static final String COL_STARTPICKDATETIME = "startPickDateTime";
  326 +
  327 + public static final String COL_ENDPICKDATETIME = "endPickDateTime";
  328 +
  329 + public static final String COL_REBATCHLOC = "rebatchLoc";
  330 +
  331 + public static final String COL_FINISHREBATCH = "finishRebatch";
  332 +
  333 + public static final String COL_REBATCHGROUPCODE = "rebatchGroupCode";
  334 +
  335 + public static final String COL_ALLOWREBATCH = "allowRebatch";
  336 +
  337 + public static final String COL_TASKPROCESSTYPE = "taskProcessType";
  338 +
  339 + public static final String COL_REBINBENCH = "rebinBench";
  340 +
  341 + public static final String COL_REBINED = "rebined";
  342 +
  343 + public static final String COL_STARTREBINDATETIME = "startRebinDateTime";
  344 +
  345 + public static final String COL_ENDREBINDATETIME = "endRebinDateTime";
  346 +
  347 + public static final String COL_REBINEDBY = "rebinedBy";
  348 +
  349 + public static final String COL_EXCEPTIONCODE = "exceptionCode";
  350 +
  351 + public static final String COL_EXCEPTIONHANDLEDBY = "exceptionHandledBy";
  352 +
  353 + public static final String COL_CREATED = "created";
  354 +
  355 + public static final String COL_CREATEDBY = "createdBy";
  356 +
  357 + public static final String COL_LASTUPDATED = "lastUpdated";
  358 +
  359 + public static final String COL_LASTUPDATEDBY = "lastUpdatedBy";
  360 +
  361 + public static final String COL_VERSION = "version";
  362 +
  363 + public static final String COL_USERDEF1 = "userDef1";
  364 +
  365 + public static final String COL_USERDEF2 = "userDef2";
  366 +
  367 + public static final String COL_USERDEF3 = "userDef3";
  368 +
  369 + public static final String COL_PROCESSSTAMP = "processStamp";
291 370 }
292 371 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java
  View file @850393c
... ... @@ -22,7 +22,12 @@ public interface TaskHeaderService extends IService&lt;TaskHeader&gt;{
22 22  
23 23 // List<Map<String, Object>> getReceiptTask(@Param("taskId") Integer taskId);
24 24  
25   - public AjaxResult createTransferTask(String sourceLocation, String destinationLocation, String companyCode);
  25 + AjaxResult createTransferTask(String sourceLocation, String destinationLocation);
  26 +
  27 +
  28 + AjaxResult createCheckOutTask(String[] ids);
  29 +
  30 + AjaxResult completeCycleCountOrSeeOutTask(TaskHeader taskHeader);
26 31  
27 32 AjaxResult createReceiptTask(List<Integer> ids);
28 33 }
... ...
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
  View file @850393c
... ... @@ -19,10 +19,6 @@ import com.huaheng.pc.inventory.inventoryTransaction.domain.InventoryTransaction
19 19 import com.huaheng.pc.inventory.inventoryTransaction.service.InventoryTransactionService;
20 20 import com.huaheng.pc.receipt.receiptContainerDetail.domain.ReceiptContainerDetail;
21 21 import com.huaheng.pc.receipt.receiptContainerDetail.service.ReceiptContainerDetailService;
22   -import com.huaheng.pc.receipt.receiptContainerHeader.domain.ReceiptContainerHeader;
23   -import com.huaheng.pc.receipt.receiptContainerHeader.service.ReceiptContainerHeaderService;
24   -import com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail;
25   -import com.huaheng.pc.receipt.receiptDetail.service.ReceiptDetailService;
26 22 import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
27 23 import com.huaheng.pc.receipt.receiptHeader.service.ReceiptHeaderService;
28 24 import com.huaheng.pc.shipment.shipmentContainerDetail.domain.ShipmentContainerDetail;
... ... @@ -71,15 +67,9 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
71 67 @Autowired
72 68 private ReceiptHeaderService receiptHeaderService;
73 69  
74   - @Resource
75   - private ReceiptDetailService receiptDetailService;
76   -
77 70 @Autowired
78 71 private ReceiptContainerDetailService receiptContainerDetailService;
79 72  
80   - @Resource
81   - private ReceiptContainerHeaderService receiptContainerHeaderService;
82   -
83 73  
84 74  
85 75  
... ... @@ -124,7 +114,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
124 114 TaskHeader task = new TaskHeader();
125 115 //分拣出库
126 116 task.setTaskType(400);
127   - task.setToLocation(shipmentContainerHeader.getLocationCode());
  117 + task.setLocationCode(shipmentContainerHeader.getLocationCode());
128 118 //判断是否整出任务，钱柜和AGV不能整出
129 119 if (shipmentContainerHeader.getStatus().intValue() == 300) {
130 120 //表示整出优先
... ... @@ -147,7 +137,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
147 137 }
148 138 if (inventoryTotal.compareTo(containerTotal) == 0) {
149 139 task.setTaskType(300);//整盘出库
150   - task.setToLocation("");
  140 + task.setLocationCode("");
151 141 }
152 142 }
153 143 task.setWarehouseCode(shipmentContainerHeader.getWarehouseCode());
... ... @@ -179,8 +169,8 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
179 169 taskDetail.setFromInventoryId(shipmentContainerDetail.getInventoryId());
180 170 taskDetail.setQty(shipmentContainerDetail.getQty());
181 171 taskDetail.setContainerCode(task.getContainerCode());
182   - taskDetail.setFromLocation(task.getFromLocation());
183   - taskDetail.setToLocation(task.getToLocation());
  172 + taskDetail.setFromLocation(task.getLocationCode());
  173 + taskDetail.setToLocation(task.getLocationCode());
184 174 taskDetail.setStatus(1);
185 175 taskDetail.setTaskType("s");
186 176 taskDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
... ... @@ -268,7 +258,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
268 258 throw new ServiceException("任务(" + taskId + ")任务已经是完成的！");
269 259 }
270 260 //如果没有库位不能完成
271   - if (StringUtils.isEmpty(task.getToLocation())) {
  261 + if (StringUtils.isEmpty(task.getLocationCode())) {
272 262 throw new ServiceException("任务" + taskId + "没有库位，执行中止");
273 263 }
274 264 this.completeTask(task);
... ... @@ -322,7 +312,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
322 312 if (DataUtils.getInteger(map.get("status")) < 100) {
323 313 LambdaQueryWrapper<InventoryDetail> inventory =Wrappers.lambdaQuery();
324 314 inventory.eq(InventoryDetail::getWarehouseCode,ShiroUtils.getWarehouseCode())
325   - .eq(InventoryDetail::getLocationCode,task.getToLocation())
  315 + .eq(InventoryDetail::getLocationCode,task.getLocationCode())
326 316 .eq(InventoryDetail::getReceiptDetailId,DataUtils.getString(map.get("receiptDetailId")))
327 317 .eq(InventoryDetail::getContainerCode,DataUtils.getString(map.get("containerCode")));
328 318 InventoryDetail detail=inventoryDetailService.getOne(inventory);
... ... @@ -345,7 +335,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
345 335 detail.setInventoryHeaderId(header.getId());//库存头ID
346 336 detail.setWarehouseCode(DataUtils.getString(map.get("warehouseCode")));//仓库
347 337 detail.setCompanyCode(task.getCompanyCode());//货主
348   - detail.setLocationCode(task.getToLocation());//库位号
  338 + detail.setLocationCode(task.getLocationCode());//库位号
349 339 detail.setContainerCode(DataUtils.getString(map.get("containerCode")));//容器号
350 340 detail.setMaterialCode(DataUtils.getString(map.get("materialCode")));//物料号
351 341 detail.setMaterialName(DataUtils.getString(map.get("materialName")));//物料名称
... ... @@ -376,7 +366,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
376 366 inventoryTransaction.setTransactionType(10);
377 367 inventoryTransaction.setWarehouseCode(DataUtils.getString(map.get("warehouseCode")));
378 368 inventoryTransaction.setCompanyCode(task.getCompanyCode());
379   - inventoryTransaction.setLocationCode(task.getToLocation());
  369 + inventoryTransaction.setLocationCode(task.getLocationCode());
380 370 inventoryTransaction.setContainerCode(DataUtils.getString(map.get("containerCode")));
381 371 inventoryTransaction.setMaterialCode(DataUtils.getString(map.get("materialCode")));
382 372 inventoryTransaction.setMaterialName(DataUtils.getString(map.get("materialName")));
... ... @@ -419,11 +409,11 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
419 409 location.setContainerCode(task.getContainerCode());
420 410 location.setStatus("empty");
421 411 LambdaUpdateWrapper<Location> locationLambdaUpdateWrapper = Wrappers.lambdaUpdate();
422   - locationLambdaUpdateWrapper.eq(Location::getCode, task.getToLocation());
  412 + locationLambdaUpdateWrapper.eq(Location::getCode, task.getLocationCode());
423 413 locationService.update(location, locationLambdaUpdateWrapper);
424 414 //修改容器状态和对应的库位
425 415 Container container =new Container();
426   - container.setLocationCode(task.getToLocation());
  416 + container.setLocationCode(task.getLocationCode());
427 417 container.setStatus("some");
428 418 //修改组盘表状态为20
429 419 ReceiptContainerDetail receiptContainerDetail = new ReceiptContainerDetail();
... ... @@ -521,75 +511,10 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
521 511 return null;
522 512 }
523 513  
524   - /**
525   - * 创建上架任务
526   - * @param ids
527   - * @return
528   - */
529   - @Override
530   - public AjaxResult createReceiptTask(List<Integer> ids) {
531   - for (Integer id : ids) {
532   - ReceiptContainerHeader receiptContainerHeader = receiptContainerHeaderService.getById(id);
533   - if (receiptContainerHeader == null)
534   - throw new ServiceException("任务不存在！");
535   - if (receiptContainerHeader.getWarehouseCode() != ShiroUtils.getWarehouseCode())
536   - throw new ServiceException("任务不在当前仓库！");
537   - LambdaQueryWrapper<ReceiptContainerDetail> containerDetailLambda = Wrappers.lambdaQuery();
538   - containerDetailLambda.eq(ReceiptContainerDetail::getReceiptId, id);
539   - List<ReceiptContainerDetail> list = receiptContainerDetailService.list(containerDetailLambda);
540   - if (list.size() < 1)
541   - throw new ServiceException("没有组盘明细，请先组盘！");
542   - if (receiptContainerHeader.getStatus() == 0) {
543   - if (receiptContainerHeader.getStatus().intValue() < 10) {
544   - receiptContainerHeader.setStatus((short)10);
545   - receiptContainerHeaderService.updateById(receiptContainerHeader);
546   - }
547   - //添加任务主表
548   - TaskHeader task = new TaskHeader();
549   - task.setWarehouseCode(receiptContainerHeader.getWarehouseCode());
550   - task.setCompanyCode(receiptContainerHeader.getCompanyCode());
551   - task.setFromLocation(receiptContainerHeader.getFromLocation());
552   - task.setTaskType(Integer.valueOf(receiptContainerHeader.getTaskType()));
553   - task.setFromLocation(receiptContainerHeader.getFromLocation());
554   - task.setToLocation(receiptContainerHeader.getToLocation());
555   - task.setContainerCode(receiptContainerHeader.getContainerCode());
556   - task.setCreated(new Date());
557   - task.setCreatedBy(ShiroUtils.getLoginName());
558   - this.save(task);
559   - //添加任务明细表
560   - for(ReceiptContainerDetail item : list) {
561   - TaskDetail taskDetail = new TaskDetail();
562   - taskDetail.setTaskId(task.getId());
563   - taskDetail.setWarehouseCode(task.getWarehouseCode());
564   - taskDetail.setCompanyCode(task.getCompanyCode());
565   - taskDetail.setCompanyCode(task.getCompanyCode());
566   - taskDetail.setMaterialCode(item.getMaterialCode());
567   - taskDetail.setMaterialName(item.getMaterialName());
568   - taskDetail.setBillId(item.getReceiptId());
569   - taskDetail.setBillDetailId(item.getReceiptDetailId());
570   - taskDetail.setBillCode(item.getReceiptCode());
571   - taskDetail.setQty(BigDecimal.valueOf(item.getQty()));
572   - taskDetail.setContainerCode(task.getContainerCode());
573   - taskDetail.setFromLocation(task.getFromLocation());
574   - taskDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
575   - taskDetail.setBatch(item.getBatch());
576   - taskDetailService.save(taskDetail);
577   -
578   - ReceiptDetail receiptDetail = receiptDetailService.getById(item.getReceiptDetailId());
579   - if ("300".equals(receiptDetail.getProcessStamp())){
580   - ReceiptDetail detail = receiptDetailService.queryflow(receiptDetail);
581   - if (!receiptDetailService.updateById(detail)){
582   - throw new ServiceException("更新入库单详情失败");
583   - }
584   - receiptDetailService.updateReceiptHeaderLastStatus(receiptDetail.getReceiptId());
585   - }
586   - }
587 514  
588 515  
589   - }
590   - }
591   - return AjaxResult.success("生成任务成功！");
592   - }
  516 +
  517 +
593 518  
594 519  
595 520 }
... ...
src/main/resources/mybatis/inventory/InventoryHeaderMapper.xml
  View file @850393c
... ... @@ -35,4 +35,19 @@
35 35 enable, created, createdBy, lastUpdated, lastUpdatedBy, version, userDef1, userDef2,
36 36 userDef3
37 37 </sql>
  38 +
  39 + <select id="getUncompleteReceiptContainer" resultType="java.lang.Integer">
  40 + SELECT count(*) from receipt_container_header WHERE toLocation = #{locationCode} and `status`&lt;20 and warehouseCode = #{warehouseCode}
  41 + </select>
  42 +
  43 + <select id="getUncompleteShipmentContainer" resultType="java.lang.Integer">
  44 + SELECT count(*) from shipment_container_header t join location b ON t.warehouseCode = b.warehouseCode and t.containerCode = b.containerCode
  45 + WHERE b.`code` = #{locationCode} AND t.`status`&lt;20 and t.warehouseCode = #{warehouseCode}
  46 + </select>
  47 +
  48 +
  49 +
  50 +
  51 +
  52 +
38 53 </mapper>
39 54 \ No newline at end of file
... ...
src/main/resources/mybatis/inventory/InventoryTransactionMapper.xml
  View file @850393c
... ... @@ -26,7 +26,7 @@
26 26 <result column="manufactureDate" jdbcType="DATE" property="manufactureDate" />
27 27 <result column="expirationDate" jdbcType="DATE" property="expirationDate" />
28 28 <result column="agingDate" jdbcType="DATE" property="agingDate" />
29   - <result column="attributeId" jdbcType="INTEGER" property="attributeId" />
  29 + <result column="attributeId" jdbcType="VARCHAR" property="attributeId" />
30 30 <result column="attribute1" jdbcType="VARCHAR" property="attribute1" />
31 31 <result column="attribute2" jdbcType="VARCHAR" property="attribute2" />
32 32 <result column="attribute3" jdbcType="VARCHAR" property="attribute3" />
... ...
src/main/resources/mybatis/shipment/ShipmentContainerHeaderMapper.xml
  View file @850393c
... ... @@ -70,8 +70,8 @@
70 70 </sql>
71 71  
72 72 <select id="getShipmentContainerMaxAndMinStatusByShipmentID" resultType="java.util.Map">
73   - SELECT MAX(`status`) maxStatus , MIN(`status`) minStatus from shipment_container_header t join shipment_container_detail b on t.id = b.headerId
74   - WHERE b.shipmentHeaderId = #{shipmentId}
  73 + SELECT MAX(t.status) maxStatus , MIN(t.status) minStatus from shipment_container_header t inner join shipment_container_detail b on t.id = b.shippingContainerId
  74 + WHERE b.shipmentId = #{shipmentId}
75 75 </select>
76 76  
77 77 </mapper>
78 78 \ No newline at end of file
... ...
src/main/resources/mybatis/task/TaskDetailMapper.xml
  View file @850393c
... ... @@ -5,9 +5,8 @@
5 5 <!--@mbg.generated-->
6 6 <id column="id" jdbcType="INTEGER" property="id" />
7 7 <result column="taskId" jdbcType="INTEGER" property="taskId" />
8   - <result column="taskCode" jdbcType="VARCHAR" property="taskCode" />
9   - <result column="taskType" jdbcType="VARCHAR" property="taskType" />
10   - <result column="internalTaskType" jdbcType="VARCHAR" property="internalTaskType" />
  8 + <result column="taskType" jdbcType="INTEGER" property="taskType" />
  9 + <result column="internalTaskType" jdbcType="INTEGER" property="internalTaskType" />
11 10 <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
12 11 <result column="companyCode" jdbcType="VARCHAR" property="companyCode" />
13 12 <result column="materialCode" jdbcType="VARCHAR" property="materialCode" />
... ... @@ -54,7 +53,7 @@
54 53 </resultMap>
55 54 <sql id="Base_Column_List">
56 55 <!--@mbg.generated-->
57   - id, taskId, taskCode, taskType, internalTaskType, warehouseCode, companyCode, materialCode,
  56 + id, taskId, taskType, internalTaskType, warehouseCode, companyCode, materialCode,
58 57 materialName, materialSpec, materialUnit, qty, fromLocation, toLocation, containerCode,
59 58 fromZone, toZone, attributeId, referenceCode, referenceId, referenceLineId,
60 59 assignedUser, attribute1, attribute2, attribute3, attribute4, batch, lot, projectNo,
... ...
src/main/resources/mybatis/task/TaskHeaderMapper.xml
  View file @850393c
... ... @@ -4,21 +4,19 @@
4 4 <resultMap id="BaseResultMap" type="com.huaheng.pc.task.taskHeader.domain.TaskHeader">
5 5 <!--@mbg.generated-->
6 6 <id column="id" jdbcType="INTEGER" property="id" />
  7 + <result column="code" jdbcType="VARCHAR" property="code" />
7 8 <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
8 9 <result column="companyCode" jdbcType="VARCHAR" property="companyCode" />
9   - <result column="taskType" jdbcType="INTEGER" property="taskType" />
10   - <result column="internalTaskType" jdbcType="INTEGER" property="internalTaskType" />
11   - <result column="containerCode" jdbcType="VARCHAR" property="containerCode" />
12   - <result column="fromLocation" jdbcType="VARCHAR" property="fromLocation" />
13   - <result column="toLocation" jdbcType="VARCHAR" property="toLocation" />
  10 + <result column="taskType" jdbcType="VARCHAR" property="taskType" />
  11 + <result column="internalTaskType" jdbcType="VARCHAR" property="internalTaskType" />
14 12 <result column="referenceId" jdbcType="INTEGER" property="referenceId" />
15 13 <result column="referenceCode" jdbcType="VARCHAR" property="referenceCode" />
16 14 <result column="assignedUser" jdbcType="VARCHAR" property="assignedUser" />
17 15 <result column="confirmedBy" jdbcType="VARCHAR" property="confirmedBy" />
18   - <result column="status" jdbcType="INTEGER" property="status" />
19 16 <result column="waveId" jdbcType="INTEGER" property="waveId" />
20 17 <result column="pickingCartCode" jdbcType="VARCHAR" property="pickingCartCode" />
21 18 <result column="pickingCartPos" jdbcType="VARCHAR" property="pickingCartPos" />
  19 + <result column="containerCode" jdbcType="VARCHAR" property="containerCode" />
22 20 <result column="startPickDateTime" jdbcType="TIMESTAMP" property="startPickDateTime" />
23 21 <result column="endPickDateTime" jdbcType="TIMESTAMP" property="endPickDateTime" />
24 22 <result column="rebatchLoc" jdbcType="VARCHAR" property="rebatchLoc" />
... ... @@ -55,12 +53,12 @@
55 53  
56 54 <sql id="Base_Column_List">
57 55 <!--@mbg.generated-->
58   - id, warehouseCode, companyCode, taskType, internalTaskType, containerCode, fromLocation,
59   - toLocation, referenceId, referenceCode, assignedUser, confirmedBy, `status`, waveId,
60   - pickingCartCode, pickingCartPos, startPickDateTime, endPickDateTime, rebatchLoc,
61   - finishRebatch, rebatchGroupCode, allowRebatch, taskProcessType, rebinBench, rebined,
62   - startRebinDateTime, endRebinDateTime, rebinedBy, exceptionCode, exceptionHandledBy,
63   - created, createdBy, lastUpdated, lastUpdatedBy, version, userDef1, userDef2, userDef3,
  56 + id, code, warehouseCode, companyCode, taskType, internalTaskType, referenceId, referenceCode,
  57 + assignedUser, confirmedBy, waveId, pickingCartCode, pickingCartPos, containerCode,
  58 + startPickDateTime, endPickDateTime, rebatchLoc, finishRebatch, rebatchGroupCode,
  59 + allowRebatch, taskProcessType, rebinBench, rebined, startRebinDateTime, endRebinDateTime,
  60 + rebinedBy, exceptionCode, exceptionHandledBy, created, createdBy, lastUpdated, lastUpdatedBy,
  61 + version, userDef1, userDef2, userDef3,
64 62 processStamp
65 63 </sql>
66 64 </mapper>
67 65 \ No newline at end of file
... ...
src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html
  View file @850393c
... ... @@ -115,7 +115,7 @@
115 115 search: false,
116 116 columns: [
117 117 {
118   - checkbox: true
  118 + radio: true
119 119 },
120 120 {
121 121 field: 'id',
... ... @@ -331,11 +331,9 @@
331 331 $.modal.alertWarning("请至少选择一条记录");
332 332 return;
333 333 }
334   - var url = prefix + "/createCheckOutTask";
  334 + var url = prefix + "/detailcreateCheckOutTask";
335 335 var data = {
336   - "ids": rows.map(function (v) {
337   - return v.id;
338   - }).join(',')
  336 + "ids": rows[0].id
339 337 };
340 338 localSubmit(url, "post", "json", data);
341 339 }
... ...
src/main/resources/templates/shipment/shipmentDetail/add.html
  View file @850393c
... ... @@ -32,6 +32,32 @@
32 32 </div>
33 33 </div>
34 34 <div class="form-group">
  35 + <label class="col-sm-3 control-label">分配规则：</label>
  36 + <div class="col-sm-8">
  37 + <select id="allocationRule" class="form-control" th:with="allocationRule=${@shipmentPreference.list()}">
  38 + <option th:each="allocationRules:${allocationRule}" th:text="${allocationRules['code']}" th:value="${allocationRules['name']}"></option>
  39 + </select>
  40 + </div>
  41 + </div>
  42 + <!--<div class="form-group">-->
  43 + <!--<label class="col-sm-3 control-label">分配规则：</label>-->
  44 + <!--<div class="col-sm-8">-->
  45 + <!--<input id="allocationRule" name="allocationRule" class="form-control" type="text">-->
  46 + <!--</div>-->
  47 + <!--</div>-->
  48 + <div class="form-group">
  49 + <label class="col-sm-3 control-label">补货规则：</label>
  50 + <div class="col-sm-8">
  51 + <input id="replenishmentRule" name="replenishmentRule" class="form-control" type="text">
  52 + </div>
  53 + </div>
  54 + <div class="form-group">
  55 + <label class="col-sm-3 control-label">拣货规则：</label>
  56 + <div class="col-sm-8">
  57 + <input id="pickingRule" name="pickingRule" class="form-control" type="text">
  58 + </div>
  59 + </div>
  60 + <div class="form-group">
35 61 <label class="col-sm-3 control-label">批次：</label>
36 62 <div class="col-sm-8">
37 63 <input id="batch" name="batch" class="form-control" type="text">
... ... @@ -62,12 +88,6 @@
62 88 </div>
63 89 </div>
64 90 <div class="form-group">
65   - <label class="col-sm-3 control-label">入库日期：</label>
66   - <div class="col-sm-8">
67   - <input id="agingDate" name="agingDate" class="form-control" type="text">
68   - </div>
69   - </div>
70   - <div class="form-group">
71 91 <label class="col-sm-3 control-label">库存状态：</label>
72 92 <div class="col-sm-8">
73 93 <select id="inventoryStatus" class="form-control" th:with="inventoryStatus=${@dict.getType('inventoryStatus')}">
... ...
src/main/resources/templates/shipment/shippingCombination/shippingCombination.html
  View file @850393c
... ... @@ -256,7 +256,7 @@
256 256 type:'post',
257 257 data:{
258 258 shipmentDetailId:shipmentDetailId,
259   - inventoryId:id,
  259 + inventoryDetailId:id,
260 260 shipQty:num,
261 261 },
262 262 success:function (response) {
... ...