wms / wms_beijingtianshenghua · Commits

Commit 542f1efbda2eff388457159b4b69ee9a069571d9

Authored by mahuandong
1 parent b407fa6a

修复入库历史controller冲突

Inline Side-by-side
Showing 5 changed files with 74 additions and 699 deletions
.idea/MyBatisCodeHelperDatasource.xml
  View file @542f1ef
... ... @@ -5,9 +5,9 @@
5 5 <ProjectProfile>
6 6 <option name="addSerializeUid" value="true" />
7 7 <option name="generateService" value="true" />
8   - <option name="javaMapperPackage" value="com.huaheng.pc.inventory.adjust.mapper" />
  8 + <option name="javaMapperPackage" value="com.huaheng.pc.config.materialType.mapper" />
9 9 <option name="javaMapperPath" value="$PROJECT_DIR$/src/main/java" />
10   - <option name="javaModelPackage" value="com.huaheng.pc.inventory.adjust.domain" />
  10 + <option name="javaModelPackage" value="com.huaheng.pc.config.materialType.domain" />
11 11 <option name="javaModelPath" value="$PROJECT_DIR$/src/main/java" />
12 12 <option name="lastDatabaseCrudChooseModuleName" value="huaheng" />
13 13 <option name="moduleNameToPackageAndPathMap">
... ... @@ -29,13 +29,13 @@
29 29 <entry key="huaheng">
30 30 <value>
31 31 <UserPackageAndPathInfoByModule>
32   - <option name="javaMapperPackage" value="com.huaheng.pc.inventory.adjust.mapper" />
  32 + <option name="javaMapperPackage" value="com.huaheng.pc.config.materialType.mapper" />
33 33 <option name="javaMapperPath" value="$PROJECT_DIR$/src/main/java" />
34   - <option name="javaModelPacakge" value="com.huaheng.pc.inventory.adjust.domain" />
  34 + <option name="javaModelPacakge" value="com.huaheng.pc.config.materialType.domain" />
35 35 <option name="javaModelPath" value="$PROJECT_DIR$/src/main/java" />
36   - <option name="javaServicePackage" value="com.huaheng.pc.inventory.adjust.service" />
  36 + <option name="javaServicePackage" value="com.huaheng.pc.config.materialType.service" />
37 37 <option name="javaServicePath" value="$PROJECT_DIR$/src/main/java" />
38   - <option name="xmlPackage" value="inventory" />
  38 + <option name="xmlPackage" value="config" />
39 39 <option name="xmlPath" value="E:\code\wms2\src\main\resources\mybatis" />
40 40 </UserPackageAndPathInfoByModule>
41 41 </value>
... ... @@ -265,6 +265,16 @@
265 265 </TableGenerateConfig>
266 266 </value>
267 267 </entry>
  268 + <entry key="wms_v2:material_type">
  269 + <value>
  270 + <TableGenerateConfig>
  271 + <option name="generatedKey" value="id" />
  272 + <option name="javaModelName" value="MaterialType" />
  273 + <option name="moduleName" value="huaheng" />
  274 + <option name="useActualColumnName" value="true" />
  275 + </TableGenerateConfig>
  276 + </value>
  277 + </entry>
268 278 <entry key="wms_v2:material_unit">
269 279 <value>
270 280 <TableGenerateConfig>
... ... @@ -551,7 +561,7 @@
551 561 <option name="useLomBokOnModel" value="true" />
552 562 <option name="useSwagger" value="true" />
553 563 <option name="userMybatisPlus" value="true" />
554   - <option name="xmlMapperPackage" value="inventory" />
  564 + <option name="xmlMapperPackage" value="config" />
555 565 <option name="xmlMapperPath" value="E:\code\wms2\src\main\resources\mybatis" />
556 566 </ProjectProfile>
557 567 </option>
... ...
.idea/compiler.xml
  View file @542f1ef
... ... @@ -6,8 +6,8 @@
6 6 <sourceOutputDir name="target/generated-sources/annotations" />
7 7 <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
8 8 <outputRelativeToContentRoot value="true" />
9   - <module name="huaheng" />
10 9 <module name="wms2" />
  10 + <module name="huaheng" />
11 11 </profile>
12 12 </annotationProcessing>
13 13 </component>
... ...
.idea/workspace.xml
  View file @542f1ef
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <project version="4">
3 3 <component name="ChangeListManager">
4   - <list default="true" id="29079676-ace5-434e-89a2-76a325e744a5" name="Default Changelist" comment="盘点">
  4 + <list default="true" id="908d8a6f-e3e4-4fdc-b674-e523a3e2b520" name="Default Changelist" comment="">
  5 + <change beforePath="$PROJECT_DIR$/.idea/MyBatisCodeHelperDatasource.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/MyBatisCodeHelperDatasource.xml" afterDir="false" />
5 6 <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
6 7 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
7   - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java" afterDir="false" />
8   - <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" />
  8 + <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" />
  9 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetailHistory/controller/ReceiptDetailHistoryController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetailHistory/controller/ReceiptDetailHistoryController.java" afterDir="false" />
