wms / wms_shanghaijiaoda · Commits

Commit 224ceb3f47e1ea7581a1b603a5aa577c47ba7842

Authored by pengcheng
2 parents 8321015c 6b8254fb

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

Inline Side-by-side
Showing 6 changed files with 318 additions and 743 deletions
.idea/workspace.xml
  View file @224ceb3
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <project version="4">
3 3 <component name="ChangeListManager">
4   - <list default="true" id="908d8a6f-e3e4-4fdc-b674-e523a3e2b520" name="Default Changelist" comment="">
5   - <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6   - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java" afterDir="false" />
7   - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/controller/CycleCountHeaderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/controller/CycleCountHeaderController.java" afterDir="false" />
8   - <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" />
  4 + <list default="true" id="4d9bac65-d8f6-4ced-8855-0db48f39a5f2" name="Default Changelist" comment="">
  5 + <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" />
9 6 <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" />
10   - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/adjustDetail/addAdjust.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/adjustHeader/addAdjust.html" afterDir="false" />
11   - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/adjustDetail/adjustDetail.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/adjustDetail/adjustDetail.html" afterDir="false" />
12   - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/adjustDetail/adjustEdit.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/adjustHeader/adjustEdit.html" afterDir="false" />
13   - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/adjustHeader/adjustHeader.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/adjustHeader/adjustHeader.html" afterDir="false" />
14   - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountDetail/cycleCountDetail.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountDetail/cycleCountDetail.html" afterDir="false" />
15   - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html" afterDir="false" />
16 7 </list>
17 8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
18 9 <option name="SHOW_DIALOG" value="false" />
... ... @@ -47,46 +38,71 @@
47 38 <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
48 39 <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" />
49 40 </path>
  41 + <path>
  42 + <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
  43 + <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
  44 + <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
  45 + <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" />
  46 + <item name="task_detail: table" type="285a2a93:MysqlImplModel$Table" />
  47 + </path>
  48 + <path>
  49 + <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
  50 + <item name="@localhost" type="feb32156:DbDataSourceImpl" />
  51 + </path>
  52 + <path>
  53 + <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
  54 + <item name="@localhost" type="feb32156:DbDataSourceImpl" />
  55 + <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
  56 + </path>
50 57 </expand>
51 58 <select />
52 59 </component>
53 60 <component name="FileEditorManager">
54 61 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
55 62 <file pinned="false" current-in-tab="false">
56   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/controller/CycleCountHeaderController.java">
  63 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java">
57 64 <provider selected="true" editor-type-id="text-editor">
58   - <state relative-caret-position="-567">
59   - <caret line="44" column="51" selection-start-line="44" selection-start-column="51" selection-end-line="44" selection-end-column="51" />
  65 + <state relative-caret-position="1710">
  66 + <caret line="117" column="47" selection-start-line="117" selection-start-column="47" selection-end-line="117" selection-end-column="47" />
  67 + </state>
  68 + </provider>
  69 + </entry>
  70 + </file>
  71 + <file pinned="false" current-in-tab="false">
  72 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java">
  73 + <provider selected="true" editor-type-id="text-editor">
  74 + <state relative-caret-position="456">
  75 + <caret line="31" column="24" selection-start-line="31" selection-start-column="24" selection-end-line="31" selection-end-column="24" />
60 76 </state>
61 77 </provider>
62 78 </entry>
63 79 </file>
64 80 <file pinned="false" current-in-tab="true">
65   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java">
  81 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java">
66 82 <provider selected="true" editor-type-id="text-editor">
67   - <state relative-caret-position="8">
68   - <caret line="64" column="52" lean-forward="true" selection-start-line="64" selection-start-column="52" selection-end-line="64" selection-end-column="52" />
  83 + <state relative-caret-position="-1824">
  84 + <caret line="339" column="44" selection-start-line="339" selection-start-column="29" selection-end-line="339" selection-end-column="44" />
  85 + <folding>
  86 + <element signature="imports" expanded="true" />
  87 + </folding>
69 88 </state>
70 89 </provider>
71 90 </entry>
72 91 </file>
73 92 <file pinned="false" current-in-tab="false">
74   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html">
  93 + <entry file="file://$PROJECT_DIR$/pom.xml">
75 94 <provider selected="true" editor-type-id="text-editor">
76   - <state relative-caret-position="-12">
77   - <caret line="273" column="18" selection-start-line="273" selection-start-column="18" selection-end-line="273" selection-end-column="18" />
  95 + <state relative-caret-position="532">
  96 + <caret line="28" column="8" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="51" />
78 97 </state>
79 98 </provider>
80 99 </entry>
81 100 </file>
82 101 <file pinned="false" current-in-tab="false">
83   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountDetail/cycleCountDetail.html">
  102 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/task/task/task.html">
84 103 <provider selected="true" editor-type-id="text-editor">
85   - <state relative-caret-position="-87">
86   - <caret line="122" selection-start-line="122" selection-end-line="122" />
87   - <folding>
88   - <element signature="e#6120#12518#0" />
89   - </folding>
  104 + <state relative-caret-position="1444">
  105 + <caret line="76" column="89" selection-start-line="76" selection-start-column="70" selection-end-line="76" selection-end-column="89" />
90 106 </state>
91 107 </provider>
92 108 </entry>
... ... @@ -110,47 +126,6 @@
110 126 <component name="Git.Settings">
111 127 <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
112 128 </component>
113   - <component name="IdeDocumentHistory">
114   - <option name="CHANGED_PATHS">
115   - <list>
116   - <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/transfer.html" />
117   - <option value="$PROJECT_DIR$/src/main/resources/application-druid.properties" />
118   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/mapper/InventoryHeaderMapper.java" />
119   - <option value="$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryHeaderMapper.xml" />
120   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskDetail/domain/TaskDetail.java" />
121   - <option value="$PROJECT_DIR$/src/main/resources/mybatis/task/TaskDetailMapper.xml" />
122   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/domain/TaskHeader.java" />
123   - <option value="$PROJECT_DIR$/src/main/resources/mybatis/task/TaskHeaderMapper.xml" />
124   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/domain/InventoryTransaction.java" />
125   - <option value="$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryTransactionMapper.xml" />
126   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java" />
127   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/containerType/service/ContainerTypeServiceImpl.java" />
128   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java" />
129   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailService.java" />
130   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java" />
131   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java" />
132   - <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html" />
133   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java" />
134   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java" />
135   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/service/ContainerService.java" />
136   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/service/LocationService.java" />
137   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/service/ContainerServiceImpl.java" />
138   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/service/LocationServiceImpl.java" />
139   - <option value="$PROJECT_DIR$/src/main/resources/mybatis/config/LocationMapper.xml" />
140   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/mapper/ContainerMapper.java" />
141   - <option value="$PROJECT_DIR$/src/main/resources/mybatis/config/ContainerMapper.xml" />
142   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/mapper/LocationMapper.java" />
143   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java" />
144   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java" />
145   - <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html" />
146   - <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountDetail/cycleCountDetail.html" />
147   - <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/adjustHeader/adjustHeader.html" />
148   - <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/adjustDetail/adjustDetail.html" />
149   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/controller/CycleCountHeaderController.java" />
150   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java" />
151   - </list>
152   - </option>
153   - </component>
154 129 <component name="JsFlowSettings">
155 130 <service-enabled>true</service-enabled>
156 131 <exe-path />
... ... @@ -179,6 +154,8 @@
179 154 <foldersAlwaysOnTop value="true" />
180 155 </navigator>
181 156 <panes>
  157 + <pane id="PackagesPane" />
  158 + <pane id="Scope" />
