wms / wms_sichuanzhongmi · Commits

Commit b74f76124830dc2c3a39b3a9ed4ef193870343dc

Authored by fuxiaohan
2 parents 47d520e7 a39aa51d

Merge remote-tracking branch 'origin/WMSV2-HH' into WMSV2-HH

Inline Side-by-side
Showing 4 changed files with 97 additions and 824 deletions
.idea/misc.xml
  View file @b74f761
... ... @@ -14,4 +14,7 @@
14 14 <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
15 15 <output url="file://$PROJECT_DIR$/out" />
16 16 </component>
  17 + <component name="SuppressionsComponent">
  18 + <option name="suppComments" value="[]" />
  19 + </component>
17 20 </project>
18 21 \ No newline at end of file
... ...
.idea/modules.xml deleted
View file @47d520e
1   -<?xml version="1.0" encoding="UTF-8"?>
2   -<project version="4">
3   - <component name="ProjectModuleManager">
4   - <modules>
5   - <module fileurl="file://$PROJECT_DIR$/.idea/wms2.iml" filepath="$PROJECT_DIR$/.idea/wms2.iml" />
6   - </modules>
7   - </component>
8   -</project>
9 0 \ No newline at end of file
.idea/workspace.xml
  View file @b74f761
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <project version="4">
  3 + <component name="BranchesTreeState">
  4 + <expand>
  5 + <path>
  6 + <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
  7 + <item name="LOCAL_ROOT" type="e8cecc67:BranchNodeDescriptor" />
  8 + </path>
  9 + <path>
  10 + <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
  11 + <item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" />
  12 + </path>
  13 + <path>
  14 + <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
  15 + <item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" />
  16 + <item name="GROUP_NODE:origin" type="e8cecc67:BranchNodeDescriptor" />
  17 + </path>
  18 + </expand>
  19 + <select />
  20 + </component>
3 21 <component name="ChangeListManager">
4   - <list default="true" id="29079676-ace5-434e-89a2-76a325e744a5" name="Default Changelist" comment="增加右上角消息提示，修改配置-入库配置搜索，做成折叠样式...">
5   - <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6   - <change beforePath="$PROJECT_DIR$/src/main/resources/static/huaheng/css/huahengUI.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/static/huaheng/css/huahengUI.css" afterDir="false" />
7   - </list>
8   - <ignored path="$PROJECT_DIR$/target/" />
9   - <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
  22 + <list default="true" id="29079676-ace5-434e-89a2-76a325e744a5" name="Default Changelist" comment="合并信义源码" />
