Commit 3d549d8864c5a9d550d2f2a027e8117f7e5fd234
1 parent
fee856f0
库存和任务移库相关
Showing
11 changed files
with
712 additions
and
164 deletions
.idea/workspace.xml
... | ... | @@ -2,20 +2,15 @@ |
2 | 2 | <project version="4"> |
3 | 3 | <component name="ChangeListManager"> |
4 | 4 | <list default="true" id="908d8a6f-e3e4-4fdc-b674-e523a3e2b520" name="Default Changelist" comment=""> |
5 | - <change afterPath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/reservation.html" afterDir="false" /> | |
6 | - <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" /> | |
7 | 5 | <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/config/receiptPreference/controller/ReceiptPreferenceController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/receiptPreference/controller/ReceiptPreferenceController.java" afterDir="false" /> | |
9 | - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/controller/ReceiptDetailController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/controller/ReceiptDetailController.java" afterDir="false" /> | |
10 | - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/domain/ReceiptDetail.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/domain/ReceiptDetail.java" afterDir="false" /> | |
11 | - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailService.java" afterDir="false" /> | |
12 | - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java" afterDir="false" /> | |
13 | - <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" /> | |
14 | - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeader/domain/ReceiptHeader.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeader/domain/ReceiptHeader.java" afterDir="false" /> | |
15 | - <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" /> | |
16 | - <change beforePath="$PROJECT_DIR$/src/main/resources/application-druid.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application-druid.properties" afterDir="false" /> | |
17 | - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptDetail/receiptDetail.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptDetail/receiptDetail.html" afterDir="false" /> | |
18 | - <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" /> | |
6 | + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java" afterDir="false" /> | |
7 | + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java" afterDir="false" /> | |
8 | + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java" afterDir="false" /> | |
9 | + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/domain/TaskHeader.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/domain/TaskHeader.java" afterDir="false" /> | |
10 | + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java" afterDir="false" /> | |
11 | + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java" afterDir="false" /> | |
12 | + <change beforePath="$PROJECT_DIR$/src/main/resources/mybatis/task/TaskHeaderMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mybatis/task/TaskHeaderMapper.xml" afterDir="false" /> | |
13 | + <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/transfer.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/transfer.html" afterDir="false" /> | |
19 | 14 | </list> |
20 | 15 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> |
21 | 16 | <option name="SHOW_DIALOG" value="false" /> |
... | ... | @@ -53,6 +48,89 @@ |
53 | 48 | </expand> |
54 | 49 | <select /> |
55 | 50 | </component> |
51 | + <component name="FileEditorManager"> | |
52 | + <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> | |
53 | + <file pinned="false" current-in-tab="false"> | |
54 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java"> | |
55 | + <provider selected="true" editor-type-id="text-editor"> | |
56 | + <state relative-caret-position="236"> | |
57 | + <caret line="36" selection-start-line="36" selection-end-line="36" /> | |
58 | + </state> | |
59 | + </provider> | |
60 | + </entry> | |
61 | + </file> | |
62 | + <file pinned="false" current-in-tab="false"> | |
63 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java"> | |
64 | + <provider selected="true" editor-type-id="text-editor"> | |
65 | + <state relative-caret-position="468"> | |
66 | + <caret line="37" selection-start-line="37" selection-end-line="37" /> | |
67 | + </state> | |
68 | + </provider> | |
69 | + </entry> | |
70 | + </file> | |
71 | + <file pinned="false" current-in-tab="false"> | |
72 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java"> | |
73 | + <provider selected="true" editor-type-id="text-editor"> | |
74 | + <state relative-caret-position="340"> | |
75 | + <caret line="24" column="112" selection-start-line="24" selection-start-column="112" selection-end-line="24" selection-end-column="112" /> | |
76 | + </state> | |
77 | + </provider> | |
78 | + </entry> | |
79 | + </file> | |
80 | + <file pinned="false" current-in-tab="false"> | |
81 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java"> | |
82 | + <provider selected="true" editor-type-id="text-editor"> | |
83 | + <state relative-caret-position="240"> | |
84 | + <caret line="15" column="102" selection-start-line="15" selection-start-column="102" selection-end-line="15" selection-end-column="102" /> | |
85 | + </state> | |
86 | + </provider> | |
87 | + </entry> | |
88 | + </file> | |
89 | + <file pinned="false" current-in-tab="false"> | |
90 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java"> | |
91 | + <provider selected="true" editor-type-id="text-editor"> | |
92 | + <state relative-caret-position="2"> | |
93 | + <caret line="440" column="18" lean-forward="true" selection-start-line="440" selection-start-column="18" selection-end-line="440" selection-end-column="18" /> | |
94 | + </state> | |
95 | + </provider> | |
96 | + </entry> | |
97 | + </file> | |
98 | + <file pinned="false" current-in-tab="false"> | |
99 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/domain/TaskHeader.java"> | |
100 | + <provider selected="true" editor-type-id="text-editor"> | |
101 | + <state relative-caret-position="426"> | |
102 | + <caret line="366" column="57" selection-start-line="366" selection-start-column="57" selection-end-line="366" selection-end-column="57" /> | |
103 | + </state> | |
104 | + </provider> | |
105 | + </entry> | |
106 | + </file> | |
107 | + <file pinned="false" current-in-tab="false"> | |
108 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/mapper/TaskHeaderMapper.java"> | |
109 | + <provider selected="true" editor-type-id="text-editor"> | |
110 | + <state relative-caret-position="120"> | |
111 | + <caret line="11" selection-start-line="11" selection-end-line="11" /> | |
112 | + </state> | |
113 | + </provider> | |
114 | + </entry> | |
115 | + </file> | |
116 | + <file pinned="false" current-in-tab="true"> | |
117 | + <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/task/TaskHeaderMapper.xml"> | |
118 | + <provider selected="true" editor-type-id="text-editor"> | |
119 | + <state relative-caret-position="280"> | |
120 | + <caret line="14" column="77" selection-start-line="14" selection-start-column="77" selection-end-line="14" selection-end-column="77" /> | |
121 | + </state> | |
122 | + </provider> | |
123 | + </entry> | |
124 | + </file> | |
125 | + <file pinned="false" current-in-tab="false"> | |
126 | + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html"> | |
127 | + <provider selected="true" editor-type-id="text-editor"> | |
128 | + <state relative-caret-position="-72" /> | |
129 | + </provider> | |
130 | + </entry> | |
131 | + </file> | |
132 | + </leaf> | |
133 | + </component> | |
56 | 134 | <component name="FileTemplateManagerImpl"> |
57 | 135 | <option name="RECENT_TEMPLATES"> |
58 | 136 | <list> |
... | ... | @@ -65,6 +143,20 @@ |
65 | 143 | <component name="Git.Settings"> |
66 | 144 | <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> |
67 | 145 | </component> |
146 | + <component name="IdeDocumentHistory"> | |
147 | + <option name="CHANGED_PATHS"> | |
148 | + <list> | |
149 | + <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/transfer.html" /> | |
150 | + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java" /> | |
151 | + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java" /> | |
152 | + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java" /> | |
153 | + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java" /> | |
154 | + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java" /> | |
155 | + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/domain/TaskHeader.java" /> | |
156 | + <option value="$PROJECT_DIR$/src/main/resources/mybatis/task/TaskHeaderMapper.xml" /> | |
157 | + </list> | |
158 | + </option> | |
159 | + </component> | |
68 | 160 | <component name="MavenImportPreferences"> |
69 | 161 | <option name="importingSettings"> |
70 | 162 | <MavenImportingSettings> |
... | ... | @@ -72,10 +164,315 @@ |
72 | 164 | </MavenImportingSettings> |
73 | 165 | </option> |
74 | 166 | </component> |
167 | + <component name="ProjectFrameBounds" extendedState="6"> | |
168 | + <option name="x" value="-9" /> | |
169 | + <option name="y" value="-9" /> | |
170 | + <option name="width" value="1938" /> | |
171 | + <option name="height" value="1048" /> | |
172 | + </component> | |
75 | 173 | <component name="ProjectId" id="1Q2nhRM7LRz3yFWhpclOKgTjxn0" /> |
76 | 174 | <component name="ProjectLevelVcsManager"> |
77 | 175 | <ConfirmationsSetting value="2" id="Add" /> |
78 | 176 | </component> |
177 | + <component name="ProjectView"> | |
178 | + <navigator proportions="" version="1"> | |
179 | + <foldersAlwaysOnTop value="true" /> | |
180 | + </navigator> | |
181 | + <panes> | |
182 | + <pane id="PackagesPane" /> | |
183 | + <pane id="Scope" /> | |
184 | + <pane id="ProjectPane"> | |
185 | + <subPane> | |
186 | + <expand> | |
187 | + <path> | |
188 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
189 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
190 | + </path> | |
191 | + <path> | |
192 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
193 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
194 | + <item name=".idea" type="462c0819:PsiDirectoryNode" /> | |
195 | + </path> | |
196 | + <path> | |
197 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
198 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
199 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
200 | + </path> | |
201 | + <path> | |
202 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
203 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
204 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
205 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
206 | + </path> | |
207 | + <path> | |
208 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
209 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
210 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
211 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
212 | + <item name="java" type="462c0819:PsiDirectoryNode" /> | |
213 | + </path> | |
214 | + <path> | |
215 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
216 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
217 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
218 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
219 | + <item name="java" type="462c0819:PsiDirectoryNode" /> | |
220 | + <item name="com" type="462c0819:PsiDirectoryNode" /> | |
221 | + </path> | |
222 | + <path> | |
223 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
224 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
225 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
226 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
227 | + <item name="java" type="462c0819:PsiDirectoryNode" /> | |
228 | + <item name="com" type="462c0819:PsiDirectoryNode" /> | |
229 | + <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
230 | + </path> | |
231 | + <path> | |
232 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
233 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
234 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
235 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
236 | + <item name="java" type="462c0819:PsiDirectoryNode" /> | |
237 | + <item name="com" type="462c0819:PsiDirectoryNode" /> | |
238 | + <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
239 | + <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
240 | + </path> | |
241 | + <path> | |
242 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
243 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
244 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
245 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
246 | + <item name="java" type="462c0819:PsiDirectoryNode" /> | |
247 | + <item name="com" type="462c0819:PsiDirectoryNode" /> | |
248 | + <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
249 | + <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
250 | + <item name="config" type="462c0819:PsiDirectoryNode" /> | |
251 | + </path> | |
252 | + <path> | |
253 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
254 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
255 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
256 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
257 | + <item name="java" type="462c0819:PsiDirectoryNode" /> | |
258 | + <item name="com" type="462c0819:PsiDirectoryNode" /> | |
259 | + <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
260 | + <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
261 | + <item name="inventory" type="462c0819:PsiDirectoryNode" /> | |
262 | + </path> | |
263 | + <path> | |
264 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
265 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
266 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
267 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
268 | + <item name="java" type="462c0819:PsiDirectoryNode" /> | |
269 | + <item name="com" type="462c0819:PsiDirectoryNode" /> | |
270 | + <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
271 | + <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
272 | + <item name="inventory" type="462c0819:PsiDirectoryNode" /> | |
273 | + <item name="inventoryHeader" type="462c0819:PsiDirectoryNode" /> | |
274 | + </path> | |
275 | + <path> | |
276 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
277 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
278 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
279 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
280 | + <item name="java" type="462c0819:PsiDirectoryNode" /> | |
281 | + <item name="com" type="462c0819:PsiDirectoryNode" /> | |
282 | + <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
283 | + <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
284 | + <item name="inventory" type="462c0819:PsiDirectoryNode" /> | |
285 | + <item name="inventoryHeader" type="462c0819:PsiDirectoryNode" /> | |
286 | + <item name="controller" type="462c0819:PsiDirectoryNode" /> | |
287 | + </path> | |
288 | + <path> | |
289 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
290 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
291 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
292 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
293 | + <item name="java" type="462c0819:PsiDirectoryNode" /> | |
294 | + <item name="com" type="462c0819:PsiDirectoryNode" /> | |
295 | + <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
296 | + <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
297 | + <item name="inventory" type="462c0819:PsiDirectoryNode" /> | |
298 | + <item name="inventoryHeader" type="462c0819:PsiDirectoryNode" /> | |
299 | + <item name="service" type="462c0819:PsiDirectoryNode" /> | |
300 | + </path> | |
301 | + <path> | |
302 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
303 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
304 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
305 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
306 | + <item name="java" type="462c0819:PsiDirectoryNode" /> | |
307 | + <item name="com" type="462c0819:PsiDirectoryNode" /> | |
308 | + <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
309 | + <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
310 | + <item name="task" type="462c0819:PsiDirectoryNode" /> | |
311 | + </path> | |
312 | + <path> | |
313 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
314 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
315 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
316 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
317 | + <item name="java" type="462c0819:PsiDirectoryNode" /> | |
318 | + <item name="com" type="462c0819:PsiDirectoryNode" /> | |
319 | + <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
320 | + <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
321 | + <item name="task" type="462c0819:PsiDirectoryNode" /> | |
322 | + <item name="taskHeader" type="462c0819:PsiDirectoryNode" /> | |
323 | + </path> | |
324 | + <path> | |
325 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
326 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
327 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
328 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
329 | + <item name="java" type="462c0819:PsiDirectoryNode" /> | |
330 | + <item name="com" type="462c0819:PsiDirectoryNode" /> | |
331 | + <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
332 | + <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
333 | + <item name="task" type="462c0819:PsiDirectoryNode" /> | |
334 | + <item name="taskHeader" type="462c0819:PsiDirectoryNode" /> | |
335 | + <item name="controller" type="462c0819:PsiDirectoryNode" /> | |
336 | + </path> | |
337 | + <path> | |
338 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
339 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
340 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
341 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
342 | + <item name="java" type="462c0819:PsiDirectoryNode" /> | |
343 | + <item name="com" type="462c0819:PsiDirectoryNode" /> | |
344 | + <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
345 | + <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
346 | + <item name="task" type="462c0819:PsiDirectoryNode" /> | |
347 | + <item name="taskHeader" type="462c0819:PsiDirectoryNode" /> | |
348 | + <item name="domain" 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="mapper" 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="inventory" 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="inventory" type="462c0819:PsiDirectoryNode" /> | |
408 | + <item name="adjustDetail" type="462c0819:PsiDirectoryNode" /> | |
409 | + </path> | |
410 | + <path> | |
411 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
412 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
413 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
414 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
415 | + <item name="resources" type="462c0819:PsiDirectoryNode" /> | |
416 | + <item name="templates" type="462c0819:PsiDirectoryNode" /> | |
417 | + <item name="inventory" type="462c0819:PsiDirectoryNode" /> | |
418 | + <item name="adjustHeader" type="462c0819:PsiDirectoryNode" /> | |
419 | + </path> | |
420 | + <path> | |
421 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
422 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
423 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
424 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
425 | + <item name="resources" type="462c0819:PsiDirectoryNode" /> | |
426 | + <item name="templates" type="462c0819:PsiDirectoryNode" /> | |
427 | + <item name="inventory" type="462c0819:PsiDirectoryNode" /> | |
428 | + <item name="cycleCountDetail" type="462c0819:PsiDirectoryNode" /> | |
429 | + </path> | |
430 | + <path> | |
431 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
432 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
433 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
434 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
435 | + <item name="resources" type="462c0819:PsiDirectoryNode" /> | |
436 | + <item name="templates" type="462c0819:PsiDirectoryNode" /> | |
437 | + <item name="inventory" type="462c0819:PsiDirectoryNode" /> | |
438 | + <item name="cycleCountHeader" type="462c0819:PsiDirectoryNode" /> | |
439 | + </path> | |
440 | + <path> | |
441 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
442 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
443 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
444 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
445 | + <item name="resources" type="462c0819:PsiDirectoryNode" /> | |
446 | + <item name="templates" type="462c0819:PsiDirectoryNode" /> | |
447 | + <item name="inventory" type="462c0819:PsiDirectoryNode" /> | |
448 | + <item name="inventoryDetail" type="462c0819:PsiDirectoryNode" /> | |
449 | + </path> | |
450 | + <path> | |
451 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
452 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
453 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
454 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
455 | + <item name="resources" type="462c0819:PsiDirectoryNode" /> | |
456 | + <item name="templates" type="462c0819:PsiDirectoryNode" /> | |
457 | + <item name="inventory" type="462c0819:PsiDirectoryNode" /> | |
458 | + <item name="inventoryHeader" type="462c0819:PsiDirectoryNode" /> | |
459 | + </path> | |
460 | + <path> | |
461 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
462 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
463 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
464 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
465 | + <item name="resources" type="462c0819:PsiDirectoryNode" /> | |
466 | + <item name="templates" type="462c0819:PsiDirectoryNode" /> | |
467 | + <item name="inventory" type="462c0819:PsiDirectoryNode" /> | |
468 | + <item name="inventoryTransaction" type="462c0819:PsiDirectoryNode" /> | |
469 | + </path> | |
470 | + </expand> | |
471 | + <select /> | |
472 | + </subPane> | |
473 | + </pane> | |
474 | + </panes> | |
475 | + </component> | |
79 | 476 | <component name="PropertiesComponent"> |
80 | 477 | <property name="ASKED_ADD_EXTERNAL_FILES" value="true" /> |
81 | 478 | <property name="DefaultHtmlFileTemplate" value="HTML File" /> |
... | ... | @@ -112,26 +509,11 @@ |
112 | 509 | </RuleState> |
113 | 510 | </list> |
114 | 511 | </option> |
512 | + <option name="contentProportion" value="0.056010928" /> | |
115 | 513 | </component> |
116 | - <component name="RunManager" selected="Spring Boot.HuaHengApplication"> | |
117 | - <configuration name="test.test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true"> | |
118 | - <module name="huaheng" /> | |
119 | - <extension name="coverage"> | |
120 | - <pattern> | |
121 | - <option name="PATTERN" value="com.huaheng.test.*" /> | |
122 | - <option name="ENABLED" value="true" /> | |
123 | - </pattern> | |
124 | - </extension> | |
125 | - <option name="PACKAGE_NAME" value="com.huaheng.test" /> | |
126 | - <option name="MAIN_CLASS_NAME" value="com.huaheng.test.test" /> | |
127 | - <option name="METHOD_NAME" value="test" /> | |
128 | - <option name="TEST_OBJECT" value="method" /> | |
129 | - <method v="2"> | |
130 | - <option name="Make" enabled="true" /> | |
131 | - </method> | |
132 | - </configuration> | |
514 | + <component name="RunManager"> | |
133 | 515 | <configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot"> |
134 | - <module name="huaheng" /> | |
516 | + <module name="wms2" /> | |
135 | 517 | <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" /> |
136 | 518 | <option name="ALTERNATIVE_JRE_PATH" /> |
137 | 519 | <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" /> |
... | ... | @@ -140,11 +522,6 @@ |
140 | 522 | <option name="Make" enabled="true" /> |
141 | 523 | </method> |
142 | 524 | </configuration> |
143 | - <recent_temporary> | |
144 | - <list> | |
145 | - <item itemvalue="JUnit.test.test" /> | |
146 | - </list> | |
147 | - </recent_temporary> | |
148 | 525 | </component> |
149 | 526 | <component name="ServiceViewManager"> |
150 | 527 | <option name="allServicesViewState"> |
... | ... | @@ -242,6 +619,74 @@ |
242 | 619 | <option name="localTasksCounter" value="9" /> |
243 | 620 | <servers /> |
244 | 621 | </component> |
622 | + <component name="ToolWindowManager"> | |
623 | + <frame x="-7" y="-7" width="1550" height="838" extended-state="6" /> | |
624 | + <editor active="true" /> | |
625 | + <layout> | |
626 | + <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.33109918" /> | |
627 | + <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> | |
628 | + <window_info id="Web" order="2" side_tool="true" /> | |
629 | + <window_info id="Designer" order="3" /> | |
630 | + <window_info id="UI Designer" order="4" /> | |
631 | + <window_info id="Favorites" order="5" side_tool="true" /> | |
632 | + <window_info anchor="bottom" id="Message" order="0" /> | |
633 | + <window_info anchor="bottom" id="Find" order="1" weight="0.3286119" /> | |
634 | + <window_info anchor="bottom" id="Run" order="2" /> | |
635 | + <window_info anchor="bottom" id="Debug" order="3" weight="0.29036826" /> | |
636 | + <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> | |
637 | + <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> | |
638 | + <window_info anchor="bottom" id="TODO" order="6" /> | |
639 | + <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> | |
640 | + <window_info anchor="bottom" id="Version Control" order="8" visible="true" weight="0.07082153" /> | |
641 | + <window_info anchor="bottom" id="Database Changes" order="9" /> | |
642 | + <window_info anchor="bottom" id="Spring" order="10" /> | |
643 | + <window_info anchor="bottom" id="MyBatis Log" order="11" weight="0.3286119" /> | |
644 | + <window_info anchor="bottom" id="Event Log" order="12" sideWeight="0.50067025" side_tool="true" weight="0.23796034" /> | |
645 | + <window_info anchor="bottom" id="Messages" order="13" weight="0.12606232" /> | |
646 | + <window_info anchor="bottom" id="Java Enterprise" order="14" /> | |
647 | + <window_info anchor="bottom" id="Run Dashboard" order="15" sideWeight="0.49932975" weight="0.53824365" /> | |
648 | + <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> | |
649 | + <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> | |
650 | + <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> | |
651 | + <window_info anchor="right" id="Palette" order="3" /> | |
652 | + <window_info anchor="right" id="Database" order="4" /> | |
653 | + <window_info anchor="right" id="Maven" order="5" weight="0.097184986" /> | |
654 | + <window_info anchor="right" id="Bean Validation" order="6" /> | |
655 | + <window_info anchor="right" id="Palette	" order="7" /> | |
656 | + </layout> | |
657 | + <layout-to-restore> | |
658 | + <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.26340482" /> | |
659 | + <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> | |
660 | + <window_info id="Web" order="2" side_tool="true" /> | |
661 | + <window_info id="Designer" order="3" /> | |
662 | + <window_info id="UI Designer" order="4" /> | |
663 | + <window_info id="Favorites" order="5" side_tool="true" /> | |
664 | + <window_info anchor="bottom" id="Message" order="0" /> | |
665 | + <window_info anchor="bottom" id="Find" order="1" weight="0.3286119" /> | |
666 | + <window_info anchor="bottom" id="Run" order="2" /> | |
667 | + <window_info anchor="bottom" id="Debug" order="3" weight="0.29036826" /> | |
668 | + <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> | |
669 | + <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> | |
670 | + <window_info anchor="bottom" id="TODO" order="6" /> | |
671 | + <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> | |
672 | + <window_info anchor="bottom" id="Version Control" order="8" weight="0.45042494" /> | |
673 | + <window_info anchor="bottom" id="Database Changes" order="9" /> | |
674 | + <window_info anchor="bottom" id="Spring" order="10" /> | |
675 | + <window_info anchor="bottom" id="MyBatis Log" order="11" weight="0.3286119" /> | |
676 | + <window_info anchor="bottom" id="Event Log" order="12" sideWeight="0.50067025" side_tool="true" weight="0.23796034" /> | |
677 | + <window_info anchor="bottom" id="Messages" order="13" weight="0.12606232" /> | |
678 | + <window_info anchor="bottom" id="Java Enterprise" order="14" /> | |
679 | + <window_info active="true" anchor="bottom" id="Run Dashboard" order="15" sideWeight="0.49932975" visible="true" weight="0.18838526" /> | |
680 | + <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> | |
681 | + <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> | |
682 | + <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> | |
683 | + <window_info anchor="right" id="Palette" order="3" /> | |
684 | + <window_info anchor="right" id="Database" order="4" /> | |
685 | + <window_info anchor="right" id="Maven" order="5" weight="0.097184986" /> | |
686 | + <window_info anchor="right" id="Bean Validation" order="6" /> | |
687 | + <window_info anchor="right" id="Palette	" order="7" /> | |
688 | + </layout-to-restore> | |
689 | + </component> | |
245 | 690 | <component name="TypeScriptGeneratedFilesManager"> |
246 | 691 | <option name="version" value="1" /> |
247 | 692 | </component> |
... | ... | @@ -251,7 +696,20 @@ |
251 | 696 | <entry key="MAIN"> |
252 | 697 | <value> |
253 | 698 | <State> |
254 | - <option name="COLUMN_ORDER" /> | |
699 | + <option name="RECENTLY_FILTERED_USER_GROUPS"> | |
700 | + <collection /> | |
701 | + </option> | |
702 | + <option name="RECENTLY_FILTERED_BRANCH_GROUPS"> | |
703 | + <collection /> | |
704 | + </option> | |
705 | + <option name="COLUMN_ORDER"> | |
706 | + <list> | |
707 | + <option value="0" /> | |
708 | + <option value="1" /> | |
709 | + <option value="2" /> | |
710 | + <option value="3" /> | |
711 | + </list> | |
712 | + </option> | |
255 | 713 | </State> |
256 | 714 | </value> |
257 | 715 | </entry> |
... | ... | @@ -291,44 +749,152 @@ |
291 | 749 | <line-breakpoint type="java-line"> |
292 | 750 | <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/mapper/CycleCountHeaderMapper.java</url> |
293 | 751 | <line>5</line> |
752 | + <properties /> | |
294 | 753 | <option name="timeStamp" value="1" /> |
295 | 754 | </line-breakpoint> |
296 | 755 | <line-breakpoint type="java-line"> |
297 | 756 | <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/statusFlow/controller/StatusFlowDetailController.java</url> |
298 | 757 | <line>60</line> |
758 | + <properties /> | |
299 | 759 | <option name="timeStamp" value="4" /> |
300 | 760 | </line-breakpoint> |
301 | 761 | <line-breakpoint enabled="true" type="java-line"> |
302 | 762 | <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeaderHistory/service/ReceiptHeaderHistoryService.java</url> |
303 | 763 | <line>49</line> |
764 | + <properties /> | |
304 | 765 | <option name="timeStamp" value="16" /> |
305 | 766 | </line-breakpoint> |
306 | 767 | <line-breakpoint enabled="true" type="java-line"> |
307 | 768 | <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java</url> |
308 | 769 | <line>216</line> |
770 | + <properties /> | |
309 | 771 | <option name="timeStamp" value="19" /> |
310 | 772 | </line-breakpoint> |
311 | 773 | <line-breakpoint enabled="true" type="java-line"> |
312 | 774 | <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java</url> |
313 | 775 | <line>241</line> |
776 | + <properties /> | |
314 | 777 | <option name="timeStamp" value="20" /> |
315 | 778 | </line-breakpoint> |
316 | 779 | <line-breakpoint enabled="true" type="java-line"> |
317 | 780 | <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java</url> |
318 | 781 | <line>163</line> |
782 | + <properties /> | |
319 | 783 | <option name="timeStamp" value="22" /> |
320 | 784 | </line-breakpoint> |
321 | 785 | <line-breakpoint enabled="true" type="java-line"> |
322 | 786 | <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java</url> |
323 | 787 | <line>181</line> |
788 | + <properties /> | |
324 | 789 | <option name="timeStamp" value="23" /> |
325 | 790 | </line-breakpoint> |
326 | 791 | <line-breakpoint enabled="true" type="java-line"> |
327 | 792 | <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeader/service/ReceiptHeaderService.java</url> |
328 | 793 | <line>92</line> |
794 | + <properties /> | |
329 | 795 | <option name="timeStamp" value="24" /> |
330 | 796 | </line-breakpoint> |
331 | 797 | </breakpoints> |
332 | 798 | </breakpoint-manager> |
333 | 799 | </component> |
800 | + <component name="editorHistoryManager"> | |
801 | + <entry file="file://$PROJECT_DIR$/.idea/WMSV1.iml"> | |
802 | + <provider selected="true" editor-type-id="text-editor" /> | |
803 | + </entry> | |
804 | + <entry file="file://$PROJECT_DIR$/.idea/uiDesigner.xml"> | |
805 | + <provider selected="true" editor-type-id="text-editor"> | |
806 | + <state relative-caret-position="-828" /> | |
807 | + </provider> | |
808 | + </entry> | |
809 | + <entry file="file://$PROJECT_DIR$/.idea/MyBatisCodeHelperDatasource.xml"> | |
810 | + <provider selected="true" editor-type-id="text-editor"> | |
811 | + <state relative-caret-position="-360" /> | |
812 | + </provider> | |
813 | + </entry> | |
814 | + <entry file="file://$PROJECT_DIR$/.idea/misc.xml"> | |
815 | + <provider selected="true" editor-type-id="text-editor" /> | |
816 | + </entry> | |
817 | + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/transfer.html"> | |
818 | + <provider selected="true" editor-type-id="text-editor"> | |
819 | + <state relative-caret-position="-314"> | |
820 | + <caret line="13" column="54" selection-start-line="13" selection-start-column="54" selection-end-line="13" selection-end-column="54" /> | |
821 | + </state> | |
822 | + </provider> | |
823 | + </entry> | |
824 | + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html"> | |
825 | + <provider selected="true" editor-type-id="text-editor"> | |
826 | + <state relative-caret-position="-72" /> | |
827 | + </provider> | |
828 | + </entry> | |
829 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java"> | |
830 | + <provider selected="true" editor-type-id="text-editor"> | |
831 | + <state relative-caret-position="-1268"> | |
832 | + <caret line="36" column="13" selection-start-line="36" selection-start-column="13" selection-end-line="36" selection-end-column="13" /> | |
833 | + </state> | |
834 | + </provider> | |
835 | + </entry> | |
836 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java"> | |
837 | + <provider selected="true" editor-type-id="text-editor"> | |
838 | + <state relative-caret-position="236"> | |
839 | + <caret line="36" selection-start-line="36" selection-end-line="36" /> | |
840 | + </state> | |
841 | + </provider> | |
842 | + </entry> | |
843 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskDetail/service/TaskDetailService.java"> | |
844 | + <provider selected="true" editor-type-id="text-editor"> | |
845 | + <state relative-caret-position="60"> | |
846 | + <caret line="4" column="17" selection-start-line="4" selection-start-column="17" selection-end-line="4" selection-end-column="17" /> | |
847 | + </state> | |
848 | + </provider> | |
849 | + </entry> | |
850 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java"> | |
851 | + <provider selected="true" editor-type-id="text-editor"> | |
852 | + <state relative-caret-position="240"> | |
853 | + <caret line="15" column="102" selection-start-line="15" selection-start-column="102" selection-end-line="15" selection-end-column="102" /> | |
854 | + </state> | |
855 | + </provider> | |
856 | + </entry> | |
857 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java"> | |
858 | + <provider selected="true" editor-type-id="text-editor"> | |
859 | + <state relative-caret-position="468"> | |
860 | + <caret line="37" selection-start-line="37" selection-end-line="37" /> | |
861 | + </state> | |
862 | + </provider> | |
863 | + </entry> | |
864 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java"> | |
865 | + <provider selected="true" editor-type-id="text-editor"> | |
866 | + <state relative-caret-position="340"> | |
867 | + <caret line="24" column="112" selection-start-line="24" selection-start-column="112" selection-end-line="24" selection-end-column="112" /> | |
868 | + </state> | |
869 | + </provider> | |
870 | + </entry> | |
871 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java"> | |
872 | + <provider selected="true" editor-type-id="text-editor"> | |
873 | + <state relative-caret-position="2"> | |
874 | + <caret line="440" column="18" lean-forward="true" selection-start-line="440" selection-start-column="18" selection-end-line="440" selection-end-column="18" /> | |
875 | + </state> | |
876 | + </provider> | |
877 | + </entry> | |
878 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/domain/TaskHeader.java"> | |
879 | + <provider selected="true" editor-type-id="text-editor"> | |
880 | + <state relative-caret-position="426"> | |
881 | + <caret line="366" column="57" selection-start-line="366" selection-start-column="57" selection-end-line="366" selection-end-column="57" /> | |
882 | + </state> | |
883 | + </provider> | |
884 | + </entry> | |
885 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/mapper/TaskHeaderMapper.java"> | |
886 | + <provider selected="true" editor-type-id="text-editor"> | |
887 | + <state relative-caret-position="120"> | |
888 | + <caret line="11" selection-start-line="11" selection-end-line="11" /> | |
889 | + </state> | |
890 | + </provider> | |
891 | + </entry> | |
892 | + <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/task/TaskHeaderMapper.xml"> | |
893 | + <provider selected="true" editor-type-id="text-editor"> | |
894 | + <state relative-caret-position="280"> | |
895 | + <caret line="14" column="77" selection-start-line="14" selection-start-column="77" selection-end-line="14" selection-end-column="77" /> | |
896 | + </state> | |
897 | + </provider> | |
898 | + </entry> | |
899 | + </component> | |
334 | 900 | </project> |
335 | 901 | \ No newline at end of file |
... | ... |
src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java
... | ... | @@ -16,6 +16,8 @@ import com.huaheng.framework.web.page.TableSupport; |
16 | 16 | import com.huaheng.pc.config.material.service.MaterialServiceImpl; |
17 | 17 | import com.huaheng.pc.inventory.inventoryHeader.domain.InventoryHeader; |
18 | 18 | import com.huaheng.pc.inventory.inventoryHeader.service.InventoryHeaderService; |
19 | +import com.huaheng.pc.task.taskHeader.service.TaskHeaderService; | |
20 | +import com.huaheng.pc.task.taskHeader.service.TaskHeaderServiceImpl; | |
19 | 21 | import org.apache.shiro.authz.annotation.RequiresPermissions; |
20 | 22 | import org.springframework.stereotype.Controller; |
21 | 23 | import org.springframework.web.bind.annotation.*; |
... | ... | @@ -32,8 +34,7 @@ public class InventoryHeaderController extends BaseController |
32 | 34 | { |
33 | 35 | private String prefix = "inventory/inventoryHeader"; |
34 | 36 | |
35 | - @Resource | |
36 | - private MaterialServiceImpl materialService; | |
37 | + | |
37 | 38 | @Resource |
38 | 39 | private InventoryHeaderService inventoryHeaderService; |
39 | 40 | |
... | ... | @@ -64,7 +65,7 @@ public class InventoryHeaderController extends BaseController |
64 | 65 | .eq(InventoryHeader::getWarehouseCode,ShiroUtils.getWarehouseCode())//仓库 |
65 | 66 | .eq(StringUtils.isNotEmpty(inventoryHeader.getLocationCode()),InventoryHeader::getLocationCode,inventoryHeader.getLocationCode()) //库位 |
66 | 67 | .eq(StringUtils.isNotEmpty(inventoryHeader.getContainerCode()),InventoryHeader::getContainerCode,inventoryHeader.getContainerCode())//容器 |
67 | - //.eq(StringUtils.isNotEmpty(inventoryHeader.getCompanyCode()), InventoryHeader::getCompanyCode,inventoryHeader.getCompanyCode())//货主 | |
68 | + .eq(StringUtils.isNotEmpty(inventoryHeader.getCompanyCode()), InventoryHeader::getCompanyCode,inventoryHeader.getCompanyCode())//货主 | |
68 | 69 | .eq(StringUtils.isNotEmpty(inventoryHeader.getCreatedBy()),InventoryHeader::getCreatedBy,inventoryHeader.getCreatedBy())//创建用户 |
69 | 70 | .eq(StringUtils.isNotEmpty(inventoryHeader.getLastUpdatedBy()),InventoryHeader::getLastUpdatedBy,inventoryHeader.getLastUpdatedBy())//更新用户 |
70 | 71 | .orderByDesc(InventoryHeader::getId); |
... | ... | @@ -80,6 +81,7 @@ public class InventoryHeaderController extends BaseController |
80 | 81 | } |
81 | 82 | |
82 | 83 | } |
84 | + | |
83 | 85 | /** |
84 | 86 | * 移库页面 |
85 | 87 | * */ |
... | ... |
src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java
... | ... | @@ -9,11 +9,12 @@ import org.springframework.stereotype.Service; |
9 | 9 | public interface InventoryHeaderService extends IService<InventoryHeader> { |
10 | 10 | |
11 | 11 | |
12 | - public AjaxResult transfer (String sourceLocation, String destinationLocation); | |
13 | - | |
14 | 12 | |
15 | 13 | public AjaxResult createCheckOutTask (String ids); |
16 | 14 | |
15 | + | |
16 | + public AjaxResult transfer(String sourceLocation, String destinationLocation, String companyCode); | |
17 | + | |
17 | 18 | } |
18 | 19 | |
19 | 20 | |
... | ... |
src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java
... | ... | @@ -3,7 +3,9 @@ package com.huaheng.pc.inventory.inventoryHeader.service; |
3 | 3 | import com.huaheng.framework.web.domain.AjaxResult; |
4 | 4 | import com.huaheng.pc.inventory.inventoryHeader.domain.InventoryHeader; |
5 | 5 | import com.huaheng.pc.task.taskDetail.service.TaskDetailService; |
6 | +import com.huaheng.pc.task.taskDetail.service.TaskDetailServiceImpl; | |
6 | 7 | import com.huaheng.pc.task.taskHeader.service.TaskHeaderService; |
8 | +import com.huaheng.pc.task.taskHeader.service.TaskHeaderServiceImpl; | |
7 | 9 | import org.springframework.stereotype.Service; |
8 | 10 | import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
9 | 11 | import com.huaheng.pc.inventory.inventoryHeader.mapper.InventoryHeaderMapper; |
... | ... | @@ -11,29 +13,29 @@ import com.huaheng.pc.inventory.inventoryHeader.mapper.InventoryHeaderMapper; |
11 | 13 | import javax.annotation.Resource; |
12 | 14 | |
13 | 15 | @Service |
14 | -public class InventoryHeaderServiceImpl extends ServiceImpl<InventoryHeaderMapper, InventoryHeader> implements InventoryHeaderService { | |
16 | +public class InventoryHeaderServiceImpl extends ServiceImpl<InventoryHeaderMapper, InventoryHeader> { | |
15 | 17 | |
16 | 18 | |
17 | 19 | @Resource |
18 | - private TaskHeaderService taskHeaderService; | |
20 | + private TaskHeaderServiceImpl taskHeaderServiceImpl; | |
19 | 21 | @Resource |
20 | - private TaskDetailService taskDetailService; | |
22 | + private TaskDetailServiceImpl taskDetailServiceImpl; | |
21 | 23 | |
22 | 24 | |
23 | 25 | /** |
24 | 26 | * 移库 |
25 | 27 | * */ |
26 | - @Override | |
27 | - public AjaxResult transfer(String sourceLocation, String destinationLocation) { | |
28 | - //生成移库任务 | |
29 | 28 | |
29 | + public AjaxResult transfer(String sourceLocation, String destinationLocation, String companyCode) { | |
30 | + //生成移库任务 | |
31 | + taskHeaderServiceImpl.createTransferTask(sourceLocation,destinationLocation,companyCode); | |
30 | 32 | return AjaxResult.success("移库任务生成成功!"); |
31 | 33 | } |
32 | 34 | |
33 | 35 | /** |
34 | 36 | * 出库查看 |
35 | 37 | * */ |
36 | - @Override | |
38 | + | |
37 | 39 | public AjaxResult createCheckOutTask(String ids) { |
38 | 40 | //生成出库查看任务 |
39 | 41 | |
... | ... |
src/main/java/com/huaheng/pc/task/taskDetail/domain/TaskDetail.java
... | ... | @@ -218,12 +218,6 @@ public class TaskDetail implements Serializable { |
218 | 218 | @ApiModelProperty(value="属性3") |
219 | 219 | private String attribute3; |
220 | 220 | |
221 | - /** | |
222 | - * 属性4 | |
223 | - */ | |
224 | - @TableField(value = "attribute4") | |
225 | - @ApiModelProperty(value="属性4") | |
226 | - private String attribute4; | |
227 | 221 | |
228 | 222 | /** |
229 | 223 | * 批次 |
... | ... | @@ -377,41 +371,6 @@ public class TaskDetail implements Serializable { |
377 | 371 | private String userDef3; |
378 | 372 | |
379 | 373 | /** |
380 | - * 自定义字段4 | |
381 | - */ | |
382 | - @TableField(value = "userDef4") | |
383 | - @ApiModelProperty(value="自定义字段4") | |
384 | - private String userDef4; | |
385 | - | |
386 | - /** | |
387 | - * 自定义字段5 | |
388 | - */ | |
389 | - @TableField(value = "userDef5") | |
390 | - @ApiModelProperty(value="自定义字段5") | |
391 | - private String userDef5; | |
392 | - | |
393 | - /** | |
394 | - * 自定义字段6 | |
395 | - */ | |
396 | - @TableField(value = "userDef6") | |
397 | - @ApiModelProperty(value="自定义字段6") | |
398 | - private String userDef6; | |
399 | - | |
400 | - /** | |
401 | - * 自定义字段7 | |
402 | - */ | |
403 | - @TableField(value = "userDef7") | |
404 | - @ApiModelProperty(value="自定义字段7") | |
405 | - private String userDef7; | |
406 | - | |
407 | - /** | |
408 | - * 自定义字段8 | |
409 | - */ | |
410 | - @TableField(value = "userDef8") | |
411 | - @ApiModelProperty(value="自定义字段8") | |
412 | - private String userDef8; | |
413 | - | |
414 | - /** | |
415 | 374 | * 处理标记 |
416 | 375 | */ |
417 | 376 | @TableField(value = "processStamp") |
... | ... | @@ -479,7 +438,6 @@ public class TaskDetail implements Serializable { |
479 | 438 | |
480 | 439 | public static final String COL_ATTRIBUTE3 = "attribute3"; |
481 | 440 | |
482 | - public static final String COL_ATTRIBUTE4 = "attribute4"; | |
483 | 441 | |
484 | 442 | public static final String COL_BATCH = "batch"; |
485 | 443 | |
... | ... | @@ -525,15 +483,5 @@ public class TaskDetail implements Serializable { |
525 | 483 | |
526 | 484 | public static final String COL_USERDEF3 = "userDef3"; |
527 | 485 | |
528 | - public static final String COL_USERDEF4 = "userDef4"; | |
529 | - | |
530 | - public static final String COL_USERDEF5 = "userDef5"; | |
531 | - | |
532 | - public static final String COL_USERDEF6 = "userDef6"; | |
533 | - | |
534 | - public static final String COL_USERDEF7 = "userDef7"; | |
535 | - | |
536 | - public static final String COL_USERDEF8 = "userDef8"; | |
537 | - | |
538 | 486 | public static final String COL_PROCESSSTAMP = "processStamp"; |
539 | 487 | } |
540 | 488 | \ No newline at end of file |
... | ... |
src/main/java/com/huaheng/pc/task/taskHeader/domain/TaskHeader.java
... | ... | @@ -280,40 +280,6 @@ public class TaskHeader implements Serializable { |
280 | 280 | @ApiModelProperty(value="同步标志 0:需要同步 10:同步成功 20:同步失败") |
281 | 281 | private String userDef3; |
282 | 282 | |
283 | - /** | |
284 | - * 自定义字段4 | |
285 | - */ | |
286 | - @TableField(value = "userDef4") | |
287 | - @ApiModelProperty(value="自定义字段4") | |
288 | - private String userDef4; | |
289 | - | |
290 | - /** | |
291 | - * 自定义字段5 | |
292 | - */ | |
293 | - @TableField(value = "userDef5") | |
294 | - @ApiModelProperty(value="自定义字段5") | |
295 | - private String userDef5; | |
296 | - | |
297 | - /** | |
298 | - * 自定义字段6 | |
299 | - */ | |
300 | - @TableField(value = "userDef6") | |
301 | - @ApiModelProperty(value="自定义字段6") | |
302 | - private String userDef6; | |
303 | - | |
304 | - /** | |
305 | - * 自定义字段7 | |
306 | - */ | |
307 | - @TableField(value = "userDef7") | |
308 | - @ApiModelProperty(value="自定义字段7") | |
309 | - private String userDef7; | |
310 | - | |
311 | - /** | |
312 | - * 自定义字段8 | |
313 | - */ | |
314 | - @TableField(value = "userDef8") | |
315 | - @ApiModelProperty(value="自定义字段8") | |
316 | - private String userDef8; | |
317 | 283 | |
318 | 284 | /** |
319 | 285 | * 处理标记 |
... | ... | @@ -400,15 +366,5 @@ public class TaskHeader implements Serializable { |
400 | 366 | |
401 | 367 | public static final String COL_USERDEF3 = "userDef3"; |
402 | 368 | |
403 | - public static final String COL_USERDEF4 = "userDef4"; | |
404 | - | |
405 | - public static final String COL_USERDEF5 = "userDef5"; | |
406 | - | |
407 | - public static final String COL_USERDEF6 = "userDef6"; | |
408 | - | |
409 | - public static final String COL_USERDEF7 = "userDef7"; | |
410 | - | |
411 | - public static final String COL_USERDEF8 = "userDef8"; | |
412 | - | |
413 | 369 | public static final String COL_PROCESSSTAMP = "processStamp"; |
414 | 370 | } |
415 | 371 | \ No newline at end of file |
... | ... |
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java
... | ... | @@ -22,4 +22,6 @@ public interface TaskHeaderService extends IService<TaskHeader>{ |
22 | 22 | |
23 | 23 | // List<Map<String, Object>> getReceiptTask(@Param("taskId") Integer taskId); |
24 | 24 | |
25 | + public AjaxResult createTransferTask(String sourceLocation, String destinationLocation, String companyCode); | |
26 | + | |
25 | 27 | } |
... | ... |
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
... | ... | @@ -435,5 +435,90 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea |
435 | 435 | // return taskHeaderMapper.getReceiptTask(taskId) ; |
436 | 436 | // } |
437 | 437 | |
438 | + /** | |
439 | + * 立库移库 | |
440 | + * */ | |
441 | + @Transactional | |
442 | + public AjaxResult createTransferTask(String sourceLocation, String destinationLocation, String companyCode) { | |
443 | + /* Location temp1 = new Location(); | |
444 | + temp1.setCode(sourceLocation); | |
445 | + temp1.setWarehouseId(ShiroUtils.getWarehouseId()); | |
446 | + Location loc1 = locationService.selectFirstEntity(temp1); | |
447 | + if(loc1==null){ | |
448 | + return AjaxResult.error("源库位:"+sourceLocation+"未找到"); | |
449 | + } | |
450 | + if(!loc1.getStatus().equals("empty")){ | |
451 | + return AjaxResult.error("源库位:"+sourceLocation+"状态非空闲"); | |
452 | + } | |
453 | + if(StringUtils.isEmpty(loc1.getContainerCode())){ | |
454 | + return AjaxResult.error("源库位:"+sourceLocation+"不存在托盘"); | |
455 | + } | |
456 | + //这里增加组盘校验,如果此托盘存在未完成的组盘数据,则不能移库 | |
457 | + //校验入库组盘 | |
458 | + int count1 = inventoryService.getUncompleteReceiptContainer(sourceLocation,ShiroUtils.getWarehouseId()); | |
459 | + if(count1>0){ | |
460 | + return AjaxResult.error("源库位:"+sourceLocation+"存在入库组盘,不能移库"); | |
461 | + } | |
462 | + int count2 = inventoryService.getUncompleteShipmentContainer(sourceLocation,ShiroUtils.getWarehouseId()); | |
463 | + if(count2>0){ | |
464 | + return AjaxResult.error("源库位:"+sourceLocation+"存在出库组盘,不能移库"); | |
465 | + } | |
466 | + | |
467 | + Location temp2 = new Location(); | |
468 | + temp2.setWarehouseId(ShiroUtils.getWarehouseId()); | |
469 | + temp2.setCode(destinationLocation); | |
470 | + Location loc2 = locationService.selectFirstEntity(temp2); | |
471 | + if(loc2 == null){ | |
472 | + return AjaxResult.error("目标库位:"+destinationLocation+"未找到"); | |
473 | + } | |
474 | + if(!loc2.getStatus().equals("empty")){ | |
475 | + return AjaxResult.error("目标库位:"+destinationLocation+"状态非空闲"); | |
476 | + } | |
477 | + if(StringUtils.isNotEmpty(loc2.getContainerCode())){ | |
478 | + return AjaxResult.error("目标库位:"+destinationLocation+"已存在托盘"); | |
479 | + } | |
480 | + int count3 = inventoryService.getUncompleteReceiptContainer(destinationLocation,ShiroUtils.getWarehouseId()); | |
481 | + if(count3>0){ | |
482 | + return AjaxResult.error("目标库位:"+sourceLocation+"存在入库组盘,不能移库"); | |
483 | + } | |
484 | + //hack:这里暂时写死第五层不能往其他四层移库 | |
485 | + if(loc1.getLayer()==5){ | |
486 | + if(loc2.getLayer()<4){ | |
487 | + return AjaxResult.error("高货位不能往底货位移库"); | |
488 | + } | |
489 | + } | |
490 | + Task task = new Task(); | |
491 | + task.setWarehouseId(ShiroUtils.getWarehouseId()); | |
492 | + task.setWarehouseCode(ShiroUtils.getWarehouseCode()); | |
493 | + task.setCompanyId(ShiroUtils.getCompanyIdList().get(0));//获取第一个货主 | |
494 | + task.setCompanyCode(ShiroUtils.getCompanyCodeList().get(0)); | |
495 | + //这里默认一个0 | |
496 | + task.setPriority(0); | |
497 | + task.setType((short)800); | |
498 | + //对移库来说,这个没啥用 | |
499 | + task.setStation(null); | |
500 | + task.setContainerCode(loc1.getContainerCode()); | |
501 | + task.setFirstStatus((short)1); | |
502 | + task.setLastStatus((short)1); | |
503 | + task.setBeginTime(new Date()); | |
504 | + task.setSourceLocation(sourceLocation); | |
505 | + task.setDestinationLocation(destinationLocation); | |
506 | + task.setCreated(new Date()); | |
507 | + task.setCreatedBy(ShiroUtils.getLoginName()); | |
508 | + insert(task); | |
509 | + //更新货位状态为预定 | |
510 | + loc1.setStatus("lock"); | |
511 | + loc2.setStatus("lock"); | |
512 | + locationService.updateByModel(loc1); | |
513 | + locationService.updateByModel(loc2); | |
514 | + return AjaxResult.success(task.getId());*/ | |
515 | + return null; | |
516 | + } | |
517 | + | |
518 | + | |
519 | + | |
520 | + | |
521 | + | |
522 | + | |
438 | 523 | |
439 | 524 | } |
... | ... |
src/main/resources/mybatis/task/TaskDetailMapper.xml
... | ... | @@ -21,7 +21,6 @@ |
21 | 21 | <result column="fromZone" jdbcType="VARCHAR" property="fromZone" /> |
22 | 22 | <result column="toZone" jdbcType="VARCHAR" property="toZone" /> |
23 | 23 | <result column="attributeId" jdbcType="INTEGER" property="attributeId" /> |
24 | - <result column="enable" jdbcType="INTEGER" property="enable" /> | |
25 | 24 | <result column="referenceCode" jdbcType="VARCHAR" property="referenceCode" /> |
26 | 25 | <result column="referenceId" jdbcType="INTEGER" property="referenceId" /> |
27 | 26 | <result column="referenceLineId" jdbcType="INTEGER" property="referenceLineId" /> |
... | ... | @@ -29,7 +28,6 @@ |
29 | 28 | <result column="attribute1" jdbcType="VARCHAR" property="attribute1" /> |
30 | 29 | <result column="attribute2" jdbcType="VARCHAR" property="attribute2" /> |
31 | 30 | <result column="attribute3" jdbcType="VARCHAR" property="attribute3" /> |
32 | - <result column="attribute4" jdbcType="VARCHAR" property="attribute4" /> | |
33 | 31 | <result column="batch" jdbcType="VARCHAR" property="batch" /> |
34 | 32 | <result column="lot" jdbcType="VARCHAR" property="lot" /> |
35 | 33 | <result column="projectNo" jdbcType="VARCHAR" property="projectNo" /> |
... | ... | @@ -52,22 +50,16 @@ |
52 | 50 | <result column="userDef1" jdbcType="VARCHAR" property="userDef1" /> |
53 | 51 | <result column="userDef2" jdbcType="VARCHAR" property="userDef2" /> |
54 | 52 | <result column="userDef3" jdbcType="VARCHAR" property="userDef3" /> |
55 | - <result column="userDef4" jdbcType="VARCHAR" property="userDef4" /> | |
56 | - <result column="userDef5" jdbcType="VARCHAR" property="userDef5" /> | |
57 | - <result column="userDef6" jdbcType="VARCHAR" property="userDef6" /> | |
58 | - <result column="userDef7" jdbcType="VARCHAR" property="userDef7" /> | |
59 | - <result column="userDef8" jdbcType="VARCHAR" property="userDef8" /> | |
60 | 53 | <result column="processStamp" jdbcType="VARCHAR" property="processStamp" /> |
61 | 54 | </resultMap> |
62 | 55 | <sql id="Base_Column_List"> |
63 | 56 | <!--@mbg.generated--> |
64 | 57 | id, taskId, taskCode, taskType, internalTaskType, warehouseCode, companyCode, materialCode, |
65 | 58 | materialName, materialSpec, materialUnit, qty, fromLocation, toLocation, containerCode, |
66 | - fromZone, toZone, attributeId, `enable`, referenceCode, referenceId, referenceLineId, | |
59 | + fromZone, toZone, attributeId, referenceCode, referenceId, referenceLineId, | |
67 | 60 | assignedUser, attribute1, attribute2, attribute3, attribute4, batch, lot, projectNo, |
68 | 61 | qcCheck, manufactureDate, expirationDate, agingDate, inventorySts, waveId, fromInventoryId, |
69 | 62 | toInventoryId, confirmedBy, groupNum, groupIndex, created, createdBy, lastUpdated, |
70 | - lastUpdatedBy, version, userDef1, userDef2, userDef3, userDef4, userDef5, userDef6, | |
71 | - userDef7, userDef8, processStamp | |
63 | + lastUpdatedBy, version, userDef1, userDef2, userDef3, processStamp | |
72 | 64 | </sql> |
73 | 65 | </mapper> |
74 | 66 | \ No newline at end of file |
... | ... |
src/main/resources/mybatis/task/TaskHeaderMapper.xml
... | ... | @@ -13,7 +13,6 @@ |
13 | 13 | <result column="referenceCode" jdbcType="VARCHAR" property="referenceCode" /> |
14 | 14 | <result column="assignedUser" jdbcType="VARCHAR" property="assignedUser" /> |
15 | 15 | <result column="confirmedBy" jdbcType="VARCHAR" property="confirmedBy" /> |
16 | - <result column="enable" jdbcType="INTEGER" property="enable" /> | |
17 | 16 | <result column="waveId" jdbcType="INTEGER" property="waveId" /> |
18 | 17 | <result column="pickingCartCode" jdbcType="VARCHAR" property="pickingCartCode" /> |
19 | 18 | <result column="pickingCartPos" jdbcType="VARCHAR" property="pickingCartPos" /> |
... | ... | @@ -40,11 +39,6 @@ |
40 | 39 | <result column="userDef1" jdbcType="VARCHAR" property="userDef1" /> |
41 | 40 | <result column="userDef2" jdbcType="VARCHAR" property="userDef2" /> |
42 | 41 | <result column="userDef3" jdbcType="VARCHAR" property="userDef3" /> |
43 | - <result column="userDef4" jdbcType="VARCHAR" property="userDef4" /> | |
44 | - <result column="userDef5" jdbcType="VARCHAR" property="userDef5" /> | |
45 | - <result column="userDef6" jdbcType="VARCHAR" property="userDef6" /> | |
46 | - <result column="userDef7" jdbcType="VARCHAR" property="userDef7" /> | |
47 | - <result column="userDef8" jdbcType="VARCHAR" property="userDef8" /> | |
48 | 42 | <result column="processStamp" jdbcType="VARCHAR" property="processStamp" /> |
49 | 43 | </resultMap> |
50 | 44 | <select id="getReceiptTask" resultType="java.util.Map"> |
... | ... | @@ -60,11 +54,11 @@ |
60 | 54 | <sql id="Base_Column_List"> |
61 | 55 | <!--@mbg.generated--> |
62 | 56 | id, code, warehouseCode, companyCode, taskType, internalTaskType, referenceId, referenceCode, |
63 | - assignedUser, confirmedBy, `enable`, waveId, pickingCartCode, pickingCartPos, containerCode, | |
57 | + assignedUser, confirmedBy, waveId, pickingCartCode, pickingCartPos, containerCode, | |
64 | 58 | startPickDateTime, endPickDateTime, rebatchLoc, finishRebatch, rebatchGroupCode, |
65 | 59 | allowRebatch, taskProcessType, rebinBench, rebined, startRebinDateTime, endRebinDateTime, |
66 | 60 | rebinedBy, exceptionCode, exceptionHandledBy, created, createdBy, lastUpdated, lastUpdatedBy, |
67 | - version, userDef1, userDef2, userDef3, userDef4, userDef5, userDef6, userDef7, userDef8, | |
61 | + version, userDef1, userDef2, userDef3, | |
68 | 62 | processStamp |
69 | 63 | </sql> |
70 | 64 | </mapper> |
71 | 65 | \ No newline at end of file |
... | ... |
src/main/resources/templates/inventory/inventoryHeader/transfer.html
... | ... | @@ -34,7 +34,7 @@ |
34 | 34 | </div> |
35 | 35 | <div th:include="include::footer"></div> |
36 | 36 | <script type="text/javascript"> |
37 | - var prefix = ctx + "inventory/inventorytransfer" | |
37 | + var prefix = ctx + "inventory/inventoryHeader" | |
38 | 38 | $("#form-inventory-transfer").validate({ |
39 | 39 | rules:{ |
40 | 40 | sourceLocation:{ |
... | ... |