wms / wms_wuhangelinmei · Commits

Commit 7b1a6e3702f942dc77a837ad63b33d1b40224352

Authored by pengcheng
2 parents f29e1496 1747822c
develop ... future/yangjie moreWarehouse

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

Inline Side-by-side
Showing 11 changed files with 981 additions and 711 deletions
.idea/WMSV1.iml deleted
View file @f29e149
1   -<?xml version="1.0" encoding="UTF-8"?>
2   -<module type="JAVA_MODULE" version="4">
3   - <component name="FacetManager">
4   - <facet type="Spring" name="Spring">
5   - <configuration />
6   - </facet>
7   - <facet type="web" name="Web">
8   - <configuration>
9   - <webroots />
10   - <sourceRoots>
11   - <root url="file://$MODULE_DIR$/src/main/java" />
12   - <root url="file://$MODULE_DIR$/src/main/resources" />
13   - </sourceRoots>
14   - </configuration>
15   - </facet>
16   - </component>
17   -</module>
18 0 \ No newline at end of file
.idea/compiler.xml
  View file @7b1a6e3
... ... @@ -6,7 +6,7 @@
6 6 <sourceOutputDir name="target/generated-sources/annotations" />
7 7 <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
8 8 <outputRelativeToContentRoot value="true" />
9   - <module name="wms2" />
  9 + <module name="WMSV1" />
10 10 <module name="huaheng" />
11 11 </profile>
12 12 </annotationProcessing>
... ... @@ -15,7 +15,6 @@
15 15 <option name="ADDITIONAL_OPTIONS_OVERRIDE">
16 16 <module name="WMSV1" options="-parameters" />
17 17 <module name="huaheng" options="-parameters" />
18   - <module name="wms2" options="-parameters" />
19 18 </option>
20 19 </component>
21 20 </project>
22 21 \ No newline at end of file
... ...
.idea/workspace.xml
  View file @7b1a6e3
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <project version="4">
3 3 <component name="ChangeListManager">
4   - <list default="true" id="1fe4ff20-6474-45ee-a361-9572a808e9c9" name="Default Changelist" comment="Merge branch 'develop' of http://172.16.29.40:8010/wms/wms2 into develop&#10;&#10;# Conflicts:&#10;#&#9;.idea/workspace.xml&#10;#&#9;src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java&#10;#&#9;src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java">
  4 + <list default="true" id="29079676-ace5-434e-89a2-76a325e744a5" name="Default Changelist" comment="">
  5 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/check/checkDetail/checkComplete.html" afterDir="false" />
  6 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/check/checkDetail/checkDetail.html" afterDir="false" />
  7 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/check/checkHeader/checkHeader.html" afterDir="false" />
  8 + <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
5 9 <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/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/java/com/huaheng/pc/check/checkDetail/domain/CheckDetail.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/check/checkDetail/domain/CheckDetail.java" afterDir="false" />
7 11 </list>
8 12 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
9 13 <option name="SHOW_DIALOG" value="false" />
... ... @@ -29,370 +33,61 @@
29 33 </path>
30 34 <path>
31 35 <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
32   - <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
33   - <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
34   - </path>
35   - <path>
36   - <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
37   - <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
38   - <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
39   - <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" />
  36 + <item name="@localhost" type="feb32156:DbDataSourceImpl" />
40 37 </path>
41 38 <path>
42 39 <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
43   - <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
  40 + <item name="@localhost" type="feb32156:DbDataSourceImpl" />
44 41 <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 42 </path>
48 43 <path>
49 44 <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
50 45 <item name="@localhost" type="feb32156:DbDataSourceImpl" />
  46 + <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
  47 + <item name="wms2.0: schema" type="76f4a085:MysqlImplModel$Schema" />
51 48 </path>
52 49 <path>
53 50 <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
54 51 <item name="@localhost" type="feb32156:DbDataSourceImpl" />
55 52 <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
  53 + <item name="wms2.0: schema" type="76f4a085:MysqlImplModel$Schema" />
  54 + <item name="checking_register: table" type="285a2a93:MysqlImplModel$Table" />
56 55 </path>
57 56 </expand>
58 57 <select />
59 58 </component>
60   - <component name="FileEditorManager">
61   - <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
62   - <file pinned="false" current-in-tab="false">
63   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java">
64   - <provider selected="true" editor-type-id="text-editor">
65   - <state relative-caret-position="542">
66   - <caret line="117" column="45" lean-forward="true" selection-start-line="117" selection-start-column="45" selection-end-line="117" selection-end-column="45" />
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="209">
75   - <caret line="18" column="15" selection-start-line="18" selection-start-column="15" selection-end-line="18" selection-end-column="15" />
76   - </state>
77   - </provider>
78   - </entry>
79   - </file>
80   - <file pinned="false" current-in-tab="true">
81   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java">
82   - <provider selected="true" editor-type-id="text-editor">
83   - <state relative-caret-position="376">
84   - <caret line="1089" column="13" lean-forward="true" selection-start-line="1089" selection-start-column="13" selection-end-line="1089" selection-end-column="13" />
85   - <folding>
86   - <element signature="imports" expanded="true" />
87   - </folding>
88   - </state>
89   - </provider>
90   - </entry>
91   - </file>
92   - <file pinned="false" current-in-tab="false">
93   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentHeader/service/ShipmentHeaderService.java">
94   - <provider selected="true" editor-type-id="text-editor">
95   - <state relative-caret-position="266">
96   - <caret line="18" column="15" selection-start-line="18" selection-start-column="15" selection-end-line="18" selection-end-column="15" />
97   - </state>
98   - </provider>
99   - </entry>
100   - </file>
101   - <file pinned="false" current-in-tab="false">
102   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentHeader/service/ShipmentHeaderServiceImpl.java">
103   - <provider selected="true" editor-type-id="text-editor">
104   - <state relative-caret-position="340">
105   - <caret line="112" column="26" selection-start-line="112" selection-start-column="16" selection-end-line="112" selection-end-column="26" />
106   - </state>
107   - </provider>
108   - </entry>
109   - </file>
110   - <file pinned="false" current-in-tab="false">
111   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/domain/InventoryTransaction.java">
112   - <provider selected="true" editor-type-id="text-editor">
113   - <state relative-caret-position="226">
114   - <caret line="95" column="19" selection-start-line="95" selection-start-column="12" selection-end-line="95" selection-end-column="19" />
115   - </state>
116   - </provider>
117   - </entry>
118   - </file>
119   - <file pinned="false" current-in-tab="false">
120   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/taskHeader.html">
121   - <provider selected="true" editor-type-id="text-editor">
122   - <state relative-caret-position="214">
123   - <caret line="236" column="64" selection-start-line="236" selection-start-column="64" selection-end-line="236" selection-end-column="64" />
124   - <folding>
125   - <element signature="n#style#0;n#i#0;n#a#0;n#!!top" expanded="true" />
126   - </folding>
127   - </state>
128   - </provider>
129   - </entry>
130   - </file>
131   - </leaf>
132   - </component>
133 59 <component name="FileTemplateManagerImpl">
134 60 <option name="RECENT_TEMPLATES">
135 61 <list>
136   - <option value="CSS File" />
137 62 <option value="Class" />
138 63 <option value="HTML File" />
139 64 </list>
140 65 </option>
141 66 </component>
142   - <component name="FindInProjectRecents">
143   - <findStrings>
144   - <find>a</find>
145   - </findStrings>
146   - </component>
147 67 <component name="Git.Settings">
148   - <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
149   - </component>
150   - <component name="IdeDocumentHistory">
151   - <option name="CHANGED_PATHS">
152   - <list>
153   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java" />
154   - <option value="$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/taskHeader.html" />
155   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskDetail/domain/TaskDetail.java" />
156   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java" />
157   - </list>
  68 + <option name="RECENT_BRANCH_BY_REPOSITORY">
  69 + <map>
  70 + <entry key="$PROJECT_DIR$" value="master" />
  71 + </map>
158 72 </option>
  73 + <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
159 74 </component>
160   - <component name="JsFlowSettings">
161   - <service-enabled>true</service-enabled>
162   - <exe-path />
163   - <other-services-enabled>true</other-services-enabled>
164   - <auto-save>true</auto-save>
165   - </component>
166   - <component name="MavenImportPreferences">
167   - <option name="importingSettings">
168   - <MavenImportingSettings>
169   - <option name="importAutomatically" value="true" />
170   - </MavenImportingSettings>
  75 + <component name="IgnoredFileRootStore">
  76 + <option name="generatedRoots">
  77 + <set>
  78 + <option value="E:\code\wms2\.idea" />
  79 + </set>
171 80 </option>
172 81 </component>
173   - <component name="ProjectFrameBounds" extendedState="6">
174   - <option name="x" value="470" />
175   - <option name="width" value="980" />
176   - <option name="height" value="1030" />
177   - </component>
178   - <component name="ProjectId" id="1Q2nhRM7LRz3yFWhpclOKgTjxn0" />
  82 + <component name="ProjectId" id="1P5Ngjh73HToCarlEZkqMxrL7pm" />
