wms / wms_henanqingyuan · Commits

Commit 06ba3e80077da1ea3d9f866f10d5cb0216d48ded

Authored by xqs
2 parents faf44f43 cdf142ae
develop

Merge branch 'develop' of http://172.16.29.40:8010/wms/wms2 into develop

Inline Side-by-side
Showing 29 changed files with 2357 additions and 1066 deletions
.idea/workspace.xml
  View file @06ba3e8
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="">
  4 + <list default="true" id="baeae966-16bb-4f97-a411-22fe5a65cefd" name="Default Changelist" comment="">
  5 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/check/checkingRegister/checkingRegister.html" afterDir="false" />
5 6 <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
6 7 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
7   - <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" />
8   - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/CycleCountDetailService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/CycleCountDetailService.java" afterDir="false" />
9   - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/CycleCountDetailServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/CycleCountDetailServiceImpl.java" afterDir="false" />
10   - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountDetail/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountDetail/add.html" afterDir="false" />
11   - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountDetail/addGoods.html" beforeDir="false" />
12   - <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" />
13   - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountDetail/edit.html" beforeDir="false" />
14   - <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" />
  8 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/check/checkDetail/controller/CheckDetailController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/check/checkDetail/controller/CheckDetailController.java" afterDir="false" />
  9 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/check/checkDetail/service/CheckDetailService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/check/checkDetail/service/CheckDetailService.java" afterDir="false" />
  10 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/check/checkingRegister/controller/CheckingRegisterController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/check/checkingRegister/controller/CheckingRegisterController.java" afterDir="false" />
  11 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java" afterDir="false" />
  12 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeader/service/ReceiptHeaderService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeader/service/ReceiptHeaderService.java" afterDir="false" />
  13 + <change beforePath="$PROJECT_DIR$/src/main/resources/templates/check/checkDetail/checkComplete.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/check/checkDetail/checkComplete.html" afterDir="false" />
  14 + <change beforePath="$PROJECT_DIR$/src/main/resources/templates/check/checkDetail/checkDetail.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/check/checkDetail/checkDetail.html" afterDir="false" />
  15 + <change beforePath="$PROJECT_DIR$/src/main/resources/templates/check/checkHeader/checkHeader.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/check/checkHeader/checkHeader.html" afterDir="false" />
  16 + <change beforePath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html" afterDir="false" />
15 17 </list>
16 18 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
17 19 <option name="SHOW_DIALOG" value="false" />
... ... @@ -20,13 +22,13 @@
20 22 <option name="LAST_RESOLUTION" value="IGNORE" />
21 23 </component>
22 24 <component name="DatabaseView">
23   - <option name="SHOW_INTERMEDIATE" value="false" />
  25 + <option name="SHOW_INTERMEDIATE" value="true" />
24 26 <option name="GROUP_DATA_SOURCES" value="true" />
25 27 <option name="GROUP_SCHEMA" value="true" />
26 28 <option name="GROUP_CONTENTS" value="false" />
27 29 <option name="SORT_POSITIONED" value="false" />
28 30 <option name="SHOW_EMPTY_GROUPS" value="false" />
29   - <option name="AUTO_SCROLL_FROM_SOURCE" value="true" />
  31 + <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
30 32 <option name="HIDDEN_KINDS">
31 33 <set />
32 34 </option>
... ... @@ -62,506 +64,63 @@
62 64 <item name="@localhost" type="feb32156:DbDataSourceImpl" />
63 65 <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
64 66 </path>
  67 + <path>
  68 + <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
  69 + <item name="@localhost" type="feb32156:DbDataSourceImpl" />
  70 + <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
  71 + <item name="wms2.0: schema" type="76f4a085:MysqlImplModel$Schema" />
  72 + </path>
  73 + <path>
  74 + <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
  75 + <item name="@localhost" type="feb32156:DbDataSourceImpl" />
  76 + <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
  77 + <item name="wms2.0: schema" type="76f4a085:MysqlImplModel$Schema" />
  78 + <item name="check_detail: table" type="285a2a93:MysqlImplModel$Table" />
  79 + </path>
  80 + <path>
  81 + <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
  82 + <item name="@localhost" type="feb32156:DbDataSourceImpl" />
  83 + <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
  84 + <item name="wms2.0: schema" type="76f4a085:MysqlImplModel$Schema" />
  85 + <item name="check_header: table" type="285a2a93:MysqlImplModel$Table" />
  86 + </path>
65 87 </expand>
66 88 <select />
67 89 </component>
68   - <component name="FileEditorManager">
69   - <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
70   - <file pinned="false" current-in-tab="false">
71   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java">
72   - <provider selected="true" editor-type-id="text-editor">
73   - <state relative-caret-position="150">
74   - <caret line="145" selection-start-line="145" selection-end-line="145" />
75   - </state>
76   - </provider>
77   - </entry>
78   - </file>
79   - <file pinned="false" current-in-tab="false">
80   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/CycleCountDetailService.java">
81   - <provider selected="true" editor-type-id="text-editor">
82   - <state relative-caret-position="147">
83   - <caret line="11" column="15" selection-start-line="11" selection-start-column="15" selection-end-line="11" selection-end-column="15" />
84   - <folding>
85   - <element signature="imports" expanded="true" />
86   - </folding>
87   - </state>
88   - </provider>
89   - </entry>
90   - </file>
91   - <file pinned="false" current-in-tab="false">
92   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountDetail/cycleCountDetail.html">
93   - <provider selected="true" editor-type-id="text-editor">
94   - <state relative-caret-position="4104">
95   - <caret line="335" column="20" selection-start-line="335" selection-start-column="20" selection-end-line="335" selection-end-column="20" />
96   - </state>
97   - </provider>
98   - </entry>
99   - </file>
100   - <file pinned="false" current-in-tab="true">
101   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/CycleCountDetailServiceImpl.java">
102   - <provider selected="true" editor-type-id="text-editor">
103   - <state relative-caret-position="86">
104   - <caret line="43" column="89" selection-start-line="43" selection-start-column="69" selection-end-line="43" selection-end-column="89" />
105   - </state>
106   - </provider>
107   - </entry>
108   - </file>
109   - </leaf>
110   - </component>
111 90 <component name="FileTemplateManagerImpl">
112 91 <option name="RECENT_TEMPLATES">
113 92 <list>
114   - <option value="CSS File" />
  93 + <option value="Interface" />
115 94 <option value="Class" />
116 95 <option value="HTML File" />
  96 + <option value="Enum" />
117 97 </list>
118 98 </option>
119 99 </component>
120   - <component name="FindInProjectRecents">
121   - <findStrings>
122   - <find>a</find>
123   - </findStrings>
124   - </component>
125 100 <component name="Git.Settings">
126 101 <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
127   - <option name="RESET_MODE" value="HARD" />
128   - </component>
129   - <component name="IdeDocumentHistory">
130   - <option name="CHANGED_PATHS">
131   - <list>
132   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java" />
133   - <option value="$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/taskHeader.html" />
134   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskDetail/domain/TaskDetail.java" />
135   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java" />
136   - <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html" />
137   - <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountDetail/cycleCountDetail.html" />
138   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java" />
139   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/CycleCountDetailService.java" />
140   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/CycleCountDetailServiceImpl.java" />
141   - <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountDetail/add.html" />
142   - </list>
143   - </option>
144   - </component>
145   - <component name="JsFlowSettings">
146   - <service-enabled>true</service-enabled>
147   - <exe-path />
148   - <other-services-enabled>true</other-services-enabled>
149   - <auto-save>true</auto-save>
150   - </component>
151   - <component name="MavenImportPreferences">
152   - <option name="importingSettings">
153   - <MavenImportingSettings>
154   - <option name="importAutomatically" value="true" />
155   - </MavenImportingSettings>
156   - </option>
157   - </component>
158   - <component name="ProjectFrameBounds">
159   - <option name="x" value="-8" />
160   - <option name="width" value="1934" />
161   - <option name="height" value="1038" />
162   - </component>
163   - <component name="ProjectId" id="1Q2nhRM7LRz3yFWhpclOKgTjxn0" />
164   - <component name="ProjectLevelVcsManager">
165   - <ConfirmationsSetting value="2" id="Add" />
166   - </component>
167   - <component name="ProjectView">
168   - <navigator proportions="" version="1">
169   - <foldersAlwaysOnTop value="true" />
170   - </navigator>
171   - <panes>
172   - <pane id="Scope" />
173   - <pane id="ProjectPane">
174   - <subPane>
175   - <expand>
176   - <path>
177   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
178   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
179   - </path>
180   - <path>
181   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
182   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
183   - <item name=".idea" type="462c0819:PsiDirectoryNode" />
184   - </path>
185   - <path>
186   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
187   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
188   - <item name="src" type="462c0819:PsiDirectoryNode" />
189   - </path>
190   - <path>
191   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
192   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
193   - <item name="src" type="462c0819:PsiDirectoryNode" />
194   - <item name="main" 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   - <item name="main" type="462c0819:PsiDirectoryNode" />
201   - <item name="java" type="462c0819:PsiDirectoryNode" />
202   - </path>
203   - <path>
204   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
205   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
206   - <item name="src" type="462c0819:PsiDirectoryNode" />
207   - <item name="main" type="462c0819:PsiDirectoryNode" />
208   - <item name="java" type="462c0819:PsiDirectoryNode" />
209   - <item name="com" type="462c0819:PsiDirectoryNode" />
210   - </path>
211   - <path>
212   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
213   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
214   - <item name="src" type="462c0819:PsiDirectoryNode" />
215   - <item name="main" type="462c0819:PsiDirectoryNode" />
216   - <item name="java" type="462c0819:PsiDirectoryNode" />
217   - <item name="com" type="462c0819:PsiDirectoryNode" />
218   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
219   - </path>
220   - <path>
221   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
222   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
223   - <item name="src" type="462c0819:PsiDirectoryNode" />
224   - <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   - <item name="pc" type="462c0819:PsiDirectoryNode" />
229   - </path>
230   - <path>
231   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
232   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
233   - <item name="src" type="462c0819:PsiDirectoryNode" />
234   - <item name="main" type="462c0819:PsiDirectoryNode" />
235   - <item name="java" type="462c0819:PsiDirectoryNode" />
236   - <item name="com" type="462c0819:PsiDirectoryNode" />
237   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
238   - <item name="pc" type="462c0819:PsiDirectoryNode" />
239   - <item name="inventory" 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="inventory" type="462c0819:PsiDirectoryNode" />
251   - <item name="adjustDetail" type="462c0819:PsiDirectoryNode" />
252   - </path>
253   - <path>
254   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
255   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
256   - <item name="src" type="462c0819:PsiDirectoryNode" />
257   - <item name="main" type="462c0819:PsiDirectoryNode" />
258   - <item name="java" type="462c0819:PsiDirectoryNode" />
259   - <item name="com" type="462c0819:PsiDirectoryNode" />
260   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
261   - <item name="pc" type="462c0819:PsiDirectoryNode" />
262   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
263   - <item name="adjustDetail" type="462c0819:PsiDirectoryNode" />
264   - <item name="domain" type="462c0819:PsiDirectoryNode" />
265   - </path>
266   - <path>
267   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
268   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
269   - <item name="src" type="462c0819:PsiDirectoryNode" />
270   - <item name="main" type="462c0819:PsiDirectoryNode" />
271   - <item name="java" type="462c0819:PsiDirectoryNode" />
272   - <item name="com" type="462c0819:PsiDirectoryNode" />
273   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
274   - <item name="pc" type="462c0819:PsiDirectoryNode" />
275   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
276   - <item name="adjustDetail" type="462c0819:PsiDirectoryNode" />
277   - <item name="mapper" type="462c0819:PsiDirectoryNode" />
278   - </path>
279   - <path>
280   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
281   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
282   - <item name="src" type="462c0819:PsiDirectoryNode" />
283   - <item name="main" type="462c0819:PsiDirectoryNode" />
284   - <item name="java" type="462c0819:PsiDirectoryNode" />
285   - <item name="com" type="462c0819:PsiDirectoryNode" />
286   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
287   - <item name="pc" type="462c0819:PsiDirectoryNode" />
288   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
289   - <item name="cycleCountDetail" type="462c0819:PsiDirectoryNode" />
290   - </path>
291   - <path>
292   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
293   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
294   - <item name="src" type="462c0819:PsiDirectoryNode" />
295   - <item name="main" type="462c0819:PsiDirectoryNode" />
296   - <item name="java" type="462c0819:PsiDirectoryNode" />
297   - <item name="com" type="462c0819:PsiDirectoryNode" />
298   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
299   - <item name="pc" type="462c0819:PsiDirectoryNode" />
300   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
301   - <item name="cycleCountDetail" type="462c0819:PsiDirectoryNode" />
302   - <item name="controller" type="462c0819:PsiDirectoryNode" />
303   - </path>
304   - <path>
305   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
306   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
307   - <item name="src" type="462c0819:PsiDirectoryNode" />
308   - <item name="main" type="462c0819:PsiDirectoryNode" />
309   - <item name="java" type="462c0819:PsiDirectoryNode" />
310   - <item name="com" type="462c0819:PsiDirectoryNode" />
311   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
312   - <item name="pc" type="462c0819:PsiDirectoryNode" />
313   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
314   - <item name="cycleCountDetail" type="462c0819:PsiDirectoryNode" />
315   - <item name="domain" type="462c0819:PsiDirectoryNode" />
316   - </path>
317   - <path>
318   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
319   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
320   - <item name="src" type="462c0819:PsiDirectoryNode" />
321   - <item name="main" type="462c0819:PsiDirectoryNode" />
322   - <item name="java" type="462c0819:PsiDirectoryNode" />
323   - <item name="com" type="462c0819:PsiDirectoryNode" />
324   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
325   - <item name="pc" type="462c0819:PsiDirectoryNode" />
326   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
327   - <item name="cycleCountDetail" type="462c0819:PsiDirectoryNode" />
328   - <item name="mapper" type="462c0819:PsiDirectoryNode" />
329   - </path>
330   - <path>
331   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
332   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
333   - <item name="src" type="462c0819:PsiDirectoryNode" />
334   - <item name="main" type="462c0819:PsiDirectoryNode" />
335   - <item name="java" type="462c0819:PsiDirectoryNode" />
336   - <item name="com" type="462c0819:PsiDirectoryNode" />
337   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
338   - <item name="pc" type="462c0819:PsiDirectoryNode" />
339   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
340   - <item name="cycleCountDetail" type="462c0819:PsiDirectoryNode" />
341   - <item name="service" type="462c0819:PsiDirectoryNode" />
342   - </path>
343   - <path>
344   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
345   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
346   - <item name="src" type="462c0819:PsiDirectoryNode" />
347   - <item name="main" type="462c0819:PsiDirectoryNode" />
348   - <item name="java" type="462c0819:PsiDirectoryNode" />
349   - <item name="com" type="462c0819:PsiDirectoryNode" />
350   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
351   - <item name="pc" type="462c0819:PsiDirectoryNode" />
352   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
353   - <item name="cycleCountHeader" type="462c0819:PsiDirectoryNode" />
354   - </path>
355   - <path>
356   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
357   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
358   - <item name="src" type="462c0819:PsiDirectoryNode" />
359   - <item name="main" type="462c0819:PsiDirectoryNode" />
360   - <item name="java" type="462c0819:PsiDirectoryNode" />
361   - <item name="com" type="462c0819:PsiDirectoryNode" />
362   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
363   - <item name="pc" type="462c0819:PsiDirectoryNode" />
364   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
365   - <item name="cycleCountHeader" type="462c0819:PsiDirectoryNode" />
366   - <item name="controller" type="462c0819:PsiDirectoryNode" />
367   - </path>
368   - <path>
369   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
370   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
371   - <item name="src" type="462c0819:PsiDirectoryNode" />
372   - <item name="main" type="462c0819:PsiDirectoryNode" />
373   - <item name="java" type="462c0819:PsiDirectoryNode" />
374   - <item name="com" type="462c0819:PsiDirectoryNode" />
375   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
376   - <item name="pc" type="462c0819:PsiDirectoryNode" />
377   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
378   - <item name="cycleCountHeader" type="462c0819:PsiDirectoryNode" />
379   - <item name="domain" type="462c0819:PsiDirectoryNode" />
380   - </path>
381   - <path>
382   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
383   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
384   - <item name="src" type="462c0819:PsiDirectoryNode" />
385   - <item name="main" type="462c0819:PsiDirectoryNode" />
386   - <item name="java" type="462c0819:PsiDirectoryNode" />
387   - <item name="com" type="462c0819:PsiDirectoryNode" />
388   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
389   - <item name="pc" type="462c0819:PsiDirectoryNode" />
390   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
391   - <item name="cycleCountHeader" type="462c0819:PsiDirectoryNode" />
392   - <item name="mapper" type="462c0819:PsiDirectoryNode" />
393   - </path>
394   - <path>
395   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
396   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
397   - <item name="src" type="462c0819:PsiDirectoryNode" />
398   - <item name="main" type="462c0819:PsiDirectoryNode" />
399   - <item name="java" type="462c0819:PsiDirectoryNode" />
400   - <item name="com" type="462c0819:PsiDirectoryNode" />
401   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
402   - <item name="pc" type="462c0819:PsiDirectoryNode" />
403   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
404   - <item name="cycleCountHeader" type="462c0819:PsiDirectoryNode" />
405   - <item name="service" type="462c0819:PsiDirectoryNode" />
406   - </path>
407   - <path>
408   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
409   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
410   - <item name="src" type="462c0819:PsiDirectoryNode" />
411   - <item name="main" type="462c0819:PsiDirectoryNode" />
412   - <item name="java" type="462c0819:PsiDirectoryNode" />
413   - <item name="com" type="462c0819:PsiDirectoryNode" />
414   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
415   - <item name="pc" type="462c0819:PsiDirectoryNode" />
416   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
417   - <item name="inventoryDetail" type="462c0819:PsiDirectoryNode" />
418   - </path>
419   - <path>
420   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
421   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
422   - <item name="src" type="462c0819:PsiDirectoryNode" />
423   - <item name="main" type="462c0819:PsiDirectoryNode" />
424   - <item name="java" type="462c0819:PsiDirectoryNode" />
425   - <item name="com" type="462c0819:PsiDirectoryNode" />
426   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
427   - <item name="pc" type="462c0819:PsiDirectoryNode" />
428   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
429   - <item name="inventoryDetail" type="462c0819:PsiDirectoryNode" />
430   - <item name="controller" type="462c0819:PsiDirectoryNode" />
431   - </path>
432   - <path>
433   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
434   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
435   - <item name="src" type="462c0819:PsiDirectoryNode" />
436   - <item name="main" type="462c0819:PsiDirectoryNode" />
437   - <item name="java" type="462c0819:PsiDirectoryNode" />
438   - <item name="com" type="462c0819:PsiDirectoryNode" />
439   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
440   - <item name="pc" type="462c0819:PsiDirectoryNode" />
441   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
442   - <item name="inventoryDetail" type="462c0819:PsiDirectoryNode" />
443   - <item name="service" type="462c0819:PsiDirectoryNode" />
444   - </path>
445   - <path>
446   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
447   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
448   - <item name="src" type="462c0819:PsiDirectoryNode" />
449   - <item name="main" type="462c0819:PsiDirectoryNode" />
450   - <item name="resources" type="462c0819:PsiDirectoryNode" />
451   - </path>
452   - <path>
453   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
454   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
455   - <item name="src" type="462c0819:PsiDirectoryNode" />
456   - <item name="main" type="462c0819:PsiDirectoryNode" />
457   - <item name="resources" type="462c0819:PsiDirectoryNode" />
458   - <item name="templates" type="462c0819:PsiDirectoryNode" />
459   - </path>
460   - <path>
461   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
462   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
463   - <item name="src" type="462c0819:PsiDirectoryNode" />
464   - <item name="main" type="462c0819:PsiDirectoryNode" />
465   - <item name="resources" type="462c0819:PsiDirectoryNode" />
466   - <item name="templates" type="462c0819:PsiDirectoryNode" />
467   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
468   - </path>
469   - <path>
470   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
471   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
472   - <item name="src" type="462c0819:PsiDirectoryNode" />
473   - <item name="main" type="462c0819:PsiDirectoryNode" />
474   - <item name="resources" type="462c0819:PsiDirectoryNode" />
475   - <item name="templates" type="462c0819:PsiDirectoryNode" />
476   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
477   - <item name="adjustDetail" type="462c0819:PsiDirectoryNode" />
478   - </path>
479   - <path>
480   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
481   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
482   - <item name="src" type="462c0819:PsiDirectoryNode" />
483   - <item name="main" type="462c0819:PsiDirectoryNode" />
484   - <item name="resources" type="462c0819:PsiDirectoryNode" />
485   - <item name="templates" type="462c0819:PsiDirectoryNode" />
486   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
487   - <item name="adjustHeader" type="462c0819:PsiDirectoryNode" />
488   - </path>
489   - <path>
490   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
491   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
492   - <item name="src" type="462c0819:PsiDirectoryNode" />
493   - <item name="main" type="462c0819:PsiDirectoryNode" />
494   - <item name="resources" type="462c0819:PsiDirectoryNode" />
495   - <item name="templates" type="462c0819:PsiDirectoryNode" />
496   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
497   - <item name="cycleCountDetail" type="462c0819:PsiDirectoryNode" />
498   - </path>
499   - <path>
500   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
501   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
502   - <item name="src" type="462c0819:PsiDirectoryNode" />
503   - <item name="main" type="462c0819:PsiDirectoryNode" />
504   - <item name="resources" type="462c0819:PsiDirectoryNode" />
505   - <item name="templates" type="462c0819:PsiDirectoryNode" />
506   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
507   - <item name="cycleCountHeader" type="462c0819:PsiDirectoryNode" />
508   - </path>
509   - <path>
510   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
511   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
512   - <item name="src" type="462c0819:PsiDirectoryNode" />
513   - <item name="main" type="462c0819:PsiDirectoryNode" />
514   - <item name="resources" type="462c0819:PsiDirectoryNode" />
515   - <item name="templates" type="462c0819:PsiDirectoryNode" />
516   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
517   - <item name="inventoryDetail" type="462c0819:PsiDirectoryNode" />
518   - </path>
519   - <path>
520   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
521   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
522   - <item name="src" type="462c0819:PsiDirectoryNode" />
523   - <item name="main" type="462c0819:PsiDirectoryNode" />
524   - <item name="resources" type="462c0819:PsiDirectoryNode" />
525   - <item name="templates" type="462c0819:PsiDirectoryNode" />
526   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
527   - <item name="inventoryHeader" type="462c0819:PsiDirectoryNode" />
528   - </path>
529   - </expand>
530   - <select />
531   - </subPane>
532   - </pane>
533   - <pane id="PackagesPane" />
534   - </panes>
535 102 </component>
  103 + <component name="ProjectId" id="1QOzUtfkdeRmYuw3MIDHXXMLsFH" />
