From 757bb879c2c4c7a4948a41ca4084770c59ce179d Mon Sep 17 00:00:00 2001
From: qinyulong <yulong.qin@ceict.com.cn>
Date: Mon, 30 Mar 2026 09:33:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=97=A5=E6=9C=9F=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E6=9C=80=E6=96=B0erp=E7=94=9F=E4=BA=A7=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=8E=A5=E5=8F=A3=EF=BC=8Csql=E8=AF=AD=E5=8F=A5bug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erpdata/mapper/ErpMesRbPacturnrecordMapper.xml   | 10 ++++++----
 .../springblade/erpdata/mapper/ErpMesRbPkMapper.xml  | 11 ++++++-----
 .../erpdata/mapper/ErpMesRbPurtosoMapper.xml         | 11 ++++++-----
 .../erpdata/mapper/ErpMesRbSjsoMapper.xml            | 10 ++++++----
 .../erpdata/mapper/ErpMesRbSodelrecwxMapper.xml      | 11 ++++++-----
 .../erpdata/mapper/ErpMesRbSodelreczgMapper.xml      | 12 +++++++-----
 .../springblade/erpdata/mapper/ErpMesRbWoMapper.xml  | 11 ++++++-----
 .../erpdata/mapper/ErpMesRbWxpromotionMapper.xml     | 10 ++++++----
 .../erpdata/service/impl/ErpMesRbWoServiceImpl.java  |  4 ++--
 9 files changed, 51 insertions(+), 39 deletions(-)

diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPacturnrecordMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPacturnrecordMapper.xml
index 7f48e3db..a8f00819 100644
--- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPacturnrecordMapper.xml
+++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPacturnrecordMapper.xml
@@ -39,12 +39,14 @@
         </where>
     </select>
     <select id = "getNewlevdateMax" resultType = "java.lang.String">
-        SELECT nvl(max(a.newlevdate), selectTime)
-        as newlevdateMax
+        SELECT
+        COALESCE(
+        TO_CHAR(MAX(a.newlevdate), 'YYYY-MM-DD HH24:MI:SS'),
+        #{selectTime}
+        ) as newlevdateMax
         FROM dba_mgr.v_mes_rb_pacturnrecord a
         <where>
