wms / wms_henanqingyuan · Commits

Commit cdf142ae2a6cd6969c214f55369c755cc81b99cb

Authored by wangyanxiong
2 parents 9df4d60e 66937bd4
develop

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

Inline Side-by-side
Showing 54 changed files with 2935 additions and 1587 deletions

Too many changes to show.
Reload with full diff Plain diff Email patch

To preserve performance only 48 of 54 files are displayed.

.idea/WMSV1.iml 0 → 100644
  View file @cdf142a
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<module type="JAVA_MODULE" version="4">
  3 + <component name="FacetManager">
  4 + <facet type="Spring" name="Spring">
  5 + <configuration />
  6 + </facet>
  7 + <facet type="web" name="Web">
  8 + <configuration>
  9 + <webroots />
  10 + <sourceRoots>
  11 + <root url="file://$MODULE_DIR$/src/main/java" />
  12 + <root url="file://$MODULE_DIR$/src/main/resources" />
  13 + </sourceRoots>
  14 + </configuration>
  15 + </facet>
  16 + </component>
  17 +</module>
0 \ No newline at end of file 18 \ No newline at end of file
.idea/workspace.xml
  View file @cdf142a
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <project version="4"> 2 <project version="4">
3 <component name="ChangeListManager"> 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 <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" /> 6 <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
6 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> 7 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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" />
7 </list> 17 </list>
8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 18 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
9 <option name="SHOW_DIALOG" value="false" /> 19 <option name="SHOW_DIALOG" value="false" />
@@ -12,13 +22,13 @@ @@ -12,13 +22,13 @@
12 <option name="LAST_RESOLUTION" value="IGNORE" /> 22 <option name="LAST_RESOLUTION" value="IGNORE" />
13 </component> 23 </component>
14 <component name="DatabaseView"> 24 <component name="DatabaseView">
15 - <option name="SHOW_INTERMEDIATE" value="false" /> 25 + <option name="SHOW_INTERMEDIATE" value="true" />
16 <option name="GROUP_DATA_SOURCES" value="true" /> 26 <option name="GROUP_DATA_SOURCES" value="true" />
17 <option name="GROUP_SCHEMA" value="true" /> 27 <option name="GROUP_SCHEMA" value="true" />
18 <option name="GROUP_CONTENTS" value="false" /> 28 <option name="GROUP_CONTENTS" value="false" />
19 <option name="SORT_POSITIONED" value="false" /> 29 <option name="SORT_POSITIONED" value="false" />
20 <option name="SHOW_EMPTY_GROUPS" value="false" /> 30 <option name="SHOW_EMPTY_GROUPS" value="false" />
21 - <option name="AUTO_SCROLL_FROM_SOURCE" value="true" /> 31 + <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
22 <option name="HIDDEN_KINDS"> 32 <option name="HIDDEN_KINDS">
23 <set /> 33 <set />
24 </option> 34 </option>
@@ -54,394 +64,63 @@ @@ -54,394 +64,63 @@
54 <item name="@localhost" type="feb32156:DbDataSourceImpl" /> 64 <item name="@localhost" type="feb32156:DbDataSourceImpl" />
55 <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" /> 65 <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
56 </path> 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>
57 </expand> 87 </expand>
58 <select /> 88 <select />
59 </component> 89 </component>
60 - <component name="FileEditorManager">  
61 - <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">  
62 - <file pinned="false" current-in-tab="true">  
63 - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java">  
64 - <provider selected="true" editor-type-id="text-editor">  
65 - <state relative-caret-position="140">  
66 - <caret line="500" lean-forward="true" selection-start-line="500" selection-end-line="500" />  
67 - <folding>  
68 - <element signature="imports" expanded="true" />  
69 - </folding>  
70 - </state>  
71 - </provider>  
72 - </entry>  
73 - </file>  
74 - <file pinned="false" current-in-tab="false">  
75 - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java">  
76 - <provider selected="true" editor-type-id="text-editor">  
77 - <state relative-caret-position="-157">  
78 - <caret line="173" column="28" selection-start-line="173" selection-start-column="10" selection-end-line="173" selection-end-column="28" />  
79 - </state>  
80 - </provider>  
81 - </entry>  
82 - </file>  
83 - <file pinned="false" current-in-tab="false">  
84 - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerDetail/domain/ReceiptContainerDetail.java">  
85 - <provider selected="true" editor-type-id="text-editor">  
86 - <state relative-caret-position="226">  
87 - <caret line="347" column="1" selection-start-line="347" selection-start-column="1" selection-end-line="347" selection-end-column="1" />  
88 - </state>  
89 - </provider>  
90 - </entry>  
91 - </file>  
92 - <file pinned="false" current-in-tab="false">  
93 - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/domain/ReceiptContainerHeader.java">  
94 - <provider selected="true" editor-type-id="text-editor">  
95 - <state relative-caret-position="19">  
96 - <caret line="193" column="37" lean-forward="true" selection-start-line="193" selection-start-column="37" selection-end-line="193" selection-end-column="37" />  
97 - <folding>  
98 - <element signature="e#14321#14322#0" expanded="true" />  
99 - <element signature="e#14357#14358#0" expanded="true" />  
100 - </folding>  
101 - </state>  
102 - </provider>  
103 - </entry>  
104 - </file>  
105 - <file pinned="false" current-in-tab="false">  
106 - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentHeader/service/ShipmentHeaderService.java">  
107 - <provider selected="true" editor-type-id="text-editor">  
108 - <state relative-caret-position="266">  
109 - <caret line="18" column="15" selection-start-line="18" selection-start-column="15" selection-end-line="18" selection-end-column="15" />  
110 - </state>  
111 - </provider>  
112 - </entry>  
113 - </file>  
114 - <file pinned="false" current-in-tab="false">  
115 - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentHeader/service/ShipmentHeaderServiceImpl.java">  
116 - <provider selected="true" editor-type-id="text-editor">  
117 - <state relative-caret-position="1596">  
118 - <caret line="112" column="26" selection-start-line="112" selection-start-column="16" selection-end-line="112" selection-end-column="26" />  
119 - </state>  
120 - </provider>  
121 - </entry>  
122 - </file>  
123 - <file pinned="false" current-in-tab="false">  
124 - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/domain/InventoryTransaction.java">  
125 - <provider selected="true" editor-type-id="text-editor">  
126 - <state relative-caret-position="1653">  
127 - <caret line="95" column="19" selection-start-line="95" selection-start-column="12" selection-end-line="95" selection-end-column="19" />  
128 - </state>  
129 - </provider>  
130 - </entry>  
131 - </file>  
132 - <file pinned="false" current-in-tab="false">  
133 - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/taskHeader.html">  
134 - <provider selected="true" editor-type-id="text-editor">  
135 - <state relative-caret-position="4484">  
136 - <caret line="236" column="64" selection-start-line="236" selection-start-column="64" selection-end-line="236" selection-end-column="64" />  
137 - </state>  
138 - </provider>  
139 - </entry>  
140 - </file>  
141 - </leaf>  
142 - </component>  
143 <component name="FileTemplateManagerImpl"> 90 <component name="FileTemplateManagerImpl">
144 <option name="RECENT_TEMPLATES"> 91 <option name="RECENT_TEMPLATES">
145 <list> 92 <list>
146 - <option value="CSS File" /> 93 + <option value="Interface" />
147 <option value="Class" /> 94 <option value="Class" />
148 <option value="HTML File" /> 95 <option value="HTML File" />
  96 + <option value="Enum" />
149 </list> 97 </list>
150 </option> 98 </option>
151 </component> 99 </component>
152 - <component name="FindInProjectRecents">  
153 - <findStrings>  
154 - <find>a</find>  
155 - </findStrings>  
156 - </component>  
157 <component name="Git.Settings"> 100 <component name="Git.Settings">
158 <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> 101 <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
159 </component> 102 </component>
160 - <component name="IdeDocumentHistory">  
161 - <option name="CHANGED_PATHS">  
162 - <list>  
163 - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java" />  
164 - <option value="$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/taskHeader.html" />  
165 - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskDetail/domain/TaskDetail.java" />  
166 - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java" />  
167 - <option value="G:/网星联创/千金电玩城后台管理/ticketManager/src/com/ticket/server/back/player/entity/PlayerInfo.java" />  
168 - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/domain/ReceiptContainerHeader.java" />  
169 - </list>  
170 - </option>  
171 - </component>  
172 - <component name="JsFlowSettings">  
173 - <service-enabled>true</service-enabled>  
174 - <exe-path />  
175 - <other-services-enabled>true</other-services-enabled>  
176 - <auto-save>true</auto-save>  
177 - </component>  
178 - <component name="MavenImportPreferences">  
179 - <option name="importingSettings">  
180 - <MavenImportingSettings>  
181 - <option name="importAutomatically" value="true" />  
182 - </MavenImportingSettings>  
183 - </option>  
184 - </component>  
185 - <component name="ProjectFrameBounds" extendedState="6">  
186 - <option name="x" value="470" />  
187 - <option name="width" value="980" />  
188 - <option name="height" value="1030" />  
189 - </component>  
190 - <component name="ProjectId" id="1Q2nhRM7LRz3yFWhpclOKgTjxn0" />  
191 - <component name="ProjectLevelVcsManager">  
192 - <ConfirmationsSetting value="2" id="Add" />  
193 - </component>  
194 - <component name="ProjectView">  
195 - <navigator proportions="" version="1">  
196 - <foldersAlwaysOnTop value="true" />  
197 - </navigator>  
198 - <panes>  
199 - <pane id="Scope" />  
200 - <pane id="PackagesPane" />  
201 - <pane id="ProjectPane">  
202 - <subPane>  
203 - <expand>  
204 - <path>  
205 - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />  
206 - <item name="wms2" type="462c0819:PsiDirectoryNode" />  
207 - </path>  
208 - <path>  
209 - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />  
210 - <item name="wms2" type="462c0819:PsiDirectoryNode" />  
211 - <item name="src" type="462c0819:PsiDirectoryNode" />  
212 - </path>  
213 - <path>  
214 - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />  
215 - <item name="wms2" type="462c0819:PsiDirectoryNode" />  
216 - <item name="src" type="462c0819:PsiDirectoryNode" />  
217 - <item name="main" type="462c0819:PsiDirectoryNode" />  
218 - </path>  
219 - <path>  
220 - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />  
221 - <item name="wms2" type="462c0819:PsiDirectoryNode" />  
222 - <item name="src" type="462c0819:PsiDirectoryNode" />  
223 - <item name="main" type="462c0819:PsiDirectoryNode" />  
224 - <item name="java" type="462c0819:PsiDirectoryNode" />  
225 - </path>  
226 - <path>  
227 - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />  
228 - <item name="wms2" type="462c0819:PsiDirectoryNode" />  
229 - <item name="src" type="462c0819:PsiDirectoryNode" />  
230 - <item name="main" type="462c0819:PsiDirectoryNode" />  
231 - <item name="java" type="462c0819:PsiDirectoryNode" />  
232 - <item name="com" type="462c0819:PsiDirectoryNode" />  
233 - </path>  
234 - <path>  
235 - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />  
236 - <item name="wms2" type="462c0819:PsiDirectoryNode" />  
237 - <item name="src" type="462c0819:PsiDirectoryNode" />  
238 - <item name="main" type="462c0819:PsiDirectoryNode" />  
239 - <item name="java" type="462c0819:PsiDirectoryNode" />  
240 - <item name="com" type="462c0819:PsiDirectoryNode" />  
241 - <item name="huaheng" type="462c0819:PsiDirectoryNode" />  
242 - </path>  
243 - <path>  
244 - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />  
245 - <item name="wms2" type="462c0819:PsiDirectoryNode" />  
246 - <item name="src" type="462c0819:PsiDirectoryNode" />  
247 - <item name="main" type="462c0819:PsiDirectoryNode" />  
248 - <item name="java" type="462c0819:PsiDirectoryNode" />  
249 - <item name="com" type="462c0819:PsiDirectoryNode" />  
250 - <item name="huaheng" type="462c0819:PsiDirectoryNode" />  
251 - <item name="pc" 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="receipt" type="462c0819:PsiDirectoryNode" />  
263 - </path>  
264 - <path>  
265 - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />  
266 - <item name="wms2" type="462c0819:PsiDirectoryNode" />  
267 - <item name="src" type="462c0819:PsiDirectoryNode" />  
268 - <item name="main" type="462c0819:PsiDirectoryNode" />  
269 - <item name="java" type="462c0819:PsiDirectoryNode" />  
270 - <item name="com" type="462c0819:PsiDirectoryNode" />  
271 - <item name="huaheng" type="462c0819:PsiDirectoryNode" />  
272 - <item name="pc" type="462c0819:PsiDirectoryNode" />  
273 - <item name="receipt" type="462c0819:PsiDirectoryNode" />  
274 - <item name="receiptContainerHeader" type="462c0819:PsiDirectoryNode" />  
275 - </path>  
276 - <path>  
277 - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />  
278 - <item name="wms2" type="462c0819:PsiDirectoryNode" />  
279 - <item name="src" type="462c0819:PsiDirectoryNode" />  
280 - <item name="main" type="462c0819:PsiDirectoryNode" />  
281 - <item name="java" type="462c0819:PsiDirectoryNode" />  
282 - <item name="com" type="462c0819:PsiDirectoryNode" />  
283 - <item name="huaheng" type="462c0819:PsiDirectoryNode" />  
284 - <item name="pc" type="462c0819:PsiDirectoryNode" />  
285 - <item name="receipt" type="462c0819:PsiDirectoryNode" />  
286 - <item name="receiptContainerHeader" type="462c0819:PsiDirectoryNode" />  
287 - <item name="controller" type="462c0819:PsiDirectoryNode" />  
288 - </path>  
289 - <path>  
290 - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />  
291 - <item name="wms2" type="462c0819:PsiDirectoryNode" />  
292 - <item name="src" type="462c0819:PsiDirectoryNode" />  
293 - <item name="main" type="462c0819:PsiDirectoryNode" />  
294 - <item name="java" type="462c0819:PsiDirectoryNode" />  
295 - <item name="com" type="462c0819:PsiDirectoryNode" />  
296 - <item name="huaheng" type="462c0819:PsiDirectoryNode" />  
297 - <item name="pc" type="462c0819:PsiDirectoryNode" />  
298 - <item name="receipt" type="462c0819:PsiDirectoryNode" />  
299 - <item name="receiptContainerHeader" type="462c0819:PsiDirectoryNode" />  
300 - <item name="domain" type="462c0819:PsiDirectoryNode" />  
301 - </path>  
302 - <path>  
303 - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />  
304 - <item name="wms2" type="462c0819:PsiDirectoryNode" />  
305 - <item name="src" type="462c0819:PsiDirectoryNode" />  
306 - <item name="main" type="462c0819:PsiDirectoryNode" />  
307 - <item name="java" type="462c0819:PsiDirectoryNode" />  
308 - <item name="com" type="462c0819:PsiDirectoryNode" />  
309 - <item name="huaheng" type="462c0819:PsiDirectoryNode" />  
310 - <item name="pc" type="462c0819:PsiDirectoryNode" />  
311 - <item name="task" type="462c0819:PsiDirectoryNode" />  
312 - </path>  
313 - <path>  
314 - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />  
315 - <item name="wms2" type="462c0819:PsiDirectoryNode" />  
316 - <item name="src" type="462c0819:PsiDirectoryNode" />  
317 - <item name="main" type="462c0819:PsiDirectoryNode" />  
318 - <item name="java" type="462c0819:PsiDirectoryNode" />  
319 - <item name="com" type="462c0819:PsiDirectoryNode" />  
320 - <item name="huaheng" type="462c0819:PsiDirectoryNode" />  
321 - <item name="pc" type="462c0819:PsiDirectoryNode" />  
322 - <item name="task" type="462c0819:PsiDirectoryNode" />  
323 - <item name="taskDetail" type="462c0819:PsiDirectoryNode" />  
324 - </path>  
325 - <path>  
326 - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />  
327 - <item name="wms2" type="462c0819:PsiDirectoryNode" />  
328 - <item name="src" type="462c0819:PsiDirectoryNode" />  
329 - <item name="main" type="462c0819:PsiDirectoryNode" />  
330 - <item name="java" type="462c0819:PsiDirectoryNode" />  
331 - <item name="com" type="462c0819:PsiDirectoryNode" />  
332 - <item name="huaheng" type="462c0819:PsiDirectoryNode" />  
333 - <item name="pc" type="462c0819:PsiDirectoryNode" />  
334 - <item name="task" type="462c0819:PsiDirectoryNode" />  
335 - <item name="taskDetail" type="462c0819:PsiDirectoryNode" />  
336 - <item name="domain" type="462c0819:PsiDirectoryNode" />  
337 - </path>  
338 - <path>  
339 - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />  
340 - <item name="wms2" type="462c0819:PsiDirectoryNode" />  
341 - <item name="src" type="462c0819:PsiDirectoryNode" />  
342 - <item name="main" type="462c0819:PsiDirectoryNode" />  
343 - <item name="java" type="462c0819:PsiDirectoryNode" />  
344 - <item name="com" type="462c0819:PsiDirectoryNode" />  
345 - <item name="huaheng" type="462c0819:PsiDirectoryNode" />  
346 - <item name="pc" type="462c0819:PsiDirectoryNode" />  
347 - <item name="task" type="462c0819:PsiDirectoryNode" />  
348 - <item name="taskHeader" type="462c0819:PsiDirectoryNode" />  
349 - </path>  
350 - <path>  
351 - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />  
352 - <item name="wms2" type="462c0819:PsiDirectoryNode" />  
353 - <item name="src" type="462c0819:PsiDirectoryNode" />  
354 - <item name="main" type="462c0819:PsiDirectoryNode" />  
355 - <item name="java" type="462c0819:PsiDirectoryNode" />  
356 - <item name="com" type="462c0819:PsiDirectoryNode" />  
357 - <item name="huaheng" type="462c0819:PsiDirectoryNode" />  
358 - <item name="pc" type="462c0819:PsiDirectoryNode" />  
359 - <item name="task" type="462c0819:PsiDirectoryNode" />  
360 - <item name="taskHeader" type="462c0819:PsiDirectoryNode" />  
361 - <item name="controller" type="462c0819:PsiDirectoryNode" />  
362 - </path>  
363 - <path>  
364 - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />  
365 - <item name="wms2" type="462c0819:PsiDirectoryNode" />  
366 - <item name="src" type="462c0819:PsiDirectoryNode" />  
367 - <item name="main" type="462c0819:PsiDirectoryNode" />  
368 - <item name="java" type="462c0819:PsiDirectoryNode" />  
369 - <item name="com" type="462c0819:PsiDirectoryNode" />  
370 - <item name="huaheng" type="462c0819:PsiDirectoryNode" />  
371 - <item name="pc" type="462c0819:PsiDirectoryNode" />  
372 - <item name="task" type="462c0819:PsiDirectoryNode" />  
373 - <item name="taskHeader" type="462c0819:PsiDirectoryNode" />  
374 - <item name="service" type="462c0819:PsiDirectoryNode" />  
375 - </path>  
376 - <path>  
377 - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />  
378 - <item name="wms2" type="462c0819:PsiDirectoryNode" />  
379 - <item name="src" type="462c0819:PsiDirectoryNode" />  
380 - <item name="main" type="462c0819:PsiDirectoryNode" />  
381 - <item name="resources" type="462c0819:PsiDirectoryNode" />  
382 - </path>  
383 - <path>  
384 - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />  
385 - <item name="wms2" type="462c0819:PsiDirectoryNode" />  
386 - <item name="src" type="462c0819:PsiDirectoryNode" />  
387 - <item name="main" type="462c0819:PsiDirectoryNode" />  
388 - <item name="resources" type="462c0819:PsiDirectoryNode" />  
389 - <item name="templates" type="462c0819:PsiDirectoryNode" />  
390 - </path>  
391 - <path>  
392 - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />  
393 - <item name="wms2" type="462c0819:PsiDirectoryNode" />  
394 - <item name="src" type="462c0819:PsiDirectoryNode" />  
395 - <item name="main" type="462c0819:PsiDirectoryNode" />  
396 - <item name="resources" type="462c0819:PsiDirectoryNode" />  
397 - <item name="templates" type="462c0819:PsiDirectoryNode" />  
398 - <item name="task" type="462c0819:PsiDirectoryNode" />  
399 - </path>  
400 - <path>  
401 - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />  
402 - <item name="wms2" type="462c0819:PsiDirectoryNode" />  
403 - <item name="src" type="462c0819:PsiDirectoryNode" />  
404 - <item name="main" type="462c0819:PsiDirectoryNode" />  
405 - <item name="resources" type="462c0819:PsiDirectoryNode" />  
406 - <item name="templates" type="462c0819:PsiDirectoryNode" />  
407 - <item name="task" type="462c0819:PsiDirectoryNode" />  
408 - <item name="taskHeader" type="462c0819:PsiDirectoryNode" />  
409 - </path>  
410 - </expand>  
411 - <select />  
412 - </subPane>  
413 - </pane>  
414 - </panes>  
415 - </component> 103 + <component name="ProjectId" id="1QOzUtfkdeRmYuw3MIDHXXMLsFH" />
416 <component name="PropertiesComponent"> 104 <component name="PropertiesComponent">
417 - <property name="ASKED_ADD_EXTERNAL_FILES" value="true" />  
418 <property name="DefaultHtmlFileTemplate" value="HTML File" /> 105 <property name="DefaultHtmlFileTemplate" value="HTML File" />
419 - <property name="ExpandSpringBootJavaOptionsPanel" value="true" />  
420 - <property name="JavaScriptWeakerCompletionTypeGuess" value="true" />  
421 <property name="RequestMappingsPanelOrder0" value="0" /> 106 <property name="RequestMappingsPanelOrder0" value="0" />
422 <property name="RequestMappingsPanelOrder1" value="1" /> 107 <property name="RequestMappingsPanelOrder1" value="1" />
423 <property name="RequestMappingsPanelWidth0" value="75" /> 108 <property name="RequestMappingsPanelWidth0" value="75" />
424 <property name="RequestMappingsPanelWidth1" value="75" /> 109 <property name="RequestMappingsPanelWidth1" value="75" />
425 - <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />  
426 <property name="WebServerToolWindowFactoryState" value="false" /> 110 <property name="WebServerToolWindowFactoryState" value="false" />
427 <property name="aspect.path.notification.shown" value="true" /> 111 <property name="aspect.path.notification.shown" value="true" />
428 - <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1567762826101" />  
429 - <property name="last_opened_file_path" value="$PROJECT_DIR$/../wms-glgd" />  
430 - <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" />
431 <property name="node.js.detected.package.eslint" value="true" /> 114 <property name="node.js.detected.package.eslint" value="true" />
  115 + <property name="node.js.detected.package.tslint" value="true" />