536 104 <component name="PropertiesComponent">
537   - <property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
538 105 <property name="DefaultHtmlFileTemplate" value="HTML File" />
539   - <property name="ExpandSpringBootJavaOptionsPanel" value="true" />
540   - <property name="JavaScriptWeakerCompletionTypeGuess" value="true" />
541 106 <property name="RequestMappingsPanelOrder0" value="0" />
542 107 <property name="RequestMappingsPanelOrder1" value="1" />
543 108 <property name="RequestMappingsPanelWidth0" value="75" />
544 109 <property name="RequestMappingsPanelWidth1" value="75" />
545   - <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
546 110 <property name="WebServerToolWindowFactoryState" value="false" />
547 111 <property name="aspect.path.notification.shown" value="true" />
548   - <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1567684191959" />
549   - <property name="last_opened_file_path" value="$PROJECT_DIR$/../web_cms" />
550   - <property name="list.type.of.created.stylesheet" value="CSS" />
  112 + <property name="full.screen.before.presentation.mode" value="false" />
  113 + <property name="last_opened_file_path" value="$PROJECT_DIR$/../WMSV1" />
551 114 <property name="node.js.detected.package.eslint" value="true" />
  115 + <property name="node.js.detected.package.tslint" value="true" />
552 116 <property name="node.js.path.for.package.eslint" value="project" />
553 117 <property name="node.js.path.for.package.tslint" value="project" />
554 118 <property name="node.js.selected.package.eslint" value="(autodetect)" />
555 119 <property name="node.js.selected.package.tslint" value="(autodetect)" />
556   - <property name="nodejs_package_manager_path" value="npm" />
557   - <property name="settings.editor.selected.configurable" value="Settings.JavaScript" />
  120 + <property name="run.code.analysis.last.selected.profile" value="pProject Default" />
  121 + <property name="settings.editor.selected.configurable" value="reference.settingsdialog.IDE.editor.colors.Console Font" />
558 122 </component>
559 123 <component name="RunDashboard">
560   - <option name="configurationTypes">
561   - <set>
562   - <option value="SpringBootApplicationConfigurationType" />
563   - </set>
564   - </option>
565 124 <option name="ruleStates">
566 125 <list>
567 126 <RuleState>
... ... @@ -572,11 +131,32 @@
572 131 </RuleState>
573 132 </list>
574 133 </option>
575   - <option name="contentProportion" value="0.027285129" />
576 134 </component>
577   - <component name="RunManager">
578   - <configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
579   - <module name="wms2" />
  135 + <component name="RunManager" selected="Spring Boot.HuaHengApplication">
  136 + <configuration name="ServiceTest.sendSimpleMail" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
  137 + <module name="huaheng" />
  138 + <extension name="coverage">
  139 + <pattern>
  140 + <option name="PATTERN" value="com.huaheng.test.*" />
  141 + <option name="ENABLED" value="true" />
  142 + </pattern>
  143 + </extension>
  144 + <option name="PACKAGE_NAME" value="com.huaheng.test" />
  145 + <option name="MAIN_CLASS_NAME" value="com.huaheng.test.ServiceTest" />
  146 + <option name="METHOD_NAME" value="sendSimpleMail" />
  147 + <option name="TEST_OBJECT" value="method" />
  148 + <method v="2">
  149 + <option name="Make" enabled="true" />
  150 + </method>
  151 + </configuration>
  152 + <configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" temporary="true" nameIsGenerated="true">
  153 + <module name="huaheng" />
  154 + <extension name="coverage">
  155 + <pattern>
  156 + <option name="PATTERN" value="com.huaheng.*" />
  157 + <option name="ENABLED" value="true" />
  158 + </pattern>
  159 + </extension>
580 160 <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" />
581 161 <option name="ALTERNATIVE_JRE_PATH" />
582 162 <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" />
... ... @@ -585,13 +165,27 @@
585 165 <option name="Make" enabled="true" />
586 166 </method>
587 167 </configuration>
  168 + <list>
  169 + <item itemvalue="JUnit.ServiceTest.sendSimpleMail" />
  170 + <item itemvalue="Spring Boot.HuaHengApplication" />
  171 + </list>
  172 + <recent_temporary>
  173 + <list>
  174 + <item itemvalue="Spring Boot.HuaHengApplication" />
  175 + <item itemvalue="JUnit.ServiceTest.sendSimpleMail" />
  176 + </list>
  177 + </recent_temporary>
588 178 </component>
589 179 <component name="ServiceViewManager">
590 180 <option name="allServicesViewState">
591 181 <serviceView>
592   - <option name="contentProportion" value="0.17857143" />
593 182 <treeState>
594   - <expand />
  183 + <expand>
  184 + <path>
  185 + <item name="services root" type="e789fda9:ObjectUtils$Sentinel" />
  186 + <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@20dd4d1b" type="7427dc5b:ServiceModel$ServiceGroupNode" />
  187 + </path>
  188 + </expand>
595 189 <select />
596 190 </treeState>
597 191 </serviceView>
... ... @@ -602,160 +196,56 @@
602 196 </component>
603 197 <component name="TaskManager">
604 198 <task active="true" id="Default" summary="Default task">
605   - <changelist id="4d9bac65-d8f6-4ced-8855-0db48f39a5f2" name="Default Changelist" comment="" />
606   - <created>1566977677142</created>
  199 + <changelist id="baeae966-16bb-4f97-a411-22fe5a65cefd" name="Default Changelist" comment="" />
  200 + <created>1567656449978</created>
607 201 <option name="number" value="Default" />
608 202 <option name="presentableId" value="Default" />
609   - <updated>1566977677142</updated>
610   - <workItem from="1566977678336" duration="306000" />
611   - <workItem from="1566978429560" duration="9246000" />
612   - <workItem from="1567038752582" duration="12361000" />
613   - <workItem from="1567057373550" duration="15293000" />
614   - <workItem from="1567125196953" duration="16752000" />
615   - <workItem from="1567643852002" duration="245000" />
  203 + <updated>1567656449978</updated>
  204 + <workItem from="1567656451211" duration="5104000" />
  205 + <workItem from="1567668214629" duration="1168000" />
  206 + <workItem from="1567669746535" duration="268000" />
  207 + <workItem from="1567670126125" duration="31000" />
  208 + <workItem from="1567670171788" duration="46000" />
  209 + <workItem from="1567670233410" duration="1528000" />
  210 + <workItem from="1567730330932" duration="8838000" />
  211 + <workItem from="1567741769966" duration="1528000" />
  212 + <workItem from="1567989403996" duration="45000" />
  213 + <workItem from="1567989504844" duration="67000" />
  214 + <workItem from="1567993387653" duration="1586000" />
  215 + <workItem from="1567998341358" duration="83000" />
  216 + <workItem from="1568001742660" duration="15312000" />
  217 + <workItem from="1568025180033" duration="84000" />
  218 + <workItem from="1568026322123" duration="15000" />
  219 + <workItem from="1568082327549" duration="3389000" />
  220 + <workItem from="1568094783772" duration="3618000" />
  221 + <workItem from="1568102171954" duration="179000" />
  222 + <workItem from="1568102802104" duration="132000" />
  223 + <workItem from="1568108585629" duration="1883000" />
616 224 </task>
617   - <task id="LOCAL-00001" summary="入库单添加时添加流程标记，审核入库单">
618   - <created>1566983055587</created>
  225 + <task id="LOCAL-00001" summary="修改添加物料时使用物料类别生成物料编码">
  226 + <created>1567664306836</created>
619 227 <option name="number" value="00001" />
620 228 <option name="presentableId" value="LOCAL-00001" />
621 229 <option name="project" value="LOCAL" />
622   - <updated>1566983055587</updated>
  230 + <updated>1567664306836</updated>
623 231 </task>
624   - <task id="LOCAL-00002" summary="添加入库单历史">
625   - <created>1566987011007</created>
  232 + <task id="LOCAL-00002" summary="修改添加物料时使用物料类别生成物料编码">
  233 + <created>1567936901056</created>
626 234 <option name="number" value="00002" />
627 235 <option name="presentableId" value="LOCAL-00002" />
628 236 <option name="project" value="LOCAL" />
629   - <updated>1566987011007</updated>
  237 + <updated>1567936901056</updated>
630 238 </task>
631   - <task id="LOCAL-00003" summary="修复入库历史controller冲突">
632   - <created>1567039165473</created>
  239 + <task id="LOCAL-00003" summary="修改质检页面、添加完成质检">
  240 + <created>1568025230030</created>
633 241 <option name="number" value="00003" />
634 242 <option name="presentableId" value="LOCAL-00003" />
635 243 <option name="project" value="LOCAL" />
636   - <updated>1567039165473</updated>
637   - </task>
638   - <task id="LOCAL-00004" summary="添加物料类别">
639   - <created>1567047135508</created>
640   - <option name="number" value="00004" />
641   - <option name="presentableId" value="LOCAL-00004" />
642   - <option name="project" value="LOCAL" />
643   - <updated>1567047135508</updated>
644   - </task>
645   - <task id="LOCAL-00005" summary="添加系统参数配置">
646   - <created>1567065008303</created>
647   - <option name="number" value="00005" />
648   - <option name="presentableId" value="LOCAL-00005" />
649   - <option name="project" value="LOCAL" />
650   - <updated>1567065008303</updated>
651   - </task>
652   - <task id="LOCAL-00006" summary="删除入库单">
653   - <created>1567065196899</created>
654   - <option name="number" value="00006" />
655   - <option name="presentableId" value="LOCAL-00006" />
656   - <option name="project" value="LOCAL" />
657   - <updated>1567065196899</updated>
658   - </task>
659   - <task id="LOCAL-00007" summary="自动生成盘点首选项表">
660   - <created>1567068662565</created>
661   - <option name="number" value="00007" />
662   - <option name="presentableId" value="LOCAL-00007" />
663   - <option name="project" value="LOCAL" />
664   - <updated>1567068662565</updated>
665   - </task>
666   - <task id="LOCAL-00008" summary="添加逻辑删除配置">
667   - <created>1567069834248</created>
668   - <option name="number" value="00008" />
669   - <option name="presentableId" value="LOCAL-00008" />
670   - <option name="project" value="LOCAL" />
671   - <updated>1567069834248</updated>
672   - </task>
673   - <task id="LOCAL-00009" summary="出库任务完成。新增allocationId字段">
674   - <created>1567672551433</created>
675   - <option name="number" value="00009" />
676   - <option name="presentableId" value="LOCAL-00009" />
677   - <option name="project" value="LOCAL" />
678   - <updated>1567672551433</updated>
  244 + <updated>1568025230030</updated>
679 245 </task>
680   - <option name="localTasksCounter" value="10" />
  246 + <option name="localTasksCounter" value="4" />
681 247 <servers />
682 248 </component>
683   - <component name="TimeTrackingManager">
684   - <option name="totallyTimeSpent" value="22177000" />
685   - </component>
686   - <component name="ToolWindowManager">
687   - <frame x="-6" y="0" width="1547" height="830" extended-state="0" />
688   - <editor active="true" />
689   - <layout>
690   - <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.25453323" />
691   - <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
692   - <window_info id="Designer" order="2" />
693   - <window_info id="Image Layers" order="3" />
694   - <window_info id="Capture Tool" order="4" />
695   - <window_info id="UI Designer" order="5" />
696   - <window_info id="Favorites" order="6" side_tool="true" />
697   - <window_info id="Web" order="7" side_tool="true" />
698   - <window_info anchor="bottom" id="Message" order="0" />
699   - <window_info anchor="bottom" id="Find" order="1" weight="0.3286119" />
700   - <window_info anchor="bottom" id="Run" order="2" />
701   - <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
702   - <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
703   - <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
704   - <window_info anchor="bottom" id="TODO" order="6" />
705   - <window_info anchor="bottom" id="Spring" order="7" />
706   - <window_info anchor="bottom" id="Terminal" order="8" />
707   - <window_info anchor="bottom" id="Docker" order="9" show_stripe_button="false" />
708   - <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.5013405" side_tool="true" weight="0.2719547" />
709   - <window_info anchor="bottom" id="Messages" order="11" weight="0.042979944" />
710   - <window_info anchor="bottom" id="Java Enterprise" order="12" />
711   - <window_info anchor="bottom" id="Database Changes" order="13" weight="0.3286119" />
712   - <window_info anchor="bottom" id="Version Control" order="14" weight="0.15864022" />
713   - <window_info active="true" anchor="bottom" id="Run Dashboard" order="15" sideWeight="0.49865952" visible="true" weight="0.16905445" />
714   - <window_info anchor="bottom" id="MyBatis Log" order="16" />
715   - <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
716   - <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
717   - <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
718   - <window_info anchor="right" id="Maven" order="3" />
719   - <window_info anchor="right" id="Palette" order="4" />
720   - <window_info anchor="right" id="Capture Analysis" order="5" />
721   - <window_info anchor="right" id="Database" order="6" />
722   - <window_info anchor="right" id="Palette&#9;" order="7" />
723   - <window_info anchor="right" id="Theme Preview" order="8" />
724   - <window_info anchor="right" id="Bean Validation" order="9" />
725   - </layout>
726   - <layout-to-restore>
727   - <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.26340482" />
728   - <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
729   - <window_info id="Web" order="2" side_tool="true" />
730   - <window_info id="Designer" order="3" />
731   - <window_info id="UI Designer" order="4" />
732   - <window_info id="Favorites" order="5" side_tool="true" />
733   - <window_info anchor="bottom" id="Message" order="0" />
734   - <window_info anchor="bottom" id="Find" order="1" weight="0.3286119" />
735   - <window_info anchor="bottom" id="Run" order="2" />
736   - <window_info anchor="bottom" id="Debug" order="3" weight="0.29036826" />
737   - <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
738   - <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
739   - <window_info anchor="bottom" id="TODO" order="6" />
740   - <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
741   - <window_info anchor="bottom" id="Version Control" order="8" weight="0.45042494" />
742   - <window_info anchor="bottom" id="Database Changes" order="9" />
743   - <window_info anchor="bottom" id="Spring" order="10" />
744   - <window_info anchor="bottom" id="MyBatis Log" order="11" weight="0.3286119" />
745   - <window_info anchor="bottom" id="Event Log" order="12" sideWeight="0.50067025" side_tool="true" weight="0.23796034" />
746   - <window_info anchor="bottom" id="Messages" order="13" weight="0.12606232" />
747   - <window_info anchor="bottom" id="Java Enterprise" order="14" />
748   - <window_info active="true" anchor="bottom" id="Run Dashboard" order="15" sideWeight="0.49932975" visible="true" weight="0.18838526" />
749   - <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
750   - <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
751   - <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
752   - <window_info anchor="right" id="Palette" order="3" />
753   - <window_info anchor="right" id="Database" order="4" />
754   - <window_info anchor="right" id="Maven" order="5" weight="0.097184986" />
755   - <window_info anchor="right" id="Bean Validation" order="6" />
756   - <window_info anchor="right" id="Palette&#9;" order="7" />
757   - </layout-to-restore>
758   - </component>
759 249 <component name="TypeScriptGeneratedFilesManager">
760 250 <option name="version" value="1" />
761 251 </component>
... ... @@ -765,373 +255,37 @@
765 255 <entry key="MAIN">
766 256 <value>
767 257 <State>
768   - <option name="RECENTLY_FILTERED_USER_GROUPS">
769   - <collection />
770   - </option>
771   - <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
772   - <collection />
773   - </option>
774   - <option name="COLUMN_ORDER">
775   - <list>
776   - <option value="0" />
777   - <option value="1" />
778   - <option value="2" />
779   - <option value="3" />
780   - </list>
781   - </option>
  258 + <option name="COLUMN_ORDER" />
782 259 </State>
783 260 </value>
784 261 </entry>
785 262 </map>
786 263 </option>
787   - <option name="RECENT_FILTERS">
788   - <map>
789   - <entry key="Branch">
790   - <value>
791   - <list />
792   - </value>
793   - </entry>
794   - <entry key="User">
795   - <value>
796   - <list />
797   - </value>
798   - </entry>
799   - </map>
800   - </option>
801 264 </component>
802 265 <component name="VcsManagerConfiguration">
803   - <MESSAGE value="盘点明细页面" />
804   - <MESSAGE value="入库单添加时添加流程标记，审核入库单" />
805   - <MESSAGE value="添加入库单历史" />
806   - <MESSAGE value="修复入库历史controller冲突" />
807   - <MESSAGE value="添加物料类别" />
808   - <MESSAGE value="添加系统参数配置" />
809   - <MESSAGE value="删除入库单" />
810   - <MESSAGE value="自动生成盘点首选项表" />
811   - <MESSAGE value="添加逻辑删除配置" />
812   - <MESSAGE value="库存和任务移库相关" />
813   - <MESSAGE value="库存移库生成和完成逻辑" />
814   - <MESSAGE value="xml" />
815   - <MESSAGE value="出库任务完成。新增allocationId字段" />
816   - <option name="LAST_COMMIT_MESSAGE" value="出库任务完成。新增allocationId字段" />
  266 + <MESSAGE value="修改添加物料时使用物料类别生成物料编码" />
  267 + <MESSAGE value="修改质检页面、添加完成质检" />
  268 + <option name="LAST_COMMIT_MESSAGE" value="修改质检页面、添加完成质检" />
