根据日期获取最新erp生产订单接口，sql语句bug修改

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>

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

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">

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>

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

blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSodelreczgMapper.xml

@@ -6,13 +6,15 @@
         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
+        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

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>

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>

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);
 //			}