10 23 <option name="SHOW_DIALOG" value="false" />
11 24 <option name="HIGHLIGHT_CONFLICTS" value="true" />
12 25 <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
... ... @@ -31,94 +44,6 @@
31 44 </expand>
32 45 <select />
33 46 </component>
34   - <component name="FileEditorManager">
35   - <leaf>
36   - <file pinned="false" current-in-tab="false">
37   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/main.html">
38   - <provider selected="true" editor-type-id="text-editor" />
39   - </entry>
40   - </file>
41   - <file pinned="false" current-in-tab="false">
42   - <entry file="file://$PROJECT_DIR$/src/main/resources/static/css/style.css">
43   - <provider selected="true" editor-type-id="text-editor">
44   - <state relative-caret-position="165">
45   - <caret line="7436" column="43" selection-start-line="7436" selection-start-column="39" selection-end-line="7436" selection-end-column="43" />
46   - </state>
47   - </provider>
48   - </entry>
49   - </file>
50   - <file pinned="false" current-in-tab="false">
51   - <entry file="file://$PROJECT_DIR$/target/classes/static/css/style.css">
52   - <provider selected="true" editor-type-id="text-editor">
53   - <state relative-caret-position="258">
54   - <caret line="7415" column="9" lean-forward="true" selection-start-line="7415" selection-start-column="9" selection-end-line="7415" selection-end-column="9" />
55   - </state>
56   - </provider>
57   - </entry>
58   - </file>
59   - <file pinned="false" current-in-tab="false">
60   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/index.html">
61   - <provider selected="true" editor-type-id="text-editor">
62   - <state relative-caret-position="528">
63   - <caret line="99" column="65" selection-start-line="99" selection-start-column="65" selection-end-line="99" selection-end-column="65" />
64   - </state>
65   - </provider>
66   - </entry>
67   - </file>
68   - <file pinned="false" current-in-tab="false">
69   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/receiptPreference/receiptPreference.html">
70   - <provider selected="true" editor-type-id="text-editor">
71   - <state relative-caret-position="-5608" />
72   - </provider>
73   - </entry>
74   - </file>
75   - <file pinned="false" current-in-tab="false">
76   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/shipment/shipmentDetail/report.html">
77   - <provider selected="true" editor-type-id="text-editor">
78   - <state relative-caret-position="148">
79   - <caret line="89" column="36" selection-start-line="89" selection-start-column="36" selection-end-line="89" selection-end-column="68" />
80   - </state>
81   - </provider>
82   - </entry>
83   - </file>
84   - <file pinned="false" current-in-tab="false">
85   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/receiptPreference/list.html">
86   - <provider selected="true" editor-type-id="text-editor">
87   - <state relative-caret-position="-704">
88   - <caret line="88" column="57" selection-start-line="88" selection-start-column="57" selection-end-line="88" selection-end-column="57" />
89   - <folding>
90   - <element signature="n#style#0;n#p#0;n#ul#0;n#div#0;n#div#0;n#form#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
91   - <element signature="e#2763#8715#0" />
92   - </folding>
93   - </state>
94   - </provider>
95   - </entry>
96   - </file>
97   - <file pinned="false" current-in-tab="false">
98   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/receiptPreference/add.html">
99   - <provider selected="true" editor-type-id="text-editor" />
100   - </entry>
101   - </file>
102   - <file pinned="false" current-in-tab="true">
103   - <entry file="file://$PROJECT_DIR$/src/main/resources/static/huaheng/css/huahengUI.css">
104   - <provider selected="true" editor-type-id="text-editor">
105   - <state relative-caret-position="262">
106   - <caret line="636" column="18" selection-start-line="636" selection-start-column="18" selection-end-line="636" selection-end-column="18" />
107   - </state>
108   - </provider>
109   - </entry>
110   - </file>
111   - <file pinned="false" current-in-tab="false">
112   - <entry file="file://$PROJECT_DIR$/src/main/resources/static/css/bootstrap.min.css">
113   - <provider selected="true" editor-type-id="text-editor">
114   - <state relative-caret-position="165">
115   - <caret line="3545" selection-start-line="3545" selection-end-line="3545" />
116   - </state>
117   - </provider>
118   - </entry>
119   - </file>
120   - </leaf>
121   - </component>
122 47 <component name="FileTemplateManagerImpl">
123 48 <option name="RECENT_TEMPLATES">
124 49 <list>
... ... @@ -129,46 +54,6 @@
129 54 </list>
130 55 </option>
131 56 </component>
132   - <component name="FindInProjectRecents">
133   - <findStrings>
134   - <find>receiptTypeService</find>
135   - <find>LocationInfo</find>
136   - <find>getLocationInfo</find>
137   - <find>LK</find>
138   - <find>findShipment</find>
139   - <find>没有对应的出库单类型</find>
140   - <find>createShipmentTask</find>
141   - <find>getEmptyContainerInLocation</find>
142   - <find>findlast</find>
143   - <find>searchTask</find>
144   - <find>COMPLETE</find>
145   - <find>complete</find>
146   - <find>findTask</find>
147   - <find>inventoryDetailLook</find>
148   - <find>inventoryDetailId</find>
149   - <find>containerCode</find>
150   - <find>materialName</find>
151   - <find />
152   - <find>定位</find>
153   - <find>setLocation</find>
154   - <find>setLocationCode</find>
155   - <find>getLocationCode</find>
156   - <find>weight</find>
157   - <find>location</find>
158   - <find>locationService</find>
159   - <find>getOne</find>
160   - <find>locationLambdaQueryWrapper</find>
161   - <find>receiptDetailList</find>
162   - <find>searchShipmentInCondition</find>
163   - <find>png</find>
164   - </findStrings>
165   - <replaceStrings>
166   - <replace />
167   - </replaceStrings>
168   - <dirStrings>
169   - <dir>E:\web\wms2\src\main\java\com\huaheng\pc\receipt</dir>
170   - </dirStrings>
171   - </component>
172 57 <component name="Git.Settings">
173 58 <option name="UPDATE_TYPE" value="MERGE" />
174 59 <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
... ... @@ -178,74 +63,6 @@
178 63 </map>
179 64 </option>
180 65 </component>
181   - <component name="IdeDocumentHistory">
182   - <option name="CHANGED_PATHS">
183   - <list>
184   - <option value="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html" />
185   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/taskAssignService/TaskAssignServiceImpl.java" />
186   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/api/general/service/ReceiptApiService.java" />
187   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java" />
188   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/receipt/MobilePutawayController.java" />
189   - <option value="$PROJECT_DIR$/src/main/resources/mybatis/config/LocationMapper.xml" />
190   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeader/mapper/ReceiptHeaderMapper.java" />
191   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentHeader/mapper/ShipmentHeaderMapper.java" />
192   - <option value="$PROJECT_DIR$/src/main/resources/mybatis/shipment/ShipmentHeaderMapper.xml" />
193   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentHeader/service/ShipmentHeaderService.java" />
194   - <option value="$PROJECT_DIR$/src/main/resources/templates/monitor/locationstatus/locationstatus.html" />
195   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/controller/LocationController.java" />
196   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/shipmentType/service/ShipmentTypeServiceImpl.java" />
197   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/shipmentType/service/ShipmentTypeService.java" />
198   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentHeader/service/ShipmentHeaderServiceImpl.java" />
199   - <option value="$PROJECT_DIR$/src/main/resources/mybatis/config/ContainerMapper.xml" />
200   - <option value="$PROJECT_DIR$/src/main/resources/templates/task/task/task.html" />
201   - <option value="$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/taskHeader.html" />
202   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/task/TaskDomain.java" />
203   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/invenory/InventoryDomain.java" />
204   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/task/TaskInfo.java" />
205   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/task/TodayInfo.java" />
206   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/invenory/MobileInventoryController.java" />
207   - <option value="$PROJECT_DIR$/src/main/resources/application.yml" />
208   - <option value="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptDetail/add.html" />
209   - <option value="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/add.html" />
210   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java" />
211   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java" />
212   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/emptyOutHandle/EmptyOutHandleServiceImpl.java" />
213   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/receipt/MobileBatchReceiptController.java" />
214   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/shipment/MobileShipmentController.java" />
215   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/task/MobileTaskController.java" />
216   - <option value="$PROJECT_DIR$/src/main/resources/templates/index.html" />
217   - <option value="$PROJECT_DIR$/src/main/resources/templates/config/receiptPreference/list.html" />
218   - <option value="$PROJECT_DIR$/src/main/resources/static/css/style.css" />
219   - <option value="$PROJECT_DIR$/target/classes/static/css/style.css" />
220   - <option value="$PROJECT_DIR$/src/main/resources/static/huaheng/css/huahengUI.css" />
221   - </list>
222   - </option>
223   - </component>
224   - <component name="IgnoredFileRootStore">
225   - <option name="generatedRoots">
226   - <set>
227   - <option value="E:\code\wms2\.idea" />
228   - </set>
229   - </option>
230   - </component>
231   - <component name="MavenImportPreferences">
232   - <option name="importingSettings">
233   - <MavenImportingSettings>
234   - <option name="importAutomatically" value="true" />
235   - </MavenImportingSettings>
236   - </option>
237   - </component>
238   - <component name="MavenProjectNavigator">
239   - <treeState>
240   - <expand>
241   - <path>
242   - <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
243   - <item name="huaheng" type="9519ce18:MavenProjectsStructure$ProjectNode" />
244   - </path>
245   - </expand>
246   - <select />
247   - </treeState>
248   - </component>
249 66 <component name="ProjectFrameBounds" extendedState="6">
250 67 <option name="x" value="422" />
251 68 <option name="y" value="118" />
... ... @@ -256,109 +73,8 @@
256 73 <component name="ProjectLevelVcsManager">
257 74 <ConfirmationsSetting value="2" id="Add" />
258 75 </component>
259   - <component name="ProjectView">
260   - <navigator proportions="" version="1">
261   - <foldersAlwaysOnTop value="true" />
262   - </navigator>
263   - <panes>
264   - <pane id="Scope" />
265   - <pane id="PackagesPane" />
266   - <pane id="ProjectPane">
267   - <subPane>
268   - <expand>
269   - <path>
270   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
271   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
272   - </path>
273   - <path>
274   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
275   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
276   - <item name="src" type="462c0819:PsiDirectoryNode" />
277   - </path>
278   - <path>
279   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
280   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
281   - <item name="src" type="462c0819:PsiDirectoryNode" />
282   - <item name="main" type="462c0819:PsiDirectoryNode" />
283   - </path>
284   - <path>
285   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
286   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
287   - <item name="src" type="462c0819:PsiDirectoryNode" />
288   - <item name="main" type="462c0819:PsiDirectoryNode" />
289   - <item name="resources" type="462c0819:PsiDirectoryNode" />
290   - </path>
291   - <path>
292   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
293   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
294   - <item name="src" type="462c0819:PsiDirectoryNode" />
295   - <item name="main" type="462c0819:PsiDirectoryNode" />
296   - <item name="resources" type="462c0819:PsiDirectoryNode" />
297   - <item name="static" type="462c0819:PsiDirectoryNode" />
298   - </path>
299   - <path>
300   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
301   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
302   - <item name="src" type="462c0819:PsiDirectoryNode" />
303   - <item name="main" type="462c0819:PsiDirectoryNode" />
304   - <item name="resources" type="462c0819:PsiDirectoryNode" />
305   - <item name="templates" type="462c0819:PsiDirectoryNode" />
306   - </path>
307   - <path>
308   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
309   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
310   - <item name="src" type="462c0819:PsiDirectoryNode" />
311   - <item name="main" type="462c0819:PsiDirectoryNode" />
312   - <item name="resources" type="462c0819:PsiDirectoryNode" />
313   - <item name="templates" type="462c0819:PsiDirectoryNode" />
314   - <item name="config" type="462c0819:PsiDirectoryNode" />
315   - </path>
316   - <path>
317   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
318   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
319   - <item name="src" type="462c0819:PsiDirectoryNode" />
320   - <item name="main" type="462c0819:PsiDirectoryNode" />
321   - <item name="resources" type="462c0819:PsiDirectoryNode" />
322   - <item name="templates" type="462c0819:PsiDirectoryNode" />
323   - <item name="config" type="462c0819:PsiDirectoryNode" />
324   - <item name="receiptPreference" type="462c0819:PsiDirectoryNode" />
325   - </path>
326   - <path>
327   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
328   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
329   - <item name="target" type="462c0819:PsiDirectoryNode" />
330   - </path>
331   - <path>
332   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
333   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
334   - <item name="target" type="462c0819:PsiDirectoryNode" />
335   - <item name="classes" type="462c0819:PsiDirectoryNode" />
336   - </path>
337   - <path>
338   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
339   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
340   - <item name="target" type="462c0819:PsiDirectoryNode" />
341   - <item name="classes" type="462c0819:PsiDirectoryNode" />
342   - <item name="static" type="462c0819:PsiDirectoryNode" />
343   - </path>
344   - <path>
345   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
346   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
347   - <item name="target" type="462c0819:PsiDirectoryNode" />
348   - <item name="classes" type="462c0819:PsiDirectoryNode" />
349   - <item name="static" type="462c0819:PsiDirectoryNode" />
350   - <item name="css" type="462c0819:PsiDirectoryNode" />
351   - </path>
352   - </expand>
353   - <select />
354   - </subPane>
355   - </pane>
356   - <pane id="AndroidView" />
357   - </panes>
358   - </component>
359 76 <component name="ProjectViewState">
360 77 <option name="hideEmptyMiddlePackages" value="true" />
361   - <option name="showExcludedFiles" value="true" />
362 78 <option name="showLibraryContents" value="true" />
363 79 </component>
364 80 <component name="PropertiesComponent">
... ... @@ -382,7 +98,7 @@
382 98 <property name="node.js.path.for.package.tslint" value="project" />
383 99 <property name="node.js.selected.package.eslint" value="(autodetect)" />
384 100 <property name="node.js.selected.package.tslint" value="(autodetect)" />
385   - <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
  101 + <property name="settings.editor.selected.configurable" value="preferences.fileTypes" />