817 269 </component>
818 270 <component name="XDebuggerManager">
819 271 <breakpoint-manager>
820 272 <breakpoints>
821   - <line-breakpoint type="java-line">
822   - <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/mapper/CycleCountHeaderMapper.java</url>
823   - <line>5</line>
824   - <properties />
825   - <option name="timeStamp" value="1" />
826   - </line-breakpoint>
827   - <line-breakpoint type="java-line">
828   - <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/statusFlow/controller/StatusFlowDetailController.java</url>
829   - <line>60</line>
830   - <properties />
831   - <option name="timeStamp" value="4" />
832   - </line-breakpoint>
833 273 <line-breakpoint enabled="true" type="java-line">
834   - <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeaderHistory/service/ReceiptHeaderHistoryService.java</url>
835   - <line>49</line>
836   - <properties />
837   - <option name="timeStamp" value="16" />
  274 + <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/check/checkDetail/controller/CheckDetailController.java</url>
  275 + <line>152</line>
  276 + <option name="timeStamp" value="6" />
838 277 </line-breakpoint>
839 278 <line-breakpoint enabled="true" type="java-line">
840   - <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeader/service/ReceiptHeaderService.java</url>
841   - <line>92</line>
842   - <properties />
843   - <option name="timeStamp" value="24" />
  279 + <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/check/checkDetail/controller/CheckDetailController.java</url>
  280 + <line>154</line>
  281 + <option name="timeStamp" value="8" />
844 282 </line-breakpoint>
845 283 <line-breakpoint enabled="true" type="java-line">
846   - <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/containerType/service/ContainerTypeServiceImpl.java</url>
847   - <line>31</line>
848   - <properties />
849   - <option name="timeStamp" value="26" />
850   - </line-breakpoint>
851   - <line-breakpoint enabled="true" type="java-line">
852   - <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java</url>
853   - <line>48</line>
854   - <properties />
855   - <option name="timeStamp" value="37" />
  284 + <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/check/checkDetail/service/CheckDetailService.java</url>
  285 + <line>45</line>
  286 + <option name="timeStamp" value="9" />
856 287 </line-breakpoint>
857 288 </breakpoints>
858 289 </breakpoint-manager>
859   - <watches-manager>
860   - <configuration name="SpringBootApplicationConfigurationType">
861   - <watch expression="DataUtils.getInteger(map.get(&quot;receiptId&quot;))" language="JAVA" />
862   - </configuration>
863   - </watches-manager>
864   - </component>
865   - <component name="debuggerHistoryManager">
866   - <expressions id="watch">
867   - <expression>
868   - <expression-string>DataUtils.getInteger(map.get(&quot;receiptId&quot;))</expression-string>
869   - <language-id>JAVA</language-id>
870   - <evaluation-mode>EXPRESSION</evaluation-mode>
871   - </expression>
872   - </expressions>
873   - </component>
874   - <component name="editorHistoryManager">
875   - <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">
876   - <provider selected="true" editor-type-id="text-editor">
877   - <state relative-caret-position="149">
878   - <caret line="53" column="12" selection-start-line="53" selection-start-column="12" selection-end-line="53" selection-end-column="12" />
879   - </state>
880   - </provider>
881   - </entry>
882   - <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/task/TaskHeaderMapper.xml">
883   - <provider selected="true" editor-type-id="text-editor">
884   - <state relative-caret-position="146">
885   - <caret line="45" column="31" selection-start-line="45" selection-start-column="16" selection-end-line="45" selection-end-column="31" />
886   - </state>
887   - </provider>
888   - </entry>
889   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/task/task/task.html">
890   - <provider selected="true" editor-type-id="text-editor">
891   - <state relative-caret-position="1444">
892   - <caret line="76" column="89" selection-start-line="76" selection-start-column="70" selection-end-line="76" selection-end-column="89" />
893   - </state>
894   - </provider>
895   - </entry>
896   - <entry file="file://$PROJECT_DIR$/pom.xml">
897   - <provider selected="true" editor-type-id="text-editor">
898   - <state relative-caret-position="532">
899   - <caret line="28" column="8" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="51" />
900   - </state>
901   - </provider>
902   - </entry>
903   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java">
904   - <provider selected="true" editor-type-id="text-editor">
905   - <state relative-caret-position="-66">
906   - <caret line="238" column="16" selection-start-line="238" selection-start-column="16" selection-end-line="238" selection-end-column="16" />
907   - </state>
908   - </provider>
909   - </entry>
910   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailService.java">
911   - <provider selected="true" editor-type-id="text-editor">
912   - <state relative-caret-position="209">
913   - <caret line="13" column="9" selection-start-line="13" selection-start-column="9" selection-end-line="13" selection-end-column="9" />
914   - </state>
915   - </provider>
916   - </entry>
917   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/taskHeader.html">
918   - <provider selected="true" editor-type-id="text-editor">
919   - <state relative-caret-position="214">
920   - <caret line="236" column="64" selection-start-line="236" selection-start-column="64" selection-end-line="236" selection-end-column="64" />
921   - <folding>
922   - <element signature="n#style#0;n#i#0;n#a#0;n#!!top" expanded="true" />
923   - </folding>
924   - </state>
925   - </provider>
926   - </entry>
927   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/mapper/TaskHeaderMapper.java">
928   - <provider selected="true" editor-type-id="text-editor">
929   - <state relative-caret-position="114">
930   - <caret line="11" column="30" selection-start-line="11" selection-start-column="30" selection-end-line="11" selection-end-column="30" />
931   - </state>
932   - </provider>
933   - </entry>
934   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/controller/ReceiptContainerHeaderController.java">
935   - <provider selected="true" editor-type-id="text-editor">
936   - <state relative-caret-position="323">
937   - <caret line="136" column="42" selection-start-line="136" selection-start-column="42" selection-end-line="136" selection-end-column="42" />
938   - </state>
939   - </provider>
940   - </entry>
941   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java">
942   - <provider selected="true" editor-type-id="text-editor">
943   - <state relative-caret-position="542">
944   - <caret line="117" column="45" lean-forward="true" selection-start-line="117" selection-start-column="45" selection-end-line="117" selection-end-column="45" />
945   - </state>
946   - </provider>
947   - </entry>
948   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java">
949   - <provider selected="true" editor-type-id="text-editor">
950   - <state relative-caret-position="209">
951   - <caret line="18" column="15" selection-start-line="18" selection-start-column="15" selection-end-line="18" selection-end-column="15" />
952   - </state>
953   - </provider>
954   - </entry>
955   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/domain/InventoryTransaction.java">
956   - <provider selected="true" editor-type-id="text-editor">
957   - <state relative-caret-position="226">
958   - <caret line="95" column="19" selection-start-line="95" selection-start-column="12" selection-end-line="95" selection-end-column="19" />
959   - </state>
960   - </provider>
961   - </entry>
962   - <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/config/ContainerMapper.xml">
963   - <provider selected="true" editor-type-id="text-editor">
964   - <state relative-caret-position="490">
965   - <caret line="50" column="4" selection-start-line="50" selection-start-column="4" selection-end-line="50" selection-end-column="4" />
966   - </state>
967   - </provider>
968   - </entry>
969   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/mapper/ContainerMapper.java">
970   - <provider selected="true" editor-type-id="text-editor">
971   - <state relative-caret-position="171">
972   - <caret line="14" column="9" selection-start-line="14" selection-start-column="9" selection-end-line="14" selection-end-column="9" />
973   - </state>
974   - </provider>
975   - </entry>
976   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/service/ContainerServiceImpl.java">
977   - <provider selected="true" editor-type-id="text-editor">
978   - <state relative-caret-position="471">
979   - <caret line="127" column="47" lean-forward="true" selection-start-line="127" selection-start-column="47" selection-end-line="127" selection-end-column="47" />
980   - </state>
981   - </provider>
982   - </entry>
983   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/service/ContainerService.java">
984   - <provider selected="true" editor-type-id="text-editor">
985   - <state relative-caret-position="228">
986   - <caret line="17" column="9" selection-start-line="17" selection-start-column="9" selection-end-line="17" selection-end-column="9" />
987   - </state>
988   - </provider>
989   - </entry>
990   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskDetail/domain/TaskDetail.java">
991   - <provider selected="true" editor-type-id="text-editor">
992   - <state relative-caret-position="226">
993   - <caret line="65" column="19" selection-start-line="65" selection-start-column="19" selection-end-line="65" selection-end-column="19" />
994   - </state>
995   - </provider>
996   - </entry>
997   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentHeader/service/ShipmentHeaderService.java">
998   - <provider selected="true" editor-type-id="text-editor">
999   - <state relative-caret-position="266">
1000   - <caret line="18" column="15" selection-start-line="18" selection-start-column="15" selection-end-line="18" selection-end-column="15" />
1001   - </state>
1002   - </provider>
1003   - </entry>
1004   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java">
1005   - <provider selected="true" editor-type-id="text-editor">
1006   - <state relative-caret-position="376">
1007   - <caret line="1089" column="13" lean-forward="true" selection-start-line="1089" selection-start-column="13" selection-end-line="1089" selection-end-column="13" />
1008   - <folding>
1009   - <element signature="imports" expanded="true" />
1010   - </folding>
1011   - </state>
1012   - </provider>
1013   - </entry>
1014   - <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/5.1.5.RELEASE/spring-aop-5.1.5.RELEASE.jar!/org/springframework/aop/framework/adapter/AfterReturningAdviceInterceptor.class">
1015   - <provider selected="true" editor-type-id="text-editor">
1016   - <state relative-caret-position="109">
1017   - <caret line="24" selection-start-line="24" selection-end-line="24" />
1018   - </state>
1019   - </provider>
1020   - </entry>
1021   - <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/5.1.5.RELEASE/spring-aop-5.1.5.RELEASE.jar!/org/springframework/aop/framework/ReflectiveMethodInvocation.class">
1022   - <provider selected="true" editor-type-id="text-editor">
1023   - <state relative-caret-position="89">
1024   - <caret line="69" selection-start-line="69" selection-end-line="69" />
1025   - </state>
1026   - </provider>
1027   - </entry>
1028   - <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/5.1.5.RELEASE/spring-aop-5.1.5.RELEASE.jar!/org/springframework/aop/framework/CglibAopProxy.class">
1029   - <provider selected="true" editor-type-id="text-editor">
1030   - <state relative-caret-position="89">
1031   - <caret line="472" selection-start-line="472" selection-end-line="472" />
1032   - </state>
1033   - </provider>
1034   - </entry>
1035   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html">
1036   - <provider selected="true" editor-type-id="text-editor">
1037   - <state relative-caret-position="260">
1038   - <caret line="274" column="150" selection-start-line="274" selection-start-column="150" selection-end-line="274" selection-end-column="150" />
1039   - </state>
1040   - </provider>
1041   - </entry>
1042   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html">
1043   - <provider selected="true" editor-type-id="text-editor">
1044   - <state relative-caret-position="60">
1045   - <caret line="277" column="18" lean-forward="true" selection-start-line="277" selection-start-column="18" selection-end-line="277" selection-end-column="18" />
1046   - </state>
1047   - </provider>
1048   - </entry>
1049   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java">
1050   - <provider selected="true" editor-type-id="text-editor">
1051   - <state relative-caret-position="123">
1052   - <caret line="58" column="38" selection-start-line="58" selection-start-column="19" selection-end-line="58" selection-end-column="38" />
1053   - </state>
1054   - </provider>
1055   - </entry>
1056   - <entry file="jar://C:/Program Files/Java/jdk1.8.0_202/src.zip!/java/util/function/Predicate.java">
1057   - <provider selected="true" editor-type-id="text-editor">
1058   - <state relative-caret-position="-177">
1059   - <caret line="39" column="31" lean-forward="true" selection-start-line="39" selection-start-column="31" selection-end-line="39" selection-end-column="31" />
1060   - </state>
1061   - </provider>
1062   - </entry>
1063   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java">
1064   - <provider selected="true" editor-type-id="text-editor">
1065   - <state relative-caret-position="-5200">
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/shipment/shipmentDetail/service/ShipmentDetailServiceImpl.java">
1071   - <provider selected="true" editor-type-id="text-editor">
1072   - <state relative-caret-position="-1328">
1073   - <caret line="24" column="13" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
1074   - </state>
1075   - </provider>
1076   - </entry>
1077   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentHeader/service/ShipmentHeaderServiceImpl.java">
1078   - <provider selected="true" editor-type-id="text-editor">
1079   - <state relative-caret-position="-688">
1080   - <caret line="108" column="44" lean-forward="true" selection-start-line="108" selection-start-column="44" selection-end-line="108" selection-end-column="44" />
1081   - </state>
1082   - </provider>
1083   - </entry>
1084   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentHeaderHistory/controller/ShipmentHeaderHistoryController.java">
1085   - <provider selected="true" editor-type-id="text-editor">
1086   - <state relative-caret-position="-1730">
1087   - <caret line="37" column="13" selection-start-line="37" selection-start-column="13" selection-end-line="37" selection-end-column="13" />
1088   - </state>
1089   - </provider>
1090   - </entry>
1091   - <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">
1092   - <provider selected="true" editor-type-id="text-editor">
1093   - <state relative-caret-position="89">
1094   - <caret line="102" selection-start-line="102" selection-end-line="102" />
1095   - </state>
1096   - </provider>
1097   - </entry>
1098   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/CycleCountDetailService.java">
1099   - <provider selected="true" editor-type-id="text-editor">
1100   - <state relative-caret-position="147">
1101   - <caret line="11" column="15" selection-start-line="11" selection-start-column="15" selection-end-line="11" selection-end-column="15" />
1102   - <folding>
1103   - <element signature="imports" expanded="true" />
1104   - </folding>
1105   - </state>
1106   - </provider>
1107   - </entry>
1108   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java">
1109   - <provider selected="true" editor-type-id="text-editor">
1110   - <state relative-caret-position="150">
1111   - <caret line="145" selection-start-line="145" selection-end-line="145" />
1112   - </state>
1113   - </provider>
1114   - </entry>
1115   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountDetail/cycleCountDetail.html">
1116   - <provider selected="true" editor-type-id="text-editor">
1117   - <state relative-caret-position="4104">
1118   - <caret line="335" column="20" selection-start-line="335" selection-start-column="20" selection-end-line="335" selection-end-column="20" />
1119   - </state>
1120   - </provider>
1121   - </entry>
1122   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountDetail/add.html">
1123   - <provider selected="true" editor-type-id="text-editor">
1124   - <state relative-caret-position="740">
1125   - <caret line="291" lean-forward="true" selection-start-line="291" selection-end-line="291" />
1126   - </state>
1127   - </provider>
1128   - </entry>
1129   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/CycleCountDetailServiceImpl.java">
1130   - <provider selected="true" editor-type-id="text-editor">
1131   - <state relative-caret-position="86">
1132   - <caret line="43" column="89" selection-start-line="43" selection-start-column="69" selection-end-line="43" selection-end-column="89" />
1133   - </state>
1134   - </provider>
1135   - </entry>
1136 290 </component>
1137 291 </project>
1138 292 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/check/checkDetail/controller/CheckDetailController.java
  View file @06ba3e8
... ... @@ -148,6 +148,7 @@ public class CheckDetailController extends BaseController {
148 148 @RequiresPermissions("check:checkDetail:complete")
149 149 @Log(title = "质检-质检详情 ",operating = "质检详情删除", action = BusinessType.DELETE)
150 150 @PostMapping("/complete")
  151 + @ResponseBody
151 152 public AjaxResult complete(@ApiParam(name="质检明细id",value="id")Integer id,
152 153 @ApiParam(name="库存状态",value="inventorySts",example="good,bad")String inventorySts,
153 154 @ApiParam(name = "数量",value = "qty",example = "10,20") String qty) {
... ...
src/main/java/com/huaheng/pc/check/checkDetail/service/CheckDetailService.java
  View file @06ba3e8
... ... @@ -95,7 +95,9 @@ public class CheckDetailService extends ServiceImpl&lt;CheckDetailMapper, CheckDeta
95 95 CheckHeader checkHeader = new CheckHeader();
96 96 checkHeader.setId(checkDetail.getCheckHeaderId());
97 97 checkHeader.setStatus("20");
98   - checkHeaderService.updateById(checkHeader);
  98 + if (!checkHeaderService.updateById(checkHeader)){
  99 + throw new ServiceException("更新质检头表发生错误");
  100 + }
99 101 }
100 102 return AjaxResult.success("质检完成");
101 103 }
... ...
src/main/java/com/huaheng/pc/check/checkingRegister/controller/CheckingRegisterController.java
  View file @06ba3e8
... ... @@ -88,6 +88,7 @@ public class CheckingRegisterController extends BaseController {
88 88 CheckingRegister::getInventorySts, checkingRegister.getInventorySts())
89 89 .eq(StringUtils.isNotEmpty(checkingRegister.getCheckBy()),
90 90 CheckingRegister::getCheckAt, checkingRegister.getCheckAt())
  91 + .orderByDesc(CheckingRegister::getCheckAt)
91 92 .orderByDesc(CheckingRegister::getReceiptDetailId);
92 93  
93 94 if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
... ...
src/main/java/com/huaheng/pc/config/wave/domain/Wave.java
  View file @06ba3e8
... ... @@ -118,14 +118,14 @@ public class Wave implements Serializable {
118 118 */
119 119 @TableField(value = "locked")
120 120 @ApiModelProperty(value="是否锁定")
121   - private Integer locked;
  121 + private Boolean locked;
122 122  
123 123 /**
124 124 * 是否需要补货
125 125 */
126 126 @TableField(value = "replenishmentReqd")
127 127 @ApiModelProperty(value="是否需要补货")
128   - private Integer replenishmentReqd;
  128 + private Boolean replenishmentReqd;
129 129  
130 130 /**
131 131 * 信息编码
... ...
src/main/java/com/huaheng/pc/config/waveMaster/domain/WaveMaster.java
  View file @06ba3e8
... ... @@ -146,7 +146,7 @@ public class WaveMaster implements Serializable {
146 146 */
147 147 @TableField(value = "needReplenishment")
148 148 @ApiModelProperty(value="是否补货")
149   - private Integer needReplenishment;
  149 + private Boolean needReplenishment;
150 150  
151 151 /**
152 152 * 活动单补货分配规则
... ...
src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java
  View file @06ba3e8
... ... @@ -226,4 +226,19 @@ public class ReceiptHeaderController extends BaseController {
226 226 {
227 227 return prefix + "/receiving";
228 228 }
  229 +
  230 + /**
  231 + * 入库质检
  232 + */
  233 + @ApiOperation(value="入库质检", notes="入库质检", httpMethod = "POST")
  234 + @RequiresPermissions("receipt:receiptHeader:check")
  235 + @Log(title = "入库-入库单质检",operating = "入库质检", action = BusinessType.OTHER)
  236 + @PostMapping("/remove")
  237 + @ResponseBody
  238 + public AjaxResult check(@ApiParam(name = "id", value = "入库头表id")Integer id){
  239 + if (StringUtils.isNull(id)){
  240 + return AjaxResult.error("id为空");
  241 + }
  242 + return receiptHeaderService.add(id);
  243 + }
229 244 }
... ...
src/main/java/com/huaheng/pc/receipt/receiptHeader/service/ReceiptHeaderService.java
  View file @06ba3e8
