From 8429137f088c0eb166a4caee9b525b457e83f2ad Mon Sep 17 00:00:00 2001
From: Stang <32996823@qq.com>
Date: Thu, 7 Nov 2024 16:37:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BB=84=E8=A3=85=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=85=A5=E5=BA=93=E8=AE=A1=E5=88=92=E5=8D=95=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E9=87=8D=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ktg/mes/md/controller/BaseKnifeController.java    | 4 +++-
 ktg-mes/src/main/resources/mapper/wm/WmsZdTaskMapper.xml  | 8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/controller/BaseKnifeController.java b/ktg-mes/src/main/java/com/ktg/mes/md/controller/BaseKnifeController.java
index baf2ae9..548ad87 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/md/controller/BaseKnifeController.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/md/controller/BaseKnifeController.java
@@ -29,6 +29,8 @@ import com.ktg.common.enums.BusinessType;
 import com.ktg.common.utils.poi.ExcelUtil;
 import com.ktg.common.core.page.TableDataInfo;
 
+import static com.ktg.generator.util.MultiModuleCodeGenerator.generateTaskCode;
+
 /**
  * 工具台账Controller
  * 
@@ -752,7 +754,7 @@ public class BaseKnifeController extends BaseController
         MdItem mdItem = mdItemService.selectMdItemById(zdTask.getmProductId());
         WmsInTask wmsInTask = new WmsInTask();
         wmsInTask.setPlanInId(wmsInPlan.getPlanId());
-        wmsInTask.setPlanInCode(wmsInPlan.getPlanCode());
+        wmsInTask.setPlanInCode(generateTaskCode(wmsInPlan.getPlanCode()));
         wmsInTask.setMaterialCode(mdItem.getItemCode());
         wmsInTask.setTaskInQuantity(zdTask.getProductIdQty());
         wmsInTask.setActualInQuantity(zdTask.getProductIdQty());
diff --git a/ktg-mes/src/main/resources/mapper/wm/WmsZdTaskMapper.xml b/ktg-mes/src/main/resources/mapper/wm/WmsZdTaskMapper.xml
index eee8781..ab10022 100644
--- a/ktg-mes/src/main/resources/mapper/wm/WmsZdTaskMapper.xml
+++ b/ktg-mes/src/main/resources/mapper/wm/WmsZdTaskMapper.xml
@@ -19,6 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="attr2"    column="ATTR2"    />
         <result property="attr3"    column="ATTR3"    />
         <result property="attr4"    column="ATTR4"    />
+        <result property="figureCode"    column="figure_code"    />
         <result property="planSheet"    column="plan_sheet"    />
         <result property="createBy"    column="CREATE_BY"    />
         <result property="createTime"    column="CREATE_TIME"    />
@@ -29,8 +30,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <sql id="selectWmsZdTaskVo">
         select wzt.WMS_ZD_TASK_ID, wzt.CODE, wzt."name", wzt.M_PRODUCT_ID, wzt."product_id_qty", wzt.QTY, wzt.PLAN_OUT_ID,
-               wzt.PLAN_OUT_TYPE, wzt.QTY_OK, wzt.REMARK, wzt.ATTR1, wzt.ATTR3, wzt.CREATE_BY, wzt.CREATE_TIME,
-               wzt.UPDATE_BY, wzt.UPDATE_TIME, wzt.STATUS, mi.item_name attr2, btb.figure_code attr4
+               wzt.PLAN_OUT_TYPE, wzt.QTY_OK, wzt.REMARK, wzt.ATTR1, wzt.ATTR3, wzt.ATTR4, wzt.CREATE_BY, wzt.CREATE_TIME,
+               wzt.UPDATE_BY, wzt.UPDATE_TIME, wzt.STATUS, mi.item_name attr2, btb.figure_code plan_sheet
         from WMS_ZD_TASK wzt
         left join md_item mi on wzt.m_product_id = mi.item_id
         left join base_technology_bom btb on btb.technology_bom_id = wzt.attr4
@@ -50,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="attr1 != null  and attr1 != ''"> and ATTR1 = #{attr1}</if>
             <if test="attr2 != null  and attr2 != ''"> and ATTR2 = #{attr2}</if>
             <if test="attr3 != null  and attr3 != ''"> and ATTR3 = #{attr3}</if>
-            <if test="attr4 != null  and attr4 != ''"> and ATTR4 = #{attr4}</if>
+            <if test="attr4 != null "> and ATTR4 = #{attr4}</if>
             <if test="createBy != null  and createBy != ''"> and CREATE_BY = #{createBy}</if>
             <if test="createTime != null  and createTime != ''"> and CREATE_TIME = #{createTime}</if>
             <if test="updateBy != null  and updateBy != ''"> and UPDATE_BY = #{updateBy}</if>
@@ -123,7 +124,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="attr1 != null">ATTR1 = #{attr1},</if>
             <if test="attr2 != null">ATTR2 = #{attr2},</if>
             <if test="attr3 != null">ATTR3 = #{attr3},</if>
-            <if test="attr4 != null">ATTR4 = #{attr4},</if>
             <if test="createBy != null">CREATE_BY = #{createBy},</if>
             <if test="createTime != null">CREATE_TIME = #{createTime},</if>
             <if test="updateBy != null">UPDATE_BY = #{updateBy},</if>