From 8dcc839aca467738ad1f7d16818c96ca5f887148 Mon Sep 17 00:00:00 2001
From: liweidong-hj <liweidong-hj@huafang.com>
Date: Thu, 23 Apr 2026 16:49:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=83=A7=E7=BB=93=E7=A3=A8?=
 =?UTF-8?q?=E5=85=B7=E8=AE=A1=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../desk/dashboard/mapper/CraftMapper.xml     | 10 ++-
 .../desk/order/mapper/MoldDemandMapper.java   |  3 +-
 .../desk/order/mapper/MoldDemandMapper.xml    | 87 +++++++++++++++----
 .../service/impl/MoldDemandServiceImpl.java   |  1 +
 4 files changed, 81 insertions(+), 20 deletions(-)

diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/CraftMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/CraftMapper.xml
index f61f2068..b4f95dde 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/CraftMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/CraftMapper.xml
@@ -92,7 +92,15 @@
             resultType="org.springblade.desk.dashboard.pojo.entity.DsCraftEntity">
          select * from DS_CRAFT where is_deleted = 0
          and PART_ID = #{partId}
-         and ROAM_NO = #{roamNo}
+        <choose>
+            <when test="roamNo == null or roamNo == ''">
+            and ROAM_NO is null
+            </when>
+            <otherwise>
+                and ROAM_NO = #{roamNo}
+            </otherwise>
+        </choose>
+
     </select>
     <select id="selectDscraftByReworkOrder"
             resultType="org.springblade.desk.dashboard.pojo.entity.DsCraftEntity">
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldDemandMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldDemandMapper.java
index b55a8948..408bdff4 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldDemandMapper.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldDemandMapper.java
@@ -2,6 +2,7 @@ package org.springblade.desk.order.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.desk.order.pojo.entity.MoldDemand;
 
 import java.util.List;
