From c1d1620d74ece24daa01ef55058d6dcb844b4a6d Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Fri, 15 Nov 2024 16:41:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E6=8E=A5=E5=8F=A3=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/purchase/domain/PurchaseMacodeInfo.java   |  3 +++
 .../material/purchase/PurchaseMacodeInfoMapper.xml     | 10 ++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseMacodeInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseMacodeInfo.java
index 89bd5b50..0eb85f1a 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseMacodeInfo.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseMacodeInfo.java
@@ -78,4 +78,7 @@ public class PurchaseMacodeInfo extends BaseEntity {
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "出厂日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date productionTime;
+
+    @ApiModelProperty(value = "出厂编码")
+    private String outFacCode;
 }
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseMacodeInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseMacodeInfoMapper.xml
index 8053ab3d..c6694080 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseMacodeInfoMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseMacodeInfoMapper.xml
@@ -18,6 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
         <result property="remark"    column="remark"    />
         <result property="companyId"    column="company_id"    />
+        <result property="outFacCode"    column="out_fac_code"    />
         <result property="unitName"    column="unit_name"    />
         <result property="typeName"    column="type_name"    />
         <result property="maTypeName"    column="ma_type_name"    />
@@ -26,11 +27,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <sql id="selectPurchaseMacodeInfoVo">
         select pmi.id, pmi.task_id, pmi.type_id, pmi.ma_code, pmi.qr_code, pmi.fix_code, pmi.code_type, pmi.status,
-               pmi.create_by, pmi.create_time, pmi.update_by, pmi.update_time, pmi.remark, pmi.company_id,
-               mt.type_name, mt.unit_name, mtp.type_name as ma_type_name
+               pmi.create_by, pmi.create_time, pmi.update_by, pmi.update_time, pmi.remark, pmi.company_id, pmi.out_fac_code,
+               mt.type_name, mt.unit_name, mtp.type_name as ma_type_name, pcd.production_time
         from purchase_macode_info pmi
         left join ma_type mt on pmi.type_id = mt.type_id
         left join ma_type mtp on mt.parent_id = mtp.type_id
+        left join purchase_check_details pcd on pmi.task_id = pcd.task_id and pmi.type_id = pcd.type_id
     </sql>
 
     <select id="selectPurchaseMacodeInfoList" parameterType="com.bonus.material.purchase.domain.PurchaseMacodeInfo" resultMap="PurchaseMacodeInfoResult">
@@ -39,6 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="taskId != null "> and pmi.task_id = #{taskId}</if>
             <if test="typeId != null "> and pmi.type_id = #{typeId}</if>
             <if test="maCode != null  and maCode != ''"> and pmi.ma_code = #{maCode}</if>
+            <if test="outFacCode != null  and outFacCode != ''"> and pmi.out_fac_code = #{outFacCode}</if>
             <if test="qrCode != null  and qrCode != ''"> and pmi.qr_code = #{qrCode}</if>
             <if test="fixCode != null  and fixCode != ''"> and pmi.fix_code = #{fixCode}</if>
             <if test="codeType != null  and codeType != ''"> and pmi.code_type = #{codeType}</if>
@@ -58,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="taskId != null">task_id,</if>
             <if test="typeId != null">type_id,</if>
             <if test="maCode != null">ma_code,</if>
+            <if test="outFacCode != null">out_fac_code,</if>
             <if test="qrCode != null">qr_code,</if>
             <if test="fixCode != null">fix_code,</if>
             <if test="codeType != null">code_type,</if>
@@ -73,6 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="taskId != null">#{taskId},</if>
             <if test="typeId != null">#{typeId},</if>
             <if test="maCode != null">#{maCode},</if>
+            <if test="outFacCode != null">#{outFacCode},</if>
             <if test="qrCode != null">#{qrCode},</if>
             <if test="fixCode != null">#{fixCode},</if>
             <if test="codeType != null">#{codeType},</if>
@@ -92,6 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="taskId != null">task_id = #{taskId},</if>
             <if test="typeId != null">type_id = #{typeId},</if>
             <if test="maCode != null">ma_code = #{maCode},</if>
+            <if test="outFacCode != null">out_fac_code = #{outFacCode},</if>
             <if test="qrCode != null">qr_code = #{qrCode},</if>
             <if test="fixCode != null">fix_code = #{fixCode},</if>
             <if test="codeType != null">code_type = #{codeType},</if>