182 159 <pane id="ProjectPane">
183 160 <subPane>
184 161 <expand>
... ... @@ -189,42 +166,13 @@
189 166 <path>
190 167 <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
191 168 <item name="wms2" type="462c0819:PsiDirectoryNode" />
192   - <item name=".idea" type="462c0819:PsiDirectoryNode" />
193   - </path>
194   - <path>
195   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
196   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
197   - <item name="src" type="462c0819:PsiDirectoryNode" />
198   - </path>
199   - <path>
200   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
201   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
202   - <item name="src" type="462c0819:PsiDirectoryNode" />
203   - <item name="main" type="462c0819:PsiDirectoryNode" />
204   - </path>
205   - <path>
206   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
207   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
208   - <item name="src" type="462c0819:PsiDirectoryNode" />
209   - <item name="main" type="462c0819:PsiDirectoryNode" />
210   - <item name="java" type="462c0819:PsiDirectoryNode" />
211   - </path>
212   - <path>
213   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
214   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
215 169 <item name="src" type="462c0819:PsiDirectoryNode" />
216   - <item name="main" type="462c0819:PsiDirectoryNode" />
217   - <item name="java" type="462c0819:PsiDirectoryNode" />
218   - <item name="com" type="462c0819:PsiDirectoryNode" />
219 170 </path>
220 171 <path>
221 172 <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
222 173 <item name="wms2" type="462c0819:PsiDirectoryNode" />
223 174 <item name="src" type="462c0819:PsiDirectoryNode" />
224 175 <item name="main" type="462c0819:PsiDirectoryNode" />
225   - <item name="java" type="462c0819:PsiDirectoryNode" />
226   - <item name="com" type="462c0819:PsiDirectoryNode" />
227   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
228 176 </path>
229 177 <path>
230 178 <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
... ... @@ -232,9 +180,6 @@
232 180 <item name="src" type="462c0819:PsiDirectoryNode" />
233 181 <item name="main" type="462c0819:PsiDirectoryNode" />
234 182 <item name="java" type="462c0819:PsiDirectoryNode" />
235   - <item name="com" type="462c0819:PsiDirectoryNode" />
236   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
237   - <item name="pc" type="462c0819:PsiDirectoryNode" />
238 183 </path>
239 184 <path>
240 185 <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
... ... @@ -243,9 +188,6 @@
243 188 <item name="main" type="462c0819:PsiDirectoryNode" />
244 189 <item name="java" type="462c0819:PsiDirectoryNode" />
245 190 <item name="com" type="462c0819:PsiDirectoryNode" />
246   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
247   - <item name="pc" type="462c0819:PsiDirectoryNode" />
248   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
249 191 </path>
250 192 <path>
251 193 <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
... ... @@ -255,9 +197,6 @@
255 197 <item name="java" type="462c0819:PsiDirectoryNode" />
256 198 <item name="com" type="462c0819:PsiDirectoryNode" />
257 199 <item name="huaheng" type="462c0819:PsiDirectoryNode" />
258   - <item name="pc" type="462c0819:PsiDirectoryNode" />
259   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
260   - <item name="cycleCountDetail" type="462c0819:PsiDirectoryNode" />
261 200 </path>
262 201 <path>
263 202 <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
... ... @@ -268,34 +207,6 @@
268 207 <item name="com" type="462c0819:PsiDirectoryNode" />
269 208 <item name="huaheng" type="462c0819:PsiDirectoryNode" />
270 209 <item name="pc" type="462c0819:PsiDirectoryNode" />
271   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
272   - <item name="cycleCountDetail" type="462c0819:PsiDirectoryNode" />
273   - <item name="controller" type="462c0819:PsiDirectoryNode" />
274   - </path>
275   - <path>
276   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
277   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
278   - <item name="src" type="462c0819:PsiDirectoryNode" />
279   - <item name="main" type="462c0819:PsiDirectoryNode" />
280   - <item name="java" type="462c0819:PsiDirectoryNode" />
281   - <item name="com" type="462c0819:PsiDirectoryNode" />
282   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
283   - <item name="pc" type="462c0819:PsiDirectoryNode" />
284   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
285   - <item name="cycleCountHeader" type="462c0819:PsiDirectoryNode" />
286   - </path>
287   - <path>
288   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
289   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
290   - <item name="src" type="462c0819:PsiDirectoryNode" />
291   - <item name="main" type="462c0819:PsiDirectoryNode" />
292   - <item name="java" type="462c0819:PsiDirectoryNode" />
293   - <item name="com" type="462c0819:PsiDirectoryNode" />
294   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
295   - <item name="pc" type="462c0819:PsiDirectoryNode" />
296   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
297   - <item name="cycleCountHeader" type="462c0819:PsiDirectoryNode" />
298   - <item name="controller" type="462c0819:PsiDirectoryNode" />
299 210 </path>
300 211 <path>
301 212 <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
... ... @@ -331,19 +242,6 @@
331 242 <item name="pc" type="462c0819:PsiDirectoryNode" />
332 243 <item name="task" type="462c0819:PsiDirectoryNode" />
333 244 <item name="taskHeader" type="462c0819:PsiDirectoryNode" />
334   - <item name="controller" type="462c0819:PsiDirectoryNode" />
335   - </path>
336   - <path>
337   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
338   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
339   - <item name="src" type="462c0819:PsiDirectoryNode" />
340   - <item name="main" type="462c0819:PsiDirectoryNode" />
341   - <item name="java" type="462c0819:PsiDirectoryNode" />
342   - <item name="com" type="462c0819:PsiDirectoryNode" />
343   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
344   - <item name="pc" type="462c0819:PsiDirectoryNode" />
345   - <item name="task" type="462c0819:PsiDirectoryNode" />
346   - <item name="taskHeader" type="462c0819:PsiDirectoryNode" />
347 245 <item name="service" type="462c0819:PsiDirectoryNode" />
348 246 </path>
349 247 <path>
... ... @@ -351,18 +249,6 @@
351 249 <item name="wms2" type="462c0819:PsiDirectoryNode" />
352 250 <item name="src" type="462c0819:PsiDirectoryNode" />
353 251 <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="task" type="462c0819:PsiDirectoryNode" />
359   - <item name="taskPreference" type="462c0819:PsiDirectoryNode" />
360   - </path>
361   - <path>
362   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
363   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
364   - <item name="src" type="462c0819:PsiDirectoryNode" />
365   - <item name="main" type="462c0819:PsiDirectoryNode" />
366 252 <item name="resources" type="462c0819:PsiDirectoryNode" />
367 253 </path>
368 254 <path>
... ... @@ -373,61 +259,10 @@
373 259 <item name="resources" type="462c0819:PsiDirectoryNode" />
374 260 <item name="templates" type="462c0819:PsiDirectoryNode" />
375 261 </path>
376   - <path>
377   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
378   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
379   - <item name="src" type="462c0819:PsiDirectoryNode" />
380   - <item name="main" type="462c0819:PsiDirectoryNode" />
381   - <item name="resources" type="462c0819:PsiDirectoryNode" />
382   - <item name="templates" type="462c0819:PsiDirectoryNode" />
383   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
384   - </path>
385   - <path>
386   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
387   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
388   - <item name="src" type="462c0819:PsiDirectoryNode" />
389   - <item name="main" type="462c0819:PsiDirectoryNode" />
390   - <item name="resources" type="462c0819:PsiDirectoryNode" />
391   - <item name="templates" type="462c0819:PsiDirectoryNode" />
392   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
393   - <item name="adjustDetail" type="462c0819:PsiDirectoryNode" />
394   - </path>
395   - <path>
396   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
397   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
398   - <item name="src" type="462c0819:PsiDirectoryNode" />
399   - <item name="main" type="462c0819:PsiDirectoryNode" />
400   - <item name="resources" type="462c0819:PsiDirectoryNode" />
401   - <item name="templates" type="462c0819:PsiDirectoryNode" />
402   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
403   - <item name="adjustHeader" type="462c0819:PsiDirectoryNode" />
404   - </path>
405   - <path>
406   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
407   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
408   - <item name="src" type="462c0819:PsiDirectoryNode" />
409   - <item name="main" type="462c0819:PsiDirectoryNode" />
410   - <item name="resources" type="462c0819:PsiDirectoryNode" />
411   - <item name="templates" type="462c0819:PsiDirectoryNode" />
412   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
413   - <item name="cycleCountDetail" type="462c0819:PsiDirectoryNode" />
414   - </path>
415   - <path>
416   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
417   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
418   - <item name="src" type="462c0819:PsiDirectoryNode" />
419   - <item name="main" type="462c0819:PsiDirectoryNode" />
420   - <item name="resources" type="462c0819:PsiDirectoryNode" />
421   - <item name="templates" type="462c0819:PsiDirectoryNode" />
422   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
423   - <item name="cycleCountHeader" type="462c0819:PsiDirectoryNode" />
424   - </path>
425 262 </expand>
426 263 <select />
427 264 </subPane>
428 265 </pane>
429   - <pane id="PackagesPane" />
430   - <pane id="Scope" />
431 266 </panes>
432 267 </component>
433 268 <component name="PropertiesComponent">
... ... @@ -451,12 +286,6 @@
451 286 <property name="nodejs_package_manager_path" value="npm" />
452 287 <property name="settings.editor.selected.configurable" value="Settings.JavaScript" />
453 288 </component>
454   - <component name="RecentsManager">
455   - <key name="MoveFile.RECENT_KEYS">
456   - <recent name="C:\Project\wms2\src\main\resources\templates\inventory\adjustDetail" />
457   - <recent name="C:\Project\wms2\src\main\resources\templates\inventory\adjustHeader" />
458   - </key>
459   - </component>
460 289 <component name="RunDashboard">
461 290 <option name="configurationTypes">
462 291 <set>
... ... @@ -477,7 +306,7 @@
477 306 </component>
478 307 <component name="RunManager">
479 308 <configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
480   - <module name="wms2" />
  309 + <module name="huaheng" />
481 310 <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" />
482 311 <option name="ALTERNATIVE_JRE_PATH" />
483 312 <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" />
... ... @@ -492,17 +321,7 @@
492 321 <serviceView>
493 322 <option name="contentProportion" value="0.17857143" />
494 323 <treeState>
495   - <expand>
496   - <path>
497   - <item name="services root" type="e789fda9:ObjectUtils$Sentinel" />
498   - <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@b9e1b2d7" type="7427dc5b:ServiceModel$ServiceGroupNode" />
499   - </path>
500   - <path>
501   - <item name="services root" type="e789fda9:ObjectUtils$Sentinel" />
502   - <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@b9e1b2d7" type="7427dc5b:ServiceModel$ServiceGroupNode" />
503   - <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@67b24c63" type="7427dc5b:ServiceModel$ServiceGroupNode" />
504   - </path>
505   - </expand>
  324 + <expand />
506 325 <select />
507 326 </treeState>
508 327 </serviceView>
... ... @@ -513,7 +332,7 @@
513 332 </component>
514 333 <component name="TaskManager">
515 334 <task active="true" id="Default" summary="Default task">
516   - <changelist id="908d8a6f-e3e4-4fdc-b674-e523a3e2b520" name="Default Changelist" comment="" />
  335 + <changelist id="4d9bac65-d8f6-4ced-8855-0db48f39a5f2" name="Default Changelist" comment="" />
