diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SecondaryWarehouseServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SecondaryWarehouseServiceImpl.java index a0b1503b..33c66c5e 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SecondaryWarehouseServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SecondaryWarehouseServiceImpl.java @@ -51,6 +51,7 @@ public class SecondaryWarehouseServiceImpl implements SecondaryWarehouseService @Override public List getRecords(TeamLeaseInfo bean) { +// System.out.println(bean.getLeaseMan()); return mapper.getNewRecords(bean); } diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SecondaryWarehouseMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SecondaryWarehouseMapper.xml index 35ec6a13..4251ebe3 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SecondaryWarehouseMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SecondaryWarehouseMapper.xml @@ -214,7 +214,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - insert into receive_detail (parent_id,type_id,out_num,out_time,type,out_name) - values (#{id},#{typeId},#{outNum},now(),#{type},#{createBy}); + insert into receive_detail (parent_id,type_id,out_num,out_time,type,out_name,pick_name) + values (#{id},#{typeId},#{outNum},now(),#{type},#{createBy},#{leaseMan}); diff --git a/sgzb-ui/src/views/claimAndRefund/secondStore/secondStore.vue b/sgzb-ui/src/views/claimAndRefund/secondStore/secondStore.vue index 72c9b3af..4b0cc22a 100644 --- a/sgzb-ui/src/views/claimAndRefund/secondStore/secondStore.vue +++ b/sgzb-ui/src/views/claimAndRefund/secondStore/secondStore.vue @@ -317,7 +317,11 @@ - + + + + @@ -795,7 +805,7 @@ export default { this.$set(this.nform, 'typeName', row.typeName) this.$set(this.nform, 'modelName', row.modelName) - this.$set(this.nform, 'ckNum', row.ckNum) + this.$set(this.nform, 'ckNum', row.receiveNum) this.openIn = true this.title = '退库' }, @@ -805,7 +815,7 @@ export default { this.$refs['form'].validate((valid) => { if (valid) { if ( - parseInt(this.form.num) > parseInt(this.form.kcNum) + parseInt(this.form.outNum) > parseInt(this.form.zkNum) ) { this.$message.error('出库数量不可大于在库数量') return @@ -826,10 +836,10 @@ export default { this.$refs['nform'].validate((valid) => { if (valid) { if ( - parseInt(this.nform.num) > + parseInt(this.nform.outNum) > parseInt(this.nform.ckNum) ) { - this.$message.error('退库数量不可大于出库数量') + this.$message.error('退库数量不可大于领用数量') return } let param = {}