... ... @@ -6,6 +6,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
6 6 import com.huaheng.common.exception.service.ServiceException;
7 7 import com.huaheng.common.utils.security.ShiroUtils;
8 8 import com.huaheng.framework.web.domain.AjaxResult;
  9 +import com.huaheng.pc.check.checkDetail.domain.CheckDetail;
  10 +import com.huaheng.pc.check.checkDetail.service.CheckDetailService;
  11 +import com.huaheng.pc.check.checkHeader.domain.CheckHeader;
  12 +import com.huaheng.pc.check.checkHeader.service.CheckHeaderService;
9 13 import com.huaheng.pc.config.receiptType.domain.ReceiptType;
10 14 import com.huaheng.pc.config.receiptType.service.ReceiptTypeService;
11 15 import com.huaheng.pc.config.statusFlow.domain.StatusFlowDetail;
... ... @@ -30,7 +34,16 @@ public class ReceiptHeaderService extends ServiceImpl&lt;ReceiptHeaderMapper, Recei
30 34 private ReceiptTypeService receiptTypeService;
31 35 @Resource
32 36 private ReceiptDetailService receiptDetailService;
  37 + @Resource
  38 + private CheckHeaderService checkHeaderService;
  39 + @Resource
  40 + private CheckDetailService checkDetailService;
33 41  
  42 + /**
  43 + * 保存入库单
  44 + * @param receiptHeader
  45 + * @return
  46 + */
34 47 public AjaxResult saveReceiptHeader(ReceiptHeader receiptHeader){
35 48 LambdaQueryWrapper<ReceiptType> lambdaQueryWrapper = Wrappers.lambdaQuery();
36 49 lambdaQueryWrapper.eq(ReceiptType::getCode, receiptHeader.getReceiptType());
... ... @@ -54,6 +67,11 @@ public class ReceiptHeaderService extends ServiceImpl&lt;ReceiptHeaderMapper, Recei
54 67 return AjaxResult.toAjax(this.save(receiptHeader));
55 68 }
56 69  
  70 + /**
  71 + * 生成单号
  72 + * @param receiptType
  73 + * @return
  74 + */
57 75 public String createCode(String receiptType) {
58 76 String code = null;
59 77 Date now = new Date();
... ... @@ -118,4 +136,61 @@ public class ReceiptHeaderService extends ServiceImpl&lt;ReceiptHeaderMapper, Recei
118 136 receiptDetailService.updateReceiptHeaderLastStatus(id);
119 137 return AjaxResult.success("预约成功");
120 138 }
  139 +
  140 + /**
  141 + * 入库质检
  142 + */
  143 + public AjaxResult check(Integer id){
  144 +
  145 + ReceiptHeader receiptHeader = this.getById(id);
  146 + LambdaQueryWrapper<ReceiptDetail> receiptDetailLambda = Wrappers.lambdaQuery();
  147 + receiptDetailLambda.eq(ReceiptDetail::getReceiptId, id);
  148 + List<ReceiptDetail> receiptDetails = receiptDetailService.list(receiptDetailLambda);
  149 +
  150 + //创建质检头表
  151 + CheckHeader checkHeader = new CheckHeader();
  152 + checkHeader.setCode(receiptHeader.getCode());
  153 + checkHeader.setType("100");
  154 + checkHeader.setWarehouseCode(ShiroUtils.getWarehouseCode());
  155 + checkHeader.setReferCode(receiptHeader.getReferCode());
  156 + checkHeader.setEnable(1);
  157 + checkHeader.setStatus("0");
  158 + checkHeader.setCreatedBy(ShiroUtils.getLoginName());
  159 + checkHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
  160 +
  161 + if (!checkHeaderService.save(checkHeader)){
  162 + throw new ServiceException("添加质检头表发送错误");
  163 + }
  164 +
  165 + //查询保存后的质检头表
  166 + LambdaQueryWrapper<CheckHeader> checkHeaderLambda = Wrappers.lambdaQuery(checkHeader);
  167 + checkHeader = checkHeaderService.getOne(checkHeaderLambda);
  168 +
  169 + for (ReceiptDetail receiptDetail : receiptDetails) {
  170 + CheckDetail checkDetail = new CheckDetail();
  171 + checkDetail.setCheckHeaderId(checkHeader.getId());
  172 + checkDetail.setWarehouseCode(ShiroUtils.getWarehouseCode());
  173 + checkDetail.setCheckCode(checkHeader.getCode());
  174 + checkDetail.setReceiptDetailId(receiptDetail.getId());
  175 + checkDetail.setReceiptCode(receiptDetail.getReceiptCode());
  176 + checkDetail.setReferCode(checkHeader.getReferCode());
  177 + checkDetail.setMaterialCode(receiptDetail.getMaterialCode());
  178 + checkDetail.setMaterialName(receiptDetail.getMaterialName());
  179 + checkDetail.setMaterialSpec(receiptDetail.getMaterialSpec());
  180 + checkDetail.setMaterialUnit(receiptDetail.getMaterialUnit());
  181 + checkDetail.setCompanyCode(receiptDetail.getCompanyCode());
  182 + checkDetail.setInventorySts(receiptDetail.getInventorySts());
  183 + checkDetail.setStatus("0");
  184 + checkDetail.setQty(receiptDetail.getTotalQty());
  185 + checkDetail.setCheckBy(ShiroUtils.getLoginName());
  186 + checkDetail.setCreatedBy(ShiroUtils.getLoginName());
  187 + checkDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
  188 + if ( !checkDetailService.save(checkDetail) ){
  189 + throw new ServiceException("保存质检明细失败");
  190 + }
  191 + }
  192 +
  193 +
  194 + return AjaxResult.success("");
  195 + }
121 196 }
... ...
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
  View file @06ba3e8
... ... @@ -248,6 +248,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
248 248 taskDetail.setWarehouseCode(task.getWarehouseCode());
249 249 taskDetail.setCompanyCode(task.getCompanyCode());
250 250 taskDetail.setTaskType(task.getTaskType());
  251 + taskDetail.setToInventoryId(shipmentContainerDetail.getInventoryId());
251 252 taskDetail.setAllocationId(shipmentContainerDetail.getId());
252 253 taskDetail.setBillCode(shipmentContainerDetail.getShipmentCode());
253 254 taskDetail.setBillDetailId(shipmentContainerDetail.getShipmentDetailId());
... ... @@ -411,7 +412,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
411 412  
412 413  
413 414 /**
414   - *完成任务
  415 + *完成入库任务
415 416 */
416 417 @Override
417 418 @Transactional
... ... @@ -510,30 +511,6 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
510 511 if ( !taskDetailService.update(taskDetail, lambdaUpdateWrapper)){
511 512 throw new ServiceException("修改入库单明细失败");
512 513 }
513   -// //修改入库单的状态
514   -// ReceiptHeader receiptHeader = new ReceiptHeader();
515   -// receiptHeader.setFirstStatus(100);
516   -// receiptHeader.setLastStatus(100);
517   -// LambdaUpdateWrapper<ReceiptHeader> receiptHeaderLambdaUpdateWrapper = Wrappers.lambdaUpdate();
518   -// receiptHeaderLambdaUpdateWrapper.eq(ReceiptHeader::getId, DataUtils.getInteger(map.get("receiptId")));
519   -// if (!receiptHeaderService.update(receiptHeader, receiptHeaderLambdaUpdateWrapper)){
520   -// throw new ServiceException("修改入库单失败");
521   -// }
522   -// //修改任务明细的状态为完成
523   -// TaskDetail taskDetail = new TaskDetail();
524   -// taskDetail.setStatus(100);
525   -// taskDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
526   -// taskDetail.setAgingDate(new Date()); //入库时间
527   -// LambdaUpdateWrapper<TaskDetail> lambdaUpdateWrapper = Wrappers.lambdaUpdate();
528   -// lambdaUpdateWrapper.eq(TaskDetail::getTaskId, DataUtils.getInteger(map.get("taskDetailId")));
529   -// taskDetailService.update(taskDetail, lambdaUpdateWrapper);
530   -// //修改入库单的状态
531   -// ReceiptHeader receiptHeader =new ReceiptHeader();
532   -// receiptHeader.setFirstStatus(100);
533   -// receiptHeader.setLastStatus(100);
534   -// LambdaUpdateWrapper<ReceiptHeader> receiptHeaderLambdaUpdateWrapper = Wrappers.lambdaUpdate();
535   -// receiptHeaderLambdaUpdateWrapper.eq(ReceiptHeader::getId, DataUtils.getInteger(map.get("receiptId")));
536   -// receiptHeaderService.update(receiptHeader, receiptHeaderLambdaUpdateWrapper);
537 514  
538 515 //修改任务主表状态，因为立库任务表单头只对应一个货箱，表单详情的任务会同时完成
539 516 task.setStatus(100);
... ... @@ -581,24 +558,24 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
581 558 }
582 559  
583 560 //修改出库单明细
584   - if (task.getInternalTaskType()==200){
585   - LambdaQueryWrapper<TaskDetail> taskDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
586   - taskDetailLambdaQueryWrapper.eq(TaskDetail::getTaskId,task.getId());
587   - List<TaskDetail> taskDetailList = taskDetailService.list(taskDetailLambdaQueryWrapper);
588   -
589   - for (TaskDetail taskDeatails: taskDetailList) {
590   - LambdaQueryWrapper<ShipmentDetail> shipmentDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
591   - shipmentDetailLambdaQueryWrapper.eq(ShipmentDetail::getId,taskDeatails.getBillDetailId());
592   -
593   - ShipmentHeader shipmentHeader =new ShipmentHeader();
594   - shipmentHeader.setId(shipmentDetailService.getOne(shipmentDetailLambdaQueryWrapper).getShipmentId());
595   - shipmentHeader.setFirstStatus(100);
596   - shipmentHeader.setLastStatus(100);
597   - shipmentHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
598   - shipmentHeader.setLastUpdated(new Date());
599   - shipmentHeaderService.updateById(shipmentHeader);
600   - }
601   - }
  561 +// if (task.getInternalTaskType()==200){
  562 +//// LambdaQueryWrapper<TaskDetail> taskDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
  563 +//// taskDetailLambdaQueryWrapper.eq(TaskDetail::getTaskId,task.getId());
  564 +//// List<TaskDetail> taskDetailList = taskDetailService.list(taskDetailLambdaQueryWrapper);
  565 +//
  566 +//// for (TaskDetail taskDeatails: taskDetailList) {
  567 +//// LambdaQueryWrapper<ShipmentDetail> shipmentDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
  568 +//// shipmentDetailLambdaQueryWrapper.eq(ShipmentDetail::getId,taskDeatails.getBillDetailId());
  569 +////
  570 +//// ShipmentHeader shipmentHeader =new ShipmentHeader();
  571 +//// shipmentHeader.setId(shipmentDetailService.getOne(shipmentDetailLambdaQueryWrapper).getShipmentId());
  572 +//// shipmentHeader.setFirstStatus(100);
  573 +//// shipmentHeader.setLastStatus(100);
  574 +//// shipmentHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
  575 +//// shipmentHeader.setLastUpdated(new Date());
  576 +//// shipmentHeaderService.updateById(shipmentHeader);
  577 +//// }
  578 +// }
602 579  
603 580  
604 581 }
... ... @@ -1137,7 +1114,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
1137 1114 //设置子任务状态为已执行
1138 1115 taskDetail.setStatus(100);
1139 1116 taskDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
1140   - taskDetail.setLastUpdated(new Date()); //完成时间
  1117 + taskDetail.setLastUpdated(new Date());//完成时间
1141 1118 taskDetailService.updateById(taskDetail);
1142 1119 //记录库存交易记录
1143 1120 InventoryTransaction inventoryTransaction = new InventoryTransaction();
... ... @@ -1202,24 +1179,44 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
1202 1179 }
1203 1180 }
1204 1181 //设置出库货箱状态为拣货任务完成
1205   - ReceiptContainerDetail receiptContainerDetail = new ReceiptContainerDetail();
1206   - receiptContainerDetail.setStatus(30);
1207   - receiptContainerDetail.setLastUpdated(new Date());
1208   - receiptContainerDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
1209   - LambdaUpdateWrapper<ReceiptContainerDetail> receiptContainerDetailLambdaUpdateWrapper = Wrappers.lambdaUpdate();
1210   - receiptContainerDetailLambdaUpdateWrapper.eq(ReceiptContainerDetail::getId,task.getAllocationHeadId());
1211   - if (! receiptContainerDetailService.update(receiptContainerDetail, receiptContainerDetailLambdaUpdateWrapper)){
  1182 + ShipmentContainerDetail shipmentContainerDetail = new ShipmentContainerDetail();
  1183 + shipmentContainerDetail.setStatus(30);
  1184 + shipmentContainerDetail.setLastUpdated(new Date());
  1185 + shipmentContainerDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
  1186 + LambdaUpdateWrapper<ShipmentContainerDetail> shipmentContainerDetailLambdaUpdateWrapper = Wrappers.lambdaUpdate();
  1187 + shipmentContainerDetailLambdaUpdateWrapper.eq(ShipmentContainerDetail::getId,task.getAllocationHeadId());
  1188 + if (! shipmentContainerDetailService.update(shipmentContainerDetail, shipmentContainerDetailLambdaUpdateWrapper)){
1212 1189 throw new ServiceException("更新组盘明细状态失败");
1213 1190 }
1214 1191 //设置出库货箱表头状态为拣货任务完成
1215   - ReceiptContainerHeader ContainerHeader = new ReceiptContainerHeader();
1216   - ContainerHeader.setStatus((short)30);
1217   - ContainerHeader.setLastUpdated(new Date());
1218   - ContainerHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
1219   - LambdaUpdateWrapper<ReceiptContainerHeader> receiptContainerHeaderLambdaUpdateWrapper = Wrappers.lambdaUpdate();
1220   - receiptContainerHeaderLambdaUpdateWrapper.eq(ReceiptContainerHeader::getId,task.getAllocationHeadId());
1221   - if (! receiptContainerHeaderService.update(ContainerHeader, receiptContainerHeaderLambdaUpdateWrapper))
  1192 + ShipmentContainerHeader shipmentContainerHeader = new ShipmentContainerHeader();
  1193 + shipmentContainerHeader.setStatus(30);
  1194 + shipmentContainerHeader.setLastUpdated(new Date());
  1195 + shipmentContainerHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
  1196 + LambdaUpdateWrapper<ShipmentContainerHeader> shipmentContainerHeaderLambdaUpdateWrapper = Wrappers.lambdaUpdate();
  1197 + shipmentContainerHeaderLambdaUpdateWrapper.eq(ShipmentContainerHeader::getId,task.getAllocationHeadId());
  1198 + if (! shipmentContainerHeaderService.update(shipmentContainerHeader, shipmentContainerHeaderLambdaUpdateWrapper))
1222 1199 throw new ServiceException("更新组盘头状态失败");
  1200 +
  1201 +
  1202 + //修改出库单状态
  1203 + LambdaQueryWrapper<TaskDetail> taskDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
  1204 + taskDetailLambdaQueryWrapper.eq(TaskDetail::getTaskId,task.getId());
  1205 + List<TaskDetail> taskDetailList = taskDetailService.list(taskDetailLambdaQueryWrapper);
  1206 +
  1207 + for (TaskDetail taskDeatails: taskDetailList) {
  1208 + LambdaQueryWrapper<ShipmentDetail> shipmentDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
  1209 + shipmentDetailLambdaQueryWrapper.eq(ShipmentDetail::getId,taskDeatails.getBillDetailId());
  1210 +
  1211 + ShipmentHeader shipmentHeader =new ShipmentHeader();
  1212 + shipmentHeader.setId(shipmentDetailService.getOne(shipmentDetailLambdaQueryWrapper).getShipmentId());
  1213 + shipmentHeader.setFirstStatus(100);
  1214 + shipmentHeader.setLastStatus(100);
  1215 + shipmentHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
  1216 + shipmentHeader.setLastUpdated(new Date());
  1217 + shipmentHeaderService.updateById(shipmentHeader);
  1218 + }
  1219 +
1223 1220 }
1224 1221  
1225 1222  
... ...
src/main/resources/mybatis/config/WaveMapper.xml
  View file @06ba3e8
... ... @@ -17,8 +17,8 @@
17 17 <result column="completedAt" jdbcType="TIMESTAMP" property="completedAt" />
18 18 <result column="waveMode" jdbcType="VARCHAR" property="waveMode" />
19 19 <result column="errorMessage" jdbcType="VARCHAR" property="errorMessage" />
20   - <result column="locked" jdbcType="INTEGER" property="locked" />
21   - <result column="replenishmentReqd" jdbcType="INTEGER" property="replenishmentReqd" />
  20 + <result column="locked" jdbcType="BIT" property="locked" />
  21 + <result column="replenishmentReqd" jdbcType="BIT" property="replenishmentReqd" />
22 22 <result column="messageId" jdbcType="VARCHAR" property="messageId" />
23 23 <result column="runBy" jdbcType="VARCHAR" property="runBy" />
24 24 <result column="releasedBy" jdbcType="VARCHAR" property="releasedBy" />
... ...
src/main/resources/mybatis/config/WaveMasterMapper.xml
  View file @06ba3e8
... ... @@ -21,7 +21,7 @@
21 21 <result column="maxRplnQty" jdbcType="INTEGER" property="maxRplnQty" />
22 22 <result column="groupingOrderBy" jdbcType="VARCHAR" property="groupingOrderBy" />
23 23 <result column="ruleAssignmentCode" jdbcType="VARCHAR" property="ruleAssignmentCode" />
24   - <result column="needReplenishment" jdbcType="INTEGER" property="needReplenishment" />
  24 + <result column="needReplenishment" jdbcType="BIT" property="needReplenishment" />
25 25 <result column="rplnAllocationRule" jdbcType="VARCHAR" property="rplnAllocationRule" />
26 26 <result column="rplnLocatingRule" jdbcType="VARCHAR" property="rplnLocatingRule" />
27 27 <result column="created" jdbcType="TIMESTAMP" property="created" />
... ...
src/main/resources/templates/check/checkDetail/checkComplete.html
  View file @06ba3e8
... ... @@ -66,23 +66,28 @@
66 66 var tableValue;
67 67 var inventorySts;
68 68 var qty;
69   - if ( $("#inventorySts0 option:selected").val() == ""){
70   - inventorySts = $("#inventorySts0 option:selected").val()
  69 + if ( $("#inventorySts0 option:selected").val() != ""){
  70 + inventorySts = $("#inventorySts0 option:selected").val();
  71 + console.log(inventorySts);
71 72 }
72   - if ( $("#inventorySts1 option:selected").val() == ""){
73   - inventorySts = ","+$("#inventorySts1 option:selected").val()
  73 + if ( $("#inventorySts1 option:selected").val() != ""){
  74 + inventorySts += ","+$("#inventorySts1 option:selected").val()
74 75 }
75   - if ( $("#inventorySts2 option:selected").val() == ""){
76   - inventorySts = ","+$("#inventorySts2 option:selected").val()
  76 + if ( $("#inventorySts2 option:selected").val() != ""){
  77 + inventorySts += ","+$("#inventorySts2 option:selected").val()
  78 + }
  79 + if ( $("input[name='qty0']").val() != ""){
  80 + qty = $("input[name='qty0']").val();
  81 + }
  82 + if ( $("input[name='qty1']").val() != ""){
  83 + qty = ","+$("input[name='qty1']").val();
  84 + }
  85 + if ( $("input[name='qty2']").val() != ""){
  86 + qty = ","+$("input[name='qty2']").val();
77 87 }
78   - if ( $("input[name='qty"+i+"']").val() == ""){
79   - qty = $("input[name='qty"+i+"']").val()+","
80   - }
81 88  
82   - tableValue = formValueReplace(tableValue, "id", [[${checkDetailId}]]);
83   - tableValue = formValueReplace(tableValue, "inventorySts", inventorySts);
84   - tableValue = formValueReplace(tableValue, "qty", qty);
85   - $.operate.save(prefix + "/complete", $('#form-checkComplete-add').serialize());
  89 + tableValue= "id="+[[${id}]]+"&inventorySts="+inventorySts+"&qty="+qty;
  90 + $.operate.save(prefix + "/complete", tableValue);
86 91 }
87 92 });
88 93 </script>
... ...
src/main/resources/templates/check/checkDetail/checkDetail.html
  View file @06ba3e8
