wms / wms4_hh · Commits

Commit aaf6ef5f2c3c78c41534622516711ae72f4039c5

Authored by 肖超群
1 parent 580609fa

1. 库区由单选改成多选 

2. 修改分配库位部分报错信息
Inline Side-by-side
Showing 12 changed files with 192 additions and 93 deletions
ant-design-vue-jeecg/src/views/system/inventory/InventoryHeaderList.vue
  View file @aaf6ef5
... ... @@ -10,7 +10,7 @@
10 10 <j-multi-select-tag
11 11 v-model="queryParam.zoneCode"
12 12 :options="zoneOptions"
13   - placeholder="请选择">
  13 + placeholder="请选择库区">
14 14 </j-multi-select-tag>
15 15 </a-form-model-item>
16 16 </a-form-item>
... ...
ant-design-vue-jeecg/src/views/system/inventory/InventoryMaterialSummaryList.vue
  View file @aaf6ef5
... ... @@ -6,16 +6,13 @@
6 6 <a-row :gutter="24">
7 7 <a-col :xl="6" :lg="7" :md="8" :sm="24">
8 8 <a-form-item label="库区">
9   - <a-select
10   - show-search
11   - placeholder="请选择库区"
12   - option-filter-prop="children"
13   - v-model="queryParam.zoneCode"
14   - >
15   - <a-select-option v-for="item in zoneList" :key="item.name" :value="item.code">
16   - {{ item.name }}
17   - </a-select-option>
18   - </a-select>
  9 + <a-form-model-item prop="zoneOptions">
  10 + <j-multi-select-tag
  11 + v-model="queryParam.zoneCode"
  12 + :options="zoneOptions"
  13 + placeholder="请选择库区">
  14 + </j-multi-select-tag>
  15 + </a-form-model-item>