@@ -21,7 +22,7 @@ public interface MoldDemandMapper extends BaseMapper<MoldDemand> {
 	 * @param entity
 	 * @return
 	 */
-	List<MoldDemand> selectPage(IPage page, MoldDemand entity);
+	List<MoldDemand> selectPage(IPage page, @Param("entity") MoldDemand entity);
 
 	/**
 	 * 自定义分页 - 近一月的模具计划
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldDemandMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldDemandMapper.xml
index 99c763d6..bd6955f0 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldDemandMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldDemandMapper.xml
@@ -9,6 +9,68 @@
 		LINK_ORDER_IDS, MO_CODE, MO_NAME, QUANTITY, YP_ID, ERP_ID, ERP_WO_CODE, MAF_STATUS, URGENT_TYPE
 	</sql>
 
+<!--    <select id = "selectPage" resultType = "org.springblade.desk.order.pojo.entity.MoldDemand">-->
+<!--        SELECT-->
+<!--        a.ID,-->
+<!--        a.TENANT_ID,-->
+<!--        a.CREATE_USER,-->
+<!--        a.CREATE_TIME,-->
+<!--        a.CREATE_DEPT,-->
+<!--        a.UPDATE_USER,-->
+<!--        a.UPDATE_TIME,-->
+<!--        a.STATUS,-->
+<!--        a.IS_DELETED,-->
+<!--        a.MD_CODE,-->
+<!--        a.PART_CODE,-->
+<!--        a.PART_NAME,-->
+<!--        a.TOOL_CODE,-->
+<!--        a.TOOL_NAME,-->
+<!--        a.DEMAND_NUM,-->
+<!--        a.PLAN_TYPE_CODE,-->
+<!--        a.PLAN_TYPE_NAME,-->
+<!--        a.NEED_DATE,-->
+<!--        a.QUA_LEVEL,-->
+<!--        a.MAF_TYPE,-->
+<!--        a.KEEPER,-->
+<!--        a.RELEASER,-->
+<!--        a.MEMO,-->
+<!--        a.LINK_ORDER_IDS,-->
+<!--        a.MO_CODE,-->
+<!--        a.MO_NAME,-->
+<!--        a.QUANTITY,-->
+<!--        a.YP_ID,-->
+<!--        a.ERP_ID,-->
+<!--        a.ERP_WO_CODE,-->
+<!--        a.MAF_STATUS,-->
+<!--        a.URGENT_TYPE,-->
+<!--        b.STOCK_NUM,-->
+<!--        b.OCCUPY_NUM-->
+<!--        FROM-->
+<!--        MES_MOLD_DEMAND a-->
+<!--        LEFT JOIN (-->
+<!--        SELECT-->
+<!--        a.goods_id,-->
+<!--        b.GOODS_CODE,-->
+<!--        sum( a.QUANTITY ) AS STOCK_NUM,-->
+<!--        sum( a.OCCUPY_QUANTITY ) AS OCCUPY_NUM-->
+<!--        FROM-->
+<!--        ST_REALTIME_STOCK a-->
+<!--        LEFT JOIN ST_GOODS b ON a.GOODS_ID = b.id-->
+<!--        GROUP BY-->
+<!--        a.GOODS_ID,-->
+<!--        b.GOODS_CODE-->
+<!--        ) b ON a.PART_CODE = b.GOODS_CODE-->
+<!--        WHERE-->
+<!--        IS_DELETED = 0-->
+<!--        <if test = "entity.partCode != null and entity.partCode != ''">-->
+<!--            AND a.PART_CODE LIKE CONCAT('%', CONCAT(#{entity.partCode}, '%'))-->
+<!--        </if>-->
+<!--		<if test = "entity.toolCode != null and entity.toolCode != ''">-->
+<!--            AND a.TOOL_CODE LIKE CONCAT('%', CONCAT(#{entity.toolCode}, '%'))-->
+<!--        </if>-->
+<!--    </select>-->
+
+<!--    取消联查 增加状态为新增-->
     <select id = "selectPage" resultType = "org.springblade.desk.order.pojo.entity.MoldDemand">
         SELECT
         a.ID,
@@ -42,34 +104,23 @@
         a.ERP_ID,
         a.ERP_WO_CODE,
         a.MAF_STATUS,
-        a.URGENT_TYPE,
-        b.STOCK_NUM,
-        b.OCCUPY_NUM
+        a.URGENT_TYPE
         FROM
         MES_MOLD_DEMAND a
-        LEFT JOIN (
-        SELECT
-        a.goods_id,
-        b.GOODS_CODE,
-        sum( a.QUANTITY ) AS STOCK_NUM,
-        sum( a.OCCUPY_QUANTITY ) AS OCCUPY_NUM
-        FROM
-        ST_REALTIME_STOCK a
-        LEFT JOIN ST_GOODS b ON a.GOODS_ID = b.id
-        GROUP BY
-        a.GOODS_ID,
-        b.GOODS_CODE
-        ) b ON a.PART_CODE = b.GOODS_CODE
         WHERE
-        IS_DELETED = 0
+        a.IS_DELETED = 0
         <if test = "entity.partCode != null and entity.partCode != ''">
             AND a.PART_CODE LIKE CONCAT('%', CONCAT(#{entity.partCode}, '%'))
         </if>
-		<if test = "entity.toolCode != null and entity.toolCode != ''">
+        <if test = "entity.toolCode != null and entity.toolCode != ''">
             AND a.TOOL_CODE LIKE CONCAT('%', CONCAT(#{entity.toolCode}, '%'))
         </if>
+        <if test = "entity.toolCode != null and entity.toolCode != ''">
+            AND a.MAF_STATUS  = #{entity.mafStatus}
+        </if>
     </select>
 
+
     <select id = "pageNearlyMonth" resultType = "org.springblade.desk.order.pojo.entity.MoldDemand">
 		SELECT <include refid = "baseCommonFields" />
         FROM MES_MOLD_DEMAND
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldDemandServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldDemandServiceImpl.java
index c04e5265..c27b1e67 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldDemandServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldDemandServiceImpl.java
@@ -44,6 +44,7 @@ public class MoldDemandServiceImpl extends BaseServiceImpl<MoldDemandMapper, Mol
 
 	@Override
 	public IPage<MoldDemand> selectPage(IPage<MoldDemand> page, MoldDemand entity) {
+		entity.setMafStatus(MoldDemandEnum.MAF_STATUS_CREATE.getCode());
 		List<MoldDemand> dataList = baseMapper.selectPage(page, entity);
 		return page.setRecords(dataList);
 	}