386 102 </component>
387 103 <component name="RecentsManager">
388 104 <key name="MoveFile.RECENT_KEYS">
... ... @@ -396,18 +112,6 @@
396 112 <recent name="E:\code\wms2\src\main\resources\mybatis\monitor" />
397 113 </key>
398 114 </component>
399   - <component name="RunDashboard">
400   - <option name="ruleStates">
401   - <list>
402   - <RuleState>
403   - <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
404   - </RuleState>
405   - <RuleState>
406   - <option name="name" value="StatusDashboardGroupingRule" />
407   - </RuleState>
408   - </list>
409   - </option>
410   - </component>
411 115 <component name="RunManager">
412 116 <configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
413 117 <module name="huaheng" />
... ... @@ -440,18 +144,6 @@
440 144 <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
441 145 </configuration>
442 146 </component>
443   - <component name="ServiceViewManager">
444   - <option name="viewStates">
445   - <list>
446   - <serviceView>
447   - <treeState>
448   - <expand />
449   - <select />
450   - </treeState>
451   - </serviceView>
452   - </list>
453   - </option>
454   - </component>
455 147 <component name="SvnConfiguration">
456 148 <configuration />
457 149 </component>
... ... @@ -508,12 +200,23 @@
508 200 <option name="project" value="LOCAL" />
509 201 <updated>1594027428164</updated>
510 202 </task>
511   - <option name="localTasksCounter" value="6" />
  203 + <task id="LOCAL-00006" summary="差异单样式修改">
  204 + <created>1594890132247</created>
  205 + <option name="number" value="00006" />
  206 + <option name="presentableId" value="LOCAL-00006" />
  207 + <option name="project" value="LOCAL" />
  208 + <updated>1594890132247</updated>
  209 + </task>
  210 + <task id="LOCAL-00007" summary="差异单样式修改">
  211 + <created>1594890170064</created>
  212 + <option name="number" value="00007" />
  213 + <option name="presentableId" value="LOCAL-00007" />
  214 + <option name="project" value="LOCAL" />
  215 + <updated>1594890170064</updated>
  216 + </task>
  217 + <option name="localTasksCounter" value="8" />