432 <property name="node.js.path.for.package.eslint" value="project" /> 116 <property name="node.js.path.for.package.eslint" value="project" />
433 <property name="node.js.path.for.package.tslint" value="project" /> 117 <property name="node.js.path.for.package.tslint" value="project" />
434 <property name="node.js.selected.package.eslint" value="(autodetect)" /> 118 <property name="node.js.selected.package.eslint" value="(autodetect)" />
435 <property name="node.js.selected.package.tslint" value="(autodetect)" /> 119 <property name="node.js.selected.package.tslint" value="(autodetect)" />
436 - <property name="nodejs_package_manager_path" value="npm" />  
437 - <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" />
438 </component> 122 </component>
439 <component name="RunDashboard"> 123 <component name="RunDashboard">
440 - <option name="configurationTypes">  
441 - <set>  
442 - <option value="SpringBootApplicationConfigurationType" />  
443 - </set>  
444 - </option>  
445 <option name="ruleStates"> 124 <option name="ruleStates">
446 <list> 125 <list>
447 <RuleState> 126 <RuleState>
@@ -452,11 +131,32 @@ @@ -452,11 +131,32 @@
452 </RuleState> 131 </RuleState>
453 </list> 132 </list>
454 </option> 133 </option>
455 - <option name="contentProportion" value="0.056010928" />  
456 </component> 134 </component>
457 - <component name="RunManager">  
458 - <configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot"> 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">
459 <module name="huaheng" /> 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>
460 <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" /> 160 <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" />
461 <option name="ALTERNATIVE_JRE_PATH" /> 161 <option name="ALTERNATIVE_JRE_PATH" />
462 <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" /> 162 <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" />
@@ -465,13 +165,27 @@ @@ -465,13 +165,27 @@
465 <option name="Make" enabled="true" /> 165 <option name="Make" enabled="true" />
466 </method> 166 </method>
467 </configuration> 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>
468 </component> 178 </component>
469 <component name="ServiceViewManager"> 179 <component name="ServiceViewManager">
470 <option name="allServicesViewState"> 180 <option name="allServicesViewState">
471 <serviceView> 181 <serviceView>
472 - <option name="contentProportion" value="0.17857143" />  
473 <treeState> 182 <treeState>
474 - <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>
475 <select /> 189 <select />
476 </treeState> 190 </treeState>
477 </serviceView> 191 </serviceView>
@@ -482,141 +196,56 @@ @@ -482,141 +196,56 @@
482 </component> 196 </component>
483 <component name="TaskManager"> 197 <component name="TaskManager">
484 <task active="true" id="Default" summary="Default task"> 198 <task active="true" id="Default" summary="Default task">
485 - <changelist id="1fe4ff20-6474-45ee-a361-9572a808e9c9" name="Default Changelist" comment="" />  
486 - <created>1566977677142</created> 199 + <changelist id="baeae966-16bb-4f97-a411-22fe5a65cefd" name="Default Changelist" comment="" />
  200 + <created>1567656449978</created>
487 <option name="number" value="Default" /> 201 <option name="number" value="Default" />
488 <option name="presentableId" value="Default" /> 202 <option name="presentableId" value="Default" />
489 - <updated>1566977677142</updated>  
490 - <workItem from="1566977678336" duration="306000" />  
491 - <workItem from="1566978429560" duration="9246000" />  
492 - <workItem from="1567038752582" duration="12361000" />  
493 - <workItem from="1567057373550" duration="15293000" />  
494 - <workItem from="1567125196953" duration="16752000" />  
495 - <workItem from="1567643852002" duration="245000" />  
496 - <workItem from="1567731382438" duration="17009000" /> 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" />
497 </task> 224 </task>
498 - <task id="LOCAL-00001" summary="入库单添加时添加流程标记，审核入库单">  
499 - <created>1566983055587</created> 225 + <task id="LOCAL-00001" summary="修改添加物料时使用物料类别生成物料编码">
  226 + <created>1567664306836</created>
500 <option name="number" value="00001" /> 227 <option name="number" value="00001" />
501 <option name="presentableId" value="LOCAL-00001" /> 228 <option name="presentableId" value="LOCAL-00001" />
502 <option name="project" value="LOCAL" /> 229 <option name="project" value="LOCAL" />
503 - <updated>1566983055587</updated> 230 + <updated>1567664306836</updated>
504 </task> 231 </task>
505 - <task id="LOCAL-00002" summary="添加入库单历史">  
506 - <created>1566987011007</created> 232 + <task id="LOCAL-00002" summary="修改添加物料时使用物料类别生成物料编码">
  233 + <created>1567936901056</created>
507 <option name="number" value="00002" /> 234 <option name="number" value="00002" />
508 <option name="presentableId" value="LOCAL-00002" /> 235 <option name="presentableId" value="LOCAL-00002" />
509 <option name="project" value="LOCAL" /> 236 <option name="project" value="LOCAL" />
510 - <updated>1566987011007</updated> 237 + <updated>1567936901056</updated>
511 </task> 238 </task>
512 - <task id="LOCAL-00003" summary="修复入库历史controller冲突">  
513 - <created>1567039165473</created> 239 + <task id="LOCAL-00003" summary="修改质检页面、添加完成质检">
  240 + <created>1568025230030</created>
514 <option name="number" value="00003" /> 241 <option name="number" value="00003" />
515 <option name="presentableId" value="LOCAL-00003" /> 242 <option name="presentableId" value="LOCAL-00003" />
516 <option name="project" value="LOCAL" /> 243 <option name="project" value="LOCAL" />
517 - <updated>1567039165473</updated>  
518 - </task>  
519 - <task id="LOCAL-00004" summary="添加物料类别">  
520 - <created>1567047135508</created>  
521 - <option name="number" value="00004" />  
522 - <option name="presentableId" value="LOCAL-00004" />  
523 - <option name="project" value="LOCAL" />  
524 - <updated>1567047135508</updated> 244 + <updated>1568025230030</updated>
525 </task> 245 </task>
526 - <task id="LOCAL-00005" summary="添加系统参数配置">  
527 - <created>1567065008303</created>  
528 - <option name="number" value="00005" />  
529 - <option name="presentableId" value="LOCAL-00005" />  
530 - <option name="project" value="LOCAL" />  
531 - <updated>1567065008303</updated>  
532 - </task>  
533 - <task id="LOCAL-00006" summary="删除入库单">  
534 - <created>1567065196899</created>  
535 - <option name="number" value="00006" />  
536 - <option name="presentableId" value="LOCAL-00006" />  
537 - <option name="project" value="LOCAL" />  
538 - <updated>1567065196899</updated>  
539 - </task>  
540 - <task id="LOCAL-00007" summary="自动生成盘点首选项表">  
541 - <created>1567068662565</created>  
542 - <option name="number" value="00007" />  
543 - <option name="presentableId" value="LOCAL-00007" />  
544 - <option name="project" value="LOCAL" />  
545 - <updated>1567068662565</updated>  
546 - </task>  
547 - <task id="LOCAL-00008" summary="添加逻辑删除配置">  
548 - <created>1567069834248</created>  
549 - <option name="number" value="00008" />  
550 - <option name="presentableId" value="LOCAL-00008" />  
551 - <option name="project" value="LOCAL" />  
552 - <updated>1567069834248</updated>  
553 - </task>  
554 - <task id="LOCAL-00009" summary="出库任务完成。新增allocationId字段">  
555 - <created>1567672551433</created>  
556 - <option name="number" value="00009" />  
557 - <option name="presentableId" value="LOCAL-00009" />  
558 - <option name="project" value="LOCAL" />  
559 - <updated>1567672551433</updated>  
560 - </task>  
561 - <task id="LOCAL-00010" summary="Merge branch 'develop' of http://172.16.29.40:8010/wms/wms2 into develop&#10;&#10;# Conflicts:&#10;#&#9;.idea/workspace.xml&#10;#&#9;src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java&#10;#&#9;src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java">  
562 - <created>1567684393294</created>  
563 - <option name="number" value="00010" />  
564 - <option name="presentableId" value="LOCAL-00010" />  
565 - <option name="project" value="LOCAL" />  
566 - <updated>1567684393294</updated>  
567 - </task>  
568 - <task id="LOCAL-00011" summary="出库完成完善">  
569 - <created>1567762768238</created>  
570 - <option name="number" value="00011" />  
571 - <option name="presentableId" value="LOCAL-00011" />  
572 - <option name="project" value="LOCAL" />  
573 - <updated>1567762768238</updated>  
574 - </task>  
575 - <option name="localTasksCounter" value="12" /> 246 + <option name="localTasksCounter" value="4" />
576 <servers /> 247 <servers />
577 </component> 248 </component>
578 - <component name="TimeTrackingManager">  
579 - <option name="totallyTimeSpent" value="39317000" />  
580 - </component>  
581 - <component name="ToolWindowManager">  
582 - <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />  
583 - <layout>  
584 - <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2191689" />  
585 - <window_info id="Structure" order="1" side_tool="true" weight="0.25" />  
586 - <window_info id="Designer" order="2" />  
587 - <window_info id="Image Layers" order="3" />  
588 - <window_info id="Capture Tool" order="4" />  
589 - <window_info id="UI Designer" order="5" />  
590 - <window_info id="Favorites" order="6" side_tool="true" />  
591 - <window_info id="Web" order="7" side_tool="true" />  
592 - <window_info anchor="bottom" id="Message" order="0" />  
593 - <window_info anchor="bottom" id="Find" order="1" />  
594 - <window_info anchor="bottom" id="Run" order="2" />  
595 - <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />  
596 - <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />  
597 - <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />  
598 - <window_info anchor="bottom" id="TODO" order="6" />  
599 - <window_info anchor="bottom" id="Spring" order="7" />  
600 - <window_info anchor="bottom" id="Terminal" order="8" />  
601 - <window_info anchor="bottom" id="Docker" order="9" show_stripe_button="false" />  
602 - <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.5013405" side_tool="true" weight="0.2719547" />  
603 - <window_info anchor="bottom" id="Messages" order="11" weight="0.18696883" />  
604 - <window_info anchor="bottom" id="Java Enterprise" order="12" />  
605 - <window_info anchor="bottom" id="Database Changes" order="13" weight="0.3286119" />  
606 - <window_info anchor="bottom" id="Version Control" order="14" weight="0.3286119" />  
607 - <window_info anchor="bottom" id="Run Dashboard" order="15" sideWeight="0.49865952" weight="0.30169973" />  
608 - <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />  
609 - <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />  
610 - <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />  
611 - <window_info anchor="right" id="Maven" order="3" />  
612 - <window_info anchor="right" id="Palette" order="4" />  
613 - <window_info anchor="right" id="Capture Analysis" order="5" />  
614 - <window_info anchor="right" id="Database" order="6" />  
615 - <window_info anchor="right" id="Palette&#9;" order="7" />  
616 - <window_info anchor="right" id="Theme Preview" order="8" />  
617 - <window_info anchor="right" id="Bean Validation" order="9" />  
618 - </layout>  
619 - </component>  
620 <component name="TypeScriptGeneratedFilesManager"> 249 <component name="TypeScriptGeneratedFilesManager">
621 <option name="version" value="1" /> 250 <option name="version" value="1" />
622 </component> 251 </component>
@@ -626,289 +255,37 @@ @@ -626,289 +255,37 @@
626 <entry key="MAIN"> 255 <entry key="MAIN">
627 <value> 256 <value>
628 <State> 257 <State>
629 - <option name="RECENTLY_FILTERED_USER_GROUPS">  
630 - <collection />  
631 - </option>  
632 - <option name="RECENTLY_FILTERED_BRANCH_GROUPS">  
633 - <collection />  
634 - </option>  
635 <option name="COLUMN_ORDER" /> 258 <option name="COLUMN_ORDER" />
636 </State> 259 </State>
637 </value> 260 </value>
638 </entry> 261 </entry>
639 </map> 262 </map>
640 </option> 263 </option>
641 - <option name="RECENT_FILTERS">  
642 - <map>  
643 - <entry key="Branch">  
644 - <value>  
645 - <list />  
646 - </value>  
647 - </entry>  
648 - <entry key="User">  
649 - <value>  
650 - <list />  
651 - </value>  
652 - </entry>  
653 - </map>  
654 - </option>  
655 </component> 264 </component>
656 <component name="VcsManagerConfiguration"> 265 <component name="VcsManagerConfiguration">
657 - <MESSAGE value="盘点明细页面" />  
658 - <MESSAGE value="入库单添加时添加流程标记，审核入库单" />  
659 - <MESSAGE value="添加入库单历史" />  
660 - <MESSAGE value="修复入库历史controller冲突" />  
661 - <MESSAGE value="添加物料类别" />  
662 - <MESSAGE value="添加系统参数配置" />  
663 - <MESSAGE value="删除入库单" />  
664 - <MESSAGE value="自动生成盘点首选项表" />  
665 - <MESSAGE value="添加逻辑删除配置" />  
666 - <MESSAGE value="库存和任务移库相关" />  
667 - <MESSAGE value="库存移库生成和完成逻辑" />  
668 - <MESSAGE value="xml" />  
669 - <MESSAGE value="出库任务完成。新增allocationId字段" />  
670 - <MESSAGE value="Merge branch 'develop' of http://172.16.29.40:8010/wms/wms2 into develop&#10;&#10;# Conflicts:&#10;#&#9;.idea/workspace.xml&#10;#&#9;src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java&#10;#&#9;src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java" />  
671 - <MESSAGE value="出库完成完善" />  
672 - <option name="LAST_COMMIT_MESSAGE" value="出库完成完善" /> 266 + <MESSAGE value="修改添加物料时使用物料类别生成物料编码" />
  267 + <MESSAGE value="修改质检页面、添加完成质检" />
  268 + <option name="LAST_COMMIT_MESSAGE" value="修改质检页面、添加完成质检" />