9 10 </list>
10   - <ignored path="$PROJECT_DIR$/target/" />
11 11 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
12 12 <option name="SHOW_DIALOG" value="false" />
13 13 <option name="HIGHLIGHT_CONFLICTS" value="true" />
... ... @@ -46,69 +46,25 @@
46 46 <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
47 47 <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
48 48 <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" />
49   - <item name="location: table" type="285a2a93:MysqlImplModel$Table" />
  49 + <item name="receipt_detail: table" type="285a2a93:MysqlImplModel$Table" />
  50 + </path>
  51 + <path>
  52 + <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
  53 + <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
  54 + <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
  55 + <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" />
  56 + <item name="receipt_header: table" type="285a2a93:MysqlImplModel$Table" />
  57 + </path>
  58 + <path>
  59 + <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
  60 + <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
  61 + <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
  62 + <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" />
  63 + <item name="status_flow_detail: table" type="285a2a93:MysqlImplModel$Table" />
50 64 </path>
51 65 </expand>
52 66 <select />
53 67 </component>
54   - <component name="FileEditorManager">
55   - <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
56   - <file pinned="false" current-in-tab="false">
57   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java">
58   - <provider selected="true" editor-type-id="text-editor">
59   - <state relative-caret-position="1710">
60   - <caret line="117" column="46" selection-start-line="117" selection-start-column="46" selection-end-line="117" selection-end-column="46" />
61   - </state>
62   - </provider>
63   - </entry>
64   - </file>
65   - <file pinned="false" current-in-tab="false">
66   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java">
67   - <provider selected="true" editor-type-id="text-editor">
68   - <state relative-caret-position="209">
69   - <caret line="18" column="15" selection-start-line="18" selection-start-column="15" selection-end-line="18" selection-end-column="15" />
70   - </state>
71   - </provider>
72   - </entry>
73   - </file>
74   - <file pinned="false" current-in-tab="true">
75   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java">
76   - <provider selected="true" editor-type-id="text-editor">
77   - <state relative-caret-position="-1467">
78   - <caret line="313" column="68" lean-forward="true" selection-start-line="313" selection-start-column="68" selection-end-line="313" selection-end-column="68" />
79   - </state>
80   - </provider>
81   - </entry>
82   - </file>
83   - <file pinned="false" current-in-tab="false">
84   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/mapper/TaskHeaderMapper.java">
85   - <provider selected="true" editor-type-id="text-editor">
86   - <state relative-caret-position="114">
87   - <caret line="11" column="30" selection-start-line="11" selection-start-column="30" selection-end-line="11" selection-end-column="30" />
88   - </state>
89   - </provider>
90   - </entry>
91   - </file>
92   - <file pinned="false" current-in-tab="false">
93   - <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/task/TaskHeaderMapper.xml">
94   - <provider selected="true" editor-type-id="text-editor">
95   - <state relative-caret-position="257">
96   - <caret line="54" column="54" lean-forward="true" selection-start-line="54" selection-start-column="54" selection-end-line="54" selection-end-column="54" />
97   - </state>
98   - </provider>
99   - </entry>
100   - </file>
101   - <file pinned="false" current-in-tab="false">
102   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/taskHeader.html">
103   - <provider selected="true" editor-type-id="text-editor">
104   - <state relative-caret-position="8379">
105   - <caret line="441" column="68" selection-start-line="441" selection-start-column="68" selection-end-line="441" selection-end-column="68" />
106   - </state>
107   - </provider>
108   - </entry>
109   - </file>
110   - </leaf>
111   - </component>
112 68 <component name="FileTemplateManagerImpl">
113 69 <option name="RECENT_TEMPLATES">
114 70 <list>
... ... @@ -118,64 +74,6 @@
118 74 </component>
119 75 <component name="Git.Settings">
120 76 <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
121   - <option name="RECENT_BRANCH_BY_REPOSITORY">
122   - <map>
123   - <entry key="$PROJECT_DIR$" value="master" />
124   - </map>
125   - </option>
126   - <option name="RESET_MODE" value="HARD" />
127   - </component>
128   - <component name="IdeDocumentHistory">
129   - <option name="CHANGED_PATHS">
130   - <list>
131   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailService.java" />
132   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java" />
133   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java" />
134   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java" />
135   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/service/ShippingCombinationService.java" />
136   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/mapper/ShippingCombinationMapper.java" />
137   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/controller/WareHouseController.java" />
138   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/controller/ShippingCombinationController.java" />
139   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java" />
140   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/domain/InventoryDetail.java" />
141   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/monitor/logExecption/domain/LogExecption.java" />
142   - <option value="$PROJECT_DIR$/pom.xml" />
143   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/IndexController.java" />
144   - <option value="$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryHeaderMapper.xml" />
145   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/domain/InventoryHeader.java" />
146   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java" />
147   - <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html" />
148   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/HuaHengApplication.java" />
149   - <option value="$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/task.html" />
150   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskDetail/controller/TaskDetailController.java" />
151   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/controller/InventoryTransactionController.java" />
152   - <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html" />
153   - <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryTransaction/inventoryTransaction.html" />
154   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cyclecountHeader/mapper/CyclecountHeaderMapperAuto.java" />
155   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cyclecountDetail/mapper/CyclecountDetailMapper.java" />
156   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/mapper/CyclecountDetailMapperAuto.java" />
157   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/CycleCountDetailServiceImpl.java" />
158   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/service/CycleCountHeaderServiceImpl.java" />
159   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/controller/CycleCountHeaderController.java" />
160   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java" />
161   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/domain/CycleCountHeader.java" />
162   - <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html" />
163   - <option value="$PROJECT_DIR$/src/main/resources/templates/system/dict/data/data.html" />
164   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/dict/controller/DictDataController.java" />
165   - <option value="$PROJECT_DIR$/src/main/resources/templates/system/dict/data/add.html" />
166   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java" />
167   - <option value="$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/taskHeader.html" />
168   - <option value="$PROJECT_DIR$/src/main/resources/mybatis/task/TaskHeaderMapper.xml" />
169   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java" />
170   - </list>
171   - </option>
172   - </component>
173   - <component name="IgnoredFileRootStore">
174   - <option name="generatedRoots">
175   - <set>
176   - <option value="E:\code\wms2\.idea" />
177   - </set>
178   - </option>
179 77 </component>
180 78 <component name="MavenImportPreferences">
181 79 <option name="importingSettings">
... ... @@ -184,164 +82,13 @@
184 82 </MavenImportingSettings>
185 83 </option>
186 84 </component>
187   - <component name="MavenProjectNavigator">
188   - <treeState>
189   - <expand>
190   - <path>
191   - <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
192   - <item name="huaheng" type="9519ce18:MavenProjectsStructure$ProjectNode" />
193   - </path>
194   - </expand>
195   - <select />
196   - </treeState>
197   - </component>
198   - <component name="ProjectFrameBounds" extendedState="6">
199   - <option name="x" value="470" />
200   - <option name="width" value="980" />
201   - <option name="height" value="1030" />
202   - </component>
203   - <component name="ProjectId" id="1P5Ngjh73HToCarlEZkqMxrL7pm" />
  85 + <component name="ProjectId" id="1Q2nhRM7LRz3yFWhpclOKgTjxn0" />