179 83 <component name="ProjectLevelVcsManager">
180 84 <ConfirmationsSetting value="2" id="Add" />
181 85 </component>
182   - <component name="ProjectView">
183   - <navigator proportions="" version="1">
184   - <foldersAlwaysOnTop value="true" />
185   - </navigator>
186   - <panes>
187   - <pane id="PackagesPane" />
188   - <pane id="Scope" />
189   - <pane id="ProjectPane">
190   - <subPane>
191   - <expand>
192   - <path>
193   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
194   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
195   - </path>
196   - <path>
197   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
198   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
199   - <item name="src" type="462c0819:PsiDirectoryNode" />
200   - </path>
201   - <path>
202   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
203   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
204   - <item name="src" type="462c0819:PsiDirectoryNode" />
205   - <item name="main" type="462c0819:PsiDirectoryNode" />
206   - </path>
207   - <path>
208   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
209   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
210   - <item name="src" type="462c0819:PsiDirectoryNode" />
211   - <item name="main" type="462c0819:PsiDirectoryNode" />
212   - <item name="java" type="462c0819:PsiDirectoryNode" />
213   - </path>
214   - <path>
215   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
216   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
217   - <item name="src" type="462c0819:PsiDirectoryNode" />
218   - <item name="main" type="462c0819:PsiDirectoryNode" />
219   - <item name="java" type="462c0819:PsiDirectoryNode" />
220   - <item name="com" type="462c0819:PsiDirectoryNode" />
221   - </path>
222   - <path>
223   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
224   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
225   - <item name="src" type="462c0819:PsiDirectoryNode" />
226   - <item name="main" type="462c0819:PsiDirectoryNode" />
227   - <item name="java" type="462c0819:PsiDirectoryNode" />
228   - <item name="com" type="462c0819:PsiDirectoryNode" />
229   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
230   - </path>
231   - <path>
232   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
233   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
234   - <item name="src" type="462c0819:PsiDirectoryNode" />
235   - <item name="main" type="462c0819:PsiDirectoryNode" />
236   - <item name="java" type="462c0819:PsiDirectoryNode" />
237   - <item name="com" type="462c0819:PsiDirectoryNode" />
238   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
239   - <item name="pc" type="462c0819:PsiDirectoryNode" />
240   - </path>
241   - <path>
242   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
243   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
244   - <item name="src" type="462c0819:PsiDirectoryNode" />
245   - <item name="main" type="462c0819:PsiDirectoryNode" />
246   - <item name="java" type="462c0819:PsiDirectoryNode" />
247   - <item name="com" type="462c0819:PsiDirectoryNode" />
248   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
249   - <item name="pc" type="462c0819:PsiDirectoryNode" />
250   - <item name="receipt" type="462c0819:PsiDirectoryNode" />
251   - </path>
252   - <path>
253   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
254   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
255   - <item name="src" type="462c0819:PsiDirectoryNode" />
256   - <item name="main" type="462c0819:PsiDirectoryNode" />
257   - <item name="java" type="462c0819:PsiDirectoryNode" />
258   - <item name="com" type="462c0819:PsiDirectoryNode" />
259   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
260   - <item name="pc" type="462c0819:PsiDirectoryNode" />
261   - <item name="receipt" type="462c0819:PsiDirectoryNode" />
262   - <item name="receiptContainerHeader" type="462c0819:PsiDirectoryNode" />
263   - </path>
264   - <path>
265   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
266   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
267   - <item name="src" type="462c0819:PsiDirectoryNode" />
268   - <item name="main" type="462c0819:PsiDirectoryNode" />
269   - <item name="java" type="462c0819:PsiDirectoryNode" />
270   - <item name="com" type="462c0819:PsiDirectoryNode" />
271   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
272   - <item name="pc" type="462c0819:PsiDirectoryNode" />
273   - <item name="receipt" type="462c0819:PsiDirectoryNode" />
274   - <item name="receiptContainerHeader" type="462c0819:PsiDirectoryNode" />
275   - <item name="controller" type="462c0819:PsiDirectoryNode" />
276   - </path>
277   - <path>
278   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
279   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
280   - <item name="src" type="462c0819:PsiDirectoryNode" />
281   - <item name="main" type="462c0819:PsiDirectoryNode" />
282   - <item name="java" type="462c0819:PsiDirectoryNode" />
283   - <item name="com" type="462c0819:PsiDirectoryNode" />
284   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
285   - <item name="pc" type="462c0819:PsiDirectoryNode" />
286   - <item name="task" type="462c0819:PsiDirectoryNode" />
287   - </path>
288   - <path>
289   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
290   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
291   - <item name="src" type="462c0819:PsiDirectoryNode" />
292   - <item name="main" type="462c0819:PsiDirectoryNode" />
293   - <item name="java" type="462c0819:PsiDirectoryNode" />
294   - <item name="com" type="462c0819:PsiDirectoryNode" />
295   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
296   - <item name="pc" type="462c0819:PsiDirectoryNode" />
297   - <item name="task" type="462c0819:PsiDirectoryNode" />
298   - <item name="taskDetail" type="462c0819:PsiDirectoryNode" />
299   - </path>
300   - <path>
301   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
302   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
303   - <item name="src" type="462c0819:PsiDirectoryNode" />
304   - <item name="main" type="462c0819:PsiDirectoryNode" />
305   - <item name="java" type="462c0819:PsiDirectoryNode" />
306   - <item name="com" type="462c0819:PsiDirectoryNode" />
307   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
308   - <item name="pc" type="462c0819:PsiDirectoryNode" />
309   - <item name="task" type="462c0819:PsiDirectoryNode" />
310   - <item name="taskDetail" type="462c0819:PsiDirectoryNode" />
311   - <item name="domain" type="462c0819:PsiDirectoryNode" />
312   - </path>
313   - <path>
314   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
315   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
316   - <item name="src" type="462c0819:PsiDirectoryNode" />
317   - <item name="main" type="462c0819:PsiDirectoryNode" />
318   - <item name="java" type="462c0819:PsiDirectoryNode" />
319   - <item name="com" type="462c0819:PsiDirectoryNode" />
320   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
321   - <item name="pc" type="462c0819:PsiDirectoryNode" />
322   - <item name="task" type="462c0819:PsiDirectoryNode" />
323   - <item name="taskHeader" type="462c0819:PsiDirectoryNode" />
324   - </path>
325   - <path>
326   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
327   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
328   - <item name="src" type="462c0819:PsiDirectoryNode" />
329   - <item name="main" type="462c0819:PsiDirectoryNode" />
330   - <item name="java" type="462c0819:PsiDirectoryNode" />
331   - <item name="com" type="462c0819:PsiDirectoryNode" />
332   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
333   - <item name="pc" type="462c0819:PsiDirectoryNode" />
334   - <item name="task" type="462c0819:PsiDirectoryNode" />
335   - <item name="taskHeader" type="462c0819:PsiDirectoryNode" />
336   - <item name="controller" type="462c0819:PsiDirectoryNode" />
337   - </path>
338   - <path>
339   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
340   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
341   - <item name="src" type="462c0819:PsiDirectoryNode" />
342   - <item name="main" type="462c0819:PsiDirectoryNode" />
343   - <item name="java" type="462c0819:PsiDirectoryNode" />
344   - <item name="com" type="462c0819:PsiDirectoryNode" />
345   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
346   - <item name="pc" type="462c0819:PsiDirectoryNode" />
347   - <item name="task" type="462c0819:PsiDirectoryNode" />
348   - <item name="taskHeader" type="462c0819:PsiDirectoryNode" />
349   - <item name="service" type="462c0819:PsiDirectoryNode" />
350   - </path>
351   - <path>
352   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
353   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
354   - <item name="src" type="462c0819:PsiDirectoryNode" />
355   - <item name="main" type="462c0819:PsiDirectoryNode" />
356   - <item name="resources" type="462c0819:PsiDirectoryNode" />
357   - </path>
358   - <path>
359   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
360   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
361   - <item name="src" type="462c0819:PsiDirectoryNode" />
362   - <item name="main" type="462c0819:PsiDirectoryNode" />
363   - <item name="resources" type="462c0819:PsiDirectoryNode" />
364   - <item name="templates" type="462c0819:PsiDirectoryNode" />
365   - </path>
366   - <path>
367   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
368   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
369   - <item name="src" type="462c0819:PsiDirectoryNode" />
370   - <item name="main" type="462c0819:PsiDirectoryNode" />
371   - <item name="resources" type="462c0819:PsiDirectoryNode" />
372   - <item name="templates" type="462c0819:PsiDirectoryNode" />
373   - <item name="task" 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="resources" type="462c0819:PsiDirectoryNode" />
381   - <item name="templates" type="462c0819:PsiDirectoryNode" />
382   - <item name="task" type="462c0819:PsiDirectoryNode" />
383   - <item name="taskHeader" type="462c0819:PsiDirectoryNode" />
384   - </path>
385   - </expand>
386   - <select />
387   - </subPane>
388   - </pane>
389   - </panes>
390   - </component>
391 86 <component name="PropertiesComponent">
392 87 <property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
  88 + <property name="DatabaseDriversLRU" value="mysql" />
393 89 <property name="DefaultHtmlFileTemplate" value="HTML File" />
394 90 <property name="ExpandSpringBootJavaOptionsPanel" value="true" />
395   - <property name="JavaScriptWeakerCompletionTypeGuess" value="true" />
396 91 <property name="RequestMappingsPanelOrder0" value="0" />
397 92 <property name="RequestMappingsPanelOrder1" value="1" />
398 93 <property name="RequestMappingsPanelWidth0" value="75" />
... ... @@ -400,23 +95,22 @@
400 95 <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
401 96 <property name="WebServerToolWindowFactoryState" value="false" />
402 97 <property name="aspect.path.notification.shown" value="true" />
403   - <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1567684191959" />
404   - <property name="last_opened_file_path" value="$PROJECT_DIR$/../web_cms" />
405   - <property name="list.type.of.created.stylesheet" value="CSS" />
  98 + <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/resources/mybatis" />
406 99 <property name="node.js.detected.package.eslint" value="true" />
  100 + <property name="node.js.detected.package.tslint" value="true" />
407 101 <property name="node.js.path.for.package.eslint" value="project" />
408 102 <property name="node.js.path.for.package.tslint" value="project" />
409 103 <property name="node.js.selected.package.eslint" value="(autodetect)" />
410 104 <property name="node.js.selected.package.tslint" value="(autodetect)" />
411   - <property name="nodejs_package_manager_path" value="npm" />
412   - <property name="settings.editor.selected.configurable" value="Settings.JavaScript" />
  105 + <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
  106 + </component>
  107 + <component name="RecentsManager">
  108 + <key name="MoveFile.RECENT_KEYS">
  109 + <recent name="E:\code\wms2\src\main\resources\mybatis\general" />
  110 + <recent name="E:\code\wms2\src\main\resources\mybatis\config" />
  111 + </key>
413 112 </component>
414 113 <component name="RunDashboard">
415   - <option name="configurationTypes">
416   - <set>
417   - <option value="SpringBootApplicationConfigurationType" />
418   - </set>
419   - </option>
420 114 <option name="ruleStates">
421 115 <list>
422 116 <RuleState>
... ... @@ -427,7 +121,6 @@
427 121 </RuleState>
428 122 </list>
429 123 </option>
430   - <option name="contentProportion" value="0.056010928" />
431 124 </component>
432 125 <component name="RunManager">
433 126 <configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
... ... @@ -440,13 +133,25 @@
440 133 <option name="Make" enabled="true" />
441 134 </method>
442 135 </configuration>
  136 + <configuration default="true" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
  137 + <module name="WMSV1" />
  138 + <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" />
  139 + <option name="ALTERNATIVE_JRE_PATH" />
  140 + <method v="2">
  141 + <option name="Make" enabled="true" />
  142 + </method>
  143 + </configuration>