673 </component> 269 </component>
674 <component name="XDebuggerManager"> 270 <component name="XDebuggerManager">
675 <breakpoint-manager> 271 <breakpoint-manager>
676 <breakpoints> 272 <breakpoints>
677 - <line-breakpoint type="java-line">  
678 - <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/mapper/CycleCountHeaderMapper.java</url>  
679 - <line>5</line>  
680 - <properties />  
681 - <option name="timeStamp" value="1" />  
682 - </line-breakpoint>  
683 - <line-breakpoint type="java-line">  
684 - <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/statusFlow/controller/StatusFlowDetailController.java</url>  
685 - <line>60</line>  
686 - <properties />  
687 - <option name="timeStamp" value="4" />  
688 - </line-breakpoint>  
689 <line-breakpoint enabled="true" type="java-line"> 273 <line-breakpoint enabled="true" type="java-line">
690 - <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeaderHistory/service/ReceiptHeaderHistoryService.java</url>  
691 - <line>49</line>  
692 - <properties />  
693 - <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" />
694 </line-breakpoint> 277 </line-breakpoint>
695 <line-breakpoint enabled="true" type="java-line"> 278 <line-breakpoint enabled="true" type="java-line">
696 - <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeader/service/ReceiptHeaderService.java</url>  
697 - <line>92</line>  
698 - <properties />  
699 - <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" />
700 </line-breakpoint> 282 </line-breakpoint>
701 <line-breakpoint enabled="true" type="java-line"> 283 <line-breakpoint enabled="true" type="java-line">
702 - <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/containerType/service/ContainerTypeServiceImpl.java</url>  
703 - <line>31</line>  
704 - <properties />  
705 - <option name="timeStamp" value="26" />  
706 - </line-breakpoint>  
707 - <line-breakpoint enabled="true" type="java-line">  
708 - <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java</url>  
709 - <line>48</line>  
710 - <properties />  
711 - <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" />
712 </line-breakpoint> 287 </line-breakpoint>
713 </breakpoints> 288 </breakpoints>
714 </breakpoint-manager> 289 </breakpoint-manager>
715 - <watches-manager>  
716 - <configuration name="SpringBootApplicationConfigurationType">  
717 - <watch expression="DataUtils.getInteger(map.get(&quot;receiptId&quot;))" language="JAVA" />  
718 - </configuration>  
719 - </watches-manager>  
720 - </component>  
721 - <component name="debuggerHistoryManager">  
722 - <expressions id="watch">  
723 - <expression>  
724 - <expression-string>DataUtils.getInteger(map.get(&quot;receiptId&quot;))</expression-string>  
725 - <language-id>JAVA</language-id>  
726 - <evaluation-mode>EXPRESSION</evaluation-mode>  
727 - </expression>  
728 - </expressions>  
729 - </component>  
730 - <component name="editorHistoryManager">  
731 - <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">  
732 - <provider selected="true" editor-type-id="text-editor">  
733 - <state relative-caret-position="149">  
734 - <caret line="53" column="12" selection-start-line="53" selection-start-column="12" selection-end-line="53" selection-end-column="12" />  
735 - </state>  
736 - </provider>  
737 - </entry>  
738 - <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/task/TaskHeaderMapper.xml">  
739 - <provider selected="true" editor-type-id="text-editor">  
740 - <state relative-caret-position="146">  
741 - <caret line="45" column="31" selection-start-line="45" selection-start-column="16" selection-end-line="45" selection-end-column="31" />  
742 - </state>  
743 - </provider>  
744 - </entry>  
745 - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/task/task/task.html">  
746 - <provider selected="true" editor-type-id="text-editor">  
747 - <state relative-caret-position="1444">  
748 - <caret line="76" column="89" selection-start-line="76" selection-start-column="70" selection-end-line="76" selection-end-column="89" />  
749 - </state>  
750 - </provider>  
751 - </entry>  
752 - <entry file="file://$PROJECT_DIR$/pom.xml">  
753 - <provider selected="true" editor-type-id="text-editor">  
754 - <state relative-caret-position="532">  
755 - <caret line="28" column="8" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="51" />  
756 - </state>  
757 - </provider>  
758 - </entry>  
759 - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailService.java">  
760 - <provider selected="true" editor-type-id="text-editor">  
761 - <state relative-caret-position="209">  
762 - <caret line="13" column="9" selection-start-line="13" selection-start-column="9" selection-end-line="13" selection-end-column="9" />  
763 - </state>  
764 - </provider>  
765 - </entry>  
766 - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/mapper/TaskHeaderMapper.java">  
767 - <provider selected="true" editor-type-id="text-editor">  
768 - <state relative-caret-position="114">  
769 - <caret line="11" column="30" selection-start-line="11" selection-start-column="30" selection-end-line="11" selection-end-column="30" />  
770 - </state>  
771 - </provider>  
772 - </entry>  
773 - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/controller/ReceiptContainerHeaderController.java">  
774 - <provider selected="true" editor-type-id="text-editor">  
775 - <state relative-caret-position="323">  
776 - <caret line="136" column="42" selection-start-line="136" selection-start-column="42" selection-end-line="136" selection-end-column="42" />  
777 - </state>  
778 - </provider>  
779 - </entry>  
780 - <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/config/ContainerMapper.xml">  
781 - <provider selected="true" editor-type-id="text-editor">  
782 - <state relative-caret-position="490">  
783 - <caret line="50" column="4" selection-start-line="50" selection-start-column="4" selection-end-line="50" selection-end-column="4" />  
784 - </state>  
785 - </provider>  
786 - </entry>  
787 - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/mapper/ContainerMapper.java">  
788 - <provider selected="true" editor-type-id="text-editor">  
789 - <state relative-caret-position="171">  
790 - <caret line="14" column="9" selection-start-line="14" selection-start-column="9" selection-end-line="14" selection-end-column="9" />  
791 - </state>  
792 - </provider>  
793 - </entry>  
794 - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/service/ContainerServiceImpl.java">  
795 - <provider selected="true" editor-type-id="text-editor">  
796 - <state relative-caret-position="471">  
797 - <caret line="127" column="47" lean-forward="true" selection-start-line="127" selection-start-column="47" selection-end-line="127" selection-end-column="47" />  
798 - </state>  
799 - </provider>  
800 - </entry>  
801 - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/service/ContainerService.java">  
802 - <provider selected="true" editor-type-id="text-editor">  
803 - <state relative-caret-position="228">  
804 - <caret line="17" column="9" selection-start-line="17" selection-start-column="9" selection-end-line="17" selection-end-column="9" />  
805 - </state>  
806 - </provider>  
807 - </entry>  
808 - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskDetail/domain/TaskDetail.java">  
809 - <provider selected="true" editor-type-id="text-editor">  
810 - <state relative-caret-position="226">  
811 - <caret line="65" column="19" selection-start-line="65" selection-start-column="19" selection-end-line="65" selection-end-column="19" />  
812 - </state>  
813 - </provider>  
814 - </entry>  
815 - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java">  
816 - <provider selected="true" editor-type-id="text-editor">  
817 - <state relative-caret-position="1710">  
818 - <caret line="117" column="45" selection-start-line="117" selection-start-column="45" selection-end-line="117" selection-end-column="45" />  
819 - </state>  
820 - </provider>  
821 - </entry>  
822 - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java">  
823 - <provider selected="true" editor-type-id="text-editor">  
824 - <state relative-caret-position="209">  
825 - <caret line="18" column="15" selection-start-line="18" selection-start-column="15" selection-end-line="18" selection-end-column="15" />  
826 - </state>  
827 - </provider>  
828 - </entry>  
829 - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentHeader/service/ShipmentHeaderService.java">  
830 - <provider selected="true" editor-type-id="text-editor">  
831 - <state relative-caret-position="266">  
832 - <caret line="18" column="15" selection-start-line="18" selection-start-column="15" selection-end-line="18" selection-end-column="15" />  
833 - </state>  
834 - </provider>  
835 - </entry>  
836 - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentHeader/service/ShipmentHeaderServiceImpl.java">  
837 - <provider selected="true" editor-type-id="text-editor">  
838 - <state relative-caret-position="1596">  
839 - <caret line="112" column="26" selection-start-line="112" selection-start-column="16" selection-end-line="112" selection-end-column="26" />  
840 - </state>  
841 - </provider>  
842 - </entry>  
843 - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/domain/InventoryTransaction.java">  
844 - <provider selected="true" editor-type-id="text-editor">  
845 - <state relative-caret-position="1653">  
846 - <caret line="95" column="19" selection-start-line="95" selection-start-column="12" selection-end-line="95" selection-end-column="19" />  
847 - </state>  
848 - </provider>  
849 - </entry>  
850 - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/taskHeader.html">  
851 - <provider selected="true" editor-type-id="text-editor">  
852 - <state relative-caret-position="4484">  
853 - <caret line="236" column="64" selection-start-line="236" selection-start-column="64" selection-end-line="236" selection-end-column="64" />  
854 - </state>  
855 - </provider>  
856 - </entry>  
857 - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerDetail/domain/ReceiptContainerDetail.java">  
858 - <provider selected="true" editor-type-id="text-editor">  
859 - <state relative-caret-position="226">  
860 - <caret line="347" column="1" selection-start-line="347" selection-start-column="1" selection-end-line="347" selection-end-column="1" />  
861 - </state>  
862 - </provider>  
863 - </entry>  
864 - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/domain/InventoryDetail.java">  
865 - <provider selected="true" editor-type-id="text-editor">  
866 - <state relative-caret-position="226">  
867 - <caret line="92" column="23" selection-start-line="92" selection-start-column="23" selection-end-line="92" selection-end-column="23" />  
868 - </state>  
869 - </provider>  
870 - </entry>  
871 - <entry file="file://G:/网星联创/千金电玩城后台管理/ticketManager/src/com/ticket/server/back/player/entity/PlayerInfo.java">  
872 - <provider selected="true" editor-type-id="text-editor">  
873 - <state relative-caret-position="171">  
874 - <caret line="18" column="34" selection-start-line="18" selection-start-column="25" selection-end-line="18" selection-end-column="34" />  
875 - </state>  
876 - </provider>  
877 - </entry>  
878 - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/domain/ReceiptContainerHeader.java">  
879 - <provider selected="true" editor-type-id="text-editor">  
880 - <state relative-caret-position="19">  
881 - <caret line="193" column="37" lean-forward="true" selection-start-line="193" selection-start-column="37" selection-end-line="193" selection-end-column="37" />  
882 - <folding>  
883 - <element signature="e#14321#14322#0" expanded="true" />  
884 - <element signature="e#14357#14358#0" expanded="true" />  
885 - </folding>  
886 - </state>  
887 - </provider>  
888 - </entry>  
889 - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/domain/InventoryHeader.java">  
890 - <provider selected="true" editor-type-id="text-editor">  
891 - <state relative-caret-position="226">  
892 - <caret line="77" column="19" selection-start-line="77" selection-start-column="12" selection-end-line="77" selection-end-column="19" />  
893 - </state>  
894 - </provider>  
895 - </entry>  
896 - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java">  
897 - <provider selected="true" editor-type-id="text-editor">  
898 - <state relative-caret-position="-157">  
899 - <caret line="173" column="28" selection-start-line="173" selection-start-column="10" selection-end-line="173" selection-end-column="28" />  
900 - </state>  
901 - </provider>  
902 - </entry>  
903 - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java">  
904 - <provider selected="true" editor-type-id="text-editor">  
905 - <state relative-caret-position="140">  
906 - <caret line="500" lean-forward="true" selection-start-line="500" selection-end-line="500" />  
907 - <folding>  
908 - <element signature="imports" expanded="true" />  
909 - </folding>  
910 - </state>  
911 - </provider>  
912 - </entry>  
913 </component> 290 </component>
914 </project> 291 </project>
915 \ No newline at end of file 292 \ No newline at end of file
src/main/java/com/huaheng/pc/check/checkDetail/controller/CheckDetailController.java
  View file @cdf142a
@@ -148,6 +148,7 @@ public class CheckDetailController extends BaseController { @@ -148,6 +148,7 @@ public class CheckDetailController extends BaseController {
148 @RequiresPermissions("check:checkDetail:complete") 148 @RequiresPermissions("check:checkDetail:complete")
149 @Log(title = "质检-质检详情 ",operating = "质检详情删除", action = BusinessType.DELETE) 149 @Log(title = "质检-质检详情 ",operating = "质检详情删除", action = BusinessType.DELETE)
150 @PostMapping("/complete") 150 @PostMapping("/complete")
  151 + @ResponseBody
151 public AjaxResult complete(@ApiParam(name="质检明细id",value="id")Integer id, 152 public AjaxResult complete(@ApiParam(name="质检明细id",value="id")Integer id,
152 @ApiParam(name="库存状态",value="inventorySts",example="good,bad")String inventorySts, 153 @ApiParam(name="库存状态",value="inventorySts",example="good,bad")String inventorySts,
153 @ApiParam(name = "数量",value = "qty",example = "10,20") String qty) { 154 @ApiParam(name = "数量",value = "qty",example = "10,20") String qty) {
src/main/java/com/huaheng/pc/check/checkDetail/service/CheckDetailService.java
  View file @cdf142a
@@ -95,7 +95,9 @@ public class CheckDetailService extends ServiceImpl&lt;CheckDetailMapper, CheckDeta @@ -95,7 +95,9 @@ public class CheckDetailService extends ServiceImpl&lt;CheckDetailMapper, CheckDeta
95 CheckHeader checkHeader = new CheckHeader(); 95 CheckHeader checkHeader = new CheckHeader();
96 checkHeader.setId(checkDetail.getCheckHeaderId()); 96 checkHeader.setId(checkDetail.getCheckHeaderId());
97 checkHeader.setStatus("20"); 97 checkHeader.setStatus("20");
98 - checkHeaderService.updateById(checkHeader); 98 + if (!checkHeaderService.updateById(checkHeader)){
  99 + throw new ServiceException("更新质检头表发生错误");
  100 + }
99 } 101 }
100 return AjaxResult.success("质检完成"); 102 return AjaxResult.success("质检完成");
101 } 103 }
src/main/java/com/huaheng/pc/check/checkingRegister/controller/CheckingRegisterController.java
  View file @cdf142a
@@ -88,6 +88,7 @@ public class CheckingRegisterController extends BaseController { @@ -88,6 +88,7 @@ public class CheckingRegisterController extends BaseController {
88 CheckingRegister::getInventorySts, checkingRegister.getInventorySts()) 88 CheckingRegister::getInventorySts, checkingRegister.getInventorySts())
89 .eq(StringUtils.isNotEmpty(checkingRegister.getCheckBy()), 89 .eq(StringUtils.isNotEmpty(checkingRegister.getCheckBy()),
90 CheckingRegister::getCheckAt, checkingRegister.getCheckAt()) 90 CheckingRegister::getCheckAt, checkingRegister.getCheckAt())
  91 + .orderByDesc(CheckingRegister::getCheckAt)
