wms / wms_ningbohuazhang · Commits

Commit 7f2fa6c67254ff2e18186a3e43d5407c718d80cd

Authored by pengcheng
2 parents a568859a 60c30d9c

Merge remote-tracking branch 'origin/develop' into develop

Inline Side-by-side
Showing 73 changed files with 3560 additions and 2931 deletions

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

To preserve performance only 60 of 73 files are displayed.

.gitignore
  View file @7f2fa6c
... ... @@ -10,7 +10,7 @@ target/
10 10 *.iws
11 11 *.iml
12 12 *.ipr
13   -.idea/workspace.xml
  13 +#.idea/workspace.xml
14 14 .idea/compiler.xml
15 15  
16 16  
... ...
.idea/MyBatisCodeHelperDatasource.xml
  View file @7f2fa6c
... ... @@ -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.shipment.wave.mapper" />
  8 + <option name="javaMapperPackage" value="com.huaheng.pc.inventory.adjust.mapper" />
9 9 <option name="javaMapperPath" value="$PROJECT_DIR$/src/main/java" />
10   - <option name="javaModelPackage" value="com.huaheng.pc.shipment.wave.domain" />
  10 + <option name="javaModelPackage" value="com.huaheng.pc.inventory.adjust.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.shipment.wave.mapper" />
  32 + <option name="javaMapperPackage" value="com.huaheng.pc.inventory.adjust.mapper" />
33 33 <option name="javaMapperPath" value="$PROJECT_DIR$/src/main/java" />
34   - <option name="javaModelPacakge" value="com.huaheng.pc.shipment.wave.domain" />
  34 + <option name="javaModelPacakge" value="com.huaheng.pc.inventory.adjust.domain" />
35 35 <option name="javaModelPath" value="$PROJECT_DIR$/src/main/java" />
36   - <option name="javaServicePackage" value="com.huaheng.pc.shipment.wave.service" />
  36 + <option name="javaServicePackage" value="com.huaheng.pc.inventory.adjust.service" />
37 37 <option name="javaServicePath" value="$PROJECT_DIR$/src/main/java" />
38   - <option name="xmlPackage" value="shipment" />
  38 + <option name="xmlPackage" value="inventory" />
39 39 <option name="xmlPath" value="E:\code\wms2\src\main\resources\mybatis" />
40 40 </UserPackageAndPathInfoByModule>
41 41 </value>
... ... @@ -45,6 +45,26 @@
45 45 <option name="mybatisPlusStaticField" value="false" />
46 46 <option name="tableGenerateConfigs">
47 47 <map>
  48 + <entry key="wms_v2:adjust_detail">
  49 + <value>
  50 + <TableGenerateConfig>
  51 + <option name="generatedKey" value="id" />
  52 + <option name="javaModelName" value="AdjustDetail" />
  53 + <option name="moduleName" value="huaheng" />
  54 + <option name="useActualColumnName" value="true" />
  55 + </TableGenerateConfig>
  56 + </value>
  57 + </entry>
  58 + <entry key="wms_v2:adjust_header">
  59 + <value>
  60 + <TableGenerateConfig>
  61 + <option name="generatedKey" value="id" />
  62 + <option name="javaModelName" value="AdjustHeader" />
  63 + <option name="moduleName" value="huaheng" />
  64 + <option name="useActualColumnName" value="true" />
  65 + </TableGenerateConfig>
  66 + </value>
  67 + </entry>
48 68 <entry key="wms_v2:alarm_level">
49 69 <value>
50 70 <TableGenerateConfig>
... ... @@ -285,6 +305,26 @@
285 305 </TableGenerateConfig>
286 306 </value>
287 307 </entry>
  308 + <entry key="wms_v2:receipt_detail_history">
  309 + <value>
  310 + <TableGenerateConfig>
  311 + <option name="generatedKey" value="id" />
  312 + <option name="javaModelName" value="ReceiptDetailHistory" />
  313 + <option name="moduleName" value="huaheng" />
  314 + <option name="useActualColumnName" value="true" />
  315 + </TableGenerateConfig>
  316 + </value>
  317 + </entry>
  318 + <entry key="wms_v2:receipt_header_history">
  319 + <value>
  320 + <TableGenerateConfig>
  321 + <option name="generatedKey" value="id" />
  322 + <option name="javaModelName" value="ReceiptHeaderHistory" />
  323 + <option name="moduleName" value="huaheng" />
  324 + <option name="useActualColumnName" value="true" />
  325 + </TableGenerateConfig>
  326 + </value>
  327 + </entry>
288 328 <entry key="wms_v2:receipt_preference">
289 329 <value>
290 330 <TableGenerateConfig>
... ... @@ -511,7 +551,7 @@
511 551 <option name="useLomBokOnModel" value="true" />
512 552 <option name="useSwagger" value="true" />
513 553 <option name="userMybatisPlus" value="true" />
514   - <option name="xmlMapperPackage" value="shipment" />
  554 + <option name="xmlMapperPackage" value="inventory" />
515 555 <option name="xmlMapperPath" value="E:\code\wms2\src\main\resources\mybatis" />
516 556 </ProjectProfile>
517 557 </option>
... ...
.idea/WMSV1.iml deleted
View file @a568859
1   -<?xml version="1.0" encoding="UTF-8"?>
2   -<module type="JAVA_MODULE" version="4">
3   - <component name="FacetManager">
4   - <facet type="Spring" name="Spring">
5   - <configuration />
6   - </facet>
7   - <facet type="web" name="Web">
8   - <configuration>
9   - <webroots />
10   - <sourceRoots>
11   - <root url="file://$MODULE_DIR$/src/main/java" />
12   - <root url="file://$MODULE_DIR$/src/main/resources" />
13   - </sourceRoots>
14   - </configuration>
15   - </facet>
16   - </component>
17   -</module>
18 0 \ No newline at end of file
.idea/compiler.xml
  View file @7f2fa6c
... ... @@ -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="wms2" />
10 9 <module name="huaheng" />
  10 + <module name="wms2" />
11 11 </profile>
12 12 </annotationProcessing>
13 13 </component>
... ...
.idea/dataSources.xml
  View file @7f2fa6c
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <project version="4">
3 3 <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
4   - <data-source source="LOCAL" name="@172.16.29.45" uuid="2845c0bf-201c-4178-b161-2bab8cfbfe5d">
  4 + <data-source source="LOCAL" name="@172.16.29.45" uuid="5e014158-5749-424f-a74a-1c32e588e60f">
5 5 <driver-ref>mysql.8</driver-ref>
6 6 <synchronize>true</synchronize>
7 7 <jdbc-driver>com.mysql.cj.jdbc.Driver</jdbc-driver>
... ...
.idea/workspace.xml
  View file @7f2fa6c
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="">
5   - <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java" afterDir="false" />
6   - <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/controller/CycleCountHeaderController.java" afterDir="false" />
  4 + <list default="true" id="908d8a6f-e3e4-4fdc-b674-e523a3e2b520" name="Default Changelist" comment="">
7 5 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
8   - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/domain/CycleCountHeader.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/domain/CycleCountHeader.java" afterDir="false" />
9   - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/cyclecountDetail/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountDetail/add.html" afterDir="false" />
10   - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/cyclecountDetail/addGoods.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountDetail/addGoods.html" afterDir="false" />
11   - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/cyclecountDetail/cyclecountDetail.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountDetail/cycleCountDetail.html" afterDir="false" />
12   - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/cyclecountDetail/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountDetail/edit.html" afterDir="false" />
13   - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/cyclecountHeader/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountHeader/add.html" afterDir="false" />
14   - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/cyclecountHeader/cyclecountHeader.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html" afterDir="false" />
15   - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/cyclecountHeader/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountHeader/edit.html" afterDir="false" />
16   - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/cyclecountHeader/report.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountHeader/report.html" afterDir="false" />
17   - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java" afterDir="false" />
18   - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java" afterDir="false" />
19   - <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" />
20   - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/taskHeader.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/taskHeader.html" afterDir="false" />
  6 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/domain/InventoryTransaction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/domain/InventoryTransaction.java" afterDir="false" />
  7 + <change beforePath="$PROJECT_DIR$/src/main/resources/mybatis/inventory/CycleCountDetailMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mybatis/inventory/CycleCountDetailMapper.xml" afterDir="false" />
  8 + <change beforePath="$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryTransactionMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryTransactionMapper.xml" afterDir="false" />
  9 + <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryTransaction/inventoryTransaction.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryTransaction/inventoryTransaction.html" afterDir="false" />
21 10 </list>
22 11 <ignored path="$PROJECT_DIR$/target/" />
  12 + <ignored path="$PROJECT_DIR$/out/" />
23 13 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
24 14 <option name="SHOW_DIALOG" value="false" />
25 15 <option name="HIGHLIGHT_CONFLICTS" value="true" />
26 16 <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
27 17 <option name="LAST_RESOLUTION" value="IGNORE" />
28 18 </component>
29   - <component name="DatabaseView">
30   - <option name="SHOW_INTERMEDIATE" value="false" />
31   - <option name="GROUP_DATA_SOURCES" value="true" />
32   - <option name="GROUP_SCHEMA" value="true" />
33   - <option name="GROUP_CONTENTS" value="false" />
34   - <option name="SORT_POSITIONED" value="false" />
35   - <option name="SHOW_EMPTY_GROUPS" value="false" />
36   - <option name="AUTO_SCROLL_FROM_SOURCE" value="true" />
37   - <option name="HIDDEN_KINDS">
38   - <set />
39   - </option>
40   - <expand>
41   - <path>
42   - <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
43   - <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
44   - </path>
45   - <path>
46   - <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
47   - <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
48   - <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
49   - </path>
50   - <path>
51   - <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
52   - <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
53   - <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
54   - <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" />
55   - </path>
56   - <path>
57   - <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
58   - <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
59   - <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
60   - <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" />
61   - <item name="location: table" type="285a2a93:MysqlImplModel$Table" />
62   - </path>
63   - </expand>
64   - <select />
65   - </component>
66 19 <component name="FileEditorManager">
67   - <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
68   - <leaf>
69   - <file pinned="false" current-in-tab="false">
70   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/domain/TaskHeader.java">
71   - <provider selected="true" editor-type-id="text-editor" />
72   - </entry>
73   - </file>
74   - <file pinned="false" current-in-tab="false">
75   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java">
76   - <provider selected="true" editor-type-id="text-editor">
77   - <state relative-caret-position="639">
78   - <caret line="85" selection-start-line="85" selection-end-line="85" />
79   - <folding>
80   - <element signature="imports" expanded="true" />
81   - </folding>
82   - <state relative-caret-position="409">
83   - <caret line="103" column="57" lean-forward="true" selection-start-line="103" selection-start-column="57" selection-end-line="103" selection-end-column="57" />
84   - </state>
85   - </provider>
86   - </entry>
87   - </file>
88   - <file pinned="false" current-in-tab="false">
89   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java">
90   - <provider selected="true" editor-type-id="text-editor">
91   - <state relative-caret-position="152">
92   - <caret line="11" column="27" selection-start-line="11" selection-start-column="27" selection-end-line="11" selection-end-column="27" />
93   - </state>
94   - </provider>
95   - </entry>
96   - </file>
97   - <file pinned="false" current-in-tab="true">
98   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html">
99   - <file pinned="false" current-in-tab="true">
100   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java">
101   - <provider selected="true" editor-type-id="text-editor">
102   - <state relative-caret-position="72">
103   - <caret line="91" column="52" lean-forward="true" selection-start-line="91" selection-start-column="52" selection-end-line="91" selection-end-column="52" />
104   - <state relative-caret-position="-173">
105   - <caret line="161" column="34" selection-start-line="161" selection-start-column="34" selection-end-line="161" selection-end-column="34" />
106   - </state>
107   - </provider>
108   - </entry>
109   - </file>
110   - <file pinned="false" current-in-tab="false">
111   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/taskHeader.html">
112   - <provider selected="true" editor-type-id="text-editor">
113   - <state relative-caret-position="-513">
114   - <folding>
115   - <element signature="n#style#0;n#i#0;n#a#0;n#!!top" expanded="true" />
116   - </folding>
117   - </state>
118   - </provider>
119   - </entry>
120   - </file>
121   - </leaf>
122   - </component>
123   - <component name="FileTemplateManagerImpl">
124   - <option name="RECENT_TEMPLATES">
125   - <list>
126   - <option value="Class" />
127   - </list>
128   - </option>
  20 + <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
129 21 </component>
130 22 <component name="Git.Settings">
131 23 <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
132   - <option name="RECENT_BRANCH_BY_REPOSITORY">
133   - <map>
134   - <entry key="$PROJECT_DIR$" value="master" />
135   - </map>
136   - </option>
137   - <option name="RESET_MODE" value="HARD" />
138 24 </component>
139 25 <component name="IdeDocumentHistory">
140 26 <option name="CHANGED_PATHS">
141 27 <list>
142   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailService.java" />
143   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java" />
144   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java" />
145   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java" />
146   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/service/ShippingCombinationService.java" />
147   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/mapper/ShippingCombinationMapper.java" />
148   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/controller/WareHouseController.java" />
149   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/controller/ShippingCombinationController.java" />
150   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java" />
151   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/domain/InventoryDetail.java" />
152   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/monitor/logExecption/domain/LogExecption.java" />
153   - <option value="$PROJECT_DIR$/pom.xml" />
154   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/IndexController.java" />
155   - <option value="$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryHeaderMapper.xml" />
156   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/domain/InventoryHeader.java" />
157   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java" />
158   - <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html" />
159   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/HuaHengApplication.java" />
160   - <option value="$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/task.html" />
161   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskDetail/controller/TaskDetailController.java" />
162   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java" />
163   - <option value="$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/taskHeader.html" />
164   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/controller/InventoryTransactionController.java" />
165   - <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html" />
166   - <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryTransaction/inventoryTransaction.html" />
167   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cyclecountHeader/mapper/CyclecountHeaderMapperAuto.java" />
168   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cyclecountDetail/mapper/CyclecountDetailMapper.java" />
169   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/mapper/CyclecountDetailMapperAuto.java" />
170   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/CycleCountDetailServiceImpl.java" />
171   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/service/CycleCountHeaderServiceImpl.java" />
  28 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/domain/CycleCountDetail.java" />
  29 + <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html" />
172 30 <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/controller/CycleCountHeaderController.java" />
173 31 <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java" />
174   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/domain/CycleCountHeader.java" />
175   - <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html" />
  32 + <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountDetail/cycleCountDetail.html" />
  33 + <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryTransaction/inventoryTransaction.html" />
  34 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/domain/InventoryTransaction.java" />
  35 + <option value="$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryTransactionMapper.xml" />
  36 + <option value="$PROJECT_DIR$/src/main/resources/mybatis/inventory/CycleCountDetailMapper.xml" />
176 37 </list>
177 38 </option>
178 39 </component>
179   - <component name="IgnoredFileRootStore">
180   - <option name="generatedRoots">
181   - <set>
182   - <option value="E:\code\wms2\.idea" />
183   - </set>
184   - </option>
185   - </component>
186 40 <component name="MavenImportPreferences">
187 41 <option name="importingSettings">
188 42 <MavenImportingSettings>
... ... @@ -202,11 +56,11 @@
202 56 </treeState>
203 57 </component>
204 58 <component name="ProjectFrameBounds" extendedState="6">
205   - <option name="x" value="470" />
206   - <option name="width" value="980" />
207   - <option name="height" value="1030" />
  59 + <option name="x" value="-9" />
  60 + <option name="y" value="-9" />
  61 + <option name="width" value="1938" />
  62 + <option name="height" value="1048" />
208 63 </component>
209   - <component name="ProjectId" id="1P5Ngjh73HToCarlEZkqMxrL7pm" />
210 64 <component name="ProjectLevelVcsManager">
211 65 <ConfirmationsSetting value="2" id="Add" />
212 66 </component>
... ... @@ -215,6 +69,7 @@
215 69 <foldersAlwaysOnTop value="true" />
216 70 </navigator>
217 71 <panes>
  72 + <pane id="PackagesPane" />
218 73 <pane id="ProjectPane">
219 74 <subPane>
220 75 <expand>
... ... @@ -288,84 +143,7 @@
288 143 <item name="huaheng" type="462c0819:PsiDirectoryNode" />
289 144 <item name="pc" type="462c0819:PsiDirectoryNode" />
290 145 <item name="inventory" type="462c0819:PsiDirectoryNode" />
291   - <item name="cycleCountDetail" type="462c0819:PsiDirectoryNode" />
292   - </path>
293   - <path>
294   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
295   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
296   - <item name="src" type="462c0819:PsiDirectoryNode" />
297   - <item name="main" type="462c0819:PsiDirectoryNode" />
298   - <item name="java" type="462c0819:PsiDirectoryNode" />
299   - <item name="com" type="462c0819:PsiDirectoryNode" />
300   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
301   - <item name="pc" type="462c0819:PsiDirectoryNode" />
302   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
303   - <item name="cycleCountDetail" type="462c0819:PsiDirectoryNode" />
304   - <item name="controller" type="462c0819:PsiDirectoryNode" />
305   - </path>
306   - <path>
307   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
308   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
309   - <item name="src" type="462c0819:PsiDirectoryNode" />
310   - <item name="main" type="462c0819:PsiDirectoryNode" />
311   - <item name="java" type="462c0819:PsiDirectoryNode" />
312   - <item name="com" type="462c0819:PsiDirectoryNode" />
313   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
314   - <item name="pc" type="462c0819:PsiDirectoryNode" />
315   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
316   - <item name="cycleCountDetail" type="462c0819:PsiDirectoryNode" />
317   - <item name="domain" type="462c0819:PsiDirectoryNode" />
318   - </path>
319   - <path>
320   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
321   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
322   - <item name="src" type="462c0819:PsiDirectoryNode" />
323   - <item name="main" type="462c0819:PsiDirectoryNode" />
324   - <item name="java" type="462c0819:PsiDirectoryNode" />
325   - <item name="com" type="462c0819:PsiDirectoryNode" />
326   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
327   - <item name="pc" type="462c0819:PsiDirectoryNode" />
328   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
329   - <item name="cycleCountDetail" type="462c0819:PsiDirectoryNode" />
330   - <item name="mapper" type="462c0819:PsiDirectoryNode" />
331   - </path>
332   - <path>
333   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
334   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
335   - <item name="src" type="462c0819:PsiDirectoryNode" />
336   - <item name="main" type="462c0819:PsiDirectoryNode" />
337   - <item name="java" type="462c0819:PsiDirectoryNode" />
338   - <item name="com" type="462c0819:PsiDirectoryNode" />
339   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
340   - <item name="pc" type="462c0819:PsiDirectoryNode" />
341   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
342   - <item name="cycleCountDetail" type="462c0819:PsiDirectoryNode" />
343   - <item name="service" type="462c0819:PsiDirectoryNode" />
344   - </path>
345   - <path>
346   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
347   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
348   - <item name="src" type="462c0819:PsiDirectoryNode" />
349   - <item name="main" type="462c0819:PsiDirectoryNode" />
350   - <item name="java" type="462c0819:PsiDirectoryNode" />
351   - <item name="com" type="462c0819:PsiDirectoryNode" />
352   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
353   - <item name="pc" type="462c0819:PsiDirectoryNode" />
354   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
355   - <item name="cycleCountHeader" type="462c0819:PsiDirectoryNode" />
356   - </path>
357   - <path>
358   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
359   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
360   - <item name="src" type="462c0819:PsiDirectoryNode" />
361   - <item name="main" type="462c0819:PsiDirectoryNode" />
362   - <item name="java" type="462c0819:PsiDirectoryNode" />
363   - <item name="com" type="462c0819:PsiDirectoryNode" />
364   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
365   - <item name="pc" type="462c0819:PsiDirectoryNode" />
366   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
367   - <item name="cycleCountHeader" type="462c0819:PsiDirectoryNode" />
368   - <item name="controller" type="462c0819:PsiDirectoryNode" />
  146 + <item name="adjustDetail" type="462c0819:PsiDirectoryNode" />
369 147 </path>
370 148 <path>
371 149 <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
... ... @@ -377,46 +155,7 @@
377 155 <item name="huaheng" type="462c0819:PsiDirectoryNode" />
378 156 <item name="pc" type="462c0819:PsiDirectoryNode" />
379 157 <item name="inventory" type="462c0819:PsiDirectoryNode" />
380   - <item name="cycleCountHeader" type="462c0819:PsiDirectoryNode" />
381   - <item name="domain" type="462c0819:PsiDirectoryNode" />
382   - </path>
383   - <path>
384   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
385   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
386   - <item name="src" type="462c0819:PsiDirectoryNode" />
387   - <item name="main" type="462c0819:PsiDirectoryNode" />
388   - <item name="java" type="462c0819:PsiDirectoryNode" />
389   - <item name="com" type="462c0819:PsiDirectoryNode" />
390   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
391   - <item name="pc" type="462c0819:PsiDirectoryNode" />
392   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
393   - <item name="inventoryDetail" type="462c0819:PsiDirectoryNode" />
394   - </path>
395   - <path>
396   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
397   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
398   - <item name="src" type="462c0819:PsiDirectoryNode" />
399   - <item name="main" type="462c0819:PsiDirectoryNode" />
400   - <item name="java" type="462c0819:PsiDirectoryNode" />
401   - <item name="com" type="462c0819:PsiDirectoryNode" />
402   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
403   - <item name="pc" type="462c0819:PsiDirectoryNode" />
404   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
405   - <item name="inventoryDetail" type="462c0819:PsiDirectoryNode" />
406   - <item name="controller" type="462c0819:PsiDirectoryNode" />
407   - </path>
408   - <path>
409   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
410   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
411   - <item name="src" type="462c0819:PsiDirectoryNode" />
412   - <item name="main" type="462c0819:PsiDirectoryNode" />
413   - <item name="java" type="462c0819:PsiDirectoryNode" />
414   - <item name="com" type="462c0819:PsiDirectoryNode" />
415   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
416   - <item name="pc" type="462c0819:PsiDirectoryNode" />
417   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
418   - <item name="inventoryDetail" type="462c0819:PsiDirectoryNode" />
419   - <item name="domain" type="462c0819:PsiDirectoryNode" />
  158 + <item name="adjustHeader" type="462c0819:PsiDirectoryNode" />
420 159 </path>
421 160 <path>
422 161 <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
... ... @@ -451,7 +190,6 @@
451 190 <item name="templates" type="462c0819:PsiDirectoryNode" />
452 191 <item name="inventory" type="462c0819:PsiDirectoryNode" />
453 192 <item name="cycleCountDetail" type="462c0819:PsiDirectoryNode" />
454   - <item name="task" type="462c0819:PsiDirectoryNode" />
455 193 </path>
456 194 <path>
457 195 <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
... ... @@ -460,8 +198,6 @@
460 198 <item name="main" type="462c0819:PsiDirectoryNode" />
461 199 <item name="resources" type="462c0819:PsiDirectoryNode" />
462 200 <item name="templates" type="462c0819:PsiDirectoryNode" />
463   - <item name="task" type="462c0819:PsiDirectoryNode" />
464   - <item name="taskHeader" type="462c0819:PsiDirectoryNode" />
465 201 <item name="inventory" type="462c0819:PsiDirectoryNode" />
466 202 <item name="cycleCountHeader" type="462c0819:PsiDirectoryNode" />
467 203 </path>
... ... @@ -483,41 +219,21 @@
483 219 <item name="resources" type="462c0819:PsiDirectoryNode" />
484 220 <item name="templates" type="462c0819:PsiDirectoryNode" />
485 221 <item name="inventory" type="462c0819:PsiDirectoryNode" />
486   - <item name="inventoryHeader" type="462c0819:PsiDirectoryNode" />
  222 + <item name="inventoryTransaction" type="462c0819:PsiDirectoryNode" />
487 223 </path>
488 224 </expand>
489 225 <select />
490 226 </subPane>
491 227 </pane>
492 228 <pane id="Scope" />
493   - <pane id="PackagesPane" />
494 229 </panes>
495 230 </component>
496 231 <component name="PropertiesComponent">
497   - <property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
498   - <property name="DatabaseDriversLRU" value="mysql" />
499 232 <property name="RequestMappingsPanelOrder0" value="0" />
500 233 <property name="RequestMappingsPanelOrder1" value="1" />
501 234 <property name="RequestMappingsPanelWidth0" value="75" />
502 235 <property name="RequestMappingsPanelWidth1" value="75" />
503 236 <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
504   - <property name="WebServerToolWindowFactoryState" value="false" />
505   - <property name="aspect.path.notification.shown" value="true" />
506   - <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1566803879583" />
507   - <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/resources/mybatis" />
508   - <property name="node.js.detected.package.eslint" value="true" />
509   - <property name="node.js.detected.package.tslint" value="true" />
510   - <property name="node.js.path.for.package.eslint" value="project" />
511   - <property name="node.js.path.for.package.tslint" value="project" />
512   - <property name="node.js.selected.package.eslint" value="(autodetect)" />
513   - <property name="node.js.selected.package.tslint" value="(autodetect)" />
514   - <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
515   - </component>
516   - <component name="RecentsManager">
517   - <key name="MoveFile.RECENT_KEYS">
518   - <recent name="E:\code\wms2\src\main\resources\mybatis\general" />
519   - <recent name="E:\code\wms2\src\main\resources\mybatis\config" />
520   - </key>
521 237 </component>
522 238 <component name="RunDashboard">
523 239 <option name="ruleStates">
... ... @@ -533,138 +249,49 @@
533 249 </component>
534 250 <component name="RunManager">
535 251 <configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
536   - <module name="huaheng" />
  252 + <module name="wms2" />