443 144 </component>
444 145 <component name="ServiceViewManager">
445 146 <option name="allServicesViewState">
446 147 <serviceView>
447   - <option name="contentProportion" value="0.17857143" />
448 148 <treeState>
449   - <expand />
  149 + <expand>
  150 + <path>
  151 + <item name="services root" type="e789fda9:ObjectUtils$Sentinel" />
  152 + <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@fe9f505" type="7427dc5b:ServiceModel$ServiceGroupNode" />
  153 + </path>
  154 + </expand>
450 155 <select />
451 156 </treeState>
452 157 </serviceView>
... ... @@ -457,127 +162,45 @@
457 162 </component>
458 163 <component name="TaskManager">
459 164 <task active="true" id="Default" summary="Default task">
460   - <changelist id="4d9bac65-d8f6-4ced-8855-0db48f39a5f2" name="Default Changelist" comment="" />
461   - <created>1566977677142</created>
  165 + <changelist id="29079676-ace5-434e-89a2-76a325e744a5" name="Default Changelist" comment="" />
  166 + <created>1565160110910</created>
462 167 <option name="number" value="Default" />
463 168 <option name="presentableId" value="Default" />
464   - <updated>1566977677142</updated>
465   - <workItem from="1566977678336" duration="306000" />
466   - <workItem from="1566978429560" duration="9246000" />
467   - <workItem from="1567038752582" duration="12361000" />
468   - <workItem from="1567057373550" duration="15293000" />
469   - <workItem from="1567125196953" duration="16752000" />
470   - <workItem from="1567643852002" duration="245000" />
  169 + <updated>1565160110910</updated>
  170 + <workItem from="1565160112236" duration="11971000" />
  171 + <workItem from="1565224833241" duration="14642000" />
  172 + <workItem from="1565242153135" duration="1476000" />
  173 + <workItem from="1565259513116" duration="148000" />
  174 + <workItem from="1565311988064" duration="7176000" />
  175 + <workItem from="1565328536669" duration="797000" />
  176 + <workItem from="1567937269900" duration="1065000" />
  177 + <workItem from="1567939943746" duration="865000" />
  178 + <workItem from="1567950680620" duration="3139000" />
471 179 </task>
472   - <task id="LOCAL-00001" summary="入库单添加时添加流程标记，审核入库单">
473   - <created>1566983055587</created>
  180 + <task id="LOCAL-00001" summary="添加库位、库位类型增删改查接口">
  181 + <created>1565226427512</created>
474 182 <option name="number" value="00001" />
475 183 <option name="presentableId" value="LOCAL-00001" />
476 184 <option name="project" value="LOCAL" />
477   - <updated>1566983055587</updated>
  185 + <updated>1565226427512</updated>
478 186 </task>
479   - <task id="LOCAL-00002" summary="添加入库单历史">
480   - <created>1566987011007</created>
  187 + <task id="LOCAL-00002" summary="添加入库、出库表实体类&#10;添加客户、供应商增删改查接口&#10;添加库位、容器、供应商页面">
  188 + <created>1565256884822</created>
481 189 <option name="number" value="00002" />
482 190 <option name="presentableId" value="LOCAL-00002" />
483 191 <option name="project" value="LOCAL" />
484   - <updated>1566987011007</updated>
  192 + <updated>1565256884822</updated>
485 193 </task>
486   - <task id="LOCAL-00003" summary="修复入库历史controller冲突">
487   - <created>1567039165473</created>
  194 + <task id="LOCAL-00003" summary="修改库区service">
  195 + <created>1565259481656</created>
488 196 <option name="number" value="00003" />
489 197 <option name="presentableId" value="LOCAL-00003" />
490 198 <option name="project" value="LOCAL" />
491   - <updated>1567039165473</updated>
492   - </task>
493   - <task id="LOCAL-00004" summary="添加物料类别">
494   - <created>1567047135508</created>
495   - <option name="number" value="00004" />
496   - <option name="presentableId" value="LOCAL-00004" />
497   - <option name="project" value="LOCAL" />
498   - <updated>1567047135508</updated>
499   - </task>
500   - <task id="LOCAL-00005" summary="添加系统参数配置">
501   - <created>1567065008303</created>
502   - <option name="number" value="00005" />
503   - <option name="presentableId" value="LOCAL-00005" />
504   - <option name="project" value="LOCAL" />
505   - <updated>1567065008303</updated>
506   - </task>
507   - <task id="LOCAL-00006" summary="删除入库单">
508   - <created>1567065196899</created>
509   - <option name="number" value="00006" />
510   - <option name="presentableId" value="LOCAL-00006" />
511   - <option name="project" value="LOCAL" />
512   - <updated>1567065196899</updated>
513   - </task>
514   - <task id="LOCAL-00007" summary="自动生成盘点首选项表">
515   - <created>1567068662565</created>
516   - <option name="number" value="00007" />
517   - <option name="presentableId" value="LOCAL-00007" />
518   - <option name="project" value="LOCAL" />
519   - <updated>1567068662565</updated>
520   - </task>
521   - <task id="LOCAL-00008" summary="添加逻辑删除配置">
522   - <created>1567069834248</created>
523   - <option name="number" value="00008" />
524   - <option name="presentableId" value="LOCAL-00008" />
525   - <option name="project" value="LOCAL" />
526   - <updated>1567069834248</updated>
527   - </task>
528   - <task id="LOCAL-00009" summary="出库任务完成。新增allocationId字段">
529   - <created>1567672551433</created>
530   - <option name="number" value="00009" />
531   - <option name="presentableId" value="LOCAL-00009" />
532   - <option name="project" value="LOCAL" />
533   - <updated>1567672551433</updated>
  199 + <updated>1565259481656</updated>
534 200 </task>
535   - <option name="localTasksCounter" value="10" />
  201 + <option name="localTasksCounter" value="4" />
