From dba22d147765a1c75adcbd95011b3145fc834c1e Mon Sep 17 00:00:00 2001
From: hayu <1604366271@qq.com>
Date: Wed, 3 Apr 2024 14:07:26 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E5=8E=82=E5=AE=B6=E8=A7=84=E6=A0=BC?=
 =?UTF-8?q?=E5=9E=8B=E5=8F=B7=E6=B7=BB=E5=8A=A0=E5=8F=8A=E6=9C=BA=E5=85=B7?=
 =?UTF-8?q?=E4=BB=93=E5=82=A8=E7=8A=B6=E6=80=81=E6=9F=A5=E8=AF=A2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bonus/sgzb/base/api/domain/MaType.java     | 14 ++++++++++++++
 .../resources/mapper/base/MaMachineTypeMapper.xml  | 11 +++++++----
 .../mapper/material/StorageStatusMapper.xml        |  1 +
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaType.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaType.java
index 39f5dcc3..4d1755c9 100644
--- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaType.java
+++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaType.java
@@ -203,6 +203,12 @@ public class MaType extends BaseEntity {
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private List<MaType> children = new ArrayList<>();
 
+    /**
+     * 厂家规格型号
+     */
+    @ApiModelProperty(value = "厂家规格型号")
+    private String facModel;
+
     
 
     public Long getTypeId() {
@@ -550,4 +556,12 @@ public class MaType extends BaseEntity {
     public void setFinalPrice(String finalPrice) {
         this.finalPrice = finalPrice;
     }
+
+    public String getFacModel() {
+        return facModel;
+    }
+
+    public void setFacModel(String facModel) {
+        this.facModel = facModel;
+    }
 }
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml
index dae1bac1..786ad5ff 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml
@@ -69,6 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isPlan != null">is_plan,</if>
             <if test="isAncuo != null">is_ancuo,</if>
             <if test="remark != null">remark,</if>
+            <if test="facModel != null">fac_model,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="typeName != null and typeName != ''">#{typeName},</if>
@@ -98,6 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isPlan != null">#{isPlan},</if>
             <if test="isAncuo != null">#{isAncuo},</if>
             <if test="remark != null">#{remark},</if>
+            <if test="facModel != null">#{facModel},</if>
         </trim>
     </insert>
 
@@ -154,6 +156,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isAncuo != null">is_ancuo = #{isAncuo},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="companyId != null">company_id = #{companyId},</if>
+            <if test="facModel != null">fac_model = #{facModel},</if>
         </trim>
         where type_id = #{typeId}
     </update>
@@ -273,13 +276,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
 
     <select id="selectMaTypeByTypeId" resultMap="MaTypeResult">
-        select m.type_id, m.type_name, m.parent_id, m.status, m.num, m.unit_id, m.manage_type,
+        select m.type_id, m.type_name, m.parent_id, m.status, m.num, m.unit_id,m.unit_name, m.manage_type,
                m.lease_price, m.eff_time, m.rent_price, m.buy_price, m.pay_price, m.level, m.rated_load, m.test_load,
                m.holding_time, m.warn_num, mtf.file_name photoName, mtf.file_url photoUrl,
                mtf2.file_name documentName, mtf2.file_url documentUrl, mtk.user_id keeperUserId,
-               su.nick_name keeperUserName, mtr.user_id repairUserId, su1.nick_name repairUserName, mpi.prop_name,
+               su.nick_name keeperUserName, mtr.user_id repairUserId, su1.nick_name repairUserName,mpi.prop_id as propId, mpi.prop_name as propName,
                m.del_flag, m.create_by, m.create_time,
-               m.remark, m.company_id
+               m.remark, m.company_id,m.fac_model as facModel
         from ma_type m
                      left join ma_prop_set mps on m.type_id = mps.type_id
                      left join ma_prop_info mpi on mps.prop_id = mpi.prop_id
@@ -334,7 +337,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         m.holding_time, m.warn_num, mtf.file_name photoName, mtf.file_url photoUrl,
         mtf2.file_name documentName, mtf2.file_url documentUrl, mtk.user_id keeperUserId,
         su.nick_name keeperUserName, mpi.prop_name, m.del_flag, m.create_by, m.create_time,
-        m.remark, m.company_id
+        m.remark, m.company_id,m.fac_model as facModel
         from ma_type m
         left join ma_prop_set mps on m.type_id = mps.type_id
         left join ma_prop_info mpi on mps.prop_id = mpi.prop_id
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/StorageStatusMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/StorageStatusMapper.xml
index 9be81e9f..28b90587 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/StorageStatusMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/StorageStatusMapper.xml
@@ -85,6 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                             GROUP BY mt.type_id) AS subquery4 ON subquery4.type_id = mt.type_id
                  LEFT JOIN ma_type mt2 on mt2.type_id = mt.parent_id
         WHERE mt.`level` = 4
+        and mt.del_flag = '0'
         <if test="typeName != null and typeName != ''">
             and mt2.type_name like concat('%',#{typeName},'%')
         </if>

From c96a108d89d9a8be9e88e3ee574deacf3acbcba9 Mon Sep 17 00:00:00 2001
From: "liang.chao" <liang.chao@ustcinfo.com>
Date: Wed, 3 Apr 2024 14:08:22 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E9=80=80=E6=96=99=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E8=A1=A8=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/controller/BackReceiveController.java | 11 ++-
 .../bonus/sgzb/app/domain/BackApplyInfo.java  |  7 ++
 .../mapper/app/BackReceiveMapper.xml          | 85 +++++++++++++------
 .../controller/BackApplyController.java       | 16 ++--
 .../sgzb/material/domain/BackApplyInfo.java   |  2 +
 5 files changed, 89 insertions(+), 32 deletions(-)

diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java
index 3b0e47f1..75bb60b3 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java
@@ -13,6 +13,7 @@ import java.util.List;
 
 /**
  * 退料接收-app
+ *
  * @author bns_han
  */
 @RestController
@@ -32,8 +33,14 @@ public class BackReceiveController extends BaseController {
     @GetMapping("getbackReceiveList")
     public AjaxResult getbackReceiveList(BackApplyInfo record) {
         try {
-            List<BackApplyInfo> list = backReceiveService.getbackReceiveList(record);
-            return success(list);
+            if (record.getFlag() == 0) {
+                List<BackApplyInfo> list = backReceiveService.getbackReceiveList(record);
+                return success(list);
+            } else {
+                startPage();
+                List<BackApplyInfo> list = backReceiveService.getbackReceiveList(record);
+                return success(getDataTable(list));
+            }
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java
index 092a459d..bd12c738 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java
@@ -51,6 +51,10 @@ public class BackApplyInfo {
      * 类型名称
      */
     private String typeName;
+    /**
+     * 协议号
+     */
+    private String agreementCode;
     /**
      * 规格编号
      */
@@ -159,4 +163,7 @@ public class BackApplyInfo {
      * 退料数量
      */
     private String preNum;
+    private String startTime;
+    private String endTime;
+    private Integer flag;
 }
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
index a9eb290b..dc5f40af 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
@@ -583,35 +583,69 @@
     SELECT
       bai.id,
       bai.`code`,
-      bai.task_id as taskId,
-      bai.back_person as backPerson,
+      bai.task_id AS taskId,
+      bai.back_person AS backPerson,
       bai.phone,
       bpl.lot_id,
-      bpl.lot_name as lotName,
-      bui.unit_id as unitId,
-      bui.unit_name as unitName,
-      bai.back_time as backTime,
-      tt.task_status as taskStatus,
-      tta.agreement_id as agreementId,
-      GROUP_CONCAT(DISTINCT bad.type_id) as typeId,
-      GROUP_CONCAT(mt2.type_name, '') AS typeName
+      bpl.lot_name AS lotName,
+      bui.unit_id AS unitId,
+      bui.unit_name AS unitName,
+      bai.back_time AS backTime,
+      bagi.agreement_code AS agreementCode,
+      tt.task_status AS taskStatus,
+      sd.`name` AS taskName,
+      tta.agreement_id AS agreementId,
+      GROUP_CONCAT( DISTINCT bad.type_id ) AS typeId,
+      GROUP_CONCAT( mt2.type_name, '' ) AS typeName
     FROM
       back_apply_info bai
-        LEFT JOIN back_apply_details bad on bad.parent_id=bai.id
-        LEFT JOIN tm_task tt on tt.task_id=bai.task_id
-        LEFT JOIN tm_task_agreement tta on tta.task_id=tt.task_id
-        LEFT JOIN bm_agreement_info bagi on bagi.agreement_id=tta.agreement_id
-        LEFT JOIN bm_project_lot bpl on bpl.lot_id=bagi.project_id
-        LEFT JOIN bm_unit_info bui on bui.unit_id=bagi.unit_id
-        LEFT JOIN sys_user us on us.user_id=bai.create_by
-        LEFT JOIN ma_type mt1 ON mt1.type_id=bad.type_id
-        LEFT JOIN ma_type mt2 ON mt2.type_id=mt1.parent_id
-        LEFT JOIN ma_type mt3 ON mt3.type_id=mt2.parent_id
-        LEFT JOIN ma_type mt4 ON mt4.type_id=mt3.parent_id
+        LEFT JOIN back_apply_details bad ON bad.parent_id = bai.id
+        LEFT JOIN tm_task tt ON tt.task_id = bai.task_id
+        LEFT JOIN tm_task_agreement tta ON tta.task_id = tt.task_id
+        LEFT JOIN bm_agreement_info bagi ON bagi.agreement_id = tta.agreement_id
+        LEFT JOIN bm_project_lot bpl ON bpl.lot_id = bagi.project_id
+        LEFT JOIN bm_unit_info bui ON bui.unit_id = bagi.unit_id
+        LEFT JOIN sys_user us ON us.user_id = bai.create_by
+        LEFT JOIN ma_type mt1 ON mt1.type_id = bad.type_id
+        LEFT JOIN ma_type mt2 ON mt2.type_id = mt1.parent_id
+        LEFT JOIN ma_type mt3 ON mt3.type_id = mt2.parent_id
+        LEFT JOIN ma_type mt4 ON mt4.type_id = mt3.parent_id
+        LEFT JOIN sys_dic sd ON sd.id = tt.task_status
     WHERE
-      tt.task_status in (38,39,40)
-    GROUP BY bai.id, us.user_name, bai.phone, bpl.lot_name, bui.unit_name, bagi.plan_start_time
-    ORDER BY tt.task_status asc ,bai.create_time desc
+      tt.task_status IN ( 37, 38, 39, 40 )
+      <if test="keyWord != null and keyWord != ''">
+        and (bai.code like concat('%', #{keyWord}, '%') or
+        bagi.agreement_code like concat('%', #{keyWord}, '%'))
+      </if>
+      <if test="unitId != null and unitId != ''">
+        and bui.unit_id = #{unitId}
+      </if>
+      <if test="lotId != null and lotId != ''">
+        and bpl.lot_id = #{lotId}
+      </if>
+      <if test="agreementCode != null and agreementCode != ''">
+        and bagi.agreement_code like concat('%', #{agreementCode}, '%')
+      </if>
+      <if test="taskStatus != null and taskStatus != ''">
+        and tt.task_status = #{taskStatus}
+      </if>
+      <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+        AND bai.back_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59')
+      </if>
+    GROUP BY
+      bai.id,
+      us.user_name,
+      bai.phone,
+      bpl.lot_name,
+      bui.unit_name,
+      bagi.plan_start_time
+    <if test="typeId != null and typeId != ''">
+      HAVING
+      FIND_IN_SET(#{typeId}, GROUP_CONCAT(DISTINCT bad.type_id))
+    </if>
+    ORDER BY
+      tt.task_status ASC,
+      bai.create_time DESC
   </select>
 
   <select id="receiveView" resultType="com.bonus.sgzb.app.domain.BackApplyInfo">
@@ -620,7 +654,8 @@
       bai.task_id as taskId,
       tta.agreement_id as agreementId,
       mt.type_id as typeId,
-      mt.type_name typeCode,
+      mt.type_name as typeCode,
+      mt.unit_name as unitName,
       mt2.type_name AS typeName,
       IFNULL(bad.audit_num,0)-(IFNULL(aa.back_num,0)) as num,
       mt.manage_type as manageType,
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java
index 34c90e1e..ac6e3c6b 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java
@@ -84,11 +84,17 @@ public class BackApplyController extends BaseController {
      */
     @ApiOperation(value = "退料申请（查看）")
     @GetMapping("/getViewByApply")
-    public TableDataInfo getViewByApply(BackApplyInfo bean) {
-        startPage();
-        bean.setFlag(0);
-        List<BackApplyInfo> list = backApplyService.getViewByApply(bean);
-        return getDataTable(list);
+    public AjaxResult getViewByApply(BackApplyInfo bean) {
+        if (bean.getViewWeb() == 1) {
+            bean.setFlag(0);
+            List<BackApplyInfo> list = backApplyService.getViewByApply(bean);
+            return AjaxResult.success(list);
+        } else {
+            startPage();
+            bean.setFlag(0);
+            List<BackApplyInfo> list = backApplyService.getViewByApply(bean);
+            return AjaxResult.success(getDataTable(list));
+        }
     }
 
     /**
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyInfo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyInfo.java
index e9394e3b..ded459e7 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyInfo.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyInfo.java
@@ -245,4 +245,6 @@ public class BackApplyInfo extends BaseEntity {
     /** 前端条件查询所传退料时间 */
     private String time;
 
+    private int viewWeb;
+
 }

From 46bf52d9e9f74f32a40cacac454c4ddf8d54b5a3 Mon Sep 17 00:00:00 2001
From: binbin_pan <max_163email@163.com>
Date: Wed, 3 Apr 2024 14:21:13 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E6=95=B0=E9=87=8F=E7=9B=98=E7=82=B9?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93-=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/store/warehousing/putInStore.vue    | 60 +++++++++++--------
 1 file changed, 35 insertions(+), 25 deletions(-)

diff --git a/sgzb-ui/src/views/store/warehousing/putInStore.vue b/sgzb-ui/src/views/store/warehousing/putInStore.vue
index d564a797..4617c23e 100644
--- a/sgzb-ui/src/views/store/warehousing/putInStore.vue
+++ b/sgzb-ui/src/views/store/warehousing/putInStore.vue
@@ -278,9 +278,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="10">
-            <el-form-item label="检验时间" label-width="130px" prop="thisCheckFixTime" v-if="!isNumCheck">
+            <el-form-item label="检验时间" label-width="130px" prop="thisCheckTime" v-if="!isNumCheck">
               <el-date-picker
-                v-model="codeForm.thisCheckFixTime"
+                v-model="codeForm.thisCheckTime"
                 type="date"
                 placeholder="请输入检验时间"
                 style="width: 400px"
@@ -288,9 +288,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="7">
-            <el-form-item label="下次检验时间" label-width="130px" prop="nextCheckFixTime" v-if="!isNumCheck">
+            <el-form-item label="下次检验时间" label-width="130px" prop="nextCheckTime" v-if="!isNumCheck">
               <el-date-picker
-                v-model="codeForm.nextCheckFixTime"
+                v-model="codeForm.nextCheckTime"
                 type="date"
                 placeholder="请输入检验时间"
                 style="width: 13vw;"
@@ -383,20 +383,20 @@
             </el-select>
           </template>
         </el-table-column>
-        <el-table-column label="检验日期" align="center" prop="thisCheckFixTime" :show-overflow-tooltip="true">
+        <el-table-column label="检验日期" align="center" prop="thisCheckTime" :show-overflow-tooltip="true">
           <template v-slot:default="{ row }" v-if="!isNumCheck">
             <el-date-picker
-              v-model="row.thisCheckFixTime"
+              v-model="row.thisCheckTime"
               type="date"
               placeholder="请输入检验时间"
               style="width: 170px"
             ></el-date-picker>
           </template>
         </el-table-column>
-        <el-table-column label="下次检验日期" align="center" prop="nextCheckFixTime" :show-overflow-tooltip="true">
+        <el-table-column label="下次检验日期" align="center" prop="nextCheckTime" :show-overflow-tooltip="true">
           <template v-slot:default="{ row }" v-if="!isNumCheck">
             <el-date-picker
-              v-model="row.nextCheckFixTime"
+              v-model="row.nextCheckTime"
               type="date"
               placeholder="请输入下次检验时间"
               style="width: 170px"
@@ -603,8 +603,8 @@ export default {
         codeSuffixEnd: undefined,
         buyPrice: undefined,
         codeFactory: undefined,
-        thisCheckFixTime: undefined,
-        nextCheckFixTime: undefined,
+        thisCheckTime: undefined,
+        nextCheckTime: undefined,
         pageNum: 1,
         pageSize: 10,
       },
@@ -676,6 +676,7 @@ export default {
       this.numTableList = []
       this.$refs['codeForm'].clearValidate()
       this.codeOpen = false;
+      this.getList()
     },
     // 表单重置
     reset() {
@@ -701,8 +702,8 @@ export default {
         codeSuffixEnd: undefined,
         buyPrice: undefined,
         codeFactory: undefined,
-        thisCheckFixTime: undefined,
-        nextCheckFixTime: undefined,
+        thisCheckTime: undefined,
+        nextCheckTime: undefined,
         pageNum: 1,
         pageSize: 10,
       }
@@ -741,20 +742,18 @@ export default {
             const outFacCode = ''
             // 生产厂家
             const maVender = this.supplierList.find(item => item.supplierId == this.codeForm.codeFactory)?.supplier || ''
-            // 检验日期: codeForm.thisCheckFixTime, 时间格式为 yyyy-MM-dd
-            let thisCheckFixTime = new Date(this.codeForm.thisCheckFixTime).toLocaleDateString('zh-CN', {year: 'numeric', month: '2-digit', day: '2-digit'}).replace(/\//g, '-')
-            if (thisCheckFixTime == 'Invalid Date') thisCheckFixTime = ''
-            // 下次检验日期: codeForm.nextCheckFixTime
-            let nextCheckFixTime = new Date(this.codeForm.nextCheckFixTime).toLocaleDateString('zh-CN', {year: 'numeric', month: '2-digit', day: '2-digit'}).replace(/\//g, '-')
-            if (nextCheckFixTime == 'Invalid Date') nextCheckFixTime = ''
+            // 检验日期: codeForm.thisCheckTime
+            const thisCheckTime = this.codeForm.nextCheckTime
+            // 下次检验日期: codeForm.nextCheckTime
+            const nextCheckTime = this.codeForm.nextCheckTime
             // 单价: codeForm.buyPrice
             const buyPrice = this.codeForm.buyPrice || 0
             this.codeTableList.push({
               maCode,
               outFacCode,
               maVender,
-              thisCheckFixTime,
-              nextCheckFixTime,
+              thisCheckTime,
+              nextCheckTime,
               buyPrice
             })
           }
@@ -774,8 +773,8 @@ export default {
       row.maCode = ''
       row.outFacCode = ''
       row.maVender = ''
-      row.thisCheckFixTime = ''
-      row.nextCheckFixTime = ''
+      row.thisCheckTime = ''
+      row.nextCheckTime = ''
       row.buyPrice = 0
 
     },
@@ -792,6 +791,9 @@ export default {
       this.codeOpen = true;
       this.title = "数量盘点入库";
       this.resetCodeForm()
+      this.$nextTick(() => {
+        this.$refs['codeForm'].clearValidate()
+      })
     },
     /** 新增编号盘点按钮操作 */
     handleCodeAdd() {
@@ -800,6 +802,9 @@ export default {
       this.codeOpen = true;
       this.title = "编码盘点入库";
       this.resetCodeForm()
+      this.$nextTick(() => {
+        this.$refs['codeForm'].clearValidate()
+      })
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
@@ -822,9 +827,9 @@ export default {
       this.$refs['codeForm'].validate(valid => {
         if (valid) {
           let SavePutInfoDto = {}
-          console.log('🚀 ~ this.codeForm:', this.codeForm);
-          console.log('🚀 ~ this.codeTableList:', this.codeTableList);
-          console.log('🚀 ~ this.numTableList:', this.numTableList);
+          // console.log('🚀 ~ this.codeForm:', this.codeForm);
+          // console.log('🚀 ~ this.numTableList:', this.numTableList);
+          // console.log('🚀 ~ this.codeTableList:', this.codeTableList);
           if (this.isNumCheck) {
             // 提交数据
             SavePutInfoDto = {
@@ -844,6 +849,11 @@ export default {
               this.getList()
             })
           } else {
+            // 统一处理时间格式为 yyyy-MM-dd
+            this.codeTableList.forEach(item => {
+              item.thisCheckTime = new Date(item.thisCheckTime).toLocaleDateString('zh-CN', {year: 'numeric', month: '2-digit', day: '2-digit'}).replace(/\//g, '-')
+              item.nextCheckTime = new Date(item.nextCheckTime).toLocaleDateString('zh-CN', {year: 'numeric', month: '2-digit', day: '2-digit'}).replace(/\//g, '-')
+            })
             // 提交数据
             SavePutInfoDto = {
               isCode: true, // 是否编码盘点

From 764d4acd98652a7a55566e24a4875751dc80f3e7 Mon Sep 17 00:00:00 2001
From: binbin_pan <max_163email@163.com>
Date: Wed, 3 Apr 2024 14:53:03 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E6=95=B0=E9=87=8F=E7=9B=98=E7=82=B9?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93-=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sgzb-ui/src/views/store/warehousing/putInStore.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/sgzb-ui/src/views/store/warehousing/putInStore.vue b/sgzb-ui/src/views/store/warehousing/putInStore.vue
index 4617c23e..761052fe 100644
--- a/sgzb-ui/src/views/store/warehousing/putInStore.vue
+++ b/sgzb-ui/src/views/store/warehousing/putInStore.vue
@@ -851,8 +851,12 @@ export default {
           } else {
             // 统一处理时间格式为 yyyy-MM-dd
             this.codeTableList.forEach(item => {
-              item.thisCheckTime = new Date(item.thisCheckTime).toLocaleDateString('zh-CN', {year: 'numeric', month: '2-digit', day: '2-digit'}).replace(/\//g, '-')
-              item.nextCheckTime = new Date(item.nextCheckTime).toLocaleDateString('zh-CN', {year: 'numeric', month: '2-digit', day: '2-digit'}).replace(/\//g, '-')
+              if (item.thisCheckTime) {
+                item.thisCheckTime = new Date(item.thisCheckTime).toLocaleDateString('zh-CN', {year: 'numeric', month: '2-digit', day: '2-digit'}).replace(/\//g, '-')
+              }
+              if (item.nextCheckTime) {
+                item.nextCheckTime = new Date(item.nextCheckTime).toLocaleDateString('zh-CN', {year: 'numeric', month: '2-digit', day: '2-digit'}).replace(/\//g, '-')
+              }
             })
             // 提交数据
             SavePutInfoDto = {

From 126b5007751a7ec8c9933aad37fd6f1f3e6be110 Mon Sep 17 00:00:00 2001
From: binbin_pan <max_163email@163.com>
Date: Wed, 3 Apr 2024 14:55:53 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E6=95=B0=E9=87=8F=E7=9B=98=E7=82=B9?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93-=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sgzb-ui/src/views/store/warehousing/putInStore.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sgzb-ui/src/views/store/warehousing/putInStore.vue b/sgzb-ui/src/views/store/warehousing/putInStore.vue
index 761052fe..d94213f6 100644
--- a/sgzb-ui/src/views/store/warehousing/putInStore.vue
+++ b/sgzb-ui/src/views/store/warehousing/putInStore.vue
@@ -853,9 +853,13 @@ export default {
             this.codeTableList.forEach(item => {
               if (item.thisCheckTime) {
                 item.thisCheckTime = new Date(item.thisCheckTime).toLocaleDateString('zh-CN', {year: 'numeric', month: '2-digit', day: '2-digit'}).replace(/\//g, '-')
+              } else {
+                item.thisCheckTime = ''
               }
               if (item.nextCheckTime) {
                 item.nextCheckTime = new Date(item.nextCheckTime).toLocaleDateString('zh-CN', {year: 'numeric', month: '2-digit', day: '2-digit'}).replace(/\//g, '-')
+              } else {
+                item.nextCheckTime = ''
               }
             })
             // 提交数据

From 9c8f44ff9f48e2fb76e3c9999c3e786c95198674 Mon Sep 17 00:00:00 2001
From: binbin_pan <max_163email@163.com>
Date: Wed, 3 Apr 2024 15:02:34 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E6=95=B0=E9=87=8F=E7=9B=98=E7=82=B9?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93-=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sgzb-ui/src/views/store/warehousing/putInStore.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sgzb-ui/src/views/store/warehousing/putInStore.vue b/sgzb-ui/src/views/store/warehousing/putInStore.vue
index d94213f6..b5163d6a 100644
--- a/sgzb-ui/src/views/store/warehousing/putInStore.vue
+++ b/sgzb-ui/src/views/store/warehousing/putInStore.vue
@@ -743,7 +743,7 @@ export default {
             // 生产厂家
             const maVender = this.supplierList.find(item => item.supplierId == this.codeForm.codeFactory)?.supplier || ''
             // 检验日期: codeForm.thisCheckTime
-            const thisCheckTime = this.codeForm.nextCheckTime
+            const thisCheckTime = this.codeForm.thisCheckTime
             // 下次检验日期: codeForm.nextCheckTime
             const nextCheckTime = this.codeForm.nextCheckTime
             // 单价: codeForm.buyPrice

From 1f8fd7b7e1772063fa08e40678a02062d430970d Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Wed, 3 Apr 2024 15:26:11 +0800
Subject: [PATCH 7/7] test

---
 .../service/impl/InventoryAndWarehousingServiceImpl.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/InventoryAndWarehousingServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/InventoryAndWarehousingServiceImpl.java
index 6f177e79..28da051c 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/InventoryAndWarehousingServiceImpl.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/InventoryAndWarehousingServiceImpl.java
@@ -86,7 +86,7 @@ public class InventoryAndWarehousingServiceImpl implements InventoryAndWarehousi
             }
         } catch (Exception e) {
             log.error("保存入库盘点异常:{}",e.getMessage());
-            // 添加事务回滚逻辑
+            // 添加事务回滚逻辑，保证入库全部成功或者全部失败
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return AjaxResult.error(ExceptionEnum.SAVE_TO_DATABASE.getCode(), ExceptionEnum.SAVE_TO_DATABASE.getMsg());
         }