512 218 <servers />
513 219 </component>
514   - <component name="TimeTrackingManager">
515   - <option name="totallyTimeSpent" value="162341000" />
516   - </component>
517 220 <component name="TodoView">
518 221 <todo-panel id="selected-file">
519 222 <is-autoscroll-to-source value="true" />
... ... @@ -523,45 +226,6 @@
523 226 <is-autoscroll-to-source value="true" />
524 227 </todo-panel>
525 228 </component>
526   - <component name="ToolWindowManager">
527   - <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
528   - <editor active="true" />
529   - <layout>
530   - <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49885583" visible="true" weight="0.25" />
531   - <window_info id="Structure" order="1" sideWeight="0.5011442" side_tool="true" weight="0.27680966" />
532   - <window_info id="Designer" order="2" />
533   - <window_info id="Image Layers" order="3" />
534   - <window_info id="UI Designer" order="4" />
535   - <window_info id="Favorites" order="5" side_tool="true" />
536   - <window_info id="Capture Tool" order="6" />
537   - <window_info id="Web" order="7" side_tool="true" />
538   - <window_info anchor="bottom" id="Message" order="0" />
539   - <window_info anchor="bottom" id="Find" order="1" weight="0.32952926" />
540   - <window_info anchor="bottom" id="Run" order="2" sideWeight="0.49932975" weight="0.38937092" />
541   - <window_info anchor="bottom" id="Debug" order="3" weight="0.37635574" />
542   - <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
543   - <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
544   - <window_info anchor="bottom" id="TODO" order="6" weight="0.32952926" />
545   - <window_info anchor="bottom" id="Spring" order="7" weight="0.32952926" />
546   - <window_info anchor="bottom" id="Terminal" order="8" weight="0.32952926" />
547   - <window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.50067025" side_tool="true" weight="0.4807418" />
548   - <window_info anchor="bottom" id="Statistic" order="10" />
549   - <window_info anchor="bottom" id="Java Enterprise" order="11" weight="0.32952926" />
550   - <window_info anchor="bottom" id="Database Changes" order="12" />
551   - <window_info active="true" anchor="bottom" id="Version Control" order="13" visible="true" weight="0.23318872" />
552   - <window_info anchor="bottom" id="Messages" order="14" sideWeight="0.49865952" weight="0.32952926" />
553   - <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
554   - <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
555   - <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
556   - <window_info anchor="right" id="Palette" order="3" />
557   - <window_info anchor="right" id="Palette&#9;" order="4" />
558   - <window_info anchor="right" id="Capture Analysis" order="5" />
559   - <window_info anchor="right" id="Database" order="6" weight="0.3297587" />
560   - <window_info anchor="right" id="Bean Validation" order="7" weight="0.3297587" />
561   - <window_info anchor="right" id="Theme Preview" order="8" />
562   - <window_info anchor="right" id="Maven Projects" order="9" weight="0.3297587" />
563   - </layout>
564   - </component>
565 229 <component name="TypeScriptGeneratedFilesManager">
566 230 <option name="version" value="1" />
567 231 </component>
... ... @@ -570,22 +234,7 @@
570 234 <map>
571 235 <entry key="MAIN">
572 236 <value>
573   - <State>
574   - <option name="RECENTLY_FILTERED_USER_GROUPS">
575   - <collection />
576   - </option>
577   - <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
578   - <collection />
579   - </option>
580   - <option name="COLUMN_ORDER">
581   - <list>
582   - <option value="0" />
583   - <option value="1" />
584   - <option value="2" />
585   - <option value="3" />
586   - </list>
587   - </option>
588   - </State>
  237 + <State />
589 238 </value>
590 239 </entry>
591 240 </map>
... ... @@ -604,66 +253,78 @@
604 253 </entry>
605 254 </map>
606 255 </option>
  256 + <option name="oldMeFiltersMigrated" value="true" />
607 257 </component>
608 258 <component name="VcsManagerConfiguration">
609 259 <MESSAGE value="添加库位、库位类型增删改查接口" />
610 260 <MESSAGE value="添加入库、出库表实体类&#10;添加客户、供应商增删改查接口&#10;添加库位、容器、供应商页面" />
611 261 <MESSAGE value="修改库区service" />
612 262 <MESSAGE value="增加右上角消息提示，修改配置-入库配置搜索，做成折叠样式..." />
613   - <option name="LAST_COMMIT_MESSAGE" value="增加右上角消息提示，修改配置-入库配置搜索，做成折叠样式..." />
  263 + <MESSAGE value="差异单样式修改" />
  264 + <option name="LAST_COMMIT_MESSAGE" value="差异单样式修改" />