19 16 </a-form-item>
20 17 </a-col>
21 18 <a-col :xl="6" :lg="7" :md="8" :sm="24">
... ... @@ -139,6 +136,7 @@ export default {
139 136 data() {
140 137 return {
141 138 zoneList: [],
  139 + zoneOptions:[],
142 140 companyList: [],
143 141 selectedMainId: '',
144 142 description: '物料汇总主表管理页面',
... ... @@ -237,11 +235,19 @@ export default {
237 235 return actions.join('')
238 236 },
239 237 loadFrom() {
240   - getZoneList().then(res => {
  238 + getZoneList().then((res) => {
241 239 if (res.success) {
242 240 this.zoneList = res.result
  241 + //延迟半秒执行,避免组件未加载完,数据已经加载完
  242 + setTimeout(()=>{
  243 + //slice可以在数组的任何位置进行删除/添加操作
  244 + this.zoneOptions.splice(0, 1);
  245 + for (let i = 0; i < res.result.length; i++) {
  246 + this.zoneOptions.push({value:res.result[i].code,text:res.result[i].name})
  247 + }
  248 + },500)
243 249 }
244   - })
  250 + });
245 251 ajaxGetDictItems('box_type').then(res => {
246 252 if (res.success) {
247 253 this.boxTypeList = res.result
... ...
ant-design-vue-jeecg/src/views/system/inventory/InventoryTransactionList.vue
  View file @aaf6ef5
... ... @@ -5,6 +5,17 @@
5 5 <a-form layout="inline" @keyup.enter.native="searchQuery">
6 6 <a-row :gutter="24">
7 7 <a-col :xl="6" :lg="7" :md="8" :sm="24">
  8 + <a-form-item label="库区">
  9 + <a-form-model-item prop="zoneOptions">
  10 + <j-multi-select-tag
  11 + v-model="queryParam.zoneCode"
  12 + :options="zoneOptions"
  13 + placeholder="请选择库区">
  14 + </j-multi-select-tag>
  15 + </a-form-model-item>
  16 + </a-form-item>
  17 + </a-col>
  18 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
8 19 <a-form-item label="货主">
9 20 <a-select
10 21 show-search
... ... @@ -152,6 +163,13 @@
152 163 </a-tag>
153 164 </span>
154 165  
  166 + <span slot="zoneCode" slot-scope="zoneCode">
  167 + <a-tag :key="zoneCode" color="blue">
  168 + {{ solutionZoneCode(zoneCode) }}
  169 + </a-tag>
  170 + </span>
  171 + </a-table>
  172 +
155 173 <template slot="htmlSlot" slot-scope="text">
156 174 <div v-html="text"></div>
157 175 </template>
... ... @@ -204,7 +222,7 @@ import {mixinDevice} from &#39;@/utils/mixin&#39;
204 222 import {JeecgListMixin} from '@/mixins/JeecgListMixin'
205 223 import InventoryTransactionModal from './modules/InventoryTransactionModal'
206 224 import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
207   -import {getCompanyList} from '@/api/api'
  225 +import {getCompanyList, getZoneList} from '@/api/api'
208 226  
209 227 export default {
210 228 name: 'InventoryTransactionList',
... ... @@ -216,6 +234,8 @@ export default {
216 234 return {
217 235 description: '库存交易记录管理页面',
218 236 companyList: [],
  237 + zoneList: [],
  238 + zoneOptions:[],
219 239 // 表头
220 240 columns: [
221 241 {
... ... @@ -224,12 +244,19 @@ export default {
224 244 dataIndex: 'id'
225 245 },
226 246 {
227   - title: '货主',
228   - align: "center",
229   - dataIndex: 'companyCode',
230   - key: 'companyCode',
231   - scopedSlots: {customRender: 'companyCode'}
  247 + title: '库区',
  248 + align: 'center',
  249 + dataIndex: 'zoneCode',
  250 + key: 'zoneCode',
  251 + scopedSlots: { customRender: 'zoneCode' }
232 252 },
  253 + // {
  254 + // title: '货主',
  255 + // align: "center",
  256 + // dataIndex: 'companyCode',
  257 + // key: 'companyCode',
  258 + // scopedSlots: {customRender: 'companyCode'}
  259 + // },
233 260 {
234 261 title: '容器编码',
235 262 align: "center",
... ... @@ -292,6 +319,16 @@ export default {
292 319 dataIndex: 'batch'
293 320 },
294 321 {
  322 + title: '入库单编码',
  323 + align: "center",
  324 + dataIndex: 'receiptCode'
  325 + },
  326 + {
  327 + title: '出库单编码',
  328 + align: "center",
  329 + dataIndex: 'shipmentCode'
  330 + },
  331 + {
295 332 title: '创建人',
296 333 align: "center",
297 334 dataIndex: 'createBy'
... ... @@ -355,13 +392,35 @@ export default {
355 392 initDictConfig() {
356 393 },
357 394 loadFrom() {
358   - console.log("loadFrom 11");
  395 + getZoneList().then((res) => {
  396 + if (res.success) {
  397 + this.zoneList = res.result
  398 + //延迟半秒执行,避免组件未加载完,数据已经加载完
  399 + setTimeout(()=>{
  400 + //slice可以在数组的任何位置进行删除/添加操作
  401 + this.zoneOptions.splice(0, 1);
  402 + for (let i = 0; i < res.result.length; i++) {
  403 + this.zoneOptions.push({value:res.result[i].code,text:res.result[i].name})
  404 + }
  405 + },500)
  406 + }
  407 + });
359 408 getCompanyList().then((res) => {
360 409 if (res.success) {
361 410 this.companyList = res.result
362 411 }
363 412 });
364 413 },
  414 + solutionZoneCode(value) {
  415 + var actions = []
  416 + Object.keys(this.zoneList).some(key => {
  417 + if (this.zoneList[key].code === '' + value) {
  418 + actions.push(this.zoneList[key].name)
  419 + return true
  420 + }
  421 + })
  422 + return actions.join('')
  423 + },
365 424 solutionCompany(value) {
366 425 var actions = []
367 426 Object.keys(this.companyList).some((key) => {
... ...
ant-design-vue-jeecg/src/views/system/inventory/SimpleInventoryDetailList.vue
  View file @aaf6ef5
... ... @@ -5,6 +5,17 @@
5 5 <a-form layout="inline" @keyup.enter.native="searchQuery">
6 6 <a-row :gutter="24">
7 7 <a-col :xl="6" :lg="7" :md="8" :sm="24">
  8 + <a-form-item label="库区">
  9 + <a-form-model-item prop="zoneOptions">
  10 + <j-multi-select-tag
  11 + v-model="queryParam.zoneCode"
  12 + :options="zoneOptions"
  13 + placeholder="请选择库区">
  14 + </j-multi-select-tag>
  15 + </a-form-model-item>
  16 + </a-form-item>
  17 + </a-col>
  18 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
8 19 <a-form-item label="货主">
9 20 <a-select
10 21 show-search
... ... @@ -19,19 +30,6 @@
19 30 </a-form-item>
20 31 </a-col>
21 32 <a-col :xl="6" :lg="7" :md="8" :sm="24">
22   - <a-form-item label="库区">
23   - <a-select
24   - show-search
25   - placeholder="请选择库区"
26   - option-filter-prop="children"
27   - v-model="queryParam.zoneCode">
28   - <a-select-option v-for="item in zoneList" :key="item.name" :value="item.code">
29   - {{item.name}}
30   - </a-select-option>
31   - </a-select>
32   - </a-form-item>
33   - </a-col>
34   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
35 33 <a-form-item label="库位编码">
36 34 <a-input placeholder="请输入库位编码" v-model="queryParam.locationCode"></a-input>
37 35 </a-form-item>
... ... @@ -232,6 +230,7 @@ export default {
232 230 data() {
233 231 return {
234 232 zoneList: [],
  233 + zoneOptions:[],
235 234 companyList: [],
236 235 description: '库存详情管理页面',
237 236 // 表头
... ... @@ -398,6 +397,14 @@ export default {
398 397 getZoneList().then((res) => {
399 398 if (res.success) {
400 399 this.zoneList = res.result
  400 + //延迟半秒执行,避免组件未加载完,数据已经加载完
  401 + setTimeout(()=>{
  402 + //slice可以在数组的任何位置进行删除/添加操作
  403 + this.zoneOptions.splice(0, 1);
  404 + for (let i = 0; i < res.result.length; i++) {
  405 + this.zoneOptions.push({value:res.result[i].code,text:res.result[i].name})
  406 + }
  407 + },500)
401 408 }
402 409 });
403 410 getCompanyList().then(res => {
... ...
ant-design-vue-jeecg/src/views/system/task/CircleTaskHeaderList.vue
  View file @aaf6ef5
... ... @@ -5,6 +5,17 @@
5 5 <a-form layout="inline" @keyup.enter.native="searchQuery">
6 6 <a-row :gutter="24">
7 7 <a-col :xl="6" :lg="7" :md="8" :sm="24">
  8 + <a-form-item label="库区">
  9 + <a-form-model-item prop="zoneOptions">
  10 + <j-multi-select-tag
  11 + v-model="queryParam.zoneCode"
  12 + :options="zoneOptions"
  13 + placeholder="请选择">
  14 + </j-multi-select-tag>
  15 + </a-form-model-item>
  16 + </a-form-item>
  17 + </a-col>
  18 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
8 19 <a-form-item label="任务ID">
9 20 <a-input placeholder="请输入任务ID" v-model="queryParam.id"></a-input>
10 21 </a-form-item>
... ... @@ -20,20 +31,6 @@
20 31 </a-form-item>
21 32 </a-col>
22 33 <a-col :xl="6" :lg="7" :md="8" :sm="24">
23   - <a-form-item label="库区">
24   - <a-select
25   - show-search
26   - placeholder="请选择库区"
27   - option-filter-prop="children"
28   -
29   - v-model="queryParam.zoneCode">
30   - <a-select-option v-for="item in zoneList" :key="item.name" :value="item.code">
31   - {{item.name}}
32   - </a-select-option>
33   - </a-select>
34   - </a-form-item>
35   - </a-col>
36   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
37 34 <a-form-item label="起始库位">
38 35 <a-input placeholder="请输入起始库位" v-model="queryParam.fromLocationCode"></a-input>
39 36 </a-form-item>
... ... @@ -207,6 +204,7 @@ export default {
207 204 return {
208 205 description: '任务表管理页面',
209 206 zoneList: [],
  207 + zoneOptions:[],
210 208 isorter: {
211 209 column: 'status',
212 210 order: 'asc',
... ... @@ -410,6 +408,14 @@ export default {
410 408 getZoneList().then((res) => {
411 409 if (res.success) {
412 410 this.zoneList = res.result
  411 + //延迟半秒执行,避免组件未加载完,数据已经加载完
  412 + setTimeout(()=>{
  413 + //slice可以在数组的任何位置进行删除/添加操作
  414 + this.zoneOptions.splice(0, 1);
  415 + for (let i = 0; i < res.result.length; i++) {
  416 + this.zoneOptions.push({value:res.result[i].code,text:res.result[i].name})
  417 + }
  418 + },500)
413 419 }
414 420 });
415 421 },
... ...
ant-design-vue-jeecg/src/views/system/task/ReceiptTaskHeaderList.vue
  View file @aaf6ef5
... ... @@ -5,6 +5,17 @@
5 5 <a-form layout="inline" @keyup.enter.native="searchQuery">
6 6 <a-row :gutter="24">
7 7 <a-col :xl="6" :lg="7" :md="8" :sm="24">
  8 + <a-form-item label="库区">
  9 + <a-form-model-item prop="zoneOptions">
  10 + <j-multi-select-tag
  11 + v-model="queryParam.zoneCode"
  12 + :options="zoneOptions"
  13 + placeholder="请选择">
  14 + </j-multi-select-tag>
  15 + </a-form-model-item>
  16 + </a-form-item>
  17 + </a-col>
  18 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
8 19 <a-form-item label="任务ID">
9 20 <a-input placeholder="请输入任务ID" v-model="queryParam.id"></a-input>
10 21 </a-form-item>
... ... @@ -20,19 +31,6 @@
20 31 </a-form-item>
21 32 </a-col>
22 33 <a-col :xl="6" :lg="7" :md="8" :sm="24">
23   - <a-form-item label="库区">
24   - <a-select
25   - show-search
26   - placeholder="请选择库区"
27   - option-filter-prop="children"
28   - v-model="queryParam.zoneCode">
29   - <a-select-option v-for="item in zoneList" :key="item.name" :value="item.code">
30   - {{item.name}}
31   - </a-select-option>
32   - </a-select>
33   - </a-form-item>
34   - </a-col>
35   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
36 34 <a-form-item label="起始库位">
37 35 <a-input placeholder="请输入起始库位" v-model="queryParam.fromLocationCode"></a-input>
38 36 </a-form-item>
... ... @@ -201,6 +199,7 @@ export default {
201 199 return {
202 200 description: '任务表管理页面',
203 201 zoneList: [],
  202 + zoneOptions:[],
204 203 isorter: {
205 204 column: 'status',
206 205 order: 'asc',
... ... @@ -405,6 +404,14 @@ export default {
405 404 getZoneList().then((res) => {
406 405 if (res.success) {
407 406 this.zoneList = res.result
  407 + //延迟半秒执行,避免组件未加载完,数据已经加载完
  408 + setTimeout(()=>{
  409 + //slice可以在数组的任何位置进行删除/添加操作
  410 + this.zoneOptions.splice(0, 1);
  411 + for (let i = 0; i < res.result.length; i++) {
  412 + this.zoneOptions.push({value:res.result[i].code,text:res.result[i].name})
  413 + }
  414 + },500)
408 415 }
409 416 });
410 417 },
... ...
ant-design-vue-jeecg/src/views/system/task/ShipmentTaskHeaderList.vue
  View file @aaf6ef5
... ... @@ -5,6 +5,17 @@
5 5 <a-form layout="inline" @keyup.enter.native="searchQuery">
6 6 <a-row :gutter="24">
7 7 <a-col :xl="6" :lg="7" :md="8" :sm="24">
  8 + <a-form-item label="库区">
  9 + <a-form-model-item prop="zoneOptions">
  10 + <j-multi-select-tag
  11 + v-model="queryParam.zoneCode"
  12 + :options="zoneOptions"
  13 + placeholder="请选择">
  14 + </j-multi-select-tag>
  15 + </a-form-model-item>
  16 + </a-form-item>
  17 + </a-col>
  18 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
8 19 <a-form-item label="任务ID">
9 20 <a-input placeholder="请输入任务ID" v-model="queryParam.id"></a-input>
10 21 </a-form-item>
... ... @@ -20,19 +31,6 @@
20 31 </a-form-item>
21 32 </a-col>
22 33 <a-col :xl="6" :lg="7" :md="8" :sm="24">
23   - <a-form-item label="库区">
24   - <a-select
25   - show-search
26   - placeholder="请选择库区"
27   - option-filter-prop="children"
28   - v-model="queryParam.zoneCode">
29   - <a-select-option v-for="item in zoneList" :key="item.name" :value="item.code">
30   - {{item.name}}
31   - </a-select-option>
32   - </a-select>
33   - </a-form-item>
34   - </a-col>
35   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
36 34 <a-form-item label="起始库位">
37 35 <a-input placeholder="请输入起始库位" v-model="queryParam.fromLocationCode"></a-input>
38 36 </a-form-item>
... ... @@ -201,10 +199,12 @@ export default {
201 199 data() {
202 200 return {
203 201 description: '任务表管理页面',
  202 + zoneList: [],
204 203 isorter: {
205 204 column: 'status',
206 205 order: 'asc',
207 206 },
  207 + zoneOptions:[],
208 208 // 表头
209 209 columns: [
210 210 {
... ... @@ -380,6 +380,14 @@ export default {
380 380 getZoneList().then((res) => {
381 381 if (res.success) {
382 382 this.zoneList = res.result
  383 + //延迟半秒执行,避免组件未加载完,数据已经加载完
  384 + setTimeout(()=>{
  385 + //slice可以在数组的任何位置进行删除/添加操作
  386 + this.zoneOptions.splice(0, 1);
  387 + for (let i = 0; i < res.result.length; i++) {
  388 + this.zoneOptions.push({value:res.result[i].code,text:res.result[i].name})
  389 + }
  390 + },500)
383 391 }
384 392 });
385 393 },
... ...
ant-design-vue-jeecg/src/views/system/task/TransferTaskHeaderList.vue
  View file @aaf6ef5
... ... @@ -5,6 +5,17 @@
5 5 <a-form layout="inline" @keyup.enter.native="searchQuery">
6 6 <a-row :gutter="24">
7 7 <a-col :xl="6" :lg="7" :md="8" :sm="24">
  8 + <a-form-item label="库区">
  9 + <a-form-model-item prop="zoneOptions">
  10 + <j-multi-select-tag
  11 + v-model="queryParam.zoneCode"
  12 + :options="zoneOptions"
  13 + placeholder="请选择">
  14 + </j-multi-select-tag>
  15 + </a-form-model-item>
  16 + </a-form-item>
  17 + </a-col>
  18 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
8 19 <a-form-item label="任务ID">
9 20 <a-input placeholder="请输入任务ID" v-model="queryParam.id"></a-input>
10 21 </a-form-item>
... ... @@ -20,19 +31,6 @@
20 31 </a-form-item>
21 32 </a-col>
22 33 <a-col :xl="6" :lg="7" :md="8" :sm="24">
23   - <a-form-item label="库区">
24   - <a-select
25   - show-search
26   - placeholder="请选择库区"
27   - option-filter-prop="children"
28   - v-model="queryParam.zoneCode">
29   - <a-select-option v-for="item in zoneList" :key="item.name" :value="item.code">
30   - {{item.name}}
31   - </a-select-option>
32   - </a-select>
33   - </a-form-item>
34   - </a-col>
35   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
36 34 <a-form-item label="起始库位">
37 35 <a-input placeholder="请输入起始库位" v-model="queryParam.fromLocationCode"></a-input>
38 36 </a-form-item>
... ... @@ -205,6 +203,7 @@ export default {
205 203 return {
206 204 description: '任务表管理页面',
207 205 zoneList: [],
  206 + zoneOptions:[],
208 207 isorter: {
209 208 column: 'status',
210 209 order: 'asc',
... ... @@ -412,6 +411,14 @@ export default {
412 411 getZoneList().then((res) => {
413 412 if (res.success) {
414 413 this.zoneList = res.result
  414 + //延迟半秒执行,避免组件未加载完,数据已经加载完
  415 + setTimeout(()=>{
  416 + //slice可以在数组的任何位置进行删除/添加操作
  417 + this.zoneOptions.splice(0, 1);
  418 + for (let i = 0; i < res.result.length; i++) {
  419 + this.zoneOptions.push({value:res.result[i].code,text:res.result[i].name})
  420 + }
  421 + },500)
415 422 }
416 423 });
417 424 },
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/service/LocationAllocationServiceImpl.java
  View file @aaf6ef5
... ... @@ -15,6 +15,7 @@ import org.jeecg.modules.wms.config.containerType.entity.ContainerType;
15 15 import org.jeecg.modules.wms.config.containerType.service.IContainerTypeService;
16 16 import org.jeecg.modules.wms.config.location.entity.Location;
17 17 import org.jeecg.modules.wms.config.location.service.ILocationService;
  18 +import org.jeecg.modules.wms.config.locationHigh.service.ILocationHighService;
18 19 import org.jeecg.modules.wms.config.locationType.entity.LocationType;
19 20 import org.jeecg.modules.wms.config.locationType.service.ILocationTypeService;
20 21 import org.jeecg.modules.wms.config.parameterConfiguration.service.IParameterConfigurationService;
... ... @@ -48,6 +49,8 @@ public class LocationAllocationServiceImpl implements LocationAllocationService
48 49 @Resource
49 50 private IZoneService zoneService;
50 51 @Resource
  52 + private ILocationHighService locationHighService;
  53 + @Resource
51 54 private IParameterConfigurationService parameterConfigurationService;
52 55 @Resource
53 56 private LocationAllocationService locationAllocationService;
... ... @@ -121,7 +124,7 @@ public class LocationAllocationServiceImpl implements LocationAllocationService
121 124 }
122 125 roadWays.removeAll(removeRoadWays);
123 126 if (roadWays == null || roadWays.size() == 0) {
124   - throw new JeecgBootException("分配库位时, 巷道为空");
  127 + throw new JeecgBootException("分配库位时, 可用巷道为空");
125 128 }
126 129 Collections.shuffle(roadWays);
127 130 Integer roadWay = locationAllocationService.getRoadWay(roadWays, warehouseCode);
... ... @@ -178,7 +181,7 @@ public class LocationAllocationServiceImpl implements LocationAllocationService
178 181 }
179 182 String lastString = "ORDER BY high asc, layer asc, id asc limit 1";
180 183 if (roadWays == null || roadWays.size() == 0) {
181   - throw new JeecgBootException("分配库位时, 巷道为空");
  184 + throw new JeecgBootException("分配库位时, 可用巷道为空");
182 185 }
183 186 Collections.shuffle(roadWays);
184 187 Integer roadWay = locationAllocationService.getRoadWay(roadWays, warehouseCode);
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/service/WcsServiceImpl.java
  View file @aaf6ef5
... ... @@ -173,7 +173,7 @@ public class WcsServiceImpl implements WcsService {
173 173 locationHighLambdaQueryWrapper.eq(LocationHigh::getHighLevel, highHeight).in(LocationHigh::getLocationTypeCode, locationTypeCodeList);
174 174 LocationHigh locationHigh = locationHighService.getOne(locationHighLambdaQueryWrapper);
175 175 if (locationHigh == null) {
176   - return Result.error("分配库位时，没有找到库位高度");
  176 + return Result.error("分配库位时，高度不匹配，WCS给的高度值" + highHeight + "不在WMS系统配置范围内");
177 177 }
178 178 int high = locationHigh.getHigh();
179 179 String value = parameterConfigurationService.getValueByCode(QuantityConstant.RULE_ALLOCATION);
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/controller/ReceiptContainerHeaderController.java
  View file @aaf6ef5
... ... @@ -2,7 +2,6 @@ package org.jeecg.modules.wms.receipt.receiptContainerHeader.controller;
2 2  
3 3 import java.io.IOException;
4 4 import java.util.Arrays;
5   -import java.util.Date;
6 5 import java.util.List;
7 6 import java.util.Map;
8 7 import java.util.stream.Collectors;
... ... @@ -209,7 +208,6 @@ public class ReceiptContainerHeaderController extends JeecgController&lt;ReceiptCon
209 208 @PostMapping(value = "/addReceiptContainerDetail")
210 209 @RequiresPermissions("receiptContainerDetail:add")
211 210 public Result<String> addReceiptContainerDetail(@RequestBody ReceiptContainerDetail receiptContainerDetail) {
212   - receiptContainerDetail.setReceiveTime(new Date());
213 211 receiptContainerDetailService.save(receiptContainerDetail);
214 212 return Result.OK("添加成功！");
215 213 }
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiving/service/impl/ReceiveServiceImpl.java
  View file @aaf6ef5
... ... @@ -2,7 +2,6 @@ package org.jeecg.modules.wms.receipt.receiving.service.impl;
2 2  
3 3 import java.math.BigDecimal;
4 4 import java.util.ArrayList;
5   -import java.util.Date;
6 5 import java.util.List;
7 6 import java.util.stream.Collectors;
8 7  
... ... @@ -251,7 +250,6 @@ public class ReceiveServiceImpl extends ServiceImpl&lt;ReceiveMapper, Receive&gt; impl
251 250 receiptContainerDetail.setLot(receiptDetail.getLot());
252 251 receiptContainerDetail.setProject(receiptDetail.getProject());
253 252 receiptContainerDetail.setInventoryStatus(receiptDetail.getInventoryStatus());
254   - receiptContainerDetail.setReceiveTime(new Date());
255 253 receiptContainerDetailList.add(receiptContainerDetail);
256 254 }
257 255 }
... ...