From 307bb01e5a8a8af3a56e2e713d91488a7d67557b Mon Sep 17 00:00:00 2001
From: 76164 <761646706@qq.com>
Date: Thu, 25 Jul 2024 16:54:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E5=BA=93=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SecondaryWarehouseServiceImpl.java   |  1 +
 .../material/SecondaryWarehouseMapper.xml     |  4 ++--
 .../secondStore/secondStore.vue               | 20 ++++++++++++++-----
 3 files changed, 18 insertions(+), 7 deletions(-)

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<TeamLeaseInfo> 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"
     </select>
 
     <insert id="addNewOperate">
-        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});
     </insert>
 </mapper>
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 @@
                 </el-form-item>
 
                 <el-form-item label="出库数量" prop="outNum">
-                    <el-input v-model="form.outNum" placeholder="请输入出库数量" maxlength="20" />
+                    <el-input
+                      v-model="form.outNum"
+                      placeholder="请输入出库数量"
+                      maxlength="20"
+                    />
                 </el-form-item>
                 <el-form-item label="班组名称" prop="teamName">
                     <el-input
@@ -378,6 +382,12 @@
                         disabled
                     />
                 </el-form-item>
+                <el-form-item label="领用数量" prop="ckNum">
+                  <el-input
+                    v-model="nform.ckNum"
+                    disabled
+                  />
+                </el-form-item>
 <!--                <el-form-item label="已出库数量" prop="ckNum">
                     <el-input v-model="nform.ckNum" disabled />
                 </el-form-item>-->
@@ -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 = {}