614 265 </component>
615 266 <component name="WindowStateProjectService">
616   - <state x="414" y="175" key="#com.intellij.execution.impl.EditConfigurationsDialog" />
617   - <state x="414" y="175" key="#com.intellij.execution.impl.EditConfigurationsDialog/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" />
618   - <state x="690" y="266" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog" />
619   - <state x="690" y="266" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" />
620   - <state x="550" y="111" key="CommitChangelistDialog2" />
621   - <state x="550" y="111" key="CommitChangelistDialog2/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" />
622   - <state x="550" y="111" key="CommitChangelistDialog2/0.0.1920.1040@0.0.1920.1040" />
623   - <state x="184" y="92" key="DiffContextDialog" />
624   - <state x="184" y="92" key="DiffContextDialog/0.0.1920.1040@0.0.1920.1040" />
625   - <state width="1877" height="232" key="GridCell.Tab.0.bottom" />
626   - <state width="1877" height="232" key="GridCell.Tab.0.bottom/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" />
627   - <state width="1877" height="232" key="GridCell.Tab.0.center" />
628   - <state width="1877" height="232" key="GridCell.Tab.0.center/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" />
629   - <state width="1877" height="232" key="GridCell.Tab.0.left" />
630   - <state width="1877" height="232" key="GridCell.Tab.0.left/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" />
631   - <state width="1877" height="232" key="GridCell.Tab.0.right" />
632   - <state width="1877" height="232" key="GridCell.Tab.0.right/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" />
633   - <state width="1877" height="232" key="GridCell.Tab.1.bottom" />
634   - <state width="1877" height="232" key="GridCell.Tab.1.bottom/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" />
635   - <state width="1877" height="232" key="GridCell.Tab.1.center" />
636   - <state width="1877" height="232" key="GridCell.Tab.1.center/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" />
637   - <state width="1877" height="232" key="GridCell.Tab.1.left" />
638   - <state width="1877" height="232" key="GridCell.Tab.1.left/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" />
639   - <state width="1877" height="232" key="GridCell.Tab.1.right" />
640   - <state width="1877" height="232" key="GridCell.Tab.1.right/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" />
641   - <state width="1877" height="232" key="GridCell.Tab.2.bottom" />
642   - <state width="1877" height="232" key="GridCell.Tab.2.bottom/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" />
643   - <state width="1877" height="232" key="GridCell.Tab.2.center" />
644   - <state width="1877" height="232" key="GridCell.Tab.2.center/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" />
645   - <state width="1877" height="232" key="GridCell.Tab.2.left" />
646   - <state width="1877" height="232" key="GridCell.Tab.2.left/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" />
647   - <state width="1877" height="232" key="GridCell.Tab.2.right" />
648   - <state width="1877" height="232" key="GridCell.Tab.2.right/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" />
649   - <state x="552" y="253" key="Vcs.Push.Dialog.v2" />
650   - <state x="552" y="253" key="Vcs.Push.Dialog.v2/0.0.1920.1040@0.0.1920.1040" />
651   - <state x="742" y="437" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" />
652   - <state x="742" y="437" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" />
653   - <state x="709" y="231" key="git4idea.branch.GitSmartOperationDialog" />
654   - <state x="709" y="231" key="git4idea.branch.GitSmartOperationDialog/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" />
655   - <state x="647" y="310" key="git4idea.merge.GitPullDialog" />
656   - <state x="647" y="310" key="git4idea.merge.GitPullDialog/0.0.1920.1040@0.0.1920.1040" />
657   - <state x="623" y="225" width="672" height="678" key="search.everywhere.popup" />
658   - <state x="623" y="225" width="672" height="678" key="search.everywhere.popup/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" />
  267 + <state x="414" y="175" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1594890018298" />
  268 + <state x="414" y="175" key="#com.intellij.execution.impl.EditConfigurationsDialog/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1594890018298" />
  269 + <state x="690" y="266" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog" timestamp="1594890018298" />
  270 + <state x="690" y="266" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1594890018298" />
  271 + <state x="550" y="111" key="CommitChangelistDialog2" timestamp="1594890018298" />
  272 + <state x="550" y="111" key="CommitChangelistDialog2/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1594890018298" />
  273 + <state x="550" y="111" key="CommitChangelistDialog2/0.0.1920.1040@0.0.1920.1040" timestamp="1594890018298" />
  274 + <state x="184" y="92" key="DiffContextDialog" timestamp="1594890018298" />
  275 + <state x="184" y="92" key="DiffContextDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1594890018298" />
  276 + <state width="1877" height="232" key="GridCell.Tab.0.bottom" timestamp="1594890018298" />
  277 + <state width="1877" height="232" key="GridCell.Tab.0.bottom/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1594890018298" />
  278 + <state width="1877" height="232" key="GridCell.Tab.0.center" timestamp="1594890018298" />
  279 + <state width="1877" height="232" key="GridCell.Tab.0.center/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1594890018298" />
  280 + <state width="1877" height="232" key="GridCell.Tab.0.left" timestamp="1594890018298" />
  281 + <state width="1877" height="232" key="GridCell.Tab.0.left/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1594890018298" />
  282 + <state width="1877" height="232" key="GridCell.Tab.0.right" timestamp="1594890018298" />
  283 + <state width="1877" height="232" key="GridCell.Tab.0.right/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1594890018298" />
  284 + <state width="1877" height="232" key="GridCell.Tab.1.bottom" timestamp="1594890018298" />
  285 + <state width="1877" height="232" key="GridCell.Tab.1.bottom/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1594890018298" />
  286 + <state width="1877" height="232" key="GridCell.Tab.1.center" timestamp="1594890018298" />
  287 + <state width="1877" height="232" key="GridCell.Tab.1.center/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1594890018298" />
  288 + <state width="1877" height="232" key="GridCell.Tab.1.left" timestamp="1594890018298" />
  289 + <state width="1877" height="232" key="GridCell.Tab.1.left/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1594890018298" />
  290 + <state width="1877" height="232" key="GridCell.Tab.1.right" timestamp="1594890018298" />
  291 + <state width="1877" height="232" key="GridCell.Tab.1.right/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1594890018298" />
  292 + <state width="1877" height="232" key="GridCell.Tab.2.bottom" timestamp="1594890018298" />
  293 + <state width="1877" height="232" key="GridCell.Tab.2.bottom/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1594890018298" />
  294 + <state width="1877" height="232" key="GridCell.Tab.2.center" timestamp="1594890018298" />
  295 + <state width="1877" height="232" key="GridCell.Tab.2.center/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1594890018298" />
  296 + <state width="1877" height="232" key="GridCell.Tab.2.left" timestamp="1594890018298" />
  297 + <state width="1877" height="232" key="GridCell.Tab.2.left/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1594890018298" />
  298 + <state width="1877" height="232" key="GridCell.Tab.2.right" timestamp="1594890018298" />
  299 + <state width="1877" height="232" key="GridCell.Tab.2.right/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1594890018298" />
  300 + <state x="696" y="221" key="RollbackChangesDialog" timestamp="1594890072970">
  301 + <screen x="0" y="0" width="1920" height="1040" />
  302 + </state>
  303 + <state x="696" y="221" key="RollbackChangesDialog/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1594890072970" />
  304 + <state x="461" y="164" key="SettingsEditor" timestamp="1594946753286">
  305 + <screen x="0" y="0" width="1920" height="1040" />
  306 + </state>
  307 + <state x="461" y="164" key="SettingsEditor/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1594946753286" />
  308 + <state x="552" y="253" key="Vcs.Push.Dialog.v2" timestamp="1594946725336">
  309 + <screen x="0" y="0" width="1920" height="1040" />
  310 + </state>
  311 + <state x="552" y="253" key="Vcs.Push.Dialog.v2/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1594946725336" />
  312 + <state x="552" y="253" key="Vcs.Push.Dialog.v2/0.0.1920.1040@0.0.1920.1040" timestamp="1594890018298" />
  313 + <state x="742" y="437" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1594890018298" />
  314 + <state x="742" y="437" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1594890018298" />
  315 + <state x="709" y="231" key="git4idea.branch.GitSmartOperationDialog" timestamp="1594890018298" />
  316 + <state x="709" y="231" key="git4idea.branch.GitSmartOperationDialog/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1594890018298" />
  317 + <state x="647" y="310" key="git4idea.merge.GitPullDialog" timestamp="1594890018298" />
  318 + <state x="647" y="310" key="git4idea.merge.GitPullDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1594890018298" />
  319 + <state x="623" y="225" width="672" height="678" key="search.everywhere.popup" timestamp="1594890018298" />
  320 + <state x="623" y="225" width="672" height="678" key="search.everywhere.popup/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1594890018298" />