204 86 <component name="ProjectLevelVcsManager">
205 87 <ConfirmationsSetting value="2" id="Add" />
206 88 </component>
207   - <component name="ProjectView">
208   - <navigator proportions="" version="1">
209   - <foldersAlwaysOnTop value="true" />
210   - </navigator>
211   - <panes>
212   - <pane id="ProjectPane">
213   - <subPane>
214   - <expand>
215   - <path>
216   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
217   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
218   - </path>
219   - <path>
220   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
221   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
222   - <item name="src" type="462c0819:PsiDirectoryNode" />
223   - </path>
224   - <path>
225   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
226   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
227   - <item name="src" type="462c0819:PsiDirectoryNode" />
228   - <item name="main" type="462c0819:PsiDirectoryNode" />
229   - </path>
230   - <path>
231   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
232   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
233   - <item name="src" type="462c0819:PsiDirectoryNode" />
234   - <item name="main" type="462c0819:PsiDirectoryNode" />
235   - <item name="java" type="462c0819:PsiDirectoryNode" />
236   - </path>
237   - <path>
238   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
239   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
240   - <item name="src" type="462c0819:PsiDirectoryNode" />
241   - <item name="main" type="462c0819:PsiDirectoryNode" />
242   - <item name="java" type="462c0819:PsiDirectoryNode" />
243   - <item name="com" type="462c0819:PsiDirectoryNode" />
244   - </path>
245   - <path>
246   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
247   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
248   - <item name="src" type="462c0819:PsiDirectoryNode" />
249   - <item name="main" type="462c0819:PsiDirectoryNode" />
250   - <item name="java" type="462c0819:PsiDirectoryNode" />
251   - <item name="com" type="462c0819:PsiDirectoryNode" />
252   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
253   - </path>
254   - <path>
255   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
256   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
257   - <item name="src" type="462c0819:PsiDirectoryNode" />
258   - <item name="main" type="462c0819:PsiDirectoryNode" />
259   - <item name="java" type="462c0819:PsiDirectoryNode" />
260   - <item name="com" type="462c0819:PsiDirectoryNode" />
261   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
262   - <item name="pc" type="462c0819:PsiDirectoryNode" />
263   - </path>
264   - <path>
265   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
266   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
267   - <item name="src" type="462c0819:PsiDirectoryNode" />
268   - <item name="main" type="462c0819:PsiDirectoryNode" />
269   - <item name="java" type="462c0819:PsiDirectoryNode" />
270   - <item name="com" type="462c0819:PsiDirectoryNode" />
271   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
272   - <item name="pc" type="462c0819:PsiDirectoryNode" />
273   - <item name="task" 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="task" type="462c0819:PsiDirectoryNode" />
285   - <item name="taskHeader" type="462c0819:PsiDirectoryNode" />
286   - </path>
287   - <path>
288   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
289   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
290   - <item name="src" type="462c0819:PsiDirectoryNode" />
291   - <item name="main" type="462c0819:PsiDirectoryNode" />
292   - <item name="java" type="462c0819:PsiDirectoryNode" />
293   - <item name="com" type="462c0819:PsiDirectoryNode" />
294   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
295   - <item name="pc" type="462c0819:PsiDirectoryNode" />
296   - <item name="task" type="462c0819:PsiDirectoryNode" />
297   - <item name="taskHeader" type="462c0819:PsiDirectoryNode" />
298   - <item name="controller" type="462c0819:PsiDirectoryNode" />
299   - </path>
300   - <path>
301   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
302   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
303   - <item name="src" type="462c0819:PsiDirectoryNode" />
304   - <item name="main" type="462c0819:PsiDirectoryNode" />
305   - <item name="resources" 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   - </path>
315   - <path>
316   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
317   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
318   - <item name="src" type="462c0819:PsiDirectoryNode" />
319   - <item name="main" type="462c0819:PsiDirectoryNode" />
320   - <item name="resources" type="462c0819:PsiDirectoryNode" />
321   - <item name="templates" type="462c0819:PsiDirectoryNode" />
322   - <item name="task" 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="resources" type="462c0819:PsiDirectoryNode" />
330   - <item name="templates" type="462c0819:PsiDirectoryNode" />
331   - <item name="task" type="462c0819:PsiDirectoryNode" />
332   - <item name="taskHeader" type="462c0819:PsiDirectoryNode" />
333   - </path>
334   - </expand>
335   - <select />
336   - </subPane>
337   - </pane>
338   - <pane id="Scope" />
339   - <pane id="PackagesPane" />
340   - </panes>
341   - </component>
342 89 <component name="PropertiesComponent">
343 90 <property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
344   - <property name="DatabaseDriversLRU" value="mysql" />
  91 + <property name="ExpandSpringBootJavaOptionsPanel" value="true" />