-            a.newlevdate <![CDATA[ >= ]]> to_date(#{selectTime},'YYYY-MM-DD HH24:MI:SS')
+            a.newlevdate >= TO_DATE(#{selectTime}, 'YYYY-MM-DD HH24:MI:SS')
         </where>
-        ORDER BY a.newlevdate DESC;
     </select>
 </mapper>
diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPkMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPkMapper.xml
index b7f274fd..8cf2e1a1 100644
--- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPkMapper.xml
+++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPkMapper.xml
@@ -7,14 +7,15 @@
     </select>
 
     <select id = "getNewlevdateMax" resultType = "java.lang.String">
-        SELECT nvl(max(a.newlevdate), selectTime)
-        as newlevdateMax
+        SELECT
+        COALESCE(
+        TO_CHAR(MAX(a.newlevdate), 'YYYY-MM-DD HH24:MI:SS'),
+        #{selectTime}
+        ) as newlevdateMax
         FROM dba_mgr.v_mes_rb_pk a
         <where>
-           1=1
-            AND a.newlevdate <![CDATA[ >= ]]> to_date(#{selectTime},'YYYY-MM-DD HH24:MI:SS')
+            a.newlevdate >= TO_DATE(#{selectTime}, 'YYYY-MM-DD HH24:MI:SS')
         </where>
-        ORDER BY a.newlevdate DESC;
     </select>
     <select id = "getMesRbPkList" resultType = "org.springblade.erpdata.pojo.dto.view.MesRbPk">
         SELECT
diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPurtosoMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPurtosoMapper.xml
index 4550ea9b..9c3aa6d3 100644
--- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPurtosoMapper.xml
+++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPurtosoMapper.xml
@@ -7,14 +7,15 @@
     </select>
 
     <select id = "getNewlevdateMax" resultType = "java.lang.String">
-        SELECT nvl(max(a.newlevdate), selectTime)
-                   as newlevdateMax
+        SELECT
+        COALESCE(
+        TO_CHAR(MAX(a.newlevdate), 'YYYY-MM-DD HH24:MI:SS'),
+        #{selectTime}
+        ) as newlevdateMax
         FROM dba_mgr.V_MES_RB_PURTOSO a
         <where>
-            a.is_deleted = 0
-            AND a.newlevdate <![CDATA[ >= ]]> to_date(#{selectTime},'YYYY-MM-DD HH24:MI:SS')
+            a.newlevdate >= TO_DATE(#{selectTime}, 'YYYY-MM-DD HH24:MI:SS')
         </where>
-        ORDER BY a.newlevdate DESC;
     </select>
 
     <select id = "getMesRbPurtosoList" resultType = "org.springblade.erpdata.pojo.dto.view.MesRbPurtoso">
diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSjsoMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSjsoMapper.xml
index a5c2c13e..6be7c8dc 100644
--- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSjsoMapper.xml
+++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSjsoMapper.xml
@@ -38,13 +38,15 @@
             a.newlevdate > v_select_time*/
     </select>
     <select id = "getNewlevdateMax" resultType = "java.lang.String">
-        SELECT nvl(max(a.newlevdate), selectTime)
-        as newlevdateMax
+        SELECT
+        COALESCE(
+        TO_CHAR(MAX(a.newlevdate), 'YYYY-MM-DD HH24:MI:SS'),
+        #{selectTime}
+        ) as newlevdateMax
         FROM dba_mgr.v_mes_rb_sjso a
         <where>
-            a.newlevdate <![CDATA[ >= ]]> to_date(#{selectTime},'YYYY-MM-DD HH24:MI:SS')
+            a.newlevdate >= TO_DATE(#{selectTime}, 'YYYY-MM-DD HH24:MI:SS')
         </where>
-        ORDER BY a.newlevdate DESC;
     </select>
 
 </mapper>
diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSodelrecwxMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSodelrecwxMapper.xml
index d382ddae..95f9df08 100644
--- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSodelrecwxMapper.xml
+++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSodelrecwxMapper.xml
@@ -6,14 +6,15 @@
         SELECT * FROM dba_mgr.v_mes_rb_sodelrecwx WHERE is_deleted = 0
     </select>
     <select id = "getNewlevdateMax" resultType = "java.lang.String">
-        SELECT nvl(max(a.newlevdate), selectTime)
-        as newlevdateMax
+        SELECT
+        COALESCE(
+        TO_CHAR(MAX(a.newlevdate), 'YYYY-MM-DD HH24:MI:SS'),
+        #{selectTime}
+        ) as newlevdateMax
         FROM dba_mgr.v_mes_rb_sodelrecwx a
         <where>
-            a.is_deleted = 0
-            AND a.newlevdate <![CDATA[ >= ]]> to_date(#{selectTime},'YYYY-MM-DD HH24:MI:SS')
+            a.newlevdate >= TO_DATE(#{selectTime}, 'YYYY-MM-DD HH24:MI:SS')
         </where>
-        ORDER BY a.newlevdate DESC;
     </select>
     <select id = "getMesRbSodelrecwxList" resultType = "org.springblade.erpdata.pojo.dto.view.MesRbSodelrecwx">
         SELECT
diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSodelreczgMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSodelreczgMapper.xml
index 7fd3897a..db6b0053 100644
--- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSodelreczgMapper.xml
+++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSodelreczgMapper.xml
@@ -5,14 +5,16 @@
     <select id = "getMesRbSodelreczgErpList" resultType = "org.springblade.erpdata.pojo.dto.view.MesRbSodelreczg">
         SELECT * FROM v_mes_rb_sodelreczg WHERE is_deleted = 0
     </select>
-    <select id = "getNewlevdateMax" resultType = "java.lang.String">
-        SELECT nvl(max(a.newlevdate), selectTime)
-        as newlevdateMax
+    <select id="getNewlevdateMax" resultType="java.lang.String">
+        SELECT
+        COALESCE(
+        TO_CHAR(MAX(a.newlevdate), 'YYYY-MM-DD HH24:MI:SS'),
+        #{selectTime}
+        ) as newlevdateMax
         FROM dba_mgr.v_mes_rb_sodelreczg a
         <where>
-            a.newlevdate <![CDATA[ >= ]]> to_date(#{selectTime},'YYYY-MM-DD HH24:MI:SS')
+            a.newlevdate >= TO_DATE(#{selectTime}, 'YYYY-MM-DD HH24:MI:SS')
         </where>
-        ORDER BY a.newlevdate DESC;
     </select>
     <select id = "getMesRbSodelreczgList" resultType = "org.springblade.erpdata.pojo.dto.view.MesRbSodelreczg">
         SELECT
diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbWoMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbWoMapper.xml
index c38990d3..62bb1d8b 100644
--- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbWoMapper.xml
+++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbWoMapper.xml
@@ -29,13 +29,14 @@
     </select>
 
     <select id="getNewlevdateMax" resultType="java.lang.String">
-        SELECT nvl(max(a.wopordat), selectTime)
-        as newlevdateMax
+        SELECT
+        COALESCE(
+        TO_CHAR(MAX(a.wopordat), 'YYYY-MM-DD HH24:MI:SS'),
+        #{selectTime}
+        ) as newlevdateMax
         FROM dba_mgr.v_mes_rb_wo a
         <where>
-            a.is_deleted = 0
-            AND a.wopordat <![CDATA[ >= ]]> to_date(#{selectTime},'YYYY-MM-DD HH24:MI:SS')
+            a.wopordat >= TO_DATE(#{selectTime}, 'YYYY-MM-DD HH24:MI:SS')
         </where>
-        ORDER BY a.wopordat DESC;
     </select>
 </mapper>
diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbWxpromotionMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbWxpromotionMapper.xml
index a9df05cd..b430fa53 100644
--- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbWxpromotionMapper.xml
+++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbWxpromotionMapper.xml
@@ -37,13 +37,15 @@
             a.newlevdate > v_select_time-1 / 24 / 6*/
     </select>
     <select id = "getNewlevdateMax" resultType = "java.lang.String">
-        SELECT nvl(max(a.newlevdate), selectTime)
-        as newlevdateMax
+        SELECT
+        COALESCE(
+        TO_CHAR(MAX(a.newlevdate), 'YYYY-MM-DD HH24:MI:SS'),
+        #{selectTime}
+        ) as newlevdateMax
         FROM dba_mgr.v_mes_rb_wxpromotion a
         <where>
-            a.newlevdate <![CDATA[ >= ]]> to_date(#{selectTime},'YYYY-MM-DD HH24:MI:SS')
+            a.newlevdate >= TO_DATE(#{selectTime}, 'YYYY-MM-DD HH24:MI:SS')
         </where>
-        ORDER BY a.newlevdate DESC;
     </select>
 
 </mapper>
diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWoServiceImpl.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWoServiceImpl.java
index a2f4f81b..3b412001 100644
--- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWoServiceImpl.java
+++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWoServiceImpl.java
@@ -172,7 +172,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
 			yieldPlan.setDominantDept(mesRbWo.getPrtmdept());
 			yieldPlan.setPrimaryCraft(mesRbWo.getProcessline());
 			yieldPlan.setProductLine(mesRbWo.getProdline());
-			yieldPlan.setPlanType(12001L);//赋值默认值12001
+			yieldPlan.setPlanType(Long.valueOf(YieldPlanEnum.PLAN_TYPE_1.getCode()));//赋值默认值12001
 			if(mesRbWo.getProcesslinedesc().contains("封接")
 					||"LX08-05-028,LX08-05-030,LX08-05-031".contains(mesRbWo.getProcessline())){
 				yieldPlan.setPlanType(12002L);
@@ -341,7 +341,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
 			yieldOrder.setPkUsername(mesRbPacturnrecord.getRecname());
 			yieldOrder.setPkDate(mesRbPacturnrecord.getWoreqdat());
 //			List<DsPartEntity> dsPartList=apsOrderClient.getDsCraftListByCode(mesRbPacturnrecord.getPrtno());
-//			yieldOrder.setYieldType(12001);
+			yieldOrder.setYieldType(YieldOrderEnum.YIELD_TYPE_1.getCode());
 //			if(dsPartList!=null&&dsPartList.get(0).getCraftWay().contains("封接")){
 //				yieldOrder.setYieldType(12002);
 //			}