... ... @@ -151,7 +151,6 @@
151 151 align: 'center',
152 152 formatter: function(value, row, index) {
153 153 var actions = [];
154   - actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
155 154 if (row.status == 10) {
156 155 actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="complete(\'' + row.id + '\')"><i class="fa fa-edit"></i>质检完成</a> ');
157 156 }
... ...
src/main/resources/templates/check/checkHeader/checkHeader.html
  View file @06ba3e8
... ... @@ -103,7 +103,14 @@
103 103 title : '质检类型',
104 104 align: 'center',
105 105 formatter: function(value, row, index) {
106   - return $.table.selectDictLabel(type, value);
  106 + var actions = [];
  107 + $.each(type, function(index, dict) {
  108 + if (dict.remark == value) {
  109 + actions.push("<span class='badge badge-" + dict.listClass + "'>" + dict.dictLabel + "</span>");
  110 + return false;
  111 + }
  112 + });
  113 + return actions.join('');
107 114 }
108 115 },
109 116 {
... ... @@ -180,12 +187,7 @@
180 187 align: 'center',
181 188 formatter: function(value, row, index) {
182 189 var actions = [];
183   - if (row.status == 0){
184   - actions.push('<a id="table_edit" class="btn btn-success btn-xs ' + printFlag + '" href="#" onclick="verify(\'' + row.id + '\')"><i class="fa fa-print"></i>审核</a> ');
185   - }
186   - 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> ');
187   - actions.push('<a class="btn btn-info btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')" ><i class="fa fa-edit"></i>编辑</a> ');
188   - // actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-trash-o"></i>删除</a>');
  190 + actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-trash-o"></i>删除</a>');
189 191 return actions.join('');
190 192 }
191 193 }]
... ... @@ -209,10 +211,6 @@
209 211 $("#tabDetail").addClass("in active");
210 212 }
211 213  
212   - function verify(id) {
213   -
214   - }
215   -
216 214 function queryParams(params) {
217 215 return {
218 216 type:[[${type}]]
... ...
src/main/resources/templates/check/checkingRegister/checkingRegister.html 0 → 100644
  View file @06ba3e8
  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="col-sm-12 select-info">
  9 + <form id="company-form">
  10 + <div class="select-list">
  11 + <ul>
  12 + <li>
  13 + 质检单号：<input type="text" name="checkCode"/>
  14 + </li>
  15 + <li>
  16 + 入库单号：<input type="text" name="receiptCode"/>
  17 + </li>
  18 + <li>
  19 + 关联单号：<input type="text" name="referCode"/>
  20 + </li>
  21 + <li>
  22 + 关联行号：<input type="text" name="referLineId"/>
  23 + </li>
  24 + <li>
  25 + 物料编码：<input type="text" name="materialCode"/>
  26 + </li>
  27 + <li>
  28 + 物料名称：<input type="text" name="materialName"/>
  29 + </li>
  30 + <li>
  31 + 质检人：<input type="text" name="checkBy"/>
  32 + </li>
  33 + <li class="time">
  34 + <label>创建时间： </label>
  35 + <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[createdBegin]"/>
  36 + <span>-</span>
  37 + <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[createdEnd]"/>
  38 + </li>
  39 + <li>
  40 + <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
  41 + <!--<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="config:company:export"><i class="fa fa-download"></i>&nbsp;导出</a>-->
  42 + </li>
  43 + </ul>
  44 + </div>
  45 + </form>
  46 + </div>
  47 + <div class="btn-group hidden-xs" id="toolbar" role="group">
  48 + <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()" shiro:hasPermission="check:checkingRegister:remove">
  49 + <i class="fa fa-trash-o"></i> 删除
  50 + </a>
  51 + </div>
  52 + <div class="col-sm-12 select-info">
  53 + <table id="bootstrap-table" data-mobile-responsive="true" class="table table-bordered table-hover"></table>
  54 + </div>
  55 + </div>
  56 +</div>
  57 +<div th:include="include :: footer"></div>
  58 +<script th:inline="javascript">
  59 + var prefix = ctx + "check/checkingRegister";
  60 + var editFlag = [[${@permission.hasPermi('check:checkingRegister:edit')}]];
  61 + var removeFlag = [[${@permission.hasPermi('check:checkingRegister:remove')}]];
  62 + var inventorySts = [[${@dict.getType('inventoryStatus')}]];
  63 +
  64 + $(function() {
  65 + var options = {
  66 + url: prefix + "/list",
  67 + createUrl: prefix + "/add",
  68 + updateUrl: prefix + "/edit/{id}",
  69 + removeUrl: prefix + "/remove",
  70 + modalName: "质检报告",
  71 + search: false,
  72 + queryParams: queryParams,
  73 + sortName: "id",
  74 + sortOrder: "desc",
  75 + columns: [{
  76 + checkbox: true
  77 + },
  78 + {
  79 + field : 'id',
  80 + title : 'id'
  81 + },
  82 + {
  83 + field : 'checkDetailId',
  84 + title : '质检明细标识',
  85 + visible : false
  86 + },
  87 + {
  88 + field : 'checkHeaderId',
  89 + title : '头表标识',
  90 + visible : false
  91 + },
  92 + {
  93 + field : 'warehouseCode',
  94 + title : '仓库代码',
  95 + visible : false
  96 + },
  97 + {
  98 + field : 'checkCode',
  99 + title : '质检单号'
  100 + },
  101 + {
  102 + field : 'receiptDetailId',
  103 + title : '入库单明细标识' ,
  104 + visible:false
  105 + },
  106 + {
  107 + field : 'receiptCode',
  108 + title : '入库单号'
  109 + },
  110 + {
  111 + field : 'referCode',
  112 + title : '关联单号'
  113 + },
  114 + {
  115 + field : 'referLineId',
  116 + title : '关联行号' ,
  117 + visible:false
  118 + },
  119 + {
  120 + field : 'referPlatform',
  121 + title : '关联平台' ,
  122 + visible:false
  123 + },
  124 + {
  125 + field : 'materialCode',
  126 + title : '物料编码'
  127 + },
  128 + {
  129 + field : 'materialName',
  130 + title : '物料名称'
  131 + },
  132 + {
  133 + field : 'materialSpec',
  134 + title : '物料规格'
  135 + },
  136 + {
  137 + field : 'materialUnit',
  138 + title : '物料单位'
  139 + },
  140 + {
  141 + field : 'companyCode',
  142 + title : '货主编码' ,
  143 + visible:false
  144 + },
  145 + {
  146 + field : 'inventorySts',
  147 + title : '库存状态',
  148 + align: 'center',
  149 + formatter: function (value, row, index) {
  150 + return $.table.selectDictLabel(inventorySts, value);
  151 + }
  152 + },
  153 + {
  154 + field : 'qty',
  155 + title : '数量'
  156 + },
  157 + {
  158 + field : 'checkBy',
  159 + title : '质检人'
  160 + },
  161 + {
  162 + field : 'checkAt',
  163 + title : '质检时间'
  164 + },
  165 + {
  166 + field : 'created',
  167 + title : '创建时间'
  168 + },
  169 + {
  170 + field : 'createdBy',
  171 + title : '创建用户'
  172 + },
  173 + {
  174 + field : 'lastUpdated',
  175 + title : '更新时间'
  176 + },
  177 + {
  178 + field : 'lastUpdatedBy',
  179 + title : '更新用户'
  180 + },
  181 + {
  182 + field : 'userDef1',
  183 + title : '自定义字段1' ,
  184 + visible:false
  185 + },
  186 + {
  187 + field : 'userDef2',
  188 + title : '自定义字段2' ,
  189 + visible:false
  190 + },
  191 + {
  192 + field : 'userDef3',
  193 + title : '自定义字段3' ,
  194 + visible:false
  195 + }]
  196 + };
  197 + $.table.init(options);
  198 + });
  199 +</script>
  200 +</body>
  201 +</html>
0 202 \ No newline at end of file
... ...
src/main/resources/templates/config/wave/add.html 0 → 100644
  View file @06ba3e8
  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-wave-add">
  8 + <div class="form-group">
  9 + <label class="col-sm-3 control-label">波次名称：</label>
  10 + <div class="col-sm-8">
  11 + <input id="waveName" name="waveName" class="form-control" type="text">
  12 + </div>
  13 + </div>
  14 + <div class="form-group">
  15 + <label class="col-sm-3 control-label">波次主表：</label>
  16 + <div class="col-sm-8">
  17 + <input id="masterCode" name="masterCode" 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="status" name="status" 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 + <div class="radio radio-info radio-inline" style="transform: scale(1.1, 1.1);">
  30 + <input type="radio" id="locked1" name="locked" value="true" checked="checked"
  31 + class="radio_select">
  32 + <label for="locked1">是</label>
  33 + </div>
  34 + <div class="radio radio-danger radio-inline " style="transform: scale(1.1, 1.1);">
  35 + <input type="radio" id="locked2" name="locked" value="false">
  36 + <label for="locked2">否</label>
  37 + </div>
  38 + </div>
  39 + </div>
  40 + <div class="form-group">
  41 + <label class="col-sm-3 control-label">是否需要补货：</label>
  42 + <div class="col-sm-8">
  43 + <div class="radio radio-info radio-inline" style="transform: scale(1.1, 1.1);">
  44 + <input type="radio" id="replenishmentReqd1" name="replenishmentReqd" value="true" checked="checked"
  45 + class="radio_select">
  46 + <label for="replenishmentReqd1">是</label>
  47 + </div>
  48 + <div class="radio radio-danger radio-inline " style="transform: scale(1.1, 1.1);">
  49 + <input type="radio" id="replenishmentReqd2" name="replenishmentReqd" value="false">
  50 + <label for="replenishmentReqd2">否</label>
  51 + </div>
  52 + </div>
  53 + </div>
  54 + <div class="form-group">
  55 + <label class="col-sm-3 control-label">波次模式：</label>
  56 + <div class="col-sm-8">
  57 + <input id="waveMode" name="waveMode" class="form-control" type="text">
  58 + </div>
  59 + </div>
  60 + <!--<div class="form-group">
  61 + <label class="col-sm-3 control-label">数据版本：</label>
  62 + <div class="col-sm-8">
  63 + <input id="version" name="version" class="form-control" type="text">
  64 + </div>
  65 + </div>-->
  66 + <!--<div class="form-group"> -->
  67 + <!--<label class="col-sm-3 control-label">创建时间：</label>-->
  68 + <!--<div class="col-sm-8">-->
  69 + <!--<input id="created" name="created" class="form-control" type="text">-->
  70 + <!--</div>-->
  71 + <!--</div>-->
  72 + <!--<div class="form-group"> -->
  73 + <!--<label class="col-sm-3 control-label">创建者：</label>-->
  74 + <!--<div class="col-sm-8">-->
  75 + <!--<input id="createdBy" name="createdBy" class="form-control" type="text">-->
  76 + <!--</div>-->
  77 + <!--</div>-->
  78 + <!--<div class="form-group"> -->
  79 + <!--<label class="col-sm-3 control-label">创建时间：</label>-->
  80 + <!--<div class="col-sm-8">-->
  81 + <!--<input id="lastUpdated" name="lastUpdated" class="form-control" type="text">-->
  82 + <!--</div>-->
  83 + <!--</div>-->
  84 + <!--<div class="form-group"> -->
  85 + <!--<label class="col-sm-3 control-label">更新者：</label>-->
  86 + <!--<div class="col-sm-8">-->
  87 + <!--<input id="lastUpdatedBy" name="lastUpdatedBy" class="form-control" type="text">-->
  88 + <!--</div>-->
  89 + <!--</div>-->
  90 + <!--<div class="form-group"> -->
  91 + <!--<label class="col-sm-3 control-label">是否有效：</label>-->
  92 + <!--<div class="col-sm-8">-->
  93 + <!--&lt;!&ndash;<input id="enable" name="enable" class="form-control" type="text">&ndash;&gt;-->
  94 + <!--<div class="onoffswitch">-->
  95 + <!--<input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="enable" name="enable">-->
  96 + <!--<label class="onoffswitch-label" for="enable">-->
  97 + <!--<span class="onoffswitch-inner"></span>-->
  98 + <!--<span class="onoffswitch-switch"></span>-->
  99 + <!--</label>-->
  100 + <!--</div>-->
  101 + <!--</div>-->
  102 + <!--</div>-->
  103 + <!--<div class="form-group"> -->
  104 + <!--<label class="col-sm-3 control-label">是否删除：</label>-->
  105 + <!--<div class="col-sm-8">-->
  106 + <!--<input id="deleted" name="deleted" class="form-control" type="text">-->
  107 + <!--</div>-->
  108 + <!--</div>-->
  109 + <!--<div class="form-group"> -->
  110 + <!--<label class="col-sm-3 control-label">自定义字段1：</label>-->
  111 + <!--<div class="col-sm-8">-->
  112 + <!--<input id="userDef1" name="userDef1" class="form-control" type="text">-->
  113 + <!--</div>-->
  114 + <!--</div>-->
  115 + <!--<div class="form-group"> -->
  116 + <!--<label class="col-sm-3 control-label">自定义字段2：</label>-->
  117 + <!--<div class="col-sm-8">-->
  118 + <!--<input id="userDef2" name="userDef2" class="form-control" type="text">-->
  119 + <!--</div>-->
  120 + <!--</div>-->
  121 + <!--<div class="form-group"> -->
  122 + <!--<label class="col-sm-3 control-label">自定义字段3：</label>-->
  123 + <!--<div class="col-sm-8">-->
  124 + <!--<input id="userDef3" name="userDef3" class="form-control" type="text">-->
  125 + <!--</div>-->
  126 + <!--</div>-->
  127 + <!--<div class="form-group"> -->
  128 + <!--<label class="col-sm-3 control-label">自定义字段4：</label>-->
  129 + <!--<div class="col-sm-8">-->
  130 + <!--<input id="userDef4" name="userDef4" class="form-control" type="text">-->
  131 + <!--</div>-->
  132 + <!--</div>-->
  133 + <!--<div class="form-group"> -->
  134 + <!--<label class="col-sm-3 control-label">自定义字段5：</label>-->
  135 + <!--<div class="col-sm-8">-->
  136 + <!--<input id="userDef5" name="userDef5" class="form-control" type="text">-->
  137 + <!--</div>-->
  138 + <!--</div>-->
  139 + <div class="form-group">
  140 + <div class="form-control-static col-sm-offset-9">
  141 + <button type="submit" class="btn btn-primary">提交</button>
  142 + <button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button>
  143 + </div>
  144 + </div>
  145 + </form>
  146 +</div>
  147 +<div th:include="include::footer"></div>
  148 +<script type="text/javascript">
  149 + var prefix = ctx + "config/wave";
  150 + $("#form-wave-add").validate({
  151 + rules:{
  152 + waveName:{
  153 + required: true,
  154 + },
  155 + masterCode:{
  156 + required: true,
  157 + },
  158 + status:{
  159 + required: true,
  160 + },
  161 + locked:{
  162 + required: true,
  163 + },
  164 + replenishmentReqd:{
  165 + required: true,
  166 + },
  167 + waveMode: {
  168 + required: true,
  169 + }
  170 + },
  171 + submitHandler: function(form) {
  172 + var tableValue = $.common.getTableValue("#form-wave-add");
  173 + $.operate.save(prefix + "/add", tableValue);
  174 + }
  175 + });
  176 +</script>
  177 +</body>
  178 +</html>
... ...
src/main/resources/templates/config/wave/edit.html 0 → 100644
  View file @06ba3e8
  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" th:object="${wave}">
  7 + <form class="form-horizontal m" id="form-wave-edit">
  8 + <input name="id" th:field="*{id}">
  9 + <div class="form-group">
  10 + <label class="col-sm-3 control-label">波次名称：</label>
  11 + <div class="col-sm-8">
  12 + <input id="waveName" name="waveName" class="form-control" type="text" th:field="*{waveName}">
  13 + </div>
  14 + </div>
  15 + <div class="form-group">
  16 + <label class="col-sm-3 control-label">波次主表：</label>
  17 + <div class="col-sm-8">
  18 + <input id="masterCode" name="masterCode" class="form-control" type="text" th:field="*{masterCode}">
  19 + </div>
  20 + </div>
  21 + <div class="form-group">
  22 + <label class="col-sm-3 control-label">状态：</label>
  23 + <div class="col-sm-8">
  24 + <input id="status" name="status" class="form-control" type="text" th:field="*{status}">
  25 + </div>
  26 + </div>
  27 + <div class="form-group">
  28 + <label class="col-sm-3 control-label">是否锁定：</label>
  29 + <div class="col-sm-8">
  30 + <div class="radio radio-info radio-inline" style="transform: scale(1.1, 1.1);">
  31 + <input type="radio" id="locked1" name="locked" value="true" th:field="*{locked}"
  32 + class="radio_select">
  33 + <label for="locked1">是</label>
  34 + </div>
  35 + <div class="radio radio-danger radio-inline " style="transform: scale(1.1, 1.1);">
  36 + <input type="radio" id="locked2" name="locked" value="false" th:field="*{locked}">
  37 + <label for="locked2">否</label>
  38 + </div>
  39 + </div>
  40 + </div>
  41 + <div class="form-group">
  42 + <label class="col-sm-3 control-label">是否需要补货：</label>
  43 + <div class="col-sm-8">
  44 + <div class="radio radio-info radio-inline" style="transform: scale(1.1, 1.1);">
  45 + <input type="radio" id="replenishmentReqd1" name="replenishmentReqd" value="true" th:field="*{replenishmentReqd}"
  46 + class="radio_select">
  47 + <label for="replenishmentReqd1">是</label>
  48 + </div>
  49 + <div class="radio radio-danger radio-inline " style="transform: scale(1.1, 1.1);">
  50 + <input type="radio" id="replenishmentReqd2" name="replenishmentReqd" value="false" th:field="*{replenishmentReqd}">
  51 + <label for="replenishmentReqd2">否</label>
  52 + </div>
  53 + </div>
  54 + </div>
  55 + <div class="form-group">
  56 + <label class="col-sm-3 control-label">波次模式：</label>
  57 + <div class="col-sm-8">
  58 + <input id="waveMode" name="waveMode" class="form-control" type="text" th:field="*{waveMode}">
  59 + </div>
  60 + </div>
  61 + <!--<div class="form-group">
  62 + <label class="col-sm-3 control-label">数据版本：</label>
  63 + <div class="col-sm-8">
  64 + <input id="version" name="version" class="form-control" type="text">
  65 + </div>
  66 + </div>-->
  67 + <!--<div class="form-group"> -->
  68 + <!--<label class="col-sm-3 control-label">创建时间：</label>-->
  69 + <!--<div class="col-sm-8">-->
  70 + <!--<input id="created" name="created" class="form-control" type="text">-->
  71 + <!--</div>-->
  72 + <!--</div>-->
  73 + <!--<div class="form-group"> -->
  74 + <!--<label class="col-sm-3 control-label">创建者：</label>-->
  75 + <!--<div class="col-sm-8">-->
  76 + <!--<input id="createdBy" name="createdBy" class="form-control" type="text">-->
  77 + <!--</div>-->
  78 + <!--</div>-->
  79 + <!--<div class="form-group"> -->
  80 + <!--<label class="col-sm-3 control-label">创建时间：</label>-->
  81 + <!--<div class="col-sm-8">-->
  82 + <!--<input id="lastUpdated" name="lastUpdated" class="form-control" type="text">-->
  83 + <!--</div>-->
  84 + <!--</div>-->
  85 + <!--<div class="form-group"> -->
  86 + <!--<label class="col-sm-3 control-label">更新者：</label>-->
  87 + <!--<div class="col-sm-8">-->
  88 + <!--<input id="lastUpdatedBy" name="lastUpdatedBy" class="form-control" type="text">-->
  89 + <!--</div>-->
  90 + <!--</div>-->
  91 + <!--<div class="form-group"> -->
  92 + <!--<label class="col-sm-3 control-label">是否有效：</label>-->
  93 + <!--<div class="col-sm-8">-->
  94 + <!--&lt;!&ndash;<input id="enable" name="enable" class="form-control" type="text">&ndash;&gt;-->
  95 + <!--<div class="onoffswitch">-->
  96 + <!--<input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="enable" name="enable">-->
  97 + <!--<label class="onoffswitch-label" for="enable">-->
  98 + <!--<span class="onoffswitch-inner"></span>-->
  99 + <!--<span class="onoffswitch-switch"></span>-->
  100 + <!--</label>-->
  101 + <!--</div>-->
  102 + <!--</div>-->
  103 + <!--</div>-->
  104 + <!--<div class="form-group"> -->
  105 + <!--<label class="col-sm-3 control-label">是否删除：</label>-->
  106 + <!--<div class="col-sm-8">-->
  107 + <!--<input id="deleted" name="deleted" class="form-control" type="text">-->
  108 + <!--</div>-->
  109 + <!--</div>-->
  110 + <!--<div class="form-group"> -->
  111 + <!--<label class="col-sm-3 control-label">自定义字段1：</label>-->
  112 + <!--<div class="col-sm-8">-->
  113 + <!--<input id="userDef1" name="userDef1" class="form-control" type="text">-->
  114 + <!--</div>-->
  115 + <!--</div>-->
  116 + <!--<div class="form-group"> -->
  117 + <!--<label class="col-sm-3 control-label">自定义字段2：</label>-->
  118 + <!--<div class="col-sm-8">-->
  119 + <!--<input id="userDef2" name="userDef2" class="form-control" type="text">-->
  120 + <!--</div>-->
  121 + <!--</div>-->
  122 + <!--<div class="form-group"> -->
  123 + <!--<label class="col-sm-3 control-label">自定义字段3：</label>-->
  124 + <!--<div class="col-sm-8">-->
  125 + <!--<input id="userDef3" name="userDef3" class="form-control" type="text">-->
  126 + <!--</div>-->
  127 + <!--</div>-->
  128 + <!--<div class="form-group"> -->
  129 + <!--<label class="col-sm-3 control-label">自定义字段4：</label>-->
  130 + <!--<div class="col-sm-8">-->
  131 + <!--<input id="userDef4" name="userDef4" class="form-control" type="text">-->
  132 + <!--</div>-->
  133 + <!--</div>-->
  134 + <!--<div class="form-group"> -->
  135 + <!--<label class="col-sm-3 control-label">自定义字段5：</label>-->
  136 + <!--<div class="col-sm-8">-->
  137 + <!--<input id="userDef5" name="userDef5" class="form-control" type="text">-->
  138 + <!--</div>-->
  139 + <!--</div>-->
  140 + <div class="form-group">
  141 + <div class="form-control-static col-sm-offset-9">
  142 + <button type="submit" class="btn btn-primary">提交</button>
  143 + <button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button>
  144 + </div>
  145 + </div>
  146 + </form>
  147 +</div>
  148 +<div th:include="include::footer"></div>
  149 +<script type="text/javascript">
  150 + var prefix = ctx + "config/wave";
  151 + $("#form-wave-edit").validate({
  152 + rules:{
  153 + waveName:{
  154 + required: true,
  155 + },
  156 + masterCode:{
  157 + required: true,
  158 + },
  159 + status:{
  160 + required: true,
  161 + },
  162 + locked:{
  163 + required: true,
  164 + },
  165 + replenishmentReqd:{
  166 + required: true,
  167 + },
  168 + waveMode: {
  169 + required: true,
  170 + }
  171 + },
  172 + submitHandler: function(form) {
  173 + var tableValue = $.common.getTableValue("#form-wave-edit");
  174 + $.operate.save(prefix + "/edit", tableValue);
  175 + }
  176 + });
  177 +</script>
  178 +</body>
  179 +</html>
... ...
src/main/resources/templates/config/wave/wave.html 0 → 100644
  View file @06ba3e8
  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="col-sm-12 select-info">
  9 + <form id="wave-form">
  10 + <div class="select-list">
  11 + <ul>
  12 + <li>
  13 + 波次名称：<input type="text" name="waveName"/>
  14 + </li>
  15 + <li>
  16 + 波次主表：<input type="text" name="masterCode"/>
  17 + </li>
  18 + <li class="time">
  19 + <label>创建时间： </label>
  20 + <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="createdBegin"/>
  21 + <span>-</span>
  22 + <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="createdEnd"/>
  23 + </li>
  24 + <li>
  25 + <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
  26 + <!--<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="system:role:export"><i class="fa fa-download"></i>&nbsp;导出</a>-->
  27 + </li>
  28 + </ul>
  29 + </div>
  30 + </form>
  31 + </div>
  32 + <div class="btn-group hidden-xs" id="toolbar" role="group">
  33 + <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="config:wave:add">
  34 + <i class="fa fa-plus"></i> 新增
  35 + </a>
  36 + <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()" shiro:hasPermission="config:wave:remove">
  37 + <i class="fa fa-trash-o"></i> 删除
  38 + </a>
  39 + </div>
  40 +
  41 + <div class="col-sm-12 select-info">
  42 + <table id="bootstrap-table" data-mobile-responsive="true" class="table table-bordered table-hover"></table>
  43 + </div>
  44 + <div>
  45 + </div>
  46 + <div th:include="include :: footer"></div>
  47 + <script th:inline="javascript">
  48 + var editFlag = [[${@permission.hasPermi('config:wave:edit')}]];
  49 + var removeFlag = [[${@permission.hasPermi('config:wave:remove')}]];
  50 + var prefix = ctx + "config/wave";
  51 + var datas = [[${@dict.getType('sys_normal_disable')}]];
  52 + $(function() {
  53 + var options = {
  54 + url: prefix + "/list",
  55 + createUrl: prefix + "/add",
  56 + updateUrl: prefix + "/edit/{id}",
  57 + removeUrl: prefix + "/remove",
  58 + modalName: "波次",
  59 + search: false,
  60 + columns: [{
  61 + checkbox: true
  62 + },
  63 + {
  64 + field : 'id',
  65 + title : 'ID'
  66 + },
  67 + {
  68 + field : 'waveName',
  69 + title : '波次名称'
  70 + },
  71 + {
  72 + field : 'masterCode',
  73 + title : '波次主表'
  74 + },
  75 + {
  76 + field : 'status',
  77 + title : '状态'
  78 + },
  79 + {
  80 + field : 'warehouseCode',
  81 + title : '仓库编码',
  82 + visible : false
  83 + },
  84 + {
  85 + field : 'currentWaveStep',
  86 + title : '当前波次步骤',
  87 + },
  88 + {
  89 + field : 'lastWaveStep',
  90 + title : '上一波次步骤',
  91 + },
  92 + {
  93 + field : 'totalShipments',
  94 + title : '总单数',
  95 + },
  96 + {
  97 + field : 'totalLines',
  98 + title : '总行数'
  99 + },
  100 + {
  101 + field : 'totalQty',
  102 + title : '总数量'
  103 + },
  104 + {
  105 + field : 'locked',
  106 + title : '是否锁定',
  107 + formatter: function (value, item, index) {
  108 + if (value==true) {
  109 + return '<span class="badge" style="background-color: #00B83F;color: white;width: 36px;">' + ' 是 ' + '</span>';
  110 + }
  111 + else if (value==false) {
  112 + return '<span class="badge" style="background-color: #ff0000;color: white;width: 36px;">' + ' 否 ' + '</span>';
  113 + }
  114 + }
  115 + },
  116 + {
  117 + field : 'replenishmentReqd',
  118 + title : '是否需要补货',
  119 + formatter: function (value, item, index) {
  120 + if (value==true) {
  121 + return '<span class="badge" style="background-color: #00B83F;color: white;width: 36px;">' + ' 是 ' + '</span>';
  122 + }
  123 + else if (value==false) {
  124 + return '<span class="badge" style="background-color: #ff0000;color: white;width: 36px;">' + ' 否 ' + '</span>';
  125 + }
  126 + }
  127 + },
  128 + {
  129 + field : 'startedAt',
  130 + title : '波次开始时间'
  131 + },
  132 + {
  133 + field : 'completedAt',
  134 + title : '波次结束时间'
  135 + },
  136 + {
  137 + field : 'waveMode',
  138 + title : '波次模式'
  139 + },
  140 + {
  141 + field : 'errorMessage',
  142 + title : '错误信息'
  143 + },
  144 + {
  145 + field : 'runBy',
  146 + title : '信息编码'
  147 + },
  148 + {
  149 + field : 'created',
  150 + title : '创建时间',
  151 + visible : false
  152 + },
  153 + {
  154 + field : 'createdBy',
  155 + title : '创建用户',
  156 + visible : false
  157 + },
  158 + {
  159 + field : 'lastUpdated',
  160 + title : '更新时间',
  161 + visible : false
  162 + },
  163 + {
  164 + field : 'lastUpdatedBy',
  165 + title : '更新用户',
  166 + visible : false
  167 + },
  168 + {
  169 + field : 'version',
  170 + title : '数据版本',
  171 + visible : false
  172 + },
  173 + {
  174 + field : 'processStamp',
  175 + title : '处理标记',
  176 + visible : false
  177 + },
  178 + {
  179 + field : 'userDef1',
  180 + title : '自定义字段1' ,
  181 + visible:false
  182 + },
  183 + {
  184 + field : 'userDef2',
  185 + title : '自定义字段2' ,
  186 + visible:false
  187 + },
  188 + {
  189 + field : 'userDef3',
  190 + title : '自定义字段3' ,
  191 + visible:false
  192 + },
  193 + {
  194 + field : 'userDef4',
  195 + title : '自定义字段4' ,
  196 + visible:false
  197 + },
  198 + {
  199 + title: '操作',
  200 + align: 'center',
  201 + formatter: function(value, row, index) {
  202 + var actions = [];
  203 + actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')" ><i class="fa fa-edit"></i>编辑</a> ');
  204 + actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')" ><i class="fa fa-trash-o"></i>删除</a>');
  205 + return actions.join('');
  206 + }
  207 + }]
  208 + };
  209 + $.table.init(options);
  210 + });
  211 + </script>
  212 +</body>
  213 +</html>