345 92 <property name="RequestMappingsPanelOrder0" value="0" />
346 93 <property name="RequestMappingsPanelOrder1" value="1" />
347 94 <property name="RequestMappingsPanelWidth0" value="75" />
... ... @@ -349,21 +96,12 @@
349 96 <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
350 97 <property name="WebServerToolWindowFactoryState" value="false" />
351 98 <property name="aspect.path.notification.shown" value="true" />
352   - <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1566992925117" />
353   - <property name="last_opened_file_path" value="$PROJECT_DIR$/../wms-glgd" />
354 99 <property name="node.js.detected.package.eslint" value="true" />
355   - <property name="node.js.detected.package.tslint" value="true" />
356 100 <property name="node.js.path.for.package.eslint" value="project" />
357 101 <property name="node.js.path.for.package.tslint" value="project" />
358 102 <property name="node.js.selected.package.eslint" value="(autodetect)" />
359 103 <property name="node.js.selected.package.tslint" value="(autodetect)" />
360   - <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
361   - </component>
362   - <component name="RecentsManager">
363   - <key name="MoveFile.RECENT_KEYS">
364   - <recent name="E:\code\wms2\src\main\resources\mybatis\general" />
365   - <recent name="E:\code\wms2\src\main\resources\mybatis\config" />
366   - </key>
  104 + <property name="settings.editor.selected.configurable" value="preferences.fileTypes" />
367 105 </component>
368 106 <component name="RunDashboard">
369 107 <option name="ruleStates">
... ... @@ -388,25 +126,12 @@
388 126 <option name="Make" enabled="true" />
389 127 </method>
390 128 </configuration>
391   - <configuration default="true" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
392   - <module name="WMSV1" />
393   - <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" />
394   - <option name="ALTERNATIVE_JRE_PATH" />
395   - <method v="2">
396   - <option name="Make" enabled="true" />
397   - </method>
398   - </configuration>
399 129 </component>
400 130 <component name="ServiceViewManager">
401 131 <option name="allServicesViewState">
402 132 <serviceView>
403 133 <treeState>
404   - <expand>
405   - <path>
406   - <item name="services root" type="e789fda9:ObjectUtils$Sentinel" />
407   - <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@fe9f505" type="7427dc5b:ServiceModel$ServiceGroupNode" />
408   - </path>
409   - </expand>
  134 + <expand />
410 135 <select />
411 136 </treeState>
412 137 </serviceView>
... ... @@ -417,118 +142,32 @@
417 142 </component>
418 143 <component name="TaskManager">
419 144 <task active="true" id="Default" summary="Default task">
420   - <changelist id="29079676-ace5-434e-89a2-76a325e744a5" name="Default Changelist" comment="" />
421   - <created>1565160110910</created>
  145 + <changelist id="908d8a6f-e3e4-4fdc-b674-e523a3e2b520" name="Default Changelist" comment="" />
  146 + <created>1566977677142</created>
422 147 <option name="number" value="Default" />
423 148 <option name="presentableId" value="Default" />
424   - <updated>1565160110910</updated>
425   - <workItem from="1565160112236" duration="11971000" />
426   - <workItem from="1565224833241" duration="14642000" />
427   - <workItem from="1565242153135" duration="1476000" />
428   - <workItem from="1565259513116" duration="148000" />
429   - <workItem from="1565311988064" duration="7176000" />
430   - <workItem from="1565328536669" duration="797000" />
431   - <workItem from="1566803530593" duration="266000" />
432   - <workItem from="1566951795036" duration="23038000" />
  149 + <updated>1566977677142</updated>
  150 + <workItem from="1566977678336" duration="306000" />
  151 + <workItem from="1566978429560" duration="9246000" />
  152 + <workItem from="1567038752582" duration="348000" />
433 153 </task>
434   - <task id="LOCAL-00001" summary="添加库位、库位类型增删改查接口">
435   - <created>1565226427512</created>
  154 + <task id="LOCAL-00001" summary="入库单添加时添加流程标记，审核入库单">
  155 + <created>1566983055587</created>
436 156 <option name="number" value="00001" />
437 157 <option name="presentableId" value="LOCAL-00001" />
438 158 <option name="project" value="LOCAL" />
439   - <updated>1565226427512</updated>
  159 + <updated>1566983055587</updated>
440 160 </task>
441   - <task id="LOCAL-00002" summary="添加入库、出库表实体类&#10;添加客户、供应商增删改查接口&#10;添加库位、容器、供应商页面">
442   - <created>1565256884822</created>
  161 + <task id="LOCAL-00002" summary="添加入库单历史">
  162 + <created>1566987011007</created>