517 336 <created>1566977677142</created>
518 337 <option name="number" value="Default" />
519 338 <option name="presentableId" value="Default" />
... ... @@ -523,6 +342,7 @@
523 342 <workItem from="1567038752582" duration="12361000" />
524 343 <workItem from="1567057373550" duration="15293000" />
525 344 <workItem from="1567125196953" duration="16752000" />
  345 + <workItem from="1567643852002" duration="245000" />
526 346 </task>
527 347 <task id="LOCAL-00001" summary="入库单添加时添加流程标记，审核入库单">
528 348 <created>1566983055587</created>
... ... @@ -583,73 +403,48 @@
583 403 <option name="localTasksCounter" value="9" />
584 404 <servers />
585 405 </component>
  406 + <component name="TimeTrackingManager">
  407 + <option name="totallyTimeSpent" value="2000" />
  408 + </component>
586 409 <component name="ToolWindowManager">
587 410 <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
588 411 <editor active="true" />
589 412 <layout>
590   - <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.19839142" />
  413 + <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.28016084" />
591 414 <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
592   - <window_info id="Web" order="2" side_tool="true" />
593   - <window_info id="Designer" order="3" />
594   - <window_info id="UI Designer" order="4" />
595   - <window_info id="Favorites" order="5" side_tool="true" />
  415 + <window_info id="Designer" order="2" />
  416 + <window_info id="Image Layers" order="3" />
  417 + <window_info id="Capture Tool" order="4" />
  418 + <window_info id="UI Designer" order="5" />
  419 + <window_info id="Favorites" order="6" side_tool="true" />
  420 + <window_info id="Web" order="7" side_tool="true" />
596 421 <window_info anchor="bottom" id="Message" order="0" />
597   - <window_info anchor="bottom" id="Find" order="1" weight="0.3286119" />
  422 + <window_info anchor="bottom" id="Find" order="1" />
598 423 <window_info anchor="bottom" id="Run" order="2" />
599   - <window_info anchor="bottom" id="Debug" order="3" weight="0.29036826" />
  424 + <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
600 425 <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
601 426 <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
602 427 <window_info anchor="bottom" id="TODO" order="6" />
603   - <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
604   - <window_info anchor="bottom" id="Version Control" order="8" sideWeight="0.49932975" weight="0.08073654" />
605   - <window_info anchor="bottom" id="Database Changes" order="9" weight="0.3286119" />
606   - <window_info anchor="bottom" id="Spring" order="10" />
607   - <window_info anchor="bottom" id="MyBatis Log" order="11" weight="0.3286119" />
608   - <window_info anchor="bottom" id="Event Log" order="12" sideWeight="0.50067025" side_tool="true" weight="0.6090652" />
609   - <window_info anchor="bottom" id="Messages" order="13" weight="0.04249292" />
610   - <window_info anchor="bottom" id="Java Enterprise" order="14" />
611   - <window_info active="true" anchor="bottom" id="Run Dashboard" order="15" sideWeight="0.49932975" visible="true" weight="0.17280453" />
  428 + <window_info anchor="bottom" id="Spring" order="7" />
  429 + <window_info anchor="bottom" id="Terminal" order="8" />
  430 + <window_info anchor="bottom" id="Docker" order="9" show_stripe_button="false" />
  431 + <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50067025" side_tool="true" weight="0.22946176" />
  432 + <window_info anchor="bottom" id="Messages" order="11" weight="0.18696883" />
  433 + <window_info anchor="bottom" id="Java Enterprise" order="12" />
  434 + <window_info anchor="bottom" id="Database Changes" order="13" weight="0.3286119" />
  435 + <window_info anchor="bottom" id="Version Control" order="14" weight="0.3286119" />
  436 + <window_info anchor="bottom" id="Run Dashboard" order="15" sideWeight="0.49932975" visible="true" weight="0.22946176" />
612 437 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
613 438 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
614 439 <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
615   - <window_info anchor="right" id="Palette" order="3" />
616   - <window_info anchor="right" id="Database" order="4" />
617   - <window_info anchor="right" id="Maven" order="5" weight="0.097184986" />
618   - <window_info anchor="right" id="Bean Validation" order="6" />
  440 + <window_info anchor="right" id="Maven" order="3" />
  441 + <window_info anchor="right" id="Palette" order="4" />
  442 + <window_info anchor="right" id="Capture Analysis" order="5" />
  443 + <window_info anchor="right" id="Database" order="6" />
619 444 <window_info anchor="right" id="Palette&#9;" order="7" />
  445 + <window_info anchor="right" id="Theme Preview" order="8" />
  446 + <window_info anchor="right" id="Bean Validation" order="9" />
620 447 </layout>
621   - <layout-to-restore>
622   - <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.26340482" />
623   - <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
624   - <window_info id="Web" order="2" side_tool="true" />
625   - <window_info id="Designer" order="3" />
626   - <window_info id="UI Designer" order="4" />
627   - <window_info id="Favorites" order="5" side_tool="true" />
628   - <window_info anchor="bottom" id="Message" order="0" />
629   - <window_info anchor="bottom" id="Find" order="1" weight="0.3286119" />
630   - <window_info anchor="bottom" id="Run" order="2" />
631   - <window_info anchor="bottom" id="Debug" order="3" weight="0.29036826" />
632   - <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
633   - <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
634   - <window_info anchor="bottom" id="TODO" order="6" />
635   - <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
636   - <window_info anchor="bottom" id="Version Control" order="8" weight="0.45042494" />
637   - <window_info anchor="bottom" id="Database Changes" order="9" />
638   - <window_info anchor="bottom" id="Spring" order="10" />
639   - <window_info anchor="bottom" id="MyBatis Log" order="11" weight="0.3286119" />
640   - <window_info anchor="bottom" id="Event Log" order="12" sideWeight="0.50067025" side_tool="true" weight="0.23796034" />
641   - <window_info anchor="bottom" id="Messages" order="13" weight="0.12606232" />
642   - <window_info anchor="bottom" id="Java Enterprise" order="14" />
643   - <window_info active="true" anchor="bottom" id="Run Dashboard" order="15" sideWeight="0.49932975" visible="true" weight="0.18838526" />
644   - <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
645   - <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
646   - <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
647   - <window_info anchor="right" id="Palette" order="3" />
648   - <window_info anchor="right" id="Database" order="4" />
649   - <window_info anchor="right" id="Maven" order="5" weight="0.097184986" />
650   - <window_info anchor="right" id="Bean Validation" order="6" />
651   - <window_info anchor="right" id="Palette&#9;" order="7" />
652   - </layout-to-restore>
653 448 </component>
654 449 <component name="TypeScriptGeneratedFilesManager">
655 450 <option name="version" value="1" />
... ... @@ -666,14 +461,7 @@
666 461 <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
667 462 <collection />
668 463 </option>
669   - <option name="COLUMN_ORDER">
670   - <list>
671   - <option value="0" />
672   - <option value="1" />
673   - <option value="2" />
674   - <option value="3" />
675   - </list>
676   - </option>
  464 + <option name="COLUMN_ORDER" />
677 465 </State>
678 466 </value>
679 467 </entry>
... ... @@ -695,7 +483,6 @@
695 483 </option>
696 484 </component>
697 485 <component name="VcsManagerConfiguration">
698   - <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
699 486 <MESSAGE value="盘点明细页面" />
700 487 <MESSAGE value="入库单添加时添加流程标记，审核入库单" />
701 488 <MESSAGE value="添加入库单历史" />
... ... @@ -708,9 +495,7 @@
708 495 <MESSAGE value="库存和任务移库相关" />
709 496 <MESSAGE value="库存移库生成和完成逻辑" />
710 497 <MESSAGE value="xml" />
711   - <MESSAGE value="空托出入库，完成逻辑" />
712   - <MESSAGE value="pull" />
713   - <option name="LAST_COMMIT_MESSAGE" value="pull" />
  498 + <option name="LAST_COMMIT_MESSAGE" value="xml" />
714 499 </component>
715 500 <component name="XDebuggerManager">
716 501 <breakpoint-manager>
... ... @@ -769,386 +554,13 @@
769 554 <properties />
770 555 <option name="timeStamp" value="26" />
771 556 </line-breakpoint>
  557 + <line-breakpoint enabled="true" type="java-line">
  558 + <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java</url>
  559 + <line>47</line>
  560 + <properties />
  561 + <option name="timeStamp" value="37" />
  562 + </line-breakpoint>