0 214 \ No newline at end of file
... ...
src/main/resources/templates/config/waveFlowDetail/add.html 0 → 100644
  View file @06ba3e8
  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-filterConfigDetail-add">
  8 + <input name="headerId" type="hidden" th:value="${headerId}">
  9 + <div class="form-group">
  10 + <label class="col-sm-3 control-label">编码：</label>
  11 + <div class="col-sm-8">
  12 + <input id="code" name="code" class="form-control" type="text">
  13 + </div>
  14 + </div>
  15 + <div class="form-group">
  16 + <label class="col-sm-3 control-label">模块：</label>
  17 + <div class="col-sm-8">
  18 + <input id="moduleType" name="moduleType" class="form-control" type="text">
  19 + </div>
  20 + </div>
  21 + <div class="form-group">
  22 + <label class="col-sm-3 control-label">类型：</label>
  23 + <div class="col-sm-8">
  24 + <input id="recordType" name="recordType" class="form-control" type="text">
  25 + </div>
  26 + </div>
  27 + <div class="form-group">
  28 + <label class="col-sm-3 control-label">条件名：</label>
  29 + <div class="col-sm-8">
  30 + <input id="filterCode" name="filterCode" class="form-control" type="text">
  31 + </div>
  32 + </div>
  33 + <div class="form-group">
  34 + <label class="col-sm-3 control-label">描述：</label>
  35 + <div class="col-sm-8">
  36 + <input id="description" name="description" class="form-control" type="text">
  37 + </div>
  38 + </div>
  39 + <div class="form-group">
  40 + <label class="col-sm-3 control-label">全SQL：</label>
  41 + <div class="col-sm-8">
  42 + <input id="statement" name="statement" class="form-control" type="text">
  43 + </div>
  44 + </div>
  45 + <div class="form-group">
  46 + <label class="col-sm-3 control-label">是否系统创建：</label>
  47 + <div class="col-sm-8">
  48 + <div class="radio radio-info radio-inline" style="transform: scale(1.1, 1.1);">
  49 + <input type="radio" id="systemCreated1" name="systemCreated" value="true" checked="checked"
  50 + class="radio_select">
  51 + <label for="systemCreated1">是</label>
  52 + </div>
  53 + <div class="radio radio-danger radio-inline " style="transform: scale(1.1, 1.1);">
  54 + <input type="radio" id="systemCreated2" name="systemCreated" value="false">
  55 + <label for="systemCreated2">否</label>
  56 + </div>
  57 + </div>
  58 + </div>
  59 + <div class="form-group">
  60 + <label class="col-sm-3 control-label">是否自定义SQL：</label>
  61 + <div class="col-sm-8">
  62 + <div class="radio radio-info radio-inline" style="transform: scale(1.1, 1.1);">
  63 + <input type="radio" id="customSql1" name="customSql" value="true" checked="checked"
  64 + class="radio_select">
  65 + <label for="customSql1">是</label>
  66 + </div>
  67 + <div class="radio radio-danger radio-inline " style="transform: scale(1.1, 1.1);">
  68 + <input type="radio" id="customSql2" name="customSql" value="false">
  69 + <label for="customSql2">否</label>
  70 + </div>
  71 + </div>
  72 + </div>
  73 + <div class="form-group">
  74 + <div class="form-control-static col-sm-offset-9">
  75 + <button type="submit" class="btn btn-primary">提交</button>
  76 + <button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button>
  77 + </div>
  78 + </div>
  79 + </form>
  80 +</div>
  81 +<div th:include="include::footer"></div>
  82 +<script type="text/javascript">
  83 + var prefix = ctx + "config/filterConfigDetail";
  84 + $("#form-filterConfigDetail-add").validate({
  85 + rules:{
  86 + code:{
  87 + required:true,
  88 + },
  89 + moduleType:{
  90 + required:true,
  91 + },
  92 + recordType:{
  93 + required:true,
  94 + },
  95 + filterCode:{
  96 + required:true,
  97 + },
  98 + },
  99 + submitHandler: function(form) {
  100 + // $.operate.save(prefix + "/add", $('#form-locationType-add').serialize());
  101 + var tableValue = $.common.getTableValue("#form-filterConfigDetail-add");
  102 + $.operate.save(prefix + "/add", tableValue);
  103 + }
  104 + });
  105 +</script>
  106 +</body>
  107 +</html>
... ...
src/main/resources/templates/config/waveFlowDetail/edit.html 0 → 100644
  View file @06ba3e8
  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-filterConfigDetail-edit" th:object="${filterConfigDetail}">
  8 + <input name="id" type="hidden" th:field="*{id}">
  9 + <input name="headerId" type="hidden" th:field="*{headerId}">
  10 + <div class="form-group">
  11 + <label class="col-sm-3 control-label">编码：</label>
  12 + <div class="col-sm-8">
  13 + <input id="code" name="code" class="form-control" type="text" th:field="*{code}">
  14 + </div>
  15 + </div>
  16 + <div class="form-group">
  17 + <label class="col-sm-3 control-label">模块：</label>
  18 + <div class="col-sm-8">
  19 + <input id="moduleType" name="moduleType" class="form-control" type="text" th:field="*{moduleType}">
  20 + </div>
  21 + </div>
  22 + <div class="form-group">
  23 + <label class="col-sm-3 control-label">类型：</label>
  24 + <div class="col-sm-8">
  25 + <input id="recordType" name="recordType" class="form-control" type="text" th:field="*{recordType}">
  26 + </div>
  27 + </div>
  28 + <div class="form-group">
  29 + <label class="col-sm-3 control-label">条件名：</label>
  30 + <div class="col-sm-8">
  31 + <input id="filterCode" name="filterCode" class="form-control" type="text" th:field="*{filterCode}">
  32 + </div>
  33 + </div>
  34 + <div class="form-group">
  35 + <label class="col-sm-3 control-label">描述：</label>
  36 + <div class="col-sm-8">
  37 + <input id="description" name="description" class="form-control" type="text" th:field="*{description}">
  38 + </div>
  39 + </div>
  40 + <div class="form-group">
  41 + <label class="col-sm-3 control-label">全SQL：</label>
  42 + <div class="col-sm-8">
  43 + <input id="statement" name="statement" class="form-control" type="text" th:field="*{statement}">
  44 + </div>
  45 + </div>
  46 + <div class="form-group">
  47 + <label class="col-sm-3 control-label">是否系统创建：</label>
  48 + <div class="col-sm-8">
  49 + <div class="radio radio-info radio-inline" style="transform: scale(1.1, 1.1);">
  50 + <input type="radio" id="systemCreated1" name="systemCreated" value="true" th:field="*{systemCreated}"
  51 + class="radio_select">
  52 + <label for="systemCreated1">是</label>
  53 + </div>
  54 + <div class="radio radio-danger radio-inline " style="transform: scale(1.1, 1.1);">
  55 + <input type="radio" id="systemCreated2" name="systemCreated" value="false" th:field="*{systemCreated}">
  56 + <label for="systemCreated2">否</label>
  57 + </div>
  58 + </div>
  59 + </div>
  60 + <div class="form-group">
  61 + <label class="col-sm-3 control-label">是否自定义SQL：</label>
  62 + <div class="col-sm-8">
  63 + <div class="radio radio-info radio-inline" style="transform: scale(1.1, 1.1);">
  64 + <input type="radio" id="customSql1" name="customSql" value="true" th:field="*{customSql}"
  65 + class="radio_select">
  66 + <label for="customSql1">是</label>
  67 + </div>
  68 + <div class="radio radio-danger radio-inline " style="transform: scale(1.1, 1.1);">
  69 + <input type="radio" id="customSql2" name="customSql" value="false" th:field="*{customSql}">
  70 + <label for="customSql2">否</label>
  71 + </div>
  72 + </div>
  73 + </div>
  74 + <div class="form-group">
  75 + <div class="form-control-static col-sm-offset-9">
  76 + <button type="submit" class="btn btn-primary">提交</button>
  77 + <button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button>
  78 + </div>
  79 + </div>
  80 + </form>
  81 +</div>
  82 +<div th:include="include::footer"></div>
  83 +<script type="text/javascript">
  84 + var prefix = ctx + "config/filterConfigDetail";
  85 + $("#form-filterConfigDetail-edit").validate({
  86 + rules:{
  87 + code:{
  88 + required:true,
  89 + },
  90 + moduleType:{
  91 + required:true,
  92 + },
  93 + recordType:{
  94 + required:true,
  95 + },
  96 + filterCode:{
  97 + required:true,
  98 + },
  99 + },
  100 + submitHandler: function(form) {
  101 + // $.operate.save(prefix + "/add", $('#form-locationType-add').serialize());
  102 + var tableValue = $.common.getTableValue("#form-filterConfigDetail-edit");
  103 + $.operate.save(prefix + "/edit", tableValue);
  104 + }
  105 + });
  106 +</script>
  107 +</body>
  108 +</html>