536 202 <servers />
537 203 </component>
538   - <component name="TimeTrackingManager">
539   - <option name="totallyTimeSpent" value="22177000" />
540   - </component>
541   - <component name="ToolWindowManager">
542   - <frame x="-7" y="-7" width="1550" height="838" extended-state="7" />
543   - <editor active="true" />
544   - <layout>
545   - <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.28016084" />
546   - <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
547   - <window_info id="Designer" order="2" />
548   - <window_info id="Image Layers" order="3" />
549   - <window_info id="Capture Tool" order="4" />
550   - <window_info id="UI Designer" order="5" />
551   - <window_info id="Favorites" order="6" side_tool="true" />
552   - <window_info id="Web" order="7" side_tool="true" />
553   - <window_info anchor="bottom" id="Message" order="0" />
554   - <window_info anchor="bottom" id="Find" order="1" />
555   - <window_info anchor="bottom" id="Run" order="2" />
556   - <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
557   - <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
558   - <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
559   - <window_info anchor="bottom" id="TODO" order="6" />
560   - <window_info anchor="bottom" id="Spring" order="7" />
561   - <window_info anchor="bottom" id="Terminal" order="8" />
562   - <window_info anchor="bottom" id="Docker" order="9" show_stripe_button="false" />
563   - <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.5013405" side_tool="true" weight="0.2719547" />
564   - <window_info anchor="bottom" id="Messages" order="11" weight="0.18696883" />
565   - <window_info anchor="bottom" id="Java Enterprise" order="12" />
566   - <window_info anchor="bottom" id="Database Changes" order="13" weight="0.3286119" />
567   - <window_info anchor="bottom" id="Version Control" order="14" weight="0.3286119" />
568   - <window_info anchor="bottom" id="Run Dashboard" order="15" sideWeight="0.49865952" weight="0.2719547" />
569   - <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
570   - <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
571   - <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
572   - <window_info anchor="right" id="Maven" order="3" />
573   - <window_info anchor="right" id="Palette" order="4" />
574   - <window_info anchor="right" id="Capture Analysis" order="5" />
575   - <window_info anchor="right" id="Database" order="6" />
576   - <window_info anchor="right" id="Palette&#9;" order="7" />
577   - <window_info anchor="right" id="Theme Preview" order="8" />
578   - <window_info anchor="right" id="Bean Validation" order="9" />
579   - </layout>
580   - </component>
581 204 <component name="TypeScriptGeneratedFilesManager">
582 205 <option name="version" value="1" />
583 206 </component>
... ... @@ -587,251 +210,18 @@
587 210 <entry key="MAIN">
588 211 <value>
589 212 <State>
590   - <option name="RECENTLY_FILTERED_USER_GROUPS">
591   - <collection />
592   - </option>
593   - <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
594   - <collection />
595   - </option>
596 213 <option name="COLUMN_ORDER" />
597 214 </State>
598 215 </value>
599 216 </entry>
600 217 </map>
601 218 </option>
602   - <option name="RECENT_FILTERS">
603   - <map>
604   - <entry key="Branch">
605   - <value>
606   - <list />
607   - </value>
608   - </entry>
609   - <entry key="User">
610   - <value>
611   - <list />
612   - </value>
613   - </entry>
614   - </map>
615   - </option>
616 219 </component>
617 220 <component name="VcsManagerConfiguration">
618   - <MESSAGE value="盘点明细页面" />
619   - <MESSAGE value="入库单添加时添加流程标记，审核入库单" />
620   - <MESSAGE value="添加入库单历史" />
621   - <MESSAGE value="修复入库历史controller冲突" />
622   - <MESSAGE value="添加物料类别" />
623   - <MESSAGE value="添加系统参数配置" />
624   - <MESSAGE value="删除入库单" />
625   - <MESSAGE value="自动生成盘点首选项表" />
626   - <MESSAGE value="添加逻辑删除配置" />
627   - <MESSAGE value="库存和任务移库相关" />
628   - <MESSAGE value="库存移库生成和完成逻辑" />
629   - <MESSAGE value="xml" />
630   - <MESSAGE value="出库任务完成。新增allocationId字段" />
631   - <option name="LAST_COMMIT_MESSAGE" value="出库任务完成。新增allocationId字段" />
632   - </component>
633   - <component name="XDebuggerManager">
634   - <breakpoint-manager>
635   - <breakpoints>
636   - <line-breakpoint type="java-line">
637   - <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/mapper/CycleCountHeaderMapper.java</url>
638   - <line>5</line>
639   - <properties />
640   - <option name="timeStamp" value="1" />
641   - </line-breakpoint>
642   - <line-breakpoint type="java-line">
643   - <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/statusFlow/controller/StatusFlowDetailController.java</url>
644   - <line>60</line>
645   - <properties />
646   - <option name="timeStamp" value="4" />
647   - </line-breakpoint>
648   - <line-breakpoint enabled="true" type="java-line">
649   - <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeaderHistory/service/ReceiptHeaderHistoryService.java</url>
650   - <line>49</line>
651   - <properties />
652   - <option name="timeStamp" value="16" />
653   - </line-breakpoint>
654   - <line-breakpoint enabled="true" type="java-line">
655   - <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeader/service/ReceiptHeaderService.java</url>
656   - <line>92</line>
657   - <properties />
658   - <option name="timeStamp" value="24" />
659   - </line-breakpoint>
660   - <line-breakpoint enabled="true" type="java-line">
661   - <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/containerType/service/ContainerTypeServiceImpl.java</url>
662   - <line>31</line>
663   - <properties />
664   - <option name="timeStamp" value="26" />
665   - </line-breakpoint>
666   - <line-breakpoint enabled="true" type="java-line">
667   - <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java</url>
668   - <line>48</line>
669   - <properties />
670   - <option name="timeStamp" value="37" />
671   - </line-breakpoint>
672   - </breakpoints>
673   - </breakpoint-manager>
674   - <watches-manager>
675   - <configuration name="SpringBootApplicationConfigurationType">
676   - <watch expression="DataUtils.getInteger(map.get(&quot;receiptId&quot;))" language="JAVA" />
677   - </configuration>
678   - </watches-manager>
679   - </component>
680   - <component name="debuggerHistoryManager">
681   - <expressions id="watch">
682   - <expression>
683   - <expression-string>DataUtils.getInteger(map.get(&quot;receiptId&quot;))</expression-string>
684   - <language-id>JAVA</language-id>
685   - <evaluation-mode>EXPRESSION</evaluation-mode>
686   - </expression>
687   - </expressions>
688   - </component>
689   - <component name="editorHistoryManager">
690   - <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">
691   - <provider selected="true" editor-type-id="text-editor">
692   - <state relative-caret-position="149">
693   - <caret line="53" column="12" selection-start-line="53" selection-start-column="12" selection-end-line="53" selection-end-column="12" />
694   - </state>
695   - </provider>
696   - </entry>
697   - <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/task/TaskHeaderMapper.xml">
698   - <provider selected="true" editor-type-id="text-editor">
699   - <state relative-caret-position="146">
700   - <caret line="45" column="31" selection-start-line="45" selection-start-column="16" selection-end-line="45" selection-end-column="31" />
701   - </state>
702   - </provider>
703   - </entry>
704   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/task/task/task.html">
705   - <provider selected="true" editor-type-id="text-editor">
706   - <state relative-caret-position="1444">
707   - <caret line="76" column="89" selection-start-line="76" selection-start-column="70" selection-end-line="76" selection-end-column="89" />
708   - </state>
709   - </provider>
710   - </entry>
711   - <entry file="file://$PROJECT_DIR$/pom.xml">
712   - <provider selected="true" editor-type-id="text-editor">
713   - <state relative-caret-position="532">
714   - <caret line="28" column="8" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="51" />
715   - </state>
716   - </provider>
717   - </entry>
718   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java">
719   - <provider selected="true" editor-type-id="text-editor">
720   - <state relative-caret-position="-66">
721   - <caret line="238" column="16" selection-start-line="238" selection-start-column="16" selection-end-line="238" selection-end-column="16" />
722   - </state>
723   - </provider>
724   - </entry>
725   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailService.java">
726   - <provider selected="true" editor-type-id="text-editor">
727   - <state relative-caret-position="209">
728   - <caret line="13" column="9" selection-start-line="13" selection-start-column="9" selection-end-line="13" selection-end-column="9" />
729   - </state>
730   - </provider>
731   - </entry>
732   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/taskHeader.html">
733   - <provider selected="true" editor-type-id="text-editor">
734   - <state relative-caret-position="214">
735   - <caret line="236" column="64" selection-start-line="236" selection-start-column="64" selection-end-line="236" selection-end-column="64" />
736   - <folding>
737   - <element signature="n#style#0;n#i#0;n#a#0;n#!!top" expanded="true" />
738   - </folding>
739   - </state>
740   - </provider>
741   - </entry>
742   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/mapper/TaskHeaderMapper.java">
743   - <provider selected="true" editor-type-id="text-editor">
744   - <state relative-caret-position="114">
745   - <caret line="11" column="30" selection-start-line="11" selection-start-column="30" selection-end-line="11" selection-end-column="30" />
746   - </state>
747   - </provider>
748   - </entry>
749   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/controller/ReceiptContainerHeaderController.java">
750   - <provider selected="true" editor-type-id="text-editor">
751   - <state relative-caret-position="323">
752   - <caret line="136" column="42" selection-start-line="136" selection-start-column="42" selection-end-line="136" selection-end-column="42" />
753   - </state>
754   - </provider>
755   - </entry>
756   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java">
757   - <provider selected="true" editor-type-id="text-editor">
758   - <state relative-caret-position="542">
759   - <caret line="117" column="45" lean-forward="true" selection-start-line="117" selection-start-column="45" selection-end-line="117" selection-end-column="45" />
760   - </state>
761   - </provider>
762   - </entry>
763   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java">
764   - <provider selected="true" editor-type-id="text-editor">
765   - <state relative-caret-position="209">
766   - <caret line="18" column="15" selection-start-line="18" selection-start-column="15" selection-end-line="18" selection-end-column="15" />
767   - </state>
768   - </provider>
769   - </entry>
770   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/domain/InventoryTransaction.java">
771   - <provider selected="true" editor-type-id="text-editor">
772   - <state relative-caret-position="226">
773   - <caret line="95" column="19" selection-start-line="95" selection-start-column="12" selection-end-line="95" selection-end-column="19" />
774   - </state>
775   - </provider>
776   - </entry>
777   - <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/config/ContainerMapper.xml">
778   - <provider selected="true" editor-type-id="text-editor">
779   - <state relative-caret-position="490">
780   - <caret line="50" column="4" selection-start-line="50" selection-start-column="4" selection-end-line="50" selection-end-column="4" />
781   - </state>
782   - </provider>
783   - </entry>
784   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/mapper/ContainerMapper.java">
785   - <provider selected="true" editor-type-id="text-editor">
786   - <state relative-caret-position="171">
787   - <caret line="14" column="9" selection-start-line="14" selection-start-column="9" selection-end-line="14" selection-end-column="9" />
788   - </state>
789   - </provider>
790   - </entry>
791   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/service/ContainerServiceImpl.java">
792   - <provider selected="true" editor-type-id="text-editor">
793   - <state relative-caret-position="471">
794   - <caret line="127" column="47" lean-forward="true" selection-start-line="127" selection-start-column="47" selection-end-line="127" selection-end-column="47" />
795   - </state>
796   - </provider>
797   - </entry>
798   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/service/ContainerService.java">
799   - <provider selected="true" editor-type-id="text-editor">
800   - <state relative-caret-position="228">
801   - <caret line="17" column="9" selection-start-line="17" selection-start-column="9" selection-end-line="17" selection-end-column="9" />
802   - </state>
803   - </provider>
804   - </entry>
805   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskDetail/domain/TaskDetail.java">
806   - <provider selected="true" editor-type-id="text-editor">
807   - <state relative-caret-position="226">
808   - <caret line="65" column="19" selection-start-line="65" selection-start-column="19" selection-end-line="65" selection-end-column="19" />
809   - </state>
810   - </provider>
811   - </entry>
812   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentHeader/service/ShipmentHeaderService.java">
813   - <provider selected="true" editor-type-id="text-editor">
814   - <state relative-caret-position="266">
815   - <caret line="18" column="15" selection-start-line="18" selection-start-column="15" selection-end-line="18" selection-end-column="15" />
816   - </state>
817   - </provider>
818   - </entry>
819   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentHeader/service/ShipmentHeaderServiceImpl.java">
820   - <provider selected="true" editor-type-id="text-editor">
821   - <state relative-caret-position="340">
822   - <caret line="112" column="26" selection-start-line="112" selection-start-column="16" selection-end-line="112" selection-end-column="26" />
823   - </state>
824   - </provider>
825   - </entry>
826   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java">
827   - <provider selected="true" editor-type-id="text-editor">
828   - <state relative-caret-position="376">
829   - <caret line="1089" column="13" lean-forward="true" selection-start-line="1089" selection-start-column="13" selection-end-line="1089" selection-end-column="13" />
830   - <folding>
831   - <element signature="imports" expanded="true" />
832   - </folding>
833   - </state>
834   - </provider>
835   - </entry>
  221 + <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
  222 + <MESSAGE value="添加库位、库位类型增删改查接口" />
  223 + <MESSAGE value="添加入库、出库表实体类&#10;添加客户、供应商增删改查接口&#10;添加库位、容器、供应商页面" />
  224 + <MESSAGE value="修改库区service" />
  225 + <option name="LAST_COMMIT_MESSAGE" value="修改库区service" />