91 .orderByDesc(CheckingRegister::getReceiptDetailId); 92 .orderByDesc(CheckingRegister::getReceiptDetailId);
92 93
93 if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){ 94 if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
src/main/java/com/huaheng/pc/config/shipmentPreference/controller/ShipmentPreferenceController.java
  View file @cdf142a
@@ -114,7 +114,7 @@ public class ShipmentPreferenceController extends BaseController { @@ -114,7 +114,7 @@ public class ShipmentPreferenceController extends BaseController {
114 */ 114 */
115 @ApiOperation(value="修改出库首选项", notes="修改出库首选项", httpMethod = "POST") 115 @ApiOperation(value="修改出库首选项", notes="修改出库首选项", httpMethod = "POST")
116 @RequiresPermissions("config:shipmentPreference:edit") 116 @RequiresPermissions("config:shipmentPreference:edit")
117 - @Log(title = "通用-出库首选项", operating = "修改出库首选项", action = BusinessType.UPDATE) 117 + @Log(title = "配置-出库首选项", operating = "修改出库首选项", action = BusinessType.UPDATE)
118 @PostMapping("/edit") 118 @PostMapping("/edit")
119 @ResponseBody 119 @ResponseBody
120 public AjaxResult editSave( 120 public AjaxResult editSave(
@@ -128,7 +128,7 @@ public class ShipmentPreferenceController extends BaseController { @@ -128,7 +128,7 @@ public class ShipmentPreferenceController extends BaseController {
128 */ 128 */
129 @ApiOperation(value="删除出库首选项", notes="根据id批量删除入库首选项，参数示例1,2,3", httpMethod = "POST") 129 @ApiOperation(value="删除出库首选项", notes="根据id批量删除入库首选项，参数示例1,2,3", httpMethod = "POST")
130 @RequiresPermissions("config:shipmentPreference:remove") 130 @RequiresPermissions("config:shipmentPreference:remove")
131 - @Log(title = "通用-出库首选项", operating = "删除出库首选项", action = BusinessType.DELETE) 131 + @Log(title = "配置-出库首选项", operating = "删除出库首选项", action = BusinessType.DELETE)
132 @PostMapping( "/remove") 132 @PostMapping( "/remove")
133 @ResponseBody 133 @ResponseBody
134 public AjaxResult remove(String ids) { 134 public AjaxResult remove(String ids) {
src/main/java/com/huaheng/pc/shipment/wave/controller/WaveController.java renamed to src/main/java/com/huaheng/pc/config/wave/controller/WaveController.java
  View file @cdf142a
1 -package com.huaheng.pc.shipment.wave.controller; 1 +package com.huaheng.pc.config.wave.controller;
2 2
3 3
4 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 4 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
5 import com.baomidou.mybatisplus.core.metadata.IPage; 5 import com.baomidou.mybatisplus.core.metadata.IPage;
6 import com.baomidou.mybatisplus.core.toolkit.Wrappers; 6 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
7 import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 7 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
  8 +import com.huaheng.common.support.Convert;
8 import com.huaheng.common.utils.StringUtils; 9 import com.huaheng.common.utils.StringUtils;
9 import com.huaheng.common.utils.security.ShiroUtils; 10 import com.huaheng.common.utils.security.ShiroUtils;
10 import com.huaheng.framework.aspectj.lang.annotation.Log; 11 import com.huaheng.framework.aspectj.lang.annotation.Log;
11 import com.huaheng.framework.aspectj.lang.constant.BusinessType; 12 import com.huaheng.framework.aspectj.lang.constant.BusinessType;
12 import com.huaheng.framework.web.controller.BaseController; 13 import com.huaheng.framework.web.controller.BaseController;
  14 +import com.huaheng.framework.web.domain.AjaxResult;
13 import com.huaheng.framework.web.page.PageDomain; 15 import com.huaheng.framework.web.page.PageDomain;
14 import com.huaheng.framework.web.page.TableDataInfo; 16 import com.huaheng.framework.web.page.TableDataInfo;
15 import com.huaheng.framework.web.page.TableSupport; 17 import com.huaheng.framework.web.page.TableSupport;
16 -import com.huaheng.pc.shipment.wave.domain.Wave;  
17 -import com.huaheng.pc.shipment.wave.service.WaveService; 18 +import com.huaheng.pc.config.wave.domain.Wave;
  19 +import com.huaheng.pc.config.wave.service.WaveService;
18 import io.swagger.annotations.Api; 20 import io.swagger.annotations.Api;
  21 +import io.swagger.annotations.ApiOperation;
  22 +import io.swagger.annotations.ApiParam;
19 import org.apache.shiro.authz.annotation.RequiresPermissions; 23 import org.apache.shiro.authz.annotation.RequiresPermissions;
20 import org.springframework.beans.factory.annotation.Autowired; 24 import org.springframework.beans.factory.annotation.Autowired;
21 import org.springframework.stereotype.Controller; 25 import org.springframework.stereotype.Controller;
22 -import org.springframework.web.bind.annotation.GetMapping;  
23 -import org.springframework.web.bind.annotation.PostMapping;  
24 -import org.springframework.web.bind.annotation.RequestMapping;  
25 -import org.springframework.web.bind.annotation.ResponseBody; 26 +import org.springframework.ui.ModelMap;
  27 +import org.springframework.web.bind.annotation.*;
26 28
  29 +import java.util.ArrayList;
27 import java.util.List; 30 import java.util.List;
28 31
29 /** 32 /**
@@ -50,7 +53,7 @@ public class WaveController extends BaseController { @@ -50,7 +53,7 @@ public class WaveController extends BaseController {
50 } 53 }
51 54
52 /** 55 /**
53 - * 查询订单分析结果 56 + * 查询波次
54 */ 57 */
55 @RequiresPermissions("shipment:wave:list") 58 @RequiresPermissions("shipment:wave:list")
56 @Log(title = "出库-波次", operating="查看波次", action = BusinessType.GRANT) 59 @Log(title = "出库-波次", operating="查看波次", action = BusinessType.GRANT)
@@ -63,14 +66,14 @@ public class WaveController extends BaseController { @@ -63,14 +66,14 @@ public class WaveController extends BaseController {
63 Integer pageNum = pageDomain.getPageNum(); 66 Integer pageNum = pageDomain.getPageNum();
64 Integer pageSize = pageDomain.getPageSize(); 67 Integer pageSize = pageDomain.getPageSize();
65 68
66 - lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin),Wave::getCreated, createdBegin) 69 + lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin), Wave::getCreated, createdBegin)
67 .le(StringUtils.isNotEmpty(createdEnd), Wave::getCreated, createdEnd) 70 .le(StringUtils.isNotEmpty(createdEnd), Wave::getCreated, createdEnd)
68 .eq(Wave::getWarehouseCode, ShiroUtils.getWarehouseCode()) 71 .eq(Wave::getWarehouseCode, ShiroUtils.getWarehouseCode())
69 .eq(StringUtils.isNotEmpty(wave.getWaveMode() 72 .eq(StringUtils.isNotEmpty(wave.getWaveMode()
70 - ),Wave::getWaveMode,wave.getWaveMode())  
71 - .eq(wave.getStatus()!=null,Wave::getStatus,wave.getStatus()) 73 + ), Wave::getWaveMode,wave.getWaveMode())
  74 + .eq(wave.getStatus()!=null, Wave::getStatus,wave.getStatus())
72 .like(StringUtils.isNotEmpty(wave.getWaveName() 75 .like(StringUtils.isNotEmpty(wave.getWaveName()
73 - ),Wave::getWaveName,wave.getWaveName()); 76 + ), Wave::getWaveName,wave.getWaveName());
74 77
75 if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){ 78 if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
76 /** 79 /**
@@ -85,5 +88,66 @@ public class WaveController extends BaseController { @@ -85,5 +88,66 @@ public class WaveController extends BaseController {
85 } 88 }
86 } 89 }
87 90
  91 + /**
  92 + * 新增波次
  93 + */
  94 + @GetMapping("/add")
  95 + public String add() {
  96 + return prefix + "/add";
  97 + }
  98 +
  99 + /**
  100 + * 新增波次
  101 + */
  102 + @RequiresPermissions("config:wave:add")
  103 + @Log(title = "配置-波次", operating = "新增波次", action = BusinessType.INSERT)
  104 + @PostMapping("/add")
  105 + @ResponseBody
  106 + public AjaxResult addSave(Wave wave){
  107 + wave.setWarehouseCode(ShiroUtils.getWarehouseCode());
  108 + wave.setCreatedBy(ShiroUtils.getLoginName());
  109 + wave.setLastUpdatedBy(ShiroUtils.getLoginName());
  110 + return toAjax(waveService.save(wave));
  111 + }
  112 +
  113 + /**
  114 + * 修改波次
  115 + */
  116 + @GetMapping("/edit/{id}")
  117 + public String edit(@PathVariable("id") Integer id, ModelMap mmap) {
  118 + mmap.put("wave", waveService.getById(id));
  119 + return prefix + "/edit";
  120 + }
  121 +
  122 + /**
  123 + * 修改波次
  124 + */
  125 + @RequiresPermissions("config:wave:edit")
  126 + @Log(title = "通用-波次", operating = "修改波次", action = BusinessType.UPDATE)
  127 + @PostMapping("/edit")
  128 + @ResponseBody
  129 + public AjaxResult editSave(Wave wave) {
  130 + wave.setLastUpdatedBy(ShiroUtils.getLoginName());
  131 + return toAjax(waveService.updateById(wave));
  132 + }
  133 +
  134 + /**
  135 + * 删除波次
  136 + */
  137 + @RequiresPermissions("config:wave:remove")
  138 + @Log(title = "配置-波次", operating = "删除波次", action = BusinessType.DELETE)
  139 + @PostMapping( "/remove")
  140 + @ResponseBody
  141 + public AjaxResult remove(String ids) {
  142 + if (StringUtils.isEmpty(ids)){
  143 + return AjaxResult.error("id不能为空");
  144 + }
  145 + List<Integer> list = new ArrayList<>();
  146 + for (Integer id : Convert.toIntArray(ids)) {
  147 + list.add(id);
  148 + }
  149 + return toAjax(waveService.removeByIds(list));
  150 + }
  151 +
88 152
89 } 153 }
src/main/java/com/huaheng/pc/shipment/wave/domain/Wave.java renamed to src/main/java/com/huaheng/pc/config/wave/domain/Wave.java
  View file @cdf142a
1 -package com.huaheng.pc.shipment.wave.domain; 1 +package com.huaheng.pc.config.wave.domain;
2 2
3 import com.baomidou.mybatisplus.annotation.IdType; 3 import com.baomidou.mybatisplus.annotation.IdType;
4 import com.baomidou.mybatisplus.annotation.TableField; 4 import com.baomidou.mybatisplus.annotation.TableField;
@@ -6,9 +6,10 @@ import com.baomidou.mybatisplus.annotation.TableId; @@ -6,9 +6,10 @@ import com.baomidou.mybatisplus.annotation.TableId;
6 import com.baomidou.mybatisplus.annotation.TableName; 6 import com.baomidou.mybatisplus.annotation.TableName;
7 import io.swagger.annotations.ApiModel; 7 import io.swagger.annotations.ApiModel;
8 import io.swagger.annotations.ApiModelProperty; 8 import io.swagger.annotations.ApiModelProperty;
  9 +import lombok.Data;
  10 +
9 import java.io.Serializable; 11 import java.io.Serializable;
10 import java.util.Date; 12 import java.util.Date;
11 -import lombok.Data;  
12 13
13 @ApiModel(value="com.huaheng.pc.shipment.wave.domain.Wave") 14 @ApiModel(value="com.huaheng.pc.shipment.wave.domain.Wave")
14 @Data 15 @Data
@@ -117,14 +118,14 @@ public class Wave implements Serializable { @@ -117,14 +118,14 @@ public class Wave implements Serializable {
117 */ 118 */
118 @TableField(value = "locked") 119 @TableField(value = "locked")
119 @ApiModelProperty(value="是否锁定") 120 @ApiModelProperty(value="是否锁定")
120 - private Integer locked; 121 + private Boolean locked;
121 122
122 /** 123 /**
123 * 是否需要补货 124 * 是否需要补货
124 */ 125 */
125 @TableField(value = "replenishmentReqd") 126 @TableField(value = "replenishmentReqd")
126 @ApiModelProperty(value="是否需要补货") 127 @ApiModelProperty(value="是否需要补货")
127 - private Integer replenishmentReqd; 128 + private Boolean replenishmentReqd;
128 129
129 /** 130 /**
130 * 信息编码 131 * 信息编码
src/main/java/com/huaheng/pc/shipment/wave/mapper/WaveMapper.java renamed to src/main/java/com/huaheng/pc/config/wave/mapper/WaveMapper.java
  View file @cdf142a
1 -package com.huaheng.pc.shipment.wave.mapper; 1 +package com.huaheng.pc.config.wave.mapper;
2 2
3 import com.baomidou.mybatisplus.core.mapper.BaseMapper; 3 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4 -import com.huaheng.pc.shipment.wave.domain.Wave; 4 +import com.huaheng.pc.config.wave.domain.Wave;
5 5
6 public interface WaveMapper extends BaseMapper<Wave> { 6 public interface WaveMapper extends BaseMapper<Wave> {
7 } 7 }
8 \ No newline at end of file 8 \ No newline at end of file
src/main/java/com/huaheng/pc/shipment/wave/service/WaveService.java renamed to src/main/java/com/huaheng/pc/config/wave/service/WaveService.java
  View file @cdf142a
1 -package com.huaheng.pc.shipment.wave.service; 1 +package com.huaheng.pc.config.wave.service;
2 2
3 -import org.springframework.stereotype.Service;  
4 -import javax.annotation.Resource;  
5 -import java.util.List;  
6 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 3 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
7 -import com.huaheng.pc.shipment.wave.mapper.WaveMapper;  
8 -import com.huaheng.pc.shipment.wave.domain.Wave; 4 +import com.huaheng.pc.config.wave.domain.Wave;
  5 +import com.huaheng.pc.config.wave.mapper.WaveMapper;
  6 +import org.springframework.stereotype.Service;
  7 +
9 @Service 8 @Service
10 public class WaveService extends ServiceImpl<WaveMapper, Wave> { 9 public class WaveService extends ServiceImpl<WaveMapper, Wave> {
11 10
src/main/java/com/huaheng/pc/shipment/waveFlowDetail/controller/WaveFlowDetailController.java renamed to src/main/java/com/huaheng/pc/config/waveFlowDetail/controller/WaveFlowDetailController.java
  View file @cdf142a
1 -package com.huaheng.pc.shipment.waveFlowDetail.controller; 1 +package com.huaheng.pc.config.waveFlowDetail.controller;
2 2
3 3
4 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 4 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
5 import com.baomidou.mybatisplus.core.metadata.IPage; 5 import com.baomidou.mybatisplus.core.metadata.IPage;
6 import com.baomidou.mybatisplus.core.toolkit.Wrappers; 6 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
7 import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 7 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
  8 +import com.huaheng.common.support.Convert;
8 import com.huaheng.common.utils.StringUtils; 9 import com.huaheng.common.utils.StringUtils;
9 import com.huaheng.common.utils.security.ShiroUtils; 10 import com.huaheng.common.utils.security.ShiroUtils;
10 import com.huaheng.framework.aspectj.lang.annotation.Log; 11 import com.huaheng.framework.aspectj.lang.annotation.Log;
11 import com.huaheng.framework.aspectj.lang.constant.BusinessType; 12 import com.huaheng.framework.aspectj.lang.constant.BusinessType;
12 import com.huaheng.framework.web.controller.BaseController; 13 import com.huaheng.framework.web.controller.BaseController;
  14 +import com.huaheng.framework.web.domain.AjaxResult;
13 import com.huaheng.framework.web.page.PageDomain; 15 import com.huaheng.framework.web.page.PageDomain;
14 import com.huaheng.framework.web.page.TableDataInfo; 16 import com.huaheng.framework.web.page.TableDataInfo;
15 import com.huaheng.framework.web.page.TableSupport; 17 import com.huaheng.framework.web.page.TableSupport;
16 -import com.huaheng.pc.shipment.waveFlowDetail.domain.WaveFlowDetail;  
17 -import com.huaheng.pc.shipment.waveFlowDetail.service.WaveFlowDetailService; 18 +import com.huaheng.pc.config.waveFlowDetail.domain.WaveFlowDetail;
  19 +import com.huaheng.pc.config.waveFlowDetail.service.WaveFlowDetailService;
18 import io.swagger.annotations.Api; 20 import io.swagger.annotations.Api;
19 import org.apache.shiro.authz.annotation.RequiresPermissions; 21 import org.apache.shiro.authz.annotation.RequiresPermissions;
20 import org.springframework.beans.factory.annotation.Autowired; 22 import org.springframework.beans.factory.annotation.Autowired;
21 import org.springframework.stereotype.Controller; 23 import org.springframework.stereotype.Controller;
22 -import org.springframework.web.bind.annotation.GetMapping;  
23 -import org.springframework.web.bind.annotation.PostMapping;  
24 -import org.springframework.web.bind.annotation.RequestMapping;  
25 -import org.springframework.web.bind.annotation.ResponseBody; 24 +import org.springframework.ui.ModelMap;
  25 +import org.springframework.web.bind.annotation.*;
26 26
  27 +import java.util.ArrayList;
27 import java.util.List; 28 import java.util.List;
28 29
29 /** 30 /**
@@ -50,7 +51,7 @@ public class WaveFlowDetailController extends BaseController { @@ -50,7 +51,7 @@ public class WaveFlowDetailController extends BaseController {
50 } 51 }
51 52
52 /** 53 /**
53 - * 查询订单分析结果 54 + * 查询波次流明细
54 */ 55 */
55 @RequiresPermissions("shipment:waveFlowDetail:list") 56 @RequiresPermissions("shipment:waveFlowDetail:list")
56 @Log(title = "出库-波次流明细", operating="查看波次流明细", action = BusinessType.GRANT) 57 @Log(title = "出库-波次流明细", operating="查看波次流明细", action = BusinessType.GRANT)
@@ -63,7 +64,7 @@ public class WaveFlowDetailController extends BaseController { @@ -63,7 +64,7 @@ public class WaveFlowDetailController extends BaseController {
63 Integer pageNum = pageDomain.getPageNum(); 64 Integer pageNum = pageDomain.getPageNum();
64 Integer pageSize = pageDomain.getPageSize(); 65 Integer pageSize = pageDomain.getPageSize();
65 66
66 - lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin),WaveFlowDetail::getCreated, createdBegin) 67 + lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin), WaveFlowDetail::getCreated, createdBegin)
67 .le(StringUtils.isNotEmpty(createdEnd), WaveFlowDetail::getCreated, createdEnd) 68 .le(StringUtils.isNotEmpty(createdEnd), WaveFlowDetail::getCreated, createdEnd)
68 .eq(WaveFlowDetail::getWarehouseCode, ShiroUtils.getWarehouseCode()); 69 .eq(WaveFlowDetail::getWarehouseCode, ShiroUtils.getWarehouseCode());
69 70
@@ -80,5 +81,65 @@ public class WaveFlowDetailController extends BaseController { @@ -80,5 +81,65 @@ public class WaveFlowDetailController extends BaseController {
80 } 81 }
81 } 82 }
82 83
  84 + /**
  85 + * 新增波次流明细
  86 + */
  87 + @GetMapping("/add")
  88 + public String add() {
  89 + return prefix + "/add";
  90 + }
  91 +
  92 + /**
  93 + * 新增波次流明细
  94 + */
  95 + @RequiresPermissions("config:wave:add")
  96 + @Log(title = "配置-波次流明细", operating = "新增波次流明细", action = BusinessType.INSERT)
  97 + @PostMapping("/add")
  98 + @ResponseBody
  99 + public AjaxResult addSave(WaveFlowDetail waveFlowDetail){
  100 + waveFlowDetail.setWarehouseCode(ShiroUtils.getWarehouseCode());
  101 + waveFlowDetail.setCreatedBy(ShiroUtils.getLoginName());
  102 + waveFlowDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
  103 + return toAjax(waveFlowDetailService.save(waveFlowDetail));
  104 + }
  105 +
  106 + /**
  107 + * 修改波次流明细
  108 + */
  109 + @GetMapping("/edit/{id}")
  110 + public String edit(@PathVariable("id") Integer id, ModelMap mmap) {
  111 + mmap.put("wave", waveFlowDetailService.getById(id));
  112 + return prefix + "/edit";
  113 + }
  114 +
  115 + /**
  116 + * 修改波次流明细
  117 + */
  118 + @RequiresPermissions("config:wave:edit")
  119 + @Log(title = "通用-波次流明细", operating = "修改波次流明细", action = BusinessType.UPDATE)
  120 + @PostMapping("/edit")
  121 + @ResponseBody
  122 + public AjaxResult editSave(WaveFlowDetail waveFlowDetail) {
  123 + waveFlowDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
  124 + return toAjax(waveFlowDetailService.updateById(waveFlowDetail));
  125 + }
  126 +
  127 + /**
  128 + * 删除波次流明细
  129 + */
  130 + @RequiresPermissions("config:wave:remove")
  131 + @Log(title = "配置-波次流明细", operating = "删除波次流明细", action = BusinessType.DELETE)
  132 + @PostMapping( "/remove")
  133 + @ResponseBody
  134 + public AjaxResult remove(String ids) {
  135 + if (StringUtils.isEmpty(ids)){
  136 + return AjaxResult.error("id不能为空");
  137 + }
  138 + List<Integer> list = new ArrayList<>();
  139 + for (Integer id : Convert.toIntArray(ids)) {
  140 + list.add(id);
  141 + }
  142 + return toAjax(waveFlowDetailService.removeByIds(list));
  143 + }
83 144
84 } 145 }
src/main/java/com/huaheng/pc/shipment/waveFlowDetail/domain/WaveFlowDetail.java renamed to src/main/java/com/huaheng/pc/config/waveFlowDetail/domain/WaveFlowDetail.java
  View file @cdf142a
1 -package com.huaheng.pc.shipment.waveFlowDetail.domain; 1 +package com.huaheng.pc.config.waveFlowDetail.domain;
2 2
3 import com.baomidou.mybatisplus.annotation.IdType; 3 import com.baomidou.mybatisplus.annotation.IdType;
4 import com.baomidou.mybatisplus.annotation.TableField; 4 import com.baomidou.mybatisplus.annotation.TableField;
@@ -6,9 +6,10 @@ import com.baomidou.mybatisplus.annotation.TableId; @@ -6,9 +6,10 @@ import com.baomidou.mybatisplus.annotation.TableId;
6 import com.baomidou.mybatisplus.annotation.TableName; 6 import com.baomidou.mybatisplus.annotation.TableName;
7 import io.swagger.annotations.ApiModel; 7 import io.swagger.annotations.ApiModel;
8 import io.swagger.annotations.ApiModelProperty; 8 import io.swagger.annotations.ApiModelProperty;
  9 +import lombok.Data;
  10 +
9 import java.io.Serializable; 11 import java.io.Serializable;
10 import java.util.Date; 12 import java.util.Date;
11 -import lombok.Data;  
12 13
13 @ApiModel(value="com.huaheng.pc.shipment.waveFlowDetail.domain.WaveFlowDetail") 14 @ApiModel(value="com.huaheng.pc.shipment.waveFlowDetail.domain.WaveFlowDetail")
14 @Data 15 @Data
src/main/java/com/huaheng/pc/shipment/waveFlowDetail/mapper/WaveFlowDetailMapper.java renamed to src/main/java/com/huaheng/pc/config/waveFlowDetail/mapper/WaveFlowDetailMapper.java
  View file @cdf142a
1 -package com.huaheng.pc.shipment.waveFlowDetail.mapper; 1 +package com.huaheng.pc.config.waveFlowDetail.mapper;
2 2
3 import com.baomidou.mybatisplus.core.mapper.BaseMapper; 3 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4 -import com.huaheng.pc.shipment.waveFlowDetail.domain.WaveFlowDetail; 4 +import com.huaheng.pc.config.waveFlowDetail.domain.WaveFlowDetail;
5 5
6 public interface WaveFlowDetailMapper extends BaseMapper<WaveFlowDetail> { 6 public interface WaveFlowDetailMapper extends BaseMapper<WaveFlowDetail> {
7 } 7 }
8 \ No newline at end of file 8 \ No newline at end of file
src/main/java/com/huaheng/pc/shipment/waveFlowDetail/service/WaveFlowDetailService.java renamed to src/main/java/com/huaheng/pc/config/waveFlowDetail/service/WaveFlowDetailService.java
  View file @cdf142a
1 -package com.huaheng.pc.shipment.waveFlowDetail.service; 1 +package com.huaheng.pc.config.waveFlowDetail.service;
2 2
3 -import org.springframework.stereotype.Service;  
4 -import javax.annotation.Resource;  
5 -import java.util.List;  
6 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 3 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
7 -import com.huaheng.pc.shipment.waveFlowDetail.domain.WaveFlowDetail;  
8 -import com.huaheng.pc.shipment.waveFlowDetail.mapper.WaveFlowDetailMapper; 4 +import com.huaheng.pc.config.waveFlowDetail.domain.WaveFlowDetail;
  5 +import com.huaheng.pc.config.waveFlowDetail.mapper.WaveFlowDetailMapper;
  6 +import org.springframework.stereotype.Service;
  7 +
9 @Service 8 @Service
10 public class WaveFlowDetailService extends ServiceImpl<WaveFlowDetailMapper, WaveFlowDetail> { 9 public class WaveFlowDetailService extends ServiceImpl<WaveFlowDetailMapper, WaveFlowDetail> {
11 10
src/main/java/com/huaheng/pc/shipment/waveFlowHeader/controller/WaveFlowHeaderController.java renamed to src/main/java/com/huaheng/pc/config/waveFlowHeader/controller/WaveFlowHeaderController.java
  View file @cdf142a
1 -package com.huaheng.pc.shipment.waveFlowHeader.controller; 1 +package com.huaheng.pc.config.waveFlowHeader.controller;
2 2
3 3
4 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 4 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
5 import com.baomidou.mybatisplus.core.metadata.IPage; 5 import com.baomidou.mybatisplus.core.metadata.IPage;
6 import com.baomidou.mybatisplus.core.toolkit.Wrappers; 6 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
7 import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 7 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
  8 +import com.huaheng.common.support.Convert;
8 import com.huaheng.common.utils.StringUtils; 9 import com.huaheng.common.utils.StringUtils;
9 import com.huaheng.common.utils.security.ShiroUtils; 10 import com.huaheng.common.utils.security.ShiroUtils;
10 import com.huaheng.framework.aspectj.lang.annotation.Log; 11 import com.huaheng.framework.aspectj.lang.annotation.Log;
11 import com.huaheng.framework.aspectj.lang.constant.BusinessType; 12 import com.huaheng.framework.aspectj.lang.constant.BusinessType;
12 import com.huaheng.framework.web.controller.BaseController; 13 import com.huaheng.framework.web.controller.BaseController;
  14 +import com.huaheng.framework.web.domain.AjaxResult;
13 import com.huaheng.framework.web.page.PageDomain; 15 import com.huaheng.framework.web.page.PageDomain;
14 import com.huaheng.framework.web.page.TableDataInfo; 16 import com.huaheng.framework.web.page.TableDataInfo;
15 import com.huaheng.framework.web.page.TableSupport; 17 import com.huaheng.framework.web.page.TableSupport;
16 -import com.huaheng.pc.shipment.waveFlowHeader.domain.WaveFlowHeader;  
17 -import com.huaheng.pc.shipment.waveFlowHeader.service.WaveFlowHeaderService; 18 +import com.huaheng.pc.config.waveFlowHeader.domain.WaveFlowHeader;
  19 +import com.huaheng.pc.config.waveFlowHeader.service.WaveFlowHeaderService;
18 import io.swagger.annotations.Api; 20 import io.swagger.annotations.Api;
19 import org.apache.shiro.authz.annotation.RequiresPermissions; 21 import org.apache.shiro.authz.annotation.RequiresPermissions;
20 import org.springframework.beans.factory.annotation.Autowired; 22 import org.springframework.beans.factory.annotation.Autowired;
21 import org.springframework.stereotype.Controller; 23 import org.springframework.stereotype.Controller;
22 -import org.springframework.web.bind.annotation.GetMapping;  
23 -import org.springframework.web.bind.annotation.PostMapping;  
24 -import org.springframework.web.bind.annotation.RequestMapping;  
25 -import org.springframework.web.bind.annotation.ResponseBody; 24 +import org.springframework.ui.ModelMap;
  25 +import org.springframework.web.bind.annotation.*;
26 26
  27 +import java.util.ArrayList;
27 import java.util.List; 28 import java.util.List;
28 29
29 /** 30 /**
@@ -50,7 +51,7 @@ public class WaveFlowHeaderController extends BaseController { @@ -50,7 +51,7 @@ public class WaveFlowHeaderController extends BaseController {
50 } 51 }
51 52
52 /** 53 /**
53 - * 查询订单分析结果 54 + * 查询波次流头表
54 */ 55 */
55 @RequiresPermissions("shipment:waveFlowHeader:list") 56 @RequiresPermissions("shipment:waveFlowHeader:list")
56 @Log(title = "出库-波次流头表", operating="查看波次流头表", action = BusinessType.GRANT) 57 @Log(title = "出库-波次流头表", operating="查看波次流头表", action = BusinessType.GRANT)
@@ -63,11 +64,11 @@ public class WaveFlowHeaderController extends BaseController { @@ -63,11 +64,11 @@ public class WaveFlowHeaderController extends BaseController {
63 Integer pageNum = pageDomain.getPageNum(); 64 Integer pageNum = pageDomain.getPageNum();
64 Integer pageSize = pageDomain.getPageSize(); 65 Integer pageSize = pageDomain.getPageSize();
65 66
66 - lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin),WaveFlowHeader::getCreated, createdBegin) 67 + lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin), WaveFlowHeader::getCreated, createdBegin)
67 .le(StringUtils.isNotEmpty(createdEnd), WaveFlowHeader::getCreated, createdEnd) 68 .le(StringUtils.isNotEmpty(createdEnd), WaveFlowHeader::getCreated, createdEnd)
68 .eq(WaveFlowHeader::getWarehouseCode, ShiroUtils.getWarehouseCode()) 69 .eq(WaveFlowHeader::getWarehouseCode, ShiroUtils.getWarehouseCode())
69 .eq(StringUtils.isNotEmpty(waveFlowHeader.getCode() 70 .eq(StringUtils.isNotEmpty(waveFlowHeader.getCode()
70 - ),WaveFlowHeader::getCode,waveFlowHeader.getCode()); 71 + ), WaveFlowHeader::getCode,waveFlowHeader.getCode());
71 72
72 if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){ 73 if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
73 /** 74 /**
@@ -83,4 +84,66 @@ public class WaveFlowHeaderController extends BaseController { @@ -83,4 +84,66 @@ public class WaveFlowHeaderController extends BaseController {
83 } 84 }
84 85
85 86
  87 + /**
  88 + * 新增波次流头表
  89 + */
  90 + @GetMapping("/add")
  91 + public String add() {
  92 + return prefix + "/add";
  93 + }
  94 +
  95 + /**
  96 + * 新增波次流头表
  97 + */
  98 + @RequiresPermissions("config:waveFlowHeader:add")
  99 + @Log(title = "配置-波次流头表", operating = "新增波次流头表", action = BusinessType.INSERT)
  100 + @PostMapping("/add")
  101 + @ResponseBody
  102 + public AjaxResult addSave(WaveFlowHeader waveFlowHeader){
  103 + waveFlowHeader.setWarehouseCode(ShiroUtils.getWarehouseCode());
  104 + waveFlowHeader.setCreatedBy(ShiroUtils.getLoginName());
  105 + waveFlowHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
  106 + return toAjax(waveFlowHeaderService.save(waveFlowHeader));
  107 + }
  108 +
  109 + /**
  110 + * 修改波次流头表
  111 + */
  112 + @GetMapping("/edit/{id}")
  113 + public String edit(@PathVariable("id") Integer id, ModelMap mmap) {
  114 + mmap.put("waveFlowHeader", waveFlowHeaderService.getById(id));
  115 + return prefix + "/edit";
  116 + }
  117 +
  118 + /**
  119 + * 修改波次流头表
  120 + */
  121 + @RequiresPermissions("config:waveFlowHeader:edit")
  122 + @Log(title = "通用-波次流头表", operating = "修改波次流头表", action = BusinessType.UPDATE)
  123 + @PostMapping("/edit")
  124 + @ResponseBody
  125 + public AjaxResult editSave(WaveFlowHeader waveFlowHeader) {
  126 + waveFlowHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
  127 + return toAjax(waveFlowHeaderService.updateById(waveFlowHeader));
  128 + }
  129 +
  130 + /**
  131 + * 删除波次流头表
  132 + */
  133 + @RequiresPermissions("config:waveFlowHeader:remove")
  134 + @Log(title = "配置-波次流头表", operating = "删除波次流头表", action = BusinessType.DELETE)
  135 + @PostMapping( "/remove")
  136 + @ResponseBody
  137 + public AjaxResult remove(String ids) {
  138 + if (StringUtils.isEmpty(ids)){
  139 + return AjaxResult.error("id不能为空");
  140 + }
  141 + List<Integer> list = new ArrayList<>();
  142 + for (Integer id : Convert.toIntArray(ids)) {
  143 + list.add(id);
  144 + }
  145 + return toAjax(waveFlowHeaderService.removeByIds(list));
  146 + }
  147 +
  148 +
86 } 149 }
src/main/java/com/huaheng/pc/shipment/waveFlowHeader/domain/WaveFlowHeader.java renamed to src/main/java/com/huaheng/pc/config/waveFlowHeader/domain/WaveFlowHeader.java
  View file @cdf142a