772 563 </breakpoints>
773 564 </breakpoint-manager>
774 565 </component>
775   - <component name="editorHistoryManager">
776   - <entry file="jar://C:/Program Files/Java/jdk1.8.0_202/src.zip!/com/sun/jmx/snmp/tasks/Task.java">
777   - <provider selected="true" editor-type-id="text-editor">
778   - <state relative-caret-position="330">
779   - <caret line="57" column="17" selection-start-line="57" selection-start-column="17" selection-end-line="57" selection-end-column="17" />
780   - </state>
781   - </provider>
782   - </entry>
783   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerDetail/service/ReceiptContainerDetailServiceImpl.java">
784   - <provider selected="true" editor-type-id="text-editor">
785   - <state relative-caret-position="80">
786   - <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
787   - </state>
788   - </provider>
789   - </entry>
790   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerDetail/service/ReceiptContainerDetailService.java">
791   - <provider selected="true" editor-type-id="text-editor">
792   - <state relative-caret-position="60">
793   - <caret line="4" column="62" selection-start-line="4" selection-start-column="62" selection-end-line="4" selection-end-column="62" />
794   - </state>
795   - </provider>
796   - </entry>
797   - <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">
798   - <provider selected="true" editor-type-id="text-editor">
799   - <state relative-caret-position="80">
800   - <caret line="13" column="43" lean-forward="true" selection-start-line="13" selection-start-column="43" selection-end-line="13" selection-end-column="43" />
801   - </state>
802   - </provider>
803   - </entry>
804   - <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/task/TaskDetailMapper.xml">
805   - <provider selected="true" editor-type-id="text-editor">
806   - <state relative-caret-position="464">
807   - <caret line="54" column="25" lean-forward="true" selection-start-line="54" selection-start-column="25" selection-end-line="54" selection-end-column="25" />
808   - </state>
809   - </provider>
810   - </entry>
811   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskDetail/mapper/TaskDetailMapper.java">
812   - <provider selected="true" editor-type-id="text-editor">
813   - <state relative-caret-position="100">
814   - <caret line="6" column="1" lean-forward="true" selection-start-line="6" selection-start-column="1" selection-end-line="6" selection-end-column="1" />
815   - </state>
816   - </provider>
817   - </entry>
818   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskDetail/domain/TaskDetail.java">
819   - <provider selected="true" editor-type-id="text-editor">
820   - <state relative-caret-position="304">
821   - <caret line="43" column="19" selection-start-line="43" selection-start-column="19" selection-end-line="43" selection-end-column="19" />
822   - </state>
823   - </provider>
824   - </entry>
825   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskDetail/service/TaskDetailServiceImpl.java">
826   - <provider selected="true" editor-type-id="text-editor">
827   - <state relative-caret-position="80">
828   - <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
829   - </state>
830   - </provider>
831   - </entry>
832   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskDetail/service/TaskDetailService.java">
833   - <provider selected="true" editor-type-id="text-editor">
834   - <state relative-caret-position="60">
835   - <caret line="4" column="17" selection-start-line="4" selection-start-column="17" selection-end-line="4" selection-end-column="17" />
836   - </state>
837   - </provider>
838   - </entry>
839   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/domain/ShipmentTaskCreateModel.java">
840   - <provider selected="true" editor-type-id="text-editor">
841   - <state relative-caret-position="-12">
842   - <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
843   - </state>
844   - </provider>
845   - </entry>
846   - <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/task/TaskHeaderMapper.xml">
847   - <provider selected="true" editor-type-id="text-editor">
848   - <state relative-caret-position="322">
849   - <caret line="18" column="4" selection-start-line="18" selection-start-column="4" selection-end-line="18" selection-end-column="4" />
850   - </state>
851   - </provider>
852   - </entry>
853   - <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryTransactionMapper.xml">
854   - <provider selected="true" editor-type-id="text-editor">
855   - <state relative-caret-position="308">
856   - <caret line="28" column="50" selection-start-line="28" selection-start-column="50" selection-end-line="28" selection-end-column="50" />
857   - </state>
858   - </provider>
859   - </entry>
860   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/mapper/InventoryTransactionMapper.java">
861   - <provider selected="true" editor-type-id="text-editor">
862   - <state relative-caret-position="80">
863   - <caret line="5" column="17" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="17" />
864   - </state>
865   - </provider>
866   - </entry>
867   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/domain/TaskHeader.java">
868   - <provider selected="true" editor-type-id="text-editor">
869   - <state relative-caret-position="1048">
870   - <caret line="316" column="69" selection-start-line="316" selection-start-column="69" selection-end-line="316" selection-end-column="69" />
871   - </state>
872   - </provider>
873   - </entry>
874   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/domain/InventoryTransaction.java">
875   - <provider selected="true" editor-type-id="text-editor">
876   - <state relative-caret-position="324">
877   - <caret line="179" column="18" selection-start-line="179" selection-start-column="18" selection-end-line="179" selection-end-column="18" />
878   - </state>
879   - </provider>
880   - </entry>
881   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/containerType/service/ContainerTypeServiceImpl.java">
882   - <provider selected="true" editor-type-id="text-editor">
883   - <state relative-caret-position="400">
884   - <caret line="31" selection-start-line="31" selection-end-line="31" />
885   - </state>
886   - </provider>
887   - </entry>
888   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/container/add.html">
889   - <provider selected="true" editor-type-id="text-editor">
890   - <state relative-caret-position="164">
891   - <caret line="10" column="95" selection-start-line="10" selection-start-column="95" selection-end-line="10" selection-end-column="95" />
892   - </state>
893   - </provider>
894   - </entry>
895   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/mapper/TaskHeaderMapper.java">
896   - <provider selected="true" editor-type-id="text-editor">
897   - <state relative-caret-position="120">
898   - <caret line="11" column="78" selection-start-line="11" selection-start-column="78" selection-end-line="11" selection-end-column="78" />
899   - </state>
900   - </provider>
901   - </entry>
902   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/transfer.html">
903   - <provider selected="true" editor-type-id="text-editor">
904   - <state relative-caret-position="-264">
905   - <caret line="13" column="54" selection-start-line="13" selection-start-column="54" selection-end-line="13" selection-end-column="54" />
906   - </state>
907   - </provider>
908   - </entry>
909   - <entry file="jar://C:/Program Files/Java/jdk1.8.0_202/src.zip!/java/util/function/Function.java">
910   - <provider selected="true" editor-type-id="text-editor">
911   - <state relative-caret-position="460">
912   - <caret line="46" column="32" selection-start-line="46" selection-start-column="32" selection-end-line="46" selection-end-column="32" />
913   - </state>
914   - </provider>
915   - </entry>
916   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/service/InventoryTransactionService.java">
917   - <provider selected="true" editor-type-id="text-editor">
918   - <state relative-caret-position="60">
919   - <caret line="4" column="17" selection-start-line="4" selection-start-column="17" selection-end-line="4" selection-end-column="17" />
920   - </state>
921   - </provider>
922   - </entry>
923   - <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">
924   - <provider selected="true" editor-type-id="text-editor">
925   - <state relative-caret-position="216">
926   - <caret line="37" column="20" selection-start-line="37" selection-start-column="20" selection-end-line="37" selection-end-column="20" />
927   - <folding>
928   - <element signature="e#1400#1401#0" expanded="true" />
929   - <element signature="e#1463#1464#0" expanded="true" />
930   - </folding>
931   - </state>
932   - </provider>
933   - </entry>
934   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java">
935   - <provider selected="true" editor-type-id="text-editor">
936   - <state relative-caret-position="100">
937   - <caret line="8" column="61" selection-start-line="8" selection-start-column="61" selection-end-line="8" selection-end-column="61" />
938   - </state>
939   - </provider>
940   - </entry>
941   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html">
942   - <provider selected="true" editor-type-id="text-editor">
943   - <state relative-caret-position="185">
944   - <caret line="335" column="16" lean-forward="true" selection-start-line="335" selection-start-column="16" selection-end-line="335" selection-end-column="16" />
945   - <folding>
946   - <element signature="e#4822#10729#0" />
947   - </folding>
948   - </state>
949   - </provider>
950   - </entry>
951   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailService.java">
952   - <provider selected="true" editor-type-id="text-editor">
953   - <state relative-caret-position="140">
954   - <caret line="9" selection-start-line="9" selection-end-line="9" />
955   - </state>
956   - </provider>
957   - </entry>
958   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java">
959   - <provider selected="true" editor-type-id="text-editor">
960   - <state relative-caret-position="173">
961   - <caret line="104" column="25" selection-start-line="104" selection-start-column="25" selection-end-line="104" selection-end-column="25" />
962   - </state>
963   - </provider>
964   - </entry>
965   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/service/ContainerService.java">
966   - <provider selected="true" editor-type-id="text-editor">
967   - <state relative-caret-position="200">
968   - <caret line="15" selection-start-line="15" selection-end-line="15" />
969   - </state>
970   - </provider>
971   - </entry>
972   - <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/config/ContainerMapper.xml">
973   - <provider selected="true" editor-type-id="text-editor">
974   - <state relative-caret-position="436">
975   - <caret line="50" column="23" selection-start-line="50" selection-start-column="23" selection-end-line="50" selection-end-column="23" />
976   - </state>
977   - </provider>
978   - </entry>
979   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/mapper/ContainerMapper.java">
980   - <provider selected="true" editor-type-id="text-editor">
981   - <state relative-caret-position="180">
982   - <caret line="14" selection-start-line="14" selection-end-line="14" />
983   - </state>
984   - </provider>
985   - </entry>
986   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/mapper/LocationMapper.java">
987   - <provider selected="true" editor-type-id="text-editor">
988   - <state relative-caret-position="280">
989   - <caret line="16" column="1" lean-forward="true" selection-start-line="16" selection-start-column="1" selection-end-line="16" selection-end-column="1" />
990   - </state>
991   - </provider>
992   - </entry>
993   - <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/config/LocationMapper.xml">
994   - <provider selected="true" editor-type-id="text-editor">
995   - <state relative-caret-position="446">
996   - <caret line="49" column="132" lean-forward="true" selection-start-line="49" selection-start-column="132" selection-end-line="49" selection-end-column="132" />
997   - </state>
998   - </provider>
999   - </entry>
1000   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/service/LocationServiceImpl.java">
1001   - <provider selected="true" editor-type-id="text-editor">
1002   - <state relative-caret-position="326">
1003   - <caret line="116" column="7" lean-forward="true" selection-start-line="116" selection-start-column="7" selection-end-line="116" selection-end-column="7" />
1004   - <folding>
1005   - <element signature="e#4932#4933#0" expanded="true" />
1006   - <element signature="e#4992#4993#0" expanded="true" />
1007   - </folding>
1008   - </state>
1009   - </provider>
1010   - </entry>
1011   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/service/ContainerServiceImpl.java">
1012   - <provider selected="true" editor-type-id="text-editor">
1013   - <state relative-caret-position="392">
1014   - <caret line="123" column="13" lean-forward="true" selection-start-line="123" selection-start-column="13" selection-end-line="123" selection-end-column="13" />
1015   - </state>
1016   - </provider>
1017   - </entry>
1018   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/service/LocationService.java">
1019   - <provider selected="true" editor-type-id="text-editor">
1020   - <state relative-caret-position="220">
1021   - <caret line="12" column="96" selection-start-line="12" selection-start-column="96" selection-end-line="12" selection-end-column="96" />
1022   - </state>
1023   - </provider>
1024   - </entry>
1025   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java">
1026   - <provider selected="true" editor-type-id="text-editor">
1027   - <state relative-caret-position="216">
1028   - <caret line="18" column="15" selection-start-line="18" selection-start-column="15" selection-end-line="18" selection-end-column="15" />
1029   - </state>
1030   - </provider>
1031   - </entry>
1032   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java">
1033   - <provider selected="true" editor-type-id="text-editor">
1034   - <state relative-caret-position="363">
1035   - <caret line="924" lean-forward="true" selection-start-line="924" selection-end-line="924" />
1036   - <folding>
1037   - <element signature="imports" expanded="true" />
1038   - </folding>
1039   - </state>
1040   - </provider>
1041   - </entry>
1042   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/service/InventoryTransactionServiceImpl.java">
1043   - <provider selected="true" editor-type-id="text-editor">
1044   - <state relative-caret-position="80">
1045   - <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
1046   - </state>
1047   - </provider>
1048   - </entry>
1049   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java">
1050   - <provider selected="true" editor-type-id="text-editor">
1051   - <state relative-caret-position="671">
1052   - <caret line="60" column="12" selection-start-line="60" selection-start-column="12" selection-end-line="60" selection-end-column="12" />
1053   - </state>
1054   - </provider>
1055   - </entry>
1056   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java">
1057   - <provider selected="true" editor-type-id="text-editor">
1058   - <state relative-caret-position="-525">
1059   - <caret line="44" column="22" selection-start-line="44" selection-start-column="22" selection-end-line="44" selection-end-column="22" />
1060   - </state>
1061   - </provider>
1062   - </entry>
1063   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/controller/InventoryTransactionController.java">
1064   - <provider selected="true" editor-type-id="text-editor">
1065   - <state relative-caret-position="-1060">
1066   - <caret line="33" column="13" selection-start-line="33" selection-start-column="13" selection-end-line="33" selection-end-column="13" />
1067   - </state>
1068   - </provider>
1069   - </entry>
1070   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java">
1071   - <provider selected="true" editor-type-id="text-editor">
1072   - <state relative-caret-position="1531">
1073   - <caret line="214" column="20" selection-start-line="214" selection-start-column="20" selection-end-line="214" selection-end-column="20" />
1074   - </state>
1075   - </provider>
1076   - </entry>
1077   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java">
1078   - <provider selected="true" editor-type-id="text-editor">
1079   - <state relative-caret-position="367">
1080   - <caret line="117" column="42" selection-start-line="117" selection-start-column="42" selection-end-line="117" selection-end-column="42" />
1081   - </state>
1082   - </provider>
1083   - </entry>
1084   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html">
1085   - <provider selected="true" editor-type-id="text-editor">
1086   - <state relative-caret-position="-12">
1087   - <caret line="273" column="18" selection-start-line="273" selection-start-column="18" selection-end-line="273" selection-end-column="18" />
1088   - </state>
1089   - </provider>
1090   - </entry>
1091   - <entry file="file://$PROJECT_DIR$/src/main/resources/static/huaheng/js/huahengUI.js">
1092   - <provider selected="true" editor-type-id="text-editor">
1093   - <state relative-caret-position="304">
1094   - <caret line="44" column="25" lean-forward="true" selection-start-line="43" selection-start-column="52" selection-end-line="44" selection-end-column="25" />
1095   - </state>
1096   - </provider>
1097   - </entry>
1098   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/adjustDetail/adjustDetail.html">
1099   - <provider selected="true" editor-type-id="text-editor">
1100   - <state relative-caret-position="196">
1101   - <caret line="323" column="16" lean-forward="true" selection-start-line="323" selection-start-column="16" selection-end-line="323" selection-end-column="16" />
1102   - </state>
1103   - </provider>
1104   - </entry>
1105   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/adjustHeader/adjustHeader.html">
1106   - <provider selected="true" editor-type-id="text-editor">
1107   - <state relative-caret-position="163">
1108   - <caret line="187" column="30" lean-forward="true" selection-start-line="187" selection-start-column="30" selection-end-line="187" selection-end-column="30" />
1109   - <folding>
1110   - <element signature="n#style#0;n#a#0;n#!!top" expanded="true" />
1111   - </folding>
1112   - </state>
1113   - </provider>
1114   - </entry>
1115   - <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.1.5.RELEASE/spring-core-5.1.5.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
1116   - <provider selected="true" editor-type-id="text-editor">
1117   - <state relative-caret-position="167">
1118   - <caret line="102" selection-start-line="102" selection-end-line="102" />
1119   - </state>
1120   - </provider>
1121   - </entry>
1122   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/domain/CycleCountDetail.java">
1123   - <provider selected="true" editor-type-id="text-editor">
1124   - <state relative-caret-position="120">
1125   - <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
1126   - </state>
1127   - </provider>
1128   - </entry>
1129   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountDetail/cycleCountDetail.html">
1130   - <provider selected="true" editor-type-id="text-editor">
1131   - <state relative-caret-position="-87">
1132   - <caret line="122" selection-start-line="122" selection-end-line="122" />
1133   - <folding>
1134   - <element signature="e#6120#12518#0" />
1135   - </folding>
1136   - </state>
1137   - </provider>
1138   - </entry>
1139   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/controller/CycleCountHeaderController.java">
1140   - <provider selected="true" editor-type-id="text-editor">
1141   - <state relative-caret-position="-567">
1142   - <caret line="44" column="51" selection-start-line="44" selection-start-column="51" selection-end-line="44" selection-end-column="51" />
1143   - </state>
1144   - </provider>
1145   - </entry>
1146   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java">
1147   - <provider selected="true" editor-type-id="text-editor">
1148   - <state relative-caret-position="8">
1149   - <caret line="64" column="52" lean-forward="true" selection-start-line="64" selection-start-column="52" selection-end-line="64" selection-end-column="52" />
1150   - </state>
1151   - </provider>
1152   - </entry>
1153   - </component>
1154 566 </project>
1155 567 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/task/taskDetail/domain/TaskDetail.java
  View file @224ceb3