836 226 </component>
837 227 </project>
838 228 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/check/checkDetail/controller/CheckDetailController.java 0 → 100644
  View file @7b1a6e3
  1 +package com.huaheng.pc.check.checkDetail.controller;
  2 +
  3 +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
  4 +import com.baomidou.mybatisplus.core.metadata.IPage;
  5 +import com.baomidou.mybatisplus.core.toolkit.Wrappers;
  6 +import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
  7 +import com.huaheng.common.support.Convert;
  8 +import com.huaheng.common.utils.StringUtils;
  9 +import com.huaheng.common.utils.security.ShiroUtils;
  10 +import com.huaheng.framework.aspectj.lang.annotation.Log;
  11 +import com.huaheng.framework.aspectj.lang.constant.BusinessType;
  12 +import com.huaheng.framework.web.controller.BaseController;
  13 +import com.huaheng.framework.web.domain.AjaxResult;
  14 +import com.huaheng.framework.web.page.PageDomain;
  15 +import com.huaheng.framework.web.page.TableDataInfo;
  16 +import com.huaheng.framework.web.page.TableSupport;
  17 +import com.huaheng.pc.check.checkDetail.domain.CheckDetail;
  18 +import com.huaheng.pc.check.checkDetail.service.CheckDetailService;
  19 +import io.swagger.annotations.ApiOperation;
  20 +import io.swagger.annotations.ApiParam;
  21 +import org.apache.shiro.authz.annotation.RequiresPermissions;
  22 +import org.springframework.stereotype.Controller;
  23 +import org.springframework.ui.ModelMap;
  24 +import org.springframework.web.bind.annotation.*;
  25 +
  26 +import javax.annotation.Resource;
  27 +import java.util.Arrays;
  28 +import java.util.List;
  29 +
  30 +/**
  31 + * Created by mahuandong Cotter on 2019/9/8.
  32 + */
  33 +@Controller
  34 +@RequestMapping("/check/checkDetail")
  35 +public class CheckDetailController extends BaseController {
  36 +
  37 + @Resource
  38 + private CheckDetailService checkDetailService;
  39 +
  40 + private String prefix = "check/checkDetail";
  41 +
  42 + @RequiresPermissions("check:checkDetail:view")
  43 + @GetMapping("{id}")
  44 + public String checkingRegister(@PathVariable("id")Integer id, ModelMap modelMap) {
  45 + modelMap.put("id",id);
  46 + return prefix + "/checkDetail";
  47 + }
  48 +
  49 + /**
  50 + * 查询质检详情
  51 + */
  52 + @ApiOperation(value="查看质检详情", notes="根据详情表id获取质检详情", httpMethod = "POST")
  53 + @RequiresPermissions("che:receiptDetail:list")
  54 + @Log(title = "质检-质检详情", operating = "查看质检详情", action = BusinessType.GRANT)
  55 + @PostMapping("/list/{id}")
  56 + @ResponseBody
  57 + public TableDataInfo list(@ApiParam(name="receiptDetail",value="入库详情") @PathVariable("id")Integer checkDetailId) {
  58 + LambdaQueryWrapper<CheckDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
  59 + PageDomain pageDomain = TableSupport.buildPageRequest();
  60 + Integer pageNum = pageDomain.getPageNum();
  61 + Integer pageSize = pageDomain.getPageSize();
  62 + lambdaQueryWrapper.eq(CheckDetail::getCheckHeaderId, checkDetailId);
  63 +
  64 + if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
  65 + /*使用分页查询*/
  66 + Page<CheckDetail> page = new Page<>(pageNum, pageSize);
  67 + IPage<CheckDetail> iPage = checkDetailService.page(page, lambdaQueryWrapper);
  68 + return getMpDataTable(iPage.getRecords(), iPage.getTotal());
  69 + } else {
  70 + List<CheckDetail> list = checkDetailService.list(lambdaQueryWrapper);
  71 + return getDataTable(list);
  72 + }
  73 + }
  74 +
  75 + /**
  76 + * 新增质检详情
  77 + */
  78 + @GetMapping("/add")
  79 + public String add() {
  80 + return prefix + "/add";
  81 + }
  82 +
  83 + /**
  84 + * 新增保存质检详情
  85 + */
  86 + @ApiOperation(value="新增质检详情 ", notes="新增质检详情 ", httpMethod = "POST")
  87 + @RequiresPermissions("check:checkDetail:add")
  88 + @Log(title = "质检-质检详情 ",operating = "新增质检详情 ", action = BusinessType.INSERT)
  89 + @PostMapping("/add")
  90 + @ResponseBody
  91 + public AjaxResult addSave(CheckDetail checkDetail) {
  92 + return toAjax(checkDetailService.save(checkDetail));
  93 + }
  94 +
  95 + /**
  96 + * 修改质检详情
  97 + */
  98 + @GetMapping("/edit/{id}")
  99 + public String edit(@PathVariable("id") Integer id, ModelMap mmap) {
  100 + CheckDetail checkDetail = checkDetailService.getById(id);
  101 + mmap.put("checkDetail", checkDetail);
  102 + return prefix + "/edit";
  103 + }
  104 +
  105 + /**
  106 + * 修改保存质检详情
  107 + */
  108 + @ApiOperation(value="修改质检详情", notes="修改质检详情", httpMethod = "POST")
  109 + @RequiresPermissions("check:checkDetail:edit")
  110 + @Log(title = "质检-质检详情 ",operating = "修改质检详情 ", action = BusinessType.UPDATE)
  111 + @PostMapping("/edit")
  112 + @ResponseBody
  113 + public AjaxResult editSave(CheckDetail checkDetail) {
  114 + checkDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
  115 + return toAjax(checkDetailService.updateById(checkDetail));
  116 + }
  117 +
  118 + @ApiOperation(value="删除质检详情", notes="删除质检详情", httpMethod = "POST")
  119 + @RequiresPermissions("check:checkDetail:remove")
  120 + @Log(title = "质检-质检详情 ",operating = "质检详情删除", action = BusinessType.DELETE)
  121 + @PostMapping("remove")
  122 + public AjaxResult remove(String ids) {
  123 + if (StringUtils.isEmpty(ids)){
  124 + return AjaxResult.error("id不能为空");
  125 + }
  126 +
  127 + List<Integer> idList = Arrays.asList(Convert.toIntArray(ids));
  128 + return toAjax(checkDetailService.removeByIds(idList));
  129 + }
  130 +}
... ...
src/main/java/com/huaheng/pc/check/checkDetail/domain/CheckDetail.java
  View file @7b1a6e3
... ... @@ -116,8 +116,11 @@ public class CheckDetail implements Serializable {
116 116 @ApiModelProperty(value="物料规格")
117 117 private String materialSpec;
118 118  
  119 + /**
  120 + * 物料单位
  121 + */
119 122 @TableField(value = "materialUnit")
120   - @ApiModelProperty(value="null")
  123 + @ApiModelProperty(value="物料单位")
121 124 private String materialUnit;
122 125  
123 126 /**
... ...
src/main/java/com/huaheng/pc/check/checkHeader/controller/CheckHeaderController.java 0 → 100644
  View file @7b1a6e3
  1 +package com.huaheng.pc.check.checkHeader.controller;
  2 +
  3 +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
  4 +import com.baomidou.mybatisplus.core.metadata.IPage;
  5 +import com.baomidou.mybatisplus.core.toolkit.Wrappers;
  6 +import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
  7 +import com.huaheng.common.support.Convert;
  8 +import com.huaheng.common.utils.StringUtils;
  9 +import com.huaheng.common.utils.security.ShiroUtils;
  10 +import com.huaheng.framework.aspectj.lang.annotation.Log;
  11 +import com.huaheng.framework.aspectj.lang.constant.BusinessType;
  12 +import com.huaheng.framework.web.controller.BaseController;
  13 +import com.huaheng.framework.web.domain.AjaxResult;
  14 +import com.huaheng.framework.web.page.PageDomain;
  15 +import com.huaheng.framework.web.page.TableDataInfo;
  16 +import com.huaheng.framework.web.page.TableSupport;
  17 +import com.huaheng.pc.check.checkHeader.domain.CheckHeader;
  18 +import com.huaheng.pc.check.checkHeader.service.CheckHeaderService;
  19 +import com.huaheng.pc.check.checkingRegister.domain.CheckingRegister;
  20 +import io.swagger.annotations.Api;
  21 +import io.swagger.annotations.ApiOperation;
  22 +import io.swagger.annotations.ApiParam;
  23 +import org.apache.shiro.authz.annotation.RequiresPermissions;
  24 +import org.springframework.stereotype.Controller;
  25 +import org.springframework.ui.ModelMap;
  26 +import org.springframework.web.bind.annotation.*;
  27 +
  28 +import javax.annotation.Resource;
  29 +import java.util.Arrays;
  30 +import java.util.List;
  31 +
  32 +/**
  33 + * Created by mahuandong Cotter on 2019/9/6.
  34 + */
  35 +@Api(tags="质检单")
  36 +@Controller
  37 +@RequestMapping("/check/checkHeader")
  38 +public class CheckHeaderController extends BaseController {
  39 +
  40 + @Resource
  41 + private CheckHeaderService checkHeaderService;
  42 +
  43 + private String prefix = "check/checkHeader";
  44 +
  45 + @RequiresPermissions("check:checkHeader:view")
  46 + @GetMapping()
  47 + public String checkingRegister()
  48 + {
  49 + return prefix + "/checkHeader";
  50 + }
  51 +
  52 + /**
  53 + * 查询质检头
  54 + */
  55 + @RequiresPermissions("check:checkHeader:list")
  56 + @Log(title = "质检-质检头表", operating = "查看质检头表", action = BusinessType.GRANT)
  57 + @PostMapping("/list")
  58 + @ResponseBody
  59 + public TableDataInfo list(@ApiParam(name="checkHeader",value="质检头表") CheckHeader checkHeader,
  60 + @ApiParam(name = "createdBegin", value = "起止时间") String createdBegin,
  61 + @ApiParam(name = "createdEnd", value = "结束时间") String createdEnd) {
  62 + LambdaQueryWrapper<CheckHeader> lambdaQueryWrapper = Wrappers.lambdaQuery();
  63 + PageDomain pageDomain = TableSupport.buildPageRequest();
  64 + Integer pageNum = pageDomain.getPageNum();
  65 + Integer pageSize = pageDomain.getPageSize();
  66 +
  67 + lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin), CheckHeader::getCreated, createdBegin)
  68 + .le(StringUtils.isNotEmpty(createdEnd), CheckHeader::getCreated, createdEnd)
  69 + .eq(CheckHeader::getWarehouseCode, ShiroUtils.getWarehouseCode())
  70 + .eq(StringUtils.isNotNull(checkHeader.getCode()), CheckHeader::getCode, checkHeader.getCode())
  71 + .eq(StringUtils.isNotEmpty(checkHeader.getReferCode()), CheckHeader::getReferCode, checkHeader.getReferCode())
  72 + .eq(StringUtils.isNotEmpty(checkHeader.getStatus()), CheckHeader::getStatus, checkHeader.getStatus())
  73 + .eq(StringUtils.isNotEmpty(checkHeader.getType()), CheckHeader::getType, checkHeader.getType());
  74 +
  75 + if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
  76 + // 使用分页查询
  77 + Page<CheckHeader> page = new Page<>(pageNum, pageSize);
  78 + IPage<CheckHeader> iPage = checkHeaderService.page(page, lambdaQueryWrapper);
  79 + return getMpDataTable(iPage.getRecords(), iPage.getTotal());
  80 + } else {
  81 + List<CheckHeader> list = checkHeaderService.list(lambdaQueryWrapper);
  82 + return getDataTable(list);
  83 + }
  84 + }
  85 +
  86 + /**
  87 + * 新增质检头表
  88 + */
  89 + @GetMapping("/add")
  90 + public String add() {
  91 + return prefix + "/add";
  92 + }
  93 +
  94 + /**
  95 + * 新增保存质检头
  96 + */
  97 + @ApiOperation(value="新增质检头 ", notes="新增质检头 ", httpMethod = "POST")
  98 + @RequiresPermissions("check:checkHeader:add")
  99 + @Log(title = "质检-质检头 ",operating = "新增质检头 ", action = BusinessType.INSERT)
  100 + @PostMapping("/add")
  101 + @ResponseBody
  102 + public AjaxResult addSave(CheckHeader checkHeader) {
  103 + return toAjax(checkHeaderService.save(checkHeader));
  104 + }
  105 +
  106 + /**
  107 + * 修改质检头表
  108 + */
  109 + @GetMapping("/edit/{id}")
  110 + public String edit(@PathVariable("id") Integer id, ModelMap mmap) {
  111 + CheckHeader checkHeader = checkHeaderService.getById(id);
  112 + mmap.put("checkHeader", checkHeader);
  113 + return prefix + "/edit";
  114 + }
  115 +
  116 + /**
  117 + * 修改保存质检表
  118 + */
  119 + @ApiOperation(value="修改质检头", notes="修改质检头", httpMethod = "POST")
  120 + @RequiresPermissions("check:checkHeader:edit")
  121 + @Log(title = "质检-质检头 ",operating = "修改质检头 ", action = BusinessType.UPDATE)
  122 + @PostMapping("/edit")
  123 + @ResponseBody
  124 + public AjaxResult editSave(CheckHeader checkHeader) {
  125 + checkHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
  126 + return toAjax(checkHeaderService.updateById(checkHeader));
  127 + }
  128 +
  129 + /**
  130 + * 删除质检头
  131 + */
  132 + @ApiOperation(value="删除质检头", notes="删除质检头", httpMethod = "POST")
  133 + @RequiresPermissions("check:checkHeader:remove")
  134 + @Log(title = "质检-质检头 ",operating = "质检头删除", action = BusinessType.DELETE)
  135 + @PostMapping("/remove")
  136 + @ResponseBody
  137 + public AjaxResult remove(@ApiParam(name = "id", value = "质检头表id字符串")String ids){
  138 + if (StringUtils.isNull(ids)){
  139 + return AjaxResult.error("id为空");
  140 + }
  141 + return toAjax(checkHeaderService.removeByIds(Arrays.asList(Convert.toIntArray(ids))));
  142 + }
  143 +}