... ...
src/main/resources/templates/config/waveFlowDetail/waveFlowDetail.html 0 → 100644
  View file @06ba3e8
  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>
  6 +
  7 +<div class="btn-group hidden-xs" id="toolbar" role="group">
  8 + <a class="btn btn-outline btn-success btn-rounded" onclick="add()" shiro:hasPermission="config:waveFlowDetail:add">
  9 + <i class="fa fa-plus"></i> 新增
  10 + </a>
  11 + <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()" shiro:hasPermission="config:waveFlowDetail:remove">
  12 + <i class="fa fa-trash-o"></i> 删除
  13 + </a>
  14 +</div>
  15 +<div class="col-sm-12">
  16 + <table id="bootstrap-table" data-mobile-responsive="true" class="table table-bordered table-hover"></table>
  17 +</div>
  18 +
  19 +
  20 +<div th:include="include :: footer"></div>
  21 +<script th:inline="javascript">
  22 + var prefix = ctx + "config/waveFlowDetail";
  23 + var editFlag = [[${@permission.hasPermi('config:waveFlowDetail:edit')}]];
  24 + var removeFlag = [[${@permission.hasPermi('config:waveFlowDetail:remove')}]];
  25 + var datas = [[${@dict.getType('sys_normal_disable')}]];
  26 + var nessaryDatas = [[${@dict.getType('nessary')}]];
  27 + $(function() {
  28 + var options = {
  29 + url: prefix + "/list",
  30 + createUrl: prefix + "/add",
  31 + updateUrl: prefix + "/edit/{id}",
  32 + removeUrl: prefix + "/remove",
  33 + modalName: "订单分析明细",
  34 + queryParams:function(params) {
  35 + return {
  36 + // 传递参数查询参数
  37 + headerId: [[${headerId}]],
  38 + pageSize: params.limit,
  39 + pageNum: params.offset / params.limit + 1,
  40 + searchValue: params.search,
  41 + orderByColumn: params.sort,
  42 + isAsc: params.order
  43 + };
  44 + },
  45 + search: false,
  46 + sortName: "id",
  47 + sortOrder: "desc",
  48 + columns: [{
  49 + checkbox: true
  50 + },
  51 + {
  52 + field : 'id',
  53 + title : 'id'
  54 + },
  55 + {
  56 + field : 'headerId',
  57 + title : '头表id',
  58 + visible: false
  59 + },
  60 + {
  61 + field : 'waveFlowCode',
  62 + title : '波次流程'
  63 + },
  64 + {
  65 + field : 'sequence',
  66 + title : '序号'
  67 + },
  68 + {
  69 + field : 'waveStepCode',
  70 + title : '波次步骤'
  71 + },
  72 + {
  73 + field : 'waveStepName',
  74 + title : '描述'
  75 + },
  76 + {
  77 + field : 'value1',
  78 + title : '参数1',
  79 + visible : false
  80 + },
  81 + {
  82 + field : 'value2',
  83 + title : '参数2',
  84 + visible : false
  85 + },
  86 + {
  87 + field : 'value3',
  88 + title : '参数3',
  89 + visible : false
  90 + },
  91 + {
  92 + field : 'created',
  93 + title : '创建时间'
  94 + },
  95 + {
  96 + field : 'createdBy',
  97 + title : '创建用户'
  98 + },
  99 + {
  100 + field : 'lastUpdated',
  101 + title : '更新时间'
  102 + },
  103 + {
  104 + field : 'lastUpdatedBy',
  105 + title : '更新用户'
  106 + },
  107 + {
  108 + field : 'userDef1',
  109 + title : '自定义字段1' ,
  110 + visible:false
  111 + },
  112 + {
  113 + field : 'userDef2',
  114 + title : '自定义字段2' ,
  115 + visible:false
  116 + },
  117 + {
  118 + field : 'userDef3',
  119 + title : '自定义字段3' ,
  120 + visible:false
  121 + },
  122 + {
  123 + title: '操作',
  124 + align: 'center',
  125 + formatter: function(value, row, index) {
  126 + var actions = [];
  127 + actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
  128 + actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-trash-o"></i>删除</a>');
  129 + return actions.join('');
  130 + }
  131 + }]
  132 + };
  133 + $.table.init(options);
  134 + });
  135 +
  136 + function add() {
  137 + var headerId = [[${headerId}]];
  138 + $.modal.open("添加流程明细", prefix + "/add/"+headerId);
  139 + }
  140 +</script>
  141 +</body>
  142 +</html>
0 143 \ No newline at end of file
... ...
src/main/resources/templates/config/waveFlowHeader/add.html 0 → 100644
  View file @06ba3e8
  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-filterConfigHeader-add">
  8 + <div class="form-group">
  9 + <label class="col-sm-3 control-label">流程名称：</label>
  10 + <div class="col-sm-8">
  11 + <input id="code" name="code" class="form-control" type="text">
  12 + </div>
  13 + </div>
  14 + <div class="form-group">
  15 + <div class="form-control-static col-sm-offset-9">
  16 + <button type="submit" class="btn btn-primary">提交</button>
  17 + <button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button>
  18 + </div>
  19 + </div>
  20 + </form>
  21 +</div>
  22 +<div th:include="include::footer"></div>
  23 +<script type="text/javascript">
  24 + var prefix = ctx + "config/filterConfigHeader";
  25 + $("#form-filterConfigHeader-add").validate({
  26 + rules: {
  27 + code: {
  28 + required: true,
  29 + }
  30 + },
  31 + submitHandler: function (form) {
  32 + // $.operate.save(prefix + "/add", $('#form-locationType-add').serialize());
  33 + var tableValue = $.common.getTableValue("#form-filterConfigHeader-add");
  34 + $.operate.save(prefix + "/add", tableValue);
  35 + }
  36 + });
  37 +</script>
  38 +</body>
  39 +</html>
... ...
src/main/resources/templates/config/waveFlowHeader/edit.html 0 → 100644
  View file @06ba3e8
  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-waveFlowHeader-edit" th:object="${waveFlowHeader}">
  8 + <input name="id" th:field="*{id}" type="hidden">
  9 + <div class="form-group">
  10 + <label class="col-sm-3 control-label">流程名称：</label>
  11 + <div class="col-sm-8">
  12 + <input id="code" name="code" class="form-control" type="text" th:field="*{code}">
  13 + </div>
  14 + </div>
  15 + <!--<div class="form-group">-->
  16 + <!--<label class="col-sm-3 control-label">是否系统创建：</label>-->
  17 + <!--<div class="col-sm-8">-->
  18 + <!--<div class="onoffswitch">-->
  19 + <!--<input type="checkbox" th:checked="${systemCreated}" class="onoffswitch-checkbox" id="systemCreated" name="systemCreated">-->
  20 + <!--<label class="onoffswitch-label" for="systemCreated">-->
  21 + <!--<span class="onoffswitch-inner"></span>-->
  22 + <!--<span class="onoffswitch-switch"></span>-->
  23 + <!--</label>-->
  24 + <!--</div>-->
  25 + <!--</div>-->
  26 + <!--</div>-->
  27 + <div class="form-group">
  28 + <div class="form-control-static col-sm-offset-9">
  29 + <button type="submit" class="btn btn-primary">提交</button>
  30 + <button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button>
  31 + </div>
  32 + </div>
  33 + </form>
  34 +</div>
  35 +<div th:include="include::footer"></div>
  36 +<script type="text/javascript">
  37 + var prefix = ctx + "config/waveFlowHeader";
  38 + $("#form-waveFlowHeader-edit").validate({
  39 + rules:{
  40 + code:{
  41 + required:true,
  42 + }
  43 + },
  44 + submitHandler: function(form) {
  45 + var tableValue = $.common.getTableValue("#form-waveFlowHeader-edit");
  46 + $.operate.save(prefix + "/edit", tableValue);
  47 + }
  48 + });
  49 +</script>
  50 +</body>
  51 +</html>
... ...
src/main/resources/templates/config/waveFlowHeader/waveFlowHeader.html 0 → 100644
  View file @06ba3e8
  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="waveFlowHeader-form">
  18 + <div class="select-list">
  19 + <ul>
  20 + <li>
  21 + 流程名称：<input type="text" name="code"/>
  22 + </li>
  23 + <li class="time">
  24 + <label>创建时间： </label>
  25 + <input type="text" class="time-input" id="startTime" placeholder="开始时间"
  26 + name="createdBegin"/>
  27 + <span>-</span>
  28 + <input type="text" class="time-input" id="endTime" placeholder="结束时间"
  29 + name="createdEnd"/>
  30 + </li>
  31 + <li>
  32 + <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
  33 + class="fa fa-search"></i>&nbsp;搜索</a>
  34 + </li>
  35 + </ul>
  36 + </div>
  37 + </form>
  38 + </div>
  39 +
  40 +
  41 + <div class="btn-group hidden-xs" id="toolbar" role="group">
  42 + <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()"
  43 + shiro:hasPermission="config:waveFlowHeader:add">
  44 + <i class="fa fa-plus"></i> 新增
  45 + </a>
  46 + <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()"
  47 + shiro:hasPermission="config:waveFlowHeader:remove">
  48 + <i class="fa fa-trash-o"></i> 删除
  49 + </a>
  50 + </div>
  51 +
  52 + <table id="bootstrap-table" data-mobile-responsive="true" class="table table-bordered table-hover"></table>
  53 + </div>
  54 +
  55 + <div class="tab-pane fade" id="tabDetail">
  56 + <table id="bootstrap-table1" data-mobile-responsive="true"
  57 + class="table table-bordered table-hover"></table>
  58 + </div>
  59 + </div>
  60 + </div>
  61 + </div>
  62 +</div>
  63 +<div th:include="include :: footer"></div>
  64 +<script th:inline="javascript">
  65 + var prefix = ctx + "config/waveFlowHeader";
  66 + var prefix1 = ctx + "config/waveFlowDetail";
  67 + var editFlag = [[${@permission.hasPermi('config:waveFlowHeader:edit')}]];
  68 + var removeFlag = [[${@permission.hasPermi('config:waveFlowHeader:remove')}]];
  69 + var datas = [[${@dict.getType('sys_normal_disable')}]];
  70 +
  71 + $(function() {
  72 + var options = {
  73 + url: prefix + "/list",
  74 + createUrl: prefix + "/add",
  75 + updateUrl: prefix + "/edit/{id}",
  76 + removeUrl: prefix + "/remove",
  77 + modalName: "订单分析主表",
  78 + search: false,
  79 + sortName: "id",
  80 + sortOrder: "desc",
  81 + columns: [{
  82 + checkbox: true
  83 + },
  84 + {
  85 + field : 'id',
  86 + title : 'id'
  87 + },
  88 + {
  89 + field : 'code',
  90 + title : '流程名称'
  91 + },
  92 + {
  93 + field : 'version',
  94 + title : '数据版本',
  95 + visible : false
  96 + },
  97 + {
  98 + field : 'processStamp',
  99 + title : '处理标记',
  100 + visible : false
  101 + },
  102 + {
  103 + field : 'created',
  104 + title : '创建时间',
  105 + visible : false
  106 + },
  107 + {
  108 + field : 'createdBy',
  109 + title : '创建用户',
  110 + visible : false
  111 + },
  112 + {
  113 + field : 'lastUpdated',
  114 + title : '更新时间',
  115 + visible : false
  116 + },
  117 + {
  118 + field : 'lastUpdatedBy',
  119 + title : '更新用户',
  120 + visible : false
  121 + },
  122 + {
  123 + field : 'userDef1',
  124 + title : '自定义字段1' ,
  125 + visible:false
  126 + },
  127 + {
  128 + field : 'userDef2',
  129 + title : '自定义字段2' ,
  130 + visible:false
  131 + },
  132 + {
  133 + field : 'userDef3',
  134 + title : '自定义字段3' ,
  135 + visible:false
  136 + },
  137 + {
  138 + title: '操作',
  139 + align: 'center',
  140 + formatter: function(value, row, index) {
  141 + var actions = [];
  142 + actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
  143 + actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-trash-o"></i>删除</a>');
  144 + return actions.join('');
  145 + }
  146 + }]
  147 + };
  148 + $.table.init(options);
  149 + });
  150 +
  151 + function detail(id, code) {
  152 + var url = prefix1+"/list/" + id;
  153 + createtable(url);
  154 + }
  155 +
  156 + function createtable(url) {
  157 + $("#tabDetail").children().remove();
  158 + $("#myTab li").removeClass("active");
  159 + var height = $(document).height()-100 + 'px';
  160 + var str = '<iframe class="huaheng_iframe" name="iframe" width="100%" height="' + height + '" src="' + url + '" frameborder="0" data-id="' + url + '" seamless></iframe>';
  161 + $("#tabDetail").append(str);
  162 + $(".tab-pane").removeClass("in active");
  163 + $("#myTab li:eq(1)").addClass("active");
  164 + $("#tabDetail").addClass("in active");
  165 + }
  166 +</script>
  167 +</body>
  168 +</html>
0 169 \ No newline at end of file
... ...
src/main/resources/templates/config/waveMaster/add.html 0 → 100644
  View file @06ba3e8
  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-waveMaster-add">
  8 + <div class="form-group">
  9 + <label class="col-sm-3 control-label">主表名称：</label>
  10 + <div class="col-sm-8">
  11 + <input id="code" name="code" class="form-control" type="text">
  12 + </div>
  13 + </div>
  14 + <div class="form-group">
  15 + <label class="col-sm-3 control-label">排序：</label>
  16 + <div class="col-sm-8">
  17 + <input id="sequence" name="sequence" 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="shipmentFilterCode" name="shipmentFilterCode" 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="waveFlowCode" name="waveFlowCode" 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="statusFlowCode" name="statusFlowCode" 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="shortMode" name="shortMode" 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="maxShipments" name="maxShipments" class="form-control" type="text">
  48 + </div>
  49 + </div>
  50 + <div class="form-group">
  51 + <label class="col-sm-3 control-label">行数限制数量：</label>
  52 + <div class="col-sm-8">
  53 + <input id="maxLines" name="maxLines" class="form-control" type="text">
  54 + </div>
  55 + </div>
  56 + <div class="form-group">
  57 + <label class="col-sm-3 control-label">默认波次创建数量：</label>
  58 + <div class="col-sm-8">
  59 + <input id="defaultWaveCreateSize" name="defaultWaveCreateSize" class="form-control" type="text">
  60 + </div>
  61 + </div>
  62 + <div class="form-group">
  63 + <label class="col-sm-3 control-label">订单分组大小：</label>
  64 + <div class="col-sm-8">
  65 + <input id="shipmentGroupSize" name="shipmentGroupSize" class="form-control" type="text">
  66 + </div>
  67 + </div>
  68 + <div class="form-group">
  69 + <label class="col-sm-3 control-label">是否补货：</label>
  70 + <div class="col-sm-8">
  71 + <div class="radio radio-info radio-inline" style="transform: scale(1.1, 1.1);">
  72 + <input type="radio" id="needReplenishment1" name="needReplenishment" value="true" checked="checked"
  73 + class="radio_select">
  74 + <label for="needReplenishment1">是</label>
  75 + </div>
  76 + <div class="radio radio-danger radio-inline " style="transform: scale(1.1, 1.1);">
  77 + <input type="radio" id="needReplenishment2" name="needReplenishment" value="false">
  78 + <label for="needReplenishment2">否</label>
  79 + </div>
  80 + </div>
  81 + </div>
  82 + <div class="form-group">
  83 + <label class="col-sm-3 control-label">取消波次时保留补货任务：</label>
  84 + <div class="col-sm-8">
  85 + <input id="holdRplnTask" name="holdRplnTask" class="form-control" type="text">
  86 + </div>
  87 + </div>
  88 + <!--<div class="form-group">
  89 + <label class="col-sm-3 control-label">数据版本：</label>
  90 + <div class="col-sm-8">
  91 + <input id="version" name="version" class="form-control" type="text">
  92 + </div>
  93 + </div>-->
  94 + <!--<div class="form-group"> -->
  95 + <!--<label class="col-sm-3 control-label">创建时间：</label>-->
  96 + <!--<div class="col-sm-8">-->
  97 + <!--<input id="created" name="created" class="form-control" type="text">-->
  98 + <!--</div>-->
  99 + <!--</div>-->
  100 + <!--<div class="form-group"> -->
  101 + <!--<label class="col-sm-3 control-label">创建者：</label>-->
  102 + <!--<div class="col-sm-8">-->
  103 + <!--<input id="createdBy" name="createdBy" class="form-control" type="text">-->
  104 + <!--</div>-->
  105 + <!--</div>-->
  106 + <!--<div class="form-group"> -->
  107 + <!--<label class="col-sm-3 control-label">创建时间：</label>-->
  108 + <!--<div class="col-sm-8">-->
  109 + <!--<input id="lastUpdated" name="lastUpdated" class="form-control" type="text">-->
  110 + <!--</div>-->
  111 + <!--</div>-->
  112 + <!--<div class="form-group"> -->
  113 + <!--<label class="col-sm-3 control-label">更新者：</label>-->
  114 + <!--<div class="col-sm-8">-->
  115 + <!--<input id="lastUpdatedBy" name="lastUpdatedBy" class="form-control" type="text">-->
  116 + <!--</div>-->
  117 + <!--</div>-->
  118 + <!--<div class="form-group"> -->
  119 + <!--<label class="col-sm-3 control-label">是否有效：</label>-->
  120 + <!--<div class="col-sm-8">-->
  121 + <!--&lt;!&ndash;<input id="enable" name="enable" class="form-control" type="text">&ndash;&gt;-->
  122 + <!--<div class="onoffswitch">-->
  123 + <!--<input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="enable" name="enable">-->
  124 + <!--<label class="onoffswitch-label" for="enable">-->
  125 + <!--<span class="onoffswitch-inner"></span>-->
  126 + <!--<span class="onoffswitch-switch"></span>-->
  127 + <!--</label>-->
  128 + <!--</div>-->
  129 + <!--</div>-->
  130 + <!--</div>-->
  131 + <!--<div class="form-group"> -->
  132 + <!--<label class="col-sm-3 control-label">是否删除：</label>-->
  133 + <!--<div class="col-sm-8">-->
  134 + <!--<input id="deleted" name="deleted" class="form-control" type="text">-->
  135 + <!--</div>-->
  136 + <!--</div>-->
  137 + <!--<div class="form-group"> -->
  138 + <!--<label class="col-sm-3 control-label">自定义字段1：</label>-->
  139 + <!--<div class="col-sm-8">-->
  140 + <!--<input id="userDef1" name="userDef1" class="form-control" type="text">-->
  141 + <!--</div>-->
  142 + <!--</div>-->
  143 + <!--<div class="form-group"> -->
  144 + <!--<label class="col-sm-3 control-label">自定义字段2：</label>-->
  145 + <!--<div class="col-sm-8">-->
  146 + <!--<input id="userDef2" name="userDef2" class="form-control" type="text">-->
  147 + <!--</div>-->
  148 + <!--</div>-->
  149 + <!--<div class="form-group"> -->
  150 + <!--<label class="col-sm-3 control-label">自定义字段3：</label>-->
  151 + <!--<div class="col-sm-8">-->
  152 + <!--<input id="userDef3" name="userDef3" class="form-control" type="text">-->
  153 + <!--</div>-->
  154 + <!--</div>-->
  155 + <!--<div class="form-group"> -->
  156 + <!--<label class="col-sm-3 control-label">自定义字段4：</label>-->
  157 + <!--<div class="col-sm-8">-->
  158 + <!--<input id="userDef4" name="userDef4" class="form-control" type="text">-->
  159 + <!--</div>-->
  160 + <!--</div>-->
  161 + <!--<div class="form-group"> -->
  162 + <!--<label class="col-sm-3 control-label">自定义字段5：</label>-->
  163 + <!--<div class="col-sm-8">-->
  164 + <!--<input id="userDef5" name="userDef5" class="form-control" type="text">-->
  165 + <!--</div>-->
  166 + <!--</div>-->
  167 + <div class="form-group">
  168 + <div class="form-control-static col-sm-offset-9">
  169 + <button type="submit" class="btn btn-primary">提交</button>
  170 + <button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button>
  171 + </div>
  172 + </div>
  173 + </form>
  174 +</div>
  175 +<div th:include="include::footer"></div>
  176 +<script type="text/javascript">
  177 + var prefix = ctx + "config/waveMaster";
  178 + $("#form-waveMaster-add").validate({
  179 + rules:{
  180 + code:{
  181 + required: true,
  182 + },
  183 + sequence:{
  184 + required: true,
  185 + },
  186 + shipmentFilterCode:{
  187 + required: true,
  188 + },
  189 + waveFlowCode:{
  190 + required: true,
  191 + },
  192 + statusFlowCode:{
  193 + required: true,
  194 + },
  195 + shortMode: {
  196 + required: true,
  197 + },
  198 + maxShipments: {
  199 + required: true,
  200 + },
  201 + maxLines: {
  202 + required: true,
  203 + },
  204 + defaultWaveCreateSize: {
  205 + required: true,
  206 + },
  207 + shipmentGroupSize: {
  208 + required: true,
  209 + },
  210 + holdRplnTask: {
  211 + required: true,
  212 + },
  213 + needReplenishment: {
  214 + required: true,
  215 + }
  216 + },
  217 + submitHandler: function(form) {
  218 + var tableValue = $.common.getTableValue("#form-waveMaster-add");
  219 + $.operate.save(prefix + "/add", tableValue);
  220 + }
  221 + });
  222 +</script>
  223 +</body>
  224 +</html>