... ... @@ -57,6 +57,14 @@ public class TaskDetail implements Serializable {
57 57 @ApiModelProperty(value="货主")
58 58 private String companyCode;
59 59  
  60 +
  61 + /**
  62 + * 组盘子id
  63 + */
  64 + @TableField(value = "allocationId")
  65 + @ApiModelProperty(value="组盘子id")
  66 + private String allocationId;
  67 +
60 68 /**
61 69 * 单据编码
62 70 */
... ... @@ -162,12 +170,6 @@ public class TaskDetail implements Serializable {
162 170 @ApiModelProperty(value="参考单号")
163 171 private String referenceCode;
164 172  
165   - /**
166   - * 参考内部号
167   - */
168   - @TableField(value = "referenceId")
169   - @ApiModelProperty(value="参考内部号")
170   - private Integer referenceId;
171 173  
172 174 /**
173 175 * 参考内部行号
... ... @@ -379,6 +381,8 @@ public class TaskDetail implements Serializable {
379 381  
380 382 public static final String COL_COMPANYCODE = "companyCode";
381 383  
  384 + public static final String COL_ALLOCATIONID= "allocationId";
  385 +
382 386 public static final String COL_BILLCODE= "billCode";
383 387  
384 388 public static final String COL_BILLDETAILID= "billDetailId";
... ...
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java
  View file @224ceb3
... ... @@ -31,6 +31,8 @@ public interface TaskHeaderService extends IService&lt;TaskHeader&gt;{
31 31  
32 32 AjaxResult createReceiptTask(List<Integer> ids);
33 33  
  34 + void completeShipmentTask(TaskHeader task) ;
  35 +
34 36 Integer UncompleteCount(String containerCode);
35 37  
36 38  
... ...
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
  View file @224ceb3
... ... @@ -30,12 +30,21 @@ import com.huaheng.pc.shipment.shipmentContainerDetail.domain.ShipmentContainerD
30 30 import com.huaheng.pc.shipment.shipmentContainerDetail.service.ShipmentContainerDetailService;
31 31 import com.huaheng.pc.shipment.shipmentContainerHeader.domain.ShipmentContainerHeader;
32 32 import com.huaheng.pc.shipment.shipmentContainerHeader.service.ShipmentContainerHeaderService;
  33 +import com.huaheng.pc.shipment.shipmentDetail.domain.ShipmentDetail;
  34 +import com.huaheng.pc.shipment.shipmentDetail.service.ShipmentDetailService;
33 35 import com.huaheng.pc.shipment.shipmentHeader.domain.ShipmentHeader;
  36 +import com.huaheng.pc.shipment.shipmentHeader.service.ShipmentHeaderService;
34 37 import com.huaheng.pc.task.taskDetail.domain.TaskDetail;
35 38 import com.huaheng.pc.task.taskDetail.service.TaskDetailService;
36 39 import com.huaheng.pc.task.taskHeader.domain.ShipmentTaskCreateModel;
  40 +import org.jsoup.helper.DataUtil;
37 41 import org.springframework.stereotype.Service;
38 42 import java.math.BigDecimal;
  43 +import java.text.SimpleDateFormat;
  44 +import java.util.ArrayList;
  45 +import java.util.Date;
  46 +import java.util.List;
  47 +import java.util.Map;
39 48 import java.util.*;
40 49 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
41 50 import com.huaheng.pc.task.taskHeader.domain.TaskHeader;
... ... @@ -74,6 +83,13 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
74 83 @Resource
75 84 private ReceiptContainerDetailService receiptContainerDetailService;
76 85 @Resource
  86 + private ShipmentHeaderService shipmentHeaderService;
  87 + @Resource
  88 + private ShipmentDetailService shipmentDetailService;
  89 +
  90 +
  91 +
  92 + @Resource
77 93 private ReceiptContainerHeaderService receiptContainerHeaderService;
78 94 @Resource
79 95 private TaskHeaderMapper taskHeaderMapper;
... ... @@ -206,7 +222,12 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
206 222 /**
207 223 * 下发WCS执行任务
208 224 */
  225 + /**
  226 + *
  227 + * 执行任务
  228 + * */
209 229 @Override
  230 + @Transactional
210 231 public AjaxResult<TaskHeader> sendTaskToWcs(Integer[] taskIds) {
211 232 TaskHeader task = null;
212 233 for (Integer taskId : taskIds) {
... ... @@ -221,7 +242,8 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
221 242 task.setLastUpdatedBy(ShiroUtils.getLoginName());
222 243 LambdaUpdateWrapper<TaskHeader> HeaderUpdateWrapper = Wrappers.lambdaUpdate();
223 244 HeaderUpdateWrapper.eq(TaskHeader::getId, taskId);
224   - taskHeaderService.update(task, HeaderUpdateWrapper);
  245 + if (!taskHeaderService.update(task, HeaderUpdateWrapper))
  246 + throw new ServiceException("更新任务头失败");
225 247 //修改任务明细状态
226 248 TaskDetail record = new TaskDetail();
227 249 record.setStatus(10);
... ... @@ -229,38 +251,24 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
229 251 record.setLastUpdatedBy(ShiroUtils.getLoginName());
230 252 LambdaUpdateWrapper<TaskDetail> lambdaUpdateWrapper = Wrappers.lambdaUpdate();
231 253 lambdaUpdateWrapper.eq(TaskDetail::getTaskId, task.getId());
232   - taskDetailService.update(record, lambdaUpdateWrapper);
233   -
234   -
235   -// if (task.getInternalTaskType().equals("100"))
236   -// {
237   -// List<Map<String, Object>> maps = taskDetailService.selectListMapByEqual("billId, billDetailId", condition);
238   -// for (Map<String, Object> item : maps){
239   -// Integer billDetailId = DataUtils.getInteger(item.get("billDetailId"));
240   -// receiptHeaderService.updateDetailStatus(billDetailId, (short)300);
241   -// }
242   -// maps.stream().map(X -> X.get("billId")).distinct().forEach(X -> receiptHeaderService.receiptStatusUpdate(DataUtils.getInteger(X), (short)300));
243   -// }
244   -// //盘点单执行
245   -// if(task.getType() == 700){
246   -// CyclecountDetail cyclecountDetai = cyclecountDetailService.selectEntityById(
247   -// task.getAllocationHeadId());
248   -// cyclecountDetai.setStatus(10);
249   -// cyclecountDetailService.updateByModel(cyclecountDetai);
250   -// }
251   -//// //如果是单排人工库，那么出入库都是先完成，在下发AGV任务
252   -//// if (task.getType().intValue() == 300 || task.getType().intValue() == 600) {
253   -//// if (task.getSourceLocation().startsWith("L03") == false ) {
254   -//// taskAgvService.createTaskAgv(task);
255   -//// }
256   -//// }
257   -//// else {
258   -//// taskAgvService.createTaskAgv(task);
259   -//// }
260   -// //任务类型是出库，那就完成任务在叫agv
261   -// if (task.getType().intValue() == 100 || task.getType().intValue() == 500) {
262   -// taskAgvService.createTaskAgv(task);
263   -// }
  254 + if (!taskDetailService.update(record, lambdaUpdateWrapper)){
  255 + throw new ServiceException("更新任务明细失败");
  256 + }
  257 + //修改入库明细
  258 + ReceiptDetail receiptDetail = receiptDetailService.queryflow(receiptDetailService.getById(record.getId()));
  259 + if (!receiptDetailService.updateById(receiptDetail)){
  260 + throw new ServiceException("更新状态失败");
  261 + }
  262 + receiptDetailService.updateReceiptHeaderLastStatus(receiptDetail.getReceiptId());
  263 + //修改组盘表状态为20
  264 + ReceiptContainerDetail receiptContainerDetail = new ReceiptContainerDetail();
  265 + receiptContainerDetail.setStatus(20);
  266 + receiptContainerDetail.setLastUpdated(new Date());
  267 + receiptContainerDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
  268 + LambdaUpdateWrapper<ReceiptContainerDetail> receiptContainerDetailLambdaUpdateWrapper = Wrappers.lambdaUpdate();
  269 + receiptContainerDetailLambdaUpdateWrapper.eq(ReceiptContainerDetail::getReceiptId,receiptDetail.getReceiptId());
  270 + if (! receiptContainerDetailService.update(receiptContainerDetail, receiptContainerDetailLambdaUpdateWrapper))
  271 + throw new ServiceException("更新组盘状态失败");
264 272 }
265 273 return AjaxResult.success("下发任务成功", task);
266 274 }
... ... @@ -294,13 +302,13 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
294 302 */
295 303 public void completeTask(TaskHeader task) throws Exception {
296 304 //区分任务类型
297   - if (task.getInternalTaskType() == 100 || task.getInternalTaskType() == 200) {
  305 + if (task.getInternalTaskType() == 100) {
298 306 //入库任务
299 307 completeReceiptTask(task);
300 308 }
301   - if (task.getInternalTaskType() == 300 || task.getInternalTaskType() == 400) {
302   -// //出库任务
303   -// completeShipmentTask(task);
  309 + if (task.getInternalTaskType() == 200) {
  310 +// 出库任务
  311 + completeShipmentTask(task);
304 312 }
305 313 // 700 盘点 900 出库查看,包过空托出库查看
306 314 if (task.getInternalTaskType() == 700 || task.getInternalTaskType() == 900) {
... ... @@ -322,9 +330,10 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
322 330  
323 331  
324 332 /**
325   - *
  333 + *完成任务
326 334 */
327 335 @Override
  336 + @Transactional
328 337 public AjaxResult completeReceiptTask(TaskHeader task) throws Exception {
329 338 List<Map<String, Object>> taskReceiptContainerDetail = taskHeaderMapper.getReceiptTask(task.getId());
330 339 if (taskReceiptContainerDetail.size() < 1) {
... ... @@ -345,13 +354,16 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
345 354 header.setWarehouseCode(DataUtils.getString(map.get("warehouseCode")));//仓库
346 355 header.setCompanyCode(task.getCompanyCode());//货主
347 356 header.setContainerCode(DataUtils.getString(map.get("containerCode")));//容器号
  357 + header.setLocationCode(task.getToLocation());
348 358 header.setTotalQty(DataUtils.getInteger(map.get("totalQty")));//总数量
349 359 header.setLocking(1);
350 360 header.setEnable(1);
351 361 header.setCreatedBy(ShiroUtils.getLoginName());
352 362 header.setCreated(new Date());
353 363 header.setLastUpdated(new Date());
354   - inventoryHeaderService.save(header);
  364 + if (!inventoryHeaderService.save(header))
  365 + throw new ServiceException("添加库存单失败");
  366 +
355 367 //库存明细添加
356 368 detail = new InventoryDetail();
357 369 detail.setInventoryHeaderId(header.getId());//库存头ID
... ... @@ -367,19 +379,23 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
367 379 detail.setBatch(DataUtils.getString(map.get("batch")));//批次
368 380 detail.setLot(DataUtils.getString(map.get("lot")));//批号
369 381 detail.setInventorySts(DataUtils.getString(map.get("inventorySts")));//库存状态
370   - detail.setManufactureDate(DataUtils.getDateTime(map.get("manufactureDate")));//生产日期
371   - detail.setExpirationDate(DataUtils.getDateTime(map.get("expirationDate")));//失效日期
  382 + detail.setManufactureDate(new SimpleDateFormat("yyyy-MM-dd").parse(map.get("manufactureDate").toString()));//生产日期
  383 +// detail.setExpirationDate(new SimpleDateFormat("yyyy-MM-dd").parse(map.get("expirationDate").toString()));//失效日期
372 384 detail.setQty(DataUtils.getBigDecimal(map.get("qty")));//数量
373 385 detail.setTaskQty(DataUtils.getBigDecimal(map.get("qty")));
374 386 detail.setCreatedBy(ShiroUtils.getLoginName());//创建人
375 387 detail.setLastUpdatedBy(ShiroUtils.getLoginName());//创建时间
376   - inventoryDetailService.save(detail);
377   - } else {
  388 + if (!inventoryDetailService.save(detail))
  389 + throw new ServiceException("添加库存明细失败");
  390 + }
  391 + else {
378 392 detail.setQty(detail.getQty().add(DataUtils.getBigDecimal(map.get("qty"))));
379 393 detail.setLastUpdatedBy(ShiroUtils.getLoginName());
380 394 LambdaUpdateWrapper<InventoryDetail> lambdaUpdateWrapper = Wrappers.lambdaUpdate();
381   - lambdaUpdateWrapper.eq(InventoryDetail::getId, DataUtils.getInteger(map.get("receiptDetailId")));
382   - inventoryDetailService.update(detail, lambdaUpdateWrapper);
  395 + lambdaUpdateWrapper.eq(InventoryDetail::getId,DataUtils.getInteger(map.get("receiptDetailId")));
  396 + if (!inventoryDetailService.update(detail, lambdaUpdateWrapper))
  397 + throw new ServiceException("更新入库单明细失败");
  398 +
383 399 }
384 400 //记录库存交易记录
385 401 InventoryTransaction inventoryTransaction = new InventoryTransaction();
... ... @@ -394,28 +410,49 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
394 410 inventoryTransaction.setBillDetailId(DataUtils.getInteger(map.get("receiptDetailId")));
395 411 inventoryTransaction.setBatch(DataUtils.getString(map.get("batch")));
396 412 inventoryTransaction.setLot(DataUtils.getString(map.get("lot")));
397   - inventoryTransaction.setManufactureDate(DataUtils.getDateTime(map.get("manufactureDate")));
398   - inventoryTransaction.setExpirationDate(DataUtils.getDateTime(map.get("expirationDate")));
  413 + inventoryTransaction.setManufactureDate(new SimpleDateFormat("yyyy-MM-dd").parse(map.get("manufactureDate").toString()));//生产日期
  414 +// inventoryTransaction.setExpirationDate(DataUtils.getDateTime(map.get("expirationDate")));
399 415 inventoryTransaction.setInventorySts(DataUtils.getString((map.get("inventorySts"))));
400 416 inventoryTransaction.setTaskQty(DataUtils.getInteger(map.get("qty")));
401 417 inventoryTransaction.setCreated(new Date());
402 418 inventoryTransaction.setCreatedBy(ShiroUtils.getLoginName());
403   - inventoryTransactionService.save(inventoryTransaction);
  419 + if (!inventoryTransactionService.save(inventoryTransaction))
  420 + throw new ServiceException("新增库存记录失败");
404 421 //修改任务明细的状态为完成
405 422 TaskDetail taskDetail = new TaskDetail();
406 423 taskDetail.setStatus(100);
407 424 taskDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
408 425 taskDetail.setAgingDate(new Date()); //入库时间
409 426 LambdaUpdateWrapper<TaskDetail> lambdaUpdateWrapper = Wrappers.lambdaUpdate();
410   - lambdaUpdateWrapper.eq(TaskDetail::getTaskId, DataUtils.getInteger(map.get("taskDetailId")));
  427 + lambdaUpdateWrapper.eq(TaskDetail::getTaskId,task.getId());
411 428 taskDetailService.update(taskDetail, lambdaUpdateWrapper);
412   - //修改入库单的状态
413   - ReceiptHeader receiptHeader = new ReceiptHeader();
414   - receiptHeader.setFirstStatus(100);
415   - receiptHeader.setLastStatus(100);
416   - LambdaUpdateWrapper<ReceiptHeader> receiptHeaderLambdaUpdateWrapper = Wrappers.lambdaUpdate();
417   - receiptHeaderLambdaUpdateWrapper.eq(ReceiptHeader::getId, DataUtils.getInteger(map.get("receiptId")));
418   - receiptHeaderService.update(receiptHeader, receiptHeaderLambdaUpdateWrapper);
  429 + if ( !taskDetailService.update(taskDetail, lambdaUpdateWrapper)){
  430 + throw new ServiceException("修改入库单明细失败");
  431 + }
  432 +// //修改入库单的状态
  433 +// ReceiptHeader receiptHeader = new ReceiptHeader();
  434 +// receiptHeader.setFirstStatus(100);
  435 +// receiptHeader.setLastStatus(100);
  436 +// LambdaUpdateWrapper<ReceiptHeader> receiptHeaderLambdaUpdateWrapper = Wrappers.lambdaUpdate();
  437 +// receiptHeaderLambdaUpdateWrapper.eq(ReceiptHeader::getId, DataUtils.getInteger(map.get("receiptId")));
  438 +// if (!receiptHeaderService.update(receiptHeader, receiptHeaderLambdaUpdateWrapper)){
  439 +// throw new ServiceException("修改入库单失败");
  440 +// }
  441 +// //修改任务明细的状态为完成
  442 +// TaskDetail taskDetail = new TaskDetail();
  443 +// taskDetail.setStatus(100);
  444 +// taskDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
  445 +// taskDetail.setAgingDate(new Date()); //入库时间
  446 +// LambdaUpdateWrapper<TaskDetail> lambdaUpdateWrapper = Wrappers.lambdaUpdate();
  447 +// lambdaUpdateWrapper.eq(TaskDetail::getTaskId, DataUtils.getInteger(map.get("taskDetailId")));
  448 +// taskDetailService.update(taskDetail, lambdaUpdateWrapper);
  449 +// //修改入库单的状态
  450 +// ReceiptHeader receiptHeader =new ReceiptHeader();
  451 +// receiptHeader.setFirstStatus(100);
  452 +// receiptHeader.setLastStatus(100);
  453 +// LambdaUpdateWrapper<ReceiptHeader> receiptHeaderLambdaUpdateWrapper = Wrappers.lambdaUpdate();
  454 +// receiptHeaderLambdaUpdateWrapper.eq(ReceiptHeader::getId, DataUtils.getInteger(map.get("receiptId")));
  455 +// receiptHeaderService.update(receiptHeader, receiptHeaderLambdaUpdateWrapper);
419 456  
420 457 //修改任务主表状态，因为立库任务表单头只对应一个货箱，表单详情的任务会同时完成
421 458 task.setStatus(100);
... ... @@ -423,25 +460,43 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
423 460 task.setLastUpdated(new Date());
424 461 LambdaUpdateWrapper<TaskHeader> taskHeaderLambdaUpdateWrapper = Wrappers.lambdaUpdate();
425 462 taskHeaderLambdaUpdateWrapper.eq(TaskHeader::getId, task.getId());
426   - taskHeaderService.update(task, taskHeaderLambdaUpdateWrapper);
  463 + if (!taskHeaderService.update(task, taskHeaderLambdaUpdateWrapper))
  464 + throw new ServiceException("更新任务主表失败");
  465 +
427 466 //修改库位状态和对应的容器
428 467 Location location = new Location();
429 468 location.setContainerCode(task.getContainerCode());
430 469 location.setStatus("empty");
431 470 LambdaUpdateWrapper<Location> locationLambdaUpdateWrapper = Wrappers.lambdaUpdate();
432 471 locationLambdaUpdateWrapper.eq(Location::getCode, task.getToLocation());
433   - locationService.update(location, locationLambdaUpdateWrapper);
  472 + if (!locationService.update(location, locationLambdaUpdateWrapper))
  473 + throw new ServiceException("更新库位失败");
  474 +
434 475 //修改容器状态和对应的库位
435 476 Container container = new Container();
436 477 container.setLocationCode(task.getToLocation());
437 478 container.setStatus("some");
438   - //修改组盘表状态为20
  479 + if (!containerService.save(container)){
  480 + throw new ServiceException("更新容器失败");
  481 + }
  482 + //修改组盘表状态为20
439 483 ReceiptContainerDetail receiptContainerDetail = new ReceiptContainerDetail();
440 484 receiptContainerDetail.setStatus(20);
  485 + receiptContainerDetail.setProcessStamp("0");
  486 + receiptContainerDetail.setLastUpdated(new Date());
  487 + receiptContainerDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
441 488 LambdaUpdateWrapper<ReceiptContainerDetail> receiptContainerDetailLambdaUpdateWrapper = Wrappers.lambdaUpdate();
442 489 receiptContainerDetailLambdaUpdateWrapper.eq(ReceiptContainerDetail::getReceiptId, DataUtils.getInteger(map.get("receiptId")));
443   - receiptContainerDetailService.update(receiptContainerDetail, receiptContainerDetailLambdaUpdateWrapper);
  490 + if (! receiptContainerDetailService.update(receiptContainerDetail, receiptContainerDetailLambdaUpdateWrapper))
  491 + throw new ServiceException("更新组盘状态失败");
  492 + //修改入库明细
  493 + ReceiptDetail receiptDetail = receiptDetailService.queryflow(receiptDetailService.getById(DataUtils.getInteger(map.get("receiptDetailId"))));
  494 + if (!receiptDetailService.updateById(receiptDetail)){
  495 + throw new ServiceException("更新状态失败");
  496 + }
  497 + receiptDetailService.updateReceiptHeaderLastStatus(receiptDetail.getReceiptId());
444 498 }
  499 +
445 500 }
446 501 return AjaxResult.success("完成入库任务");
447 502 }
... ... @@ -848,7 +903,6 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
848 903  
849 904 /**
850 905 * 创建上架任务
851   - *
852 906 * @param ids
853 907 * @return
854 908 */
... ... @@ -933,5 +987,108 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
933 987  
934 988  
935 989  
  990 + /**
  991 + *
  992 + * 完成出库任务
  993 + * */
  994 + @Override
  995 + public void completeShipmentTask(TaskHeader task) {
  996 + //获取所有子任务
  997 + TaskDetail condition = new TaskDetail();
  998 + condition.setTaskId(task.getId());
  999 + LambdaQueryWrapper<TaskDetail> lambdaQueryWrapper = Wrappers.lambdaQuery(condition);
  1000 + List<TaskDetail> taskDetails = taskDetailService.list(lambdaQueryWrapper);
  1001 + List<Integer> shipmentHeadIds = new ArrayList<>();
  1002 + for(TaskDetail taskDetail : taskDetails){
  1003 + if(taskDetail.getStatus()<20){
  1004 + //获取出库子货箱
  1005 + ShipmentContainerDetail shipmentContainerDetail = shipmentContainerDetailService.getById(taskDetail.getAllocationId());
  1006 + //取出子单据
  1007 + ShipmentDetail shipmentDetail = shipmentDetailService.getById(taskDetail.getBillDetailId());
  1008 + //暂存id，为更新单据状态准备
  1009 + shipmentHeadIds.add(shipmentDetail.getShipmentId());
  1010 + //获取对应库存记录
  1011 + InventoryDetail inventoryDetail = inventoryDetailService.getById(taskDetail.getToInventoryId());
  1012 + if (inventoryDetail == null) {
  1013 + throw new ServiceException("任务明细对应的库存ID【" + taskDetail.getToInventoryId().toString() + "】不存在！");
  1014 + }
  1015 + BigDecimal orignalQty = inventoryDetail.getQty();
  1016 + //扣减库存
  1017 + inventoryDetail.setTaskQty(inventoryDetail.getTaskQty().subtract(taskDetail.getQty()));
  1018 + inventoryDetail.setQty(inventoryDetail.getQty().subtract(taskDetail.getQty()));
  1019 + if(inventoryDetail.getQty().compareTo(new BigDecimal("0"))==0 && inventoryDetail.getTaskQty().compareTo(new BigDecimal("0"))==0){
  1020 + //如果库存没有了，就删除这个库存
  1021 + inventoryDetailService.removeById(inventoryDetail.getId());
  1022 + }else {
  1023 + //否则更新这个库存
  1024 + inventoryDetailService.updateById(inventoryDetail);
  1025 + }
  1026 + //设置子任务状态为已执行
  1027 + taskDetail.setStatus(100);
  1028 + taskDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
  1029 + taskDetail.setLastUpdated(new Date()); //完成时间
  1030 + taskDetailService.updateById(taskDetail);
  1031 + //记录库存交易记录
  1032 + InventoryTransaction inventoryTransaction = new InventoryTransaction();
  1033 + inventoryTransaction.setWarehouseCode(task.getWarehouseCode());
  1034 + inventoryTransaction.setCompanyCode(shipmentDetail.getCompanyCode());
  1035 + inventoryTransaction.setLocationCode(inventoryDetail.getLocationCode());
  1036 + inventoryTransaction.setContainerCode(inventoryDetail.getContainerCode());
  1037 + inventoryTransaction.setTransactionType(20);
  1038 + inventoryTransaction.setMaterialCode(shipmentDetail.getMaterialCode());
  1039 + //inventory.setMaterialName(DataUtils.getString(taskDetail.getMaterialName()));//物料名称
  1040 + inventoryTransaction.setBillCode(taskDetail.getBillCode());
  1041 + inventoryTransaction.setBillDetailId(shipmentDetail.getId());
  1042 + inventoryTransaction.setBatch(shipmentDetail.getBatch());
  1043 + inventoryTransaction.setLot(shipmentDetail.getLot());
  1044 + inventoryTransaction.setManufactureDate(shipmentDetail.getManufactureDate());
  1045 + inventoryTransaction.setExpirationDate(shipmentDetail.getExpirationDate());
  1046 + inventoryTransaction.setInventorySts(inventoryDetail.getInventorySts());
  1047 + //这里取反，更符合出库的语义，同时方便对记录进行统计
  1048 + inventoryTransaction.setTaskQty(taskDetail.getQty().intValue());
  1049 +// inventoryTransaction.setCostPrice(shipmentDetail.);
  1050 + inventoryTransaction.setCreated(null);
  1051 + inventoryTransaction.setCreatedBy(ShiroUtils.getLoginName());
  1052 + inventoryTransactionService.save(inventoryTransaction);
  1053 +// //更新单据状态
  1054 +// shipmentHeaderService.updateShipmentStatus(shipmentHeader.getId());
  1055 + }
  1056 + }
  1057 + //设置主任务为已执行
  1058 + task.setStatus(100);
  1059 + task.setLastUpdatedBy(ShiroUtils.getLoginName());
  1060 + task.setLastUpdated(new Date());
  1061 + taskHeaderService.updateById(task);
  1062 + //将库位状态改为空闲，如果是整出的对应的容器也清空
  1063 + Location locationRecord = new Location();
  1064 + locationRecord.setStatus("empty");
  1065 + if(task.getTaskType()==300) {
  1066 + locationRecord.setContainerCode("");
  1067 + }
  1068 + LambdaUpdateWrapper<Location> locationLambdaUpdateWrapper = Wrappers.lambdaUpdate();
  1069 + locationLambdaUpdateWrapper.eq(Location::getCode,task.getToLocation());
  1070 + locationService.update(locationLambdaUpdateWrapper);
  1071 + //如果是整出，删掉这个库位上的这个托盘，否则更改托盘状态
  1072 + Container containerRecord = new Container();
  1073 +// if(task.getTaskType()==300) {
  1074 +// containerService.updateLocationCodeAndStatus(task.getContainerCode(),"","empty");
  1075 +// }
  1076 +// else{
  1077 +// //查询是否存在关联的库存，入如果没有就修改容器状态为empty
  1078 +// Inventory inventoryCondition = new Inventory();
  1079 +// inventoryCondition.setLocationCode(task.getSourceLocation());
  1080 +// Map<String, Object> map = inventoryService.selectFirstMap("id", inventoryCondition);
  1081 +// if (map == null) {
  1082 +// //如果没有库存就设置为empty
  1083 +// containerService.updateStatus(task.getContainerCode(), "empty");
  1084 +// }
  1085 +// }
  1086 +// //设置出库货箱状态为拣货任务完成
  1087 +// shipmentContainerHeaderService.resetStatusShipmentContainer(task.getAllocationHeadId(),(short)20);
  1088 + //最后更新单据状态
  1089 + shipmentHeadIds.stream().distinct().forEach(t->shipmentHeaderService.updateShipmentStatus(t));
  1090 +
  1091 + }
  1092 +
936 1093  
937 1094 }
... ...
src/main/resources/templates/task/taskDetail/taskDetail.html
  View file @224ceb3
... ... @@ -72,12 +72,12 @@
72 72 sortable:true
73 73 },
74 74 {
75   - field : 'sourceLocation',
  75 + field : 'fromLocation',
76 76 title : '源库位',
77 77 sortable:true
78 78 },
79 79 {
80   - field : 'destinationLocation',
  80 + field : 'toLocation',
81 81 title : '目的库位',
82 82 sortable:true
83 83 },
... ...
src/main/resources/templates/task/taskHeader/taskHeader.html
  View file @224ceb3
... ... @@ -32,7 +32,7 @@
32 32 </li>
33 33  
34 34 <li>
35   - 库位编号：<input type="text" name="locationCode"/>
  35 + 库位编号：<input type="text" name="toLocation"/>
36 36 </li>
37 37 <li class="time" style="height: 30px">
38 38 <label>创建时间： </label>
... ... @@ -171,7 +171,7 @@
171 171  
172 172 },
173 173 {
174   - field : 'locationCode',
  174 + field : 'toLocation',
175 175 title : '库位号',
176 176 visible:true
177 177 },
... ... @@ -234,7 +234,7 @@
234 234 actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>取消</a> ');
235 235 actions.push('<a class="btn btn-primary btn-xs ' + completeFlag + '" href="#" onclick="complete(\'' + row.id + '\')"><i class="fa fa-check"></i>完成</a>');
236 236 }
237   - if (row.status >=10) {
  237 + if (row.status >= 10 && row.status < 100) {
238 238 actions.push('<a class="btn btn-primary btn-xs ' + completeFlag + '" href="#" onclick="complete(\'' + row.id + '\')"><i class="fa fa-check"></i>完成</a>');
239 239 }
240 240 return actions.join('');
... ...