... ...
src/main/java/com/huaheng/pc/check/checkingRegister/controller/CheckingRegisterController.java 0 → 100644
  View file @7b1a6e3
  1 +package com.huaheng.pc.check.checkingRegister.controller;
  2 +
  3 +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
  4 +import com.baomidou.mybatisplus.core.metadata.IPage;
  5 +import com.baomidou.mybatisplus.core.toolkit.Wrappers;
  6 +import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
  7 +import com.fasterxml.jackson.databind.ser.Serializers;
  8 +import com.huaheng.common.support.Convert;
  9 +import com.huaheng.common.utils.StringUtils;
  10 +import com.huaheng.common.utils.security.ShiroUtils;
  11 +import com.huaheng.framework.aspectj.lang.annotation.Log;
  12 +import com.huaheng.framework.aspectj.lang.constant.BusinessType;
  13 +import com.huaheng.framework.web.controller.BaseController;
  14 +import com.huaheng.framework.web.domain.AjaxResult;
  15 +import com.huaheng.framework.web.page.PageDomain;
  16 +import com.huaheng.framework.web.page.TableDataInfo;
  17 +import com.huaheng.framework.web.page.TableSupport;
  18 +import com.huaheng.pc.check.checkingRegister.domain.CheckingRegister;
  19 +import com.huaheng.pc.check.checkingRegister.service.CheckingRegisterService;
  20 +import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
  21 +import io.swagger.annotations.Api;
  22 +import io.swagger.annotations.ApiOperation;
  23 +import io.swagger.annotations.ApiParam;
  24 +import org.apache.shiro.authz.annotation.RequiresPermissions;
  25 +import org.springframework.stereotype.Controller;
  26 +import org.springframework.ui.ModelMap;
  27 +import org.springframework.web.bind.annotation.*;
  28 +
  29 +import javax.annotation.Resource;
  30 +import java.util.Arrays;
  31 +import java.util.List;
  32 +
  33 +/**
  34 + * 质检报告
  35 + * Created by mahuandong Cotter on 2019/9/6.
  36 + */
  37 +@Api(tags = "质检报告")
  38 +@Controller
  39 +@RequestMapping("/check/checkingRegister")
  40 +public class CheckingRegisterController extends BaseController {
  41 +
  42 + @Resource
  43 + private CheckingRegisterService checkingRegisterService;
  44 +
  45 + private String prefix = "check/checkingRegister";
  46 +
  47 + @RequiresPermissions("check:checkingRegister:view")
  48 + @GetMapping()
  49 + public String checkingRegister()
  50 + {
  51 + return prefix + "/checkingRegister";
  52 + }
  53 +
  54 + /**
  55 + * 查询质检报告
  56 + */
  57 + @RequiresPermissions("check:checkingRegister:list")
  58 + @Log(title = "质检-质检报告头表", operating = "查看质检报告列表", action = BusinessType.GRANT)
  59 + @PostMapping("/list")
  60 + @ResponseBody
  61 + public TableDataInfo list(@ApiParam(name="receiptDetail",value="质检头表") CheckingRegister checkingRegister,
  62 + @ApiParam(name = "createdBegin", value = "起止时间") String createdBegin,
  63 + @ApiParam(name = "createdEnd", value = "结束时间") String createdEnd) {
  64 + LambdaQueryWrapper<CheckingRegister> lambdaQueryWrapper = Wrappers.lambdaQuery();
  65 + PageDomain pageDomain = TableSupport.buildPageRequest();
  66 + Integer pageNum = pageDomain.getPageNum();
  67 + Integer pageSize = pageDomain.getPageSize();
  68 +
  69 + lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin), CheckingRegister::getCreated, createdBegin)
  70 + .le(StringUtils.isNotEmpty(createdEnd), CheckingRegister::getCreated, createdEnd)
  71 + .in(CheckingRegister::getCompanyCode, ShiroUtils.getCompanyCodeList())
  72 + .eq(CheckingRegister::getWarehouseCode, ShiroUtils.getWarehouseCode())
  73 + .eq(StringUtils.isNotNull(checkingRegister.getReceiptDetailId()),
  74 + CheckingRegister::getReceiptDetailId, checkingRegister.getReceiptDetailId())
  75 + .eq(StringUtils.isNotEmpty(checkingRegister.getReceiptCode()),
  76 + CheckingRegister::getReceiptCode, checkingRegister.getReceiptCode())
  77 + .eq(StringUtils.isNotEmpty(checkingRegister.getReferCode()),
  78 + CheckingRegister::getReceiptCode, checkingRegister.getReceiptCode())
  79 + .eq(StringUtils.isNotNull(checkingRegister.getReferLineId()),
  80 + CheckingRegister::getReferLineId, checkingRegister.getReferLineId())
  81 + .eq(StringUtils.isNotEmpty(checkingRegister.getReferPlatform()),
  82 + CheckingRegister::getReferPlatform, checkingRegister.getReferPlatform())
  83 + .eq(StringUtils.isNotEmpty(checkingRegister.getMaterialCode()),
  84 + CheckingRegister::getMaterialCode, checkingRegister.getMaterialCode())
  85 + .eq(StringUtils.isNotEmpty(checkingRegister.getMaterialName()),
  86 + CheckingRegister::getMaterialName, checkingRegister.getMaterialName())
  87 + .eq(StringUtils.isNotEmpty(checkingRegister.getInventorySts()),
  88 + CheckingRegister::getInventorySts, checkingRegister.getInventorySts())
  89 + .eq(StringUtils.isNotEmpty(checkingRegister.getCheckBy()),
  90 + CheckingRegister::getCheckAt, checkingRegister.getCheckAt())
  91 + .orderByDesc(CheckingRegister::getReceiptDetailId);
  92 +
  93 + if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
  94 + // 使用分页查询
  95 + Page<CheckingRegister> page = new Page<>(pageNum, pageSize);
  96 + IPage<CheckingRegister> iPage = checkingRegisterService.page(page, lambdaQueryWrapper);
  97 + return getMpDataTable(iPage.getRecords(), iPage.getTotal());
  98 + } else {
  99 + List<CheckingRegister> list = checkingRegisterService.list(lambdaQueryWrapper);
  100 + return getDataTable(list);
  101 + }
  102 + }
  103 +
  104 + /**
  105 + * 新增质检报告
  106 + */
  107 + @GetMapping("/add")
  108 + public String add() {
  109 + return prefix + "/add";
  110 + }
  111 +
  112 + /**
  113 + * 新增保存质检报告
  114 + */
  115 + @ApiOperation(value="新增质检报告 ", notes="新增质检报告 ", httpMethod = "POST")
  116 + @RequiresPermissions("check:checkingRegister:add")
  117 + @Log(title = "质检-质检报告 ",operating = "新增质检报告 ", action = BusinessType.INSERT)
  118 + @PostMapping("/add")
  119 + @ResponseBody
  120 + public AjaxResult addSave(CheckingRegister checkingRegister) {
  121 + return toAjax(checkingRegisterService.save(checkingRegister));
  122 + }
  123 +
  124 + /**
  125 + * 修改质检报告
  126 + */
  127 + @GetMapping("/edit/{id}")
  128 + public String edit(@PathVariable("id") Integer id, ModelMap mmap) {
  129 + CheckingRegister checkingRegister = checkingRegisterService.getById(id);
  130 + mmap.put("checkingRegister", checkingRegister);
  131 + return prefix + "/edit";
  132 + }
  133 +
  134 + /**
  135 + * 修改保存质检报告
  136 + */
  137 + @ApiOperation(value="修改质检报告", notes="修改质检报告", httpMethod = "POST")
  138 + @RequiresPermissions("check:checkingRegister:edit")
  139 + @Log(title = "质检-质检报告 ",operating = "修改质检报告 ", action = BusinessType.UPDATE)
  140 + @PostMapping("/edit")
  141 + @ResponseBody
  142 + public AjaxResult editSave(CheckingRegister checkingRegister) {
  143 + checkingRegister.setCheckBy(ShiroUtils.getLoginName());
  144 + checkingRegister.setLastUpdatedBy(ShiroUtils.getLoginName());
  145 + return toAjax(checkingRegisterService.updateById(checkingRegister));
  146 + }
  147 +
  148 + /**
  149 + * 删除质检报告
  150 + */
  151 + @ApiOperation(value="删除质检报告", notes="删除质检报告", httpMethod = "POST")
  152 + @RequiresPermissions("check:checkingRegister:remove")
  153 + @Log(title = "质检-质检报告 ",operating = "质检报告删除", action = BusinessType.UPDATE)
  154 + @PostMapping("/remove")
  155 + @ResponseBody
  156 + public AjaxResult remove(@ApiParam(name = "id", value = "质检头表id字符串")String ids){
  157 + if (StringUtils.isNull(ids)){
  158 + return AjaxResult.error("id为空");
  159 + }
  160 + return toAjax(checkingRegisterService.removeByIds(Arrays.asList(Convert.toIntArray(ids))));
  161 + }
  162 +
  163 +}