537 253 <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" />
538 254 <option name="ALTERNATIVE_JRE_PATH" />
539   - <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" />
540   - <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
541 255 <method v="2">
542 256 <option name="Make" enabled="true" />
543 257 </method>
544 258 </configuration>
545   - <configuration default="true" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
546   - <module name="WMSV1" />
547   - <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" />
548   - <option name="ALTERNATIVE_JRE_PATH" />
549   - <method v="2">
550   - <option name="Make" enabled="true" />
551   - </method>
552   - </configuration>
553   - </component>
554   - <component name="ServiceViewManager">
555   - <option name="allServicesViewState">
556   - <serviceView>
557   - <treeState>
558   - <expand>
559   - <path>
560   - <item name="services root" type="e789fda9:ObjectUtils$Sentinel" />
561   - <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@fe9f505" type="7427dc5b:ServiceModel$ServiceGroupNode" />
562   - </path>
563   - </expand>
564   - <select />
565   - </treeState>
566   - </serviceView>
567   - </option>
568 259 </component>
569 260 <component name="SvnConfiguration">
570 261 <configuration />
571 262 </component>
572   - <component name="TaskManager">
573   - <task active="true" id="Default" summary="Default task">
574   - <changelist id="29079676-ace5-434e-89a2-76a325e744a5" name="Default Changelist" comment="" />
575   - <created>1565160110910</created>
576   - <option name="number" value="Default" />
577   - <option name="presentableId" value="Default" />
578   - <updated>1565160110910</updated>
579   - <workItem from="1565160112236" duration="11971000" />
580   - <workItem from="1565224833241" duration="14642000" />
581   - <workItem from="1565242153135" duration="1476000" />
582   - <workItem from="1565259513116" duration="148000" />
583   - <workItem from="1565311988064" duration="7176000" />
584   - <workItem from="1565328536669" duration="797000" />
585   - <workItem from="1566803530593" duration="266000" />
586   - </task>
587   - <task id="LOCAL-00001" summary="添加库位、库位类型增删改查接口">
588   - <created>1565226427512</created>
589   - <option name="number" value="00001" />
590   - <option name="presentableId" value="LOCAL-00001" />
591   - <option name="project" value="LOCAL" />
592   - <updated>1565226427512</updated>
593   - </task>
594   - <task id="LOCAL-00002" summary="添加入库、出库表实体类&#10;添加客户、供应商增删改查接口&#10;添加库位、容器、供应商页面">
595   - <created>1565256884822</created>
596   - <option name="number" value="00002" />
597   - <option name="presentableId" value="LOCAL-00002" />
598   - <option name="project" value="LOCAL" />
599   - <updated>1565256884822</updated>
600   - </task>
601   - <task id="LOCAL-00003" summary="修改库区service">
602   - <created>1565259481656</created>
603   - <option name="number" value="00003" />
604   - <option name="presentableId" value="LOCAL-00003" />
605   - <option name="project" value="LOCAL" />
606   - <updated>1565259481656</updated>
607   - </task>
608   - <option name="localTasksCounter" value="4" />
609   - <servers />
610   - </component>
611   - <component name="TimeTrackingManager">
612   - <option name="totallyTimeSpent" value="266000" />
613   - </component>
614 263 <component name="ToolWindowManager">
615   - <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
  264 + <frame x="-7" y="-7" width="1550" height="838" extended-state="7" />
616 265 <layout>
617   - <window_info id="Designer" />
618   - <window_info id="Image Layers" />
619   - <window_info id="Capture Tool" />
620   - <window_info id="UI Designer" />
621   - <window_info id="Favorites" side_tool="true" />
622   - <window_info id="Web" side_tool="true" />
623   - <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25" />
  266 + <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.3324397" />
624 267 <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
625   - <window_info anchor="bottom" id="Spring" />
626   - <window_info anchor="bottom" id="Terminal" />
627   - <window_info anchor="bottom" id="Docker" show_stripe_button="false" />
628   - <window_info anchor="bottom" id="Event Log" side_tool="true" />
629   - <window_info anchor="bottom" id="Java Enterprise" />
630   - <window_info anchor="bottom" id="Database Changes" />
631   - <window_info anchor="bottom" id="Version Control" />
632   - <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49832776" visible="true" weight="0.1883378" />
633   - <window_info id="Structure" order="1" sideWeight="0.50167227" side_tool="true" weight="0.23793566" />
634   - <window_info id="Web" order="2" sideWeight="0.50167227" side_tool="true" weight="0.23793566" />
  268 + <window_info id="Web" order="2" side_tool="true" />
635 269 <window_info id="Designer" order="3" />
636 270 <window_info id="UI Designer" order="4" />
637   - <window_info id="Favorites" order="5" sideWeight="0.50167227" side_tool="true" weight="0.23793566" />
638   - <window_info id="Image Layers" order="6" />
639   - <window_info id="Capture Tool" order="7" />
  271 + <window_info id="Favorites" order="5" side_tool="true" />
640 272 <window_info anchor="bottom" id="Message" order="0" />
641 273 <window_info anchor="bottom" id="Find" order="1" />
642 274 <window_info anchor="bottom" id="Run" order="2" />
643   - <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
  275 + <window_info anchor="bottom" id="Debug" order="3" visible="true" weight="0.07365439" />
644 276 <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
645 277 <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
646   - <window_info anchor="bottom" id="TODO" order="6" weight="0.3275488" />
647   - <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
648   - <window_info anchor="bottom" id="Version Control" order="8" weight="0.49433428" />
649   - <window_info active="true" anchor="bottom" id="Run Dashboard" order="9" sideWeight="0.91152817" visible="true" weight="0.54532576" />
650   - <window_info anchor="bottom" id="Spring" order="10" weight="0.3286119" />
651   - <window_info anchor="bottom" id="Database Changes" order="11" weight="0.3275488" />
652   - <window_info anchor="bottom" id="Event Log" order="12" sideWeight="0.08847185" side_tool="true" weight="0.34560907" />
653   - <window_info anchor="bottom" id="Java Enterprise" order="13" weight="0.3275488" />
654   - <window_info anchor="bottom" id="Messages" order="14" weight="0.16005665" />
655   - <window_info anchor="bottom" id="MyBatis Log" order="15" />
656   - <window_info anchor="bottom" id="Terminal" order="16" />
657 278 <window_info anchor="bottom" id="TODO" order="6" />
658   - <window_info anchor="right" id="Maven" weight="0.3297587" />
659   - <window_info anchor="right" id="Palette" />
660   - <window_info anchor="right" id="Capture Analysis" />
661   - <window_info anchor="right" id="Database" />
662   - <window_info anchor="right" id="Palette&#9;" />
663   - <window_info anchor="right" id="Theme Preview" />
664   - <window_info anchor="right" id="Bean Validation" />
  279 + <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
  280 + <window_info anchor="bottom" id="Version Control" order="8" weight="0.42776203" />
  281 + <window_info anchor="bottom" id="Database Changes" order="9" />
  282 + <window_info anchor="bottom" id="Spring" order="10" />
  283 + <window_info anchor="bottom" id="MyBatis Log" order="11" />
  284 + <window_info anchor="bottom" id="Event Log" order="12" side_tool="true" />
  285 + <window_info anchor="bottom" id="Messages" order="13" weight="0.12606232" />
  286 + <window_info anchor="bottom" id="Java Enterprise" order="14" />
665 287 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
666 288 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
667 289 <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
  290 + <window_info anchor="right" id="Palette" order="3" />
  291 + <window_info anchor="right" id="Database" order="4" />
  292 + <window_info anchor="right" id="Maven" order="5" weight="0.097184986" />
  293 + <window_info anchor="right" id="Bean Validation" order="6" />
  294 + <window_info anchor="right" id="Palette&#9;" order="7" />
668 295 </layout>
669 296 </component>
670 297 <component name="TypeScriptGeneratedFilesManager">
... ... @@ -682,7 +309,14 @@
682 309 <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
683 310 <collection />
684 311 </option>
685   - <option name="COLUMN_ORDER" />
  312 + <option name="COLUMN_ORDER">
  313 + <list>
  314 + <option value="0" />
  315 + <option value="1" />
  316 + <option value="2" />
  317 + <option value="3" />
  318 + </list>
  319 + </option>
686 320 </State>
687 321 </value>
688 322 </entry>
... ... @@ -704,259 +338,164 @@
704 338 </option>
705 339 </component>
706 340 <component name="VcsManagerConfiguration">
707   - <MESSAGE value="添加库位、库位类型增删改查接口" />
708   - <MESSAGE value="添加入库、出库表实体类&#10;添加客户、供应商增删改查接口&#10;添加库位、容器、供应商页面" />
709   - <MESSAGE value="修改库区service" />
710   - <option name="LAST_COMMIT_MESSAGE" value="修改库区service" />
711   - <MESSAGE value="Merge branch 'develop' of http://172.16.29.40:8010/wms/wms2 into develop&#10;&#10;# Conflicts:&#10;#&#9;.idea/workspace.xml" />
712   - <MESSAGE value="添加userWarehouse" />
713   - <MESSAGE value="添加containerCapacity" />
714   - <MESSAGE value="添加物料页面" />
715   - <MESSAGE value="添加商品详情" />
716   - <MESSAGE value="添加物料时判断单位是否存在，不存在则添加物料单位" />
717   - <MESSAGE value="添加task实体类" />
718   - <MESSAGE value="添加商品、商品详情页面" />
719   - <MESSAGE value="添加承运商" />
720   - <MESSAGE value="添加物料导入、导出模板，添加Excel导入导出配置文件" />
721   - <MESSAGE value="添加仓库配置" />
722   - <MESSAGE value="代码错误，库存导包" />
723   - <MESSAGE value="代码错误，导包" />
724   - <MESSAGE value="上架任务查询" />
725   - <MESSAGE value="库存交易搜索" />
726   - <MESSAGE value="库存状态搜索" />
727   - <MESSAGE value="盘点" />
728   - <option name="LAST_COMMIT_MESSAGE" value="盘点" />
  341 + <MESSAGE value="盘点明细页面" />
  342 + <option name="LAST_COMMIT_MESSAGE" value="盘点明细页面" />
729 343 </component>
730 344 <component name="XDebuggerManager">
731 345 <breakpoint-manager>
732 346 <breakpoints>
733 347 <line-breakpoint enabled="true" type="java-line">
734   - <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/common/utils/poi/ExcelUtil.java</url>
735   - <line>302</line>
736   - <properties />
737   - <option name="timeStamp" value="12" />
738   - </line-breakpoint>
739   - <line-breakpoint enabled="true" type="java-line">
740   - <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/service/MaterialServiceImpl.java</url>
741   - <line>66</line>
  348 + <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/mapper/CycleCountHeaderMapper.java</url>
  349 + <line>5</line>
742 350 <properties />
743   - <option name="timeStamp" value="24" />
744   - </line-breakpoint>
745   - <line-breakpoint enabled="true" type="java-line">
746   - <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/monitor/logExecption/controllerAdvice/MyControllerAdvice.java</url>
747   - <line>26</line>
748   - <properties />
749   - <option name="timeStamp" value="25" />
  351 + <option name="timeStamp" value="1" />
750 352 </line-breakpoint>
751 353 </breakpoints>
752 354 </breakpoint-manager>
753   - <watches-manager>
754   - <configuration name="SpringBootApplicationConfigurationType">
755   - <watch expression="receiptTotal" />
756   - <watch expression="this.h" custom="java.lang.reflect.Proxy" />
757   - <watch expression="((MybatisMapperProxy)this.h).methodCache" custom="java.lang.reflect.Proxy,com.baomidou.mybatisplus.core.override.MybatisMapperProxy" />
758   - </configuration>
759   - </watches-manager>
760 355 </component>
761 356 <component name="editorHistoryManager">
762   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/domain/TaskHeader.java">
  357 + <entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
763 358 <provider selected="true" editor-type-id="text-editor" />
764 359 </entry>
765   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java">
766   - <provider selected="true" editor-type-id="text-editor">
767   - <state relative-caret-position="409">
768   - <caret line="103" column="57" lean-forward="true" selection-start-line="103" selection-start-column="57" selection-end-line="103" selection-end-column="57" />
769   - </state>
770   - </provider>
771   - </entry>
772   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java">
773   - <provider selected="true" editor-type-id="text-editor">
774   - <state relative-caret-position="152">
775   - <caret line="11" column="27" selection-start-line="11" selection-start-column="27" selection-end-line="11" selection-end-column="27" />
776   - </state>
777   - </provider>
778   - </entry>
779   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/taskHeader.html">
  360 + <entry file="file://$PROJECT_DIR$/.idea/WMSV1.iml" />
  361 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/domain/CycleCountDetail.java">
780 362 <provider selected="true" editor-type-id="text-editor">
781   - <state relative-caret-position="-513">
  363 + <state relative-caret-position="287">
  364 + <caret line="607" column="5" lean-forward="true" selection-start-line="607" selection-start-column="5" selection-end-line="607" selection-end-column="5" />
782 365 <folding>
783   - <element signature="n#style#0;n#i#0;n#a#0;n#!!top" expanded="true" />
784   - <element signature="n#style#0;n#a#0;n#!!top" expanded="true" />
  366 + <element signature="e#11035#11036#0" expanded="true" />
  367 + <element signature="e#11064#11065#0" expanded="true" />
  368 + <element signature="e#17291#17292#0" expanded="true" />
  369 + <element signature="e#17330#17331#0" expanded="true" />
  370 + <element signature="e#17395#17396#0" expanded="true" />
  371 + <element signature="e#17451#17452#0" expanded="true" />
785 372 </folding>
786 373 </state>
787 374 </provider>
788 375 </entry>
789   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskDetail/controller/TaskDetailController.java">
  376 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html">
790 377 <provider selected="true" editor-type-id="text-editor">
791   - <state relative-caret-position="-185">
792   - <caret line="43" column="48" lean-forward="true" selection-start-line="43" selection-start-column="48" selection-end-line="43" selection-end-column="48" />
793   - <folding>
794   - <element signature="imports" expanded="true" />
795   - </folding>
  378 + <state relative-caret-position="176">
  379 + <caret line="25" column="18" selection-start-line="25" selection-start-column="18" selection-end-line="25" selection-end-column="18" />
796 380 </state>
797 381 </provider>
798 382 </entry>
799   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java">
  383 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryTransaction/inventoryTransaction.html">
800 384 <provider selected="true" editor-type-id="text-editor">
801   - <state relative-caret-position="40">
802   - <caret line="55" column="48" lean-forward="true" selection-start-line="55" selection-start-column="48" selection-end-line="55" selection-end-column="48" />
803   - <folding>
804   - <element signature="imports" expanded="true" />
805   - </folding>
  385 + <state relative-caret-position="368">
  386 + <caret line="274" column="23" selection-start-line="274" selection-start-column="23" selection-end-line="274" selection-end-column="23" />
806 387 </state>
807 388 </provider>
808 389 </entry>
809   - <entry file="file://$PROJECT_DIR$/src/main/resources/static/huaheng/js/huahengUI.js">
  390 + <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryTransactionMapper.xml">
810 391 <provider selected="true" editor-type-id="text-editor">
811   - <state relative-caret-position="213">
812   - <caret line="119" column="12" selection-start-line="119" selection-start-column="12" selection-end-line="119" selection-end-column="12" />
  392 + <state relative-caret-position="880">
  393 + <caret line="44" column="53" selection-start-line="44" selection-start-column="53" selection-end-line="44" selection-end-column="53" />
813 394 </state>
814 395 </provider>
815 396 </entry>
816   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html">
  397 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/mapper/InventoryTransactionMapper.java">
817 398 <provider selected="true" editor-type-id="text-editor">
818   - <state relative-caret-position="-99">
819   - <caret line="50" column="54" lean-forward="true" selection-start-line="50" selection-start-column="54" selection-end-line="50" selection-end-column="54" />
  399 + <state relative-caret-position="80">
  400 + <caret line="5" column="17" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="17" />
820 401 </state>
821 402 </provider>
822 403 </entry>
823   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryTransaction/inventoryTransaction.html">
  404 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/domain/InventoryTransaction.java">
824 405 <provider selected="true" editor-type-id="text-editor">
825   - <state relative-caret-position="312">
826   - <caret line="39" column="41" lean-forward="true" selection-start-line="39" selection-start-column="41" selection-end-line="39" selection-end-column="41" />
  406 + <state relative-caret-position="4068">
  407 + <caret line="278" column="32" lean-forward="true" selection-start-line="278" selection-start-column="32" selection-end-line="278" selection-end-column="32" />
827 408 </state>
828 409 </provider>
829 410 </entry>
830   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/domain/InventoryTransaction.java">
  411 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/mapper/InventoryHeaderMapper.java">
831 412 <provider selected="true" editor-type-id="text-editor">
832   - <state relative-caret-position="322">
833   - <caret line="60" column="20" lean-forward="true" selection-start-line="60" selection-start-column="20" selection-end-line="60" selection-end-column="35" />
  413 + <state relative-caret-position="80">
  414 + <caret line="5" column="17" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="17" />
834 415 </state>
835 416 </provider>
836 417 </entry>
837   - <entry file="jar://C:/Program Files/Java/jdk1.8.0_202/src.zip!/java/util/function/Function.java">
  418 + <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryHeaderMapper.xml">
838 419 <provider selected="true" editor-type-id="text-editor">
839   - <state relative-caret-position="-7">
840   - <caret line="45" column="16" lean-forward="true" selection-start-line="45" selection-start-column="16" selection-end-line="45" selection-end-column="16" />
  420 + <state relative-caret-position="-68">
  421 + <caret line="2" selection-start-line="2" selection-end-line="2" />
841 422 </state>
842 423 </provider>
843 424 </entry>
844   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/controller/InventoryTransactionController.java">
  425 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/domain/InventoryHeader.java">
845 426 <provider selected="true" editor-type-id="text-editor">
846   - <state relative-caret-position="226">
847   - <caret line="77" column="143" selection-start-line="77" selection-start-column="143" selection-end-line="77" selection-end-column="143" />
  427 + <state relative-caret-position="140">
  428 + <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
848 429 </state>
849 430 </provider>
850 431 </entry>
851   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/mapper/CycleCountHeaderMapper.java">
852   - <provider selected="true" editor-type-id="text-editor" />
853   - </entry>
854   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/service/ICycleCountHeaderService.java">
855   - <provider selected="true" editor-type-id="text-editor" />
856   - </entry>
857   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/mapper/CyclecountHeaderMapperAuto.java">
858   - <provider selected="true" editor-type-id="text-editor" />
859   - </entry>
860   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/ICycleCountDetailService.java">
861   - <provider selected="true" editor-type-id="text-editor" />
862   - </entry>
863   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/mapper/CyclecountDetailMapperAuto.java">
  432 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/mapper/InventoryDetailMapper.java">
864 433 <provider selected="true" editor-type-id="text-editor">
865   - <state relative-caret-position="40">
866   - <caret line="2" column="55" selection-start-line="2" selection-start-column="55" selection-end-line="2" selection-end-column="55" />
  434 + <state relative-caret-position="80">
  435 + <caret line="5" selection-start-line="5" selection-end-line="5" />
867 436 </state>
868 437 </provider>
869 438 </entry>
870   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/domain/CycleCountDetail.java">
  439 + <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryDetailMapper.xml">
871 440 <provider selected="true" editor-type-id="text-editor">
872   - <state relative-caret-position="420">
873   - <caret line="25" column="15" lean-forward="true" selection-start-line="25" selection-start-column="15" selection-end-line="25" selection-end-column="15" />
  441 + <state relative-caret-position="40">
  442 + <caret line="2" selection-start-line="2" selection-end-line="2" />
874 443 </state>
875 444 </provider>
876 445 </entry>
877   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/CycleCountDetailServiceImpl.java">
  446 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/mapper/CycleCountHeaderMapper.java">
878 447 <provider selected="true" editor-type-id="text-editor">
879   - <state relative-caret-position="100">
880   - <caret line="31" column="40" selection-start-line="31" selection-start-column="40" selection-end-line="31" selection-end-column="40" />
881   - <folding>
882   - <element signature="e#0#15820#0" expanded="true" />
883   - </folding>
  448 + <state relative-caret-position="80">
  449 + <caret line="5" selection-start-line="5" selection-end-line="5" />
884 450 </state>
885 451 </provider>
886 452 </entry>
887   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/service/CycleCountHeaderServiceImpl.java">
  453 + <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/inventory/CycleCountHeaderMapper.xml">
888 454 <provider selected="true" editor-type-id="text-editor">
889   - <state relative-caret-position="764">
890   - <caret line="67" column="5" selection-start-line="67" selection-start-column="5" selection-end-line="67" selection-end-column="5" />
891   - <folding>
892   - <element signature="e#0#16496#0" expanded="true" />
893   - </folding>
  455 + <state relative-caret-position="40">
  456 + <caret line="2" selection-start-line="2" selection-end-line="2" />
894 457 </state>
895 458 </provider>
896 459 </entry>
897 460 <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/mapper/CycleCountDetailMapper.java">
898 461 <provider selected="true" editor-type-id="text-editor">
899   - <state relative-caret-position="120">
900   - <caret line="6" column="1" lean-forward="true" selection-start-line="6" selection-start-column="1" selection-end-line="6" selection-end-column="1" />
901   - <folding>
902   - <element signature="imports" expanded="true" />
903   - </folding>
  462 + <state relative-caret-position="80">
  463 + <caret line="5" column="17" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="17" />
904 464 </state>
905 465 </provider>
906 466 </entry>
907   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java">
  467 + <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/inventory/CycleCountDetailMapper.xml">
908 468 <provider selected="true" editor-type-id="text-editor">
909   - <state relative-caret-position="70">
910   - <caret line="66" lean-forward="true" selection-start-line="66" selection-end-line="66" />
  469 + <state relative-caret-position="960">
  470 + <caret line="48" column="60" selection-start-line="48" selection-start-column="60" selection-end-line="48" selection-end-column="60" />
911 471 </state>
912 472 </provider>
913 473 </entry>
914   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java">
  474 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountDetail/cycleCountDetail.html">
915 475 <provider selected="true" editor-type-id="text-editor">
916   - <state relative-caret-position="-173">
917   - <caret line="161" column="34" selection-start-line="161" selection-start-column="34" selection-end-line="161" selection-end-column="34" />
918   - <state relative-caret-position="639">
919   - <caret line="85" selection-start-line="85" selection-end-line="85" />
920   - <folding>
921   - <element signature="imports" expanded="true" />
922   - </folding>
  476 + <state relative-caret-position="8402">
  477 + <caret line="639" column="9" lean-forward="true" selection-start-line="639" selection-start-column="9" selection-end-line="639" selection-end-column="9" />
923 478 </state>
924 479 </provider>
925 480 </entry>
926 481 <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java">
927 482 <provider selected="true" editor-type-id="text-editor">
928   - <state relative-caret-position="531">
929   - <caret line="91" selection-start-line="91" selection-end-line="91" />
930   - <folding>
931   - <element signature="imports" expanded="true" />
932   - </folding>
933   - </state>
934   - </provider>
935   - </entry>
936   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/domain/CycleCountHeader.java">
937   - <provider selected="true" editor-type-id="text-editor">
938   - <state relative-caret-position="4480">
939   - <caret line="231" column="4" selection-start-line="231" selection-start-column="4" selection-end-line="231" selection-end-column="4" />
940   - <folding>
941   - <element signature="e#15677#15678#0" expanded="true" />
942   - <element signature="e#15706#15707#0" expanded="true" />
943   - <element signature="e#15751#15752#0" expanded="true" />
944   - <element signature="e#15787#15788#0" expanded="true" />
945   - </folding>
  483 + <state relative-caret-position="-218">
  484 + <caret line="57" column="17" selection-start-line="57" selection-start-column="17" selection-end-line="57" selection-end-column="17" />
946 485 </state>
947 486 </provider>
948 487 </entry>
949   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html">
  488 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/controller/CycleCountHeaderController.java">
950 489 <provider selected="true" editor-type-id="text-editor">
951   - <state relative-caret-position="303">
952   - <caret line="103" column="20" lean-forward="true" selection-start-line="103" selection-start-column="20" selection-end-line="103" selection-end-column="34" />
  490 + <state relative-caret-position="146">
  491 + <caret line="76" column="59" selection-start-line="76" selection-start-column="59" selection-end-line="76" selection-end-column="59" />
953 492 </state>
954 493 </provider>
955 494 </entry>
956 495 <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html">
957 496 <provider selected="true" editor-type-id="text-editor">
958   - <state relative-caret-position="72">
959   - <caret line="91" column="52" lean-forward="true" selection-start-line="91" selection-start-column="52" selection-end-line="91" selection-end-column="52" />
  497 + <state relative-caret-position="564">
  498 + <caret line="46" column="36" selection-start-line="46" selection-start-column="36" selection-end-line="53" selection-end-column="41" />