659 321 </component>
660 322 <component name="XDebuggerManager">
661 323 <breakpoint-manager>
662 324 <breakpoints>
663 325 <line-breakpoint enabled="true" type="java-line">
664 326 <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java</url>
665   - <line>462</line>
666   - <properties />
  327 + <line>459</line>
667 328 <option name="timeStamp" value="41" />
668 329 </line-breakpoint>
669 330 </breakpoints>
... ... @@ -673,375 +334,4 @@
673 334 <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
674 335 <option name="FILTER_TARGETS" value="false" />
675 336 </component>
676   - <component name="editorHistoryManager">
677   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/mobile/invenory/MobileInventory.java">
678   - <provider selected="true" editor-type-id="text-editor">
679   - <state relative-caret-position="133">
680   - <caret line="9" column="19" selection-start-line="9" selection-start-column="19" selection-end-line="9" selection-end-column="19" />
681   - </state>
682   - </provider>
683   - </entry>
684   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/domain/ShipmentDomain.java">
685   - <provider selected="true" editor-type-id="text-editor">
686   - <state relative-caret-position="76">
687   - <caret line="8" selection-start-line="8" selection-end-line="8" selection-end-column="5" />
688   - </state>
689   - </provider>
690   - </entry>
691   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/domain/InventoryDetail.java">
692   - <provider selected="true" editor-type-id="text-editor">
693   - <state relative-caret-position="266">
694   - <caret line="23" selection-start-line="23" selection-end-line="23" />
695   - </state>
696   - </provider>
697   - </entry>
698   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/mobile/invenory/InventoryDomain.java">
699   - <provider selected="true" editor-type-id="text-editor">
700   - <state relative-caret-position="133">
701   - <caret line="10" column="51" selection-start-line="10" selection-start-column="51" selection-end-line="10" selection-end-column="51" />
702   - <folding>
703   - <element signature="imports" expanded="true" />
704   - </folding>
705   - </state>
706   - </provider>
707   - </entry>
708   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/mobile/task/TodayInfo.java">
709   - <provider selected="true" editor-type-id="text-editor">
710   - <state relative-caret-position="38">
711   - <caret line="2" column="22" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="22" />
712   - <folding>
713   - <element signature="e#197#198#0" expanded="true" />
714   - <element signature="e#230#231#0" expanded="true" />
715   - <element signature="e#283#284#0" expanded="true" />
716   - <element signature="e#327#328#0" expanded="true" />
717   - <element signature="e#367#368#0" expanded="true" />
718   - <element signature="e#402#403#0" expanded="true" />
719   - <element signature="e#459#460#0" expanded="true" />
720   - <element signature="e#507#508#0" expanded="true" />
721   - <element signature="e#548#549#0" expanded="true" />
722   - <element signature="e#584#585#0" expanded="true" />
723   - <element signature="e#643#644#0" expanded="true" />
724   - <element signature="e#693#694#0" expanded="true" />
725   - </folding>
726   - </state>
727   - </provider>
728   - </entry>
729   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html">
730   - <provider selected="true" editor-type-id="text-editor">
731   - <state relative-caret-position="112">
732   - <caret line="111" column="48" selection-start-line="111" selection-start-column="29" selection-end-line="111" selection-end-column="48" />
733   - </state>
734   - </provider>
735   - </entry>
736   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java">
737   - <provider selected="true" editor-type-id="text-editor">
738   - <state relative-caret-position="-2">
739   - <caret line="66" column="18" selection-start-line="66" selection-start-column="18" selection-end-line="66" selection-end-column="18" />
740   - </state>
741   - </provider>
742   - </entry>
743   - <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
744   - <provider selected="true" editor-type-id="text-editor">
745   - <state relative-caret-position="197">
746   - <caret line="29" column="22" lean-forward="true" selection-start-line="29" selection-start-column="22" selection-end-line="29" selection-end-column="22" />
747   - </state>
748   - </provider>
749   - </entry>
750   - <entry file="file://$PROJECT_DIR$/src/main/resources/application-dev.yml">
751   - <provider selected="true" editor-type-id="text-editor" />
752   - </entry>
753   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/framework/config/ShiroConfig.java">
754   - <provider selected="true" editor-type-id="text-editor">
755   - <state relative-caret-position="327">
756   - <caret line="264" column="19" lean-forward="true" selection-start-line="264" selection-start-column="19" selection-end-line="264" selection-end-column="19" />
757   - </state>
758   - </provider>
759   - </entry>
760   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/receipt/receiptDetail/add.html">
761   - <provider selected="true" editor-type-id="text-editor">
762   - <state relative-caret-position="152">
763   - <caret line="134" column="32" lean-forward="true" selection-start-line="134" selection-start-column="32" selection-end-line="134" selection-end-column="32" />
764   - <folding>
765   - <element signature="n#style#0;n#button#0;n#div#0;n#div#14;n#form#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
766   - <element signature="n#style#0;n#button#1;n#div#0;n#div#14;n#form#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
767   - </folding>
768   - </state>
769   - </provider>
770   - </entry>
771   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/add.html">
772   - <provider selected="true" editor-type-id="text-editor">
773   - <state relative-caret-position="114">
774   - <caret line="6" column="68" lean-forward="true" selection-start-line="6" selection-start-column="68" selection-end-line="6" selection-end-column="68" />
775   - <folding>
776   - <element signature="n#style#0;n#button#0;n#div#0;n#div#5;n#form#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
777   - <element signature="n#style#0;n#button#1;n#div#0;n#div#5;n#form#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
778   - </folding>
779   - </state>
780   - </provider>
781   - </entry>
782   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/edit.html">
783   - <provider selected="true" editor-type-id="text-editor">
784   - <state relative-caret-position="118">
785   - <caret line="31" column="32" lean-forward="true" selection-start-line="31" selection-start-column="32" selection-end-line="31" selection-end-column="32" />
786   - </state>
787   - </provider>
788   - </entry>
789   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiving/service/ReceivingService.java">
790   - <provider selected="true" editor-type-id="text-editor">
791   - <state relative-caret-position="353">
792   - <caret line="90" column="9" lean-forward="true" selection-start-line="90" selection-start-column="9" selection-end-line="90" selection-end-column="9" />
793   - </state>
794   - </provider>
795   - </entry>
796   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/mapper/TaskHeaderMapper.java">
797   - <provider selected="true" editor-type-id="text-editor">
798   - <state relative-caret-position="76">
799   - <caret line="9" column="66" lean-forward="true" selection-start-line="9" selection-start-column="66" selection-end-line="9" selection-end-column="66" />
800   - </state>
801   - </provider>
802   - </entry>
803   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java">
804   - <provider selected="true" editor-type-id="text-editor">
805   - <state relative-caret-position="106">
806   - <caret line="90" column="55" lean-forward="true" selection-start-line="90" selection-start-column="55" selection-end-line="90" selection-end-column="55" />
807   - </state>
808   - </provider>
809   - </entry>
810   - <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.1.2/mybatis-plus-extension-3.1.2-sources.jar!/com/baomidou/mybatisplus/extension/service/IService.java" />
811   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java">
812   - <provider selected="true" editor-type-id="text-editor">
813   - <state relative-caret-position="216">
814   - <caret line="162" column="33" selection-start-line="162" selection-start-column="33" selection-end-line="162" selection-end-column="33" />
815   - </state>
816   - </provider>
817   - </entry>
818   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java">
819   - <provider selected="true" editor-type-id="text-editor">
820   - <state relative-caret-position="339">
821   - <caret line="651" column="39" lean-forward="true" selection-start-line="651" selection-start-column="39" selection-end-line="651" selection-end-column="39" />
822   - </state>
823   - </provider>
824   - </entry>
825   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/controller/OverrideHandle.java">
826   - <provider selected="true" editor-type-id="text-editor">
827   - <state relative-caret-position="348">
828   - <caret line="33" column="44" lean-forward="true" selection-start-line="33" selection-start-column="44" selection-end-line="33" selection-end-column="44" />
829   - </state>
830   - </provider>
831   - </entry>
832   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/overrideHandle/OverrideHandleService.java">
833   - <provider selected="true" editor-type-id="text-editor">
834   - <state relative-caret-position="133">
835   - <caret line="9" column="15" selection-start-line="9" selection-start-column="15" selection-end-line="9" selection-end-column="15" />
836   - </state>
837   - </provider>
838   - </entry>
839   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/controller/EmptyOutHandle.java">
840   - <provider selected="true" editor-type-id="text-editor">
841   - <state relative-caret-position="224">
842   - <caret line="35" column="59" lean-forward="true" selection-start-line="35" selection-start-column="59" selection-end-line="35" selection-end-column="59" />
843   - </state>
844   - </provider>
845   - </entry>
846   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/emptyOutHandle/EmptyOutHandleService.java">
847   - <provider selected="true" editor-type-id="text-editor">
848   - <state relative-caret-position="114">
849   - <caret line="7" selection-start-line="7" selection-end-line="7" />
850   - </state>
851   - </provider>
852   - </entry>
853   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/emptyOutHandle/EmptyOutHandleServiceImpl.java">
854   - <provider selected="true" editor-type-id="text-editor">
855   - <state relative-caret-position="302">
856   - <caret line="51" column="5" lean-forward="true" selection-start-line="51" selection-start-column="5" selection-end-line="51" selection-end-column="5" />
857   - </state>
858   - </provider>
859   - </entry>
860   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/taskFinish/TaskFinishService.java">
861   - <provider selected="true" editor-type-id="text-editor">
862   - <state relative-caret-position="133">
863   - <caret line="8" column="15" selection-start-line="8" selection-start-column="15" selection-end-line="8" selection-end-column="15" />
864   - </state>
865   - </provider>
866   - </entry>
867   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/taskFinish/TaskFinishServiceImpl.java">
868   - <provider selected="true" editor-type-id="text-editor">
869   - <state relative-caret-position="-70">
870   - <caret line="27" column="22" selection-start-line="27" selection-start-column="22" selection-end-line="27" selection-end-column="22" />
871   - </state>
872   - </provider>
873   - </entry>
874   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/controller/TaskFinish.java">
875   - <provider selected="true" editor-type-id="text-editor">
876   - <state relative-caret-position="367">
877   - <caret line="35" column="56" selection-start-line="35" selection-start-column="56" selection-end-line="35" selection-end-column="56" />
878   - </state>
879   - </provider>
880   - </entry>
881   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/controller/TaskInfoController.java">
882   - <provider selected="true" editor-type-id="text-editor">
883   - <state relative-caret-position="167">
884   - <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
885   - </state>
886   - </provider>
887   - </entry>
888   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/controller/WarecellAllocation.java">
889   - <provider selected="true" editor-type-id="text-editor">
890   - <state relative-caret-position="424">
891   - <caret line="56" column="50" lean-forward="true" selection-start-line="56" selection-start-column="50" selection-end-line="56" selection-end-column="50" />
892   - </state>
893   - </provider>
894   - </entry>
895   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/warecellAllocation/WarecellAllocationService.java">
896   - <provider selected="true" editor-type-id="text-editor">
897   - <state relative-caret-position="228">
898   - <caret line="14" column="15" selection-start-line="14" selection-start-column="15" selection-end-line="14" selection-end-column="15" />
899   - </state>
900   - </provider>
901   - </entry>
902   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/warecellAllocation/WarecellAllocationServiceImpl.java">
903   - <provider selected="true" editor-type-id="text-editor">
904   - <state relative-caret-position="197">
905   - <caret line="309" column="39" selection-start-line="309" selection-start-column="39" selection-end-line="309" selection-end-column="39" />
906   - </state>
907   - </provider>
908   - </entry>
909   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/overrideHandle/OverrideHandleServiceImpl.java">
910   - <provider selected="true" editor-type-id="text-editor">
911   - <state relative-caret-position="330">
912   - <caret line="140" column="9" lean-forward="true" selection-start-line="140" selection-start-column="9" selection-end-line="140" selection-end-column="9" />
913   - </state>
914   - </provider>
915   - </entry>
916   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/controller/WcsLoginController.java">
917   - <provider selected="true" editor-type-id="text-editor">
918   - <state relative-caret-position="116">
919   - <caret line="30" column="53" selection-start-line="30" selection-start-column="53" selection-end-line="30" selection-end-column="53" />
920   - </state>
921   - </provider>
922   - </entry>
923   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/acs/controller/TaskConfirm.java">
924   - <provider selected="true" editor-type-id="text-editor">
925   - <state relative-caret-position="186">
926   - <caret line="20" column="34" lean-forward="true" selection-start-line="20" selection-start-column="34" selection-end-line="20" selection-end-column="34" />
927   - </state>
928   - </provider>
929   - </entry>
930   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/domain/ReceiptDomain.java">
931   - <provider selected="true" editor-type-id="text-editor">
932   - <state relative-caret-position="95">
933   - <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
934   - </state>
935   - </provider>
936   - </entry>
937   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/controller/ReceiptApi.java">
938   - <provider selected="true" editor-type-id="text-editor">
939   - <state relative-caret-position="230">
940   - <caret line="35" column="53" lean-forward="true" selection-start-line="35" selection-start-column="53" selection-end-line="35" selection-end-column="53" />
941   - </state>
942   - </provider>
943   - </entry>
944   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/service/ReceiptApiService.java">
945   - <provider selected="true" editor-type-id="text-editor">
946   - <state relative-caret-position="243">
947   - <caret line="71" column="66" selection-start-line="71" selection-start-column="66" selection-end-line="71" selection-end-column="66" />
948   - </state>
949   - </provider>
950   - </entry>
951   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/mobile/invenory/MobileInventoryController.java">
952   - <provider selected="true" editor-type-id="text-editor">
953   - <state relative-caret-position="269">
954   - <caret line="464" column="5" selection-start-line="441" selection-start-column="3" selection-end-line="464" selection-end-column="5" />
955   - </state>
956   - </provider>
957   - </entry>
958   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/mobile/receipt/MobileBatchReceiptController.java">
959   - <provider selected="true" editor-type-id="text-editor">
960   - <state relative-caret-position="164">
961   - <caret line="532" column="4" selection-start-line="532" selection-start-column="4" selection-end-line="553" selection-end-column="5" />
962   - </state>
963   - </provider>
964   - </entry>
965   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/mobile/shipment/MobileShipmentController.java">
966   - <provider selected="true" editor-type-id="text-editor">
967   - <state relative-caret-position="230">
968   - <caret line="209" column="5" selection-start-line="188" selection-start-column="4" selection-end-line="209" selection-end-column="5" />
969   - </state>
970   - </provider>
971   - </entry>
972   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/mobile/task/MobileTaskController.java">
973   - <provider selected="true" editor-type-id="text-editor">
974   - <state relative-caret-position="211">
975   - <caret line="74" column="43" selection-start-line="74" selection-start-column="22" selection-end-line="74" selection-end-column="43" />
976   - <folding>
977   - <element signature="imports" expanded="true" />
978   - </folding>
979   - </state>
980   - </provider>
981   - </entry>
982   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/main.html">
983   - <provider selected="true" editor-type-id="text-editor" />
984   - </entry>
985   - <entry file="file://$PROJECT_DIR$/src/main/resources/static/css/bootstrap.min.css">
986   - <provider selected="true" editor-type-id="text-editor">
987   - <state relative-caret-position="165">
988   - <caret line="3545" selection-start-line="3545" selection-end-line="3545" />
989   - </state>
990   - </provider>
991   - </entry>
992   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/receiptPreference/add.html">
993   - <provider selected="true" editor-type-id="text-editor" />
994   - </entry>
995   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/receiptPreference/receiptPreference.html">
996   - <provider selected="true" editor-type-id="text-editor">
997   - <state relative-caret-position="-5608" />
998   - </provider>
999   - </entry>
1000   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/index.html">
1001   - <provider selected="true" editor-type-id="text-editor">
1002   - <state relative-caret-position="528">
1003   - <caret line="99" column="65" selection-start-line="99" selection-start-column="65" selection-end-line="99" selection-end-column="65" />
1004   - </state>
1005   - </provider>
1006   - </entry>
1007   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/shipment/shipmentDetail/report.html">
1008   - <provider selected="true" editor-type-id="text-editor">
1009   - <state relative-caret-position="148">
1010   - <caret line="89" column="36" selection-start-line="89" selection-start-column="36" selection-end-line="89" selection-end-column="68" />
1011   - </state>
1012   - </provider>
1013   - </entry>
1014   - <entry file="file://$PROJECT_DIR$/src/main/resources/static/css/style.css">
1015   - <provider selected="true" editor-type-id="text-editor">
1016   - <state relative-caret-position="165">
1017   - <caret line="7436" column="43" selection-start-line="7436" selection-start-column="39" selection-end-line="7436" selection-end-column="43" />
1018   - </state>
1019   - </provider>
1020   - </entry>
1021   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/receiptPreference/list.html">
1022   - <provider selected="true" editor-type-id="text-editor">
1023   - <state relative-caret-position="-704">
1024   - <caret line="88" column="57" selection-start-line="88" selection-start-column="57" selection-end-line="88" selection-end-column="57" />
1025   - <folding>
1026   - <element signature="n#style#0;n#p#0;n#ul#0;n#div#0;n#div#0;n#form#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
1027   - <element signature="e#2763#8715#0" />
1028   - </folding>
1029   - </state>
1030   - </provider>
1031   - </entry>
1032   - <entry file="file://$PROJECT_DIR$/target/classes/static/css/style.css">
1033   - <provider selected="true" editor-type-id="text-editor">
1034   - <state relative-caret-position="258">
1035   - <caret line="7415" column="9" lean-forward="true" selection-start-line="7415" selection-start-column="9" selection-end-line="7415" selection-end-column="9" />
1036   - </state>
1037   - </provider>
1038   - </entry>
1039   - <entry file="file://$PROJECT_DIR$/src/main/resources/static/huaheng/css/huahengUI.css">
1040   - <provider selected="true" editor-type-id="text-editor">
1041   - <state relative-caret-position="262">
1042   - <caret line="636" column="18" selection-start-line="636" selection-start-column="18" selection-end-line="636" selection-end-column="18" />
1043   - </state>
1044   - </provider>
1045   - </entry>
1046   - </component>
1047 337 </project>
1048 338 \ No newline at end of file
... ...
src/main/resources/templates/inventory/cyclecountHeader/cyclecountHeader.html
  View file @b74f761
... ... @@ -2,14 +2,6 @@
2 2 <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
3 3 <meta charset="utf-8">
4 4 <head th:include="include :: header"></head>
5   -<style>
6   - #toolbar1 {
7   - display: inline-block;
8   - /*position: absolute;
9   - margin: 10px auto;*/
10   - line-height: 34px;
11   - }
12   -</style>
13 5 <body class="gray-bg">
14 6 <div class="container-div">
15 7 <div class="row">
... ... @@ -109,10 +101,6 @@
109 101 sortName: "created",
110 102 sortOrder: "desc",
111 103 search: false,
112   -
113   - // onDblClickRow: function (row) {
114   - // showDetail(row.id,row.code);
115   - // },
116 104 onDblClickRow:function(row){
117 105 detail(row.id,row.masterCode);
118 106 },
... ...