1 -package com.huaheng.pc.shipment.waveFlowHeader.domain; 1 +package com.huaheng.pc.config.waveFlowHeader.domain;
2 2
3 import com.baomidou.mybatisplus.annotation.IdType; 3 import com.baomidou.mybatisplus.annotation.IdType;
4 import com.baomidou.mybatisplus.annotation.TableField; 4 import com.baomidou.mybatisplus.annotation.TableField;
@@ -6,9 +6,10 @@ import com.baomidou.mybatisplus.annotation.TableId; @@ -6,9 +6,10 @@ import com.baomidou.mybatisplus.annotation.TableId;
6 import com.baomidou.mybatisplus.annotation.TableName; 6 import com.baomidou.mybatisplus.annotation.TableName;
7 import io.swagger.annotations.ApiModel; 7 import io.swagger.annotations.ApiModel;
8 import io.swagger.annotations.ApiModelProperty; 8 import io.swagger.annotations.ApiModelProperty;
  9 +import lombok.Data;
  10 +
9 import java.io.Serializable; 11 import java.io.Serializable;
10 import java.util.Date; 12 import java.util.Date;
11 -import lombok.Data;  
12 13
13 @ApiModel(value="com.huaheng.pc.shipment.waveFlowHeader.domain.WaveFlowHeader") 14 @ApiModel(value="com.huaheng.pc.shipment.waveFlowHeader.domain.WaveFlowHeader")
14 @Data 15 @Data
src/main/java/com/huaheng/pc/shipment/waveFlowHeader/mapper/WaveFlowHeaderMapper.java renamed to src/main/java/com/huaheng/pc/config/waveFlowHeader/mapper/WaveFlowHeaderMapper.java
  View file @cdf142a