0 164 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
  View file @7b1a6e3
... ... @@ -483,7 +483,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
483 483 }
484 484 //修改组盘表状态为20
485 485 ReceiptContainerDetail receiptContainerDetail = new ReceiptContainerDetail();
486   - receiptContainerDetail.setStatus(20);
  486 + receiptContainerDetail.setStatus(30);
487 487 receiptContainerDetail.setProcessStamp("0");
488 488 receiptContainerDetail.setLastUpdated(new Date());
489 489 receiptContainerDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
... ... @@ -1015,15 +1015,20 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
1015 1015 throw new ServiceException("任务明细对应的库存ID【" + taskDetail.getToInventoryId().toString() + "】不存在！");
1016 1016 }
1017 1017 BigDecimal orignalQty = inventoryDetail.getQty();
1018   - //扣减库存
  1018 + //减扣库存单
  1019 + InventoryHeader inventoryHeader = inventoryHeaderService.getById(inventoryDetail.getInventoryHeaderId());
  1020 + inventoryHeader.setTotalQty(inventoryDetail.getQty().subtract(taskDetail.getQty()).intValue());
  1021 + //扣减库存明细
1019 1022 inventoryDetail.setTaskQty(inventoryDetail.getTaskQty().subtract(taskDetail.getQty()));
1020 1023 inventoryDetail.setQty(inventoryDetail.getQty().subtract(taskDetail.getQty()));
1021 1024 if(inventoryDetail.getQty().compareTo(new BigDecimal("0"))==0 && inventoryDetail.getTaskQty().compareTo(new BigDecimal("0"))==0){
1022 1025 //如果库存没有了，就删除这个库存
1023 1026 inventoryDetailService.removeById(inventoryDetail.getId());
  1027 + inventoryHeaderService.removeById(inventoryHeader.getId());
1024 1028 }else {
1025 1029 //否则更新这个库存
1026 1030 inventoryDetailService.updateById(inventoryDetail);
  1031 + inventoryHeaderService.updateById(inventoryHeader);
1027 1032 }
1028 1033 //设置子任务状态为已执行
1029 1034 taskDetail.setStatus(100);
... ... @@ -1092,11 +1097,25 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
1092 1097 containerService.update(containerLambdaUpdateWrapper);
1093 1098 }
1094 1099 }
1095   -// //设置出库货箱状态为拣货任务完成
1096   -// shipmentContainerHeaderService.resetStatusShipmentContainer(task.getAllocationHeadId(),(short)20);
1097   - // 最后更新单据状态
1098   - shipmentHeadIds.stream().distinct().forEach(t->shipmentHeaderService.updateShipmentStatus(t));
1099   -
  1100 + //设置出库货箱状态为拣货任务完成
  1101 + ReceiptContainerDetail receiptContainerDetail = new ReceiptContainerDetail();
  1102 + receiptContainerDetail.setStatus(30);
  1103 + receiptContainerDetail.setLastUpdated(new Date());
  1104 + receiptContainerDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
  1105 + LambdaUpdateWrapper<ReceiptContainerDetail> receiptContainerDetailLambdaUpdateWrapper = Wrappers.lambdaUpdate();
  1106 + receiptContainerDetailLambdaUpdateWrapper.eq(ReceiptContainerDetail::getId,task.getAllocationHeadId());
  1107 + if (! receiptContainerDetailService.update(receiptContainerDetail, receiptContainerDetailLambdaUpdateWrapper)){
  1108 + throw new ServiceException("更新组盘明细状态失败");
  1109 + }
  1110 + //设置出库货箱表头状态为拣货任务完成
  1111 + ReceiptContainerHeader ContainerHeader = new ReceiptContainerHeader();
  1112 + ContainerHeader.setStatus((short)30);
  1113 + ContainerHeader.setLastUpdated(new Date());
  1114 + ContainerHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
  1115 + LambdaUpdateWrapper<ReceiptContainerHeader> receiptContainerHeaderLambdaUpdateWrapper = Wrappers.lambdaUpdate();
  1116 + receiptContainerHeaderLambdaUpdateWrapper.eq(ReceiptContainerHeader::getId,task.getAllocationHeadId());
  1117 + if (! receiptContainerHeaderService.update(ContainerHeader, receiptContainerHeaderLambdaUpdateWrapper))
  1118 + throw new ServiceException("更新组盘头状态失败");
1100 1119 }
1101 1120  
1102 1121  
... ...
src/main/resources/templates/check/checkDetail/checkComplete.html 0 → 100644
  View file @7b1a6e3
  1 +<!DOCTYPE HTML>
  2 +<html lang="zh" xmlns:th="http://www.thymeleaf.org">
  3 +<meta charset="utf-8">
  4 +<head th:include="include :: header"></head>
  5 +<body class="white-bg">
  6 +<div class="wrapper wrapper-content animated fadeInRight ibox-content">
  7 + <form class="form-horizontal m" id="form-receiptContainerDetail-add">
  8 + <div class="form-group">
  9 + <label class="col-sm-3 control-label">组盘头id号：</label>
  10 + <div class="col-sm-8">
  11 + <input id="headerId" name="headerId" class="form-control" type="text">
  12 + </div>
  13 + </div>
  14 + <div class="form-group">
  15 + <label class="col-sm-3 control-label">入库单明细id号：</label>
  16 + <div class="col-sm-8">
  17 + <input id="receiptDetailId" name="receiptDetailId" class="form-control" type="text">
  18 + </div>
  19 + </div>
  20 + <div class="form-group">
  21 + <label class="col-sm-3 control-label">：</label>
  22 + <div class="col-sm-8">
  23 + <input id="materialCode" name="materialCode" class="form-control" type="text">
  24 + </div>
  25 + </div>
  26 + <div class="form-group">
  27 + <label class="col-sm-3 control-label">：</label>
  28 + <div class="col-sm-8">
  29 + <input id="materialName" name="materialName" class="form-control" type="text">
  30 + </div>
  31 + </div>
  32 + <div class="form-group">
  33 + <label class="col-sm-3 control-label">组盘数量：</label>
  34 + <div class="col-sm-8">
  35 + <input id="qty" name="qty" class="form-control" type="text">
  36 + </div>
  37 + </div>
  38 + <div class="form-group">
  39 + <label class="col-sm-3 control-label">创建时间：</label>
  40 + <div class="col-sm-8">
  41 + <input id="created" name="created" class="form-control" type="text">
  42 + </div>
  43 + </div>
  44 + <div class="form-group">
  45 + <label class="col-sm-3 control-label">创建用户：</label>
  46 + <div class="col-sm-8">
  47 + <input id="createdBy" name="createdBy" class="form-control" type="text">
  48 + </div>
  49 + </div>
  50 + <div class="form-group">
  51 + <div class="form-control-static col-sm-offset-9">
  52 + <button type="submit" class="btn btn-primary">提交</button>
  53 + <button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button>
  54 + </div>
  55 + </div>
  56 + </form>
  57 +</div>
  58 +<div th:include="include::footer"></div>
  59 +<script type="text/javascript">
  60 + var prefix = ctx + "receipt/receiptContainerDetail"
  61 + $("#form-receiptContainerDetail-add").validate({
  62 + rules:{
  63 + xxxx:{
  64 + required:true,
  65 + },
  66 + },
  67 + submitHandler: function(form) {
  68 + $.operate.save(prefix + "/add", $('#form-receiptContainerDetail-add').serialize());
  69 + }
  70 + });
  71 +</script>
  72 +</body>
  73 +</html>