960 499 </state>
961 500 </provider>
962 501 </entry>
... ...
src/main/java/com/huaheng/pc/config/materialType/domain/MaterialType.java 0 → 100644
  View file @7f2fa6c
  1 +package com.huaheng.pc.config.materialType.domain;
  2 +
  3 +import com.baomidou.mybatisplus.annotation.IdType;
  4 +import com.baomidou.mybatisplus.annotation.TableField;
  5 +import com.baomidou.mybatisplus.annotation.TableId;
  6 +import com.baomidou.mybatisplus.annotation.TableName;
  7 +import io.swagger.annotations.ApiModel;
  8 +import io.swagger.annotations.ApiModelProperty;
  9 +import java.io.Serializable;
  10 +import java.util.Date;
  11 +import lombok.Data;
  12 +
  13 +@ApiModel(value="com.huaheng.pc.config.materialType.domain.MaterialType")
  14 +@Data
  15 +@TableName(value = "material_type")
  16 +public class MaterialType implements Serializable {
  17 + /**
  18 + * ID
  19 + */
  20 + @TableId(value = "id", type = IdType.AUTO)
  21 + @ApiModelProperty(value="ID")
  22 + private Integer id;
  23 +
  24 + /**
  25 + * 编码
  26 + */
  27 + @TableField(value = "code")
  28 + @ApiModelProperty(value="编码")
  29 + private String code;
  30 +
  31 + /**
  32 + * 名称
  33 + */
  34 + @TableField(value = "name")
  35 + @ApiModelProperty(value="名称")
  36 + private String name;
  37 +
  38 + /**
  39 + * 货主编码
  40 + */
  41 + @TableField(value = "companyCode")
  42 + @ApiModelProperty(value="货主编码")
  43 + private String companyCode;
  44 +
  45 + /**
  46 + * 仓库编码
  47 + */
  48 + @TableField(value = "warehouseCode")
  49 + @ApiModelProperty(value="仓库编码")
  50 + private String warehouseCode;
  51 +
  52 + /**
  53 + * ABC分类
  54 + */
  55 + @TableField(value = "abcClass")
  56 + @ApiModelProperty(value="ABC分类")
  57 + private String abcClass;
  58 +
  59 + /**
  60 + * 保质期（天）
  61 + */
  62 + @TableField(value = "daysToExpire")
  63 + @ApiModelProperty(value="保质期（天）")
  64 + private Integer daysToExpire;
  65 +
  66 + /**
  67 + * 入库流程
  68 + */
  69 + @TableField(value = "receivingFlow")
  70 + @ApiModelProperty(value="入库流程")
  71 + private String receivingFlow;
  72 +
  73 + /**
  74 + * 出库流程
  75 + */
  76 + @TableField(value = "shippingFlow")
  77 + @ApiModelProperty(value="出库流程")
  78 + private String shippingFlow;
  79 +
  80 + /**
  81 + * 定位规则
  82 + */
  83 + @TableField(value = "locatingRule")
  84 + @ApiModelProperty(value="定位规则")
  85 + private String locatingRule;
  86 +
  87 + /**
  88 + * 分配规则
  89 + */
  90 + @TableField(value = "allocationRule")
  91 + @ApiModelProperty(value="分配规则")
  92 + private String allocationRule;
  93 +
  94 + /**
  95 + * 补货规则
  96 + */
  97 + @TableField(value = "replenishmentRule")
  98 + @ApiModelProperty(value="补货规则")
  99 + private String replenishmentRule;
  100 +
  101 + /**
  102 + * 空货位规则
  103 + */
  104 + @TableField(value = "emptyLocRule")
  105 + @ApiModelProperty(value="空货位规则")
  106 + private String emptyLocRule;
  107 +
  108 + /**
  109 + * 拣货规则
  110 + */
  111 + @TableField(value = "pickingRule")
  112 + @ApiModelProperty(value="拣货规则")
  113 + private String pickingRule;
  114 +
  115 + /**
  116 + * 属性模版
  117 + */
  118 + @TableField(value = "attributeTemplateCode")
  119 + @ApiModelProperty(value="属性模版")
  120 + private String attributeTemplateCode;
  121 +
  122 + /**
  123 + * 记录序列号
  124 + */
  125 + @TableField(value = "trackSerialNum")
  126 + @ApiModelProperty(value="记录序列号")
  127 + private Integer trackSerialNum;
  128 +
  129 + /**
  130 + * 自动生成序列号
  131 + */
  132 + @TableField(value = "autoGenSerialNum")
  133 + @ApiModelProperty(value="自动生成序列号")
  134 + private Integer autoGenSerialNum;
  135 +
  136 + /**
  137 + * 自动生成序列号表达式
  138 + */
  139 + @TableField(value = "autoGenSerialNumFormat")
  140 + @ApiModelProperty(value="自动生成序列号表达式")
  141 + private String autoGenSerialNumFormat;
  142 +
  143 + /**
  144 + * 序列号模版
  145 + */
  146 + @TableField(value = "snTemplateCode")
  147 + @ApiModelProperty(value="序列号模版")
  148 + private String snTemplateCode;
  149 +
  150 + /**
  151 + * 临期预警天数
  152 + */
  153 + @TableField(value = "expiringDays")
  154 + @ApiModelProperty(value="临期预警天数")
  155 + private Integer expiringDays;
  156 +
  157 + /**
  158 + * 收货预警天数
  159 + */
  160 + @TableField(value = "minShelfLifeDays")
  161 + @ApiModelProperty(value="收货预警天数")
  162 + private Integer minShelfLifeDays;
  163 +
  164 + /**
  165 + * 状态
  166 + */
  167 + @TableField(value = "enable")
  168 + @ApiModelProperty(value="状态")
  169 + private Integer enable;
  170 +
  171 + /**
  172 + * 创建时间
  173 + */
  174 + @TableField(value = "created")
  175 + @ApiModelProperty(value="创建时间")
  176 + private Date created;
  177 +
  178 + /**
  179 + * 创建用户
  180 + */
  181 + @TableField(value = "createdBy")
  182 + @ApiModelProperty(value="创建用户")
  183 + private String createdBy;
  184 +
  185 + /**
  186 + * 创建时间
  187 + */
  188 + @TableField(value = "lastUpdated")
  189 + @ApiModelProperty(value="创建时间")
  190 + private Date lastUpdated;
  191 +
  192 + /**
  193 + * 更新用户
  194 + */
  195 + @TableField(value = "lastUpdatedBy")
  196 + @ApiModelProperty(value="更新用户")
  197 + private String lastUpdatedBy;
  198 +
  199 + /**
  200 + * 数据版本
  201 + */
  202 + @TableField(value = "version")
  203 + @ApiModelProperty(value="数据版本")
  204 + private Integer version;
  205 +
  206 + /**
  207 + * 是否AGV区域发货
  208 + */
  209 + @TableField(value = "userDef1")
  210 + @ApiModelProperty(value="是否AGV区域发货")
  211 + private String userDef1;
  212 +
  213 + /**
  214 + * 自定义字段2
  215 + */
  216 + @TableField(value = "userDef2")
  217 + @ApiModelProperty(value="自定义字段2")
  218 + private String userDef2;
  219 +
  220 + /**
  221 + * 商品同步标识
  222 + */
  223 + @TableField(value = "userDef3")
  224 + @ApiModelProperty(value="商品同步标识")
  225 + private String userDef3;
  226 +
  227 + /**
  228 + * 自定义字段4
  229 + */
  230 + @TableField(value = "userDef4")
  231 + @ApiModelProperty(value="自定义字段4")
  232 + private String userDef4;
  233 +
  234 + /**
  235 + * 自定义字段5
  236 + */
  237 + @TableField(value = "userDef5")
  238 + @ApiModelProperty(value="自定义字段5")
  239 + private String userDef5;
  240 +
  241 + /**
  242 + * 自定义字段6
  243 + */
  244 + @TableField(value = "userDef6")
  245 + @ApiModelProperty(value="自定义字段6")
  246 + private String userDef6;
  247 +
  248 + /**
  249 + * 自定义字段7
  250 + */
  251 + @TableField(value = "userDef7")
  252 + @ApiModelProperty(value="自定义字段7")
  253 + private String userDef7;
  254 +
  255 + /**
  256 + * 自定义字段8
  257 + */
  258 + @TableField(value = "userDef8")
  259 + @ApiModelProperty(value="自定义字段8")
  260 + private String userDef8;
  261 +
  262 + private static final long serialVersionUID = 1L;
  263 +}
0 264 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/config/materialType/mapper/MaterialTypeMapper.java 0 → 100644
  View file @7f2fa6c
  1 +package com.huaheng.pc.config.materialType.mapper;
  2 +
  3 +import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  4 +import com.huaheng.pc.config.materialType.domain.MaterialType;
  5 +
  6 +public interface MaterialTypeMapper extends BaseMapper<MaterialType> {
  7 +}
0 8 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/config/materialType/service/MaterialTypeService.java 0 → 100644
  View file @7f2fa6c
  1 +package com.huaheng.pc.config.materialType.service;
  2 +
  3 +import org.springframework.stereotype.Service;
  4 +import javax.annotation.Resource;
  5 +import java.util.List;
  6 +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  7 +import com.huaheng.pc.config.materialType.domain.MaterialType;
  8 +import com.huaheng.pc.config.materialType.mapper.MaterialTypeMapper;
  9 +@Service
  10 +public class MaterialTypeService extends ServiceImpl<MaterialTypeMapper, MaterialType> {
  11 +
  12 +}
... ...
src/main/java/com/huaheng/pc/config/receiptType/controller/receiptTypeController.java
  View file @7f2fa6c