1 -package com.huaheng.pc.shipment.waveFlowHeader.mapper; 1 +package com.huaheng.pc.config.waveFlowHeader.mapper;
2 2
3 import com.baomidou.mybatisplus.core.mapper.BaseMapper; 3 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4 -import com.huaheng.pc.shipment.waveFlowHeader.domain.WaveFlowHeader; 4 +import com.huaheng.pc.config.waveFlowHeader.domain.WaveFlowHeader;
5 5
6 public interface WaveFlowHeaderMapper extends BaseMapper<WaveFlowHeader> { 6 public interface WaveFlowHeaderMapper extends BaseMapper<WaveFlowHeader> {
7 } 7 }
8 \ No newline at end of file 8 \ No newline at end of file
src/main/java/com/huaheng/pc/shipment/waveFlowHeader/service/WaveFlowHeaderService.java renamed to src/main/java/com/huaheng/pc/config/waveFlowHeader/service/WaveFlowHeaderService.java
  View file @cdf142a
1 -package com.huaheng.pc.shipment.waveFlowHeader.service; 1 +package com.huaheng.pc.config.waveFlowHeader.service;
2 2
3 -import org.springframework.stereotype.Service;  
4 -import javax.annotation.Resource;  
5 -import java.util.List;  
6 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 3 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
7 -import com.huaheng.pc.shipment.waveFlowHeader.mapper.WaveFlowHeaderMapper;  
8 -import com.huaheng.pc.shipment.waveFlowHeader.domain.WaveFlowHeader; 4 +import com.huaheng.pc.config.waveFlowHeader.domain.WaveFlowHeader;
  5 +import com.huaheng.pc.config.waveFlowHeader.mapper.WaveFlowHeaderMapper;
  6 +import org.springframework.stereotype.Service;
  7 +
9 @Service 8 @Service
10 public class WaveFlowHeaderService extends ServiceImpl<WaveFlowHeaderMapper, WaveFlowHeader> { 9 public class WaveFlowHeaderService extends ServiceImpl<WaveFlowHeaderMapper, WaveFlowHeader> {
11 10
src/main/java/com/huaheng/pc/shipment/waveMaster/controller/WaveMasterController.java renamed to src/main/java/com/huaheng/pc/config/waveMaster/controller/WaveMasterController.java
  View file @cdf142a
1 -package com.huaheng.pc.shipment.waveMaster.controller; 1 +package com.huaheng.pc.config.waveMaster.controller;
2 2
3 3
4 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 4 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
5 import com.baomidou.mybatisplus.core.metadata.IPage; 5 import com.baomidou.mybatisplus.core.metadata.IPage;
6 import com.baomidou.mybatisplus.core.toolkit.Wrappers; 6 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
7 import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 7 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
  8 +import com.huaheng.common.support.Convert;
8 import com.huaheng.common.utils.StringUtils; 9 import com.huaheng.common.utils.StringUtils;
9 import com.huaheng.common.utils.security.ShiroUtils; 10 import com.huaheng.common.utils.security.ShiroUtils;
10 import com.huaheng.framework.aspectj.lang.annotation.Log; 11 import com.huaheng.framework.aspectj.lang.annotation.Log;
11 import com.huaheng.framework.aspectj.lang.constant.BusinessType; 12 import com.huaheng.framework.aspectj.lang.constant.BusinessType;
12 import com.huaheng.framework.web.controller.BaseController; 13 import com.huaheng.framework.web.controller.BaseController;
  14 +import com.huaheng.framework.web.domain.AjaxResult;
13 import com.huaheng.framework.web.page.PageDomain; 15 import com.huaheng.framework.web.page.PageDomain;
14 import com.huaheng.framework.web.page.TableDataInfo; 16 import com.huaheng.framework.web.page.TableDataInfo;
15 import com.huaheng.framework.web.page.TableSupport; 17 import com.huaheng.framework.web.page.TableSupport;
16 -import com.huaheng.pc.shipment.wave.domain.Wave;  
17 -import com.huaheng.pc.shipment.waveMaster.domain.WaveMaster;  
18 -import com.huaheng.pc.shipment.waveMaster.service.WaveMasterService; 18 +import com.huaheng.pc.config.waveMaster.domain.WaveMaster;
  19 +import com.huaheng.pc.config.waveMaster.service.WaveMasterService;
19 import io.swagger.annotations.Api; 20 import io.swagger.annotations.Api;
20 import org.apache.shiro.authz.annotation.RequiresPermissions; 21 import org.apache.shiro.authz.annotation.RequiresPermissions;
21 import org.springframework.beans.factory.annotation.Autowired; 22 import org.springframework.beans.factory.annotation.Autowired;
22 import org.springframework.stereotype.Controller; 23 import org.springframework.stereotype.Controller;
23 -import org.springframework.web.bind.annotation.GetMapping;  
24 -import org.springframework.web.bind.annotation.PostMapping;  
25 -import org.springframework.web.bind.annotation.RequestMapping;  
26 -import org.springframework.web.bind.annotation.ResponseBody; 24 +import org.springframework.ui.ModelMap;
  25 +import org.springframework.web.bind.annotation.*;
27 26
  27 +import java.util.ArrayList;
28 import java.util.List; 28 import java.util.List;
29 29
30 /** 30 /**
@@ -51,7 +51,7 @@ public class WaveMasterController extends BaseController { @@ -51,7 +51,7 @@ public class WaveMasterController extends BaseController {
51 } 51 }
52 52
53 /** 53 /**
54 - * 查询订单分析结果 54 + * 查询波次主表
55 */ 55 */
56 @RequiresPermissions("shipment:waveMaster:list") 56 @RequiresPermissions("shipment:waveMaster:list")
57 @Log(title = "出库-波次主表", operating="查看波次主表", action = BusinessType.GRANT) 57 @Log(title = "出库-波次主表", operating="查看波次主表", action = BusinessType.GRANT)
@@ -64,13 +64,13 @@ public class WaveMasterController extends BaseController { @@ -64,13 +64,13 @@ public class WaveMasterController extends BaseController {
64 Integer pageNum = pageDomain.getPageNum(); 64 Integer pageNum = pageDomain.getPageNum();
65 Integer pageSize = pageDomain.getPageSize(); 65 Integer pageSize = pageDomain.getPageSize();
66 66
67 - lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin),WaveMaster::getCreated, createdBegin) 67 + lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin), WaveMaster::getCreated, createdBegin)
68 .le(StringUtils.isNotEmpty(createdEnd), WaveMaster::getCreated, createdEnd) 68 .le(StringUtils.isNotEmpty(createdEnd), WaveMaster::getCreated, createdEnd)
69 .eq(WaveMaster::getWarehouseCode, ShiroUtils.getWarehouseCode()) 69 .eq(WaveMaster::getWarehouseCode, ShiroUtils.getWarehouseCode())
70 .eq(StringUtils.isNotEmpty(waveMaster.getCode() 70 .eq(StringUtils.isNotEmpty(waveMaster.getCode()
71 - ),WaveMaster::getCode,waveMaster.getCode()) 71 + ), WaveMaster::getCode,waveMaster.getCode())
72 .like(StringUtils.isNotEmpty(waveMaster.getShipmentFilterCode() 72 .like(StringUtils.isNotEmpty(waveMaster.getShipmentFilterCode()
73 - ),WaveMaster::getShipmentFilterCode,waveMaster.getShipmentFilterCode()); 73 + ), WaveMaster::getShipmentFilterCode,waveMaster.getShipmentFilterCode());
74 74
75 if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){ 75 if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
76 /** 76 /**
@@ -86,4 +86,67 @@ public class WaveMasterController extends BaseController { @@ -86,4 +86,67 @@ public class WaveMasterController extends BaseController {
86 } 86 }
87 87
88 88
  89 + /**
  90 + * 新增波次主表
  91 + */
  92 + @GetMapping("/add")
  93 + public String add() {
  94 + return prefix + "/add";
  95 + }
  96 +
  97 + /**
  98 + * 新增波次主表
  99 + */
  100 + @RequiresPermissions("config:waveMaster:add")
  101 + @Log(title = "配置-波次主表", operating = "新增波次主表", action = BusinessType.INSERT)
  102 + @PostMapping("/add")
  103 + @ResponseBody
  104 + public AjaxResult addSave(WaveMaster waveMaster){
  105 + waveMaster.setWarehouseCode(ShiroUtils.getWarehouseCode());
  106 + waveMaster.setCreatedBy(ShiroUtils.getLoginName());
  107 + waveMaster.setLastUpdatedBy(ShiroUtils.getLoginName());
  108 + return toAjax(waveMasterService.save(waveMaster));
  109 + }
  110 +
  111 + /**
  112 + * 修改波次
  113 + */
  114 + @GetMapping("/edit/{id}")
  115 + public String edit(@PathVariable("id") Integer id, ModelMap mmap) {
  116 + mmap.put("waveMaster", waveMasterService.getById(id));
  117 + return prefix + "/edit";
  118 + }
  119 +
  120 + /**
  121 + * 修改波次
  122 + */
  123 + @RequiresPermissions("config:waveMaster:edit")
  124 + @Log(title = "通用-波次主表", operating = "修改波次主表", action = BusinessType.UPDATE)
  125 + @PostMapping("/edit")
  126 + @ResponseBody
  127 + public AjaxResult editSave(WaveMaster waveMaster) {
  128 + waveMaster.setLastUpdatedBy(ShiroUtils.getLoginName());
  129 + return toAjax(waveMasterService.updateById(waveMaster));
  130 + }
  131 +
  132 + /**
  133 + * 删除波次
  134 + */
  135 + @RequiresPermissions("config:waveMaster:remove")
  136 + @Log(title = "配置-波次主表", operating = "删除波次主表", action = BusinessType.DELETE)
  137 + @PostMapping( "/remove")
  138 + @ResponseBody
  139 + public AjaxResult remove(String ids) {
  140 + if (StringUtils.isEmpty(ids)){
  141 + return AjaxResult.error("id不能为空");
  142 + }
  143 + List<Integer> list = new ArrayList<>();
  144 + for (Integer id : Convert.toIntArray(ids)) {
  145 + list.add(id);
  146 + }
  147 + return toAjax(waveMasterService.removeByIds(list));
  148 + }
  149 +
  150 +
  151 +
89 } 152 }
src/main/java/com/huaheng/pc/shipment/waveMaster/domain/WaveMaster.java renamed to src/main/java/com/huaheng/pc/config/waveMaster/domain/WaveMaster.java
  View file @cdf142a
1 -package com.huaheng.pc.shipment.waveMaster.domain; 1 +package com.huaheng.pc.config.waveMaster.domain;
2 2
3 import com.baomidou.mybatisplus.annotation.IdType; 3 import com.baomidou.mybatisplus.annotation.IdType;
4 import com.baomidou.mybatisplus.annotation.TableField; 4 import com.baomidou.mybatisplus.annotation.TableField;
@@ -6,9 +6,10 @@ import com.baomidou.mybatisplus.annotation.TableId; @@ -6,9 +6,10 @@ import com.baomidou.mybatisplus.annotation.TableId;
6 import com.baomidou.mybatisplus.annotation.TableName; 6 import com.baomidou.mybatisplus.annotation.TableName;
7 import io.swagger.annotations.ApiModel; 7 import io.swagger.annotations.ApiModel;
8 import io.swagger.annotations.ApiModelProperty; 8 import io.swagger.annotations.ApiModelProperty;
  9 +import lombok.Data;
  10 +