... ...
src/main/resources/templates/check/checkDetail/checkDetail.html 0 → 100644
  View file @7b1a6e3
  1 +<!DOCTYPE HTML>
  2 +<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
  3 +<meta charset="utf-8">
  4 +<head th:include="include :: header"></head>
  5 +<body class="gray-bg">
  6 +<div class="container-div">
  7 + <div class="row">
  8 + <div class="btn-group hidden-xs" id="toolbar" role="group">
  9 + <input type="hidden" id="headerId" name="receiptId" th:value="${headerId}"/>
  10 + <!--<a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="receipt:receiptContainer:add">-->
  11 + <!--<i class="fa fa-plus"></i> 新增-->
  12 + <!--</a>-->
  13 + <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()" shiro:hasPermission="receipt:receiptContainer:remove">
  14 + <i class="fa fa-trash-o"></i> 删除
  15 + </a>
  16 + </div>
  17 +
  18 + <div class="col-sm-12 select-info">
  19 + <table id="bootstrap-table" data-mobile-responsive="true" class="table table-bordered table-hover"></table>
  20 + </div>
  21 + </div>
  22 +</div>
  23 +<div th:include="include :: footer"></div>
  24 +<script th:inline="javascript">
  25 + // var editFlag = [[${@permission.hasPermi('receipt:receiptContainer:edit')}]];
  26 + var removeFlag = [[${@permission.hasPermi('check:checkDetail:remove')}]];
  27 + var prefix = ctx + "check/checkDetail";
  28 +
  29 + $(function() {
  30 + var options = {
  31 + url: prefix + "/list",
  32 + createUrl: prefix + "/add",
  33 + updateUrl: prefix + "/edit/{id}",
  34 + removeUrl: prefix + "/remove",
  35 + queryParams: queryParams,
  36 + modalName: "质检明细",
  37 + sortName: "id",
  38 + sortOrder: "desc",
  39 + search: false,
  40 + columns: [{
  41 + checkbox: true
  42 + },
  43 + {
  44 + field : 'id',
  45 + title : 'id'
  46 + },
  47 + {
  48 + field : 'checkHeaderId',
  49 + title : '质检头id'
  50 + },
  51 + {
  52 + field : 'warehouseCode',
  53 + title : '仓库编码',
  54 + visible : false
  55 + },
  56 + {
  57 + field : 'checkCode',
  58 + title : '质检单编码'
  59 + },
  60 + {
  61 + field : 'inventoryDetailId',
  62 + title : '库存明细标识'
  63 + },
  64 + {
  65 + field : 'locationCode',
  66 + title : '库位编码'
  67 + },
  68 + {
  69 + field : 'containerCode',
  70 + title : '容器编码'
  71 + },
  72 + {
  73 + field : 'receiptDetailId',
  74 + title : '入库单明细标识'
  75 + },
  76 + {
  77 + field : 'receiptCode',
  78 + title : '入库单号'
  79 + },
  80 + {
  81 + field : 'referCode',
  82 + title : '关联单号"'
  83 + },
  84 + {
  85 + field : 'referLineId',
  86 + title : '关联行号'
  87 + },
  88 + {
  89 + field : 'referPlatform',
  90 + title : '关联平台'
  91 + },
  92 + {
  93 + field : 'materialCode',
  94 + title : '物料编码'
  95 + },
  96 + {
  97 + field : 'materialName',
  98 + title : '物料名称'
  99 + },
  100 + {
  101 + field : 'materialSpec',
  102 + title : '物料规格'
  103 + },
  104 + {
  105 + field : 'materialUnit',
  106 + title : '物料单位'
  107 + },
  108 + {
  109 + field : 'companyCode',
  110 + title : '货主代码'
  111 + },
  112 + {
  113 + field : 'inventorySts',
  114 + title : '库存状态'
  115 + },
  116 + {
  117 + field : 'status',
  118 + title : '状态'
  119 + },
  120 + {
  121 + field : 'qty',
  122 + title : '系统数量'
  123 + },
  124 + {
  125 + field : 'checkBy',
  126 + title : '质检人'
  127 + },
  128 + {
  129 + field : 'checkAt',
  130 + title : '质检时间'
  131 + },
  132 + {
  133 + field : 'created',
  134 + title : '创建时间'
  135 + },
  136 + {
  137 + field : 'createdBy',
  138 + title : '创建用户'
  139 + },
  140 + {
  141 + title: '操作',
  142 + align: 'center',
  143 + formatter: function(value, row, index) {
  144 + var actions = [];
  145 + actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
  146 + if (row.status == 0){
  147 + actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>开始质检</a> ');
  148 + } else if (row.status == 10) {
  149 + actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>质检完成</a> ');
  150 + }
  151 + actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
  152 + return actions.join('');
  153 + }
  154 + }]
  155 + };
  156 + $.table.init(options);
  157 + });
  158 +
  159 + function queryParams(params) {
  160 + return {
  161 + headerId:$("#receiptContainerId").val()
  162 + };
  163 + }
  164 +</script>
  165 +</body>
  166 +</html>
0 167 \ No newline at end of file
... ...
src/main/resources/templates/check/checkHeader/checkHeader.html 0 → 100644
  View file @7b1a6e3
  1 +<!DOCTYPE HTML>
  2 +<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
  3 +<meta charset="utf-8">
  4 +<head th:include="include :: header"></head>
  5 +<body class="gray-bg">
  6 +
  7 +<div class="container-div">
  8 + <div class="row">
  9 + <div class="col-sm-12 select-info">
  10 + <ul id="myTab" class="nav nav-tabs">
  11 + <li class="active"><a href="#tabHeader" data-toggle="tab">主表</a></li>
  12 + <li><a href="#tabDetail" data-toggle="tab">明细</a></li>
  13 + </ul>
  14 + <div id="myTabContent" class="tab-content">
  15 + <div class="tab-pane fade in active" id="tabHeader">
  16 + <div class="col-sm-12 select-info">
  17 + <form id="receiptHeader-form">
  18 + <div class="select-list">
  19 + <ul>
  20 + <li>
  21 + 编码：<input type="text" name="code"/>
  22 + </li>
  23 + <li>
  24 + 入库单编码：<input type="text" name="referCode">
  25 + </li>
  26 + <li>状态：
  27 + <select name="lastStatus">
  28 + <option value="">所有</option>
  29 + <option value="0">新建</option>
  30 + </select>
  31 + </li>
  32 + <li class="time">
  33 + <label>创建时间： </label>
  34 + <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[createdBegin]"/>
  35 + <span>-</span>
  36 + <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[createdEnd]"/>
  37 + </li>
  38 + <li>
  39 + <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
  40 + </li>
  41 + </ul>
  42 + </div>
  43 + </form>
  44 + </div>
  45 + <div class="btn-group hidden-xs" id="toolbar" role="group">
  46 + <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()"
  47 + shiro:hasPermission="receipt:receiptHeader:add">
  48 + <i class="fa fa-plus"></i> 新增
  49 + </a>
  50 + <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()"
  51 + shiro:hasPermission="receipt:receiptHeader:remove">
  52 + <i class="fa fa-trash-o"></i> 删除
  53 + </a>
  54 + </div>
  55 + <table id="bootstrap-table" data-mobile-responsive="true" class="table table-bordered table-hover"></table>
  56 + </div>
  57 +
  58 + <div class="tab-pane fade" id="tabDetail">
  59 + <table id="bootstrap-table1" data-mobile-responsive="true"
  60 + class="table table-bordered table-hover"></table>
  61 + </div>
  62 + </div>
  63 + </div>
  64 + </div>
  65 +</div>
  66 +<div th:include="include :: footer"></div>
  67 +<script th:inline="javascript">
  68 + var prefix = ctx + "check/checkHeader";
  69 + var prefix1 = ctx + "check/checkDetail";
  70 + var editFlag = [[${@permission.hasPermi('check:checkHeader:edit')}]];
  71 + var removeFlag = [[${@permission.hasPermi('check:checkHeader:remove')}]];
  72 + var receiptTypes = [[${@receiptTypeService.getType()}]];
  73 + var receiptHeaderStatus = [[${@dict.getType('receiptHeaderStatus')}]];
  74 + var printFlag = [[${@permission.hasPermi('check:checkHeader:report')}]];
  75 + var addFlag= [[${@permission.hasPermi('check:checkHeader:add')}]];
  76 + var datas = [[${@dict.getType('sys_normal_disable')}]];
  77 +
  78 + $(function() {
  79 + var options = {
  80 + url: prefix + "/list",
  81 + createUrl: prefix + "/add",
  82 + updateUrl: prefix + "/edit/{id}",
  83 + removeUrl: prefix + "/remove",
  84 + modalName: "流程",
  85 + search: false,
  86 + sortName: "id",
  87 + sortOrder: "desc",
  88 + columns: [{
  89 + checkbox: true
  90 + },
  91 + {
  92 + field : 'id',
  93 + title : '入库单id'
  94 + },
  95 + {
  96 + field : 'code',
  97 + title : '编码'
  98 + },
  99 + {
  100 + field : 'referCode',
  101 + title : '关联单号'
  102 + },
  103 + {
  104 + field : 'referPlatform',
  105 + title : '关联平台'
  106 + },
  107 + {
  108 + field : 'enable',
  109 + title : '是否有效',
  110 + align: 'center',
  111 + formatter: function(value, row, index) {
  112 + return $.table.selectDictLabel(datas, value);
  113 + }
  114 + },
  115 + {
  116 + field : 'status',
  117 + title : '状态',
  118 + visible:false
  119 + },
  120 + {
  121 + field : 'closedBy',
  122 + title : '关闭人'
  123 + },
  124 + {
  125 + field : 'closedAt',
  126 + title : '关闭日期'
  127 + },
  128 + {
  129 + field : 'created',
  130 + title : '创建时间',
  131 + sortable:true,
  132 + visible:false
  133 + },
  134 + {
  135 + field : 'createdBy',
  136 + title : '创建用户',
  137 + visible:false
  138 + },
  139 + {
  140 + field : 'lastUpdated',
  141 + title : '最后修改时间',
  142 + sortable:true,
  143 + visible:false
  144 + },
  145 + {
  146 + field : 'lastUpdatedBy',
  147 + title : '更新用户',
  148 + visible:false
  149 + },
  150 + {
  151 + field : 'userDef1',
  152 + title : '自定义字段1',
  153 + visible: false
  154 + },
  155 + {
  156 + field : 'userDef2',
  157 + title : '自定义字段2',
  158 + visible: false
  159 + },
  160 + {
  161 + field : 'userDef3',
  162 + title : '自定义字段3' ,
  163 + visible: false
  164 + },
  165 + {
  166 + title: '操作',
  167 + align: 'center',
  168 + formatter: function(value, row, index) {
  169 + var actions = [];
  170 + actions.push('<a id="table_edit" class="btn btn-success btn-xs ' + printFlag + '" href="#" onclick="complete(\'' + row.id + '\')"><i class="fa fa-print"></i>完成</a> ');
  171 + actions.push('<a class="btn btn-info btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')" ><i class="fa fa-edit"></i>编辑</a> ');
  172 + // actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-trash-o"></i>删除</a>');
  173 + return actions.join('');
  174 + }
  175 + }]
  176 + };
  177 + $.table.init(options);
  178 + });
  179 +
  180 + function detail(id, code) {
  181 + var url = prefix1+"/list/" + id;
  182 + createtable(url);
  183 + }
  184 +
  185 + function createtable(url) {
  186 + $("#tabDetail").children().remove();
  187 + $("#myTab li").removeClass("active");
  188 + var height = $(document).height()-100 + 'px';
  189 + var str = '<iframe class="huaheng_iframe" name="iframe" width="100%" height="' + height + '" src="' + url + '" frameborder="0" data-id="' + url + '" seamless></iframe>';
  190 + $("#tabDetail").append(str);
  191 + $(".tab-pane").removeClass("in active");
  192 + $("#myTab li:eq(1)").addClass("active");
  193 + $("#tabDetail").addClass("in active");
  194 + }
  195 +
  196 + function complete(id) {
  197 +
  198 + }
  199 +</script>
  200 +</body>
  201 +</html>
0 202 \ No newline at end of file
... ...