... ... @@ -66,6 +66,7 @@ public class receiptTypeController extends BaseController {
66 66 .eq(StringUtils.isNotEmpty(receiptType.getCode()), ReceiptType::getCode, receiptType.getCode())
67 67 .eq(StringUtils.isNotEmpty(receiptType.getReferType()), ReceiptType::getReferType, receiptType.getReferType())
68 68 .in(ReceiptType::getCompanyCode, ShiroUtils.getCompanyCodeList())
  69 + .eq(StringUtils.isNotEmpty(receiptType.getName()), ReceiptType::getName, receiptType.getName())
69 70 .eq(ReceiptType::getWarehouseCode, ShiroUtils.getWarehouseCode());
70 71  
71 72 if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
... ...
src/main/java/com/huaheng/pc/config/receiptType/domain/ReceiptType.java
  View file @7f2fa6c
... ... @@ -6,12 +6,14 @@ import com.baomidou.mybatisplus.annotation.TableId;
6 6 import com.baomidou.mybatisplus.annotation.TableName;
7 7 import io.swagger.annotations.ApiModel;
8 8 import io.swagger.annotations.ApiModelProperty;
  9 +import lombok.Data;
9 10  
10 11 import java.io.Serializable;
11 12 import java.util.Date;
12 13  
13 14 @ApiModel(value="com.huaheng.pc.config.receiptType.domain.ReceiptType")
14 15 @TableName(value = "receipt_type")
  16 +@Data
15 17 public class ReceiptType implements Serializable {
16 18 /**
17 19 * 入库单内部号
... ... @@ -42,6 +44,13 @@ public class ReceiptType implements Serializable {
42 44 private String code;
43 45  
44 46 /**
  47 + * 名称
  48 + */
  49 + @TableField(value = "name")
  50 + @ApiModelProperty(value="名称")
  51 + private String name;
  52 +
  53 + /**
45 54 * 关联订单类型
46 55 */
47 56 @TableField(value = "referType")
... ... @@ -159,424 +168,4 @@ public class ReceiptType implements Serializable {
159 168 @TableField(value = "processStamp")
160 169 @ApiModelProperty(value="处理标记")
161 170 private String processStamp;
162   -
163   - private static final long serialVersionUID = 1L;
164   -
165   - public static final String COL_WAREHOUSECODE = "warehouseCode";
166   -
167   - public static final String COL_COMPANYCODE = "companyCode";
168   -
169   - public static final String COL_CODE = "code";
170   -
171   - public static final String COL_REFERTYPE = "referType";
172   -
173   - public static final String COL_RECEIPTFLOW = "receiptFlow";
174   -
175   - public static final String COL_ENABLE = "enable";
176   -
177   - public static final String COL_CREATED = "created";
178   -
179   - public static final String COL_CREATEDBY = "createdBy";
180   -
181   - public static final String COL_LASTUPDATED = "lastUpdated";
182   -
183   - public static final String COL_LASTUPDATEDBY = "lastUpdatedBy";
184   -
185   - public static final String COL_VERSION = "version";
186   -
187   - public static final String COL_USERDEF1 = "userDef1";
188   -
189   - public static final String COL_USERDEF2 = "userDef2";
190   -
191   - public static final String COL_USERDEF3 = "userDef3";
192   -
193   - public static final String COL_USERDEF4 = "userDef4";
194   -
195   - public static final String COL_USERDEF5 = "userDef5";
196   -
197   - public static final String COL_USERDEF6 = "userDef6";
198   -
199   - public static final String COL_USERDEF7 = "userDef7";
200   -
201   - public static final String COL_USERDEF8 = "userDef8";
202   -
203   - public static final String COL_PROCESSSTAMP = "processStamp";
204   -
205   - /**
206   - * 获取入库单内部号
207   - *
208   - * @return id - 入库单内部号
209   - */
210   - public Integer getId() {
211   - return id;
212   - }
213   -
214   - /**
215   - * 设置入库单内部号
216   - *
217   - * @param id 入库单内部号
218   - */
219   - public void setId(Integer id) {
220   - this.id = id;
221   - }
222   -
223   - /**
224   - * 获取仓库
225   - *
226   - * @return warehouseCode - 仓库
227   - */
228   - public String getWarehouseCode() {
229   - return warehouseCode;
230   - }
231   -
232   - /**
233   - * 设置仓库
234   - *
235   - * @param warehouseCode 仓库
236   - */
237   - public void setWarehouseCode(String warehouseCode) {
238   - this.warehouseCode = warehouseCode;
239   - }
240   -
241   - /**
242   - * 获取货主
243   - *
244   - * @return companyCode - 货主
245   - */
246   - public String getCompanyCode() {
247   - return companyCode;
248   - }
249   -
250   - /**
251   - * 设置货主
252   - *
253   - * @param companyCode 货主
254   - */
255   - public void setCompanyCode(String companyCode) {
256   - this.companyCode = companyCode;
257   - }
258   -
259   - /**
260   - * 获取编码
261   - *
262   - * @return code - 编码
263   - */
264   - public String getCode() {
265   - return code;
266   - }
267   -
268   - /**
269   - * 设置编码
270   - *
271   - * @param code 编码
272   - */
273   - public void setCode(String code) {
274   - this.code = code;
275   - }
276   -
277   - /**
278   - * 获取关联订单类型
279   - *
280   - * @return referType - 关联订单类型
281   - */
282   - public String getReferType() {
283   - return referType;
284   - }
285   -
286   - /**
287   - * 设置关联订单类型
288   - *
289   - * @param referType 关联订单类型
290   - */
291   - public void setReferType(String referType) {
292   - this.referType = referType;
293   - }
294   -
295   - /**
296   - * 获取入库流程
297   - *
298   - * @return receiptFlow - 入库流程
299   - */
300   - public String getReceiptFlow() {
301   - return receiptFlow;
302   - }
303   -
304   - /**
305   - * 设置入库流程
306   - *
307   - * @param receiptFlow 入库流程
308   - */
309   - public void setReceiptFlow(String receiptFlow) {
310   - this.receiptFlow = receiptFlow;
311   - }
312   -
313   - /**
314   - * 获取是否启用
315   - *
316   - * @return enable - 是否启用
317   - */
318   - public Boolean getEnable() {
319   - return enable;
320   - }
321   -
322   - /**
323   - * 设置是否启用
324   - *
325   - * @param enable 是否启用
326   - */
327   - public void setEnable(Boolean enable) {
328   - this.enable = enable;
329   - }
330   -
331   - /**
332   - * 获取创建时间
333   - *
334   - * @return created - 创建时间
335   - */
336   - public Date getCreated() {
337   - return created;
338   - }
339   -
340   - /**
341   - * 设置创建时间
342   - *
343   - * @param created 创建时间
344   - */
345   - public void setCreated(Date created) {
346   - this.created = created;
347   - }
348   -
349   - /**
350   - * 获取创建用户
351   - *
352   - * @return createdBy - 创建用户
353   - */
354   - public String getCreatedBy() {
355   - return createdBy;
356   - }
357   -
358   - /**
359   - * 设置创建用户
360   - *
361   - * @param createdBy 创建用户
362   - */
363   - public void setCreatedBy(String createdBy) {
364   - this.createdBy = createdBy;
365   - }
366   -
367   - /**
368   - * 获取创建时间
369   - *
370   - * @return lastUpdated - 创建时间
371   - */
372   - public Date getLastUpdated() {
373   - return lastUpdated;
374   - }
375   -
376   - /**
377   - * 设置创建时间
378   - *
379   - * @param lastUpdated 创建时间
380   - */
381   - public void setLastUpdated(Date lastUpdated) {
382   - this.lastUpdated = lastUpdated;
383   - }
384   -
385   - /**
386   - * 获取更新用户
387   - *
388   - * @return lastUpdatedBy - 更新用户
389   - */
390   - public String getLastUpdatedBy() {
391   - return lastUpdatedBy;
392   - }
393   -
394   - /**
395   - * 设置更新用户
396   - *
397   - * @param lastUpdatedBy 更新用户
398   - */
399   - public void setLastUpdatedBy(String lastUpdatedBy) {
400   - this.lastUpdatedBy = lastUpdatedBy;
401   - }
402   -
403   - /**
404   - * 获取数据版本
405   - *
406   - * @return version - 数据版本
407   - */
408   - public Integer getVersion() {
409   - return version;
410   - }
411   -
412   - /**
413   - * 设置数据版本
414   - *
415   - * @param version 数据版本
416   - */
417   - public void setVersion(Integer version) {
418   - this.version = version;
419   - }
420   -
421   - /**
422   - * 获取自定义字段1
423   - *
424   - * @return userDef1 - 自定义字段1
425   - */
426   - public String getUserDef1() {
427   - return userDef1;
428   - }
429   -
430   - /**
431   - * 设置自定义字段1
432   - *
433   - * @param userDef1 自定义字段1
434   - */
435   - public void setUserDef1(String userDef1) {
436   - this.userDef1 = userDef1;
437   - }
438   -
439   - /**
440   - * 获取自定义字段2
441   - *
442   - * @return userDef2 - 自定义字段2
443   - */
444   - public String getUserDef2() {
445   - return userDef2;
446   - }
447   -
448   - /**
449   - * 设置自定义字段2
450   - *
451   - * @param userDef2 自定义字段2
452   - */
453   - public void setUserDef2(String userDef2) {
454   - this.userDef2 = userDef2;
455   - }
456   -
457   - /**
458   - * 获取自定义字段3
459   - *
460   - * @return userDef3 - 自定义字段3
461   - */
462   - public String getUserDef3() {
463   - return userDef3;
464   - }
465   -
466   - /**
467   - * 设置自定义字段3
468   - *
469   - * @param userDef3 自定义字段3
470   - */
471   - public void setUserDef3(String userDef3) {
472   - this.userDef3 = userDef3;
473   - }
474   -
475   - /**
476   - * 获取自定义字段4
477   - *
478   - * @return userDef4 - 自定义字段4
479   - */
480   - public String getUserDef4() {
481   - return userDef4;
482   - }
483   -
484   - /**
485   - * 设置自定义字段4
486   - *
487   - * @param userDef4 自定义字段4
488   - */
489   - public void setUserDef4(String userDef4) {
490   - this.userDef4 = userDef4;
491   - }
492   -
493   - /**
494   - * 获取自定义字段5
495   - *
496   - * @return userDef5 - 自定义字段5
497   - */
498   - public String getUserDef5() {
499   - return userDef5;
500   - }
501   -
502   - /**
503   - * 设置自定义字段5
504   - *
505   - * @param userDef5 自定义字段5
506   - */
507   - public void setUserDef5(String userDef5) {
508   - this.userDef5 = userDef5;
509   - }
510   -
511   - /**
512   - * 获取自定义字段6
513   - *
514   - * @return userDef6 - 自定义字段6
515   - */
516   - public String getUserDef6() {
517   - return userDef6;
518   - }
519   -
520   - /**
521   - * 设置自定义字段6
522   - *
523   - * @param userDef6 自定义字段6
524   - */
525   - public void setUserDef6(String userDef6) {
526   - this.userDef6 = userDef6;
527   - }
528   -
529   - /**
530   - * 获取自定义字段7
531   - *
532   - * @return userDef7 - 自定义字段7
533   - */
534   - public String getUserDef7() {
535   - return userDef7;
536   - }
537   -
538   - /**
539   - * 设置自定义字段7
540   - *
541   - * @param userDef7 自定义字段7
542   - */
543   - public void setUserDef7(String userDef7) {
544   - this.userDef7 = userDef7;
545   - }
546   -
547   - /**
548   - * 获取自定义字段8
549   - *
550   - * @return userDef8 - 自定义字段8
551   - */
552   - public String getUserDef8() {
553   - return userDef8;
554   - }
555   -
556   - /**
557   - * 设置自定义字段8
558   - *
559   - * @param userDef8 自定义字段8
560   - */
561   - public void setUserDef8(String userDef8) {
562   - this.userDef8 = userDef8;
563   - }
564   -
565   - /**
566   - * 获取处理标记
567   - *
568   - * @return processStamp - 处理标记
569   - */
570   - public String getProcessStamp() {
571   - return processStamp;
572   - }
573   -
574   - /**
575   - * 设置处理标记
576   - *
577   - * @param processStamp 处理标记
578   - */
579   - public void setProcessStamp(String processStamp) {
580   - this.processStamp = processStamp;
581   - }
582 171 }
583 172 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/config/receiptType/service/ReceiptTypeServiceImpl.java
  View file @7f2fa6c
1 1 package com.huaheng.pc.config.receiptType.service;
2 2  
  3 +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
  4 +import com.baomidou.mybatisplus.core.toolkit.Wrappers;
3 5 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  6 +import com.huaheng.common.utils.security.ShiroUtils;
4 7 import com.huaheng.pc.config.receiptType.domain.ReceiptType;
5 8 import com.huaheng.pc.config.receiptType.mapper.ReceiptTypeMapper;
6 9 import org.springframework.stereotype.Service;
7 10  
8   -@Service
  11 +import java.util.List;
  12 +import java.util.Map;
  13 +
  14 +@Service("receiptTypeService")
9 15 public class ReceiptTypeServiceImpl extends ServiceImpl<ReceiptTypeMapper, ReceiptType> implements ReceiptTypeService {
10 16  
  17 + public List<Map<String, Object>> getType(){
  18 + LambdaQueryWrapper<ReceiptType> lambdaQueryWrapper = Wrappers.lambdaQuery();
  19 + lambdaQueryWrapper.eq(ReceiptType::getWarehouseCode, ShiroUtils.getWarehouseCode())
  20 + .in(ReceiptType::getCompanyCode, ShiroUtils.getCompanyCodeList());
  21 + return this.listMaps(lambdaQueryWrapper);
  22 + }
11 23 }
... ...
src/main/java/com/huaheng/pc/config/statusFlow/controller/StatusFlowDetailController.java
  View file @7f2fa6c
... ... @@ -15,7 +15,9 @@ import com.huaheng.framework.web.page.PageDomain;
15 15 import com.huaheng.framework.web.page.TableDataInfo;
16 16 import com.huaheng.framework.web.page.TableSupport;
17 17 import com.huaheng.pc.config.statusFlow.domain.StatusFlowDetail;
  18 +import com.huaheng.pc.config.statusFlow.domain.StatusFlowHeader;
18 19 import com.huaheng.pc.config.statusFlow.service.StatusFlowDetailService;
  20 +import com.huaheng.pc.config.statusFlow.service.StatusFlowHeaderService;
19 21 import io.swagger.annotations.Api;
20 22 import io.swagger.annotations.ApiOperation;
21 23 import io.swagger.annotations.ApiParam;
... ... @@ -35,6 +37,8 @@ public class StatusFlowDetailController extends BaseController {
35 37  
36 38 @Resource
37 39 private StatusFlowDetailService statusFlowDetailService;
  40 + @Resource
  41 + private StatusFlowHeaderService statusFlowHeaderService;
38 42  
39 43 private String prefix = "config/statusFlowDetail";
40 44  
... ... @@ -70,7 +74,8 @@ public class StatusFlowDetailController extends BaseController {
70 74 .eq(StringUtils.isNotEmpty(statusFlowDetail.getRecordType()),
71 75 StatusFlowDetail::getRecordType, statusFlowDetail.getRecordType())
72 76 .eq(StringUtils.isNotNull(statusFlowDetail.getNessary()),
73   - StatusFlowDetail::getNessary, statusFlowDetail.getNessary());
  77 + StatusFlowDetail::getNessary, statusFlowDetail.getNessary())
  78 + .orderByAsc(StatusFlowDetail::getSequence);
74 79  
75 80 if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
76 81 /*使用分页查询*/
... ... @@ -88,7 +93,9 @@ public class StatusFlowDetailController extends BaseController {
88 93 */
89 94 @GetMapping("/add/{headerId}")
90 95 public String add(@PathVariable("headerId")Integer headerId, ModelMap mmap) {
  96 + StatusFlowHeader statusFlowHeader = statusFlowHeaderService.getById(headerId);
91 97 mmap.put("headerId",headerId);
  98 + mmap.put("headerCode", statusFlowHeader.getCode());
92 99 return prefix + "/add";
93 100 }
94 101  
... ...
src/main/java/com/huaheng/pc/config/statusFlow/domain/StatusFlowDetail.java
  View file @7f2fa6c
... ... @@ -22,9 +22,13 @@ public class StatusFlowDetail implements Serializable {
22 22 private Integer id;
23 23  
24 24 @TableField(value = "headerId")
25   - @ApiModelProperty(value="null")
  25 + @ApiModelProperty(value="头表id")
26 26 private Integer headerId;
27 27  
  28 + @TableField(value = "headerCode")
  29 + @ApiModelProperty(value="头表编码")
  30 + private Integer headerCode;
  31 +
28 32 /**
29 33 * 状态流
30 34 */
... ...
src/main/java/com/huaheng/pc/config/statusFlow/domain/StatusFlowHeader.java
  View file @7f2fa6c
... ... @@ -25,14 +25,14 @@ public class StatusFlowHeader implements Serializable {
25 25 * 状态流
26 26 */
27 27 @TableField(value = "code")
28   - @ApiModelProperty(value="状态流")
  28 + @ApiModelProperty(value="编码")
29 29 private String code;
30 30  
31 31 /**
32 32 * 状态流名称
33 33 */
34 34 @TableField(value = "name")
35   - @ApiModelProperty(value="状态流名称")
  35 + @ApiModelProperty(value="名称")
36 36 private String name;
37 37  
38 38 /**
... ...
src/main/java/com/huaheng/pc/config/statusFlow/service/StatusFlowDetailService.java
  View file @7f2fa6c
1 1 package com.huaheng.pc.config.statusFlow.service;
2 2  
  3 +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
  4 +import com.baomidou.mybatisplus.core.toolkit.Wrappers;
3 5 import org.springframework.stereotype.Service;
4 6 import javax.annotation.Resource;
5 7 import java.util.List;
  8 +import java.util.WeakHashMap;
  9 +
6 10 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
7 11 import com.huaheng.pc.config.statusFlow.domain.StatusFlowDetail;
8 12 import com.huaheng.pc.config.statusFlow.mapper.StatusFlowDetailMapper;
9 13 @Service
10 14 public class StatusFlowDetailService extends ServiceImpl<StatusFlowDetailMapper, StatusFlowDetail> {
11 15  
  16 + public List<StatusFlowDetail> queryStatusFlowDetail(String headerCode){
  17 + LambdaQueryWrapper<StatusFlowDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
  18 + lambdaQueryWrapper.orderByAsc(StatusFlowDetail::getSequence)
  19 + .eq(StatusFlowDetail::getHeaderCode, headerCode);
  20 + return this.list(lambdaQueryWrapper);
  21 + }
12 22 }
... ...
src/main/java/com/huaheng/pc/config/statusFlow/service/StatusFlowHeaderService.java
  View file @7f2fa6c
1 1 package com.huaheng.pc.config.statusFlow.service;
2 2  
  3 +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
  4 +import com.baomidou.mybatisplus.core.toolkit.Wrappers;
3 5 import org.springframework.stereotype.Service;
4 6 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
5 7 import com.huaheng.pc.config.statusFlow.domain.StatusFlowHeader;
6 8 import com.huaheng.pc.config.statusFlow.mapper.StatusFlowHeaderMapper;
7   -@Service
  9 +
  10 +import java.util.List;
  11 +import java.util.Map;
  12 +
  13 +@Service("StatusFlow")
8 14 public class StatusFlowHeaderService extends ServiceImpl<StatusFlowHeaderMapper, StatusFlowHeader> {
9 15  
  16 + public List<Map<String, Object>> flowList(){
  17 + LambdaQueryWrapper<StatusFlowHeader> lambda = Wrappers.lambdaQuery();
  18 + lambda.select(StatusFlowHeader::getCode, StatusFlowHeader::getName);
  19 + return this.listMaps(lambda);
  20 + }
10 21 }
... ...
src/main/java/com/huaheng/pc/inventory/adjust/domain/AdjustDetail.java 0 → 100644
  View file @7f2fa6c
  1 +package com.huaheng.pc.inventory.adjust.domain;
  2 +
  3 +import com.baomidou.mybatisplus.annotation.IdType;
  4 +import com.baomidou.mybatisplus.annotation.TableField;
  5 +import com.baomidou.mybatisplus.annotation.TableId;
  6 +import com.baomidou.mybatisplus.annotation.TableName;
  7 +import io.swagger.annotations.ApiModel;
  8 +import io.swagger.annotations.ApiModelProperty;
  9 +import java.io.Serializable;
  10 +import java.util.Date;
  11 +import lombok.Data;
  12 +
  13 +@ApiModel(value="com.huaheng.pc.inventory.adjust.domain.AdjustDetail")
  14 +@Data
  15 +@TableName(value = "adjust_detail")
  16 +public class AdjustDetail implements Serializable {
  17 + @TableId(value = "id", type = IdType.AUTO)
  18 + @ApiModelProperty(value="null")
  19 + private Integer id;
  20 +
  21 + /**
  22 + * 调整单号
  23 + */
  24 + @TableField(value = "adjustCode")
  25 + @ApiModelProperty(value="调整单号")
  26 + private String adjustCode;
  27 +
  28 + /**
  29 + * 盘点单号
  30 + */
  31 + @TableField(value = "cycleCountCode")
  32 + @ApiModelProperty(value="盘点单号")
  33 + private String cycleCountCode;
  34 +
  35 + /**
  36 + * 盘点单号行号
  37 + */
  38 + @TableField(value = "cycleCountLineId")
  39 + @ApiModelProperty(value="盘点单号行号")
  40 + private String cycleCountLineId;
  41 +
  42 + /**
  43 + * 质检单号
  44 + */
  45 + @TableField(value = "checkCode")
  46 + @ApiModelProperty(value="质检单号")
  47 + private String checkCode;
  48 +
  49 + /**
  50 + * 质检单号行号
  51 + */
  52 + @TableField(value = "checkLineCode")
  53 + @ApiModelProperty(value="质检单号行号")
  54 + private String checkLineCode;
  55 +
  56 + /**
  57 + * 调整关联单号
  58 + */
  59 + @TableField(value = "referCode")
  60 + @ApiModelProperty(value="调整关联单号")
  61 + private String referCode;
  62 +
  63 + /**
  64 + * 调整关联标识
  65 + */
  66 + @TableField(value = "referId")
  67 + @ApiModelProperty(value="调整关联标识")
  68 + private Integer referId;
  69 +
  70 + /**
  71 + * 调整行号
  72 + */
  73 + @TableField(value = "pendingAdjustId")
  74 + @ApiModelProperty(value="调整行号")
  75 + private Integer pendingAdjustId;
  76 +
  77 + /**
  78 + * 仓库编码
  79 + */
  80 + @TableField(value = "warehouseCode")
  81 + @ApiModelProperty(value="仓库编码")
  82 + private String warehouseCode;
  83 +
  84 + /**
  85 + * 货主编码
  86 + */
  87 + @TableField(value = "companyCode")
  88 + @ApiModelProperty(value="货主编码")
  89 + private String companyCode;
  90 +
  91 + /**
  92 + * 商品编码
  93 + */
  94 + @TableField(value = "materialCode")
  95 + @ApiModelProperty(value="商品编码")
  96 + private String materialCode;
  97 +
  98 + /**
  99 + * 商品名称
  100 + */
  101 + @TableField(value = "materialName")
  102 + @ApiModelProperty(value="商品名称")
  103 + private String materialName;
  104 +
  105 + /**
  106 + * 商品规格
  107 + */
  108 + @TableField(value = "materialSpec")
  109 + @ApiModelProperty(value="商品规格")
  110 + private String materialSpec;
  111 +
  112 + /**
  113 + * 商品单位
  114 + */
  115 + @TableField(value = "materialUnit")
  116 + @ApiModelProperty(value="商品单位")
  117 + private String materialUnit;
  118 +
  119 + /**
  120 + * 1盘点 ，2 质检 ，3 调整
  121 + */
  122 + @TableField(value = "problemType")
  123 + @ApiModelProperty(value="1盘点 ，2 质检 ，3 调整")
  124 + private String problemType;
  125 +
  126 + /**
  127 + * 属性号
  128 + */
  129 + @TableField(value = "attributeId")
  130 + @ApiModelProperty(value="属性号")
  131 + private Integer attributeId;
  132 +
  133 + /**
  134 + * 调整前库存状态
  135 + */
  136 + @TableField(value = "fromInventorySts")
  137 + @ApiModelProperty(value="调整前库存状态")
  138 + private String fromInventorySts;
  139 +
  140 + /**
  141 + * 调整后库存状态
  142 + */
  143 + @TableField(value = "toInventorySts")
  144 + @ApiModelProperty(value="调整后库存状态")
  145 + private String toInventorySts;
  146 +
  147 + /**
  148 + * 调整前的数量
  149 + */
  150 + @TableField(value = "fromQty")
  151 + @ApiModelProperty(value="调整前的数量")
  152 + private Integer fromQty;
  153 +
  154 + /**
  155 + * 调整后的数量
  156 + */
  157 + @TableField(value = "toQty")
  158 + @ApiModelProperty(value="调整后的数量 ")
  159 + private Integer toQty;
  160 +
  161 + /**
  162 + * 调整变动数量
  163 + */
  164 + @TableField(value = "gapQty")
  165 + @ApiModelProperty(value="调整变动数量 ")
  166 + private Integer gapQty;
  167 +
  168 + /**
  169 + * 操作人
  170 + */
  171 + @TableField(value = "reportBy")
  172 + @ApiModelProperty(value="操作人")
  173 + private String reportBy;
  174 +
  175 + /**
  176 + * 状态 -0-待调整 1-已调整 2-未批准 3-已批准
  177 + */
  178 + @TableField(value = "status")
  179 + @ApiModelProperty(value="状态 -0-待调整 1-已调整 2-未批准 3-已批准")
  180 + private Integer status;
  181 +
  182 + /**
  183 + * 创建时间
  184 + */
  185 + @TableField(value = "created")
  186 + @ApiModelProperty(value="创建时间")
  187 + private Date created;
  188 +
  189 + /**
  190 + * 操作时间
  191 + */
  192 + @TableField(value = "operateTime")
  193 + @ApiModelProperty(value="操作时间")
  194 + private Date operateTime;
  195 +
  196 + /**
  197 + * 审批时间
  198 + */
  199 + @TableField(value = "agreeTime")
  200 + @ApiModelProperty(value="审批时间")
  201 + private Date agreeTime;
  202 +
  203 + /**
  204 + * 备注
  205 + */
  206 + @TableField(value = "Remark")
  207 + @ApiModelProperty(value="备注")
  208 + private String remark;
  209 +
  210 + /**
  211 + * 数据版本
  212 + */
  213 + @TableField(value = "version")
  214 + @ApiModelProperty(value="数据版本")
  215 + private Integer version;
  216 +
  217 + /**
  218 + * 自定义字段1
  219 + */
  220 + @TableField(value = "userDef1")
  221 + @ApiModelProperty(value="自定义字段1")
  222 + private String userDef1;
  223 +
  224 + /**
  225 + * 自定义字段2
  226 + */
  227 + @TableField(value = "userDef2")
  228 + @ApiModelProperty(value="自定义字段2")
  229 + private String userDef2;
  230 +
  231 + /**
  232 + * 自定义字段3
  233 + */
  234 + @TableField(value = "userDef3")
  235 + @ApiModelProperty(value="自定义字段3")
  236 + private String userDef3;
  237 +
  238 + /**
  239 + * 自定义字段4
  240 + */
  241 + @TableField(value = "userDef4")
  242 + @ApiModelProperty(value="自定义字段4")
  243 + private String userDef4;
  244 +
  245 + /**
  246 + * 自定义字段5
  247 + */
  248 + @TableField(value = "userDef5")
  249 + @ApiModelProperty(value="自定义字段5")
  250 + private String userDef5;
  251 +
  252 + /**
  253 + * 自定义字段6
  254 + */
  255 + @TableField(value = "userDef6")
  256 + @ApiModelProperty(value="自定义字段6")
  257 + private String userDef6;
  258 +
  259 + /**
  260 + * 自定义字段7
  261 + */
  262 + @TableField(value = "userDef7")
  263 + @ApiModelProperty(value="自定义字段7")
  264 + private String userDef7;
  265 +
  266 + /**
  267 + * 自定义字段8
  268 + */
  269 + @TableField(value = "userDef8")
  270 + @ApiModelProperty(value="自定义字段8")
  271 + private String userDef8;
  272 +
  273 + /**
  274 + * 处理标记
  275 + */
  276 + @TableField(value = "processStamp")
  277 + @ApiModelProperty(value="处理标记")
  278 + private String processStamp;
  279 +
  280 + private static final long serialVersionUID = 1L;
  281 +}
0 282 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/inventory/adjust/domain/AdjustHeader.java 0 → 100644
  View file @7f2fa6c
  1 +package com.huaheng.pc.inventory.adjust.domain;
  2 +
  3 +import com.baomidou.mybatisplus.annotation.IdType;
  4 +import com.baomidou.mybatisplus.annotation.TableField;
  5 +import com.baomidou.mybatisplus.annotation.TableId;
  6 +import com.baomidou.mybatisplus.annotation.TableName;
  7 +import io.swagger.annotations.ApiModel;
  8 +import io.swagger.annotations.ApiModelProperty;
  9 +import java.io.Serializable;
  10 +import java.util.Date;
  11 +import lombok.Data;
  12 +
  13 +@ApiModel(value="com.huaheng.pc.inventory.adjust.domain.AdjustHeader")
  14 +@Data
  15 +@TableName(value = "adjust_header")
  16 +public class AdjustHeader implements Serializable {
  17 + @TableId(value = "id", type = IdType.AUTO)
  18 + @ApiModelProperty(value="null")
  19 + private Integer id;
  20 +
  21 + /**
  22 + * 编码
  23 + */
  24 + @TableField(value = "code")
  25 + @ApiModelProperty(value="编码")
  26 + private String code;
  27 +
  28 + /**
  29 + * 名称
  30 + */
  31 + @TableField(value = "name")
  32 + @ApiModelProperty(value="名称")
  33 + private String name;
  34 +
  35 + /**
  36 + * 仓库代码
  37 + */
  38 + @TableField(value = "warehouseCode")
  39 + @ApiModelProperty(value="仓库代码")
  40 + private String warehouseCode;
  41 +
  42 + /**
  43 + * 货主编码
  44 + */
  45 + @TableField(value = "companyCode")
  46 + @ApiModelProperty(value="货主编码")
  47 + private String companyCode;
  48 +
  49 + /**
  50 + * 1盘点 ，2 质检 ，3 调整
  51 + */
  52 + @TableField(value = "problemType")
  53 + @ApiModelProperty(value="1盘点 ，2 质检 ，3 调整")
  54 + private String problemType;
  55 +
  56 + /**
  57 + * 盘点单号
  58 + */
  59 + @TableField(value = "cycleCountCode")
  60 + @ApiModelProperty(value="盘点单号")
  61 + private String cycleCountCode;
  62 +
  63 + /**
  64 + * 质检单号
  65 + */
  66 + @TableField(value = "checkCode")
  67 + @ApiModelProperty(value="质检单号")
  68 + private String checkCode;
  69 +
  70 + /**
  71 + * 关联上游单号
  72 + */
  73 + @TableField(value = "referCode")
  74 + @ApiModelProperty(value="关联上游单号")
  75 + private String referCode;
  76 +
  77 + /**
  78 + * 关联上游单号
  79 + */
  80 + @TableField(value = "referId")
  81 + @ApiModelProperty(value="关联上游单号")
  82 + private Integer referId;
  83 +
  84 + /**
  85 + * 关联上游系统原因说明
  86 + */
  87 + @TableField(value = "referReason")
  88 + @ApiModelProperty(value="关联上游系统原因说明")
  89 + private String referReason;
  90 +
  91 + /**
  92 + * 创建人
  93 + */
  94 + @TableField(value = "createdBy")
  95 + @ApiModelProperty(value="创建人")
  96 + private String createdBy;
  97 +
  98 + /**
  99 + * 创建时间
  100 + */
  101 + @TableField(value = "created")
  102 + @ApiModelProperty(value="创建时间")
  103 + private Date created;
  104 +
  105 + /**
  106 + * 修改人
  107 + */
  108 + @TableField(value = "lastUpdatedBy")
  109 + @ApiModelProperty(value="修改人")
  110 + private String lastUpdatedBy;
  111 +
  112 + /**
  113 + * 修改时间
  114 + */
  115 + @TableField(value = "lastUpdated")
  116 + @ApiModelProperty(value="修改时间")
  117 + private Date lastUpdated;
  118 +
  119 + /**
  120 + * 数据版本
  121 + */
  122 + @TableField(value = "version")
  123 + @ApiModelProperty(value="数据版本")
  124 + private Integer version;
  125 +
  126 + /**
  127 + * 自定义字段1
  128 + */
  129 + @TableField(value = "userDef1")
  130 + @ApiModelProperty(value="自定义字段1")
  131 + private String userDef1;
  132 +
  133 + /**
  134 + * 自定义字段2
  135 + */
  136 + @TableField(value = "userDef2")
  137 + @ApiModelProperty(value="自定义字段2")
  138 + private String userDef2;
  139 +
  140 + /**
  141 + * 自定义字段3
  142 + */
  143 + @TableField(value = "userDef3")
  144 + @ApiModelProperty(value="自定义字段3")
  145 + private String userDef3;
  146 +
  147 + /**
  148 + * 自定义字段4
  149 + */
  150 + @TableField(value = "userDef4")
  151 + @ApiModelProperty(value="自定义字段4")
  152 + private String userDef4;
  153 +
  154 + /**
  155 + * 自定义字段5
  156 + */
  157 + @TableField(value = "userDef5")
  158 + @ApiModelProperty(value="自定义字段5")
  159 + private String userDef5;
  160 +
  161 + /**
  162 + * 自定义字段6
  163 + */
  164 + @TableField(value = "userDef6")
  165 + @ApiModelProperty(value="自定义字段6")
  166 + private String userDef6;
  167 +
  168 + /**
  169 + * 自定义字段7
  170 + */
  171 + @TableField(value = "userDef7")
  172 + @ApiModelProperty(value="自定义字段7")
  173 + private String userDef7;
  174 +
  175 + /**
  176 + * 处理标记
  177 + */
  178 + @TableField(value = "processStamp")
  179 + @ApiModelProperty(value="处理标记")
  180 + private String processStamp;
  181 +
  182 + private static final long serialVersionUID = 1L;
  183 +}
0 184 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/inventory/adjust/mapper/AdjustDetailMapper.java 0 → 100644
  View file @7f2fa6c
  1 +package com.huaheng.pc.inventory.adjust.mapper;
  2 +
  3 +import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  4 +import com.huaheng.pc.inventory.adjust.domain.AdjustDetail;
  5 +
  6 +public interface AdjustDetailMapper extends BaseMapper<AdjustDetail> {
  7 +}
0 8 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/inventory/adjust/mapper/AdjustHeaderMapper.java 0 → 100644
  View file @7f2fa6c
  1 +package com.huaheng.pc.inventory.adjust.mapper;
  2 +
  3 +import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  4 +import com.huaheng.pc.inventory.adjust.domain.AdjustHeader;
  5 +
  6 +public interface AdjustHeaderMapper extends BaseMapper<AdjustHeader> {
  7 +}
0 8 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/inventory/adjust/service/AdjustDetailService.java 0 → 100644
  View file @7f2fa6c
  1 +package com.huaheng.pc.inventory.adjust.service;
  2 +
  3 +import org.springframework.stereotype.Service;
  4 +import javax.annotation.Resource;
  5 +import java.util.List;
  6 +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  7 +import com.huaheng.pc.inventory.adjust.domain.AdjustDetail;
  8 +import com.huaheng.pc.inventory.adjust.mapper.AdjustDetailMapper;
  9 +@Service
  10 +public class AdjustDetailService extends ServiceImpl<AdjustDetailMapper, AdjustDetail> {
  11 +
  12 +}
... ...
src/main/java/com/huaheng/pc/inventory/adjust/service/AdjustHeaderService.java 0 → 100644
  View file @7f2fa6c
  1 +package com.huaheng.pc.inventory.adjust.service;
  2 +
  3 +import org.springframework.stereotype.Service;
  4 +import javax.annotation.Resource;
  5 +import java.util.List;
  6 +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  7 +import com.huaheng.pc.inventory.adjust.domain.AdjustHeader;
  8 +import com.huaheng.pc.inventory.adjust.mapper.AdjustHeaderMapper;
  9 +@Service
  10 +public class AdjustHeaderService extends ServiceImpl<AdjustHeaderMapper, AdjustHeader> {
  11 +
  12 +}
... ...
src/main/java/com/huaheng/pc/inventory/adjustHeader/controller/adjustHeaderController.java 0 → 100644
  View file @7f2fa6c
  1 +package com.huaheng.pc.inventory.adjustHeader.controller;
  2 +
  3 +import com.huaheng.framework.web.controller.BaseController;
  4 +import org.springframework.stereotype.Controller;
  5 +import org.springframework.web.bind.annotation.RequestMapping;
  6 +
  7 +@Controller
  8 +@RequestMapping("/inventory/adjustHeader")
  9 +public class adjustHeaderController extends BaseController {
  10 +
  11 +
  12 +
  13 +
  14 +
  15 +
  16 +}
... ...
src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java
  View file @7f2fa6c
... ... @@ -57,16 +57,32 @@ public class CycleCountDetailController extends BaseController {
57 57 @Log(title = "库存-盘点",operating = "查看盘点明细", action = BusinessType.GRANT)
58 58 @ResponseBody
59 59 public TableDataInfo list(CycleCountDetail cycleCountDetail, String createdBegin, String createdEnd) {
  60 +
60 61 LambdaQueryWrapper<CycleCountDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
61 62 PageDomain pageDomain = TableSupport.buildPageRequest();
62 63 Integer pageNum = pageDomain.getPageNum();
63 64 Integer pageSize = pageDomain.getPageSize();
64 65  
65   - lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin), CycleCountDetail::getCreated, createdBegin)
  66 + lambdaQueryWrapper.ge(
  67 + StringUtils.isNotEmpty(createdBegin), CycleCountDetail::getCreated, createdBegin)
66 68 .le(StringUtils.isNotEmpty(createdEnd), CycleCountDetail::getCreated, createdEnd)//创建时间范围
67   - .eq(CycleCountDetail::getWarehouseCode, ShiroUtils.getWarehouseCode()) //仓库
68   -
69   -
  69 + //.eq(CycleCountDetail::getWarehouseCode, ShiroUtils.getWarehouseCode()) //仓库
  70 + .eq(cycleCountDetail.getCycleCountHeadId() != null ,CycleCountDetail::getCycleCountHeadId,cycleCountDetail.getCycleCountHeadId())//盘点主单
  71 + .eq(StringUtils.isNotEmpty(cycleCountDetail.getCompanyCode()),CycleCountDetail::getCompanyCode, cycleCountDetail.getCompanyCode())//货主
  72 + .eq(StringUtils.isNotEmpty(cycleCountDetail.getLocationCode()), CycleCountDetail::getLocationCode, cycleCountDetail.getLocationCode()) //库位
  73 + .eq(StringUtils.isNotEmpty(cycleCountDetail.getContainerCode()), CycleCountDetail::getContainerCode,cycleCountDetail.getContainerCode()) //容器
  74 + .eq(cycleCountDetail.getInventoryDetailId() != null, CycleCountDetail::getInventoryDetailId, cycleCountDetail.getInventoryDetailId())//库存明细ID
  75 + .eq(StringUtils.isNotEmpty(cycleCountDetail.getMaterialCode()), CycleCountDetail::getMaterialCode,cycleCountDetail.getMaterialCode())//物料编码
  76 + .like(StringUtils.isNotEmpty(cycleCountDetail.getMaterialName()), CycleCountDetail::getMaterialName, cycleCountDetail.getMaterialName())//物料名称
  77 + .like(StringUtils.isNotEmpty(cycleCountDetail.getMaterialSpec()), CycleCountDetail::getMaterialSpec,cycleCountDetail.getMaterialSpec())//物料规格
  78 + .eq(cycleCountDetail.getTaskHeaderId() != null, CycleCountDetail::getTaskHeaderId, cycleCountDetail.getTaskHeaderId())//任务主表
  79 + .eq(StringUtils.isNotEmpty(cycleCountDetail.getInventorySts()), CycleCountDetail::getInventorySts,cycleCountDetail.getInventorySts())//库存状态
  80 + .eq(cycleCountDetail.getEnableStatus() != null, CycleCountDetail::getEnableStatus, cycleCountDetail.getEnableStatus())//明细状态
  81 + .eq(StringUtils.isNotEmpty(cycleCountDetail.getBatch()),CycleCountDetail::getBatch,cycleCountDetail.getBatch())//批次
  82 + .eq(StringUtils.isNotEmpty(cycleCountDetail.getLot()),CycleCountDetail::getLot,cycleCountDetail.getLot())//批号
  83 + .eq(StringUtils.isNotEmpty(cycleCountDetail.getProjectNo()),CycleCountDetail::getProjectNo,cycleCountDetail.getProjectNo())//项目号
  84 + .eq(StringUtils.isNotEmpty(cycleCountDetail.getCreatedBy()),CycleCountDetail::getCreatedBy,cycleCountDetail.getCreatedBy())//创建人
  85 + .eq(StringUtils.isNotEmpty(cycleCountDetail.getCompletedBy()), CycleCountDetail::getCompletedBy,cycleCountDetail.getCompletedBy())//完成人
70 86 .orderByDesc(CycleCountDetail::getId);
71 87  
72 88 if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)) {
... ...
src/main/java/com/huaheng/pc/inventory/cycleCountDetail/domain/CycleCountDetail.java
  View file @7f2fa6c
... ... @@ -132,11 +132,11 @@ public class CycleCountDetail implements Serializable {
132 132 private Long countedQty;
133 133  
134 134 /**
135   - * 调整数量
  135 + * 差异数量
136 136 */
137   - @TableField(value = "adjustQty")
138   - @ApiModelProperty(value="调整数量")
139   - private Long adjustQty;
  137 + @TableField(value = "gapQty")
  138 + @ApiModelProperty(value="差异数量")
  139 + private Long gapQty;
140 140  
141 141 /**
142 142 * 失败原因
... ... @@ -278,83 +278,19 @@ public class CycleCountDetail implements Serializable {
278 278 @ApiModelProperty(value="项目号")
279 279 private String projectNo;
280 280  
281   - private static final long serialVersionUID = 1L;
282   -
283   - public static final String COL_ID = "id";
284   -
285   - public static final String COL_COUNTID = "countId";
286   -
287   - public static final String COL_ROUND = "round";
288   -
289   - public static final String COL_TASKHEADERID = "taskHeaderId";
290   -
291   - public static final String COL_TASKDETAILID = "taskDetailId";
292   -
293   - public static final String COL_WAREHOUSECODE = "warehouseCode";
294   -
295   - public static final String COL_INVENTORYDETAILID = "inventoryDetailId";
296   -
297   - public static final String COL_LOCATIONCODE = "locationCode";
298   -
299   - public static final String COL_CONTAINERCODE = "containerCode";
300   -
301   - public static final String COL_MATERIALCODE = "materialCode";
302   -
303   - public static final String COL_MATERIALNAME = "materialName";
304   -
305   - public static final String COL_MATERIALSPEC = "materialSpec";
306   -
307   - public static final String COL_MATERIALUNIT = "materialUnit";
308   -
309   - public static final String COL_COMPANYCODE = "companyCode";
310   -
311   - public static final String COL_INVENTORYSTS = "inventorySts";
312   -
313   - public static final String COL_SYSTEMQTY = "systemQty";
314   -
315   - public static final String COL_COUNTEDQTY = "countedQty";
316   -
317   - public static final String COL_ADJUSTQTY = "adjustQty";
318   -
319   - public static final String COL_REJECTIONNOTE = "rejectionNote";
320   -
321   - public static final String COL_COUNTEDBY = "countedBy";
322 281  
323   - public static final String COL_COUNTEDAT = "countedAt";
324   -
325   - public static final String COL_ASSIGNEDTO = "assignedTo";
326   -
327   - public static final String COL_ASSIGNEDAT = "assignedAt";
328   -
329   - public static final String COL_COMPLETEDBY = "completedBy";
330   -
331   - public static final String COL_COMPLETEDAT = "completedAt";
332   -
333   - public static final String COL_ENABLESTATUS = "enableStatus";
334   -
335   - public static final String COL_CREATED = "created";
336   -
337   - public static final String COL_CREATEDBY = "createdBy";
338   -
339   - public static final String COL_LASTUPDATED = "lastUpdated";
340   -
341   - public static final String COL_LASTUPDATEDBY = "lastUpdatedBy";
342   -
343   - public static final String COL_VERSION = "version";
344   -
345   - public static final String COL_USERDEF1 = "userDef1";
346   -
347   - public static final String COL_USERDEF2 = "userDef2";
  282 + /**
  283 + * 盘点主单号
  284 + * */
  285 + @TableField(value = "cycleCountHeadId")
  286 + @ApiModelProperty(value = "盘点主单号")
  287 + private Integer cycleCountHeadId;
348 288  
349   - public static final String COL_USERDEF3 = "userDef3";
350 289  
351   - public static final String COL_PROCESSSTAMP = "processStamp";
352 290  
353   - public static final String COL_BATCH = "batch";
354 291  
355   - public static final String COL_LOT = "lot";
  292 + private static final long serialVersionUID = 1L;
356 293  
357   - public static final String COL_PROJECTNO = "projectNo";
358 294  
359 295 /**
360 296 * 获取ID
... ... @@ -665,19 +601,14 @@ public class CycleCountDetail implements Serializable {
665 601 /**
666 602 * 获取调整数量
667 603 *
668   - * @return adjustQty - 调整数量
  604 + * @return gapQty- 调整数量
669 605 */
670   - public Long getAdjustQty() {
671   - return adjustQty;
  606 + public Long getGapQty() {
  607 + return gapQty;
672 608 }
673 609  
674   - /**
675   - * 设置调整数量
676   - *
677   - * @param adjustQty 调整数量
678   - */
679   - public void setAdjustQty(Long adjustQty) {
680   - this.adjustQty = adjustQty;
  610 + public void setGapQty(Long gapQty) {
  611 + this.gapQty = gapQty;
681 612 }
682 613  
683 614 /**
... ... @@ -1039,4 +970,12 @@ public class CycleCountDetail implements Serializable {
1039 970 public void setProjectNo(String projectNo) {
1040 971 this.projectNo = projectNo;
1041 972 }
  973 +
  974 + public Integer getCycleCountHeadId() {
  975 + return cycleCountHeadId;
  976 + }
  977 +
  978 + public void setCycleCountHeadId(Integer cycleCountHeadId) {
  979 + this.cycleCountHeadId = cycleCountHeadId;
  980 + }
1042 981 }
1043 982 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/inventory/cycleCountHeader/controller/CycleCountHeaderController.java
  View file @7f2fa6c
... ... @@ -68,10 +68,13 @@ public class CycleCountHeaderController extends BaseController {
68 68  
69 69 lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin), CycleCountHeader::getCreated, createdBegin)
70 70 .le(StringUtils.isNotEmpty(createdEnd), CycleCountHeader::getCreated, createdEnd)//创建时间范围
71   - .eq(CycleCountHeader::getWarehouseCode, ShiroUtils.getWarehouseCode()) //仓库
72   -
73   -
74   -
  71 + //.eq(CycleCountHeader::getWarehouseCode, ShiroUtils.getWarehouseCode()) //仓库
  72 + .eq(StringUtils.isNotEmpty(cycleCountHeader.getSourceCode()),CycleCountHeader::getSourceCode,cycleCountHeader.getSourceCode())//源盘点单号
  73 + .eq(cycleCountHeader.getId() != null, CycleCountHeader::getId,cycleCountHeader.getId())//ID
  74 + .eq(StringUtils.isNotEmpty(cycleCountHeader.getMasterCode()),CycleCountHeader::getMasterCode, cycleCountHeader.getMasterCode())//盘点主表编号
  75 + .eq(cycleCountHeader.getCountOrderId() != null, CycleCountHeader::getCountOrderId, cycleCountHeader.getCountOrderId())//原始盘点ID
  76 + .eq(cycleCountHeader.getStatusCyc() != null, CycleCountHeader::getStatusCyc, cycleCountHeader.getStatusCyc()) //盘点单状态
  77 + .eq(cycleCountHeader.getCountType() != null ,CycleCountHeader::getCountType, cycleCountHeader.getCountType())//盘点类型
75 78 .orderByDesc(CycleCountHeader::getId);
76 79  
77 80 if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
... ...
src/main/java/com/huaheng/pc/inventory/inventoryTransaction/domain/InventoryTransaction.java
  View file @7f2fa6c
... ... @@ -208,13 +208,6 @@ public class InventoryTransaction implements Serializable {
208 208 private String lockCode;
209 209  
210 210 /**
211   - * 上次盘点日期
212   - */
213   - @TableField(value = "lastCycleCountDate")
214   - @ApiModelProperty(value="上次盘点日期")
215   - private Date lastCycleCountDate;
216   -
217   - /**
218 211 * 创建时间
219 212 */
220 213 @TableField(value = "created")
... ... @@ -285,4 +278,6 @@ public class InventoryTransaction implements Serializable {
285 278 @ApiModelProperty(value = "供应商编码")
286 279 private String supplierCode;
287 280  
  281 +
  282 +
288 283 }
289 284 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/receipt/receiptDetail/controller/ReceiptDetailController.java
  View file @7f2fa6c
... ... @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
4 4 import com.baomidou.mybatisplus.core.metadata.IPage;
5 5 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
6 6 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
  7 +import com.huaheng.common.exception.service.ServiceException;
  8 +import com.huaheng.common.support.Convert;
7 9 import com.huaheng.common.utils.StringUtils;
8 10 import com.huaheng.common.utils.security.ShiroUtils;
9 11 import com.huaheng.framework.aspectj.lang.annotation.Log;
... ... @@ -16,15 +18,19 @@ import com.huaheng.framework.web.page.TableSupport;
16 18 import com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail;
17 19 import com.huaheng.pc.receipt.receiptDetail.service.ReceiptDetailService;
18 20 import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
  21 +import com.huaheng.pc.receipt.receiptHeader.service.ReceiptHeaderService;
19 22 import io.swagger.annotations.Api;
20 23 import io.swagger.annotations.ApiOperation;
21 24 import io.swagger.annotations.ApiParam;
  25 +import org.apache.ibatis.annotations.Param;
22 26 import org.apache.shiro.authz.annotation.RequiresPermissions;
  27 +import org.aspectj.weaver.loadtime.Aj;
23 28 import org.springframework.stereotype.Controller;
24 29 import org.springframework.ui.ModelMap;
25 30 import org.springframework.web.bind.annotation.*;
26 31  
27 32 import javax.annotation.Resource;
  33 +import java.util.ArrayList;
28 34 import java.util.List;
29 35 import java.util.concurrent.locks.ReentrantLock;
30 36  
... ... @@ -36,13 +42,18 @@ public class ReceiptDetailController extends BaseController {
36 42 @Resource
37 43 private ReceiptDetailService receiptDetailService;
38 44  
  45 + @Resource
  46 + private ReceiptHeaderService receiptHeaderService;
  47 +
39 48 private String prefix = "receipt/receiptDetail";
40 49  
41   - @RequiresPermissions("config:receiptDetail:view")
  50 + @RequiresPermissions("receipt:receiptDetail:view")
42 51 @Log(title = "入库-入库详情列表", operating = "入库详情列表", action = BusinessType.GRANT)
43 52 @GetMapping("/list/{id}")
44 53 public String list(@PathVariable("id")Integer id, ModelMap mmap) {
45   - mmap.put("receiptDetail",id);
  54 + ReceiptHeader receiptHeader = receiptHeaderService.getById(id);
  55 + mmap.put("receiptId", id);
  56 + mmap.put("receiptCode", receiptHeader.getCode());
46 57 return prefix+"/receiptDetail";
47 58 }
48 59  
... ... @@ -50,7 +61,7 @@ public class ReceiptDetailController extends BaseController {
50 61 * 查询入库详情
51 62 */
52 63 @ApiOperation(value="查看入库详情", notes="根据头表id获取入库单明细信息", httpMethod = "POST")
53   - @RequiresPermissions("config:receiptDetail:list")
  64 + @RequiresPermissions("receipt:receiptDetail:list")
54 65 @Log(title = "入库-入库单明细管理", operating = "查看入库单明细", action = BusinessType.GRANT)
55 66 @PostMapping("/list")
56 67 @ResponseBody
... ... @@ -79,8 +90,14 @@ public class ReceiptDetailController extends BaseController {
79 90 /**
80 91 * 新增入库明细
81 92 */
82   - @GetMapping("/add")
83   - public String add() {
  93 + @GetMapping("/add/{id}/{receiptCode}")
  94 + public String add(@PathVariable("id") Integer id, @PathVariable("receiptCode") String receiptCode, ModelMap mmap) {
  95 + LambdaQueryWrapper<ReceiptHeader> lambdaQueryWrapper = Wrappers.lambdaQuery();
  96 + lambdaQueryWrapper.eq(ReceiptHeader::getId, id).eq(ReceiptHeader::getCode, receiptCode);
  97 + ReceiptHeader receiptHeader = receiptHeaderService.getOne(lambdaQueryWrapper);
  98 + mmap.put("receiptId", id);
  99 + mmap.put("companyCode", receiptHeader.getCompanyCode());
  100 + mmap.put("receiptCode", receiptCode);
84 101 return prefix + "/add";
85 102 }
86 103  
... ... @@ -88,11 +105,88 @@ public class ReceiptDetailController extends BaseController {
88 105 * 新增保存入库单
89 106 */
90 107 @ApiOperation(value="新增入库单 ", notes="新增入库单 ", httpMethod = "POST")
91   - @RequiresPermissions("config:receiptHeader:add")
  108 + @RequiresPermissions("receipt:receiptDetail:add")
92 109 @Log(title = "入库-入库单 ",operating = "新增入库单 ", action = BusinessType.INSERT)
93 110 @PostMapping("/add")
94 111 @ResponseBody
95 112 public AjaxResult addSave(ReceiptDetail receiptDetail) {
96 113 return receiptDetailService.saveReceiptDetaial(receiptDetail);
97 114 }
  115 +
  116 + /**
  117 + * 修改入库明细
  118 + */
  119 + @GetMapping("/edit/{id}")
  120 + public String edit(@PathVariable("id") Integer id, ModelMap mmap) {
  121 + ReceiptDetail receiptDetail = receiptDetailService.getById(id);
  122 + mmap.put("receiptDetail", receiptDetail);
  123 + return prefix + "/edit";
  124 + }
  125 +
  126 + /**
  127 + * 修改保存入库单
  128 + */
  129 + @ApiOperation(value="修改入库单 ", notes="修改入库单 ", httpMethod = "POST")
  130 + @RequiresPermissions("receipt:receiptDetail:add")
  131 + @Log(title = "入库-入库单 ",operating = "修改入库单 ", action = BusinessType.INSERT)
  132 + @PostMapping("/edit")
  133 + @ResponseBody
  134 + public AjaxResult editSave(
  135 + @ApiParam(name="receiptDetail",value="入库详情") ReceiptDetail receiptDetail) {
  136 + return receiptDetailService.updateReceiptDetaial(receiptDetail);
  137 + }
  138 +
  139 + /**
  140 + * 删除入库单
  141 + */
  142 + //@ApiOperation(value="删除入库单 ", notes="删除入库单 ", httpMethod = "POST")
  143 + //@RequiresPermissions("receipt:receiptDetail:add")
  144 + //@Log(title = "入库-入库单 ",operating = "修改入库单 ", action = BusinessType.INSERT)
  145 + //@PostMapping("/edit")
  146 + //@ResponseBody
  147 + //public AjaxResult remove(String ids) {
  148 + // if (StringUtils.isEmpty(ids)){
  149 + // return AjaxResult.error("id为空");
  150 + // }
  151 + // List<Integer> list = new ArrayList<>();
  152 + // for (Integer id : Convert.toIntArray(ids)){
  153 + // list.add(id);
  154 + // }
  155 + // return toAjax(receiptDetailService.removeByIds(list));
  156 + //}
  157 +
  158 + /**
  159 + * 审核入库单
  160 + */
  161 + @ApiOperation(value="审核入库单", notes="审核入库单", httpMethod = "POST")
  162 + @RequiresPermissions("receipt:receiptDetail:approval")
  163 + @Log(title = "入库-入库单 ",operating = "审核入库单 ", action = BusinessType.UPDATE)
  164 + @PostMapping("/approval")
  165 + @ResponseBody
  166 + public AjaxResult approval(@ApiParam(name="id",value="入库明细表id") String ids,
  167 + @ApiParam(name="approval",value="审核结果值，10审核驳回，20作废，100审核成功") Integer approval) {
  168 +
  169 + if (StringUtils.isEmpty(ids)){
  170 + return AjaxResult.error("id不能为空");
  171 + }
  172 + if (approval != 10 || approval != 20 || approval != 100){
  173 + return AjaxResult.error("传入参数错误");
  174 + }
  175 + for (Integer id : Convert.toIntArray(ids)) {
  176 + ReceiptDetail receiptDetail = new ReceiptDetail();
  177 + receiptDetail.setId(id);
  178 + receiptDetail.setProcessStamp(String.valueOf(approval));
  179 + receiptDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
  180 + if (receiptDetailService.updateById(receiptDetail)){
  181 + ReceiptHeader receiptHeader = new ReceiptHeader();
  182 + receiptHeader.setFirstStatus(approval);
  183 + receiptHeader.setId(receiptDetail.getReceiptId());
  184 + receiptHeaderService.updateById(receiptHeader);
  185 + } else {
  186 + throw new ServiceException("审核失败");
  187 + }
  188 + }
  189 +
  190 + return AjaxResult.success("审核成功");
  191 + }
98 192 }
... ...
src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailService.java
  View file @7f2fa6c
... ... @@ -7,4 +7,5 @@ public interface ReceiptDetailService extends IService&lt;ReceiptDetail&gt;{
7 7  
8 8 AjaxResult saveReceiptDetaial(ReceiptDetail receiptDetail);
9 9  
  10 + AjaxResult updateReceiptDetaial(ReceiptDetail receiptDetail);
10 11 }
... ...
src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java
  View file @7f2fa6c
... ... @@ -2,10 +2,22 @@ package com.huaheng.pc.receipt.receiptDetail.service;
2 2  
3 3 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
4 4 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
  5 +import com.huaheng.common.exception.service.ServiceException;
5 6 import com.huaheng.common.utils.security.ShiroUtils;
6 7 import com.huaheng.framework.web.domain.AjaxResult;
7 8 import com.huaheng.pc.config.material.domain.Material;
8 9 import com.huaheng.pc.config.material.service.MaterialService;
  10 +import com.huaheng.pc.config.materialType.domain.MaterialType;
  11 +import com.huaheng.pc.config.materialType.service.MaterialTypeService;
  12 +import com.huaheng.pc.config.receiptPreference.domain.ReceiptPreference;
  13 +import com.huaheng.pc.config.receiptPreference.service.ReceiptPreferenceService;
  14 +import com.huaheng.pc.config.receiptType.domain.ReceiptType;
  15 +import com.huaheng.pc.config.receiptType.service.ReceiptTypeService;
  16 +import com.huaheng.pc.config.statusFlow.domain.StatusFlowDetail;
  17 +import com.huaheng.pc.config.statusFlow.service.StatusFlowDetailService;
  18 +import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
  19 +import com.huaheng.pc.receipt.receiptHeader.service.ReceiptHeaderService;
  20 +import org.aspectj.weaver.loadtime.Aj;
9 21 import org.springframework.stereotype.Service;
10 22 import javax.annotation.Resource;
11 23 import java.util.List;
... ... @@ -13,16 +25,145 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
13 25 import com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail;
14 26 import com.huaheng.pc.receipt.receiptDetail.mapper.ReceiptDetailMapper;
15 27 import com.huaheng.pc.receipt.receiptDetail.service.ReceiptDetailService;
  28 +import org.springframework.transaction.annotation.Transactional;
  29 +
16 30 @Service
17 31 public class ReceiptDetailServiceImpl extends ServiceImpl<ReceiptDetailMapper, ReceiptDetail> implements ReceiptDetailService{
18 32  
19 33 @Resource
20 34 private MaterialService materialService;
  35 + @Resource
  36 + private ReceiptHeaderService receiptHeaderService;
  37 + @Resource
  38 + private ReceiptTypeService receiptTypeService;
  39 + @Resource
  40 + private StatusFlowDetailService statusFlowDetailService;
  41 + @Resource
  42 + private MaterialTypeService materialTypeService;
  43 + @Resource
  44 + private ReceiptPreferenceService receiptPreferenceService;
21 45  
  46 + /**
  47 + * 新增入库明细
  48 + * @param receiptDetail
  49 + * @return
  50 + */
  51 + @Transactional
22 52 public AjaxResult saveReceiptDetaial(ReceiptDetail receiptDetail){
  53 + /* 判断入库头表状态*/
  54 + LambdaQueryWrapper<ReceiptHeader> lambdaReceiptHeader = Wrappers.lambdaQuery();
  55 + lambdaReceiptHeader.eq(ReceiptHeader::getId, receiptDetail.getReceiptId());
  56 + ReceiptHeader receiptHeader = receiptHeaderService.getOne(lambdaReceiptHeader);
  57 +
  58 + //判断入库头表状态
  59 + if (receiptHeader == null ){
  60 + throw new ServiceException("找不到主单据");
  61 + } else if (receiptHeader.getFirstStatus() > 100){
  62 + throw new ServiceException("单据进入订单池后，不允许新增明细");
  63 + } else if (receiptHeader.getFirstStatus() == 20) {
  64 + throw new ServiceException("单据已作废");
  65 + }
  66 + receiptDetail.setReceiptCode(receiptHeader.getCode());
  67 +
  68 + /* 判断物料编码*/
23 69 LambdaQueryWrapper<Material> lambdaQueryWrapper = Wrappers.lambdaQuery();
24   - lambdaQueryWrapper.eq(Material::getCompanyCode, receiptDetail.getMaterialCode());
  70 + lambdaQueryWrapper.eq(Material::getCode, receiptDetail.getMaterialCode());
  71 + Material material = materialService.getOne(lambdaQueryWrapper);
  72 + if (material == null) {
  73 + throw new ServiceException("物料不存在");
  74 + }
  75 + receiptDetail.setCompanyCode(material.getCompanyCode());
  76 + receiptDetail.setMaterialName(material.getName());
  77 + receiptDetail.setMaterialSpec(material.getSpec());
  78 + receiptDetail.setMaterialUnit(material.getUnit());
  79 +
  80 + receiptDetail.setCreatedBy(ShiroUtils.getLoginName());
  81 + receiptDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
25 82 receiptDetail.setWarehouseCode(ShiroUtils.getWarehouseCode());
26   - return this.save(receiptDetail) ? AjaxResult.success("操作成功！") : AjaxResult.error("操作失败！");
  83 +
  84 + //查询头表中绑定的入库类型中的入库流程
  85 + LambdaQueryWrapper<ReceiptType> lambdaReceiptType = Wrappers.lambdaQuery();
  86 + lambdaReceiptType.eq(ReceiptType::getCode, receiptHeader.getReceiptType());
  87 + ReceiptType receiptType = receiptTypeService.getOne(lambdaReceiptType);
  88 + if (receiptType.getReceiptFlow() != null){
  89 + //物料是否有入库流程
  90 + List<StatusFlowDetail> statusFlowDetails = statusFlowDetailService.queryStatusFlowDetail(receiptType.getReceiptFlow());
  91 + receiptDetail.setProcessStamp(statusFlowDetails.get(0).getFlowCode());
  92 + } else if (material.getReceivingFlow() != null){
  93 + //物料是否有入库流程
  94 + List<StatusFlowDetail> statusFlowDetails = statusFlowDetailService.queryStatusFlowDetail(material.getReceivingFlow());
  95 + receiptDetail.setProcessStamp(statusFlowDetails.get(0).getFlowCode());
  96 + } else {
  97 + //该物料类别是否有入库流程
  98 + LambdaQueryWrapper<MaterialType> lambdaMaterialType = Wrappers.lambdaQuery();
  99 + lambdaMaterialType.eq(MaterialType::getCode, material.getType());
  100 + MaterialType materialType = materialTypeService.getOne(lambdaMaterialType);
  101 + if (materialType.getReceivingFlow() != null) {
  102 + List<StatusFlowDetail> statusFlowDetails = statusFlowDetailService.queryStatusFlowDetail(materialType.getReceivingFlow());
  103 + receiptDetail.setProcessStamp(statusFlowDetails.get(0).getFlowCode());
  104 + } else {
  105 + //以上都没有的情况下查询入库首选项中的入库流程
  106 + LambdaQueryWrapper<ReceiptPreference> lambda = Wrappers.lambdaQuery();
  107 + lambda.last("Limit 1");
  108 + ReceiptPreference receiptPreference = receiptPreferenceService.getOne(lambda);
  109 + List<StatusFlowDetail> statusFlowDetails = statusFlowDetailService.queryStatusFlowDetail(receiptPreference.getReceivingFlow());
  110 + receiptDetail.setProcessStamp(statusFlowDetails.get(0).getFlowCode());
  111 + }
  112 + }
  113 +
  114 + if (this.save(receiptDetail)) {
  115 + receiptHeader.setTotalQty(receiptHeader.getTotalQty()+receiptDetail.getTotalQty());
  116 + receiptHeader.setTotalLines(receiptHeader.getTotalLines()+1);
  117 + receiptHeaderService.updateById(receiptHeader);
  118 + return AjaxResult.success("新增单据明细成功");
  119 + } else {
  120 + return AjaxResult.error("新增单据明细失败！");
  121 + }
  122 +
  123 + }
  124 +
  125 + /**
  126 + * 修改入库明细
  127 + * @param receiptDetail
  128 + * @return
  129 + */
  130 + @Override
  131 + @Transactional
  132 + public AjaxResult updateReceiptDetaial(ReceiptDetail receiptDetail) {
  133 + /* 先修改入库头表中的总数量和总行数，再更新记录，完成后更新入库头表中总数量和总行数*/
  134 +
  135 + //查询原记录
  136 + ReceiptDetail originalReceiptDetail= this.getById(receiptDetail.getId());
  137 + ReceiptHeader receiptHeader = receiptHeaderService.getById(receiptDetail.getReceiptId());
  138 + //判断物料编码是否被修改
  139 + if (!originalReceiptDetail.getMaterialCode().equals(receiptDetail.getMaterialCode())){
  140 + LambdaQueryWrapper<Material> lambdaMaterial = Wrappers.lambdaQuery();
  141 + lambdaMaterial.eq(Material::getCode,receiptDetail.getMaterialCode());
  142 + Material material = materialService.getOne(lambdaMaterial);
  143 + if (material == null) {
  144 + throw new ServiceException("该物料编码不存在");
  145 +
  146 + }else {
  147 + receiptDetail.setMaterialName(material.getName());
  148 + receiptDetail.setMaterialSpec(material.getSpec());
  149 + receiptDetail.setMaterialUnit(material.getUnit());
  150 +
  151 + receiptHeader.setTotalQty(receiptHeader.getTotalQty()-originalReceiptDetail.getTotalQty());
  152 + receiptHeader.setTotalLines(receiptHeader.getTotalLines()-1);
  153 + if ( !receiptHeaderService.updateById(receiptHeader)){
  154 + return AjaxResult.error("入库头表更新失败");
  155 + }
  156 + }
  157 + }
  158 +
  159 + receiptDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
  160 + if ( !this.updateById(receiptDetail) ){
  161 + return AjaxResult.error("入库明细更新失败");
  162 + } else {
  163 + receiptHeader.setTotalQty(receiptHeader.getTotalQty()+receiptDetail.getTotalQty());
  164 + receiptHeader.setTotalLines(receiptHeader.getTotalLines()+1);
  165 + receiptHeaderService.updateById(receiptHeader);
  166 + return AjaxResult.success("修改单据明细成功");
  167 + }
27 168 }
28 169 }
... ...
src/main/java/com/huaheng/pc/receipt/receiptDetailHistory/domain/ReceiptDetailHistory.java 0 → 100644
  View file @7f2fa6c
  1 +package com.huaheng.pc.receipt.receiptDetailHistory.domain;
  2 +
  3 +import com.baomidou.mybatisplus.annotation.IdType;
  4 +import com.baomidou.mybatisplus.annotation.TableField;
  5 +import com.baomidou.mybatisplus.annotation.TableId;
  6 +import com.baomidou.mybatisplus.annotation.TableName;
  7 +import io.swagger.annotations.ApiModel;
  8 +import io.swagger.annotations.ApiModelProperty;
  9 +import java.io.Serializable;
  10 +import java.math.BigDecimal;
  11 +import java.util.Date;
  12 +import lombok.Data;
  13 +
  14 +@ApiModel(value="com.huaheng.pc.receipt.receiptDetailHistory.domain.ReceiptDetailHistory")
  15 +@Data
  16 +@TableName(value = "receipt_detail_history")
  17 +public class ReceiptDetailHistory implements Serializable {
  18 + /**
  19 + * 入库明细内部号
  20 + */
  21 + @TableId(value = "id", type = IdType.AUTO)
  22 + @ApiModelProperty(value="入库明细内部号")
  23 + private Integer id;
  24 +
  25 + /**
  26 + * 入库单头内部号
  27 + */
  28 + @TableField(value = "receiptId")
  29 + @ApiModelProperty(value="入库单头内部号")
  30 + private Integer receiptId;
  31 +
  32 + /**
  33 + * 入库单
  34 + */
  35 + @TableField(value = "receiptCode")
  36 + @ApiModelProperty(value="入库单")
  37 + private String receiptCode;
  38 +
  39 + /**
  40 + * 仓库
  41 + */
  42 + @TableField(value = "warehouseCode")
  43 + @ApiModelProperty(value="仓库")
  44 + private String warehouseCode;
  45 +
  46 + /**
  47 + * 货主
  48 + */
  49 + @TableField(value = "companyCode")
  50 + @ApiModelProperty(value="货主")
  51 + private String companyCode;
  52 +
  53 + /**
  54 + * 物料编码
  55 + */
  56 + @TableField(value = "materialCode")
  57 + @ApiModelProperty(value="物料编码")
  58 + private String materialCode;
  59 +
  60 + /**
  61 + * 物料信息
  62 + */
  63 + @TableField(value = "materialName")
  64 + @ApiModelProperty(value="物料信息")
  65 + private String materialName;
  66 +
  67 + /**
  68 + * 物料规格
  69 + */
  70 + @TableField(value = "materialSpec")
  71 + @ApiModelProperty(value="物料规格")
  72 + private String materialSpec;
  73 +
  74 + /**
  75 + * 物料单位
  76 + */
  77 + @TableField(value = "materialUnit")
  78 + @ApiModelProperty(value="物料单位")
  79 + private String materialUnit;
  80 +
  81 + /**
  82 + * 供应商编码
  83 + */
  84 + @TableField(value = "supplierCode")
  85 + @ApiModelProperty(value="供应商编码")
  86 + private String supplierCode;
  87 +
  88 + /**
  89 + * 批次
  90 + */
  91 + @TableField(value = "batch")
  92 + @ApiModelProperty(value="批次")
  93 + private String batch;
  94 +
  95 + /**
  96 + * 批号
  97 + */
  98 + @TableField(value = "lot")
  99 + @ApiModelProperty(value="批号")
  100 + private String lot;
  101 +
  102 + /**
  103 + * 质检
  104 + */
  105 + @TableField(value = "qcCheck")
  106 + @ApiModelProperty(value="质检")
  107 + private String qcCheck;
  108 +
  109 + /**
  110 + * 项目号
  111 + */
  112 + @TableField(value = "projectNo")
  113 + @ApiModelProperty(value="项目号")
  114 + private String projectNo;
  115 +
  116 + /**
  117 + * 生产日期
  118 + */
  119 + @TableField(value = "manufactureDate")
  120 + @ApiModelProperty(value="生产日期")
  121 + private Date manufactureDate;
  122 +
  123 + /**
  124 + * 失效日期
  125 + */
  126 + @TableField(value = "expirationDate")
  127 + @ApiModelProperty(value="失效日期")
  128 + private Date expirationDate;
  129 +
  130 + /**
  131 + * 入库日期
  132 + */
  133 + @TableField(value = "agingDate")
  134 + @ApiModelProperty(value="入库日期")
  135 + private Date agingDate;
  136 +
  137 + /**
  138 + * 属性模板
  139 + */
  140 + @TableField(value = "attributeTemplateCode")
  141 + @ApiModelProperty(value="属性模板")
  142 + private String attributeTemplateCode;
  143 +
  144 + /**
  145 + * 属性1
  146 + */
  147 + @TableField(value = "attribute1")
  148 + @ApiModelProperty(value="属性1")
  149 + private String attribute1;
  150 +
  151 + /**
  152 + * 属性2
  153 + */
  154 + @TableField(value = "attribute2")
  155 + @ApiModelProperty(value="属性2")
  156 + private String attribute2;
  157 +
  158 + /**
  159 + * 属性3
  160 + */
  161 + @TableField(value = "attribute3")
  162 + @ApiModelProperty(value="属性3")
  163 + private String attribute3;
  164 +
  165 + /**
  166 + * 属性4
  167 + */
  168 + @TableField(value = "attribute4")
  169 + @ApiModelProperty(value="属性4")
  170 + private String attribute4;
  171 +
  172 + /**
  173 + * 总数量
  174 + */
  175 + @TableField(value = "totalQty")
  176 + @ApiModelProperty(value="总数量")
  177 + private Integer totalQty;
  178 +
  179 + /**
  180 + * 未收数量
  181 + */
  182 + @TableField(value = "openQty")
  183 + @ApiModelProperty(value="未收数量")
  184 + private Integer openQty;
  185 +
  186 + /**
  187 + * ERP单号
  188 + */
  189 + @TableField(value = "referCode")
  190 + @ApiModelProperty(value="ERP单号")
  191 + private String referCode;
  192 +
  193 + /**
  194 + * ERP内部号
  195 + */
  196 + @TableField(value = "referId")
  197 + @ApiModelProperty(value="ERP内部号")
  198 + private Integer referId;
  199 +
  200 + /**
  201 + * ERP行号
  202 + */
  203 + @TableField(value = "referLineNum")
  204 + @ApiModelProperty(value="ERP行号")
  205 + private String referLineNum;
  206 +
  207 + /**
  208 + * 定位规则
  209 + */
  210 + @TableField(value = "locatingRule")
  211 + @ApiModelProperty(value="定位规则")
  212 + private String locatingRule;
  213 +
  214 + /**
  215 + * 库存状态
  216 + */
  217 + @TableField(value = "inventorySts")
  218 + @ApiModelProperty(value="库存状态")
  219 + private String inventorySts;
  220 +
  221 + /**
  222 + * 标价
  223 + */
  224 + @TableField(value = "itemListPrice")
  225 + @ApiModelProperty(value="标价")
  226 + private BigDecimal itemListPrice;
  227 +
  228 + /**
  229 + * 净价
  230 + */
  231 + @TableField(value = "itemNetPrice")
  232 + @ApiModelProperty(value="净价")
  233 + private BigDecimal itemNetPrice;
  234 +
  235 + /**
  236 + * 是否虚拟套件
  237 + */
  238 + @TableField(value = "isVirtualBom")
  239 + @ApiModelProperty(value="是否虚拟套件")
  240 + private Integer isVirtualBom;
  241 +
  242 + /**
  243 + * 创建时间
  244 + */
  245 + @TableField(value = "created")
  246 + @ApiModelProperty(value="创建时间")
  247 + private Date created;
  248 +
  249 + /**
  250 + * 创建用户
  251 + */
  252 + @TableField(value = "createdBy")
  253 + @ApiModelProperty(value="创建用户")
  254 + private String createdBy;
  255 +
  256 + /**
  257 + * 创建时间
  258 + */
  259 + @TableField(value = "lastUpdated")
  260 + @ApiModelProperty(value="创建时间")
  261 + private Date lastUpdated;
  262 +
  263 + /**
  264 + * 更新用户
  265 + */
  266 + @TableField(value = "lastUpdatedBy")
  267 + @ApiModelProperty(value="更新用户")
  268 + private String lastUpdatedBy;
  269 +
  270 + /**
  271 + * 数据版本
  272 + */
  273 + @TableField(value = "version")
  274 + @ApiModelProperty(value="数据版本")
  275 + private Integer version;
  276 +
  277 + /**
  278 + * 自定义字段1
  279 + */
  280 + @TableField(value = "userDef1")
  281 + @ApiModelProperty(value="自定义字段1")
  282 + private String userDef1;
  283 +
  284 + /**
  285 + * 自定义字段2
  286 + */
  287 + @TableField(value = "userDef2")
  288 + @ApiModelProperty(value="自定义字段2")
  289 + private String userDef2;
  290 +
  291 + /**
  292 + * 自定义字段3
  293 + */
  294 + @TableField(value = "userDef3")
  295 + @ApiModelProperty(value="自定义字段3")
  296 + private String userDef3;
  297 +
  298 + /**
  299 + * 自定义字段4
  300 + */
  301 + @TableField(value = "userDef4")
  302 + @ApiModelProperty(value="自定义字段4")
  303 + private String userDef4;
  304 +
  305 + /**
  306 + * 自定义字段5
  307 + */
  308 + @TableField(value = "userDef5")
  309 + @ApiModelProperty(value="自定义字段5")
  310 + private String userDef5;
  311 +
  312 + /**
  313 + * 自定义字段6
  314 + */
  315 + @TableField(value = "userDef6")
  316 + @ApiModelProperty(value="自定义字段6")
  317 + private String userDef6;
  318 +
  319 + /**
  320 + * 自定义字段7
  321 + */
  322 + @TableField(value = "userDef7")
  323 + @ApiModelProperty(value="自定义字段7")
  324 + private String userDef7;
  325 +
  326 + /**
  327 + * 自定义字段8
  328 + */
  329 + @TableField(value = "userDef8")
  330 + @ApiModelProperty(value="自定义字段8")
  331 + private String userDef8;
  332 +
  333 + /**
  334 + * 处理标记
  335 + */
  336 + @TableField(value = "processStamp")
  337 + @ApiModelProperty(value="处理标记")
  338 + private String processStamp;
  339 +
  340 + /**
  341 + * 是否删除
  342 + */
  343 + @TableField(value = "deleted")
  344 + @ApiModelProperty(value="是否删除")
  345 + private Boolean deleted;
  346 +
  347 + private static final long serialVersionUID = 1L;
  348 +}
0 349 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/receipt/receiptDetailHistory/mapper/ReceiptDetailHistoryMapper.java 0 → 100644
  View file @7f2fa6c
  1 +package com.huaheng.pc.receipt.receiptDetailHistory.mapper;
  2 +
  3 +import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  4 +import com.huaheng.pc.receipt.receiptDetailHistory.domain.ReceiptDetailHistory;
  5 +
  6 +public interface ReceiptDetailHistoryMapper extends BaseMapper<ReceiptDetailHistory> {
  7 +}
0 8 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/receipt/receiptDetailHistory/service/ReceiptDetailHistoryService.java 0 → 100644
  View file @7f2fa6c
  1 +package com.huaheng.pc.receipt.receiptDetailHistory.service;
  2 +
  3 +import org.springframework.stereotype.Service;
  4 +import javax.annotation.Resource;
  5 +import java.util.List;
  6 +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  7 +import com.huaheng.pc.receipt.receiptDetailHistory.domain.ReceiptDetailHistory;
  8 +import com.huaheng.pc.receipt.receiptDetailHistory.mapper.ReceiptDetailHistoryMapper;
  9 +@Service
  10 +public class ReceiptDetailHistoryService extends ServiceImpl<ReceiptDetailHistoryMapper, ReceiptDetailHistory> {
  11 +
  12 +}
... ...
src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java
  View file @7f2fa6c
... ... @@ -16,7 +16,9 @@ import com.huaheng.framework.web.page.TableSupport;
16 16 import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
17 17 import com.huaheng.pc.receipt.receiptHeader.service.ReceiptHeaderService;
18 18 import io.swagger.annotations.Api;
  19 +import io.swagger.annotations.ApiModel;
19 20 import io.swagger.annotations.ApiOperation;
  21 +import io.swagger.annotations.ApiParam;
20 22 import org.apache.shiro.authz.annotation.RequiresPermissions;
21 23 import org.springframework.stereotype.Controller;
22 24 import org.springframework.ui.ModelMap;
... ... @@ -35,7 +37,7 @@ public class ReceiptHeaderController extends BaseController {
35 37 @Resource
36 38 private ReceiptHeaderService receiptHeaderService;
37 39  
38   - @RequiresPermissions("config:receiptHeader:view")
  40 + @RequiresPermissions("receipt:receiptHeader:view")
39 41 @GetMapping()
40 42 public String containerCapacity()
41 43 {
... ... @@ -45,11 +47,13 @@ public class ReceiptHeaderController extends BaseController {
45 47 /**
46 48 * 查询入库单
47 49 */
48   - @RequiresPermissions("config:receiptHeader:list")
  50 + @RequiresPermissions("receipt:receiptHeader:list")
49 51 @Log(title = "入库-入库单头表", operating = "查看入库单列表", action = BusinessType.GRANT)
50 52 @PostMapping("/list")
51 53 @ResponseBody
52   - public TableDataInfo list(ReceiptHeader receiptHeader, String createdBegin, String createdEnd) {
  54 + public TableDataInfo list(@ApiParam(name="receiptDetail",value="入库头表")ReceiptHeader receiptHeader,
  55 + @ApiParam(name = "createdBegin", value = "起止时间") String createdBegin,
  56 + @ApiParam(name = "createdEnd", value = "结束时间") String createdEnd) {
53 57 LambdaQueryWrapper<ReceiptHeader> lambdaQueryWrapper = Wrappers.lambdaQuery();
54 58 PageDomain pageDomain = TableSupport.buildPageRequest();
55 59 Integer pageNum = pageDomain.getPageNum();
... ... @@ -60,7 +64,12 @@ public class ReceiptHeaderController extends BaseController {
60 64 .in(ReceiptHeader::getCompanyCode, ShiroUtils.getCompanyCodeList())
61 65 .eq(ReceiptHeader::getWarehouseCode, ShiroUtils.getWarehouseCode())
62 66 .eq(StringUtils.isNotEmpty(receiptHeader.getReceiptType()),
63   - ReceiptHeader::getReceiptType, receiptHeader.getReceiptType());
  67 + ReceiptHeader::getReceiptType, receiptHeader.getReceiptType())
  68 + .eq(StringUtils.isNotEmpty(receiptHeader.getCode()), ReceiptHeader::getCode, receiptHeader.getCode())
  69 + .eq(StringUtils.isNotNull(receiptHeader.getFirstStatus()),
  70 + ReceiptHeader::getFirstStatus, receiptHeader.getFirstStatus())
  71 + .eq(StringUtils.isNotNull(receiptHeader.getLastStatus()),
  72 + ReceiptHeader::getLastStatus, receiptHeader.getLastStatus());
64 73  
65 74 if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
66 75 /**
... ... @@ -87,17 +96,12 @@ public class ReceiptHeaderController extends BaseController {
87 96 * 新增保存入库单
88 97 */
89 98 @ApiOperation(value="新增入库单 ", notes="新增入库单 ", httpMethod = "POST")
90   - @RequiresPermissions("config:receiptHeader:add")
  99 + @RequiresPermissions("receipt:receiptHeader:add")
91 100 @Log(title = "入库-入库单 ",operating = "新增入库单 ", action = BusinessType.INSERT)
92 101 @PostMapping("/add")
93 102 @ResponseBody
94 103 public AjaxResult addSave(ReceiptHeader receiptHeader) {
95   - receiptHeader.setWarehouseCode(ShiroUtils.getWarehouseCode());
96   - receiptHeader.setFirstStatus(0);
97   - receiptHeader.setLastStatus(0);
98   - receiptHeader.setCreatedBy(ShiroUtils.getLoginName());
99   - receiptHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
100   - return toAjax(receiptHeaderService.save(receiptHeader));
  104 + return receiptHeaderService.saveReceiptHeader(receiptHeader);
101 105 }
102 106  
103 107 /**
... ... @@ -114,7 +118,7 @@ public class ReceiptHeaderController extends BaseController {
114 118 * 修改保存入库单
115 119 */
116 120 @ApiOperation(value="修改入库单", notes="修改入库单", httpMethod = "POST")
117   - @RequiresPermissions("config:receiptHeader:edit")
  121 + @RequiresPermissions("receipt:receiptHeader:edit")
118 122 @Log(title = "入库-入库单 ",operating = "修改入库单 ", action = BusinessType.UPDATE)
119 123 @PostMapping("/edit")
120 124 @ResponseBody
... ... @@ -122,4 +126,41 @@ public class ReceiptHeaderController extends BaseController {
122 126 receiptHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
123 127 return toAjax(receiptHeaderService.updateById(receiptHeader));
124 128 }
  129 +
  130 + /**
  131 + * 审核入库单
  132 + */
  133 + @ApiOperation(value="审核入库单", notes="审核入库单", httpMethod = "POST")
  134 + @RequiresPermissions("receipt:receiptHeader:approval")
  135 + @Log(title = "入库-入库单 ",operating = "审核入库单 ", action = BusinessType.UPDATE)
  136 + @PostMapping("/approval")
  137 + @ResponseBody
  138 + public AjaxResult approval(@ApiParam(name="id",value="入库头表id") Integer id,
  139 + @ApiParam(name="approval",value="审核结果值，10审核驳回，20作废，100审核成功") Integer approval) {
  140 + ReceiptHeader receiptHeader = new ReceiptHeader();
  141 + if (approval != 10 || approval != 20 || approval != 100){
  142 + return AjaxResult.error("传入参数错误");
  143 + }
  144 + receiptHeader.setId(id);
  145 + receiptHeader.setLastStatus(approval);
  146 + receiptHeader.setFirstStatus(approval);
  147 + receiptHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
  148 + return toAjax(receiptHeaderService.updateById(receiptHeader));
  149 + }
  150 +
  151 + /**
  152 + * 提交审核入库单
  153 + */
  154 + @ApiOperation(value="提交审核入库单", notes="提交审核入库单", httpMethod = "POST")
  155 + @RequiresPermissions("receipt:receiptHeader:approval")
  156 + @Log(title = "入库-入库单 ",operating = "提交审核入库单 ", action = BusinessType.UPDATE)
  157 + @PostMapping("/submitReview")
  158 + @ResponseBody
  159 + public AjaxResult submitReview(@ApiParam(name="id",value="入库头表id") Integer id) {
  160 + ReceiptHeader receiptHeader = new ReceiptHeader();
  161 + receiptHeader.setId(id);
  162 + receiptHeader.setFirstStatus(5);
  163 + receiptHeader.setLastStatus(5);
  164 + return toAjax(receiptHeaderService.updateById(receiptHeader));
  165 + }
125 166 }
... ...
src/main/java/com/huaheng/pc/receipt/receiptHeader/domain/ReceiptHeader.java
  View file @7f2fa6c
1 1 package com.huaheng.pc.receipt.receiptHeader.domain;
2 2  
3   -import com.baomidou.mybatisplus.annotation.IdType;
4   -import com.baomidou.mybatisplus.annotation.TableField;
5   -import com.baomidou.mybatisplus.annotation.TableId;
6   -import com.baomidou.mybatisplus.annotation.TableName;
  3 +import com.baomidou.mybatisplus.annotation.*;
7 4 import io.swagger.annotations.ApiModel;
8 5 import io.swagger.annotations.ApiModelProperty;
9 6 import java.io.Serializable;
... ... @@ -293,6 +290,7 @@ public class ReceiptHeader implements Serializable {
293 290 */
294 291 @TableField(value = "deleted")
295 292 @ApiModelProperty(value="是否删除")
  293 + @TableLogic
296 294 private Boolean deleted;
297 295  
298 296 private static final long serialVersionUID = 1L;
... ...
src/main/java/com/huaheng/pc/receipt/receiptHeader/service/ReceiptHeaderService.java
  View file @7f2fa6c
1 1 package com.huaheng.pc.receipt.receiptHeader.service;
2 2  
  3 +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
  4 +import com.baomidou.mybatisplus.core.toolkit.Wrappers;
3 5 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  6 +import com.huaheng.common.exception.service.ServiceException;
  7 +import com.huaheng.common.utils.security.ShiroUtils;
  8 +import com.huaheng.framework.web.domain.AjaxResult;
  9 +import com.huaheng.pc.config.receiptType.domain.ReceiptType;
  10 +import com.huaheng.pc.config.receiptType.service.ReceiptTypeService;
  11 +import com.huaheng.pc.config.statusFlow.domain.StatusFlowDetail;
  12 +import com.huaheng.pc.config.statusFlow.service.StatusFlowDetailService;
4 13 import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
5 14 import com.huaheng.pc.receipt.receiptHeader.mapper.ReceiptHeaderMapper;
6 15 import org.springframework.stereotype.Service;
  16 +
  17 +import javax.annotation.Resource;
  18 +import java.text.SimpleDateFormat;
  19 +import java.util.Date;
  20 +import java.util.List;
  21 +
7 22 @Service
8 23 public class ReceiptHeaderService extends ServiceImpl<ReceiptHeaderMapper, ReceiptHeader> {
9 24  
  25 + @Resource
  26 + private ReceiptTypeService receiptTypeService;
  27 + @Resource
  28 + private StatusFlowDetailService statusFlowDetailService;
  29 +
  30 + public AjaxResult saveReceiptHeader(ReceiptHeader receiptHeader){
  31 + LambdaQueryWrapper<ReceiptType> lambdaQueryWrapper = Wrappers.lambdaQuery();
  32 + lambdaQueryWrapper.eq(ReceiptType::getCode, receiptHeader.getReceiptType());
  33 + ReceiptType receiptType = receiptTypeService.getOne(lambdaQueryWrapper);
  34 +
  35 + //流程详情查询
  36 + LambdaQueryWrapper<StatusFlowDetail> lambdaStatus = Wrappers.lambdaQuery();
  37 + lambdaStatus.orderByAsc(StatusFlowDetail::getSequence);
  38 +
  39 + if(receiptType == null) {
  40 + throw new ServiceException("没有对应的入库单类型");
  41 + }
  42 +
  43 + String code = createCode(receiptHeader.getReceiptType());
  44 + receiptHeader.setCode(code);
  45 + receiptHeader.setFirstStatus(0);
  46 + receiptHeader.setLastStatus(0);
  47 + receiptHeader.setWarehouseCode(ShiroUtils.getWarehouseCode());
  48 + receiptHeader.setCreatedBy(ShiroUtils.getLoginName());
  49 + receiptHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
  50 + return AjaxResult.toAjax(this.save(receiptHeader));
  51 + }
  52 +
  53 + public String createCode(String receiptType) {
  54 + String code = null;
  55 + Date now = new Date();
  56 + SimpleDateFormat df = new SimpleDateFormat("yyyyMMdd");
  57 + LambdaQueryWrapper<ReceiptHeader> lambda = Wrappers.lambdaQuery();
  58 + lambda.select(ReceiptHeader::getCode).eq(ReceiptHeader::getReceiptType, receiptType)
  59 + .orderByDesc(ReceiptHeader::getId).last("Limit 1");
  60 + //如果指定类型的最后的code存在，并且日期一致。那么 code = 入库单类型 + 年月日 + (排序号 + 1)
  61 + String maxCode = null;
  62 + ReceiptHeader receiptHeader = this.getOne(lambda);
  63 + if ( receiptHeader != null){
  64 + maxCode = this.getOne(lambda).getCode();
  65 + }
  66 + if (maxCode != null && maxCode.substring(maxCode.length() - 13, maxCode.length() - 5).equals(df.format(now))) {
  67 + Integer Count = Integer.valueOf(maxCode.substring(maxCode.length() - 5, maxCode.length()));
  68 + code = receiptType + df.format(now) + String.format("%05d", Count + 1);
  69 + } else {
  70 + code = receiptType + df.format(now) + "00001";
  71 + }
  72 + return code;
  73 + }
10 74 }
... ...
src/main/java/com/huaheng/pc/receipt/receiptHeaderHistory/domain/ReceiptHeaderHistory.java 0 → 100644
  View file @7f2fa6c
  1 +package com.huaheng.pc.receipt.receiptHeaderHistory.domain;
  2 +
  3 +import com.baomidou.mybatisplus.annotation.IdType;
  4 +import com.baomidou.mybatisplus.annotation.TableField;
  5 +import com.baomidou.mybatisplus.annotation.TableId;
  6 +import com.baomidou.mybatisplus.annotation.TableName;
  7 +import io.swagger.annotations.ApiModel;
  8 +import io.swagger.annotations.ApiModelProperty;
  9 +import java.io.Serializable;
  10 +import java.math.BigDecimal;
  11 +import java.util.Date;
  12 +import lombok.Data;
  13 +
  14 +@ApiModel(value="com.huaheng.pc.receipt.receiptHeaderHistory.domain.ReceiptHeaderHistory")
  15 +@Data
  16 +@TableName(value = "receipt_header_history")
  17 +public class ReceiptHeaderHistory implements Serializable {
  18 + /**
  19 + * 入库单内部号
  20 + */
  21 + @TableId(value = "id", type = IdType.AUTO)
  22 + @ApiModelProperty(value="入库单内部号")
  23 + private Integer id;
  24 +
  25 + /**
  26 + * 仓库
  27 + */
  28 + @TableField(value = "warehouseCode")
  29 + @ApiModelProperty(value="仓库")
  30 + private String warehouseCode;
  31 +
  32 + /**
  33 + * 货主
  34 + */
  35 + @TableField(value = "companyCode")
  36 + @ApiModelProperty(value="货主")
  37 + private String companyCode;
  38 +
  39 + /**
  40 + * 入库单号
  41 + */
  42 + @TableField(value = "code")
  43 + @ApiModelProperty(value="入库单号")
  44 + private String code;
  45 +
  46 + /**
  47 + * 入库类型
  48 + */
  49 + @TableField(value = "receiptType")
  50 + @ApiModelProperty(value="入库类型")
  51 + private String receiptType;
  52 +
  53 + /**
  54 + * 首状态
  55 + */
  56 + @TableField(value = "firstStatus")
  57 + @ApiModelProperty(value="首状态")
  58 + private Integer firstStatus;
  59 +
  60 + /**
  61 + * 尾状态
  62 + */
  63 + @TableField(value = "lastStatus")
  64 + @ApiModelProperty(value="尾状态")
  65 + private Integer lastStatus;
  66 +
  67 + /**
  68 + * 关联单号
  69 + */
  70 + @TableField(value = "referCode")
  71 + @ApiModelProperty(value="关联单号")
  72 + private String referCode;
  73 +
  74 + /**
  75 + * 关联单号（内部号）
  76 + */
  77 + @TableField(value = "referId")
  78 + @ApiModelProperty(value="关联单号（内部号）")
  79 + private Integer referId;
  80 +
  81 + /**
  82 + * 关联订单类型
  83 + */
  84 + @TableField(value = "referType")
  85 + @ApiModelProperty(value="关联订单类型")
  86 + private String referType;
  87 +
  88 + /**
  89 + * 预计到达日期
  90 + */
  91 + @TableField(value = "scheduledArriveDate")
  92 + @ApiModelProperty(value="预计到达日期")
  93 + private Date scheduledArriveDate;
  94 +
  95 + /**
  96 + * 实际到达日期
  97 + */
  98 + @TableField(value = "actualArriveDate")
  99 + @ApiModelProperty(value="实际到达日期")
  100 + private Date actualArriveDate;
  101 +
  102 + /**
  103 + * 月台货位
  104 + */
  105 + @TableField(value = "recvDock")
  106 + @ApiModelProperty(value="月台货位")
  107 + private String recvDock;
  108 +
  109 + /**
  110 + * 关闭时间
  111 + */
  112 + @TableField(value = "closedAt")
  113 + @ApiModelProperty(value="关闭时间")
  114 + private Date closedAt;
  115 +
  116 + /**
  117 + * 强制关闭用户
  118 + */
  119 + @TableField(value = "closedBy")
  120 + @ApiModelProperty(value="强制关闭用户")
  121 + private String closedBy;
  122 +
  123 + /**
  124 + * 开始收货日期
  125 + */
  126 + @TableField(value = "startCheckinDatetime")
  127 + @ApiModelProperty(value="开始收货日期")
  128 + private Date startCheckinDatetime;
  129 +
  130 + /**
  131 + * 结束收货日期
  132 + */
  133 + @TableField(value = "endCheckinDatetime")
  134 + @ApiModelProperty(value="结束收货日期")
  135 + private Date endCheckinDatetime;
  136 +
  137 + /**
  138 + * 总数量
  139 + */
  140 + @TableField(value = "totalQty")
  141 + @ApiModelProperty(value="总数量")
  142 + private Integer totalQty;
  143 +
  144 + /**
  145 + * 总行数
  146 + */
  147 + @TableField(value = "totalLines")
  148 + @ApiModelProperty(value="总行数")
  149 + private Integer totalLines;
  150 +
  151 + /**
  152 + * 总箱数
  153 + */
  154 + @TableField(value = "toalCases")
  155 + @ApiModelProperty(value="总箱数")
  156 + private Integer toalCases;
  157 +
  158 + /**
  159 + * 总重量
  160 + */
  161 + @TableField(value = "totalWeight")
  162 + @ApiModelProperty(value="总重量")
  163 + private BigDecimal totalWeight;
  164 +
  165 + /**
  166 + * 总体积
  167 + */
  168 + @TableField(value = "totalVolume")
  169 + @ApiModelProperty(value="总体积")
  170 + private BigDecimal totalVolume;
  171 +
  172 + /**
  173 + * 入库单备注
  174 + */
  175 + @TableField(value = "receiptNote")
  176 + @ApiModelProperty(value="入库单备注")
  177 + private String receiptNote;
  178 +
  179 + /**
  180 + * 锁定
  181 + */
  182 + @TableField(value = "locked")
  183 + @ApiModelProperty(value="锁定")
  184 + private Integer locked;
  185 +
  186 + /**
  187 + * 锁定用户
  188 + */
  189 + @TableField(value = "lockedBy")
  190 + @ApiModelProperty(value="锁定用户")
  191 + private String lockedBy;
  192 +
  193 + /**
  194 + * 创建时间
  195 + */
  196 + @TableField(value = "created")
  197 + @ApiModelProperty(value="创建时间")
  198 + private Date created;
  199 +
  200 + /**
  201 + * 创建用户
  202 + */
  203 + @TableField(value = "createdBy")
  204 + @ApiModelProperty(value="创建用户")
  205 + private String createdBy;
  206 +
  207 + /**
  208 + * 创建时间
  209 + */
  210 + @TableField(value = "lastUpdated")
  211 + @ApiModelProperty(value="创建时间")
  212 + private Date lastUpdated;
  213 +
  214 + /**
  215 + * 更新用户
  216 + */
  217 + @TableField(value = "lastUpdatedBy")
  218 + @ApiModelProperty(value="更新用户")
  219 + private String lastUpdatedBy;
  220 +
  221 + /**
  222 + * 数据版本
  223 + */
  224 + @TableField(value = "version")
  225 + @ApiModelProperty(value="数据版本")
  226 + private Integer version;
  227 +
  228 + /**
  229 + * 自定义字段1
  230 + */
  231 + @TableField(value = "userDef1")
  232 + @ApiModelProperty(value="自定义字段1")
  233 + private String userDef1;
  234 +
  235 + /**
  236 + * 自定义字段2
  237 + */
  238 + @TableField(value = "userDef2")
  239 + @ApiModelProperty(value="自定义字段2")
  240 + private String userDef2;
  241 +
  242 + /**
  243 + * 自定义字段3
  244 + */
  245 + @TableField(value = "userDef3")
  246 + @ApiModelProperty(value="自定义字段3")
  247 + private String userDef3;
  248 +
  249 + /**
  250 + * 自定义字段4
  251 + */
  252 + @TableField(value = "userDef4")
  253 + @ApiModelProperty(value="自定义字段4")
  254 + private String userDef4;
  255 +
  256 + /**
  257 + * 自定义字段5
  258 + */
  259 + @TableField(value = "userDef5")
  260 + @ApiModelProperty(value="自定义字段5")
  261 + private String userDef5;
  262 +
  263 + /**
  264 + * 自定义字段6
  265 + */
  266 + @TableField(value = "userDef6")
  267 + @ApiModelProperty(value="自定义字段6")
  268 + private String userDef6;
  269 +
  270 + /**
  271 + * 自定义字段7
  272 + */
  273 + @TableField(value = "userDef7")
  274 + @ApiModelProperty(value="自定义字段7")
  275 + private String userDef7;
  276 +
  277 + /**
  278 + * 自定义字段8
  279 + */
  280 + @TableField(value = "userDef8")
  281 + @ApiModelProperty(value="自定义字段8")
  282 + private String userDef8;
  283 +
  284 + /**
  285 + * 处理标记
  286 + */
  287 + @TableField(value = "processStamp")
  288 + @ApiModelProperty(value="处理标记")
  289 + private String processStamp;
  290 +
  291 + /**
  292 + * 是否删除
  293 + */
  294 + @TableField(value = "deleted")
  295 + @ApiModelProperty(value="是否删除")
  296 + private Boolean deleted;
  297 +
  298 + private static final long serialVersionUID = 1L;
  299 +}
0 300 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/receipt/receiptHeaderHistory/mapper/ReceiptHeaderHistoryMapper.java 0 → 100644
  View file @7f2fa6c
  1 +package com.huaheng.pc.receipt.receiptHeaderHistory.mapper;
  2 +
  3 +import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  4 +import com.huaheng.pc.receipt.receiptHeaderHistory.domain.ReceiptHeaderHistory;
  5 +
  6 +public interface ReceiptHeaderHistoryMapper extends BaseMapper<ReceiptHeaderHistory> {
  7 +}
0 8 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/receipt/receiptHeaderHistory/service/ReceiptHeaderHistoryService.java 0 → 100644
  View file @7f2fa6c
  1 +package com.huaheng.pc.receipt.receiptHeaderHistory.service;
  2 +
  3 +import org.springframework.stereotype.Service;
  4 +import javax.annotation.Resource;
  5 +import java.util.List;
  6 +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  7 +import com.huaheng.pc.receipt.receiptHeaderHistory.domain.ReceiptHeaderHistory;
  8 +import com.huaheng.pc.receipt.receiptHeaderHistory.mapper.ReceiptHeaderHistoryMapper;
  9 +@Service
  10 +public class ReceiptHeaderHistoryService extends ServiceImpl<ReceiptHeaderHistoryMapper, ReceiptHeaderHistory> {
  11 +
  12 +}
... ...
src/main/java/com/huaheng/pc/system/dict/controller/DictDataController.java
  View file @7f2fa6c
... ... @@ -3,6 +3,8 @@ package com.huaheng.pc.system.dict.controller;
3 3 import java.util.List;
4 4  
5 5 import com.huaheng.framework.web.service.DictService;
  6 +import com.huaheng.pc.system.dict.domain.DictType;
  7 +import com.huaheng.pc.system.dict.service.IDictTypeService;
6 8 import org.apache.shiro.authz.annotation.RequiresPermissions;
7 9 import org.springframework.beans.factory.annotation.Autowired;
8 10 import org.springframework.stereotype.Controller;
... ... @@ -35,6 +37,9 @@ public class DictDataController extends BaseController
35 37 @Autowired
36 38 private IDictDataService dictDataService;
37 39  
  40 + @Autowired
  41 + private IDictTypeService dictTypeService;
  42 +
38 43 public static List<DictData> dictDataList = null;
39 44  
40 45 @RequiresPermissions("system:dict:view")
... ... @@ -75,9 +80,10 @@ public class DictDataController extends BaseController
75 80 /**
76 81 * 新增字典类型
77 82 */
78   - @GetMapping("/add/{dictType}")
79   - public String add(@PathVariable("dictType") String dictType, ModelMap mmap)
  83 + @GetMapping("/add/{id}")
  84 + public String add(@PathVariable("id") Integer id, ModelMap mmap)
80 85 {
  86 + DictType dictType= dictTypeService.selectDictTypeById(id);
81 87 mmap.put("dictType", dictType);
82 88 return prefix + "/add";
83 89 }
... ...
src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java
  View file @7f2fa6c
... ... @@ -108,7 +108,7 @@ public class TaskHeaderController extends BaseController {
108 108 /**
109 109 * 完成任务
110 110 */
111   - @RequiresPermissions("task:task:complete")
  111 + @RequiresPermissions("task:taskHeader:complete")
112 112 @Log(title = "任务-任务管理", operating = "PC完成立库任务", action = BusinessType.UPDATE)
113 113 @PostMapping( "/completeTaskByWMS")
114 114 @ResponseBody
... ...
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
  View file @7f2fa6c
... ... @@ -12,7 +12,10 @@ import com.huaheng.pc.config.location.domain.Location;
12 12 import com.huaheng.pc.config.location.service.LocationService;
13 13 import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail;
14 14 import com.huaheng.pc.inventory.inventoryDetail.service.InventoryDetailService;
  15 +import com.huaheng.pc.inventory.inventoryHeader.domain.InventoryHeader;
  16 +import com.huaheng.pc.inventory.inventoryHeader.service.InventoryHeaderService;
15 17 import com.huaheng.pc.inventory.inventoryTransaction.domain.InventoryTransaction;
  18 +import com.huaheng.pc.inventory.inventoryTransaction.service.InventoryTransactionService;
16 19 import com.huaheng.pc.receipt.receiptContainerHeader.domain.ReceiptContainerHeader;
17 20 import com.huaheng.pc.shipment.shipmentContainerDetail.domain.ShipmentContainerDetail;
18 21 import com.huaheng.pc.shipment.shipmentContainerDetail.service.ShipmentContainerDetailService;
... ... @@ -54,6 +57,12 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
54 57 @Autowired
55 58 private TaskHeaderService taskHeaderService;
56 59  
  60 + @Autowired
  61 + private InventoryHeaderService inventoryHeaderService;
  62 +
  63 + @Autowired
  64 + private InventoryTransactionService inventoryTransactionService;
  65 +
57 66 @Resource
58 67 private TaskHeaderMapper taskHeaderMapper;
59 68  
... ... @@ -239,7 +248,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
239 248 throw new ServiceException("任务(" + taskId + ")任务已经是完成的！");
240 249 }
241 250 //如果没有库位不能完成
242   - if (StringUtils.isEmpty(task.getPickingCartPos())) {
  251 + if (StringUtils.isEmpty(task.getLocationCode())) {
243 252 throw new ServiceException("任务" + taskId + "没有库位，执行中止");
244 253 }
245 254 this.completeTask(task);
... ... @@ -286,83 +295,83 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
286 295 public AjaxResult completeReceiptTask(TaskHeader task) throws Exception {
287 296 // String LocationCode = task.getIsDoubleIn().intValue() == 0 ? task.getDestinationLocation() : task.getSecondDestinationLocation();
288 297 List<Map<String, Object>> taskReceiptContainerDetail =taskHeaderMapper.getReceiptTask(task.getId());
  298 + if (taskReceiptContainerDetail.size()<1){
  299 + return AjaxResult.success("未找到对应任务的入库单号!!!");
  300 + }
289 301 for (Map<String, Object> map : taskReceiptContainerDetail) {
290 302 //将未完成的任务数量更新到库存表
291 303 if (DataUtils.getInteger(map.get("status")) < 100) {
292   -// //更新库存表
293   -// BigDecimal inventoryQty = new BigDecimal("0");
294   -// Inventory condition = new Inventory();
295   -// condition.setWarehouseId(ShiroUtils.getWarehouseId());
296   -// condition.setLocationCode(LocationCode);
297   -// condition.setReceiptDetailId(DataUtils.getInteger(map.get("billDetailId")));
298   -// condition.setContainerCode(DataUtils.getString(map.get("containerCode")));
299   -// Inventory inventory = inventoryService.selectFirstEntity(condition);
300   -// if (inventory == null)
301   -// {
302   -// inventory = new Inventory();
303   -// inventory.setWarehouseId(DataUtils.getInteger(map.get("warehouseId")));
304   -// inventory.setWarehouseCode(DataUtils.getString(map.get("warehouseCode")));
305   -// inventory.setLocationCode(LocationCode);
306   -// inventory.setContainerCode(DataUtils.getString(map.get("containerCode")));
307   -// inventory.setSourceCode(DataUtils.getString(map.get("sourceCode")));
308   -// inventory.setSourceLine(DataUtils.getString(map.get("sourceLine")));
309   -// inventory.setCompanyId(task.getCompanyId());
310   -// inventory.setCompanyCode(task.getCompanyCode());
311   -// inventory.setMaterialCode(DataUtils.getString(map.get("materialCode")));
312   -// inventory.setMaterialName(DataUtils.getString(map.get("materialName")));
313   -// inventory.setReceiptCode(DataUtils.getString(map.get("billCode")));
314   -// inventory.setReceiptId(DataUtils.getInteger(map.get("billId")));
315   -// inventory.setReceiptDetailId(DataUtils.getInteger(map.get("billDetailId")));
316   -// inventory.setBatch(DataUtils.getString(map.get("batch")));
317   -// inventory.setLot(DataUtils.getString(map.get("lot")));
318   -// inventory.setProject(DataUtils.getString(map.get("project")));
319   -// inventory.setManufactureDate(DataUtils.getDateTime(map.get("manufactureDate")));
320   -// inventory.setExpirationDate(DataUtils.getDateTime(map.get("expirationDate")));
321   -// inventory.setStatus(DataUtils.getString((map.get("inventoryStatus"))));
322   -// inventory.setQty(DataUtils.getBigDecimal(map.get("qty")));
323   -// inventory.setCostPrice(DataUtils.getBigDecimal(map.get("price")));
324   -// inventory.setCreatedBy(ShiroUtils.getLoginName());
325   -// inventory.setLastUpdatedBy(ShiroUtils.getLoginName());
326   -// inventoryService.insert(inventory);
327   -// }
328   -// else
329   -// {
330   -// inventoryQty = inventory.getQty();
331   -// inventory.setQty(inventory.getQty().add(DataUtils.getBigDecimal(map.get("qty"))));
332   -// inventory.setLastUpdatedBy(ShiroUtils.getLoginName());
333   -// inventoryService.updateByModel(inventory);
334   -// }
335   -// //记录库存交易记录
336   -// InventoryTransaction inventoryTransaction = new InventoryTransaction();
337   -// inventoryTransaction.setType("receipt");
338   -// inventoryTransaction.setWarehouseId(DataUtils.getInteger(map.get("warehouseId")));
339   -// inventoryTransaction.setWarehouseCode(DataUtils.getString(map.get("warehouseCode")));
340   -// inventoryTransaction.setCompanyId(task.getCompanyId());
341   -// inventoryTransaction.setCompanyCode(task.getCompanyCode());
342   -// inventoryTransaction.setLocationCode(LocationCode);
343   -// inventoryTransaction.setContainerCode(DataUtils.getString(map.get("containerCode")));
344   -// inventoryTransaction.setSourceCode(DataUtils.getString(map.get("sourceCode")));
345   -// inventoryTransaction.setSourceLine(DataUtils.getString(map.get("sourceLine")));
346   -// inventoryTransaction.setMaterialCode(DataUtils.getString(map.get("materialCode")));
347   -// inventoryTransaction.setMaterialName(DataUtils.getString(map.get("materialName")));
348   -// inventoryTransaction.setBillCode(DataUtils.getString(map.get("billCode")));
349   -// inventoryTransaction.setBillId(DataUtils.getInteger(map.get("billId")));
350   -// inventoryTransaction.setBillDetailId(DataUtils.getInteger(map.get("billDetailId")));
351   -// inventoryTransaction.setBatch(DataUtils.getString(map.get("batch")));
352   -// inventoryTransaction.setLot(DataUtils.getString(map.get("lot")));
353   -// inventoryTransaction.setProject(DataUtils.getString(map.get("project")));
354   -// inventoryTransaction.setManufactureDate(DataUtils.getDateTime(map.get("manufactureDate")));
355   -// inventoryTransaction.setExpirationDate(DataUtils.getDateTime(map.get("expirationDate")));
356   -// inventoryTransaction.setStatus(DataUtils.getString((map.get("inventoryStatus"))));
357   -// inventoryTransaction.setQty(inventoryQty);
358   -// inventoryTransaction.setTaskQty(DataUtils.getBigDecimal(map.get("qty")));
359   -// inventoryTransaction.setCostPrice(DataUtils.getBigDecimal(map.get("price")));
360   -// //inventoryTransaction.setCreatedBy(ShiroUtils.getLoginName());
361   -// inventoryTransaction.setCreated(null);
362   -// inventoryTransaction.setCreatedBy(ShiroUtils.getLoginName());
363   -// inventoryTransaction.setLastUpdated(null);
364   -// inventoryTransaction.setLastUpdatedBy(ShiroUtils.getLoginName());
365   -// inventoryTransactionService.insert(inventoryTransaction);
  304 + LambdaQueryWrapper<InventoryDetail> inventory =Wrappers.lambdaQuery();
  305 + inventory.eq(InventoryDetail::getWarehouseCode,ShiroUtils.getWarehouseCode())
  306 + .eq(InventoryDetail::getLocationCode,task.getLocationCode())
  307 + .eq(InventoryDetail::getReceiptDetailId,DataUtils.getString(map.get("id")))
  308 + .eq(InventoryDetail::getContainerCode,DataUtils.getString(map.get("containerCode")));
  309 + InventoryDetail detail=inventoryDetailService.getOne(inventory);
  310 + if (detail == null)
  311 + {
  312 + //添加库存单
  313 + InventoryHeader header = new InventoryHeader();
  314 + header.setWarehouseCode(DataUtils.getString(map.get("warehouseCode")));//仓库
  315 + header.setCompanyCode(task.getCompanyCode());//货主
  316 + header.setContainerCode(DataUtils.getString(map.get("containerCode")));//容器号
  317 + header.setTotalQty(DataUtils.getInteger(map.get("totalQty")));//总数量
  318 + header.setLocking(1);
  319 + header.setEnable(1);
  320 + header.setCreatedBy(ShiroUtils.getLoginName());
  321 + header.setCreated(new Date());
  322 + header.setLastUpdated(new Date());
  323 + inventoryHeaderService.save(header);
  324 + //库存明细添加
  325 + detail = new InventoryDetail();
  326 + detail.setInventoryHeaderId(header.getId());//库存头ID
  327 + detail.setWarehouseCode(DataUtils.getString(map.get("warehouseCode")));//仓库
  328 + detail.setCompanyCode(task.getCompanyCode());//货主
  329 + detail.setLocationCode(task.getLocationCode());//库位号
  330 + detail.setContainerCode(DataUtils.getString(map.get("containerCode")));//容器号
  331 + detail.setMaterialCode(DataUtils.getString(map.get("materialCode")));//物料号
  332 + detail.setMaterialName(DataUtils.getString(map.get("materialName")));//物料名称
  333 + detail.setMaterialSpec(DataUtils.getString(map.get("materialSpec")));//物料规格
  334 + detail.setReceiptCode(DataUtils.getString(map.get("receiptCode")));//入库单编码
  335 + detail.setReceiptDetailId(DataUtils.getInteger(map.get("id")));//入库单明细ID
  336 + detail.setBatch(DataUtils.getString(map.get("batch")));//批次
  337 + detail.setLot(DataUtils.getString(map.get("lot")));//批号
  338 + detail.setInventorySts(DataUtils.getString(map.get("inventorySts")));//库存状态
  339 + detail.setManufactureDate(DataUtils.getDateTime(map.get("manufactureDate")));//生产日期
  340 + detail.setExpirationDate(DataUtils.getDateTime(map.get("expirationDate")));//失效日期
  341 + detail.setQty(DataUtils.getBigDecimal(map.get("qty")));//数量
  342 + detail.setTaskQty(DataUtils.getBigDecimal(map.get("taskQty")));
  343 + detail.setCreatedBy(ShiroUtils.getLoginName());//创建人
  344 + detail.setLastUpdatedBy(ShiroUtils.getLoginName());//创建时间
  345 + inventoryDetailService.save(detail);
  346 + }
  347 + else
  348 + {
  349 + detail.setQty(detail.getQty().add(DataUtils.getBigDecimal(map.get("qty"))));
  350 + detail.setLastUpdatedBy(ShiroUtils.getLoginName());
  351 + LambdaUpdateWrapper<InventoryDetail> lambdaUpdateWrapper = Wrappers.lambdaUpdate();
  352 + lambdaUpdateWrapper.eq(InventoryDetail::getId,DataUtils.getInteger(map.get("id")));
  353 + inventoryDetailService.update(detail, lambdaUpdateWrapper);
  354 + }
  355 + //记录库存交易记录
  356 + InventoryTransaction inventoryTransaction = new InventoryTransaction();
  357 + inventoryTransaction.setTransactionType(10);
  358 + inventoryTransaction.setWarehouseCode(DataUtils.getString(map.get("warehouseCode")));
  359 + inventoryTransaction.setCompanyCode(task.getCompanyCode());
  360 + inventoryTransaction.setLocationCode(task.getLocationCode());
  361 + inventoryTransaction.setContainerCode(DataUtils.getString(map.get("containerCode")));
  362 + inventoryTransaction.setMaterialCode(DataUtils.getString(map.get("materialCode")));
  363 + inventoryTransaction.setMaterialName(DataUtils.getString(map.get("materialName")));
  364 + inventoryTransaction.setBillCode(DataUtils.getString(map.get("receiptCode")));
  365 + inventoryTransaction.setBillDetailId(DataUtils.getInteger(map.get("id")));
  366 + inventoryTransaction.setBatch(DataUtils.getString(map.get("batch")));
  367 + inventoryTransaction.setLot(DataUtils.getString(map.get("lot")));
  368 + inventoryTransaction.setManufactureDate(DataUtils.getDateTime(map.get("manufactureDate")));
  369 + inventoryTransaction.setExpirationDate(DataUtils.getDateTime(map.get("expirationDate")));
  370 + inventoryTransaction.setInventorySts(DataUtils.getString((map.get("inventorySts"))));
  371 + inventoryTransaction.setTaskQty(DataUtils.getInteger(map.get("taskQty")));
  372 + inventoryTransaction.setCreated(new Date());
  373 + inventoryTransaction.setCreatedBy(ShiroUtils.getLoginName());
  374 + inventoryTransactionService.save(inventoryTransaction);
366 375 // //修改任务明细的状态为完成
367 376 // TaskDetail taskDetail = new TaskDetail();
368 377 // taskDetail.setId(DataUtils.getInteger(map.get("taskDetailId")));
... ...
src/main/resources/mybatis/config/MaterialTypeMapper.xml 0 → 100644
  View file @7f2fa6c
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="com.huaheng.pc.config.materialType.mapper.MaterialTypeMapper">
  4 + <resultMap id="BaseResultMap" type="com.huaheng.pc.config.materialType.domain.MaterialType">
  5 + <!--@mbg.generated-->
  6 + <id column="id" jdbcType="INTEGER" property="id" />
  7 + <result column="code" jdbcType="VARCHAR" property="code" />
  8 + <result column="name" jdbcType="VARCHAR" property="name" />
  9 + <result column="companyCode" jdbcType="VARCHAR" property="companyCode" />
  10 + <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
  11 + <result column="abcClass" jdbcType="VARCHAR" property="abcClass" />
  12 + <result column="daysToExpire" jdbcType="INTEGER" property="daysToExpire" />
  13 + <result column="receivingFlow" jdbcType="VARCHAR" property="receivingFlow" />
  14 + <result column="shippingFlow" jdbcType="VARCHAR" property="shippingFlow" />
  15 + <result column="locatingRule" jdbcType="VARCHAR" property="locatingRule" />
  16 + <result column="allocationRule" jdbcType="VARCHAR" property="allocationRule" />
  17 + <result column="replenishmentRule" jdbcType="VARCHAR" property="replenishmentRule" />
  18 + <result column="emptyLocRule" jdbcType="VARCHAR" property="emptyLocRule" />
  19 + <result column="pickingRule" jdbcType="VARCHAR" property="pickingRule" />
  20 + <result column="attributeTemplateCode" jdbcType="VARCHAR" property="attributeTemplateCode" />
  21 + <result column="trackSerialNum" jdbcType="INTEGER" property="trackSerialNum" />
  22 + <result column="autoGenSerialNum" jdbcType="INTEGER" property="autoGenSerialNum" />
  23 + <result column="autoGenSerialNumFormat" jdbcType="VARCHAR" property="autoGenSerialNumFormat" />
  24 + <result column="snTemplateCode" jdbcType="VARCHAR" property="snTemplateCode" />
  25 + <result column="expiringDays" jdbcType="INTEGER" property="expiringDays" />
  26 + <result column="minShelfLifeDays" jdbcType="INTEGER" property="minShelfLifeDays" />
  27 + <result column="enable" jdbcType="INTEGER" property="enable" />
  28 + <result column="created" jdbcType="TIMESTAMP" property="created" />
  29 + <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
  30 + <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
  31 + <result column="lastUpdatedBy" jdbcType="VARCHAR" property="lastUpdatedBy" />
  32 + <result column="version" jdbcType="INTEGER" property="version" />
  33 + <result column="userDef1" jdbcType="VARCHAR" property="userDef1" />
  34 + <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
  35 + <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
  36 + <result column="userDef4" jdbcType="VARCHAR" property="userDef4" />
  37 + <result column="userDef5" jdbcType="VARCHAR" property="userDef5" />
  38 + <result column="userDef6" jdbcType="VARCHAR" property="userDef6" />
  39 + <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />
  40 + <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />
  41 + </resultMap>
  42 + <sql id="Base_Column_List">
  43 + <!--@mbg.generated-->
  44 + id, code, `name`, companyCode, warehouseCode, abcClass, daysToExpire, receivingFlow,
  45 + shippingFlow, locatingRule, allocationRule, replenishmentRule, emptyLocRule, pickingRule,
  46 + attributeTemplateCode, trackSerialNum, autoGenSerialNum, autoGenSerialNumFormat,
  47 + snTemplateCode, expiringDays, minShelfLifeDays, `enable`, created, createdBy, lastUpdated,
  48 + lastUpdatedBy, version, userDef1, userDef2, userDef3, userDef4, userDef5, userDef6,
  49 + userDef7, userDef8
  50 + </sql>
  51 +</mapper>
0 52 \ No newline at end of file
... ...
src/main/resources/mybatis/config/ReceiptTypeMapper.xml
  View file @7f2fa6c
... ... @@ -7,6 +7,7 @@
7 7 <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
8 8 <result column="companyCode" jdbcType="VARCHAR" property="companyCode" />
9 9 <result column="code" jdbcType="VARCHAR" property="code" />
  10 + <result column="name" jdbcType="VARCHAR" property="name" />
10 11 <result column="referType" jdbcType="VARCHAR" property="referType" />
11 12 <result column="receiptFlow" jdbcType="VARCHAR" property="receiptFlow" />
12 13 <result column="enable" jdbcType="BIT" property="enable" />
... ...
src/main/resources/mybatis/inventory/AdjustDetailMapper.xml 0 → 100644
  View file @7f2fa6c
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="com.huaheng.pc.inventory.adjust.mapper.AdjustDetailMapper">
  4 + <resultMap id="BaseResultMap" type="com.huaheng.pc.inventory.adjust.domain.AdjustDetail">
  5 + <!--@mbg.generated-->
  6 + <id column="id" jdbcType="INTEGER" property="id" />
  7 + <result column="adjustCode" jdbcType="VARCHAR" property="adjustCode" />
  8 + <result column="cycleCountCode" jdbcType="VARCHAR" property="cycleCountCode" />
  9 + <result column="cycleCountLineId" jdbcType="VARCHAR" property="cycleCountLineId" />
  10 + <result column="checkCode" jdbcType="VARCHAR" property="checkCode" />
  11 + <result column="checkLineCode" jdbcType="VARCHAR" property="checkLineCode" />
  12 + <result column="referCode" jdbcType="VARCHAR" property="referCode" />
  13 + <result column="referId" jdbcType="INTEGER" property="referId" />
  14 + <result column="pendingAdjustId" jdbcType="INTEGER" property="pendingAdjustId" />
  15 + <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
  16 + <result column="companyCode" jdbcType="VARCHAR" property="companyCode" />
  17 + <result column="materialCode" jdbcType="VARCHAR" property="materialCode" />
  18 + <result column="materialName" jdbcType="VARCHAR" property="materialName" />
  19 + <result column="materialSpec" jdbcType="VARCHAR" property="materialSpec" />
  20 + <result column="materialUnit" jdbcType="VARCHAR" property="materialUnit" />
  21 + <result column="problemType" jdbcType="VARCHAR" property="problemType" />
  22 + <result column="attributeId" jdbcType="INTEGER" property="attributeId" />
  23 + <result column="fromInventorySts" jdbcType="VARCHAR" property="fromInventorySts" />
  24 + <result column="toInventorySts" jdbcType="VARCHAR" property="toInventorySts" />
  25 + <result column="fromQty" jdbcType="INTEGER" property="fromQty" />
  26 + <result column="toQty" jdbcType="INTEGER" property="toQty" />
  27 + <result column="gapQty" jdbcType="INTEGER" property="gapQty" />
  28 + <result column="reportBy" jdbcType="VARCHAR" property="reportBy" />
  29 + <result column="status" jdbcType="INTEGER" property="status" />
  30 + <result column="created" jdbcType="TIMESTAMP" property="created" />
  31 + <result column="operateTime" jdbcType="TIMESTAMP" property="operateTime" />
  32 + <result column="agreeTime" jdbcType="TIMESTAMP" property="agreeTime" />
  33 + <result column="Remark" jdbcType="VARCHAR" property="remark" />
  34 + <result column="version" jdbcType="INTEGER" property="version" />
  35 + <result column="userDef1" jdbcType="VARCHAR" property="userDef1" />
  36 + <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
  37 + <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
  38 + <result column="userDef4" jdbcType="VARCHAR" property="userDef4" />
  39 + <result column="userDef5" jdbcType="VARCHAR" property="userDef5" />
  40 + <result column="userDef6" jdbcType="VARCHAR" property="userDef6" />
  41 + <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />
  42 + <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />
  43 + <result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
  44 + </resultMap>
  45 + <sql id="Base_Column_List">
  46 + <!--@mbg.generated-->
  47 + id, adjustCode, cycleCountCode, cycleCountLineId, checkCode, checkLineCode, referCode,
  48 + referId, pendingAdjustId, warehouseCode, companyCode, materialCode, materialName,
  49 + materialSpec, materialUnit, problemType, attributeId, fromInventorySts, toInventorySts,
  50 + fromQty, toQty, gapQty, reportBy, `status`, created, operateTime, agreeTime, Remark,
  51 + version, userDef1, userDef2, userDef3, userDef4, userDef5, userDef6, userDef7, userDef8,
  52 + processStamp
  53 + </sql>
  54 +</mapper>
0 55 \ No newline at end of file
... ...
src/main/resources/mybatis/inventory/AdjustHeaderMapper.xml 0 → 100644
  View file @7f2fa6c
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="com.huaheng.pc.inventory.adjust.mapper.AdjustHeaderMapper">
  4 + <resultMap id="BaseResultMap" type="com.huaheng.pc.inventory.adjust.domain.AdjustHeader">
  5 + <!--@mbg.generated-->
  6 + <id column="id" jdbcType="INTEGER" property="id" />
  7 + <result column="code" jdbcType="VARCHAR" property="code" />
  8 + <result column="name" jdbcType="VARCHAR" property="name" />
  9 + <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
  10 + <result column="companyCode" jdbcType="VARCHAR" property="companyCode" />
  11 + <result column="problemType" jdbcType="VARCHAR" property="problemType" />
  12 + <result column="cycleCountCode" jdbcType="VARCHAR" property="cycleCountCode" />
  13 + <result column="checkCode" jdbcType="VARCHAR" property="checkCode" />
  14 + <result column="referCode" jdbcType="VARCHAR" property="referCode" />
  15 + <result column="referId" jdbcType="INTEGER" property="referId" />
  16 + <result column="referReason" jdbcType="VARCHAR" property="referReason" />
  17 + <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
  18 + <result column="created" jdbcType="TIMESTAMP" property="created" />
  19 + <result column="lastUpdatedBy" jdbcType="VARCHAR" property="lastUpdatedBy" />
  20 + <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
  21 + <result column="version" jdbcType="INTEGER" property="version" />
  22 + <result column="userDef1" jdbcType="VARCHAR" property="userDef1" />
  23 + <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
  24 + <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
  25 + <result column="userDef4" jdbcType="VARCHAR" property="userDef4" />
  26 + <result column="userDef5" jdbcType="VARCHAR" property="userDef5" />
  27 + <result column="userDef6" jdbcType="VARCHAR" property="userDef6" />
  28 + <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />
  29 + <result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
  30 + </resultMap>
  31 + <sql id="Base_Column_List">
  32 + <!--@mbg.generated-->
  33 + id, code, `name`, warehouseCode, companyCode, problemType, cycleCountCode, checkCode,
  34 + referCode, referId, referReason, createdBy, created, lastUpdatedBy, lastUpdated,
  35 + version, userDef1, userDef2, userDef3, userDef4, userDef5, userDef6, userDef7, processStamp
  36 + </sql>
  37 +</mapper>
0 38 \ No newline at end of file
... ...
src/main/resources/mybatis/inventory/CycleCountDetailMapper.xml
  View file @7f2fa6c
... ... @@ -20,7 +20,7 @@
20 20 <result column="inventorySts" jdbcType="VARCHAR" property="inventorySts" />
21 21 <result column="systemQty" jdbcType="DECIMAL" property="systemQty" />
22 22 <result column="countedQty" jdbcType="DECIMAL" property="countedQty" />
23   - <result column="adjustQty" jdbcType="DECIMAL" property="adjustQty" />
  23 + <result column="gapQty" jdbcType="DECIMAL" property="gapQty" />
24 24 <result column="rejectionNote" jdbcType="VARCHAR" property="rejectionNote" />
25 25 <result column="countedBy" jdbcType="VARCHAR" property="countedBy" />
26 26 <result column="countedAt" jdbcType="TIMESTAMP" property="countedAt" />
... ... @@ -46,7 +46,7 @@
46 46 <!--@mbg.generated-->
47 47 id, countId, round, taskHeaderId, taskDetailId, warehouseCode, inventoryDetailId,
48 48 locationCode, containerCode, materialCode, materialName, materialSpec, materialUnit,
49   - companyCode, inventorySts, systemQty, countedQty, adjustQty, rejectionNote, countedBy,
  49 + companyCode, inventorySts, systemQty, countedQty, gapQty, rejectionNote, countedBy,
50 50 countedAt, assignedTo, assignedAt, completedBy, completedAt, enableStatus, created,
51 51 createdBy, lastUpdated, lastUpdatedBy, version, userDef1, userDef2, userDef3, processStamp,
52 52 batch, lot, projectNo
... ...
src/main/resources/mybatis/inventory/InventoryTransactionMapper.xml
  View file @7f2fa6c
... ... @@ -13,10 +13,10 @@
13 13 <result column="materialName" jdbcType="VARCHAR" property="materialName" />
14 14 <result column="materialSpec" jdbcType="VARCHAR" property="materialSpec" />
15 15 <result column="materialUnit" jdbcType="VARCHAR" property="materialUnit" />
16   - <result column="qty" jdbcType="INTEGER" property="qty" />
  16 + <result column="taskQty" jdbcType="INTEGER" property="taskQty" />
17 17 <result column="inventorySts" jdbcType="VARCHAR" property="inventorySts" />
18 18 <result column="referCode" jdbcType="VARCHAR" property="referCode" />
19   - <result column="referId" jdbcType="VARCHAR" property="referId" />
  19 + <result column="referDetailId" jdbcType="VARCHAR" property="referDetailId" />
20 20 <result column="referDetailId" jdbcType="VARCHAR" property="referDetailId" />
21 21 <result column="batch" jdbcType="VARCHAR" property="batch" />
22 22 <result column="lot" jdbcType="VARCHAR" property="lot" />
... ... @@ -30,31 +30,22 @@
30 30 <result column="attribute1" jdbcType="VARCHAR" property="attribute1" />
31 31 <result column="attribute2" jdbcType="VARCHAR" property="attribute2" />
32 32 <result column="attribute3" jdbcType="VARCHAR" property="attribute3" />
33   - <result column="attribute4" jdbcType="VARCHAR" property="attribute4" />
34 33 <result column="lockCode" jdbcType="VARCHAR" property="lockCode" />
35   - <result column="lastCycleCountDate" jdbcType="TIMESTAMP" property="lastCycleCountDate" />
36 34 <result column="created" jdbcType="TIMESTAMP" property="created" />
37 35 <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
38   - <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
39   - <result column="lastUpdatedBy" jdbcType="VARCHAR" property="lastUpdatedBy" />
40 36 <result column="version" jdbcType="INTEGER" property="version" />
41 37 <result column="userDef1" jdbcType="VARCHAR" property="userDef1" />
42 38 <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
43 39 <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
44   - <result column="userDef4" jdbcType="VARCHAR" property="userDef4" />
45   - <result column="userDef5" jdbcType="VARCHAR" property="userDef5" />
46   - <result column="userDef6" jdbcType="VARCHAR" property="userDef6" />
47   - <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />
48   - <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />
49 40 <result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
50 41 </resultMap>
51 42 <sql id="Base_Column_List">
52 43 <!--@mbg.generated-->
53 44 id, warehouseCode, companyCode, locationCode, containerCode, transactionType, materialCode,
54   - materialName, materialSpec, materialUnit, qty, inventorySts, referCode, referId,
  45 + materialName, materialSpec, materialUnit, taskQty, inventorySts, referCode, referDetailId,
55 46 referDetailId, batch, lot, projectNo, qcCheck, weight, manufactureDate, expirationDate,
56   - agingDate, attributeId, attribute1, attribute2, attribute3, attribute4, lockCode,
57   - lastCycleCountDate, created, createdBy, lastUpdated, lastUpdatedBy, version, userDef1,
58   - userDef2, userDef3, userDef4, userDef5, userDef6, userDef7, userDef8, processStamp
  47 + agingDate, attributeId, attribute1, attribute2, attribute3, lockCode,
  48 + created, createdBy, version, userDef1,
  49 + userDef2, userDef3, processStamp
59 50 </sql>
60 51 </mapper>
61 52 \ No newline at end of file
... ...
src/main/resources/mybatis/receipt/ReceiptDetailHistoryMapper.xml 0 → 100644
  View file @7f2fa6c
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="com.huaheng.pc.receipt.receiptDetailHistory.mapper.ReceiptDetailHistoryMapper">
  4 + <resultMap id="BaseResultMap" type="com.huaheng.pc.receipt.receiptDetailHistory.domain.ReceiptDetailHistory">
  5 + <!--@mbg.generated-->
  6 + <id column="id" jdbcType="INTEGER" property="id" />
  7 + <result column="receiptId" jdbcType="INTEGER" property="receiptId" />
  8 + <result column="receiptCode" jdbcType="VARCHAR" property="receiptCode" />
  9 + <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
  10 + <result column="companyCode" jdbcType="VARCHAR" property="companyCode" />
  11 + <result column="materialCode" jdbcType="VARCHAR" property="materialCode" />
  12 + <result column="materialName" jdbcType="VARCHAR" property="materialName" />
  13 + <result column="materialSpec" jdbcType="VARCHAR" property="materialSpec" />
  14 + <result column="materialUnit" jdbcType="VARCHAR" property="materialUnit" />
  15 + <result column="supplierCode" jdbcType="VARCHAR" property="supplierCode" />
  16 + <result column="batch" jdbcType="VARCHAR" property="batch" />
  17 + <result column="lot" jdbcType="VARCHAR" property="lot" />
  18 + <result column="qcCheck" jdbcType="VARCHAR" property="qcCheck" />
  19 + <result column="projectNo" jdbcType="VARCHAR" property="projectNo" />
  20 + <result column="manufactureDate" jdbcType="DATE" property="manufactureDate" />
  21 + <result column="expirationDate" jdbcType="DATE" property="expirationDate" />
  22 + <result column="agingDate" jdbcType="DATE" property="agingDate" />
  23 + <result column="attributeTemplateCode" jdbcType="VARCHAR" property="attributeTemplateCode" />
  24 + <result column="attribute1" jdbcType="VARCHAR" property="attribute1" />
  25 + <result column="attribute2" jdbcType="VARCHAR" property="attribute2" />
  26 + <result column="attribute3" jdbcType="VARCHAR" property="attribute3" />
  27 + <result column="attribute4" jdbcType="VARCHAR" property="attribute4" />
  28 + <result column="totalQty" jdbcType="INTEGER" property="totalQty" />
  29 + <result column="openQty" jdbcType="INTEGER" property="openQty" />
  30 + <result column="referCode" jdbcType="VARCHAR" property="referCode" />
  31 + <result column="referId" jdbcType="INTEGER" property="referId" />
  32 + <result column="referLineNum" jdbcType="VARCHAR" property="referLineNum" />
  33 + <result column="locatingRule" jdbcType="VARCHAR" property="locatingRule" />
  34 + <result column="inventorySts" jdbcType="VARCHAR" property="inventorySts" />
  35 + <result column="itemListPrice" jdbcType="DECIMAL" property="itemListPrice" />
  36 + <result column="itemNetPrice" jdbcType="DECIMAL" property="itemNetPrice" />
  37 + <result column="isVirtualBom" jdbcType="INTEGER" property="isVirtualBom" />
  38 + <result column="created" jdbcType="TIMESTAMP" property="created" />
  39 + <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
  40 + <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
  41 + <result column="lastUpdatedBy" jdbcType="VARCHAR" property="lastUpdatedBy" />
  42 + <result column="version" jdbcType="INTEGER" property="version" />
  43 + <result column="userDef1" jdbcType="VARCHAR" property="userDef1" />
  44 + <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
  45 + <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
  46 + <result column="userDef4" jdbcType="VARCHAR" property="userDef4" />
  47 + <result column="userDef5" jdbcType="VARCHAR" property="userDef5" />
  48 + <result column="userDef6" jdbcType="VARCHAR" property="userDef6" />
  49 + <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />
  50 + <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />
  51 + <result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
  52 + <result column="deleted" jdbcType="BIT" property="deleted" />
  53 + </resultMap>
  54 + <sql id="Base_Column_List">
  55 + <!--@mbg.generated-->
  56 + id, receiptId, receiptCode, warehouseCode, companyCode, materialCode, materialName,
  57 + materialSpec, materialUnit, supplierCode, batch, lot, qcCheck, projectNo, manufactureDate,
  58 + expirationDate, agingDate, attributeTemplateCode, attribute1, attribute2, attribute3,
  59 + attribute4, totalQty, openQty, referCode, referId, referLineNum, locatingRule, inventorySts,
  60 + itemListPrice, itemNetPrice, isVirtualBom, created, createdBy, lastUpdated, lastUpdatedBy,
  61 + version, userDef1, userDef2, userDef3, userDef4, userDef5, userDef6, userDef7, userDef8,
  62 + processStamp, deleted
  63 + </sql>
  64 +</mapper>
0 65 \ No newline at end of file
... ...
src/main/resources/mybatis/receipt/ReceiptHeaderHistoryMapper.xml 0 → 100644
  View file @7f2fa6c
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="com.huaheng.pc.receipt.receiptHeaderHistory.mapper.ReceiptHeaderHistoryMapper">
  4 + <resultMap id="BaseResultMap" type="com.huaheng.pc.receipt.receiptHeaderHistory.domain.ReceiptHeaderHistory">
  5 + <!--@mbg.generated-->
  6 + <id column="id" jdbcType="INTEGER" property="id" />
  7 + <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
  8 + <result column="companyCode" jdbcType="VARCHAR" property="companyCode" />
  9 + <result column="code" jdbcType="VARCHAR" property="code" />
  10 + <result column="receiptType" jdbcType="VARCHAR" property="receiptType" />
  11 + <result column="firstStatus" jdbcType="INTEGER" property="firstStatus" />
  12 + <result column="lastStatus" jdbcType="INTEGER" property="lastStatus" />
  13 + <result column="referCode" jdbcType="VARCHAR" property="referCode" />
  14 + <result column="referId" jdbcType="INTEGER" property="referId" />
  15 + <result column="referType" jdbcType="VARCHAR" property="referType" />
  16 + <result column="scheduledArriveDate" jdbcType="DATE" property="scheduledArriveDate" />
  17 + <result column="actualArriveDate" jdbcType="DATE" property="actualArriveDate" />
  18 + <result column="recvDock" jdbcType="VARCHAR" property="recvDock" />
  19 + <result column="closedAt" jdbcType="DATE" property="closedAt" />
  20 + <result column="closedBy" jdbcType="VARCHAR" property="closedBy" />
  21 + <result column="startCheckinDatetime" jdbcType="TIMESTAMP" property="startCheckinDatetime" />
  22 + <result column="endCheckinDatetime" jdbcType="TIMESTAMP" property="endCheckinDatetime" />
  23 + <result column="totalQty" jdbcType="INTEGER" property="totalQty" />
  24 + <result column="totalLines" jdbcType="INTEGER" property="totalLines" />
  25 + <result column="toalCases" jdbcType="INTEGER" property="toalCases" />
  26 + <result column="totalWeight" jdbcType="DECIMAL" property="totalWeight" />
  27 + <result column="totalVolume" jdbcType="DECIMAL" property="totalVolume" />
  28 + <result column="receiptNote" jdbcType="VARCHAR" property="receiptNote" />
  29 + <result column="locked" jdbcType="INTEGER" property="locked" />
  30 + <result column="lockedBy" jdbcType="VARCHAR" property="lockedBy" />
  31 + <result column="created" jdbcType="TIMESTAMP" property="created" />
  32 + <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
  33 + <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
  34 + <result column="lastUpdatedBy" jdbcType="VARCHAR" property="lastUpdatedBy" />
  35 + <result column="version" jdbcType="INTEGER" property="version" />
  36 + <result column="userDef1" jdbcType="VARCHAR" property="userDef1" />
  37 + <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
  38 + <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
  39 + <result column="userDef4" jdbcType="VARCHAR" property="userDef4" />
  40 + <result column="userDef5" jdbcType="VARCHAR" property="userDef5" />
  41 + <result column="userDef6" jdbcType="VARCHAR" property="userDef6" />
  42 + <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />
  43 + <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />
  44 + <result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
  45 + <result column="deleted" jdbcType="BIT" property="deleted" />
  46 + </resultMap>
  47 + <sql id="Base_Column_List">
  48 + <!--@mbg.generated-->
  49 + id, warehouseCode, companyCode, code, receiptType, firstStatus, lastStatus, referCode,
  50 + referId, referType, scheduledArriveDate, actualArriveDate, recvDock, closedAt, closedBy,
  51 + startCheckinDatetime, endCheckinDatetime, totalQty, totalLines, toalCases, totalWeight,
  52 + totalVolume, receiptNote, locked, lockedBy, created, createdBy, lastUpdated, lastUpdatedBy,
  53 + version, userDef1, userDef2, userDef3, userDef4, userDef5, userDef6, userDef7, userDef8,
  54 + processStamp, deleted
  55 + </sql>
  56 +</mapper>
0 57 \ No newline at end of file
... ...
src/main/resources/templates/config/receiptType/add.html
  View file @7f2fa6c
... ... @@ -12,6 +12,12 @@
12 12 </div>
13 13 </div>
14 14 <div class="form-group">
  15 + <label class="col-sm-3 control-label">名称：</label>
  16 + <div class="col-sm-8">
  17 + <input id="name" name="name" class="form-control" type="text">
  18 + </div>
  19 + </div>
  20 + <div class="form-group">
15 21 <label class="col-sm-3 control-label">货主编码：</label>
16 22 <div class="col-sm-8">
17 23 <select id="companyCode" name="companyCode" class="form-control" th:with="companyList=${@companyService.selectCompanyByCurrentUserId()}">
... ... @@ -40,7 +46,9 @@
40 46 <div class="form-group">
41 47 <label class="col-sm-3 control-label">入库流程：</label>
42 48 <div class="col-sm-8">
43   - <input id="receiptFlow" name="receiptFlow" class="form-control" type="text">
  49 + <select id="receiptFlow" name="receiptFlow" class="form-control" th:with="statusFlowList=${@StatusFlow.flowList()}">
  50 + <option th:each="flow : ${statusFlowList}" th:text="${flow['name']}" th:value="${flow['code']}"></option>
  51 + </select>
44 52 </div>
45 53 </div>
46 54 <!--<div class="form-group">
... ... @@ -150,8 +158,8 @@
150 158 code:{
151 159 required:true,
152 160 },
153   - referType:{
154   - required:true,
  161 + name:{
  162 + required:true,
155 163 },
156 164 receiptFlow:{
157 165 required:true,
... ... @@ -161,6 +169,7 @@
161 169 // $.operate.save(prefix + "/add", $('#form-locationType-add').serialize());
162 170 var tableValue = $.common.getTableValue("#form-receiptType-add");
163 171 tableValue = formValueReplace(tableValue, "companyCode", $("#companyCode option:selected").val());
  172 + tableValue = formValueReplace(tableValue, "receiptFlow", $("#receiptFlow option:selected").val());
164 173 tableValue = formValueReplace(tableValue, "enable", $("input[name='enable']").is(':checked'));
165 174 $.operate.save(prefix + "/add", tableValue);
166 175 }
... ...
src/main/resources/templates/config/receiptType/edit.html
  View file @7f2fa6c
... ... @@ -13,6 +13,12 @@
13 13 </div>
14 14 </div>
15 15 <div class="form-group">
  16 + <label class="col-sm-3 control-label">名字：</label>
  17 + <div class="col-sm-8">
  18 + <input id="name" name="name" class="form-control" type="text" th:field="*{name}">
  19 + </div>
  20 + </div>
  21 + <div class="form-group">
16 22 <label class="col-sm-3 control-label">货主编码：</label>
17 23 <div class="col-sm-8">
18 24 <select id="companyCode" name="companyCode" class="form-control" th:with="companyList=${@companyService.selectCompanyByCurrentUserId()}"
... ... @@ -42,7 +48,9 @@
42 48 <div class="form-group">
43 49 <label class="col-sm-3 control-label">入库流程：</label>
44 50 <div class="col-sm-8">
45   - <input id="receiptFlow" name="receiptFlow" class="form-control" type="text" th:field="*{receiptFlow}">
  51 + <select id="receiptFlow" name="receiptFlow" class="form-control" th:with="statusFlowList=${@StatusFlow.flowList()}" th:field="*{receiptFlow}">
  52 + <option th:each="flow : ${statusFlowList}" th:text="${flow['name']}" th:value="${flow['code']}"></option>
  53 + </select>
46 54 </div>
47 55 </div>
48 56 <!--<div class="form-group">
... ... @@ -152,7 +160,7 @@
152 160 code:{
153 161 required:true,
154 162 },
155   - referType:{
  163 + name:{
156 164 required:true,
157 165 },
158 166 receiptFlow:{
... ... @@ -163,6 +171,8 @@
163 171 // $.operate.save(prefix + "/add", $('#form-locationType-add').serialize());
164 172 var tableValue = $.common.getTableValue("#form-receiptType-edit");
165 173 tableValue = formValueReplace(tableValue, "companyCode", $("#companyCode option:selected").val());
  174 + tableValue = formValueReplace(tableValue, "receiptFlow", $("#receiptFlow option:selected").val());
  175 + tableValue = formValueReplace(tableValue, "enable", $("input[name='enable']").is(':checked'));
166 176 $.operate.save(prefix + "/edit", tableValue);
167 177 }
168 178 });
... ...
src/main/resources/templates/config/receiptType/receiptType.html
  View file @7f2fa6c
... ... @@ -66,6 +66,10 @@
66 66 title : '类型编码'
67 67 },
68 68 {
  69 + field : 'name',
  70 + title : '名称'
  71 + },
  72 + {
69 73 field : 'companyCode',
70 74 title : '货主编码'
71 75 },
... ...
src/main/resources/templates/config/statusFlowDetail/add.html
  View file @7f2fa6c
... ... @@ -6,6 +6,7 @@
6 6 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
7 7 <form class="form-horizontal m" id="form-statusFlowDetails-add">
8 8 <input name="headerId" type="hidden" th:value="${headerId}">
  9 + <input name="headerCode" type="hidden" th:value="${headerCode}">
9 10 <div class="form-group">
10 11 <label class="col-sm-3 control-label">状态流：</label>
11 12 <div class="col-sm-8">
... ...
src/main/resources/templates/config/statusFlowDetail/edit.html
  View file @7f2fa6c
... ... @@ -16,7 +16,7 @@
16 16 <div class="form-group">
17 17 <label class="col-sm-3 control-label">模块：</label>
18 18 <div class="col-sm-8">
19   - <input id="moduleType" name="moduleType" class="form-control" type="text" th:field="*{modlueType}">
  19 + <input id="moduleType" name="moduleType" class="form-control" type="text" th:field="*{moduleType}">
20 20 </div>
21 21 </div>
22 22 <div class="form-group">
... ... @@ -26,7 +26,7 @@
26 26 </div>
27 27 </div>
28 28 <div class="form-group">
29   - <label class="col-sm-3 control-label">类型：</label>
  29 + <label class="col-sm-3 control-label">序号：</label>
30 30 <div class="col-sm-8">
31 31 <input id="sequence" name="sequence" class="form-control" type="text" th:field="*{sequence}">
32 32 </div>
... ... @@ -53,11 +53,11 @@
53 53 <!-- </div>-->
54 54 <!--</div>-->
55 55 <div class="form-group">
56   - <label class="col-sm-3 control-label">是否启用：</label>
  56 + <label class="col-sm-3 control-label">是否有效：</label>
57 57 <div class="col-sm-8">
  58 + <!--<input id="enable" name="enable" th:field="*{enable}" class="form-control" type="text">-->
58 59 <div class="onoffswitch">
59   - <input type="checkbox" th:checked="true" class="onoffswitch-checkbox"
60   - id="enable" name="enable" th:field="*{enable}">
  60 + <input type="checkbox" th:checked="*{enable}" class="onoffswitch-checkbox" id="enable" name="enable">
61 61 <label class="onoffswitch-label" for="enable">
62 62 <span class="onoffswitch-inner"></span>
63 63 <span class="onoffswitch-switch"></span>
... ... @@ -75,7 +75,7 @@
75 75 </div>
76 76 <div th:include="include::footer"></div>
77 77 <script type="text/javascript">
78   - var prefix = ctx + "config/statusFlowDetails";
  78 + var prefix = ctx + "config/statusFlowDetail";
79 79 $("#form-statusFlowDetails-edit").validate({
80 80 rules:{
81 81 flowCode:{
... ... @@ -96,7 +96,7 @@
96 96 var tableValue = $.common.getTableValue("#form-statusFlowDetails-edit");
97 97 tableValue = formValueReplace(tableValue, "nessary", $("#nessary option:selected").val());
98 98 tableValue = formValueReplace(tableValue, "enable", $("input[name='enable']").is(':checked'));
99   - $.operate.save(prefix + "/add", tableValue);
  99 + $.operate.save(prefix + "/edit", tableValue);
100 100 }
101 101 });
102 102 </script>
... ...
src/main/resources/templates/config/statusFlowDetail/statusFlowDetail.html
  View file @7f2fa6c
... ... @@ -23,6 +23,7 @@
23 23 var editFlag = [[${@permission.hasPermi('config:statusFlowDetails:edit')}]];
24 24 var removeFlag = [[${@permission.hasPermi('config:statusFlowDetails:remove')}]];
25 25 var datas = [[${@dict.getType('sys_normal_disable')}]];
  26 + var nessaryDatas = [[${@dict.getType('nessary')}]];
26 27 $(function() {
27 28 var options = {
28 29 url: prefix + "/list",
... ... @@ -81,7 +82,7 @@
81 82 title : '是否是必须流程',
82 83 align: 'center',
83 84 formatter: function(value, row, index) {
84   - return $.table.selectDictLabel(datas, value);
  85 + return $.table.selectDictLabel(nessaryDatas, value);
85 86 }
86 87 },
87 88 {
... ...
src/main/resources/templates/config/statusFlowHeader/add.html
  View file @7f2fa6c
... ... @@ -6,13 +6,13 @@
6 6 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
7 7 <form class="form-horizontal m" id="form-statusFlowHeader-add">
8 8 <div class="form-group">
9   - <label class="col-sm-3 control-label">状态流：</label>
  9 + <label class="col-sm-3 control-label">编码：</label>
10 10 <div class="col-sm-8">
11 11 <input id="code" name="code" class="form-control" type="text">
12 12 </div>
13 13 </div>
14 14 <div class="form-group">
15   - <label class="col-sm-3 control-label">状态流名称：</label>
  15 + <label class="col-sm-3 control-label">名称：</label>
16 16 <div class="col-sm-8">
17 17 <input id="name" name="name" class="form-control" type="text">
18 18 </div>
... ...
src/main/resources/templates/config/statusFlowHeader/edit.html
  View file @7f2fa6c
... ... @@ -7,13 +7,13 @@
7 7 <form class="form-horizontal m" id="form-statusFlowHeader-edit" th:object="${statusFlowHeader}">
8 8 <input name="id" th:field="*{id}" type="hidden">
9 9 <div class="form-group">
10   - <label class="col-sm-3 control-label">状态流：</label>
  10 + <label class="col-sm-3 control-label">编码：</label>
11 11 <div class="col-sm-8">
12 12 <input id="code" name="code" class="form-control" type="text" th:field="*{code}">
13 13 </div>
14 14 </div>
15 15 <div class="form-group">
16   - <label class="col-sm-3 control-label">状态流名称：</label>
  16 + <label class="col-sm-3 control-label">名称：</label>
17 17 <div class="col-sm-8">
18 18 <input id="name" name="name" class="form-control" type="text" th:field="*{name}">
19 19 </div>
... ... @@ -43,11 +43,11 @@
43 43 <!-- </div>-->
44 44 <!--</div>-->
45 45 <div class="form-group">
46   - <label class="col-sm-3 control-label">是否启用：</label>
  46 + <label class="col-sm-3 control-label">是否有效：</label>
47 47 <div class="col-sm-8">
  48 + <!--<input id="enable" name="enable" th:field="*{enable}" class="form-control" type="text">-->
48 49 <div class="onoffswitch">
49   - <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="enable" name="enable"
50   - th:field="*{enable}">
  50 + <input type="checkbox" th:checked="*{enable}" class="onoffswitch-checkbox" id="enable" name="enable">
51 51 <label class="onoffswitch-label" for="enable">
52 52 <span class="onoffswitch-inner"></span>
53 53 <span class="onoffswitch-switch"></span>
... ... @@ -65,7 +65,7 @@
65 65 </div>
66 66 <div th:include="include::footer"></div>
67 67 <script type="text/javascript">
68   - var prefix = ctx + "config/receiptType";
  68 + var prefix = ctx + "config/statusFlowHeader";
69 69 $("#form-statusFlowHeader-edit").validate({
70 70 rules:{
71 71 code:{
... ...
src/main/resources/templates/config/statusFlowHeader/statusFlowHeader.html
  View file @7f2fa6c
... ... @@ -75,6 +75,8 @@
75 75 var prefix1 = ctx + "config/statusFlowDetail";
76 76 var editFlag = [[${@permission.hasPermi('config:statusFlowHeader:edit')}]];
77 77 var removeFlag = [[${@permission.hasPermi('config:statusFlowHeader:remove')}]];
  78 + var datas = [[${@dict.getType('sys_normal_disable')}]];
  79 +
78 80 $(function() {
79 81 var options = {
80 82 url: prefix + "/list",
... ... @@ -94,11 +96,11 @@
94 96 },
95 97 {
96 98 field : 'code',
97   - title : '状态流'
  99 + title : '编码'
98 100 },
99 101 {
100 102 field : 'name',
101   - title : '状态流名称'
  103 + title : '名称'
102 104 },
103 105 {
104 106 field : 'warehouseCode',
... ... @@ -113,6 +115,14 @@
113 115 title : '类型'
114 116 },
115 117 {
  118 + field : 'enable',
  119 + title : '是否有效' ,
  120 + align: 'center',
  121 + formatter: function(value, row, index) {
  122 + return $.table.selectDictLabel(datas, value);
  123 + }
  124 + },
  125 + {
116 126 field : 'version',
117 127 title : '数据版本',
118 128 visible : false
... ...