443 163 <option name="number" value="00002" />
444 164 <option name="presentableId" value="LOCAL-00002" />
445 165 <option name="project" value="LOCAL" />
446   - <updated>1565256884822</updated>
447   - </task>
448   - <task id="LOCAL-00003" summary="修改库区service">
449   - <created>1565259481656</created>
450   - <option name="number" value="00003" />
451   - <option name="presentableId" value="LOCAL-00003" />
452   - <option name="project" value="LOCAL" />
453   - <updated>1565259481656</updated>
454   - </task>
455   - <task id="LOCAL-00004" summary="盘点">
456   - <created>1566866817508</created>
457   - <option name="number" value="00004" />
458   - <option name="presentableId" value="LOCAL-00004" />
459   - <option name="project" value="LOCAL" />
460   - <updated>1566866817508</updated>
461   - </task>
462   - <task id="LOCAL-00005" summary="修改字典管理获取不到父节点Id bug">
463   - <created>1566872309940</created>
464   - <option name="number" value="00005" />
465   - <option name="presentableId" value="LOCAL-00005" />
466   - <option name="project" value="LOCAL" />
467   - <updated>1566872309940</updated>
468   - </task>
469   - <task id="LOCAL-00006" summary="任务完成-入库任务">
470   - <created>1566898785579</created>
471   - <option name="number" value="00006" />
472   - <option name="presentableId" value="LOCAL-00006" />
473   - <option name="project" value="LOCAL" />
474   - <updated>1566898785579</updated>
  166 + <updated>1566987011007</updated>
475 167 </task>
476   - <option name="localTasksCounter" value="7" />
  168 + <option name="localTasksCounter" value="3" />
477 169 <servers />
478 170 </component>
479   - <component name="TimeTrackingManager">
480   - <option name="totallyTimeSpent" value="45377000" />
481   - </component>
482   - <component name="TodoView">
483   - <todo-panel id="selected-file">
484   - <is-autoscroll-to-source value="true" />
485   - </todo-panel>
486   - <todo-panel id="all">
487   - <are-packages-shown value="true" />
488   - <is-autoscroll-to-source value="true" />
489   - </todo-panel>
490   - </component>
491   - <component name="ToolWindowManager">
492   - <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
493   - <editor active="true" />
494   - <layout>
495   - <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49832776" visible="true" weight="0.25670242" />
496   - <window_info id="Structure" order="1" sideWeight="0.50167227" side_tool="true" weight="0.23793566" />
497   - <window_info id="Web" order="2" sideWeight="0.50167227" side_tool="true" weight="0.23793566" />
498   - <window_info id="Designer" order="3" />
499   - <window_info id="UI Designer" order="4" />
500   - <window_info id="Favorites" order="5" sideWeight="0.50167227" side_tool="true" weight="0.23793566" />
501   - <window_info id="Image Layers" order="6" />
502   - <window_info id="Capture Tool" order="7" />
503   - <window_info anchor="bottom" id="Message" order="0" />
504   - <window_info anchor="bottom" id="Find" order="1" />
505   - <window_info anchor="bottom" id="Run" order="2" weight="0.42351276" />
506   - <window_info anchor="bottom" id="Debug" order="3" weight="0.39943343" />
507   - <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
508   - <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
509   - <window_info anchor="bottom" id="TODO" order="6" weight="0.3286119" />
510   - <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
511   - <window_info anchor="bottom" id="Version Control" order="8" weight="0.49433428" />
512   - <window_info active="true" anchor="bottom" id="Run Dashboard" order="9" sideWeight="0.91152817" visible="true" weight="0.54532576" />
513   - <window_info anchor="bottom" id="Spring" order="10" weight="0.3286119" />
514   - <window_info anchor="bottom" id="Database Changes" order="11" weight="0.32719547" />
515   - <window_info anchor="bottom" id="Event Log" order="12" sideWeight="0.08847185" side_tool="true" weight="0.34560907" />
516   - <window_info anchor="bottom" id="Java Enterprise" order="13" weight="0.3275488" />
517   - <window_info anchor="bottom" id="Messages" order="14" weight="0.15864022" />
518   - <window_info anchor="bottom" id="MyBatis Log" order="15" />
519   - <window_info anchor="bottom" id="Terminal" order="16" />
520   - <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
521   - <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
522   - <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
523   - <window_info anchor="right" id="Maven" order="3" weight="0.3297587" />
524   - <window_info anchor="right" id="Palette" order="4" />
525   - <window_info anchor="right" id="Capture Analysis" order="5" />
526   - <window_info anchor="right" id="Database" order="6" />
527   - <window_info anchor="right" id="Palette&#9;" order="7" />
528   - <window_info anchor="right" id="Theme Preview" order="8" />
529   - <window_info anchor="right" id="Bean Validation" order="9" />
530   - </layout>
531   - </component>
532 171 <component name="TypeScriptGeneratedFilesManager">
533 172 <option name="version" value="1" />
534 173 </component>
... ... @@ -538,20 +177,7 @@
538 177 <entry key="MAIN">
539 178 <value>
540 179 <State>
541   - <option name="RECENTLY_FILTERED_USER_GROUPS">
542   - <collection />
543   - </option>
544   - <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
545   - <collection />
546   - </option>
547   - <option name="COLUMN_ORDER">
548   - <list>
549   - <option value="0" />
550   - <option value="1" />
551   - <option value="2" />
552   - <option value="3" />
553   - </list>
554   - </option>
  180 + <option name="COLUMN_ORDER" />