... ...
src/main/resources/templates/config/waveMaster/edit.html 0 → 100644
  View file @06ba3e8
  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" th:object="${waveMaster}">
  7 + <form class="form-horizontal m" id="form-waveMaster-edit">
  8 + <input name="id" th:field="*{id}">
  9 + <div class="form-group">
  10 + <label class="col-sm-3 control-label">主表名称：</label>
  11 + <div class="col-sm-8">
  12 + <input id="code" name="code" class="form-control" type="text" th:field="*{code}">
  13 + </div>
  14 + </div>
  15 + <div class="form-group">
  16 + <label class="col-sm-3 control-label">排序：</label>
  17 + <div class="col-sm-8">
  18 + <input id="sequence" name="sequence" class="form-control" type="text" th:field="*{sequence}">
  19 + </div>
  20 + </div>
  21 + <div class="form-group">
  22 + <label class="col-sm-3 control-label">出库单条件：</label>
  23 + <div class="col-sm-8">
  24 + <input id="shipmentFilterCode" name="shipmentFilterCode" class="form-control" type="text" th:field="*{shipmentFilterCode}">
  25 + </div>
  26 + </div>
  27 + <div class="form-group">
  28 + <label class="col-sm-3 control-label">波次流程：</label>
  29 + <div class="col-sm-8">
  30 + <input id="waveFlowCode" name="waveFlowCode" class="form-control" type="text" th:field="*{waveFlowCode}">
  31 + </div>
  32 + </div>
  33 + <div class="form-group">
  34 + <label class="col-sm-3 control-label">状态流程：</label>
  35 + <div class="col-sm-8">
  36 + <input id="statusFlowCode" name="statusFlowCode" class="form-control" type="text" th:field="*{statusFlowCode}">
  37 + </div>
  38 + </div>
  39 + <div class="form-group">
  40 + <label class="col-sm-3 control-label">缺货模式：</label>
  41 + <div class="col-sm-8">
  42 + <input id="shortMode" name="shortMode" class="form-control" type="text" th:field="*{shortMode}">
  43 + </div>
  44 + </div>
  45 + <div class="form-group">
  46 + <label class="col-sm-3 control-label">订单数限制：</label>
  47 + <div class="col-sm-8">
  48 + <input id="maxShipments" name="maxShipments" class="form-control" type="text" th:field="*{maxShipments}">
  49 + </div>
  50 + </div>
  51 + <div class="form-group">
  52 + <label class="col-sm-3 control-label">行数限制数量：</label>
  53 + <div class="col-sm-8">
  54 + <input id="maxLines" name="maxLines" class="form-control" type="text" th:field="*{maxLines}">
  55 + </div>
  56 + </div>
  57 + <div class="form-group">
  58 + <label class="col-sm-3 control-label">默认波次创建数量：</label>
  59 + <div class="col-sm-8">
  60 + <input id="defaultWaveCreateSize" name="defaultWaveCreateSize" class="form-control" type="text" th:field="*{defaultWaveCreateSize}">
  61 + </div>
  62 + </div>
  63 + <div class="form-group">
  64 + <label class="col-sm-3 control-label">订单分组大小：</label>
  65 + <div class="col-sm-8">
  66 + <input id="shipmentGroupSize" name="shipmentGroupSize" class="form-control" type="text" th:field="*{shipmentGroupSize}">
  67 + </div>
  68 + </div>
  69 + <div class="form-group">
  70 + <label class="col-sm-3 control-label">是否补货：</label>
  71 + <div class="col-sm-8">
  72 + <div class="radio radio-info radio-inline" style="transform: scale(1.1, 1.1);">
  73 + <input type="radio" id="needReplenishment1" name="needReplenishment" value="true" th:field="*{needReplenishment}"
  74 + class="radio_select">
  75 + <label for="needReplenishment1">是</label>
  76 + </div>
  77 + <div class="radio radio-danger radio-inline " style="transform: scale(1.1, 1.1);">
  78 + <input type="radio" id="needReplenishment2" name="needReplenishment" value="false" th:field="*{needReplenishment}">
  79 + <label for="needReplenishment2">否</label>
  80 + </div>
  81 + </div>
  82 + </div>
  83 + <div class="form-group">
  84 + <label class="col-sm-3 control-label">取消波次时保留补货任务：</label>
  85 + <div class="col-sm-8">
  86 + <input id="holdRplnTask" name="holdRplnTask" class="form-control" type="text" th:field="*{holdRplnTask}">
  87 + </div>
  88 + </div>
  89 + <!--<div class="form-group">
  90 + <label class="col-sm-3 control-label">数据版本：</label>
  91 + <div class="col-sm-8">
  92 + <input id="version" name="version" class="form-control" type="text">
  93 + </div>
  94 + </div>-->
  95 + <!--<div class="form-group"> -->
  96 + <!--<label class="col-sm-3 control-label">创建时间：</label>-->
  97 + <!--<div class="col-sm-8">-->
  98 + <!--<input id="created" name="created" class="form-control" type="text">-->
  99 + <!--</div>-->
  100 + <!--</div>-->
  101 + <!--<div class="form-group"> -->
  102 + <!--<label class="col-sm-3 control-label">创建者：</label>-->
  103 + <!--<div class="col-sm-8">-->
  104 + <!--<input id="createdBy" name="createdBy" class="form-control" type="text">-->
  105 + <!--</div>-->
  106 + <!--</div>-->
  107 + <!--<div class="form-group"> -->
  108 + <!--<label class="col-sm-3 control-label">创建时间：</label>-->
  109 + <!--<div class="col-sm-8">-->
  110 + <!--<input id="lastUpdated" name="lastUpdated" class="form-control" type="text">-->
  111 + <!--</div>-->
  112 + <!--</div>-->
  113 + <!--<div class="form-group"> -->
  114 + <!--<label class="col-sm-3 control-label">更新者：</label>-->
  115 + <!--<div class="col-sm-8">-->
  116 + <!--<input id="lastUpdatedBy" name="lastUpdatedBy" class="form-control" type="text">-->
  117 + <!--</div>-->
  118 + <!--</div>-->
  119 + <!--<div class="form-group"> -->
  120 + <!--<label class="col-sm-3 control-label">是否有效：</label>-->
  121 + <!--<div class="col-sm-8">-->
  122 + <!--&lt;!&ndash;<input id="enable" name="enable" class="form-control" type="text">&ndash;&gt;-->
  123 + <!--<div class="onoffswitch">-->
  124 + <!--<input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="enable" name="enable">-->
  125 + <!--<label class="onoffswitch-label" for="enable">-->
  126 + <!--<span class="onoffswitch-inner"></span>-->
  127 + <!--<span class="onoffswitch-switch"></span>-->
  128 + <!--</label>-->
  129 + <!--</div>-->
  130 + <!--</div>-->
  131 + <!--</div>-->
  132 + <!--<div class="form-group"> -->
  133 + <!--<label class="col-sm-3 control-label">是否删除：</label>-->
  134 + <!--<div class="col-sm-8">-->
  135 + <!--<input id="deleted" name="deleted" class="form-control" type="text">-->
  136 + <!--</div>-->
  137 + <!--</div>-->
  138 + <!--<div class="form-group"> -->
  139 + <!--<label class="col-sm-3 control-label">自定义字段1：</label>-->
  140 + <!--<div class="col-sm-8">-->
  141 + <!--<input id="userDef1" name="userDef1" class="form-control" type="text">-->
  142 + <!--</div>-->
  143 + <!--</div>-->
  144 + <!--<div class="form-group"> -->
  145 + <!--<label class="col-sm-3 control-label">自定义字段2：</label>-->
  146 + <!--<div class="col-sm-8">-->
  147 + <!--<input id="userDef2" name="userDef2" class="form-control" type="text">-->
  148 + <!--</div>-->
  149 + <!--</div>-->
  150 + <!--<div class="form-group"> -->
  151 + <!--<label class="col-sm-3 control-label">自定义字段3：</label>-->
  152 + <!--<div class="col-sm-8">-->
  153 + <!--<input id="userDef3" name="userDef3" class="form-control" type="text">-->
  154 + <!--</div>-->
  155 + <!--</div>-->
  156 + <!--<div class="form-group"> -->
  157 + <!--<label class="col-sm-3 control-label">自定义字段4：</label>-->
  158 + <!--<div class="col-sm-8">-->
  159 + <!--<input id="userDef4" name="userDef4" class="form-control" type="text">-->
  160 + <!--</div>-->
  161 + <!--</div>-->
  162 + <!--<div class="form-group"> -->
  163 + <!--<label class="col-sm-3 control-label">自定义字段5：</label>-->
  164 + <!--<div class="col-sm-8">-->
  165 + <!--<input id="userDef5" name="userDef5" class="form-control" type="text">-->
  166 + <!--</div>-->
  167 + <!--</div>-->
  168 + <div class="form-group">
  169 + <div class="form-control-static col-sm-offset-9">
  170 + <button type="submit" class="btn btn-primary">提交</button>
  171 + <button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button>
  172 + </div>
  173 + </div>
  174 + </form>
  175 +</div>
  176 +<div th:include="include::footer"></div>
  177 +<script type="text/javascript">
  178 + var prefix = ctx + "config/waveMaster";
  179 + $("#form-waveMaster-edit").validate({
  180 + rules:{
  181 + code:{
  182 + required: true,
  183 + },
  184 + sequence:{
  185 + required: true,
  186 + },
  187 + shipmentFilterCode:{
  188 + required: true,
  189 + },
  190 + waveFlowCode:{
  191 + required: true,
  192 + },
  193 + statusFlowCode:{
  194 + required: true,
  195 + },
  196 + shortMode: {
  197 + required: true,
  198 + },
  199 + maxShipments: {
  200 + required: true,
  201 + },
  202 + maxLines: {
  203 + required: true,
  204 + },
  205 + defaultWaveCreateSize: {
  206 + required: true,
  207 + },
  208 + shipmentGroupSize: {
  209 + required: true,
  210 + },
  211 + holdRplnTask: {
  212 + required: true,
  213 + },
  214 + needReplenishment: {
  215 + required: true,
  216 + }
  217 + },
  218 + submitHandler: function(form) {
  219 + var tableValue = $.common.getTableValue("#form-waveMaster-edit");
  220 + $.operate.save(prefix + "/edit", tableValue);
  221 + }
  222 + });
  223 +</script>
  224 +</body>
  225 +</html>
... ...
src/main/resources/templates/config/waveMaster/waveMaster.html 0 → 100644
  View file @06ba3e8
  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="col-sm-12 select-info">
  9 + <form id="waveMaster-form">
  10 + <div class="select-list">
  11 + <ul>
  12 + <li>
  13 + 编码：<input type="text" name="code"/>
  14 + </li>
  15 + <li>
  16 + 出库单条件：<input type="text" name="shipmentFilterCode"/>
  17 + </li>
  18 + <li>
  19 + 波次流程：<input type="text" name="waveFlowCode"/>
  20 + </li>
  21 + <li class="time">
  22 + <label>创建时间： </label>
  23 + <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="createdBegin"/>
  24 + <span>-</span>
  25 + <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="createdEnd"/>
  26 + </li>
  27 + <li>
  28 + <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
  29 + <!--<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="system:role:export"><i class="fa fa-download"></i>&nbsp;导出</a>-->
  30 + </li>
  31 + </ul>
  32 + </div>
  33 + </form>
  34 + </div>
  35 + <div class="btn-group hidden-xs" id="toolbar" role="group">
  36 + <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="config:waveMaster:add">
  37 + <i class="fa fa-plus"></i> 新增
  38 + </a>
  39 + <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()" shiro:hasPermission="config:waveMaster:remove">
  40 + <i class="fa fa-trash-o"></i> 删除
  41 + </a>
  42 + </div>
  43 +
  44 + <div class="col-sm-12 select-info">
  45 + <table id="bootstrap-table" data-mobile-responsive="true" class="table table-bordered table-hover"></table>
  46 + </div>
  47 + <div>
  48 + </div>
  49 + <div th:include="include :: footer"></div>
  50 + <script th:inline="javascript">
  51 + var editFlag = [[${@permission.hasPermi('config:waveMaster:edit')}]];
  52 + var removeFlag = [[${@permission.hasPermi('config:waveMaster:remove')}]];
  53 + var prefix = ctx + "config/waveMaster";
  54 + var datas = [[${@dict.getType('sys_normal_disable')}]];
  55 + $(function() {
  56 + var options = {
  57 + url: prefix + "/list",
  58 + createUrl: prefix + "/add",
  59 + updateUrl: prefix + "/edit/{id}",
  60 + removeUrl: prefix + "/remove",
  61 + modalName: "波次主表",
  62 + search: false,
  63 + columns: [{
  64 + checkbox: true
  65 + },
  66 + {
  67 + field : 'id',
  68 + title : 'ID'
  69 + },
  70 + {
  71 + field : 'code',
  72 + title : '主表名称'
  73 + },
  74 + {
  75 + field : 'sequence',
  76 + title : '排序'
  77 + },
  78 + {
  79 + field : 'shipmentFilterCode',
  80 + title : '出库单条件'
  81 + },
  82 + {
  83 + field : 'warehouseCode',
  84 + title : '仓库编码',
  85 + visible : false
  86 + },
  87 + {
  88 + field : 'waveFlowCode',
  89 + title : '波次流程',
  90 + },
  91 + {
  92 + field : 'statusFlowCode',
  93 + title : '状态流程',
  94 + },
  95 + {
  96 + field : 'shortMode',
  97 + title : '缺货模式',
  98 + },
  99 + {
  100 + field : 'maxShipments',
  101 + title : '缺货模式'
  102 + },
  103 + {
  104 + field : 'needReplenishment',
  105 + title : '是否补货',
  106 + formatter: function (value, item, index) {
  107 + if (value==true) {
  108 + return '<span class="badge" style="background-color: #00B83F;color: white;width: 36px;">' + ' 是 ' + '</span>';
  109 + }
  110 + else if (value==false) {
  111 + return '<span class="badge" style="background-color: #ff0000;color: white;width: 36px;">' + ' 否 ' + '</span>';
  112 + }
  113 + }
  114 + },
  115 + {
  116 + field : 'maxShipments',
  117 + title : '订单数限制'
  118 + },
  119 + {
  120 + field : 'maxLines',
  121 + title : '行数限制数量'
  122 + },
  123 + {
  124 + field : 'defaultWaveCreateSize',
  125 + title : '默认波次创建数量'
  126 + },
  127 + {
  128 + field : 'shipmentGroupSize',
  129 + title : '订单分组大小'
  130 + },
  131 + {
  132 + field : 'holdRplnTask',
  133 + title : '取消波次时保留补货任务'
  134 + },
  135 + {
  136 + field : 'created',
  137 + title : '创建时间',
  138 + visible : false
  139 + },
  140 + {
  141 + field : 'createdBy',
  142 + title : '创建用户',
  143 + visible : false
  144 + },
  145 + {
  146 + field : 'lastUpdated',
  147 + title : '更新时间',
  148 + visible : false
  149 + },
  150 + {
  151 + field : 'lastUpdatedBy',
  152 + title : '更新用户',
  153 + visible : false
  154 + },
  155 + {
  156 + field : 'version',
  157 + title : '数据版本',
  158 + visible : false
  159 + },
  160 + {
  161 + field : 'processStamp',
  162 + title : '处理标记',
  163 + visible : false
  164 + },
  165 + {
  166 + field : 'userDef1',
  167 + title : '自定义字段1' ,
  168 + visible:false
  169 + },
  170 + {
  171 + field : 'userDef2',
  172 + title : '自定义字段2' ,
  173 + visible:false
  174 + },
  175 + {
  176 + field : 'userDef3',
  177 + title : '自定义字段3' ,
  178 + visible:false
  179 + },
  180 + {
  181 + field : 'userDef4',
  182 + title : '自定义字段4' ,
  183 + visible:false
  184 + },
  185 + {
  186 + title: '操作',
  187 + align: 'center',
  188 + formatter: function(value, row, index) {
  189 + var actions = [];
  190 + actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')" ><i class="fa fa-edit"></i>编辑</a> ');
  191 + actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')" ><i class="fa fa-trash-o"></i>删除</a>');
  192 + return actions.join('');
  193 + }
  194 + }]
  195 + };
  196 + $.table.init(options);
  197 + });
  198 + </script>
  199 +</body>
  200 +</html>
0 201 \ No newline at end of file
... ...
src/main/resources/templates/receipt/receiptHeader/receiptHeader.html
  View file @06ba3e8
... ... @@ -83,7 +83,7 @@
83 83 var receiptHeaderStatus = [[${@dict.getType('receiptHeaderStatus')}]];
84 84 var printFlag = [[${@permission.hasPermi('receipt:receiptHeader:report')}]];
85 85 var addFlag= [[${@permission.hasPermi('receipt:receiptHeader:add')}]];
86   -
  86 + var checkFlag = [[${@permission.hasPermi('receipt:receiptHeader:check')}]];
87 87  
88 88 $(function() {
89 89 var options = {
... ... @@ -272,6 +272,9 @@
272 272 if ((row.firstStatus >= 100 && row.firstStatus < 200) | (row.lastStatus >= 100 && row.firstStatus < 200)){
273 273 actions.push('<a class="btn btn-info btn-xs ' + editFlag + '" href="#" onclick="arrival(\'' + row.id + '\')" ><i class="fa fa-edit"></i>入库预约</a> ');
274 274 }
  275 + if (row.firstStatus == 180 || row.lastStatus == 180) {
  276 + actions.push('<a class="btn btn-info btn-xs ' + checkFlag + '" href="#" onclick="check(\'' + row.id + '\')" ><i class="fa fa-edit"></i>入库质检</a> ');
  277 + }
275 278 if (row.lastStatus <= 200){
276 279 actions.push('<a class="btn btn-primary btn-xs to-receive" ' +addFlag+ ' onclick="Toreceiving(\''+ row.code + '\')"><i class="fa fa-cart-plus"></i>收货</a> ');
277 280 }
... ... @@ -314,6 +317,12 @@
314 317 storage.receiving_code=code;
315 318 parent.$('.tabReload').click();
316 319 }
  320 +
  321 + function check(id) {
  322 + var url = prefix+"/check/"+id;
  323 + var data = { "id": id };
  324 + $.operate.submit(url, "post", "json", data);
  325 + }
317 326 </script>
318 327 </body>
319 328 </html>
320 329 \ No newline at end of file
... ...
src/main/resources/templates/task/taskHeader/taskHeader.html
  View file @06ba3e8
... ... @@ -473,7 +473,7 @@
473 473 return;
474 474 }
475 475 $.modal.confirm("确认要删除选中的" + rows.length + "条数据吗?", function() {
476   - var url = ctx + 'task/task/remove';
  476 + var url = ctx + 'task/taskHeader/remove';
477 477 var ids = "";
478 478 for(var i=0; i<rows.length; i++) {
479 479 ids = ids + rows[i].id + ","
... ...