9 import java.io.Serializable; 11 import java.io.Serializable;
10 import java.util.Date; 12 import java.util.Date;
11 -import lombok.Data;  
12 13
13 @ApiModel(value="com.huaheng.pc.shipment.waveMaster.domain.WaveMaster") 14 @ApiModel(value="com.huaheng.pc.shipment.waveMaster.domain.WaveMaster")
14 @Data 15 @Data
@@ -145,7 +146,7 @@ public class WaveMaster implements Serializable { @@ -145,7 +146,7 @@ public class WaveMaster implements Serializable {
145 */ 146 */
146 @TableField(value = "needReplenishment") 147 @TableField(value = "needReplenishment")
147 @ApiModelProperty(value="是否补货") 148 @ApiModelProperty(value="是否补货")
148 - private Integer needReplenishment; 149 + private Boolean needReplenishment;
149 150
150 /** 151 /**
151 * 活动单补货分配规则 152 * 活动单补货分配规则
src/main/java/com/huaheng/pc/shipment/waveMaster/mapper/WaveMasterMapper.java renamed to src/main/java/com/huaheng/pc/config/waveMaster/mapper/WaveMasterMapper.java
  View file @cdf142a
1 -package com.huaheng.pc.shipment.waveMaster.mapper; 1 +package com.huaheng.pc.config.waveMaster.mapper;
2 2
3 import com.baomidou.mybatisplus.core.mapper.BaseMapper; 3 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4 -import com.huaheng.pc.shipment.waveMaster.domain.WaveMaster; 4 +import com.huaheng.pc.config.waveMaster.domain.WaveMaster;
5 5
6 public interface WaveMasterMapper extends BaseMapper<WaveMaster> { 6 public interface WaveMasterMapper extends BaseMapper<WaveMaster> {
7 } 7 }
8 \ No newline at end of file 8 \ No newline at end of file
src/main/java/com/huaheng/pc/shipment/waveMaster/service/WaveMasterService.java renamed to src/main/java/com/huaheng/pc/config/waveMaster/service/WaveMasterService.java
  View file @cdf142a
1 -package com.huaheng.pc.shipment.waveMaster.service; 1 +package com.huaheng.pc.config.waveMaster.service;
2 2
3 -import org.springframework.stereotype.Service;  
4 -import javax.annotation.Resource;  
5 -import java.util.List;  
6 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 3 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
7 -import com.huaheng.pc.shipment.waveMaster.mapper.WaveMasterMapper;  
8 -import com.huaheng.pc.shipment.waveMaster.domain.WaveMaster; 4 +import com.huaheng.pc.config.waveMaster.domain.WaveMaster;
  5 +import com.huaheng.pc.config.waveMaster.mapper.WaveMasterMapper;
  6 +import org.springframework.stereotype.Service;
  7 +
9 @Service 8 @Service
10 public class WaveMasterService extends ServiceImpl<WaveMasterMapper, WaveMaster> { 9 public class WaveMasterService extends ServiceImpl<WaveMasterMapper, WaveMaster> {
11 10
src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java
  View file @cdf142a
@@ -9,21 +9,31 @@ import com.huaheng.common.utils.security.ShiroUtils; @@ -9,21 +9,31 @@ import com.huaheng.common.utils.security.ShiroUtils;
9 import com.huaheng.framework.aspectj.lang.annotation.Log; 9 import com.huaheng.framework.aspectj.lang.annotation.Log;
10 import com.huaheng.framework.aspectj.lang.constant.BusinessType; 10 import com.huaheng.framework.aspectj.lang.constant.BusinessType;
11 import com.huaheng.framework.web.controller.BaseController; 11 import com.huaheng.framework.web.controller.BaseController;
  12 +import com.huaheng.framework.web.domain.AjaxResult;
12 import com.huaheng.framework.web.page.PageDomain; 13 import com.huaheng.framework.web.page.PageDomain;
13 import com.huaheng.framework.web.page.TableDataInfo; 14 import com.huaheng.framework.web.page.TableDataInfo;
14 import com.huaheng.framework.web.page.TableSupport; 15 import com.huaheng.framework.web.page.TableSupport;
15 import com.huaheng.pc.inventory.cycleCountDetail.domain.CycleCountDetail; 16 import com.huaheng.pc.inventory.cycleCountDetail.domain.CycleCountDetail;
16 import com.huaheng.pc.inventory.cycleCountDetail.service.CycleCountDetailService; 17 import com.huaheng.pc.inventory.cycleCountDetail.service.CycleCountDetailService;
17 import com.huaheng.pc.inventory.cycleCountDetail.service.CycleCountDetailServiceImpl; 18 import com.huaheng.pc.inventory.cycleCountDetail.service.CycleCountDetailServiceImpl;
  19 +import com.huaheng.pc.inventory.cycleCountHeader.domain.CycleCountHeader;
18 import com.huaheng.pc.inventory.cycleCountHeader.service.CycleCountHeaderService; 20 import com.huaheng.pc.inventory.cycleCountHeader.service.CycleCountHeaderService;
19 import com.huaheng.pc.inventory.cycleCountHeader.service.CycleCountHeaderServiceImpl; 21 import com.huaheng.pc.inventory.cycleCountHeader.service.CycleCountHeaderServiceImpl;
  22 +import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail;
  23 +import com.huaheng.pc.inventory.inventoryDetail.service.InventoryDetailService;
  24 +import com.huaheng.pc.task.taskDetail.service.TaskDetailService;
  25 +import com.huaheng.pc.task.taskHeader.service.TaskHeaderService;
  26 +import io.swagger.models.auth.In;
  27 +import org.apache.shiro.authz.annotation.RequiresPermissions;
20 import org.springframework.stereotype.Controller; 28 import org.springframework.stereotype.Controller;
  29 +import org.springframework.ui.ModelMap;
21 import org.springframework.web.bind.annotation.GetMapping; 30 import org.springframework.web.bind.annotation.GetMapping;
22 import org.springframework.web.bind.annotation.PostMapping; 31 import org.springframework.web.bind.annotation.PostMapping;
23 import org.springframework.web.bind.annotation.RequestMapping; 32 import org.springframework.web.bind.annotation.RequestMapping;
24 import org.springframework.web.bind.annotation.ResponseBody; 33 import org.springframework.web.bind.annotation.ResponseBody;
25 34
26 import javax.annotation.Resource; 35 import javax.annotation.Resource;
  36 +import java.util.Collections;
27 import java.util.List; 37 import java.util.List;
28 38
29 39
@@ -35,10 +45,13 @@ import java.util.List; @@ -35,10 +45,13 @@ import java.util.List;
35 public class CycleCountDetailController extends BaseController { 45 public class CycleCountDetailController extends BaseController {
36 46
37 47
38 - @Resource  
39 - private CycleCountHeaderService cycleCountHeaderService; 48 +
  49 +
40 @Resource 50 @Resource
41 private CycleCountDetailService cycleCountDetailService; 51 private CycleCountDetailService cycleCountDetailService;
  52 + @Resource
  53 + private CycleCountHeaderService cycleCountHeaderService;
  54 +
42 55
43 56
44 57
@@ -63,7 +76,8 @@ public class CycleCountDetailController extends BaseController { @@ -63,7 +76,8 @@ public class CycleCountDetailController extends BaseController {
63 PageDomain pageDomain = TableSupport.buildPageRequest(); 76 PageDomain pageDomain = TableSupport.buildPageRequest();
64 Integer pageNum = pageDomain.getPageNum(); 77 Integer pageNum = pageDomain.getPageNum();
65 Integer pageSize = pageDomain.getPageSize(); 78 Integer pageSize = pageDomain.getPageSize();
66 - 79 + //没有主单ID传入则直接返回空list
  80 + if(cycleCountDetail.getCycleCountHeadId() != null){
67 lambdaQueryWrapper.ge( 81 lambdaQueryWrapper.ge(
68 StringUtils.isNotEmpty(createdBegin), CycleCountDetail::getCreated, createdBegin) 82 StringUtils.isNotEmpty(createdBegin), CycleCountDetail::getCreated, createdBegin)
69 .le(StringUtils.isNotEmpty(createdEnd), CycleCountDetail::getCreated, createdEnd)//创建时间范围 83 .le(StringUtils.isNotEmpty(createdEnd), CycleCountDetail::getCreated, createdEnd)//创建时间范围
@@ -95,16 +109,42 @@ public class CycleCountDetailController extends BaseController { @@ -95,16 +109,42 @@ public class CycleCountDetailController extends BaseController {
95 List<CycleCountDetail> list = cycleCountDetailService.list(lambdaQueryWrapper); 109 List<CycleCountDetail> list = cycleCountDetailService.list(lambdaQueryWrapper);
96 return getDataTable(list); 110 return getDataTable(list);
97 } 111 }
98 - 112 + }
99 //空List 113 //空List
100 - //return getDataTable(Collections.emptyList()); 114 + return getDataTable(Collections.emptyList());
101 115
102 } 116 }
103 117
104 118
  119 + /**
  120 + * 新增盘点明细
  121 + */
  122 + @GetMapping("/add")
  123 + public String add(Integer cycleCountHeadId,String companyCode, ModelMap m)
  124 + {
  125 + if(cycleCountHeadId == null){
  126 + throw new SecurityException("盘点头ID不能为空！");
  127 + }
  128 + //相同货主才能盘点,取出盘点头的货主
  129 + CycleCountHeader cycleCountHeader = cycleCountHeaderService.getById(cycleCountHeadId);
  130 + companyCode = cycleCountHeader.getCompanyCode();
  131 + m.put("companyCode",companyCode);
  132 + m.put("cycleCountHeadId",cycleCountHeadId);
105 133
  134 + return prefix + "/add";
  135 + }
106 136
107 - 137 + /**
  138 + * 新增保存盘点明细
  139 + */
  140 + //@RequiresPermissions("inventory:cyclecountDetail:add")
  141 + @Log(title = "库存-盘点", operating = "新增盘点补货明细", action = BusinessType.INSERT)
  142 + @PostMapping("/add")
  143 + @ResponseBody
  144 + public AjaxResult addSave(Integer cycleCountHeadId, Integer[] inventoryDetailIdIds)
  145 + {
  146 + return cycleCountDetailService.addDetails(cycleCountHeadId,inventoryDetailIdIds);
  147 + }
108 148
109 149
110 150
src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/CycleCountDetailService.java
  View file @cdf142a
1 package com.huaheng.pc.inventory.cycleCountDetail.service; 1 package com.huaheng.pc.inventory.cycleCountDetail.service;
2 2
3 import com.baomidou.mybatisplus.extension.service.IService; 3 import com.baomidou.mybatisplus.extension.service.IService;
  4 +import com.huaheng.framework.web.domain.AjaxResult;
4 import com.huaheng.pc.inventory.cycleCountDetail.domain.CycleCountDetail; 5 import com.huaheng.pc.inventory.cycleCountDetail.domain.CycleCountDetail;
5 -import com.huaheng.pc.inventory.cycleCountHeader.domain.CycleCountHeader; 6 +
6 7
7 8
8 public interface CycleCountDetailService extends IService<CycleCountDetail> { 9 public interface CycleCountDetailService extends IService<CycleCountDetail> {
9 10
10 11
  12 + AjaxResult addDetails(Integer cycleCountHeadId, Integer[] inventoryDetailIdIds);
  13 +
  14 +
  15 +
  16 +
  17 +
  18 +
11 19
12 } 20 }
13 21
src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/CycleCountDetailServiceImpl.java
  View file @cdf142a
1 package com.huaheng.pc.inventory.cycleCountDetail.service; 1 package com.huaheng.pc.inventory.cycleCountDetail.service;
2 2
  3 +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
  4 +import com.baomidou.mybatisplus.core.toolkit.Wrappers;
  5 +import com.huaheng.common.utils.security.ShiroUtils;
  6 +import com.huaheng.framework.web.domain.AjaxResult;
  7 +import com.huaheng.pc.inventory.cycleCountHeader.domain.CycleCountHeader;
  8 +import com.huaheng.pc.inventory.cycleCountHeader.service.CycleCountHeaderService;
  9 +import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail;
  10 +import com.huaheng.pc.inventory.inventoryDetail.service.InventoryDetailService;
  11 +import com.huaheng.pc.task.taskHeader.service.TaskHeaderService;
3 import org.springframework.stereotype.Service; 12 import org.springframework.stereotype.Service;
4 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 13 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
5 import com.huaheng.pc.inventory.cycleCountDetail.mapper.CycleCountDetailMapper; 14 import com.huaheng.pc.inventory.cycleCountDetail.mapper.CycleCountDetailMapper;
6 import com.huaheng.pc.inventory.cycleCountDetail.domain.CycleCountDetail; 15 import com.huaheng.pc.inventory.cycleCountDetail.domain.CycleCountDetail;
  16 +import org.springframework.transaction.annotation.Transactional;
  17 +
  18 +import javax.annotation.Resource;
  19 +import java.math.BigDecimal;
  20 +import java.util.ArrayList;
  21 +import java.util.Date;
  22 +import java.util.List;
  23 +
7 @Service 24 @Service
8 public class CycleCountDetailServiceImpl extends ServiceImpl<CycleCountDetailMapper, CycleCountDetail> implements CycleCountDetailService { 25 public class CycleCountDetailServiceImpl extends ServiceImpl<CycleCountDetailMapper, CycleCountDetail> implements CycleCountDetailService {
9 26
10 27
11 28
  29 + @Resource
  30 + private CycleCountHeaderService cycleCountHeaderService;
  31 + @Resource
  32 + private InventoryDetailService inventoryDetailService;
  33 + @Resource
  34 + private TaskHeaderService taskHeaderService;
  35 +
  36 +
  37 +
  38 +
  39 + /**
  40 + * 新增盘点明细
  41 + * */
  42 + @Override
  43 + @Transactional
  44 + public AjaxResult addDetails(Integer cycleCountHeadId, Integer[] inventoryDetailIdIds) {
  45 +
  46 + CycleCountHeader cyclecountHeader = cycleCountHeaderService.getById(cycleCountHeadId);
  47 + //可能存在并发删除的情况
  48 + if(cyclecountHeader==null){
  49 + return AjaxResult.error("盘点主单据不存在");
  50 + }
  51 + if(cyclecountHeader.getStatusCyc() > 1){
  52 + return AjaxResult.error("盘点单非新建状态，无法再添加明细");
  53 + }
  54 + //获取已经存在的明细
  55 + CycleCountDetail cycleCountDetail = new CycleCountDetail();
  56 + cycleCountDetail.setWarehouseCode(cyclecountHeader.getWarehouseCode());
  57 + cycleCountDetail.setCompanyCode(cyclecountHeader.getCompanyCode());
  58 + cycleCountDetail.setCycleCountHeadId(cycleCountHeadId);
  59 + LambdaQueryWrapper<CycleCountDetail> cycleCountDetailLambd = Wrappers.lambdaQuery(cycleCountDetail);
  60 + List<CycleCountDetail> cyclecountDetailList = this.list(cycleCountDetailLambd);
  61 + if(cyclecountDetailList == null){
  62 + cyclecountDetailList = new ArrayList<>();
  63 + }
  64 + for(int inventoryDetailId : inventoryDetailIdIds){
  65 + //当前有盘点明细时验证是否已经生成盘点细单，生成则跳出该条循环
  66 + if(cyclecountDetailList.stream().anyMatch(t -> t.getInventoryDetailId()!=null && t.getInventoryDetailId() == inventoryDetailId)){
  67 + continue;
  68 + }
  69 + //查询该条库存明细
  70 + InventoryDetail inventoryDetail = inventoryDetailService.getById(inventoryDetailId);
  71 +
  72 + //写入盘点明细
  73 + CycleCountDetail ccd = new CycleCountDetail();
  74 + ccd.setCycleCountHeadId(cycleCountHeadId);
  75 + ccd.setInventoryDetailId(inventoryDetailId);
  76 + ccd.setWarehouseCode(inventoryDetail.getWarehouseCode());
  77 + ccd.setCompanyCode(inventoryDetail.getCompanyCode());
  78 + ccd.setInventorySts(inventoryDetail.getInventorySts());
  79 + ccd.setCountId(inventoryDetail.getId());
  80 + ccd.setEnableStatus(1);
  81 + ccd.setLocationCode(inventoryDetail.getLocationCode());
  82 + ccd.setContainerCode(inventoryDetail.getContainerCode());
  83 + ccd.setMaterialCode(inventoryDetail.getMaterialCode());
  84 + ccd.setMaterialName(inventoryDetail.getMaterialName());
  85 + ccd.setMaterialSpec(inventoryDetail.getMaterialSpec());
  86 + ccd.setMaterialUnit(inventoryDetail.getMaterialUnit());
  87 + ccd.setSystemQty(inventoryDetail.getQty());
  88 +
  89 + ccd.setCountedBy(cyclecountHeader.getCreatedBy());
  90 + ccd.setCountedAt(cyclecountHeader.getCreated());
  91 + ccd.setCreated(new Date());
  92 + ccd.setCreatedBy(ShiroUtils.getLoginName());
  93 + ccd.setLastUpdated(new Date());
  94 + ccd.setLastUpdatedBy(ShiroUtils.getLoginName());
  95 + this.save(ccd);
  96 +
  97 + }
  98 + return AjaxResult.success("生成盘点明细成功");
  99 + }
12 100
13 101
14 102
15 } 103 }
  104 +
src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java
  View file @cdf142a
@@ -226,4 +226,19 @@ public class ReceiptHeaderController extends BaseController { @@ -226,4 +226,19 @@ public class ReceiptHeaderController extends BaseController {
226 { 226 {
227 return prefix + "/receiving"; 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 @cdf142a
@@ -6,6 +6,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -6,6 +6,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
6 import com.huaheng.common.exception.service.ServiceException; 6 import com.huaheng.common.exception.service.ServiceException;
7 import com.huaheng.common.utils.security.ShiroUtils; 7 import com.huaheng.common.utils.security.ShiroUtils;
8 import com.huaheng.framework.web.domain.AjaxResult; 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 import com.huaheng.pc.config.receiptType.domain.ReceiptType; 13 import com.huaheng.pc.config.receiptType.domain.ReceiptType;
10 import com.huaheng.pc.config.receiptType.service.ReceiptTypeService; 14 import com.huaheng.pc.config.receiptType.service.ReceiptTypeService;
11 import com.huaheng.pc.config.statusFlow.domain.StatusFlowDetail; 15 import com.huaheng.pc.config.statusFlow.domain.StatusFlowDetail;
@@ -30,7 +34,16 @@ public class ReceiptHeaderService extends ServiceImpl&lt;ReceiptHeaderMapper, Recei @@ -30,7 +34,16 @@ public class ReceiptHeaderService extends ServiceImpl&lt;ReceiptHeaderMapper, Recei
30 private ReceiptTypeService receiptTypeService; 34 private ReceiptTypeService receiptTypeService;
31 @Resource 35 @Resource
32 private ReceiptDetailService receiptDetailService; 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 public AjaxResult saveReceiptHeader(ReceiptHeader receiptHeader){ 47 public AjaxResult saveReceiptHeader(ReceiptHeader receiptHeader){
35 LambdaQueryWrapper<ReceiptType> lambdaQueryWrapper = Wrappers.lambdaQuery(); 48 LambdaQueryWrapper<ReceiptType> lambdaQueryWrapper = Wrappers.lambdaQuery();
36 lambdaQueryWrapper.eq(ReceiptType::getCode, receiptHeader.getReceiptType()); 49 lambdaQueryWrapper.eq(ReceiptType::getCode, receiptHeader.getReceiptType());
@@ -54,6 +67,11 @@ public class ReceiptHeaderService extends ServiceImpl&lt;ReceiptHeaderMapper, Recei @@ -54,6 +67,11 @@ public class ReceiptHeaderService extends ServiceImpl&lt;ReceiptHeaderMapper, Recei
54 return AjaxResult.toAjax(this.save(receiptHeader)); 67 return AjaxResult.toAjax(this.save(receiptHeader));
55 } 68 }
56 69
  70 + /**
  71 + * 生成单号
  72 + * @param receiptType
  73 + * @return
  74 + */
57 public String createCode(String receiptType) { 75 public String createCode(String receiptType) {
58 String code = null; 76 String code = null;
59 Date now = new Date(); 77 Date now = new Date();
@@ -118,4 +136,61 @@ public class ReceiptHeaderService extends ServiceImpl&lt;ReceiptHeaderMapper, Recei @@ -118,4 +136,61 @@ public class ReceiptHeaderService extends ServiceImpl&lt;ReceiptHeaderMapper, Recei
118 receiptDetailService.updateReceiptHeaderLastStatus(id); 136 receiptDetailService.updateReceiptHeaderLastStatus(id);
119 return AjaxResult.success("预约成功"); 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 @cdf142a
@@ -248,6 +248,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea @@ -248,6 +248,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
248 taskDetail.setWarehouseCode(task.getWarehouseCode()); 248 taskDetail.setWarehouseCode(task.getWarehouseCode());
249 taskDetail.setCompanyCode(task.getCompanyCode()); 249 taskDetail.setCompanyCode(task.getCompanyCode());
250 taskDetail.setTaskType(task.getTaskType()); 250 taskDetail.setTaskType(task.getTaskType());
  251 + taskDetail.setToInventoryId(shipmentContainerDetail.getInventoryId());
251 taskDetail.setAllocationId(shipmentContainerDetail.getId()); 252 taskDetail.setAllocationId(shipmentContainerDetail.getId());
252 taskDetail.setBillCode(shipmentContainerDetail.getShipmentCode()); 253 taskDetail.setBillCode(shipmentContainerDetail.getShipmentCode());
253 taskDetail.setBillDetailId(shipmentContainerDetail.getShipmentDetailId()); 254 taskDetail.setBillDetailId(shipmentContainerDetail.getShipmentDetailId());
src/main/resources/mybatis/shipment/WaveFlowDetailMapper.xml renamed to src/main/resources/mybatis/config/WaveFlowDetailMapper.xml
  View file @cdf142a
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> 2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3 -<mapper namespace="com.huaheng.pc.shipment.waveFlowDetail.mapper.WaveFlowDetailMapper">  
4 - <resultMap id="BaseResultMap" type="com.huaheng.pc.shipment.waveFlowDetail.domain.WaveFlowDetail"> 3 +<mapper namespace="com.huaheng.pc.config.waveFlowDetail.mapper.WaveFlowDetailMapper">
  4 + <resultMap id="BaseResultMap" type="com.huaheng.pc.config.waveFlowDetail.domain.WaveFlowDetail">
5 <!--@mbg.generated--> 5 <!--@mbg.generated-->
6 <id column="id" jdbcType="INTEGER" property="id" /> 6 <id column="id" jdbcType="INTEGER" property="id" />
7 <result column="headerId" jdbcType="INTEGER" property="headerId" /> 7 <result column="headerId" jdbcType="INTEGER" property="headerId" />
@@ -23,16 +23,12 @@ @@ -23,16 +23,12 @@
23 <result column="userDef2" jdbcType="VARCHAR" property="userDef2" /> 23 <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
24 <result column="userDef3" jdbcType="VARCHAR" property="userDef3" /> 24 <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
25 <result column="userDef4" jdbcType="VARCHAR" property="userDef4" /> 25 <result column="userDef4" jdbcType="VARCHAR" property="userDef4" />
26 - <result column="userDef5" jdbcType="VARCHAR" property="userDef5" />  
27 - <result column="userDef6" jdbcType="VARCHAR" property="userDef6" />  
28 - <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />  
29 - <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />  
30 <result column="processStamp" jdbcType="VARCHAR" property="processStamp" /> 26 <result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
31 </resultMap> 27 </resultMap>
32 <sql id="Base_Column_List"> 28 <sql id="Base_Column_List">
33 <!--@mbg.generated--> 29 <!--@mbg.generated-->
34 id, headerId, waveFlowCode, warehouseCode, `sequence`, waveStepCode, waveStepName, 30 id, headerId, waveFlowCode, warehouseCode, `sequence`, waveStepCode, waveStepName,
35 value1, value2, value3, value4, created, createdBy, lastUpdated, lastUpdatedBy, version, 31 value1, value2, value3, value4, created, createdBy, lastUpdated, lastUpdatedBy, version,
36 - userDef1, userDef2, userDef3, userDef4, userDef5, userDef6, userDef7, userDef8, processStamp 32 + userDef1, userDef2, userDef3, userDef4, processStamp
37 </sql> 33 </sql>
38 </mapper> 34 </mapper>
39 \ No newline at end of file 35 \ No newline at end of file
src/main/resources/mybatis/shipment/WaveFlowHeaderMapper.xml renamed to src/main/resources/mybatis/config/WaveFlowHeaderMapper.xml
  View file @cdf142a
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> 2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3 -<mapper namespace="com.huaheng.pc.shipment.waveFlowHeader.mapper.WaveFlowHeaderMapper">  
4 - <resultMap id="BaseResultMap" type="com.huaheng.pc.shipment.waveFlowHeader.domain.WaveFlowHeader"> 3 +<mapper namespace="com.huaheng.pc.config.waveFlowHeader.mapper.WaveFlowHeaderMapper">
  4 + <resultMap id="BaseResultMap" type="com.huaheng.pc.config.waveFlowHeader.domain.WaveFlowHeader">
5 <!--@mbg.generated--> 5 <!--@mbg.generated-->
6 <id column="id" jdbcType="INTEGER" property="id" /> 6 <id column="id" jdbcType="INTEGER" property="id" />
7 <result column="code" jdbcType="VARCHAR" property="code" /> 7 <result column="code" jdbcType="VARCHAR" property="code" />
@@ -15,15 +15,11 @@ @@ -15,15 +15,11 @@
15 <result column="userDef2" jdbcType="VARCHAR" property="userDef2" /> 15 <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
16 <result column="userDef3" jdbcType="VARCHAR" property="userDef3" /> 16 <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
17 <result column="userDef4" jdbcType="VARCHAR" property="userDef4" /> 17 <result column="userDef4" jdbcType="VARCHAR" property="userDef4" />
18 - <result column="userDef5" jdbcType="VARCHAR" property="userDef5" />  
19 - <result column="userDef6" jdbcType="VARCHAR" property="userDef6" />  
20 - <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />  
21 - <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />  
22 <result column="processStamp" jdbcType="VARCHAR" property="processStamp" /> 18 <result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
23 </resultMap> 19 </resultMap>
24 <sql id="Base_Column_List"> 20 <sql id="Base_Column_List">
25 <!--@mbg.generated--> 21 <!--@mbg.generated-->
26 id, code, warehouseCode, created, createdBy, lastUpdated, lastUpdatedBy, version, 22 id, code, warehouseCode, created, createdBy, lastUpdated, lastUpdatedBy, version,
27 - userDef1, userDef2, userDef3, userDef4, userDef5, userDef6, userDef7, userDef8, processStamp 23 + userDef1, userDef2, userDef3, userDef4, processStamp
28 </sql> 24 </sql>
29 </mapper> 25 </mapper>
30 \ No newline at end of file 26 \ No newline at end of file
src/main/resources/mybatis/shipment/WaveMapper.xml renamed to src/main/resources/mybatis/config/WaveMapper.xml
  View file @cdf142a
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> 2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3 -<mapper namespace="com.huaheng.pc.shipment.wave.mapper.WaveMapper">  
4 - <resultMap id="BaseResultMap" type="com.huaheng.pc.shipment.wave.domain.Wave"> 3 +<mapper namespace="com.huaheng.pc.config.wave.mapper.WaveMapper">
  4 + <resultMap id="BaseResultMap" type="com.huaheng.pc.config.wave.domain.Wave">
5 <!--@mbg.generated--> 5 <!--@mbg.generated-->
6 <id column="id" jdbcType="INTEGER" property="id" /> 6 <id column="id" jdbcType="INTEGER" property="id" />
7 <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" /> 7 <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
8 <result column="waveName" jdbcType="VARCHAR" property="waveName" /> 8 <result column="waveName" jdbcType="VARCHAR" property="waveName" />
9 <result column="masterCode" jdbcType="VARCHAR" property="masterCode" /> 9 <result column="masterCode" jdbcType="VARCHAR" property="masterCode" />
10 - <result column="enable" jdbcType="INTEGER" property="enable" /> 10 + <result column="status" jdbcType="INTEGER" property="status" />
11 <result column="currentWaveStep" jdbcType="VARCHAR" property="currentWaveStep" /> 11 <result column="currentWaveStep" jdbcType="VARCHAR" property="currentWaveStep" />
12 <result column="lastWaveStep" jdbcType="VARCHAR" property="lastWaveStep" /> 12 <result column="lastWaveStep" jdbcType="VARCHAR" property="lastWaveStep" />
13 <result column="totalShipments" jdbcType="INTEGER" property="totalShipments" /> 13 <result column="totalShipments" jdbcType="INTEGER" property="totalShipments" />
@@ -17,8 +17,8 @@ @@ -17,8 +17,8 @@
17 <result column="completedAt" jdbcType="TIMESTAMP" property="completedAt" /> 17 <result column="completedAt" jdbcType="TIMESTAMP" property="completedAt" />
18 <result column="waveMode" jdbcType="VARCHAR" property="waveMode" /> 18 <result column="waveMode" jdbcType="VARCHAR" property="waveMode" />
19 <result column="errorMessage" jdbcType="VARCHAR" property="errorMessage" /> 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 <result column="messageId" jdbcType="VARCHAR" property="messageId" /> 22 <result column="messageId" jdbcType="VARCHAR" property="messageId" />
23 <result column="runBy" jdbcType="VARCHAR" property="runBy" /> 23 <result column="runBy" jdbcType="VARCHAR" property="runBy" />
24 <result column="releasedBy" jdbcType="VARCHAR" property="releasedBy" /> 24 <result column="releasedBy" jdbcType="VARCHAR" property="releasedBy" />
@@ -32,10 +32,6 @@ @@ -32,10 +32,6 @@
32 <result column="userDef2" jdbcType="VARCHAR" property="userDef2" /> 32 <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
33 <result column="userDef3" jdbcType="VARCHAR" property="userDef3" /> 33 <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
34 <result column="userDef4" jdbcType="VARCHAR" property="userDef4" /> 34 <result column="userDef4" jdbcType="VARCHAR" property="userDef4" />
35 - <result column="userDef5" jdbcType="VARCHAR" property="userDef5" />  
36 - <result column="userDef6" jdbcType="VARCHAR" property="userDef6" />  
37 - <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />  
38 - <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />  
39 <result column="processStamp" jdbcType="VARCHAR" property="processStamp" /> 35 <result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
40 <result column="closed" jdbcType="INTEGER" property="closed" /> 36 <result column="closed" jdbcType="INTEGER" property="closed" />
41 <result column="closedBy" jdbcType="VARCHAR" property="closedBy" /> 37 <result column="closedBy" jdbcType="VARCHAR" property="closedBy" />
@@ -44,10 +40,10 @@ @@ -44,10 +40,10 @@
44 </resultMap> 40 </resultMap>
45 <sql id="Base_Column_List"> 41 <sql id="Base_Column_List">
46 <!--@mbg.generated--> 42 <!--@mbg.generated-->
47 - id, warehouseCode, waveName, masterCode, `enable`, currentWaveStep, lastWaveStep, 43 + id, warehouseCode, waveName, masterCode, `status`, currentWaveStep, lastWaveStep,
48 totalShipments, totalLines, totalQty, startedAt, completedAt, waveMode, errorMessage, 44 totalShipments, totalLines, totalQty, startedAt, completedAt, waveMode, errorMessage,
49 locked, replenishmentReqd, messageId, runBy, releasedBy, releasedAt, created, createdBy, 45 locked, replenishmentReqd, messageId, runBy, releasedBy, releasedAt, created, createdBy,
50 - lastUpdated, lastUpdatedBy, version, userDef1, userDef2, userDef3, userDef4, userDef5,  
51 - userDef6, userDef7, userDef8, processStamp, closed, closedBy, closedAt, released 46 + lastUpdated, lastUpdatedBy, version, userDef1, userDef2, userDef3, userDef4, processStamp,
  47 + closed, closedBy, closedAt, released
52 </sql> 48 </sql>
53 </mapper> 49 </mapper>
54 \ No newline at end of file 50 \ No newline at end of file
src/main/resources/mybatis/shipment/WaveMasterMapper.xml renamed to src/main/resources/mybatis/config/WaveMasterMapper.xml
  View file @cdf142a
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> 2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3 -<mapper namespace="com.huaheng.pc.shipment.waveMaster.mapper.WaveMasterMapper">  
4 - <resultMap id="BaseResultMap" type="com.huaheng.pc.shipment.waveMaster.domain.WaveMaster"> 3 +<mapper namespace="com.huaheng.pc.config.waveMaster.mapper.WaveMasterMapper">
  4 + <resultMap id="BaseResultMap" type="com.huaheng.pc.config.waveMaster.domain.WaveMaster">
5 <!--@mbg.generated--> 5 <!--@mbg.generated-->
6 <id column="id" jdbcType="INTEGER" property="id" /> 6 <id column="id" jdbcType="INTEGER" property="id" />
7 <result column="code" jdbcType="VARCHAR" property="code" /> 7 <result column="code" jdbcType="VARCHAR" property="code" />
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
21 <result column="maxRplnQty" jdbcType="INTEGER" property="maxRplnQty" /> 21 <result column="maxRplnQty" jdbcType="INTEGER" property="maxRplnQty" />
22 <result column="groupingOrderBy" jdbcType="VARCHAR" property="groupingOrderBy" /> 22 <result column="groupingOrderBy" jdbcType="VARCHAR" property="groupingOrderBy" />
23 <result column="ruleAssignmentCode" jdbcType="VARCHAR" property="ruleAssignmentCode" /> 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 <result column="rplnAllocationRule" jdbcType="VARCHAR" property="rplnAllocationRule" /> 25 <result column="rplnAllocationRule" jdbcType="VARCHAR" property="rplnAllocationRule" />
26 <result column="rplnLocatingRule" jdbcType="VARCHAR" property="rplnLocatingRule" /> 26 <result column="rplnLocatingRule" jdbcType="VARCHAR" property="rplnLocatingRule" />
27 <result column="created" jdbcType="TIMESTAMP" property="created" /> 27 <result column="created" jdbcType="TIMESTAMP" property="created" />
@@ -33,10 +33,6 @@ @@ -33,10 +33,6 @@
33 <result column="userDef2" jdbcType="VARCHAR" property="userDef2" /> 33 <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
34 <result column="userDef3" jdbcType="VARCHAR" property="userDef3" /> 34 <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
35 <result column="userDef4" jdbcType="VARCHAR" property="userDef4" /> 35 <result column="userDef4" jdbcType="VARCHAR" property="userDef4" />
36 - <result column="userDef5" jdbcType="VARCHAR" property="userDef5" />  
37 - <result column="userDef6" jdbcType="VARCHAR" property="userDef6" />  
38 - <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />  
39 - <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />  
40 <result column="processStamp" jdbcType="VARCHAR" property="processStamp" /> 36 <result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
41 </resultMap> 37 </resultMap>
42 <sql id="Base_Column_List"> 38 <sql id="Base_Column_List">
src/main/resources/templates/check/checkDetail/checkComplete.html
  View file @cdf142a
@@ -66,23 +66,28 @@ @@ -66,23 +66,28 @@
66 var tableValue; 66 var tableValue;
67 var inventorySts; 67 var inventorySts;
68 var qty; 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 </script> 93 </script>
src/main/resources/templates/check/checkDetail/checkDetail.html
  View file @cdf142a
@@ -151,7 +151,6 @@ @@ -151,7 +151,6 @@
151 align: 'center', 151 align: 'center',
152 formatter: function(value, row, index) { 152 formatter: function(value, row, index) {
153 var actions = []; 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 if (row.status == 10) { 154 if (row.status == 10) {
156 actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="complete(\'' + row.id + '\')"><i class="fa fa-edit"></i>质检完成</a> '); 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 @cdf142a
@@ -103,7 +103,14 @@ @@ -103,7 +103,14 @@
103 title : '质检类型', 103 title : '质检类型',
104 align: 'center', 104 align: 'center',
105 formatter: function(value, row, index) { 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,12 +187,7 @@
180 align: 'center', 187 align: 'center',
181 formatter: function(value, row, index) { 188 formatter: function(value, row, index) {
182 var actions = []; 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 return actions.join(''); 191 return actions.join('');
190 } 192 }
191 }] 193 }]
@@ -209,10 +211,6 @@ @@ -209,10 +211,6 @@
209 $("#tabDetail").addClass("in active"); 211 $("#tabDetail").addClass("in active");
210 } 212 }
211 213
212 - function verify(id) {  
213 -  
214 - }  
215 -  
216 function queryParams(params) { 214 function queryParams(params) {
217 return { 215 return {
218 type:[[${type}]] 216 type:[[${type}]]
src/main/resources/templates/check/checkingRegister/checkingRegister.html 0 → 100644
  View file @cdf142a
  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 \ No newline at end of file 202 \ No newline at end of file
src/main/resources/templates/config/wave/add.html 0 → 100644
  View file @cdf142a
  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 @cdf142a
  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 @cdf142a
  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 \ No newline at end of file 214 \ No newline at end of file
src/main/resources/templates/config/waveFlowDetail/add.html 0 → 100644
  View file @cdf142a
  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 @cdf142a
  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 @cdf142a
  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 \ No newline at end of file 143 \ No newline at end of file
src/main/resources/templates/config/waveFlowHeader/add.html 0 → 100644
  View file @cdf142a
  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 @cdf142a
  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 @cdf142a
  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 \ No newline at end of file 169 \ No newline at end of file
src/main/resources/templates/config/waveMaster/add.html 0 → 100644
  View file @cdf142a
  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 @cdf142a
  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 @cdf142a
  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 \ No newline at end of file 201 \ No newline at end of file