555 181 </State>
556 182 </value>
557 183 </entry>
... ... @@ -573,293 +199,32 @@
573 199 </option>
574 200 </component>
575 201 <component name="VcsManagerConfiguration">
576   - <MESSAGE value="添加库位、库位类型增删改查接口" />
577   - <MESSAGE value="添加入库、出库表实体类&#10;添加客户、供应商增删改查接口&#10;添加库位、容器、供应商页面" />
578   - <MESSAGE value="修改库区service" />
579   - <MESSAGE value="Merge branch 'develop' of http://172.16.29.40:8010/wms/wms2 into develop&#10;&#10;# Conflicts:&#10;#&#9;.idea/workspace.xml" />
580   - <MESSAGE value="添加userWarehouse" />
581   - <MESSAGE value="添加containerCapacity" />
582   - <MESSAGE value="添加物料页面" />
583   - <MESSAGE value="添加商品详情" />
584   - <MESSAGE value="添加物料时判断单位是否存在，不存在则添加物料单位" />
585   - <MESSAGE value="添加task实体类" />
586   - <MESSAGE value="添加商品、商品详情页面" />
587   - <MESSAGE value="添加承运商" />
588   - <MESSAGE value="添加物料导入、导出模板，添加Excel导入导出配置文件" />
589   - <MESSAGE value="添加仓库配置" />
590   - <MESSAGE value="代码错误，库存导包" />
591   - <MESSAGE value="代码错误，导包" />
592   - <MESSAGE value="上架任务查询" />
593   - <MESSAGE value="库存交易搜索" />
594   - <MESSAGE value="库存状态搜索" />
595   - <MESSAGE value="盘点" />
596   - <MESSAGE value="修改字典管理获取不到父节点Id bug" />
597   - <MESSAGE value="任务完成-入库任务" />
598   - <option name="LAST_COMMIT_MESSAGE" value="任务完成-入库任务" />
  202 + <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
  203 + <MESSAGE value="盘点明细页面" />
  204 + <MESSAGE value="入库单添加时添加流程标记，审核入库单" />
  205 + <MESSAGE value="添加入库单历史" />
  206 + <option name="LAST_COMMIT_MESSAGE" value="添加入库单历史" />
599 207 </component>
600 208 <component name="XDebuggerManager">
601 209 <breakpoint-manager>
602 210 <breakpoints>
603   - <line-breakpoint enabled="true" type="java-line">
604   - <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/common/utils/poi/ExcelUtil.java</url>
605   - <line>302</line>
606   - <properties />
607   - <option name="timeStamp" value="12" />
  211 + <line-breakpoint type="java-line">
  212 + <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/mapper/CycleCountHeaderMapper.java</url>
  213 + <line>5</line>
  214 + <option name="timeStamp" value="1" />
608 215 </line-breakpoint>
609 216 <line-breakpoint enabled="true" type="java-line">
610   - <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/service/MaterialServiceImpl.java</url>
611   - <line>66</line>
612   - <properties />
613   - <option name="timeStamp" value="24" />
  217 + <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java</url>
  218 + <line>84</line>
  219 + <option name="timeStamp" value="3" />
614 220 </line-breakpoint>
615   - <line-breakpoint enabled="true" type="java-line">
616   - <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/monitor/logExecption/controllerAdvice/MyControllerAdvice.java</url>
617   - <line>26</line>
618   - <properties />
619   - <option name="timeStamp" value="25" />
  221 + <line-breakpoint type="java-field">
  222 + <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java</url>
  223 + <line>35</line>
  224 + <properties field="receiptHeaderService" class="com.huaheng.pc.receipt.receiptDetail.service.ReceiptDetailServiceImpl" />
  225 + <option name="timeStamp" value="2" />
