Commit 35c1e10f9e496ba1a2e79ed5874073f16c3e9b37
1 parent
53a42b20
添加物料单位,重新生成库存主表和库存明细表
Showing
32 changed files
with
892 additions
and
1629 deletions
.idea/MyBatisCodeHelperDatasource.xml
... | ... | @@ -6,9 +6,9 @@ |
6 | 6 | <option name="addSerializeUid" value="true" /> |
7 | 7 | <option name="generateService" value="true" /> |
8 | 8 | <option name="generateServiceInterface" value="true" /> |
9 | - <option name="javaMapperPackage" value="com.huaheng.pc.config.warehouseConfig.mapper" /> | |
9 | + <option name="javaMapperPackage" value="com.huaheng.pc.inventory.inventoryDetail.mapper" /> | |
10 | 10 | <option name="javaMapperPath" value="$PROJECT_DIR$/src/main/java" /> |
11 | - <option name="javaModelPackage" value="com.huaheng.pc.config.warehouseConfig.domain" /> | |
11 | + <option name="javaModelPackage" value="com.huaheng.pc.inventory.inventoryDetail.domain" /> | |
12 | 12 | <option name="javaModelPath" value="$PROJECT_DIR$/src/main/java" /> |
13 | 13 | <option name="lastDatabaseCrudChooseModuleName" value="huaheng" /> |
14 | 14 | <option name="moduleNameToPackageAndPathMap"> |
... | ... | @@ -30,15 +30,15 @@ |
30 | 30 | <entry key="huaheng"> |
31 | 31 | <value> |
32 | 32 | <UserPackageAndPathInfoByModule> |
33 | - <option name="javaMapperPackage" value="com.huaheng.pc.config.warehouseConfig.mapper" /> | |
33 | + <option name="javaMapperPackage" value="com.huaheng.pc.inventory.inventoryDetail.mapper" /> | |
34 | 34 | <option name="javaMapperPath" value="$PROJECT_DIR$/src/main/java" /> |
35 | - <option name="javaModelPacakge" value="com.huaheng.pc.config.warehouseConfig.domain" /> | |
35 | + <option name="javaModelPacakge" value="com.huaheng.pc.inventory.inventoryDetail.domain" /> | |
36 | 36 | <option name="javaModelPath" value="$PROJECT_DIR$/src/main/java" /> |
37 | - <option name="javaServiceInterfacePackage" value="com.huaheng.pc.config.warehouseConfig.service" /> | |
37 | + <option name="javaServiceInterfacePackage" value="com.huaheng.pc.inventory.inventoryDetail.service" /> | |
38 | 38 | <option name="javaServiceInterfacePath" value="$PROJECT_DIR$/src/main/java" /> |
39 | - <option name="javaServicePackage" value="com.huaheng.pc.config.warehouseConfig.service" /> | |
39 | + <option name="javaServicePackage" value="com.huaheng.pc.inventory.inventoryDetail.service" /> | |
40 | 40 | <option name="javaServicePath" value="$PROJECT_DIR$/src/main/java" /> |
41 | - <option name="xmlPackage" value="config" /> | |
41 | + <option name="xmlPackage" value="inventory" /> | |
42 | 42 | <option name="xmlPath" value="E:\code\wms2\src\main\resources\mybatis" /> |
43 | 43 | </UserPackageAndPathInfoByModule> |
44 | 44 | </value> |
... | ... | @@ -138,6 +138,26 @@ |
138 | 138 | </TableGenerateConfig> |
139 | 139 | </value> |
140 | 140 | </entry> |
141 | + <entry key="wms_v2:inventory_detail"> | |
142 | + <value> | |
143 | + <TableGenerateConfig> | |
144 | + <option name="generatedKey" value="id" /> | |
145 | + <option name="javaModelName" value="InventoryDetail" /> | |
146 | + <option name="moduleName" value="huaheng" /> | |
147 | + <option name="useActualColumnName" value="true" /> | |
148 | + </TableGenerateConfig> | |
149 | + </value> | |
150 | + </entry> | |
151 | + <entry key="wms_v2:inventory_header"> | |
152 | + <value> | |
153 | + <TableGenerateConfig> | |
154 | + <option name="generatedKey" value="id" /> | |
155 | + <option name="javaModelName" value="InventoryHeader" /> | |
156 | + <option name="moduleName" value="huaheng" /> | |
157 | + <option name="useActualColumnName" value="true" /> | |
158 | + </TableGenerateConfig> | |
159 | + </value> | |
160 | + </entry> | |
141 | 161 | <entry key="wms_v2:inventory_transaction"> |
142 | 162 | <value> |
143 | 163 | <TableGenerateConfig> |
... | ... | @@ -178,12 +198,22 @@ |
178 | 198 | </TableGenerateConfig> |
179 | 199 | </value> |
180 | 200 | </entry> |
201 | + <entry key="wms_v2:material_multiple"> | |
202 | + <value> | |
203 | + <TableGenerateConfig> | |
204 | + <option name="generatedKey" value="id" /> | |
205 | + <option name="javaModelName" value="MaterialMultiple" /> | |
206 | + <option name="moduleName" value="huaheng" /> | |
207 | + <option name="useActualColumnName" value="true" /> | |
208 | + </TableGenerateConfig> | |
209 | + </value> | |
210 | + </entry> | |
181 | 211 | <entry key="wms_v2:material_unit"> |
182 | 212 | <value> |
183 | 213 | <TableGenerateConfig> |
184 | 214 | <option name="generatedKey" value="id" /> |
185 | 215 | <option name="javaModelName" value="MaterialUnit" /> |
186 | - <option name="moduleName" value="WMSV1" /> | |
216 | + <option name="moduleName" value="huaheng" /> | |
187 | 217 | <option name="useActualColumnName" value="true" /> |
188 | 218 | </TableGenerateConfig> |
189 | 219 | </value> |
... | ... | @@ -374,7 +404,7 @@ |
374 | 404 | <option name="useLomBokOnModel" value="true" /> |
375 | 405 | <option name="useSwagger" value="true" /> |
376 | 406 | <option name="userMybatisPlus" value="true" /> |
377 | - <option name="xmlMapperPackage" value="config" /> | |
407 | + <option name="xmlMapperPackage" value="inventory" /> | |
378 | 408 | <option name="xmlMapperPath" value="E:\code\wms2\src\main\resources\mybatis" /> |
379 | 409 | </ProjectProfile> |
380 | 410 | </option> |
... | ... |
.idea/workspace.xml
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/resources/templates/inventory/invetoryDetail/invetoryDetail.html" afterDir="false" /> | |
4 | + <list default="true" id="9ff7b25e-dc1a-4859-8a0c-00039489e359" name="Default Changelist" comment=""> | |
5 | + <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/materialMultiple/controller/MaterialMultipleController.java" afterDir="false" /> | |
6 | + <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/materialMultiple/domain/MaterialMultiple.java" afterDir="false" /> | |
7 | + <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/materialMultiple/mapper/MaterialMultipleMapper.java" afterDir="false" /> | |
8 | + <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/materialMultiple/service/MaterialMultipleService.java" afterDir="false" /> | |
9 | + <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/materialMultiple/service/MaterialMultipleServiceImpl.java" afterDir="false" /> | |
10 | + <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/materialUnit/controller/MaterialUnitController.java" afterDir="false" /> | |
11 | + <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/materialUnit/domain/MaterialUnit.java" afterDir="false" /> | |
12 | + <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/materialUnit/service/MaterialUnitService.java" afterDir="false" /> | |
13 | + <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/materialUnit/service/MaterialUnitServiceImpl.java" afterDir="false" /> | |
14 | + <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/MaterialMultipleMapper.xml" afterDir="false" /> | |
15 | + <change beforePath="$PROJECT_DIR$/.idea/MyBatisCodeHelperDatasource.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/MyBatisCodeHelperDatasource.xml" afterDir="false" /> | |
6 | 16 | <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> |
7 | - <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" /> | |
8 | - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java" afterDir="false" /> | |
17 | + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/controller/MaterialController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/controller/MaterialController.java" afterDir="false" /> | |
18 | + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/materialUnit/domain/MaterialUnit.java" beforeDir="false" /> | |
19 | + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/materialUnit/mapper/MaterialUnitMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/materialUnit/mapper/MaterialUnitMapper.java" afterDir="false" /> | |
20 | + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/materialUnit/service/MaterialUnitService.java" beforeDir="false" /> | |
21 | + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/materialUnit/service/MaterialUnitServiceImpl.java" beforeDir="false" /> | |
22 | + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/controller/WareHouseController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/controller/WareHouseController.java" afterDir="false" /> | |
23 | + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/domain/InventoryDetail.java" beforeDir="false" /> | |
24 | + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/mapper/InventoryDetailMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/mapper/InventoryDetailMapper.java" afterDir="false" /> | |
25 | + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailService.java" afterDir="false" /> | |
26 | + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java" afterDir="false" /> | |
9 | 27 | <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java" afterDir="false" /> |
10 | - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/domain/InventoryHeader.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/domain/InventoryHeader.java" afterDir="false" /> | |
11 | - <change beforePath="$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryHeaderMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryHeaderMapper.xml" afterDir="false" /> | |
12 | - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html" afterDir="false" /> | |
28 | + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/domain/InventoryHeader.java" beforeDir="false" /> | |
29 | + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/mapper/InventoryHeaderMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/mapper/InventoryHeaderMapper.java" afterDir="false" /> | |
30 | + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java" afterDir="false" /> | |
31 | + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java" afterDir="false" /> | |
32 | + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java" afterDir="false" /> | |
33 | + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/controller/ShippingCombinationController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/controller/ShippingCombinationController.java" afterDir="false" /> | |
34 | + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/mapper/ShippingCombinationMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/mapper/ShippingCombinationMapper.java" afterDir="false" /> | |
35 | + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/service/ShippingCombinationService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/service/ShippingCombinationService.java" afterDir="false" /> | |
36 | + <change beforePath="$PROJECT_DIR$/src/main/resources/mybatis/config/MaterialUnitMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/MaterialUnitMapper.xml" afterDir="false" /> | |
37 | + <change beforePath="$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryDetailMapper.xml" beforeDir="false" /> | |
38 | + <change beforePath="$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryHeaderMapper.xml" beforeDir="false" /> | |
13 | 39 | </list> |
14 | - <ignored path="$PROJECT_DIR$/target/" /> | |
15 | 40 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> |
16 | 41 | <option name="SHOW_DIALOG" value="false" /> |
17 | 42 | <option name="HIGHLIGHT_CONFLICTS" value="true" /> |
... | ... | @@ -48,108 +73,16 @@ |
48 | 73 | </expand> |
49 | 74 | <select /> |
50 | 75 | </component> |
51 | - <component name="FavoritesManager"> | |
52 | - <favorites_list name="wms2" /> | |
53 | - </component> | |
54 | - <component name="FileEditorManager"> | |
55 | - <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> | |
56 | - <file pinned="false" current-in-tab="true"> | |
57 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java"> | |
58 | - <provider selected="true" editor-type-id="text-editor"> | |
59 | - <state relative-caret-position="79"> | |
60 | - <caret line="72" column="28" selection-start-line="72" selection-start-column="28" selection-end-line="72" selection-end-column="28" /> | |
61 | - </state> | |
62 | - </provider> | |
63 | - </entry> | |
64 | - </file> | |
65 | - <file pinned="false" current-in-tab="false"> | |
66 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/mapper/InventoryHeaderMapper.java"> | |
67 | - <provider selected="true" editor-type-id="text-editor"> | |
68 | - <state relative-caret-position="80"> | |
69 | - <caret line="5" column="49" selection-start-line="5" selection-start-column="49" selection-end-line="5" selection-end-column="49" /> | |
70 | - </state> | |
71 | - </provider> | |
72 | - </entry> | |
73 | - </file> | |
74 | - <file pinned="false" current-in-tab="false"> | |
75 | - <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryHeaderMapper.xml"> | |
76 | - <provider selected="true" editor-type-id="text-editor"> | |
77 | - <state relative-caret-position="315"> | |
78 | - <caret line="32" column="30" selection-start-line="32" selection-start-column="30" selection-end-line="32" selection-end-column="30" /> | |
79 | - </state> | |
80 | - </provider> | |
81 | - </entry> | |
82 | - </file> | |
83 | - <file pinned="false" current-in-tab="false"> | |
84 | - <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.1.2/mybatis-plus-core-3.1.2.jar!/com/baomidou/mybatisplus/core/mapper/BaseMapper.class"> | |
85 | - <provider selected="true" editor-type-id="text-editor"> | |
86 | - <state relative-caret-position="116"> | |
87 | - <caret line="15" column="17" selection-start-line="15" selection-start-column="17" selection-end-line="15" selection-end-column="17" /> | |
88 | - </state> | |
89 | - </provider> | |
90 | - </entry> | |
91 | - </file> | |
92 | - <file pinned="false" current-in-tab="false"> | |
93 | - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html"> | |
94 | - <provider selected="true" editor-type-id="text-editor"> | |
95 | - <state relative-caret-position="499"> | |
96 | - <caret line="125" column="44" selection-start-line="125" selection-start-column="33" selection-end-line="125" selection-end-column="44" /> | |
97 | - <folding> | |
98 | - <element signature="n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | |
99 | - </folding> | |
100 | - </state> | |
101 | - </provider> | |
102 | - </entry> | |
103 | - </file> | |
104 | - <file pinned="false" current-in-tab="false"> | |
105 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/domain/InventoryHeader.java"> | |
106 | - <provider selected="true" editor-type-id="text-editor"> | |
107 | - <state relative-caret-position="-668"> | |
108 | - <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" /> | |
109 | - </state> | |
110 | - </provider> | |
111 | - </entry> | |
112 | - </file> | |
113 | - <file pinned="false" current-in-tab="false"> | |
114 | - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/invetoryDetail/invetoryDetail.html"> | |
115 | - <provider selected="true" editor-type-id="text-editor"> | |
116 | - <state relative-caret-position="94"> | |
117 | - <caret line="70" lean-forward="true" selection-start-line="70" selection-end-line="70" /> | |
118 | - <folding> | |
119 | - <element signature="n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | |
120 | - <element signature="e#2365#2371#0" expanded="true" /> | |
121 | - <element signature="e#3190#7361#0" /> | |
122 | - </folding> | |
123 | - </state> | |
124 | - </provider> | |
125 | - </entry> | |
126 | - </file> | |
127 | - <file pinned="false" current-in-tab="false"> | |
128 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java"> | |
129 | - <provider selected="true" editor-type-id="text-editor"> | |
130 | - <state> | |
131 | - <caret column="28" selection-start-column="28" selection-end-column="28" /> | |
132 | - </state> | |
133 | - </provider> | |
134 | - </entry> | |
135 | - </file> | |
136 | - </leaf> | |
137 | - </component> | |
138 | 76 | <component name="FileTemplateManagerImpl"> |
139 | 77 | <option name="RECENT_TEMPLATES"> |
140 | 78 | <list> |
141 | 79 | <option value="FxmlFile" /> |
142 | 80 | <option value="Interface" /> |
143 | - <option value="Class" /> | |
144 | 81 | <option value="HTML File" /> |
82 | + <option value="Class" /> | |
145 | 83 | </list> |
146 | 84 | </option> |
147 | 85 | </component> |
148 | - <component name="FindInProjectRecents"> | |
149 | - <findStrings> | |
150 | - <find>detail</find> | |
151 | - </findStrings> | |
152 | - </component> | |
153 | 86 | <component name="Git.Settings"> |
154 | 87 | <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> |
155 | 88 | <option name="RECENT_BRANCH_BY_REPOSITORY"> |
... | ... | @@ -158,21 +91,6 @@ |
158 | 91 | </map> |
159 | 92 | </option> |
160 | 93 | </component> |
161 | - <component name="IdeDocumentHistory"> | |
162 | - <option name="CHANGED_PATHS"> | |
163 | - <list> | |
164 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/domain/InventoryDetail.java" /> | |
165 | - <option value="$PROJECT_DIR$/README.md" /> | |
166 | - <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/cyclecountAdjust.html" /> | |
167 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java" /> | |
168 | - <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/invetoryDetail/invetoryDetail.html" /> | |
169 | - <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html" /> | |
170 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/domain/InventoryHeader.java" /> | |
171 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java" /> | |
172 | - <option value="$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryHeaderMapper.xml" /> | |
173 | - </list> | |
174 | - </option> | |
175 | - </component> | |
176 | 94 | <component name="IgnoredFileRootStore"> |
177 | 95 | <option name="generatedRoots"> |
178 | 96 | <set> |
... | ... | @@ -180,332 +98,10 @@ |
180 | 98 | </set> |
181 | 99 | </option> |
182 | 100 | </component> |
183 | - <component name="MavenImportPreferences"> | |
184 | - <option name="importingSettings"> | |
185 | - <MavenImportingSettings> | |
186 | - <option name="importAutomatically" value="true" /> | |
187 | - </MavenImportingSettings> | |
188 | - </option> | |
189 | - </component> | |
190 | - <component name="ProjectFrameBounds" extendedState="6"> | |
191 | - <option name="x" value="-10" /> | |
192 | - <option name="y" value="-10" /> | |
193 | - <option name="width" value="1939" /> | |
194 | - <option name="height" value="1049" /> | |
195 | - </component> | |
196 | 101 | <component name="ProjectId" id="1P5Ngjh73HToCarlEZkqMxrL7pm" /> |
197 | 102 | <component name="ProjectLevelVcsManager"> |
198 | 103 | <ConfirmationsSetting value="2" id="Add" /> |
199 | 104 | </component> |
200 | - <component name="ProjectView"> | |
201 | - <navigator proportions="" version="1"> | |
202 | - <foldersAlwaysOnTop value="true" /> | |
203 | - </navigator> | |
204 | - <panes> | |
205 | - <pane id="Scope" /> | |
206 | - <pane id="PackagesPane" /> | |
207 | - <pane id="ProjectPane"> | |
208 | - <subPane> | |
209 | - <expand> | |
210 | - <path> | |
211 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
212 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
213 | - </path> | |
214 | - <path> | |
215 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
216 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
217 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | |
218 | - </path> | |
219 | - <path> | |
220 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
221 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
222 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | |
223 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | |
224 | - </path> | |
225 | - <path> | |
226 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
227 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
228 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | |
229 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | |
230 | - <item name="java" type="462c0819:PsiDirectoryNode" /> | |
231 | - </path> | |
232 | - <path> | |
233 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
234 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
235 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | |
236 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | |
237 | - <item name="java" type="462c0819:PsiDirectoryNode" /> | |
238 | - <item name="com" type="462c0819:PsiDirectoryNode" /> | |
239 | - </path> | |
240 | - <path> | |
241 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
242 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
243 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | |
244 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | |
245 | - <item name="java" type="462c0819:PsiDirectoryNode" /> | |
246 | - <item name="com" type="462c0819:PsiDirectoryNode" /> | |
247 | - <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
248 | - </path> | |
249 | - <path> | |
250 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
251 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
252 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | |
253 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | |
254 | - <item name="java" type="462c0819:PsiDirectoryNode" /> | |
255 | - <item name="com" type="462c0819:PsiDirectoryNode" /> | |
256 | - <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
257 | - <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
258 | - </path> | |
259 | - <path> | |
260 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
261 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
262 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | |
263 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | |
264 | - <item name="java" type="462c0819:PsiDirectoryNode" /> | |
265 | - <item name="com" type="462c0819:PsiDirectoryNode" /> | |
266 | - <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
267 | - <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
268 | - <item name="inventory" type="462c0819:PsiDirectoryNode" /> | |
269 | - </path> | |
270 | - <path> | |
271 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
272 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
273 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | |
274 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | |
275 | - <item name="java" type="462c0819:PsiDirectoryNode" /> | |
276 | - <item name="com" type="462c0819:PsiDirectoryNode" /> | |
277 | - <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
278 | - <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
279 | - <item name="inventory" type="462c0819:PsiDirectoryNode" /> | |
280 | - <item name="inventoryDetail" type="462c0819:PsiDirectoryNode" /> | |
281 | - </path> | |
282 | - <path> | |
283 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
284 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
285 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | |
286 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | |
287 | - <item name="java" type="462c0819:PsiDirectoryNode" /> | |
288 | - <item name="com" type="462c0819:PsiDirectoryNode" /> | |
289 | - <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
290 | - <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
291 | - <item name="inventory" type="462c0819:PsiDirectoryNode" /> | |
292 | - <item name="inventoryDetail" type="462c0819:PsiDirectoryNode" /> | |
293 | - <item name="controller" type="462c0819:PsiDirectoryNode" /> | |
294 | - </path> | |
295 | - <path> | |
296 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
297 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
298 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | |
299 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | |
300 | - <item name="java" type="462c0819:PsiDirectoryNode" /> | |
301 | - <item name="com" type="462c0819:PsiDirectoryNode" /> | |
302 | - <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
303 | - <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
304 | - <item name="inventory" type="462c0819:PsiDirectoryNode" /> | |
305 | - <item name="inventoryHeader" type="462c0819:PsiDirectoryNode" /> | |
306 | - </path> | |
307 | - <path> | |
308 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
309 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
310 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | |
311 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | |
312 | - <item name="java" type="462c0819:PsiDirectoryNode" /> | |
313 | - <item name="com" type="462c0819:PsiDirectoryNode" /> | |
314 | - <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
315 | - <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
316 | - <item name="inventory" type="462c0819:PsiDirectoryNode" /> | |
317 | - <item name="inventoryHeader" type="462c0819:PsiDirectoryNode" /> | |
318 | - <item name="controller" type="462c0819:PsiDirectoryNode" /> | |
319 | - </path> | |
320 | - <path> | |
321 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
322 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
323 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | |
324 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | |
325 | - <item name="java" type="462c0819:PsiDirectoryNode" /> | |
326 | - <item name="com" type="462c0819:PsiDirectoryNode" /> | |
327 | - <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
328 | - <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
329 | - <item name="inventory" type="462c0819:PsiDirectoryNode" /> | |
330 | - <item name="inventoryHeader" type="462c0819:PsiDirectoryNode" /> | |
331 | - <item name="domain" type="462c0819:PsiDirectoryNode" /> | |
332 | - </path> | |
333 | - <path> | |
334 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
335 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
336 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | |
337 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | |
338 | - <item name="java" type="462c0819:PsiDirectoryNode" /> | |
339 | - <item name="com" type="462c0819:PsiDirectoryNode" /> | |
340 | - <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
341 | - <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
342 | - <item name="inventory" type="462c0819:PsiDirectoryNode" /> | |
343 | - <item name="inventoryHeader" type="462c0819:PsiDirectoryNode" /> | |
344 | - <item name="mapper" type="462c0819:PsiDirectoryNode" /> | |
345 | - </path> | |
346 | - <path> | |
347 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
348 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
349 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | |
350 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | |
351 | - <item name="java" type="462c0819:PsiDirectoryNode" /> | |
352 | - <item name="com" type="462c0819:PsiDirectoryNode" /> | |
353 | - <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
354 | - <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
355 | - <item name="shipment" 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="shipment" type="462c0819:PsiDirectoryNode" /> | |
367 | - <item name="shipmentHeader" type="462c0819:PsiDirectoryNode" /> | |
368 | - </path> | |
369 | - <path> | |
370 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
371 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
372 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | |
373 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | |
374 | - <item name="java" type="462c0819:PsiDirectoryNode" /> | |
375 | - <item name="com" type="462c0819:PsiDirectoryNode" /> | |
376 | - <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
377 | - <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
378 | - <item name="shipment" type="462c0819:PsiDirectoryNode" /> | |
379 | - <item name="shipmentHeader" type="462c0819:PsiDirectoryNode" /> | |
380 | - <item name="domain" type="462c0819:PsiDirectoryNode" /> | |
381 | - </path> | |
382 | - <path> | |
383 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
384 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
385 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | |
386 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | |
387 | - <item name="java" type="462c0819:PsiDirectoryNode" /> | |
388 | - <item name="com" type="462c0819:PsiDirectoryNode" /> | |
389 | - <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
390 | - <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
391 | - <item name="shipment" type="462c0819:PsiDirectoryNode" /> | |
392 | - <item name="shippingCombination" type="462c0819:PsiDirectoryNode" /> | |
393 | - </path> | |
394 | - <path> | |
395 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
396 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
397 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | |
398 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | |
399 | - <item name="java" type="462c0819:PsiDirectoryNode" /> | |
400 | - <item name="com" type="462c0819:PsiDirectoryNode" /> | |
401 | - <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
402 | - <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
403 | - <item name="shipment" type="462c0819:PsiDirectoryNode" /> | |
404 | - <item name="shippingCombination" type="462c0819:PsiDirectoryNode" /> | |
405 | - <item name="controller" type="462c0819:PsiDirectoryNode" /> | |
406 | - </path> | |
407 | - <path> | |
408 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
409 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
410 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | |
411 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | |
412 | - <item name="java" type="462c0819:PsiDirectoryNode" /> | |
413 | - <item name="com" type="462c0819:PsiDirectoryNode" /> | |
414 | - <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
415 | - <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
416 | - <item name="shipment" type="462c0819:PsiDirectoryNode" /> | |
417 | - <item name="shippingCombination" type="462c0819:PsiDirectoryNode" /> | |
418 | - <item name="service" type="462c0819:PsiDirectoryNode" /> | |
419 | - </path> | |
420 | - <path> | |
421 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
422 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
423 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | |
424 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | |
425 | - <item name="resources" type="462c0819:PsiDirectoryNode" /> | |
426 | - </path> | |
427 | - <path> | |
428 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
429 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
430 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | |
431 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | |
432 | - <item name="resources" type="462c0819:PsiDirectoryNode" /> | |
433 | - <item name="templates" type="462c0819:PsiDirectoryNode" /> | |
434 | - </path> | |
435 | - <path> | |
436 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
437 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
438 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | |
439 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | |
440 | - <item name="resources" type="462c0819:PsiDirectoryNode" /> | |
441 | - <item name="templates" type="462c0819:PsiDirectoryNode" /> | |
442 | - <item name="inventory" type="462c0819:PsiDirectoryNode" /> | |
443 | - </path> | |
444 | - <path> | |
445 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
446 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
447 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | |
448 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | |
449 | - <item name="resources" type="462c0819:PsiDirectoryNode" /> | |
450 | - <item name="templates" type="462c0819:PsiDirectoryNode" /> | |
451 | - <item name="inventory" type="462c0819:PsiDirectoryNode" /> | |
452 | - <item name="cyclecountAdjust" type="462c0819:PsiDirectoryNode" /> | |
453 | - </path> | |
454 | - <path> | |
455 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
456 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
457 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | |
458 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | |
459 | - <item name="resources" type="462c0819:PsiDirectoryNode" /> | |
460 | - <item name="templates" type="462c0819:PsiDirectoryNode" /> | |
461 | - <item name="inventory" type="462c0819:PsiDirectoryNode" /> | |
462 | - <item name="inventoryHeader" type="462c0819:PsiDirectoryNode" /> | |
463 | - </path> | |
464 | - <path> | |
465 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
466 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
467 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | |
468 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | |
469 | - <item name="resources" type="462c0819:PsiDirectoryNode" /> | |
470 | - <item name="templates" type="462c0819:PsiDirectoryNode" /> | |
471 | - <item name="inventory" type="462c0819:PsiDirectoryNode" /> | |
472 | - <item name="invetoryDetail" type="462c0819:PsiDirectoryNode" /> | |
473 | - </path> | |
474 | - <path> | |
475 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
476 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
477 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | |
478 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | |
479 | - <item name="resources" type="462c0819:PsiDirectoryNode" /> | |
480 | - <item name="templates" type="462c0819:PsiDirectoryNode" /> | |
481 | - <item name="receipt" type="462c0819:PsiDirectoryNode" /> | |
482 | - </path> | |
483 | - <path> | |
484 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
485 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
486 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | |
487 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | |
488 | - <item name="resources" type="462c0819:PsiDirectoryNode" /> | |
489 | - <item name="templates" type="462c0819:PsiDirectoryNode" /> | |
490 | - <item name="receipt" type="462c0819:PsiDirectoryNode" /> | |
491 | - <item name="receiptContainerDetail" type="462c0819:PsiDirectoryNode" /> | |
492 | - </path> | |
493 | - <path> | |
494 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
495 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
496 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | |
497 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | |
498 | - <item name="resources" type="462c0819:PsiDirectoryNode" /> | |
499 | - <item name="templates" type="462c0819:PsiDirectoryNode" /> | |
500 | - <item name="receipt" type="462c0819:PsiDirectoryNode" /> | |
501 | - <item name="receiptHeader" type="462c0819:PsiDirectoryNode" /> | |
502 | - </path> | |
503 | - </expand> | |
504 | - <select /> | |
505 | - </subPane> | |
506 | - </pane> | |
507 | - </panes> | |
508 | - </component> | |
509 | 105 | <component name="PropertiesComponent"> |
510 | 106 | <property name="ASKED_ADD_EXTERNAL_FILES" value="true" /> |
511 | 107 | <property name="DatabaseDriversLRU" value="mysql" /> |
... | ... | @@ -518,7 +114,7 @@ |
518 | 114 | <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" /> |
519 | 115 | <property name="WebServerToolWindowFactoryState" value="false" /> |
520 | 116 | <property name="aspect.path.notification.shown" value="true" /> |
521 | - <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/resources/templates/inventory/invetoryDetail" /> | |
117 | + <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/resources/mybatis/config" /> | |
522 | 118 | <property name="node.js.detected.package.eslint" value="true" /> |
523 | 119 | <property name="node.js.detected.package.tslint" value="true" /> |
524 | 120 | <property name="node.js.path.for.package.eslint" value="project" /> |
... | ... | @@ -529,15 +125,15 @@ |
529 | 125 | <property name="project.structure.last.edited" value="Project" /> |
530 | 126 | <property name="project.structure.proportion" value="0.0" /> |
531 | 127 | <property name="project.structure.side.proportion" value="0.0" /> |
532 | - <property name="settings.editor.selected.configurable" value="File.Encoding" /> | |
128 | + <property name="settings.editor.selected.configurable" value="preferences.pluginManager" /> | |
533 | 129 | </component> |
534 | 130 | <component name="RecentsManager"> |
535 | 131 | <key name="CopyFile.RECENT_KEYS"> |
536 | - <recent name="C:\Project\wms2\src\main\resources\templates\inventory\invetoryDetail" /> | |
537 | - <recent name="C:\Project\wms2\src\main\resources\templates\inventory\inventoryHeader" /> | |
538 | 132 | <recent name="E:\code\wms2\src\main\resources\mybatis\config" /> |
539 | 133 | <recent name="E:\code\wms2\src\main\java\com\huaheng\pc\config" /> |
540 | 134 | <recent name="E:\code\wms2\src\main\resources\static\ajax\libs\layui\lay\modules" /> |
135 | + <recent name="E:\code\wms2\target\classes\static\file" /> | |
136 | + <recent name="E:\code\wms2\src\main\resources\static\file" /> | |
541 | 137 | </key> |
542 | 138 | <key name="MoveFile.RECENT_KEYS"> |
543 | 139 | <recent name="E:\code\wms2\src\main\resources\templates\general\carrier" /> |
... | ... | @@ -561,11 +157,10 @@ |
561 | 157 | </RuleState> |
562 | 158 | </list> |
563 | 159 | </option> |
564 | - <option name="contentProportion" value="0.08743169" /> | |
565 | 160 | </component> |
566 | 161 | <component name="RunManager"> |
567 | 162 | <configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot"> |
568 | - <module name="wms2" /> | |
163 | + <module name="huaheng" /> | |
569 | 164 | <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" /> |
570 | 165 | <option name="ALTERNATIVE_JRE_PATH" /> |
571 | 166 | <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" /> |
... | ... | @@ -591,11 +186,7 @@ |
591 | 186 | <expand> |
592 | 187 | <path> |
593 | 188 | <item name="services root" type="e789fda9:ObjectUtils$Sentinel" /> |
594 | - <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@5ef312b7" type="7427dc5b:ServiceModel$ServiceGroupNode" /> | |
595 | - </path> | |
596 | - <path> | |
597 | - <item name="services root" type="e789fda9:ObjectUtils$Sentinel" /> | |
598 | - <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@28150ae" type="7427dc5b:ServiceModel$ServiceGroupNode" /> | |
189 | + <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@dbb4d4b" type="7427dc5b:ServiceModel$ServiceGroupNode" /> | |
599 | 190 | </path> |
600 | 191 | </expand> |
601 | 192 | <select /> |
... | ... | @@ -636,6 +227,9 @@ |
636 | 227 | <workItem from="1565832950552" duration="86000" /> |
637 | 228 | <workItem from="1565833039573" duration="288000" /> |
638 | 229 | <workItem from="1565833342181" duration="13946000" /> |
230 | + <workItem from="1565936336169" duration="3845000" /> | |
231 | + <workItem from="1565941296716" duration="6217000" /> | |
232 | + <workItem from="1566175534262" duration="11146000" /> | |
639 | 233 | </task> |
640 | 234 | <task id="LOCAL-00001" summary="添加库位、库位类型增删改查接口"> |
641 | 235 | <created>1565226427512</created> |
... | ... | @@ -728,54 +322,16 @@ |
728 | 322 | <option name="project" value="LOCAL" /> |
729 | 323 | <updated>1565833218584</updated> |
730 | 324 | </task> |
731 | - <option name="localTasksCounter" value="14" /> | |
325 | + <task id="LOCAL-00014" summary="添加仓库配置"> | |
326 | + <created>1566176469173</created> | |
327 | + <option name="number" value="00014" /> | |
328 | + <option name="presentableId" value="LOCAL-00014" /> | |
329 | + <option name="project" value="LOCAL" /> | |
330 | + <updated>1566176469173</updated> | |
331 | + </task> | |
332 | + <option name="localTasksCounter" value="15" /> | |
732 | 333 | <servers /> |
733 | 334 | </component> |
734 | - <component name="TodoView" selected-index="1"> | |
735 | - <todo-panel id="selected-file"> | |
736 | - <is-autoscroll-to-source value="true" /> | |
737 | - </todo-panel> | |
738 | - <todo-panel id="all"> | |
739 | - <are-packages-shown value="true" /> | |
740 | - <is-autoscroll-to-source value="true" /> | |
741 | - </todo-panel> | |
742 | - </component> | |
743 | - <component name="ToolWindowManager"> | |
744 | - <frame x="-7" y="-7" width="1550" height="838" extended-state="6" /> | |
745 | - <editor active="true" /> | |
746 | - <layout> | |
747 | - <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49832776" visible="true" weight="0.23793566" /> | |
748 | - <window_info id="Structure" order="1" sideWeight="0.50167227" side_tool="true" weight="0.23793566" /> | |
749 | - <window_info id="Web" order="2" sideWeight="0.50167227" side_tool="true" weight="0.23793566" /> | |
750 | - <window_info id="Designer" order="3" /> | |
751 | - <window_info id="UI Designer" order="4" /> | |
752 | - <window_info id="Favorites" order="5" sideWeight="0.50167227" side_tool="true" weight="0.23793566" /> | |
753 | - <window_info anchor="bottom" id="Message" order="0" /> | |
754 | - <window_info anchor="bottom" id="Find" order="1" /> | |
755 | - <window_info anchor="bottom" id="Run" order="2" /> | |
756 | - <window_info anchor="bottom" id="Debug" order="3" weight="0.4" /> | |
757 | - <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> | |
758 | - <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> | |
759 | - <window_info anchor="bottom" id="TODO" order="6" weight="0.3286119" /> | |
760 | - <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> | |
761 | - <window_info anchor="bottom" id="Version Control" order="8" weight="0.592068" /> | |
762 | - <window_info active="true" anchor="bottom" id="Run Dashboard" order="9" visible="true" weight="0.4022663" /> | |
763 | - <window_info anchor="bottom" id="Spring" order="10" weight="0.3286119" /> | |
764 | - <window_info anchor="bottom" id="Database Changes" order="11" weight="0.3286119" /> | |
765 | - <window_info anchor="bottom" id="Event Log" order="12" side_tool="true" /> | |
766 | - <window_info anchor="bottom" id="Java Enterprise" order="13" weight="0.3286119" /> | |
767 | - <window_info anchor="bottom" id="Messages" order="14" weight="0.43909347" /> | |
768 | - <window_info anchor="bottom" id="MyBatis Log" order="15" /> | |
769 | - <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> | |
770 | - <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> | |
771 | - <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> | |
772 | - <window_info anchor="right" id="Palette" order="3" /> | |
773 | - <window_info anchor="right" id="Maven" order="4" /> | |
774 | - <window_info anchor="right" id="Bean Validation" order="5" /> | |
775 | - <window_info anchor="right" id="Database" order="6" /> | |
776 | - <window_info anchor="right" id="Palette	" order="7" /> | |
777 | - </layout> | |
778 | - </component> | |
779 | 335 | <component name="TypeScriptGeneratedFilesManager"> |
780 | 336 | <option name="version" value="1" /> |
781 | 337 | </component> |
... | ... | @@ -785,20 +341,7 @@ |
785 | 341 | <entry key="MAIN"> |
786 | 342 | <value> |
787 | 343 | <State> |
788 | - <option name="RECENTLY_FILTERED_USER_GROUPS"> | |
789 | - <collection /> | |
790 | - </option> | |
791 | - <option name="RECENTLY_FILTERED_BRANCH_GROUPS"> | |
792 | - <collection /> | |
793 | - </option> | |
794 | - <option name="COLUMN_ORDER"> | |
795 | - <list> | |
796 | - <option value="0" /> | |
797 | - <option value="1" /> | |
798 | - <option value="2" /> | |
799 | - <option value="3" /> | |
800 | - </list> | |
801 | - </option> | |
344 | + <option name="COLUMN_ORDER" /> | |
802 | 345 | </State> |
803 | 346 | </value> |
804 | 347 | </entry> |
... | ... | @@ -833,243 +376,28 @@ |
833 | 376 | <MESSAGE value="添加商品、商品详情页面" /> |
834 | 377 | <MESSAGE value="添加承运商" /> |
835 | 378 | <MESSAGE value="添加物料导入、导出模板,添加Excel导入导出配置文件" /> |
836 | - <option name="LAST_COMMIT_MESSAGE" value="添加物料导入、导出模板,添加Excel导入导出配置文件" /> | |
379 | + <MESSAGE value="添加仓库配置" /> | |
380 | + <option name="LAST_COMMIT_MESSAGE" value="添加仓库配置" /> | |
837 | 381 | </component> |
838 | 382 | <component name="XDebuggerManager"> |
839 | 383 | <breakpoint-manager> |
840 | 384 | <breakpoints> |
841 | 385 | <line-breakpoint enabled="true" type="java-line"> |
842 | - <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/controller/MaterialController.java</url> | |
843 | - <line>198</line> | |
844 | - <properties /> | |
845 | - <option name="timeStamp" value="11" /> | |
846 | - </line-breakpoint> | |
847 | - <line-breakpoint enabled="true" type="java-line"> | |
848 | 386 | <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/common/utils/poi/ExcelUtil.java</url> |
849 | 387 | <line>302</line> |
850 | - <properties /> | |
851 | 388 | <option name="timeStamp" value="12" /> |
852 | 389 | </line-breakpoint> |
853 | 390 | <line-breakpoint enabled="true" type="java-line"> |
854 | - <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/controller/MaterialController.java</url> | |
855 | - <line>187</line> | |
856 | - <properties /> | |
857 | - <option name="timeStamp" value="16" /> | |
858 | - </line-breakpoint> | |
859 | - <line-breakpoint enabled="true" type="java-line"> | |
860 | 391 | <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/service/MaterialServiceImpl.java</url> |
861 | 392 | <line>66</line> |
862 | - <properties /> | |
863 | 393 | <option name="timeStamp" value="24" /> |
864 | 394 | </line-breakpoint> |
395 | + <line-breakpoint enabled="true" type="java-line"> | |
396 | + <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/monitor/logExecption/controllerAdvice/MyControllerAdvice.java</url> | |
397 | + <line>26</line> | |
398 | + <option name="timeStamp" value="25" /> | |
399 | + </line-breakpoint> | |
865 | 400 | </breakpoints> |
866 | 401 | </breakpoint-manager> |
867 | 402 | </component> |
868 | - <component name="editorHistoryManager"> | |
869 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/domain/ShipmentContainerHeader.java"> | |
870 | - <provider selected="true" editor-type-id="text-editor"> | |
871 | - <state relative-caret-position="-356"> | |
872 | - <caret line="118" column="16" selection-start-line="118" selection-start-column="16" selection-end-line="118" selection-end-column="16" /> | |
873 | - </state> | |
874 | - </provider> | |
875 | - </entry> | |
876 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/domain/ShipmentCombinationModel.java"> | |
877 | - <provider selected="true" editor-type-id="text-editor"> | |
878 | - <state relative-caret-position="68"> | |
879 | - <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" /> | |
880 | - </state> | |
881 | - </provider> | |
882 | - </entry> | |
883 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java"> | |
884 | - <provider selected="true" editor-type-id="text-editor"> | |
885 | - <state relative-caret-position="202"> | |
886 | - <caret line="76" column="16" lean-forward="true" selection-start-line="76" selection-start-column="16" selection-end-line="76" selection-end-column="16" /> | |
887 | - </state> | |
888 | - </provider> | |
889 | - </entry> | |
890 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/domain/InventoryDetail.java"> | |
891 | - <provider selected="true" editor-type-id="text-editor"> | |
892 | - <state relative-caret-position="1156"> | |
893 | - <caret line="81" column="11" lean-forward="true" selection-start-line="81" selection-start-column="11" selection-end-line="81" selection-end-column="11" /> | |
894 | - </state> | |
895 | - </provider> | |
896 | - </entry> | |
897 | - <entry file="file://$PROJECT_DIR$/README.md"> | |
898 | - <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]"> | |
899 | - <state split_layout="SPLIT"> | |
900 | - <first_editor relative-caret-position="40"> | |
901 | - <caret line="2" column="9" selection-start-line="2" selection-start-column="9" selection-end-line="2" selection-end-column="9" /> | |
902 | - </first_editor> | |
903 | - <second_editor /> | |
904 | - </state> | |
905 | - </provider> | |
906 | - </entry> | |
907 | - <entry file="file://$PROJECT_DIR$/pom.xml"> | |
908 | - <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" /> | |
909 | - <provider selected="true" editor-type-id="text-editor"> | |
910 | - <state relative-caret-position="-232"> | |
911 | - <caret line="73" column="33" selection-start-line="73" selection-start-column="33" selection-end-line="73" selection-end-column="33" /> | |
912 | - </state> | |
913 | - </provider> | |
914 | - </entry> | |
915 | - <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/2.1.3.RELEASE/spring-boot-autoconfigure-2.1.3.RELEASE.jar!/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfiguration.class"> | |
916 | - <provider selected="true" editor-type-id="text-editor"> | |
917 | - <state relative-caret-position="44"> | |
918 | - <caret line="250" column="44" selection-start-line="250" selection-start-column="44" selection-end-line="250" selection-end-column="44" /> | |
919 | - </state> | |
920 | - </provider> | |
921 | - </entry> | |
922 | - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/error/500.html"> | |
923 | - <provider selected="true" editor-type-id="text-editor" /> | |
924 | - </entry> | |
925 | - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/error/unauth.html"> | |
926 | - <provider selected="true" editor-type-id="text-editor" /> | |
927 | - </entry> | |
928 | - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/error/404.html"> | |
929 | - <provider selected="true" editor-type-id="text-editor" /> | |
930 | - </entry> | |
931 | - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/invetoryDetail/inventoryDetail.html" /> | |
932 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentHeader/domain/ShipmentHeader.java"> | |
933 | - <provider selected="true" editor-type-id="text-editor"> | |
934 | - <state relative-caret-position="-1715"> | |
935 | - <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" /> | |
936 | - </state> | |
937 | - </provider> | |
938 | - </entry> | |
939 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/service/ShippingCombinationService.java"> | |
940 | - <provider selected="true" editor-type-id="text-editor"> | |
941 | - <state relative-caret-position="140"> | |
942 | - <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" /> | |
943 | - </state> | |
944 | - </provider> | |
945 | - </entry> | |
946 | - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/cyclecountAdjust/cyclecountAdjust.html"> | |
947 | - <provider selected="true" editor-type-id="text-editor"> | |
948 | - <state relative-caret-position="80"> | |
949 | - <caret line="206" column="33" selection-start-line="206" selection-start-column="33" selection-end-line="206" selection-end-column="33" /> | |
950 | - <folding> | |
951 | - <element signature="n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | |
952 | - <element signature="e#3143#6956#0" /> | |
953 | - <element signature="n#style#0;n#a#0;n#!!top" expanded="true" /> | |
954 | - <element signature="e#7300#7959#0" /> | |
955 | - </folding> | |
956 | - </state> | |
957 | - </provider> | |
958 | - </entry> | |
959 | - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html"> | |
960 | - <provider selected="true" editor-type-id="text-editor"> | |
961 | - <state relative-caret-position="302"> | |
962 | - <caret line="709" column="48" lean-forward="true" selection-start-line="709" selection-start-column="48" selection-end-line="709" selection-end-column="48" /> | |
963 | - <folding> | |
964 | - <element signature="e#10179#16495#0" /> | |
965 | - <element signature="n#style#0;n#a#0;n#!!top" expanded="true" /> | |
966 | - <element signature="e#16591#20920#0" /> | |
967 | - <element signature="e#21391#24464#0" /> | |
968 | - <element signature="e#24661#25310#0" /> | |
969 | - <element signature="e#25357#25470#0" /> | |
970 | - <element signature="e#25521#25805#0" /> | |
971 | - <element signature="e#25857#26476#0" /> | |
972 | - <element signature="e#26529#27160#0" /> | |
973 | - <element signature="e#27216#27659#0" /> | |
974 | - <element signature="e#27707#28073#0" /> | |
975 | - <element signature="e#28654#28666#0" /> | |
976 | - <element signature="e#29244#29273#0" /> | |
977 | - <element signature="e#29533#29580#0" /> | |
978 | - </folding> | |
979 | - </state> | |
980 | - </provider> | |
981 | - </entry> | |
982 | - <entry file="jar://$MAVEN_REPOSITORY$/org/thymeleaf/thymeleaf/3.0.11.RELEASE/thymeleaf-3.0.11.RELEASE.jar!/org/thymeleaf/engine/TemplateManager.class"> | |
983 | - <provider selected="true" editor-type-id="text-editor"> | |
984 | - <state relative-caret-position="96"> | |
985 | - <caret line="236" selection-start-line="236" selection-end-line="236" /> | |
986 | - </state> | |
987 | - </provider> | |
988 | - </entry> | |
989 | - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/receipt/receiptContainerDetail/receiptContainerDetail.html"> | |
990 | - <provider selected="true" editor-type-id="text-editor"> | |
991 | - <state relative-caret-position="240"> | |
992 | - <caret line="12" column="44" lean-forward="true" selection-start-line="12" selection-start-column="44" selection-end-line="12" selection-end-column="44" /> | |
993 | - </state> | |
994 | - </provider> | |
995 | - </entry> | |
996 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java"> | |
997 | - <provider selected="true" editor-type-id="text-editor"> | |
998 | - <state> | |
999 | - <caret column="28" selection-start-column="28" selection-end-column="28" /> | |
1000 | - </state> | |
1001 | - </provider> | |
1002 | - </entry> | |
1003 | - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/invetoryDetail/invetoryDetail.html"> | |
1004 | - <provider selected="true" editor-type-id="text-editor"> | |
1005 | - <state relative-caret-position="94"> | |
1006 | - <caret line="70" lean-forward="true" selection-start-line="70" selection-end-line="70" /> | |
1007 | - <folding> | |
1008 | - <element signature="n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | |
1009 | - <element signature="e#2365#2371#0" expanded="true" /> | |
1010 | - <element signature="e#3190#7361#0" /> | |
1011 | - </folding> | |
1012 | - </state> | |
1013 | - </provider> | |
1014 | - </entry> | |
1015 | - <entry file="file://$PROJECT_DIR$/src/main/resources/static/huaheng/js/huahengUI.js"> | |
1016 | - <provider selected="true" editor-type-id="text-editor"> | |
1017 | - <state relative-caret-position="-608"> | |
1018 | - <caret line="11" column="37" lean-forward="true" selection-start-line="11" selection-start-column="37" selection-end-line="11" selection-end-column="37" /> | |
1019 | - </state> | |
1020 | - </provider> | |
1021 | - </entry> | |
1022 | - <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.1.2/mybatis-plus-core-3.1.2.jar!/com/baomidou/mybatisplus/core/mapper/BaseMapper.class"> | |
1023 | - <provider selected="true" editor-type-id="text-editor"> | |
1024 | - <state relative-caret-position="116"> | |
1025 | - <caret line="15" column="17" selection-start-line="15" selection-start-column="17" selection-end-line="15" selection-end-column="17" /> | |
1026 | - </state> | |
1027 | - </provider> | |
1028 | - </entry> | |
1029 | - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html"> | |
1030 | - <provider selected="true" editor-type-id="text-editor"> | |
1031 | - <state relative-caret-position="499"> | |
1032 | - <caret line="125" column="44" selection-start-line="125" selection-start-column="33" selection-end-line="125" selection-end-column="44" /> | |
1033 | - <folding> | |
1034 | - <element signature="n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | |
1035 | - </folding> | |
1036 | - </state> | |
1037 | - </provider> | |
1038 | - </entry> | |
1039 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/mapper/InventoryHeaderMapper.java"> | |
1040 | - <provider selected="true" editor-type-id="text-editor"> | |
1041 | - <state relative-caret-position="80"> | |
1042 | - <caret line="5" column="49" selection-start-line="5" selection-start-column="49" selection-end-line="5" selection-end-column="49" /> | |
1043 | - </state> | |
1044 | - </provider> | |
1045 | - </entry> | |
1046 | - <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.1.5.RELEASE/spring-core-5.1.5.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class"> | |
1047 | - <provider selected="true" editor-type-id="text-editor"> | |
1048 | - <state relative-caret-position="132"> | |
1049 | - <caret line="103" selection-start-line="103" selection-end-line="103" /> | |
1050 | - </state> | |
1051 | - </provider> | |
1052 | - </entry> | |
1053 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/domain/InventoryHeader.java"> | |
1054 | - <provider selected="true" editor-type-id="text-editor"> | |
1055 | - <state relative-caret-position="-668"> | |
1056 | - <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" /> | |
1057 | - </state> | |
1058 | - </provider> | |
1059 | - </entry> | |
1060 | - <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryHeaderMapper.xml"> | |
1061 | - <provider selected="true" editor-type-id="text-editor"> | |
1062 | - <state relative-caret-position="315"> | |
1063 | - <caret line="32" column="30" selection-start-line="32" selection-start-column="30" selection-end-line="32" selection-end-column="30" /> | |
1064 | - </state> | |
1065 | - </provider> | |
1066 | - </entry> | |
1067 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java"> | |
1068 | - <provider selected="true" editor-type-id="text-editor"> | |
1069 | - <state relative-caret-position="79"> | |
1070 | - <caret line="72" column="28" selection-start-line="72" selection-start-column="28" selection-end-line="72" selection-end-column="28" /> | |
1071 | - </state> | |
1072 | - </provider> | |
1073 | - </entry> | |
1074 | - </component> | |
1075 | 403 | </project> |
1076 | 404 | \ No newline at end of file |
... | ... |
src/main/java/com/huaheng/pc/config/materialMultiple/controller/MaterialMultipleController.java
0 → 100644
1 | +package com.huaheng.pc.config.materialMultiple.controller; | |
2 | + | |
3 | +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; | |
4 | +import com.baomidou.mybatisplus.core.metadata.IPage; | |
5 | +import com.baomidou.mybatisplus.core.toolkit.Wrappers; | |
6 | +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; | |
7 | +import com.huaheng.common.support.Convert; | |
8 | +import com.huaheng.common.utils.StringUtils; | |
9 | +import com.huaheng.common.utils.security.ShiroUtils; | |
10 | +import com.huaheng.framework.aspectj.lang.annotation.Log; | |
11 | +import com.huaheng.framework.aspectj.lang.constant.BusinessType; | |
12 | +import com.huaheng.framework.web.domain.AjaxResult; | |
13 | +import com.huaheng.framework.web.page.PageDomain; | |
14 | +import com.huaheng.framework.web.page.TableDataInfo; | |
15 | +import com.huaheng.framework.web.page.TableSupport; | |
16 | +import com.huaheng.pc.config.materialMultiple.domain.MaterialMultiple; | |
17 | +import com.huaheng.pc.config.materialMultiple.service.MaterialMultipleService; | |
18 | +import com.huaheng.pc.config.materialUnit.domain.MaterialUnit; | |
19 | +import com.huaheng.pc.general.material.domain.Material; | |
20 | +import com.huaheng.pc.general.material.service.MaterialService; | |
21 | +import io.swagger.annotations.ApiOperation; | |
22 | +import io.swagger.annotations.ApiParam; | |
23 | +import org.apache.shiro.authz.annotation.RequiresPermissions; | |
24 | +import org.springframework.stereotype.Controller; | |
25 | +import org.springframework.ui.ModelMap; | |
26 | +import org.springframework.web.bind.annotation.*; | |
27 | + | |
28 | +import javax.annotation.Resource; | |
29 | +import java.util.ArrayList; | |
30 | +import java.util.List; | |
31 | + | |
32 | +@Controller | |
33 | +@RequestMapping("/config/materialMultiple") | |
34 | +public class MaterialMultipleController { | |
35 | + | |
36 | + @Resource | |
37 | + private MaterialMultipleService materialMultipleService; | |
38 | + | |
39 | + private String prefix = "config/materialMultiple"; | |
40 | + | |
41 | + @RequiresPermissions("config:materialUnit:view") | |
42 | + @GetMapping() | |
43 | + public String materialUnit() { | |
44 | + return prefix + "/materialUnit"; | |
45 | + } | |
46 | + | |
47 | + /** | |
48 | + * 新增单位转换 | |
49 | + */ | |
50 | + @GetMapping("/add") | |
51 | + public String add() { | |
52 | + return prefix + "/add"; | |
53 | + } | |
54 | + | |
55 | + | |
56 | +} | |
... | ... |
src/main/java/com/huaheng/pc/config/materialMultiple/domain/MaterialMultiple.java
0 → 100644
1 | +package com.huaheng.pc.config.materialMultiple.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.materialMultiple.domain.MaterialMultiple") | |
14 | +@Data | |
15 | +@TableName(value = "material_multiple") | |
16 | +public class MaterialMultiple 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 = "materialCode") | |
28 | + @ApiModelProperty(value="编码") | |
29 | + private String materialCode; | |
30 | + | |
31 | + /** | |
32 | + * 名称 | |
33 | + */ | |
34 | + @TableField(value = "materialName") | |
35 | + @ApiModelProperty(value="名称") | |
36 | + private String materialName; | |
37 | + | |
38 | + /** | |
39 | + * 规格 | |
40 | + */ | |
41 | + @TableField(value = "materialSpec") | |
42 | + @ApiModelProperty(value="规格") | |
43 | + private String materialSpec; | |
44 | + | |
45 | + /** | |
46 | + * 货主编码 | |
47 | + */ | |
48 | + @TableField(value = "companyCode") | |
49 | + @ApiModelProperty(value="货主编码") | |
50 | + private String companyCode; | |
51 | + | |
52 | + /** | |
53 | + * 仓库编码 | |
54 | + */ | |
55 | + @TableField(value = "warehouseCode") | |
56 | + @ApiModelProperty(value="仓库编码") | |
57 | + private String warehouseCode; | |
58 | + | |
59 | + /** | |
60 | + * 单位1 | |
61 | + */ | |
62 | + @TableField(value = "unitId1") | |
63 | + @ApiModelProperty(value="单位1") | |
64 | + private String unitId1; | |
65 | + | |
66 | + /** | |
67 | + * 单位2 | |
68 | + */ | |
69 | + @TableField(value = "unitId2") | |
70 | + @ApiModelProperty(value="单位2") | |
71 | + private String unitId2; | |
72 | + | |
73 | + /** | |
74 | + * 单位1转单位2换算倍数 | |
75 | + */ | |
76 | + @TableField(value = "multiple") | |
77 | + @ApiModelProperty(value="单位1转单位2换算倍数") | |
78 | + private Integer multiple; | |
79 | + | |
80 | + /** | |
81 | + * 状态 | |
82 | + */ | |
83 | + @TableField(value = "enable") | |
84 | + @ApiModelProperty(value="状态") | |
85 | + private Integer enable; | |
86 | + | |
87 | + /** | |
88 | + * 创建时间 | |
89 | + */ | |
90 | + @TableField(value = "created") | |
91 | + @ApiModelProperty(value="创建时间") | |
92 | + private Date created; | |
93 | + | |
94 | + /** | |
95 | + * 创建用户 | |
96 | + */ | |
97 | + @TableField(value = "createdBy") | |
98 | + @ApiModelProperty(value="创建用户") | |
99 | + private String createdBy; | |
100 | + | |
101 | + /** | |
102 | + * 创建时间 | |
103 | + */ | |
104 | + @TableField(value = "lastUpdated") | |
105 | + @ApiModelProperty(value="创建时间") | |
106 | + private Date lastUpdated; | |
107 | + | |
108 | + /** | |
109 | + * 更新用户 | |
110 | + */ | |
111 | + @TableField(value = "lastUpdatedBy") | |
112 | + @ApiModelProperty(value="更新用户") | |
113 | + private String lastUpdatedBy; | |
114 | + | |
115 | + /** | |
116 | + * 数据版本 | |
117 | + */ | |
118 | + @TableField(value = "version") | |
119 | + @ApiModelProperty(value="数据版本") | |
120 | + private Integer version; | |
121 | + | |
122 | + /** | |
123 | + * 自定义字段1 | |
124 | + */ | |
125 | + @TableField(value = "userDef1") | |
126 | + @ApiModelProperty(value="自定义字段1") | |
127 | + private String userDef1; | |
128 | + | |
129 | + /** | |
130 | + * 自定义字段2 | |
131 | + */ | |
132 | + @TableField(value = "userDef2") | |
133 | + @ApiModelProperty(value="自定义字段2") | |
134 | + private String userDef2; | |
135 | + | |
136 | + /** | |
137 | + * 自定义字段3 | |
138 | + */ | |
139 | + @TableField(value = "userDef3") | |
140 | + @ApiModelProperty(value="自定义字段3") | |
141 | + private String userDef3; | |
142 | + | |
143 | + /** | |
144 | + * 自定义字段4 | |
145 | + */ | |
146 | + @TableField(value = "userDef4") | |
147 | + @ApiModelProperty(value="自定义字段4") | |
148 | + private String userDef4; | |
149 | + | |
150 | + /** | |
151 | + * 自定义字段5 | |
152 | + */ | |
153 | + @TableField(value = "userDef5") | |
154 | + @ApiModelProperty(value="自定义字段5") | |
155 | + private String userDef5; | |
156 | + | |
157 | + /** | |
158 | + * 自定义字段6 | |
159 | + */ | |
160 | + @TableField(value = "userDef6") | |
161 | + @ApiModelProperty(value="自定义字段6") | |
162 | + private String userDef6; | |
163 | + | |
164 | + /** | |
165 | + * 自定义字段7 | |
166 | + */ | |
167 | + @TableField(value = "userDef7") | |
168 | + @ApiModelProperty(value="自定义字段7") | |
169 | + private String userDef7; | |
170 | + | |
171 | + /** | |
172 | + * 自定义字段8 | |
173 | + */ | |
174 | + @TableField(value = "userDef8") | |
175 | + @ApiModelProperty(value="自定义字段8") | |
176 | + private String userDef8; | |
177 | + | |
178 | + private static final long serialVersionUID = 1L; | |
179 | +} | |
0 | 180 | \ No newline at end of file |
... | ... |
src/main/java/com/huaheng/pc/config/materialMultiple/mapper/MaterialMultipleMapper.java
0 → 100644
1 | +package com.huaheng.pc.config.materialMultiple.mapper; | |
2 | + | |
3 | +import com.baomidou.mybatisplus.core.mapper.BaseMapper; | |
4 | +import com.huaheng.pc.config.materialMultiple.domain.MaterialMultiple; | |
5 | + | |
6 | +public interface MaterialMultipleMapper extends BaseMapper<MaterialMultiple> { | |
7 | +} | |
0 | 8 | \ No newline at end of file |
... | ... |
src/main/java/com/huaheng/pc/config/materialMultiple/service/MaterialMultipleService.java
0 → 100644
1 | +package com.huaheng.pc.config.materialMultiple.service; | |
2 | + | |
3 | +import com.huaheng.pc.config.materialMultiple.domain.MaterialMultiple; | |
4 | +import com.baomidou.mybatisplus.extension.service.IService; | |
5 | +public interface MaterialMultipleService extends IService<MaterialMultiple>{ | |
6 | + | |
7 | + | |
8 | +} | |
... | ... |
src/main/java/com/huaheng/pc/config/materialMultiple/service/MaterialMultipleServiceImpl.java
0 → 100644
1 | +package com.huaheng.pc.config.materialMultiple.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.materialMultiple.mapper.MaterialMultipleMapper; | |
8 | +import com.huaheng.pc.config.materialMultiple.domain.MaterialMultiple; | |
9 | +import com.huaheng.pc.config.materialMultiple.service.MaterialMultipleService; | |
10 | +@Service | |
11 | +public class MaterialMultipleServiceImpl extends ServiceImpl<MaterialMultipleMapper, MaterialMultiple> implements MaterialMultipleService{ | |
12 | + | |
13 | +} | |
... | ... |
src/main/java/com/huaheng/pc/config/materialUnit/controller/MaterialUnitController.java
0 → 100644
1 | +package com.huaheng.pc.config.materialUnit.controller; | |
2 | + | |
3 | +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; | |
4 | +import com.baomidou.mybatisplus.core.metadata.IPage; | |
5 | +import com.baomidou.mybatisplus.core.toolkit.Wrappers; | |
6 | +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; | |
7 | +import com.huaheng.common.support.Convert; | |
8 | +import com.huaheng.common.utils.StringUtils; | |
9 | +import com.huaheng.common.utils.security.ShiroUtils; | |
10 | +import com.huaheng.framework.aspectj.lang.annotation.Log; | |
11 | +import com.huaheng.framework.aspectj.lang.constant.BusinessType; | |
12 | +import com.huaheng.framework.web.controller.BaseController; | |
13 | +import com.huaheng.framework.web.domain.AjaxResult; | |
14 | +import com.huaheng.framework.web.page.PageDomain; | |
15 | +import com.huaheng.framework.web.page.TableDataInfo; | |
16 | +import com.huaheng.framework.web.page.TableSupport; | |
17 | +import com.huaheng.pc.config.materialUnit.domain.MaterialUnit; | |
18 | +import com.huaheng.pc.config.materialUnit.service.MaterialUnitService; | |
19 | +import io.swagger.annotations.Api; | |
20 | +import io.swagger.annotations.ApiOperation; | |
21 | +import io.swagger.annotations.ApiParam; | |
22 | +import org.apache.shiro.authz.annotation.RequiresPermissions; | |
23 | +import org.springframework.stereotype.Controller; | |
24 | +import org.springframework.ui.ModelMap; | |
25 | +import org.springframework.web.bind.annotation.*; | |
26 | + | |
27 | +import javax.annotation.Resource; | |
28 | +import java.util.ArrayList; | |
29 | +import java.util.List; | |
30 | + | |
31 | +@Api(tags = "单位转换") | |
32 | +@Controller | |
33 | +@RequestMapping("/config/materialUnit") | |
34 | +public class MaterialUnitController extends BaseController { | |
35 | + | |
36 | + @Resource | |
37 | + private MaterialUnitService materialUnitService; | |
38 | + | |
39 | + private String prefix = "config/materialUnit"; | |
40 | + | |
41 | + @RequiresPermissions("config:materialUnit:view") | |
42 | + @GetMapping() | |
43 | + public String materialUnit() { | |
44 | + return prefix + "/materialUnit"; | |
45 | + } | |
46 | + | |
47 | + /** | |
48 | + * 查询单位转换列表 | |
49 | + */ | |
50 | + @ApiOperation(value="查看单位转换列表", notes="根据物料编码、名称、单位、创建时间获取单位转换列表", httpMethod = "POST") | |
51 | + @RequiresPermissions("config:materialUnit:list") | |
52 | + @Log(title = "配置-单位转换",operating = "单位转换列表", action = BusinessType.GRANT) | |
53 | + @PostMapping("/list") | |
54 | + @ResponseBody | |
55 | + public TableDataInfo list(@ApiParam(name="receiptType",value="料编码、名称、单位") MaterialUnit materialUnit, | |
56 | + @ApiParam(name = "createdBegin", value = "起止时间") String createdBegin, | |
57 | + @ApiParam(name = "createdEnd", value = "结束时间") String createdEnd) { | |
58 | + LambdaQueryWrapper<MaterialUnit> lambdaQueryWrapper = Wrappers.lambdaQuery(); | |
59 | + PageDomain pageDomain = TableSupport.buildPageRequest(); | |
60 | + Integer pageNum = pageDomain.getPageNum(); | |
61 | + Integer pageSize = pageDomain.getPageSize(); | |
62 | + lambdaQueryWrapper.gt(StringUtils.isNotEmpty(createdBegin), MaterialUnit::getCreated, createdBegin) | |
63 | + .lt(StringUtils.isNotEmpty(createdEnd), MaterialUnit::getCreated, createdEnd) | |
64 | + .eq(StringUtils.isNotEmpty(materialUnit.getMaterialCode()), MaterialUnit::getMaterialCode, materialUnit.getMaterialCode()) | |
65 | + .eq(StringUtils.isNotEmpty(materialUnit.getMaterialName()), MaterialUnit::getMaterialName, materialUnit.getMaterialName()) | |
66 | + .eq(StringUtils.isNotEmpty(materialUnit.getUnit()), MaterialUnit::getUnit, materialUnit.getUnit()) | |
67 | + .in(MaterialUnit::getCompanyCode, ShiroUtils.getCompanyCodeList()) | |
68 | + .eq(MaterialUnit::getWarehouseCode, ShiroUtils.getWarehouseCode()); | |
69 | + | |
70 | + if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){ | |
71 | + /*使用分页查询*/ | |
72 | + Page<MaterialUnit> page = new Page<>(pageNum, pageSize); | |
73 | + IPage<MaterialUnit> iPage = materialUnitService.page(page, lambdaQueryWrapper); | |
74 | + return getMpDataTable(iPage.getRecords(), iPage.getTotal()); | |
75 | + } else { | |
76 | + List<MaterialUnit> list = materialUnitService.list(lambdaQueryWrapper); | |
77 | + return getDataTable(list); | |
78 | + } | |
79 | + } | |
80 | + | |
81 | + /** | |
82 | + * 新增单位转换 | |
83 | + */ | |
84 | + @GetMapping("/add") | |
85 | + public String add() { | |
86 | + return prefix + "/add"; | |
87 | + } | |
88 | + | |
89 | + /** | |
90 | + * 新增保存单位转换 | |
91 | + */ | |
92 | + @ApiOperation(value="新增单位转换", notes="新增单位转换", httpMethod = "POST") | |
93 | + @RequiresPermissions("config:materialUnit:add") | |
94 | + @Log(title = "配置-单位转换",operating = "新增单位转换", action = BusinessType.INSERT) | |
95 | + @PostMapping("/add") | |
96 | + @ResponseBody | |
97 | + public AjaxResult addSave(MaterialUnit materialUnit) { | |
98 | + LambdaQueryWrapper<MaterialUnit> lambda = Wrappers.lambdaQuery(); | |
99 | + lambda.eq(MaterialUnit::getWarehouseCode, ShiroUtils.getWarehouseCode()) | |
100 | + .eq(MaterialUnit::getCompanyCode, materialUnit.getCompanyCode()) | |
101 | + .eq(MaterialUnit::getMaterialCode, materialUnit.getMaterialCode()) | |
102 | + .eq(MaterialUnit::getUnit, materialUnit.getUnit()); | |
103 | + if (materialUnitService.getOne(lambda) != null){ | |
104 | + return AjaxResult.error("当前新增记录已存在"); | |
105 | + } | |
106 | + materialUnit.setCreatedBy(ShiroUtils.getLoginName()); | |
107 | + materialUnit.setLastUpdatedBy(ShiroUtils.getLoginName()); | |
108 | + return toAjax(materialUnitService.save(materialUnit)); | |
109 | + } | |
110 | + | |
111 | + /** | |
112 | + * 修改单位转换 | |
113 | + */ | |
114 | + @GetMapping("/edit/{id}") | |
115 | + public String edit(@PathVariable("id") Integer id, ModelMap mmap) { | |
116 | + MaterialUnit materialUnit = materialUnitService.getById(id); | |
117 | + mmap.put("materialUnit", materialUnit); | |
118 | + return prefix + "/edit"; | |
119 | + } | |
120 | + | |
121 | + /** | |
122 | + * 修改保存单位转换 | |
123 | + */ | |
124 | + @ApiOperation(value="修改单位转换信息", notes="修改单位转换信息", httpMethod = "POST") | |
125 | + @RequiresPermissions("config:warehouse:edit") | |
126 | + @Log(title = "配置-单位转换",operating = "修改单位转换", action = BusinessType.UPDATE) | |
127 | + @PostMapping("/edit") | |
128 | + @ResponseBody | |
129 | + public AjaxResult editSave(MaterialUnit materialUnit) { | |
130 | + materialUnit.setLastUpdatedBy(ShiroUtils.getLoginName()); | |
131 | + return toAjax(materialUnitService.updateById(materialUnit)); | |
132 | + } | |
133 | + | |
134 | + /** | |
135 | + * 删除单位转换 | |
136 | + */ | |
137 | + @ApiOperation(value="删除单位转换", notes="单条删除或批量删除单位转换,示例1或1,2,3", httpMethod = "POST") | |
138 | + @RequiresPermissions("config:receiptType:remove") | |
139 | + @Log(title = "配置-单位转换",operating = "删除单位转换", action = BusinessType.DELETE) | |
140 | + @PostMapping( "/remove") | |
141 | + @ResponseBody | |
142 | + public AjaxResult remove(String ids) { | |
143 | + if (StringUtils.isEmpty(ids)) { | |
144 | + return AjaxResult.error("id不能为空"); | |
145 | + } | |
146 | + List<Integer> list = new ArrayList<>(); | |
147 | + for (Integer id : Convert.toIntArray(ids)) { | |
148 | + list.add(id); | |
149 | + } | |
150 | + return toAjax(materialUnitService.removeByIds(list)); | |
151 | + } | |
152 | +} | |
... | ... |
src/main/java/com/huaheng/pc/config/materialUnit/domain/MaterialUnit.java
0 → 100644
1 | +package com.huaheng.pc.config.materialUnit.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.materialUnit.domain.MaterialUnit") | |
14 | +@Data | |
15 | +@TableName(value = "material_unit") | |
16 | +public class MaterialUnit 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 = "materialCode") | |
28 | + @ApiModelProperty(value="编码") | |
29 | + private String materialCode; | |
30 | + | |
31 | + /** | |
32 | + * 名称 | |
33 | + */ | |
34 | + @TableField(value = "materialName") | |
35 | + @ApiModelProperty(value="名称") | |
36 | + private String materialName; | |
37 | + | |
38 | + /** | |
39 | + * 规格 | |
40 | + */ | |
41 | + @TableField(value = "materialSpec") | |
42 | + @ApiModelProperty(value="规格") | |
43 | + private String materialSpec; | |
44 | + | |
45 | + /** | |
46 | + * 货主编码 | |
47 | + */ | |
48 | + @TableField(value = "companyCode") | |
49 | + @ApiModelProperty(value="货主编码") | |
50 | + private String companyCode; | |
51 | + | |
52 | + /** | |
53 | + * 仓库编码 | |
54 | + */ | |
55 | + @TableField(value = "warehouseCode") | |
56 | + @ApiModelProperty(value="仓库编码") | |
57 | + private String warehouseCode; | |
58 | + | |
59 | + /** | |
60 | + * 单位 | |
61 | + */ | |
62 | + @TableField(value = "unit") | |
63 | + @ApiModelProperty(value="单位") | |
64 | + private String unit; | |
65 | + | |
66 | + /** | |
67 | + * 顺序 | |
68 | + */ | |
69 | + @TableField(value = "sequence") | |
70 | + @ApiModelProperty(value="顺序") | |
71 | + private String sequence; | |
72 | + | |
73 | + /** | |
74 | + * 状态 | |
75 | + */ | |
76 | + @TableField(value = "enable") | |
77 | + @ApiModelProperty(value="状态") | |
78 | + private Integer enable; | |
79 | + | |
80 | + /** | |
81 | + * 创建时间 | |
82 | + */ | |
83 | + @TableField(value = "created") | |
84 | + @ApiModelProperty(value="创建时间") | |
85 | + private Date created; | |
86 | + | |
87 | + /** | |
88 | + * 创建用户 | |
89 | + */ | |
90 | + @TableField(value = "createdBy") | |
91 | + @ApiModelProperty(value="创建用户") | |
92 | + private String createdBy; | |
93 | + | |
94 | + /** | |
95 | + * 创建时间 | |
96 | + */ | |
97 | + @TableField(value = "lastUpdated") | |
98 | + @ApiModelProperty(value="创建时间") | |
99 | + private Date lastUpdated; | |
100 | + | |
101 | + /** | |
102 | + * 更新用户 | |
103 | + */ | |
104 | + @TableField(value = "lastUpdatedBy") | |
105 | + @ApiModelProperty(value="更新用户") | |
106 | + private String lastUpdatedBy; | |
107 | + | |
108 | + /** | |
109 | + * 数据版本 | |
110 | + */ | |
111 | + @TableField(value = "version") | |
112 | + @ApiModelProperty(value="数据版本") | |
113 | + private Integer version; | |
114 | + | |
115 | + /** | |
116 | + * 自定义字段1 | |
117 | + */ | |
118 | + @TableField(value = "userDef1") | |
119 | + @ApiModelProperty(value="自定义字段1") | |
120 | + private String userDef1; | |
121 | + | |
122 | + /** | |
123 | + * 自定义字段2 | |
124 | + */ | |
125 | + @TableField(value = "userDef2") | |
126 | + @ApiModelProperty(value="自定义字段2") | |
127 | + private String userDef2; | |
128 | + | |
129 | + /** | |
130 | + * 自定义字段3 | |
131 | + */ | |
132 | + @TableField(value = "userDef3") | |
133 | + @ApiModelProperty(value="自定义字段3") | |
134 | + private String userDef3; | |
135 | + | |
136 | + /** | |
137 | + * 自定义字段4 | |
138 | + */ | |
139 | + @TableField(value = "userDef4") | |
140 | + @ApiModelProperty(value="自定义字段4") | |
141 | + private String userDef4; | |
142 | + | |
143 | + /** | |
144 | + * 自定义字段5 | |
145 | + */ | |
146 | + @TableField(value = "userDef5") | |
147 | + @ApiModelProperty(value="自定义字段5") | |
148 | + private String userDef5; | |
149 | + | |
150 | + /** | |
151 | + * 自定义字段6 | |
152 | + */ | |
153 | + @TableField(value = "userDef6") | |
154 | + @ApiModelProperty(value="自定义字段6") | |
155 | + private String userDef6; | |
156 | + | |
157 | + /** | |
158 | + * 自定义字段7 | |
159 | + */ | |
160 | + @TableField(value = "userDef7") | |
161 | + @ApiModelProperty(value="自定义字段7") | |
162 | + private String userDef7; | |
163 | + | |
164 | + /** | |
165 | + * 自定义字段8 | |
166 | + */ | |
167 | + @TableField(value = "userDef8") | |
168 | + @ApiModelProperty(value="自定义字段8") | |
169 | + private String userDef8; | |
170 | + | |
171 | + private static final long serialVersionUID = 1L; | |
172 | +} | |
0 | 173 | \ No newline at end of file |
... | ... |
src/main/java/com/huaheng/pc/general/materialUnit/mapper/MaterialUnitMapper.java renamed to src/main/java/com/huaheng/pc/config/materialUnit/mapper/MaterialUnitMapper.java
1 | -package com.huaheng.pc.general.materialUnit.mapper; | |
1 | +package com.huaheng.pc.config.materialUnit.mapper; | |
2 | 2 | |
3 | 3 | import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
4 | -import com.huaheng.pc.general.materialUnit.domain.MaterialUnit; | |
4 | +import com.huaheng.pc.config.materialUnit.domain.MaterialUnit; | |
5 | 5 | |
6 | 6 | public interface MaterialUnitMapper extends BaseMapper<MaterialUnit> { |
7 | 7 | } |
8 | 8 | \ No newline at end of file |
... | ... |
src/main/java/com/huaheng/pc/config/materialUnit/service/MaterialUnitService.java
0 → 100644
src/main/java/com/huaheng/pc/config/materialUnit/service/MaterialUnitServiceImpl.java
0 → 100644
1 | +package com.huaheng.pc.config.materialUnit.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.materialUnit.mapper.MaterialUnitMapper; | |
8 | +import com.huaheng.pc.config.materialUnit.domain.MaterialUnit; | |
9 | +import com.huaheng.pc.config.materialUnit.service.MaterialUnitService; | |
10 | +@Service | |
11 | +public class MaterialUnitServiceImpl extends ServiceImpl<MaterialUnitMapper, MaterialUnit> implements MaterialUnitService{ | |
12 | + | |
13 | +} | |
... | ... |
src/main/java/com/huaheng/pc/general/material/controller/MaterialController.java
... | ... | @@ -4,7 +4,6 @@ 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.support.Convert; | |
8 | 7 | import com.huaheng.common.utils.StringUtils; |
9 | 8 | import com.huaheng.common.utils.poi.ExcelUtil; |
10 | 9 | import com.huaheng.common.utils.security.ShiroUtils; |
... | ... | @@ -15,13 +14,10 @@ import com.huaheng.framework.web.domain.AjaxResult; |
15 | 14 | import com.huaheng.framework.web.page.PageDomain; |
16 | 15 | import com.huaheng.framework.web.page.TableDataInfo; |
17 | 16 | import com.huaheng.framework.web.page.TableSupport; |
18 | -import com.huaheng.pc.general.location.domain.Location; | |
19 | -import com.huaheng.pc.general.location.service.LocationService; | |
17 | +import com.huaheng.pc.config.materialUnit.domain.MaterialUnit; | |
18 | +import com.huaheng.pc.config.materialUnit.service.MaterialUnitService; | |
20 | 19 | import com.huaheng.pc.general.material.domain.Material; |
21 | 20 | import com.huaheng.pc.general.material.service.MaterialService; |
22 | -import com.huaheng.pc.general.materialUnit.domain.MaterialUnit; | |
23 | -import com.huaheng.pc.general.materialUnit.service.MaterialUnitService; | |
24 | -import com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail; | |
25 | 21 | import io.swagger.annotations.Api; |
26 | 22 | import io.swagger.annotations.ApiOperation; |
27 | 23 | import io.swagger.annotations.ApiParam; |
... | ... |
src/main/java/com/huaheng/pc/general/materialUnit/domain/MaterialUnit.java deleted
1 | -package com.huaheng.pc.general.materialUnit.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 | - | |
12 | -@ApiModel(value="com.huaheng.pc.general.materialUnit.domain.MaterialUnit") | |
13 | -@TableName(value = "material_unit") | |
14 | -public class MaterialUnit implements Serializable { | |
15 | - /** | |
16 | - * ID | |
17 | - */ | |
18 | - @TableId(value = "id", type = IdType.AUTO) | |
19 | - @ApiModelProperty(value="ID") | |
20 | - private Integer id; | |
21 | - | |
22 | - /** | |
23 | - * 编码 | |
24 | - */ | |
25 | - @TableField(value = "materialCode") | |
26 | - @ApiModelProperty(value="编码") | |
27 | - private String materialCode; | |
28 | - | |
29 | - /** | |
30 | - * 名称 | |
31 | - */ | |
32 | - @TableField(value = "materialName") | |
33 | - @ApiModelProperty(value="名称") | |
34 | - private String materialName; | |
35 | - | |
36 | - /** | |
37 | - * 规格 | |
38 | - */ | |
39 | - @TableField(value = "materialSpec") | |
40 | - @ApiModelProperty(value="规格") | |
41 | - private String materialSpec; | |
42 | - | |
43 | - /** | |
44 | - * 货主编码 | |
45 | - */ | |
46 | - @TableField(value = "companyCode") | |
47 | - @ApiModelProperty(value="货主编码") | |
48 | - private String companyCode; | |
49 | - | |
50 | - /** | |
51 | - * 仓库编码 | |
52 | - */ | |
53 | - @TableField(value = "warehouseCode") | |
54 | - @ApiModelProperty(value="仓库编码") | |
55 | - private String warehouseCode; | |
56 | - | |
57 | - /** | |
58 | - * 单位 | |
59 | - */ | |
60 | - @TableField(value = "unit") | |
61 | - @ApiModelProperty(value="单位") | |
62 | - private String unit; | |
63 | - | |
64 | - /** | |
65 | - * 顺序 | |
66 | - */ | |
67 | - @TableField(value = "sequence") | |
68 | - @ApiModelProperty(value="顺序") | |
69 | - private String sequence; | |
70 | - | |
71 | - /** | |
72 | - * 状态 | |
73 | - */ | |
74 | - @TableField(value = "enable") | |
75 | - @ApiModelProperty(value="状态") | |
76 | - private Integer enable; | |
77 | - | |
78 | - /** | |
79 | - * 创建时间 | |
80 | - */ | |
81 | - @TableField(value = "created") | |
82 | - @ApiModelProperty(value="创建时间") | |
83 | - private Date created; | |
84 | - | |
85 | - /** | |
86 | - * 创建用户 | |
87 | - */ | |
88 | - @TableField(value = "createdBy") | |
89 | - @ApiModelProperty(value="创建用户") | |
90 | - private String createdBy; | |
91 | - | |
92 | - /** | |
93 | - * 创建时间 | |
94 | - */ | |
95 | - @TableField(value = "lastUpdated") | |
96 | - @ApiModelProperty(value="创建时间") | |
97 | - private Date lastUpdated; | |
98 | - | |
99 | - /** | |
100 | - * 更新用户 | |
101 | - */ | |
102 | - @TableField(value = "lastUpdatedBy") | |
103 | - @ApiModelProperty(value="更新用户") | |
104 | - private String lastUpdatedBy; | |
105 | - | |
106 | - /** | |
107 | - * 数据版本 | |
108 | - */ | |
109 | - @TableField(value = "version") | |
110 | - @ApiModelProperty(value="数据版本") | |
111 | - private Integer version; | |
112 | - | |
113 | - /** | |
114 | - * 自定义字段1 | |
115 | - */ | |
116 | - @TableField(value = "userDef1") | |
117 | - @ApiModelProperty(value="自定义字段1") | |
118 | - private String userDef1; | |
119 | - | |
120 | - /** | |
121 | - * 自定义字段2 | |
122 | - */ | |
123 | - @TableField(value = "userDef2") | |
124 | - @ApiModelProperty(value="自定义字段2") | |
125 | - private String userDef2; | |
126 | - | |
127 | - /** | |
128 | - * 自定义字段3 | |
129 | - */ | |
130 | - @TableField(value = "userDef3") | |
131 | - @ApiModelProperty(value="自定义字段3") | |
132 | - private String userDef3; | |
133 | - | |
134 | - /** | |
135 | - * 自定义字段4 | |
136 | - */ | |
137 | - @TableField(value = "userDef4") | |
138 | - @ApiModelProperty(value="自定义字段4") | |
139 | - private String userDef4; | |
140 | - | |
141 | - /** | |
142 | - * 自定义字段5 | |
143 | - */ | |
144 | - @TableField(value = "userDef5") | |
145 | - @ApiModelProperty(value="自定义字段5") | |
146 | - private String userDef5; | |
147 | - | |
148 | - /** | |
149 | - * 自定义字段6 | |
150 | - */ | |
151 | - @TableField(value = "userDef6") | |
152 | - @ApiModelProperty(value="自定义字段6") | |
153 | - private String userDef6; | |
154 | - | |
155 | - /** | |
156 | - * 自定义字段7 | |
157 | - */ | |
158 | - @TableField(value = "userDef7") | |
159 | - @ApiModelProperty(value="自定义字段7") | |
160 | - private String userDef7; | |
161 | - | |
162 | - /** | |
163 | - * 自定义字段8 | |
164 | - */ | |
165 | - @TableField(value = "userDef8") | |
166 | - @ApiModelProperty(value="自定义字段8") | |
167 | - private String userDef8; | |
168 | - | |
169 | - private static final long serialVersionUID = 1L; | |
170 | - | |
171 | - public static final String COL_MATERIALCODE = "materialCode"; | |
172 | - | |
173 | - public static final String COL_MATERIALNAME = "materialName"; | |
174 | - | |
175 | - public static final String COL_MATERIALSPEC = "materialSpec"; | |
176 | - | |
177 | - public static final String COL_COMPANYCODE = "companyCode"; | |
178 | - | |
179 | - public static final String COL_WAREHOUSECODE = "warehouseCode"; | |
180 | - | |
181 | - public static final String COL_UNIT = "unit"; | |
182 | - | |
183 | - public static final String COL_SEQUENCE = "sequence"; | |
184 | - | |
185 | - public static final String COL_ENABLE = "enable"; | |
186 | - | |
187 | - public static final String COL_CREATED = "created"; | |
188 | - | |
189 | - public static final String COL_CREATEDBY = "createdBy"; | |
190 | - | |
191 | - public static final String COL_LASTUPDATED = "lastUpdated"; | |
192 | - | |
193 | - public static final String COL_LASTUPDATEDBY = "lastUpdatedBy"; | |
194 | - | |
195 | - public static final String COL_VERSION = "version"; | |
196 | - | |
197 | - public static final String COL_USERDEF1 = "userDef1"; | |
198 | - | |
199 | - public static final String COL_USERDEF2 = "userDef2"; | |
200 | - | |
201 | - public static final String COL_USERDEF3 = "userDef3"; | |
202 | - | |
203 | - public static final String COL_USERDEF4 = "userDef4"; | |
204 | - | |
205 | - public static final String COL_USERDEF5 = "userDef5"; | |
206 | - | |
207 | - public static final String COL_USERDEF6 = "userDef6"; | |
208 | - | |
209 | - public static final String COL_USERDEF7 = "userDef7"; | |
210 | - | |
211 | - public static final String COL_USERDEF8 = "userDef8"; | |
212 | - | |
213 | - /** | |
214 | - * 获取ID | |
215 | - * | |
216 | - * @return id - ID | |
217 | - */ | |
218 | - public Integer getId() { | |
219 | - return id; | |
220 | - } | |
221 | - | |
222 | - /** | |
223 | - * 设置ID | |
224 | - * | |
225 | - * @param id ID | |
226 | - */ | |
227 | - public void setId(Integer id) { | |
228 | - this.id = id; | |
229 | - } | |
230 | - | |
231 | - /** | |
232 | - * 获取编码 | |
233 | - * | |
234 | - * @return materialCode - 编码 | |
235 | - */ | |
236 | - public String getMaterialCode() { | |
237 | - return materialCode; | |
238 | - } | |
239 | - | |
240 | - /** | |
241 | - * 设置编码 | |
242 | - * | |
243 | - * @param materialCode 编码 | |
244 | - */ | |
245 | - public void setMaterialCode(String materialCode) { | |
246 | - this.materialCode = materialCode; | |
247 | - } | |
248 | - | |
249 | - /** | |
250 | - * 获取名称 | |
251 | - * | |
252 | - * @return materialName - 名称 | |
253 | - */ | |
254 | - public String getMaterialName() { | |
255 | - return materialName; | |
256 | - } | |
257 | - | |
258 | - /** | |
259 | - * 设置名称 | |
260 | - * | |
261 | - * @param materialName 名称 | |
262 | - */ | |
263 | - public void setMaterialName(String materialName) { | |
264 | - this.materialName = materialName; | |
265 | - } | |
266 | - | |
267 | - /** | |
268 | - * 获取规格 | |
269 | - * | |
270 | - * @return materialSpec - 规格 | |
271 | - */ | |
272 | - public String getMaterialSpec() { | |
273 | - return materialSpec; | |
274 | - } | |
275 | - | |
276 | - /** | |
277 | - * 设置规格 | |
278 | - * | |
279 | - * @param materialSpec 规格 | |
280 | - */ | |
281 | - public void setMaterialSpec(String materialSpec) { | |
282 | - this.materialSpec = materialSpec; | |
283 | - } | |
284 | - | |
285 | - /** | |
286 | - * 获取货主编码 | |
287 | - * | |
288 | - * @return companyCode - 货主编码 | |
289 | - */ | |
290 | - public String getCompanyCode() { | |
291 | - return companyCode; | |
292 | - } | |
293 | - | |
294 | - /** | |
295 | - * 设置货主编码 | |
296 | - * | |
297 | - * @param companyCode 货主编码 | |
298 | - */ | |
299 | - public void setCompanyCode(String companyCode) { | |
300 | - this.companyCode = companyCode; | |
301 | - } | |
302 | - | |
303 | - /** | |
304 | - * 获取仓库编码 | |
305 | - * | |
306 | - * @return warehouseCode - 仓库编码 | |
307 | - */ | |
308 | - public String getWarehouseCode() { | |
309 | - return warehouseCode; | |
310 | - } | |
311 | - | |
312 | - /** | |
313 | - * 设置仓库编码 | |
314 | - * | |
315 | - * @param warehouseCode 仓库编码 | |
316 | - */ | |
317 | - public void setWarehouseCode(String warehouseCode) { | |
318 | - this.warehouseCode = warehouseCode; | |
319 | - } | |
320 | - | |
321 | - /** | |
322 | - * 获取单位 | |
323 | - * | |
324 | - * @return unit - 单位 | |
325 | - */ | |
326 | - public String getUnit() { | |
327 | - return unit; | |
328 | - } | |
329 | - | |
330 | - /** | |
331 | - * 设置单位 | |
332 | - * | |
333 | - * @param unit 单位 | |
334 | - */ | |
335 | - public void setUnit(String unit) { | |
336 | - this.unit = unit; | |
337 | - } | |
338 | - | |
339 | - /** | |
340 | - * 获取顺序 | |
341 | - * | |
342 | - * @return sequence - 顺序 | |
343 | - */ | |
344 | - public String getSequence() { | |
345 | - return sequence; | |
346 | - } | |
347 | - | |
348 | - /** | |
349 | - * 设置顺序 | |
350 | - * | |
351 | - * @param sequence 顺序 | |
352 | - */ | |
353 | - public void setSequence(String sequence) { | |
354 | - this.sequence = sequence; | |
355 | - } | |
356 | - | |
357 | - /** | |
358 | - * 获取状态 | |
359 | - * | |
360 | - * @return enable - 状态 | |
361 | - */ | |
362 | - public Integer getEnable() { | |
363 | - return enable; | |
364 | - } | |
365 | - | |
366 | - /** | |
367 | - * 设置状态 | |
368 | - * | |
369 | - * @param enable 状态 | |
370 | - */ | |
371 | - public void setEnable(Integer enable) { | |
372 | - this.enable = enable; | |
373 | - } | |
374 | - | |
375 | - /** | |
376 | - * 获取创建时间 | |
377 | - * | |
378 | - * @return created - 创建时间 | |
379 | - */ | |
380 | - public Date getCreated() { | |
381 | - return created; | |
382 | - } | |
383 | - | |
384 | - /** | |
385 | - * 设置创建时间 | |
386 | - * | |
387 | - * @param created 创建时间 | |
388 | - */ | |
389 | - public void setCreated(Date created) { | |
390 | - this.created = created; | |
391 | - } | |
392 | - | |
393 | - /** | |
394 | - * 获取创建用户 | |
395 | - * | |
396 | - * @return createdBy - 创建用户 | |
397 | - */ | |
398 | - public String getCreatedBy() { | |
399 | - return createdBy; | |
400 | - } | |
401 | - | |
402 | - /** | |
403 | - * 设置创建用户 | |
404 | - * | |
405 | - * @param createdBy 创建用户 | |
406 | - */ | |
407 | - public void setCreatedBy(String createdBy) { | |
408 | - this.createdBy = createdBy; | |
409 | - } | |
410 | - | |
411 | - /** | |
412 | - * 获取创建时间 | |
413 | - * | |
414 | - * @return lastUpdated - 创建时间 | |
415 | - */ | |
416 | - public Date getLastUpdated() { | |
417 | - return lastUpdated; | |
418 | - } | |
419 | - | |
420 | - /** | |
421 | - * 设置创建时间 | |
422 | - * | |
423 | - * @param lastUpdated 创建时间 | |
424 | - */ | |
425 | - public void setLastUpdated(Date lastUpdated) { | |
426 | - this.lastUpdated = lastUpdated; | |
427 | - } | |
428 | - | |
429 | - /** | |
430 | - * 获取更新用户 | |
431 | - * | |
432 | - * @return lastUpdatedBy - 更新用户 | |
433 | - */ | |
434 | - public String getLastUpdatedBy() { | |
435 | - return lastUpdatedBy; | |
436 | - } | |
437 | - | |
438 | - /** | |
439 | - * 设置更新用户 | |
440 | - * | |
441 | - * @param lastUpdatedBy 更新用户 | |
442 | - */ | |
443 | - public void setLastUpdatedBy(String lastUpdatedBy) { | |
444 | - this.lastUpdatedBy = lastUpdatedBy; | |
445 | - } | |
446 | - | |
447 | - /** | |
448 | - * 获取数据版本 | |
449 | - * | |
450 | - * @return version - 数据版本 | |
451 | - */ | |
452 | - public Integer getVersion() { | |
453 | - return version; | |
454 | - } | |
455 | - | |
456 | - /** | |
457 | - * 设置数据版本 | |
458 | - * | |
459 | - * @param version 数据版本 | |
460 | - */ | |
461 | - public void setVersion(Integer version) { | |
462 | - this.version = version; | |
463 | - } | |
464 | - | |
465 | - /** | |
466 | - * 获取自定义字段1 | |
467 | - * | |
468 | - * @return userDef1 - 自定义字段1 | |
469 | - */ | |
470 | - public String getUserDef1() { | |
471 | - return userDef1; | |
472 | - } | |
473 | - | |
474 | - /** | |
475 | - * 设置自定义字段1 | |
476 | - * | |
477 | - * @param userDef1 自定义字段1 | |
478 | - */ | |
479 | - public void setUserDef1(String userDef1) { | |
480 | - this.userDef1 = userDef1; | |
481 | - } | |
482 | - | |
483 | - /** | |
484 | - * 获取自定义字段2 | |
485 | - * | |
486 | - * @return userDef2 - 自定义字段2 | |
487 | - */ | |
488 | - public String getUserDef2() { | |
489 | - return userDef2; | |
490 | - } | |
491 | - | |
492 | - /** | |
493 | - * 设置自定义字段2 | |
494 | - * | |
495 | - * @param userDef2 自定义字段2 | |
496 | - */ | |
497 | - public void setUserDef2(String userDef2) { | |
498 | - this.userDef2 = userDef2; | |
499 | - } | |
500 | - | |
501 | - /** | |
502 | - * 获取自定义字段3 | |
503 | - * | |
504 | - * @return userDef3 - 自定义字段3 | |
505 | - */ | |
506 | - public String getUserDef3() { | |
507 | - return userDef3; | |
508 | - } | |
509 | - | |
510 | - /** | |
511 | - * 设置自定义字段3 | |
512 | - * | |
513 | - * @param userDef3 自定义字段3 | |
514 | - */ | |
515 | - public void setUserDef3(String userDef3) { | |
516 | - this.userDef3 = userDef3; | |
517 | - } | |
518 | - | |
519 | - /** | |
520 | - * 获取自定义字段4 | |
521 | - * | |
522 | - * @return userDef4 - 自定义字段4 | |
523 | - */ | |
524 | - public String getUserDef4() { | |
525 | - return userDef4; | |
526 | - } | |
527 | - | |
528 | - /** | |
529 | - * 设置自定义字段4 | |
530 | - * | |
531 | - * @param userDef4 自定义字段4 | |
532 | - */ | |
533 | - public void setUserDef4(String userDef4) { | |
534 | - this.userDef4 = userDef4; | |
535 | - } | |
536 | - | |
537 | - /** | |
538 | - * 获取自定义字段5 | |
539 | - * | |
540 | - * @return userDef5 - 自定义字段5 | |
541 | - */ | |
542 | - public String getUserDef5() { | |
543 | - return userDef5; | |
544 | - } | |
545 | - | |
546 | - /** | |
547 | - * 设置自定义字段5 | |
548 | - * | |
549 | - * @param userDef5 自定义字段5 | |
550 | - */ | |
551 | - public void setUserDef5(String userDef5) { | |
552 | - this.userDef5 = userDef5; | |
553 | - } | |
554 | - | |
555 | - /** | |
556 | - * 获取自定义字段6 | |
557 | - * | |
558 | - * @return userDef6 - 自定义字段6 | |
559 | - */ | |
560 | - public String getUserDef6() { | |
561 | - return userDef6; | |
562 | - } | |
563 | - | |
564 | - /** | |
565 | - * 设置自定义字段6 | |
566 | - * | |
567 | - * @param userDef6 自定义字段6 | |
568 | - */ | |
569 | - public void setUserDef6(String userDef6) { | |
570 | - this.userDef6 = userDef6; | |
571 | - } | |
572 | - | |
573 | - /** | |
574 | - * 获取自定义字段7 | |
575 | - * | |
576 | - * @return userDef7 - 自定义字段7 | |
577 | - */ | |
578 | - public String getUserDef7() { | |
579 | - return userDef7; | |
580 | - } | |
581 | - | |
582 | - /** | |
583 | - * 设置自定义字段7 | |
584 | - * | |
585 | - * @param userDef7 自定义字段7 | |
586 | - */ | |
587 | - public void setUserDef7(String userDef7) { | |
588 | - this.userDef7 = userDef7; | |
589 | - } | |
590 | - | |
591 | - /** | |
592 | - * 获取自定义字段8 | |
593 | - * | |
594 | - * @return userDef8 - 自定义字段8 | |
595 | - */ | |
596 | - public String getUserDef8() { | |
597 | - return userDef8; | |
598 | - } | |
599 | - | |
600 | - /** | |
601 | - * 设置自定义字段8 | |
602 | - * | |
603 | - * @param userDef8 自定义字段8 | |
604 | - */ | |
605 | - public void setUserDef8(String userDef8) { | |
606 | - this.userDef8 = userDef8; | |
607 | - } | |
608 | - | |
609 | - @Override | |
610 | - public String toString() { | |
611 | - StringBuilder sb = new StringBuilder(); | |
612 | - sb.append(getClass().getSimpleName()); | |
613 | - sb.append(" ["); | |
614 | - sb.append("Hash = ").append(hashCode()); | |
615 | - sb.append(", id=").append(id); | |
616 | - sb.append(", materialCode=").append(materialCode); | |
617 | - sb.append(", materialName=").append(materialName); | |
618 | - sb.append(", materialSpec=").append(materialSpec); | |
619 | - sb.append(", companyCode=").append(companyCode); | |
620 | - sb.append(", warehouseCode=").append(warehouseCode); | |
621 | - sb.append(", unit=").append(unit); | |
622 | - sb.append(", sequence=").append(sequence); | |
623 | - sb.append(", enable=").append(enable); | |
624 | - sb.append(", created=").append(created); | |
625 | - sb.append(", createdBy=").append(createdBy); | |
626 | - sb.append(", lastUpdated=").append(lastUpdated); | |
627 | - sb.append(", lastUpdatedBy=").append(lastUpdatedBy); | |
628 | - sb.append(", version=").append(version); | |
629 | - sb.append(", userDef1=").append(userDef1); | |
630 | - sb.append(", userDef2=").append(userDef2); | |
631 | - sb.append(", userDef3=").append(userDef3); | |
632 | - sb.append(", userDef4=").append(userDef4); | |
633 | - sb.append(", userDef5=").append(userDef5); | |
634 | - sb.append(", userDef6=").append(userDef6); | |
635 | - sb.append(", userDef7=").append(userDef7); | |
636 | - sb.append(", userDef8=").append(userDef8); | |
637 | - sb.append("]"); | |
638 | - return sb.toString(); | |
639 | - } | |
640 | -} | |
641 | 0 | \ No newline at end of file |
src/main/java/com/huaheng/pc/general/materialUnit/service/MaterialUnitService.java deleted
1 | -package com.huaheng.pc.general.materialUnit.service; | |
2 | - | |
3 | -import com.huaheng.pc.general.materialUnit.domain.MaterialUnit; | |
4 | -import com.baomidou.mybatisplus.extension.service.IService; | |
5 | - | |
6 | -import java.util.List; | |
7 | -import java.util.Map; | |
8 | - | |
9 | -public interface MaterialUnitService extends IService<MaterialUnit>{ | |
10 | - | |
11 | - public List<Map<String, Object>> getUnit(); | |
12 | - | |
13 | -} |
src/main/java/com/huaheng/pc/general/materialUnit/service/MaterialUnitServiceImpl.java deleted
1 | -package com.huaheng.pc.general.materialUnit.service; | |
2 | - | |
3 | -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; | |
4 | -import com.baomidou.mybatisplus.core.toolkit.Wrappers; | |
5 | -import org.springframework.stereotype.Service; | |
6 | -import javax.annotation.Resource; | |
7 | -import java.util.List; | |
8 | -import java.util.Map; | |
9 | - | |
10 | -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; | |
11 | -import com.huaheng.pc.general.materialUnit.domain.MaterialUnit; | |
12 | -import com.huaheng.pc.general.materialUnit.mapper.MaterialUnitMapper; | |
13 | -import com.huaheng.pc.general.materialUnit.service.MaterialUnitService; | |
14 | -@Service("materialUnitService") | |
15 | -public class MaterialUnitServiceImpl extends ServiceImpl<MaterialUnitMapper, MaterialUnit> implements MaterialUnitService{ | |
16 | - | |
17 | - @Override | |
18 | - public List<Map<String, Object>> getUnit(){ | |
19 | - LambdaQueryWrapper<MaterialUnit> lambda = Wrappers.lambdaQuery(); | |
20 | - return this.listMaps(lambda); | |
21 | - } | |
22 | -} |
src/main/java/com/huaheng/pc/general/warehouse/controller/WareHouseController.java
... | ... | @@ -17,7 +17,6 @@ import com.huaheng.framework.web.page.TableSupport; |
17 | 17 | import com.huaheng.pc.general.company.service.CompanyService; |
18 | 18 | import com.huaheng.pc.general.warehouse.service.WarehouseService; |
19 | 19 | import com.huaheng.pc.general.warehouse.domain.Warehouse; |
20 | -import com.huaheng.pc.inventory.inventoryHeader.domain.InventoryHeader; | |
21 | 20 | import com.huaheng.pc.inventory.inventoryHeader.service.InventoryHeaderService; |
22 | 21 | import com.huaheng.pc.system.dict.service.IDictDataService; |
23 | 22 | import com.huaheng.pc.system.dict.service.IDictTypeService; |
... | ... |
src/main/java/com/huaheng/pc/inventory/inventoryDetail/domain/InventoryDetail.java
... | ... | @@ -4,339 +4,302 @@ import com.baomidou.mybatisplus.annotation.IdType; |
4 | 4 | import com.baomidou.mybatisplus.annotation.TableField; |
5 | 5 | import com.baomidou.mybatisplus.annotation.TableId; |
6 | 6 | import com.baomidou.mybatisplus.annotation.TableName; |
7 | +import io.swagger.annotations.ApiModel; | |
8 | +import io.swagger.annotations.ApiModelProperty; | |
7 | 9 | import java.io.Serializable; |
8 | -import java.math.BigDecimal; | |
9 | 10 | import java.util.Date; |
10 | 11 | import lombok.Data; |
11 | 12 | |
13 | +@ApiModel(value="com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail") | |
12 | 14 | @Data |
13 | 15 | @TableName(value = "inventory_detail") |
14 | 16 | public class InventoryDetail implements Serializable { |
15 | 17 | /** |
16 | 18 | * ID |
17 | 19 | */ |
18 | - @TableId(value = "id", type = IdType.AUTO) | |
20 | + @TableId(value = "id", type = IdType.AUTO) | |
21 | + @ApiModelProperty(value="ID") | |
19 | 22 | private Integer id; |
20 | 23 | |
21 | - /** | |
22 | - * 库存头ID | |
23 | - * */ | |
24 | + /** | |
25 | + * 库存头ID | |
26 | + */ | |
24 | 27 | @TableField(value = "inventoryHeaderId") |
28 | + @ApiModelProperty(value="库存头ID") | |
25 | 29 | private Integer inventoryHeaderId; |
26 | 30 | |
27 | 31 | /** |
28 | 32 | * 仓库 |
29 | 33 | */ |
30 | 34 | @TableField(value = "warehouseCode") |
35 | + @ApiModelProperty(value="仓库") | |
31 | 36 | private String warehouseCode; |
32 | 37 | |
33 | 38 | /** |
34 | 39 | * 货主 |
35 | 40 | */ |
36 | 41 | @TableField(value = "companyCode") |
42 | + @ApiModelProperty(value="货主") | |
37 | 43 | private String companyCode; |
38 | 44 | |
39 | 45 | /** |
40 | 46 | * 货位 |
41 | 47 | */ |
42 | 48 | @TableField(value = "locationCode") |
49 | + @ApiModelProperty(value="货位") | |
43 | 50 | private String locationCode; |
44 | 51 | |
45 | 52 | /** |
46 | 53 | * 容器 |
47 | 54 | */ |
48 | 55 | @TableField(value = "containerCode") |
56 | + @ApiModelProperty(value="容器") | |
49 | 57 | private String containerCode; |
50 | 58 | |
51 | 59 | /** |
52 | 60 | * 商品编码 |
53 | 61 | */ |
54 | 62 | @TableField(value = "materialCode") |
63 | + @ApiModelProperty(value="商品编码") | |
55 | 64 | private String materialCode; |
56 | 65 | |
57 | 66 | /** |
58 | 67 | * 商品名称 |
59 | 68 | */ |
60 | 69 | @TableField(value = "materialName") |
70 | + @ApiModelProperty(value="商品名称") | |
61 | 71 | private String materialName; |
62 | 72 | |
63 | 73 | /** |
64 | 74 | * 商品规格 |
65 | 75 | */ |
66 | 76 | @TableField(value = "materialSpec") |
77 | + @ApiModelProperty(value="商品规格") | |
67 | 78 | private String materialSpec; |
68 | 79 | |
69 | 80 | /** |
70 | 81 | * 商品单位 |
71 | 82 | */ |
72 | 83 | @TableField(value = "materialUnit") |
84 | + @ApiModelProperty(value="商品单位") | |
73 | 85 | private String materialUnit; |
74 | 86 | |
75 | 87 | /** |
76 | 88 | * 在库数量 |
77 | 89 | */ |
78 | 90 | @TableField(value = "qty") |
79 | - private BigDecimal qty; | |
91 | + @ApiModelProperty(value="在库数量") | |
92 | + private Long qty; | |
80 | 93 | |
81 | 94 | /** |
82 | 95 | * 任务数量 |
83 | 96 | */ |
84 | 97 | @TableField(value = "taskQty") |
85 | - private BigDecimal taskQty; | |
98 | + @ApiModelProperty(value="任务数量") | |
99 | + private Long taskQty; | |
86 | 100 | |
87 | 101 | /** |
88 | 102 | * 冻结数量 |
89 | 103 | */ |
90 | 104 | @TableField(value = "lockedQty") |
91 | - private BigDecimal lockedQty; | |
105 | + @ApiModelProperty(value="冻结数量") | |
106 | + private Long lockedQty; | |
92 | 107 | |
93 | 108 | /** |
94 | 109 | * 库存状态 |
95 | 110 | */ |
96 | 111 | @TableField(value = "inventorySts") |
112 | + @ApiModelProperty(value="库存状态") | |
97 | 113 | private String inventorySts; |
98 | 114 | |
99 | 115 | /** |
100 | - * 关联上游单号 | |
116 | + * 供应商编码 | |
101 | 117 | */ |
102 | - @TableField(value = "referCode") | |
103 | - private String referCode; | |
118 | + @TableField(value = "supplierCode") | |
119 | + @ApiModelProperty(value="供应商编码") | |
120 | + private String supplierCode; | |
104 | 121 | |
105 | 122 | /** |
106 | - * 关联上游单号标识 | |
123 | + * 关联上游单号 | |
107 | 124 | */ |
108 | - @TableField(value = "referId") | |
109 | - private String referId; | |
125 | + @TableField(value = "referCode") | |
126 | + @ApiModelProperty(value="关联上游单号") | |
127 | + private String referCode; | |
110 | 128 | |
111 | 129 | /** |
112 | 130 | * 关联上游单号的行号 |
113 | 131 | */ |
114 | 132 | @TableField(value = "referDetailId") |
133 | + @ApiModelProperty(value="关联上游单号的行号") | |
115 | 134 | private String referDetailId; |
116 | 135 | |
117 | 136 | /** |
118 | 137 | * 批次 |
119 | 138 | */ |
120 | 139 | @TableField(value = "batch") |
140 | + @ApiModelProperty(value="批次") | |
121 | 141 | private String batch; |
122 | 142 | |
123 | 143 | /** |
124 | 144 | * 批号 |
125 | 145 | */ |
126 | 146 | @TableField(value = "lot") |
147 | + @ApiModelProperty(value="批号") | |
127 | 148 | private String lot; |
128 | 149 | |
129 | 150 | /** |
130 | 151 | * 项目号 |
131 | 152 | */ |
132 | 153 | @TableField(value = "projectNo") |
154 | + @ApiModelProperty(value="项目号") | |
133 | 155 | private String projectNo; |
134 | 156 | |
135 | 157 | /** |
136 | 158 | * 质检 |
137 | 159 | */ |
138 | 160 | @TableField(value = "qcCheck") |
161 | + @ApiModelProperty(value="质检") | |
139 | 162 | private String qcCheck; |
140 | 163 | |
141 | 164 | /** |
142 | 165 | * 重量 |
143 | 166 | */ |
144 | 167 | @TableField(value = "weight") |
168 | + @ApiModelProperty(value="重量") | |
145 | 169 | private String weight; |
146 | 170 | |
147 | 171 | /** |
148 | 172 | * 生产日期 |
149 | 173 | */ |
150 | 174 | @TableField(value = "manufactureDate") |
175 | + @ApiModelProperty(value="生产日期") | |
151 | 176 | private Date manufactureDate; |
152 | 177 | |
153 | 178 | /** |
154 | 179 | * 失效日期 |
155 | 180 | */ |
156 | 181 | @TableField(value = "expirationDate") |
182 | + @ApiModelProperty(value="失效日期") | |
157 | 183 | private Date expirationDate; |
158 | 184 | |
159 | 185 | /** |
160 | 186 | * 入库日期 |
161 | 187 | */ |
162 | 188 | @TableField(value = "agingDate") |
189 | + @ApiModelProperty(value="入库日期") | |
163 | 190 | private Date agingDate; |
164 | 191 | |
165 | 192 | /** |
166 | 193 | * 属性号 |
167 | 194 | */ |
168 | 195 | @TableField(value = "attributeId") |
169 | - private Integer attributeId; | |
196 | + @ApiModelProperty(value="属性号") | |
197 | + private String attributeId; | |
170 | 198 | |
171 | 199 | /** |
172 | 200 | * 属性1 |
173 | 201 | */ |
174 | 202 | @TableField(value = "attribute1") |
203 | + @ApiModelProperty(value="属性1") | |
175 | 204 | private String attribute1; |
176 | 205 | |
177 | 206 | /** |
178 | 207 | * 属性2 |
179 | 208 | */ |
180 | 209 | @TableField(value = "attribute2") |
210 | + @ApiModelProperty(value="属性2") | |
181 | 211 | private String attribute2; |
182 | 212 | |
183 | 213 | /** |
184 | 214 | * 属性3 |
185 | 215 | */ |
186 | 216 | @TableField(value = "attribute3") |
217 | + @ApiModelProperty(value="属性3") | |
187 | 218 | private String attribute3; |
188 | 219 | |
189 | 220 | /** |
190 | - * 属性4 | |
191 | - */ | |
192 | - @TableField(value = "attribute4") | |
193 | - private String attribute4; | |
194 | - | |
195 | - /** | |
196 | - * 锁 | |
221 | + * 锁 (质检、出库、盘点这三个都可能锁定库存) | |
197 | 222 | */ |
198 | 223 | @TableField(value = "lockCode") |
224 | + @ApiModelProperty(value="锁 (质检、出库、盘点这三个都可能锁定库存)") | |
199 | 225 | private String lockCode; |
200 | 226 | |
201 | 227 | /** |
202 | 228 | * 上次盘点日期 |
203 | 229 | */ |
204 | 230 | @TableField(value = "lastCycleCountDate") |
231 | + @ApiModelProperty(value="上次盘点日期") | |
205 | 232 | private Date lastCycleCountDate; |
206 | 233 | |
207 | 234 | /** |
208 | 235 | * 创建时间 |
209 | 236 | */ |
210 | 237 | @TableField(value = "created") |
238 | + @ApiModelProperty(value="创建时间") | |
211 | 239 | private Date created; |
212 | 240 | |
213 | 241 | /** |
214 | 242 | * 创建用户 |
215 | 243 | */ |
216 | 244 | @TableField(value = "createdBy") |
245 | + @ApiModelProperty(value="创建用户") | |
217 | 246 | private String createdBy; |
218 | 247 | |
219 | 248 | /** |
220 | 249 | * 创建时间 |
221 | 250 | */ |
222 | 251 | @TableField(value = "lastUpdated") |
252 | + @ApiModelProperty(value="创建时间") | |
223 | 253 | private Date lastUpdated; |
224 | 254 | |
225 | 255 | /** |
226 | 256 | * 更新用户 |
227 | 257 | */ |
228 | 258 | @TableField(value = "lastUpdatedBy") |
259 | + @ApiModelProperty(value="更新用户") | |
229 | 260 | private String lastUpdatedBy; |
230 | 261 | |
231 | 262 | /** |
232 | - * 数据版本 | |
233 | - */ | |
234 | - @TableField(value = "version") | |
235 | - private Integer version; | |
236 | - | |
237 | - /** | |
238 | 263 | * 自定义字段1 |
239 | 264 | */ |
240 | 265 | @TableField(value = "userDef1") |
266 | + @ApiModelProperty(value="自定义字段1") | |
241 | 267 | private String userDef1; |
242 | 268 | |
243 | 269 | /** |
244 | 270 | * 自定义字段2 |
245 | 271 | */ |
246 | 272 | @TableField(value = "userDef2") |
273 | + @ApiModelProperty(value="自定义字段2") | |
247 | 274 | private String userDef2; |
248 | 275 | |
249 | 276 | /** |
250 | 277 | * 自定义字段3 |
251 | 278 | */ |
252 | 279 | @TableField(value = "userDef3") |
280 | + @ApiModelProperty(value="自定义字段3") | |
253 | 281 | private String userDef3; |
254 | 282 | |
255 | 283 | /** |
256 | 284 | * 处理标记 |
257 | 285 | */ |
258 | 286 | @TableField(value = "processStamp") |
287 | + @ApiModelProperty(value="处理标记") | |
259 | 288 | private String processStamp; |
260 | 289 | |
261 | - private static final long serialVersionUID = 1L; | |
262 | - | |
263 | - public static final String COL_INVENTORYHEADERID = "inventoryHeaderId"; | |
264 | - | |
265 | - public static final String COL_WAREHOUSECODE = "warehouseCode"; | |
266 | - | |
267 | - public static final String COL_COMPANYCODE = "companyCode"; | |
268 | - | |
269 | - public static final String COL_LOCATIONCODE = "locationCode"; | |
270 | - | |
271 | - public static final String COL_CONTAINERCODE = "containerCode"; | |
272 | - | |
273 | - public static final String COL_MATERIALCODE = "materialCode"; | |
274 | - | |
275 | - public static final String COL_MATERIALNAME = "materialName"; | |
276 | - | |
277 | - public static final String COL_MATERIALSPEC = "materialSpec"; | |
278 | - | |
279 | - public static final String COL_MATERIALUNIT = "materialUnit"; | |
280 | - | |
281 | - public static final String COL_QTY = "qty"; | |
282 | - | |
283 | - public static final String COL_TASKQTY = "taskQty"; | |
284 | - | |
285 | - public static final String COL_LOCKEDQTY = "lockedQty"; | |
286 | - | |
287 | - public static final String COL_INVENTORYSTS = "inventorySts"; | |
288 | - | |
289 | - public static final String COL_REFERCODE = "referCode"; | |
290 | - | |
291 | - public static final String COL_REFERID = "referId"; | |
292 | - | |
293 | - public static final String COL_REFERDETAILID = "referDetailId"; | |
294 | - | |
295 | - public static final String COL_BATCH = "batch"; | |
296 | - | |
297 | - public static final String COL_LOT = "lot"; | |
298 | - | |
299 | - public static final String COL_PROJECTNO = "projectNo"; | |
300 | - | |
301 | - public static final String COL_QCCHECK = "qcCheck"; | |
302 | - | |
303 | - public static final String COL_WEIGHT = "weight"; | |
304 | - | |
305 | - public static final String COL_MANUFACTUREDATE = "manufactureDate"; | |
306 | - | |
307 | - public static final String COL_EXPIRATIONDATE = "expirationDate"; | |
308 | - | |
309 | - public static final String COL_AGINGDATE = "agingDate"; | |
310 | - | |
311 | - public static final String COL_ATTRIBUTEID = "attributeId"; | |
312 | - | |
313 | - public static final String COL_ATTRIBUTE1 = "attribute1"; | |
314 | - | |
315 | - public static final String COL_ATTRIBUTE2 = "attribute2"; | |
316 | - | |
317 | - public static final String COL_ATTRIBUTE3 = "attribute3"; | |
318 | - | |
319 | - public static final String COL_ATTRIBUTE4 = "attribute4"; | |
320 | - | |
321 | - public static final String COL_LOCKCODE = "lockCode"; | |
322 | - | |
323 | - public static final String COL_LASTCYCLECOUNTDATE = "lastCycleCountDate"; | |
324 | - | |
325 | - public static final String COL_CREATED = "created"; | |
326 | - | |
327 | - public static final String COL_CREATEDBY = "createdBy"; | |
328 | - | |
329 | - public static final String COL_LASTUPDATED = "lastUpdated"; | |
330 | - | |
331 | - public static final String COL_LASTUPDATEDBY = "lastUpdatedBy"; | |
332 | - | |
333 | - public static final String COL_VERSION = "version"; | |
334 | - | |
335 | - public static final String COL_USERDEF1 = "userDef1"; | |
336 | - | |
337 | - public static final String COL_USERDEF2 = "userDef2"; | |
290 | + /** | |
291 | + * 入库单编码 | |
292 | + */ | |
293 | + @TableField(value = "receiptCode") | |
294 | + @ApiModelProperty(value="入库单编码") | |
295 | + private String receiptCode; | |
338 | 296 | |
339 | - public static final String COL_USERDEF3 = "userDef3"; | |
297 | + /** | |
298 | + * 入库单明细ID | |
299 | + */ | |
300 | + @TableField(value = "receiptDetailId") | |
301 | + @ApiModelProperty(value="入库单明细ID") | |
302 | + private Integer receiptDetailId; | |
340 | 303 | |
341 | - public static final String COL_PROCESSSTAMP = "processStamp"; | |
304 | + private static final long serialVersionUID = 1L; | |
342 | 305 | } |
343 | 306 | \ No newline at end of file |
... | ... |
src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailService.java
1 | 1 | package com.huaheng.pc.inventory.inventoryDetail.service; |
2 | 2 | |
3 | -import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail; | |
4 | 3 | import com.baomidou.mybatisplus.extension.service.IService; |
5 | -public interface InventoryDetailService extends IService<InventoryDetail>{ | |
4 | + | |
5 | +public interface InventoryDetailService extends IService<InventoryDetail> { | |
6 | 6 | |
7 | 7 | |
8 | 8 | } |
9 | + | |
10 | + | |
... | ... |
src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java
1 | 1 | package com.huaheng.pc.inventory.inventoryDetail.service; |
2 | 2 | |
3 | 3 | import org.springframework.stereotype.Service; |
4 | -import javax.annotation.Resource; | |
5 | -import java.util.List; | |
6 | 4 | import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
7 | -import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail; | |
8 | 5 | import com.huaheng.pc.inventory.inventoryDetail.mapper.InventoryDetailMapper; |
9 | -import com.huaheng.pc.inventory.inventoryDetail.service.InventoryDetailService; | |
6 | + | |
10 | 7 | @Service |
11 | -public class InventoryDetailServiceImpl extends ServiceImpl<InventoryDetailMapper, InventoryDetail> implements InventoryDetailService{ | |
8 | +public class InventoryDetailServiceImpl extends ServiceImpl<InventoryDetailMapper, InventoryDetail> implements InventoryDetailService { | |
12 | 9 | |
13 | 10 | } |
11 | + | |
12 | + | |
... | ... |
src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java
... | ... | @@ -14,7 +14,6 @@ import com.huaheng.framework.web.page.PageDomain; |
14 | 14 | import com.huaheng.framework.web.page.TableDataInfo; |
15 | 15 | import com.huaheng.framework.web.page.TableSupport; |
16 | 16 | import com.huaheng.pc.general.material.service.MaterialServiceImpl; |
17 | -import com.huaheng.pc.inventory.inventoryHeader.domain.InventoryHeader; | |
18 | 17 | import com.huaheng.pc.inventory.inventoryHeader.service.InventoryHeaderService; |
19 | 18 | import org.apache.shiro.authz.annotation.RequiresPermissions; |
20 | 19 | import org.springframework.stereotype.Controller; |
... | ... |
src/main/java/com/huaheng/pc/inventory/inventoryHeader/domain/InventoryHeader.java
... | ... | @@ -4,15 +4,13 @@ import com.baomidou.mybatisplus.annotation.IdType; |
4 | 4 | import com.baomidou.mybatisplus.annotation.TableField; |
5 | 5 | import com.baomidou.mybatisplus.annotation.TableId; |
6 | 6 | import com.baomidou.mybatisplus.annotation.TableName; |
7 | +import io.swagger.annotations.ApiModel; | |
8 | +import io.swagger.annotations.ApiModelProperty; | |
7 | 9 | import java.io.Serializable; |
8 | 10 | import java.util.Date; |
9 | - | |
10 | -import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail; | |
11 | 11 | import lombok.Data; |
12 | 12 | |
13 | -/** | |
14 | - * 库存主表实体类 | |
15 | - */ | |
13 | +@ApiModel(value="com.huaheng.pc.inventory.inventoryHeader.domain.InventoryHeader") | |
16 | 14 | @Data |
17 | 15 | @TableName(value = "inventory_header") |
18 | 16 | public class InventoryHeader implements Serializable { |
... | ... | @@ -20,186 +18,169 @@ public class InventoryHeader implements Serializable { |
20 | 18 | * ID |
21 | 19 | */ |
22 | 20 | @TableId(value = "id", type = IdType.AUTO) |
21 | + @ApiModelProperty(value="ID") | |
23 | 22 | private Integer id; |
24 | 23 | |
25 | 24 | /** |
26 | 25 | * 仓库 |
27 | 26 | */ |
28 | 27 | @TableField(value = "warehouseCode") |
28 | + @ApiModelProperty(value="仓库") | |
29 | 29 | private String warehouseCode; |
30 | 30 | |
31 | 31 | /** |
32 | 32 | * 货位 |
33 | 33 | */ |
34 | 34 | @TableField(value = "locationCode") |
35 | + @ApiModelProperty(value="货位") | |
35 | 36 | private String locationCode; |
36 | 37 | |
37 | 38 | /** |
38 | 39 | * 容器 |
39 | 40 | */ |
40 | 41 | @TableField(value = "containerCode") |
42 | + @ApiModelProperty(value="容器") | |
41 | 43 | private String containerCode; |
42 | 44 | |
43 | 45 | /** |
44 | 46 | * 容器状态 |
45 | 47 | */ |
46 | 48 | @TableField(value = "containerStatus") |
49 | + @ApiModelProperty(value="容器状态") | |
47 | 50 | private String containerStatus; |
48 | 51 | |
49 | 52 | /** |
50 | 53 | * 货主 |
51 | 54 | */ |
52 | 55 | @TableField(value = "companyCode") |
56 | + @ApiModelProperty(value="货主") | |
53 | 57 | private String companyCode; |
54 | 58 | |
55 | - | |
56 | 59 | /** |
57 | 60 | * 商品种类的数量 |
58 | 61 | */ |
59 | 62 | @TableField(value = "materialSkuQty") |
63 | + @ApiModelProperty(value="商品种类的数量") | |
60 | 64 | private String materialSkuQty; |
61 | 65 | |
62 | 66 | /** |
63 | 67 | * 总重量 |
64 | - * */ | |
68 | + */ | |
65 | 69 | @TableField(value = "totalWeight") |
70 | + @ApiModelProperty(value="总重量") | |
66 | 71 | private String totalWeight; |
67 | 72 | |
68 | 73 | /** |
69 | 74 | * 总数量 |
70 | 75 | */ |
71 | 76 | @TableField(value = "totalQty") |
77 | + @ApiModelProperty(value="总数量") | |
72 | 78 | private Integer totalQty; |
73 | 79 | |
74 | 80 | /** |
75 | - * 总行数 | |
81 | + * 总行量 | |
76 | 82 | */ |
77 | 83 | @TableField(value = "totalLines") |
84 | + @ApiModelProperty(value="总行量") | |
78 | 85 | private Integer totalLines; |
79 | 86 | |
80 | 87 | /** |
81 | 88 | * 项目号列表 |
82 | 89 | */ |
83 | 90 | @TableField(value = "projectNos") |
91 | + @ApiModelProperty(value="项目号列表") | |
84 | 92 | private String projectNos; |
85 | 93 | |
86 | 94 | /** |
87 | 95 | * 批次列表 |
88 | 96 | */ |
89 | 97 | @TableField(value = "batchs") |
98 | + @ApiModelProperty(value="批次列表") | |
90 | 99 | private String batchs; |
91 | 100 | |
92 | 101 | /** |
93 | 102 | * 批号列表 |
94 | 103 | */ |
95 | 104 | @TableField(value = "lots") |
105 | + @ApiModelProperty(value="批号列表") | |
96 | 106 | private String lots; |
97 | 107 | |
98 | 108 | /** |
99 | - * 上次盘点日期 | |
109 | + * 锁定 1:锁定 | |
110 | + */ | |
111 | + @TableField(value = "lock") | |
112 | + @ApiModelProperty(value="锁定 1:锁定") | |
113 | + private Integer lock; | |
114 | + | |
115 | + /** | |
116 | + * 锁定备注 | |
100 | 117 | */ |
101 | - @TableField(value = "lastCycleCountDate") | |
102 | - private Date lastCycleCountDate; | |
118 | + @TableField(value = "lockRemark") | |
119 | + @ApiModelProperty(value="锁定备注") | |
120 | + private String lockRemark; | |
103 | 121 | |
104 | 122 | /** |
105 | - * 状态 | |
123 | + * 状态,0正常 | |
106 | 124 | */ |
107 | 125 | @TableField(value = "enable") |
126 | + @ApiModelProperty(value="状态,0正常") | |
108 | 127 | private Integer enable; |
109 | 128 | |
110 | 129 | /** |
111 | 130 | * 创建时间 |
112 | 131 | */ |
113 | 132 | @TableField(value = "created") |
133 | + @ApiModelProperty(value="创建时间") | |
114 | 134 | private Date created; |
115 | 135 | |
116 | 136 | /** |
117 | 137 | * 创建用户 |
118 | 138 | */ |
119 | 139 | @TableField(value = "createdBy") |
140 | + @ApiModelProperty(value="创建用户") | |
120 | 141 | private String createdBy; |
121 | 142 | |
122 | 143 | /** |
123 | - * 创建时间 | |
144 | + * 更新时间 | |
124 | 145 | */ |
125 | 146 | @TableField(value = "lastUpdated") |
147 | + @ApiModelProperty(value="更新时间") | |
126 | 148 | private Date lastUpdated; |
127 | 149 | |
128 | 150 | /** |
129 | 151 | * 更新用户 |
130 | 152 | */ |
131 | 153 | @TableField(value = "lastUpdatedBy") |
154 | + @ApiModelProperty(value="更新用户") | |
132 | 155 | private String lastUpdatedBy; |
133 | 156 | |
134 | 157 | /** |
135 | 158 | * 数据版本 |
136 | 159 | */ |
137 | 160 | @TableField(value = "version") |
161 | + @ApiModelProperty(value="数据版本") | |
138 | 162 | private Integer version; |
139 | 163 | |
140 | 164 | /** |
141 | 165 | * 自定义字段1 |
142 | 166 | */ |
143 | 167 | @TableField(value = "userDef1") |
168 | + @ApiModelProperty(value="自定义字段1") | |
144 | 169 | private String userDef1; |
145 | 170 | |
146 | 171 | /** |
147 | 172 | * 自定义字段2 |
148 | 173 | */ |
149 | 174 | @TableField(value = "userDef2") |
175 | + @ApiModelProperty(value="自定义字段2") | |
150 | 176 | private String userDef2; |
151 | 177 | |
152 | 178 | /** |
153 | 179 | * 自定义字段3 |
154 | 180 | */ |
155 | 181 | @TableField(value = "userDef3") |
182 | + @ApiModelProperty(value="自定义字段3") | |
156 | 183 | private String userDef3; |
157 | 184 | |
158 | - | |
159 | 185 | private static final long serialVersionUID = 1L; |
160 | - | |
161 | - public static final String COL_WAREHOUSECODE = "warehouseCode"; | |
162 | - | |
163 | - public static final String COL_LOCATIONCODE = "locationCode"; | |
164 | - | |
165 | - public static final String COL_CONTAINERCODE = "containerCode"; | |
166 | - | |
167 | - public static final String COL_CONTAINERSTATUS = "containerStatus"; | |
168 | - | |
169 | - public static final String COL_COMPANYCODE = "companyCode"; | |
170 | - | |
171 | - public static final String COL_MATERIALSKUQTY = "materialSkuQty"; | |
172 | - | |
173 | - public static final String COL_TOTALWEIGHT ="totalWeight"; | |
174 | - | |
175 | - public static final String COL_TOTALQTY = "totalQty"; | |
176 | - | |
177 | - public static final String COL_TOTALLINES = "totalLines"; | |
178 | - | |
179 | - public static final String COL_PROJECTNOS = "projectNos"; | |
180 | - | |
181 | - public static final String COL_BATCHS = "batchs"; | |
182 | - | |
183 | - public static final String COL_LOTS = "lots"; | |
184 | - | |
185 | - public static final String COL_LASTCYCLECOUNTDATE = "lastCycleCountDate"; | |
186 | - | |
187 | - public static final String COL_ENABLE = "enable"; | |
188 | - | |
189 | - public static final String COL_CREATED = "created"; | |
190 | - | |
191 | - public static final String COL_CREATEDBY = "createdBy"; | |
192 | - | |
193 | - public static final String COL_LASTUPDATED = "lastUpdated"; | |
194 | - | |
195 | - public static final String COL_LASTUPDATEDBY = "lastUpdatedBy"; | |
196 | - | |
197 | - public static final String COL_VERSION = "version"; | |
198 | - | |
199 | - public static final String COL_USERDEF1 = "userDef1"; | |
200 | - | |
201 | - public static final String COL_USERDEF2 = "userDef2"; | |
202 | - | |
203 | - public static final String COL_USERDEF3 = "userDef3"; | |
204 | - | |
205 | 186 | } |
206 | 187 | \ No newline at end of file |
... | ... |
src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java
1 | 1 | package com.huaheng.pc.inventory.inventoryHeader.service; |
2 | 2 | |
3 | -import com.huaheng.pc.inventory.inventoryHeader.domain.InventoryHeader; | |
4 | 3 | import com.baomidou.mybatisplus.extension.service.IService; |
5 | 4 | import org.springframework.stereotype.Service; |
6 | 5 | |
7 | 6 | @Service |
8 | -public interface InventoryHeaderService extends IService<InventoryHeader>{ | |
7 | +public interface InventoryHeaderService extends IService<InventoryHeader> { | |
9 | 8 | |
10 | 9 | |
10 | +} | |
11 | + | |
11 | 12 | |
12 | 13 | |
13 | -} | |
... | ... |
src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java
... | ... | @@ -3,9 +3,11 @@ package com.huaheng.pc.inventory.inventoryHeader.service; |
3 | 3 | import org.springframework.stereotype.Service; |
4 | 4 | import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
5 | 5 | import com.huaheng.pc.inventory.inventoryHeader.mapper.InventoryHeaderMapper; |
6 | -import com.huaheng.pc.inventory.inventoryHeader.domain.InventoryHeader; | |
7 | 6 | |
8 | 7 | @Service |
9 | -public class InventoryHeaderServiceImpl extends ServiceImpl<InventoryHeaderMapper, InventoryHeader> implements InventoryHeaderService{ | |
8 | +public class InventoryHeaderServiceImpl extends ServiceImpl<InventoryHeaderMapper, InventoryHeader> implements InventoryHeaderService { | |
10 | 9 | |
11 | 10 | } |
11 | + | |
12 | + | |
13 | + | |
... | ... |
src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java
... | ... | @@ -9,14 +9,12 @@ import com.huaheng.pc.general.location.domain.Location; |
9 | 9 | import com.huaheng.pc.general.location.service.LocationService; |
10 | 10 | import com.huaheng.pc.general.material.domain.Material; |
11 | 11 | import com.huaheng.pc.general.material.service.MaterialService; |
12 | -import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail; | |
13 | 12 | import com.huaheng.pc.inventory.inventoryDetail.service.InventoryDetailService; |
14 | 13 | import com.huaheng.pc.shipment.shipmentContainerDetail.domain.ShipmentContainerDetail; |
15 | 14 | import com.huaheng.pc.shipment.shipmentContainerDetail.service.ShipmentContainerDetailService; |
16 | 15 | import com.huaheng.pc.shipment.shipmentContainerHeader.domain.ShipmentCombinationModel; |
17 | 16 | import com.huaheng.pc.shipment.shipmentDetail.domain.ShipmentDetail; |
18 | 17 | import com.huaheng.pc.shipment.shipmentDetail.service.ShipmentDetailService; |
19 | -import com.huaheng.pc.shipment.shipmentHeader.domain.ShipmentHeader; | |
20 | 18 | import com.huaheng.pc.shipment.shipmentHeader.service.ShipmentHeaderService; |
21 | 19 | import com.huaheng.pc.shipment.shippingCombination.domain.ShippingSearch; |
22 | 20 | import com.huaheng.pc.shipment.shippingCombination.service.ShippingCombinationService; |
... | ... | @@ -31,7 +29,6 @@ import java.util.Map; |
31 | 29 | import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
32 | 30 | import com.huaheng.pc.shipment.shipmentContainerHeader.domain.ShipmentContainerHeader; |
33 | 31 | import com.huaheng.pc.shipment.shipmentContainerHeader.mapper.ShipmentContainerHeaderMapper; |
34 | -import com.huaheng.pc.shipment.shipmentContainerHeader.service.ShipmentContainerHeaderService; | |
35 | 32 | import org.springframework.transaction.annotation.Transactional; |
36 | 33 | |
37 | 34 | @Service |
... | ... |
src/main/java/com/huaheng/pc/shipment/shippingCombination/controller/ShippingCombinationController.java
... | ... | @@ -9,7 +9,6 @@ import com.huaheng.framework.web.controller.BaseController; |
9 | 9 | import com.huaheng.framework.web.domain.AjaxResult; |
10 | 10 | import com.huaheng.framework.web.page.TableDataInfo; |
11 | 11 | import com.huaheng.pc.general.material.service.MaterialServiceImpl; |
12 | -import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail; | |
13 | 12 | import com.huaheng.pc.inventory.inventoryDetail.service.InventoryDetailService; |
14 | 13 | import com.huaheng.pc.shipment.shipmentContainerDetail.service.ShipmentContainerDetailService; |
15 | 14 | import com.huaheng.pc.shipment.shipmentContainerHeader.domain.ShipmentCombinationModel; |
... | ... |
src/main/java/com/huaheng/pc/shipment/shippingCombination/mapper/ShippingCombinationMapper.java
src/main/java/com/huaheng/pc/shipment/shippingCombination/service/ShippingCombinationService.java
1 | 1 | package com.huaheng.pc.shipment.shippingCombination.service; |
2 | 2 | |
3 | 3 | |
4 | -import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail; | |
5 | 4 | import com.huaheng.pc.shipment.shippingCombination.domain.ShippingSearch; |
6 | 5 | import com.huaheng.pc.shipment.shippingCombination.mapper.ShippingCombinationMapper; |
7 | 6 | import org.springframework.stereotype.Service; |
... | ... |
src/main/resources/mybatis/config/MaterialMultipleMapper.xml
0 → 100644
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.materialMultiple.mapper.MaterialMultipleMapper"> | |
4 | + <resultMap id="BaseResultMap" type="com.huaheng.pc.config.materialMultiple.domain.MaterialMultiple"> | |
5 | + <!--@mbg.generated--> | |
6 | + <id column="id" jdbcType="INTEGER" property="id" /> | |
7 | + <result column="materialCode" jdbcType="VARCHAR" property="materialCode" /> | |
8 | + <result column="materialName" jdbcType="VARCHAR" property="materialName" /> | |
9 | + <result column="materialSpec" jdbcType="VARCHAR" property="materialSpec" /> | |
10 | + <result column="companyCode" jdbcType="VARCHAR" property="companyCode" /> | |
11 | + <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" /> | |
12 | + <result column="unitId1" jdbcType="VARCHAR" property="unitId1" /> | |
13 | + <result column="unitId2" jdbcType="VARCHAR" property="unitId2" /> | |
14 | + <result column="multiple" jdbcType="INTEGER" property="multiple" /> | |
15 | + <result column="enable" jdbcType="INTEGER" property="enable" /> | |
16 | + <result column="created" jdbcType="TIMESTAMP" property="created" /> | |
17 | + <result column="createdBy" jdbcType="VARCHAR" property="createdBy" /> | |
18 | + <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" /> | |
19 | + <result column="lastUpdatedBy" jdbcType="VARCHAR" property="lastUpdatedBy" /> | |
20 | + <result column="version" jdbcType="INTEGER" property="version" /> | |
21 | + <result column="userDef1" jdbcType="VARCHAR" property="userDef1" /> | |
22 | + <result column="userDef2" jdbcType="VARCHAR" property="userDef2" /> | |
23 | + <result column="userDef3" jdbcType="VARCHAR" property="userDef3" /> | |
24 | + <result column="userDef4" jdbcType="VARCHAR" property="userDef4" /> | |
25 | + <result column="userDef5" jdbcType="VARCHAR" property="userDef5" /> | |
26 | + <result column="userDef6" jdbcType="VARCHAR" property="userDef6" /> | |
27 | + <result column="userDef7" jdbcType="VARCHAR" property="userDef7" /> | |
28 | + <result column="userDef8" jdbcType="VARCHAR" property="userDef8" /> | |
29 | + </resultMap> | |
30 | + <sql id="Base_Column_List"> | |
31 | + <!--@mbg.generated--> | |
32 | + id, materialCode, materialName, materialSpec, companyCode, warehouseCode, unitId1, | |
33 | + unitId2, multiple, `enable`, created, createdBy, lastUpdated, lastUpdatedBy, version, | |
34 | + userDef1, userDef2, userDef3, userDef4, userDef5, userDef6, userDef7, userDef8 | |
35 | + </sql> | |
36 | +</mapper> | |
0 | 37 | \ No newline at end of file |
... | ... |
src/main/resources/mybatis/config/MaterialUnitMapper.xml
1 | 1 | <?xml version="1.0" encoding="UTF-8"?> |
2 | 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.general.materialUnit.mapper.MaterialUnitMapper"> | |
4 | - <resultMap id="BaseResultMap" type="com.huaheng.pc.general.materialUnit.domain.MaterialUnit"> | |
3 | +<mapper namespace="com.huaheng.pc.config.materialUnit.mapper.MaterialUnitMapper"> | |
4 | + <resultMap id="BaseResultMap" type="com.huaheng.pc.config.materialUnit.domain.MaterialUnit"> | |
5 | 5 | <!--@mbg.generated--> |
6 | 6 | <id column="id" jdbcType="INTEGER" property="id" /> |
7 | 7 | <result column="materialCode" jdbcType="VARCHAR" property="materialCode" /> |
... | ... |
src/main/resources/mybatis/inventory/InventoryDetailMapper.xml
... | ... | @@ -13,12 +13,12 @@ |
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" /> | |
17 | - <result column="taskQty" jdbcType="INTEGER" property="taskQty" /> | |
18 | - <result column="lockedQty" jdbcType="INTEGER" property="lockedQty" /> | |
16 | + <result column="qty" jdbcType="DECIMAL" property="qty" /> | |
17 | + <result column="taskQty" jdbcType="DECIMAL" property="taskQty" /> | |
18 | + <result column="lockedQty" jdbcType="DECIMAL" property="lockedQty" /> | |
19 | 19 | <result column="inventorySts" jdbcType="VARCHAR" property="inventorySts" /> |
20 | + <result column="supplierCode" jdbcType="VARCHAR" property="supplierCode" /> | |
20 | 21 | <result column="referCode" jdbcType="VARCHAR" property="referCode" /> |
21 | - <result column="referId" jdbcType="VARCHAR" property="referId" /> | |
22 | 22 | <result column="referDetailId" jdbcType="VARCHAR" property="referDetailId" /> |
23 | 23 | <result column="batch" jdbcType="VARCHAR" property="batch" /> |
24 | 24 | <result column="lot" jdbcType="VARCHAR" property="lot" /> |
... | ... | @@ -28,30 +28,30 @@ |
28 | 28 | <result column="manufactureDate" jdbcType="DATE" property="manufactureDate" /> |
29 | 29 | <result column="expirationDate" jdbcType="DATE" property="expirationDate" /> |
30 | 30 | <result column="agingDate" jdbcType="DATE" property="agingDate" /> |
31 | - <result column="attributeId" jdbcType="INTEGER" property="attributeId" /> | |
31 | + <result column="attributeId" jdbcType="VARCHAR" property="attributeId" /> | |
32 | 32 | <result column="attribute1" jdbcType="VARCHAR" property="attribute1" /> |
33 | 33 | <result column="attribute2" jdbcType="VARCHAR" property="attribute2" /> |
34 | 34 | <result column="attribute3" jdbcType="VARCHAR" property="attribute3" /> |
35 | - <result column="attribute4" jdbcType="VARCHAR" property="attribute4" /> | |
36 | 35 | <result column="lockCode" jdbcType="VARCHAR" property="lockCode" /> |
37 | 36 | <result column="lastCycleCountDate" jdbcType="TIMESTAMP" property="lastCycleCountDate" /> |
38 | 37 | <result column="created" jdbcType="TIMESTAMP" property="created" /> |
39 | 38 | <result column="createdBy" jdbcType="VARCHAR" property="createdBy" /> |
40 | 39 | <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" /> |
41 | 40 | <result column="lastUpdatedBy" jdbcType="VARCHAR" property="lastUpdatedBy" /> |
42 | - <result column="version" jdbcType="INTEGER" property="version" /> | |
43 | 41 | <result column="userDef1" jdbcType="VARCHAR" property="userDef1" /> |
44 | 42 | <result column="userDef2" jdbcType="VARCHAR" property="userDef2" /> |
45 | 43 | <result column="userDef3" jdbcType="VARCHAR" property="userDef3" /> |
46 | 44 | <result column="processStamp" jdbcType="VARCHAR" property="processStamp" /> |
45 | + <result column="receiptCode" jdbcType="VARCHAR" property="receiptCode" /> | |
46 | + <result column="receiptDetailId" jdbcType="INTEGER" property="receiptDetailId" /> | |
47 | 47 | </resultMap> |
48 | 48 | <sql id="Base_Column_List"> |
49 | 49 | <!--@mbg.generated--> |
50 | - id,inventoryHeaderId , warehouseCode, companyCode, locationCode, containerCode, materialCode, materialName, | |
51 | - materialSpec, materialUnit, qty, taskQty, lockedQty, inventorySts, referCode, referId, | |
52 | - referDetailId, batch, lot, projectNo, qcCheck, weight, manufactureDate, expirationDate, | |
53 | - agingDate, attributeId, attribute1, attribute2, attribute3, attribute4, lockCode, | |
54 | - lastCycleCountDate, created, createdBy, lastUpdated, lastUpdatedBy, version, userDef1, | |
55 | - userDef2, userDef3, userDef4, userDef5, userDef6, userDef7, userDef8, processStamp | |
50 | + id, inventoryHeaderId, warehouseCode, companyCode, locationCode, containerCode, materialCode, | |
51 | + materialName, materialSpec, materialUnit, qty, taskQty, lockedQty, inventorySts, | |
52 | + supplierCode, referCode, referDetailId, batch, lot, projectNo, qcCheck, weight, manufactureDate, | |
53 | + expirationDate, agingDate, attributeId, attribute1, attribute2, attribute3, lockCode, | |
54 | + lastCycleCountDate, created, createdBy, lastUpdated, lastUpdatedBy, userDef1, userDef2, | |
55 | + userDef3, processStamp, receiptCode, receiptDetailId | |
56 | 56 | </sql> |
57 | 57 | </mapper> |
58 | 58 | \ No newline at end of file |
... | ... |
src/main/resources/mybatis/inventory/InventoryHeaderMapper.xml
... | ... | @@ -9,14 +9,15 @@ |
9 | 9 | <result column="containerCode" jdbcType="VARCHAR" property="containerCode" /> |
10 | 10 | <result column="containerStatus" jdbcType="VARCHAR" property="containerStatus" /> |
11 | 11 | <result column="companyCode" jdbcType="VARCHAR" property="companyCode" /> |
12 | - <result column="totalWeight" jdbcType="VARCHAR" property="totalWeight" /> | |
13 | 12 | <result column="materialSkuQty" jdbcType="VARCHAR" property="materialSkuQty" /> |
13 | + <result column="totalWeight" jdbcType="VARCHAR" property="totalWeight" /> | |
14 | 14 | <result column="totalQty" jdbcType="INTEGER" property="totalQty" /> |
15 | 15 | <result column="totalLines" jdbcType="INTEGER" property="totalLines" /> |
16 | 16 | <result column="projectNos" jdbcType="VARCHAR" property="projectNos" /> |
17 | 17 | <result column="batchs" jdbcType="VARCHAR" property="batchs" /> |
18 | 18 | <result column="lots" jdbcType="VARCHAR" property="lots" /> |
19 | - <result column="lastCycleCountDate" jdbcType="TIMESTAMP" property="lastCycleCountDate" /> | |
19 | + <result column="lock" jdbcType="INTEGER" property="lock" /> | |
20 | + <result column="lockRemark" jdbcType="VARCHAR" property="lockRemark" /> | |
20 | 21 | <result column="enable" jdbcType="INTEGER" property="enable" /> |
21 | 22 | <result column="created" jdbcType="TIMESTAMP" property="created" /> |
22 | 23 | <result column="createdBy" jdbcType="VARCHAR" property="createdBy" /> |
... | ... | @@ -29,9 +30,9 @@ |
29 | 30 | </resultMap> |
30 | 31 | <sql id="Base_Column_List"> |
31 | 32 | <!--@mbg.generated--> |
32 | - id, warehouseCode, locationCode, containerCode, containerStatus, companyCode, totalWeight, | |
33 | - materialSkuQty, totalQty, totalLines, projectNos, batchs, lots, lastCycleCountDate, | |
33 | + id, warehouseCode, locationCode, containerCode, containerStatus, companyCode, materialSkuQty, | |
34 | + totalWeight, totalQty, totalLines, projectNos, batchs, lots, `lock`, lockRemark, | |
34 | 35 | `enable`, created, createdBy, lastUpdated, lastUpdatedBy, version, userDef1, userDef2, |
35 | - userDef3, | |
36 | + userDef3 | |
36 | 37 | </sql> |
37 | 38 | </mapper> |
38 | 39 | \ No newline at end of file |
... | ... |