620 226 </line-breakpoint>
621 227 </breakpoints>
622 228 </breakpoint-manager>
623   - <watches-manager>
624   - <configuration name="SpringBootApplicationConfigurationType">
625   - <watch expression="receiptTotal" />
626   - <watch expression="this.h" custom="java.lang.reflect.Proxy" />
627   - <watch expression="((MybatisMapperProxy)this.h).methodCache" custom="java.lang.reflect.Proxy,com.baomidou.mybatisplus.core.override.MybatisMapperProxy" />
628   - </configuration>
629   - </watches-manager>
630   - </component>
631   - <component name="editorHistoryManager">
632   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/domain/TaskHeader.java">
633   - <provider selected="true" editor-type-id="text-editor">
634   - <state relative-caret-position="912">
635   - <caret line="56" column="37" selection-start-line="56" selection-start-column="37" selection-end-line="56" selection-end-column="37" />
636   - </state>
637   - </provider>
638   - </entry>
639   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskDetail/controller/TaskDetailController.java">
640   - <provider selected="true" editor-type-id="text-editor">
641   - <state relative-caret-position="-185">
642   - <caret line="43" column="48" lean-forward="true" selection-start-line="43" selection-start-column="48" selection-end-line="43" selection-end-column="48" />
643   - <folding>
644   - <element signature="imports" expanded="true" />
645   - </folding>
646   - </state>
647   - </provider>
648   - </entry>
649   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html">
650   - <provider selected="true" editor-type-id="text-editor">
651   - <state relative-caret-position="-99">
652   - <caret line="50" column="54" lean-forward="true" selection-start-line="50" selection-start-column="54" selection-end-line="50" selection-end-column="54" />
653   - </state>
654   - </provider>
655   - </entry>
656   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryTransaction/inventoryTransaction.html">
657   - <provider selected="true" editor-type-id="text-editor">
658   - <state relative-caret-position="312">
659   - <caret line="39" column="41" lean-forward="true" selection-start-line="39" selection-start-column="41" selection-end-line="39" selection-end-column="41" />
660   - </state>
661   - </provider>
662   - </entry>
663   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/domain/InventoryTransaction.java">
664   - <provider selected="true" editor-type-id="text-editor">
665   - <state relative-caret-position="322">
666   - <caret line="60" column="20" lean-forward="true" selection-start-line="60" selection-start-column="20" selection-end-line="60" selection-end-column="35" />
667   - </state>
668   - </provider>
669   - </entry>
670   - <entry file="jar://C:/Program Files/Java/jdk1.8.0_202/src.zip!/java/util/function/Function.java" />
671   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/controller/InventoryTransactionController.java">
672   - <provider selected="true" editor-type-id="text-editor">
673   - <state relative-caret-position="226">
674   - <caret line="77" column="143" selection-start-line="77" selection-start-column="143" selection-end-line="77" selection-end-column="143" />
675   - </state>
676   - </provider>
677   - </entry>
678   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/mapper/CycleCountHeaderMapper.java">
679   - <provider selected="true" editor-type-id="text-editor" />
680   - </entry>
681   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/service/ICycleCountHeaderService.java" />
682   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/mapper/CyclecountHeaderMapperAuto.java" />
683   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/ICycleCountDetailService.java" />
684   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/mapper/CyclecountDetailMapperAuto.java" />
685   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/domain/CycleCountDetail.java">
686   - <provider selected="true" editor-type-id="text-editor">
687   - <state relative-caret-position="420">
688   - <caret line="25" column="15" lean-forward="true" selection-start-line="25" selection-start-column="15" selection-end-line="25" selection-end-column="15" />
689   - </state>
690   - </provider>
691   - </entry>
692   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/CycleCountDetailServiceImpl.java" />
693   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/service/CycleCountHeaderServiceImpl.java" />
694   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/mapper/CycleCountDetailMapper.java">
695   - <provider selected="true" editor-type-id="text-editor">
696   - <state relative-caret-position="120">
697   - <caret line="6" column="1" lean-forward="true" selection-start-line="6" selection-start-column="1" selection-end-line="6" selection-end-column="1" />
698   - <folding>
699   - <element signature="imports" expanded="true" />
700   - </folding>
701   - </state>
702   - </provider>
703   - </entry>
704   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java">
705   - <provider selected="true" editor-type-id="text-editor">
706   - <state relative-caret-position="70">
707   - <caret line="66" lean-forward="true" selection-start-line="66" selection-end-line="66" />
708   - </state>
709   - </provider>
710   - </entry>
711   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java">
712   - <provider selected="true" editor-type-id="text-editor">
713   - <state relative-caret-position="531">
714   - <caret line="91" selection-start-line="91" selection-end-line="91" />
715   - <folding>
716   - <element signature="imports" expanded="true" />
717   - </folding>
718   - </state>
719   - </provider>
720   - </entry>
721   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/domain/CycleCountHeader.java">
722   - <provider selected="true" editor-type-id="text-editor">
723   - <state relative-caret-position="4480">
724   - <caret line="231" column="4" selection-start-line="231" selection-start-column="4" selection-end-line="231" selection-end-column="4" />
725   - <folding>
726   - <element signature="e#15677#15678#0" expanded="true" />
727   - <element signature="e#15706#15707#0" expanded="true" />
728   - <element signature="e#15751#15752#0" expanded="true" />
729   - <element signature="e#15787#15788#0" expanded="true" />
730   - </folding>
731   - </state>
732   - </provider>
733   - </entry>
734   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html">
735   - <provider selected="true" editor-type-id="text-editor">
736   - <state relative-caret-position="303">
737   - <caret line="103" column="20" lean-forward="true" selection-start-line="103" selection-start-column="20" selection-end-line="103" selection-end-column="34" />
738   - </state>
739   - </provider>
740   - </entry>
741   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html">
742   - <provider selected="true" editor-type-id="text-editor">
743   - <state relative-caret-position="72">
744   - <caret line="91" column="52" lean-forward="true" selection-start-line="91" selection-start-column="52" selection-end-line="91" selection-end-column="52" />
745   - </state>
746   - </provider>
747   - </entry>
748   - <entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
749   - <provider selected="true" editor-type-id="text-editor">
750   - <state relative-caret-position="122">
751   - <caret line="96" column="93" selection-start-line="96" selection-start-column="93" selection-end-line="96" selection-end-column="93" />
752   - </state>
753   - </provider>
754   - </entry>
755   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/HuaHengApplication.java">
756   - <provider selected="true" editor-type-id="text-editor">
757   - <state relative-caret-position="271">
758   - <caret line="28" column="58" selection-start-line="28" selection-start-column="57" selection-end-line="28" selection-end-column="58" />
759   - </state>
760   - </provider>
761   - </entry>
762   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/dict/service/IDictDataService.java">
763   - <provider selected="true" editor-type-id="text-editor">
764   - <state relative-caret-position="132">
765   - <caret line="69" column="15" selection-start-line="69" selection-start-column="15" selection-end-line="69" selection-end-column="15" />
766   - </state>
767   - </provider>
768   - </entry>
769   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/dict/service/DictDataServiceImpl.java">
770   - <provider selected="true" editor-type-id="text-editor">
771   - <state relative-caret-position="132">
772   - <caret line="106" column="47" selection-start-line="106" selection-start-column="39" selection-end-line="106" selection-end-column="47" />
773   - </state>
774   - </provider>
775   - </entry>
776   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/dict/controller/DictTypeController.java">
777   - <provider selected="true" editor-type-id="text-editor">
778   - <state relative-caret-position="759">
779   - <caret line="112" column="25" lean-forward="true" selection-start-line="112" selection-start-column="25" selection-end-line="112" selection-end-column="25" />
780   - </state>
781   - </provider>
782   - </entry>
783   - <entry file="file://$PROJECT_DIR$/src/main/resources/static/huaheng/js/huahengUI.js">
784   - <provider selected="true" editor-type-id="text-editor">
785   - <state relative-caret-position="132">
786   - <caret line="500" column="12" selection-start-line="500" selection-start-column="12" selection-end-line="500" selection-end-column="12" />
787   - </state>
788   - </provider>
789   - </entry>
790   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/system/dict/data/add.html">
791   - <provider selected="true" editor-type-id="text-editor">
792   - <state relative-caret-position="102">
793   - <caret line="23" column="126" selection-start-line="23" selection-start-column="118" selection-end-line="23" selection-end-column="126" />
794   - </state>
795   - </provider>
796   - </entry>
797   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/system/dict/data/data.html">
798   - <provider selected="true" editor-type-id="text-editor">
799   - <state relative-caret-position="89">
800   - <caret line="56" column="76" selection-start-line="56" selection-start-column="76" selection-end-line="56" selection-end-column="76" />
801   - </state>
802   - </provider>
803   - </entry>
804   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/system/dict/type/type.html">
805   - <provider selected="true" editor-type-id="text-editor">
806   - <state relative-caret-position="-38">
807   - <caret line="148" column="37" selection-start-line="148" selection-start-column="35" selection-end-line="148" selection-end-column="37" />
808   - </state>
809   - </provider>
810   - </entry>
811   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/dict/controller/DictDataController.java">
812   - <provider selected="true" editor-type-id="text-editor">
813   - <state relative-caret-position="380">
814   - <caret line="86" column="37" selection-start-line="86" selection-start-column="29" selection-end-line="86" selection-end-column="37" />
815   - <folding>
816   - <element signature="e#1501#1502#0" expanded="true" />
817   - <element signature="e#1540#1541#0" expanded="true" />
818   - </folding>
819   - </state>
820   - </provider>
821   - </entry>
822   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java">
823   - <provider selected="true" editor-type-id="text-editor">
824   - <state relative-caret-position="1710">
825   - <caret line="117" column="46" selection-start-line="117" selection-start-column="46" selection-end-line="117" selection-end-column="46" />
826   - </state>
827   - </provider>
828   - </entry>
829   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/taskHeader.html">
830   - <provider selected="true" editor-type-id="text-editor">
831   - <state relative-caret-position="8379">
832   - <caret line="441" column="68" selection-start-line="441" selection-start-column="68" selection-end-line="441" selection-end-column="68" />
833   - </state>
834   - </provider>
835   - </entry>
836   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/mapper/TaskHeaderMapper.java">
837   - <provider selected="true" editor-type-id="text-editor">
838   - <state relative-caret-position="114">
839   - <caret line="11" column="30" selection-start-line="11" selection-start-column="30" selection-end-line="11" selection-end-column="30" />
840   - </state>
841   - </provider>
842   - </entry>
843   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java">
844   - <provider selected="true" editor-type-id="text-editor">
845   - <state relative-caret-position="209">
846   - <caret line="18" column="15" selection-start-line="18" selection-start-column="15" selection-end-line="18" selection-end-column="15" />
847   - </state>
848   - </provider>
849   - </entry>
850   - <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/task/TaskHeaderMapper.xml">
851   - <provider selected="true" editor-type-id="text-editor">
852   - <state relative-caret-position="257">
853   - <caret line="54" column="54" lean-forward="true" selection-start-line="54" selection-start-column="54" selection-end-line="54" selection-end-column="54" />
854   - </state>
855   - </provider>
856   - </entry>
857   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java">
858   - <provider selected="true" editor-type-id="text-editor">
859   - <state relative-caret-position="-1467">
860   - <caret line="313" column="68" lean-forward="true" selection-start-line="313" selection-start-column="68" selection-end-line="313" selection-end-column="68" />
861   - </state>
862   - </provider>
863   - </entry>
864 229 </component>
865 230 </project>
866 231 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/receipt/receiptDetail/controller/ReceiptDetailController.java
  View file @542f1ef
... ... @@ -142,7 +142,7 @@ public class ReceiptDetailController extends BaseController {
142 142 @ApiOperation(value="删除入库单 ", notes="删除入库单 ", httpMethod = "POST")
143 143 @RequiresPermissions("receipt:receiptDetail:remove")
144 144 @Log(title = "入库-入库单 ",operating = "删除入库单 ", action = BusinessType.INSERT)
145   - @PostMapping("/edit")
  145 + @PostMapping("/remove")
146 146 @ResponseBody
147 147 public AjaxResult remove(String ids) {
148 148 if (StringUtils.isEmpty(ids)){
... ...
src/main/java/com/huaheng/pc/receipt/receiptDetailHistory/controller/ReceiptDetailHistoryController.java
  View file @542f1ef
... ... @@ -28,7 +28,7 @@ import java.util.List;
28 28  
29 29 @Api(tags = "历史入库明细")
30 30 @Controller
31   -@RequestMapping("/receipt/receiptDetail")
  31 +@RequestMapping("/receipt/receiptDetailHistory")
32 32 public class ReceiptDetailHistoryController extends BaseController {
33 33  
34 34 @Resource
... ...