白坯订单v2

op-modules/op-mes/src/main/resources/mapper/mes/ProRfidProcessDetailMapper.xml

@@ -60,10 +60,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			ppd.update_time as updateTime,
 			ppd.work_batch_code as workBatchCode,
 			ppd.bind_status as bindStatus,
-			pp.process_code as nowProcessCode,
-			pp.process_name as nowProcessName,
-			ppp.process_code as nextProcessCode,
-		    ppp.process_name as nextProcessName,
+			pp.process_code as nextProcessCode,
+			pp.process_name as nextProcessName,
+			ppp.process_code as nowProcessCode,
+		    ppp.process_name as nowProcessName,
 		    pow.order_code as orderCode
 		from pro_rfid_process_detail ppd
 		left join pro_process pp on pp.process_id = ppd.next_process_id

op-modules/op-plan/src/main/java/com/op/plan/mapper/ProWhiteOrderMapper.java

@@ -82,5 +82,5 @@ public interface ProWhiteOrderMapper {
      */
     List<ProShift> selectProShift();
 
-    Integer getTodayMaxNum();
+    Integer getTodayMaxNum(ProOrder proOrder);
 }

op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProWhiteOrderServiceImpl.java

@@ -98,7 +98,7 @@ public class ProWhiteOrderServiceImpl implements IProWhiteOrderService {
         proOrder.setQuantitySplit(0L);
         proOrder.setOrderType(proOrder.getProdType());
         String bpDD = "DD" + DateUtils.parseDateToStr(DateUtils.YYYYMMDD, DateUtils.getNowDate());
-        int liushuiNum = proWhiteOrderMapper.getTodayMaxNum();
+        int liushuiNum = proWhiteOrderMapper.getTodayMaxNum(proOrder);
         String liushuiStr = String.format("%04d", liushuiNum);
         proOrder.setOrderCode(bpDD+liushuiStr);
         proOrder.setCreateBy(SecurityContextHolder.getUserName());

op-modules/op-plan/src/main/resources/mapper/plan/ProWhiteOrderMapper.xml

@@ -91,7 +91,7 @@
     <select id="getTodayMaxNum" resultType="java.lang.Integer">
         select count(0)+1
         from pro_order
-        where order_type = 'white' and plan_pro_date = CONVERT(varchar(10),GETDATE(), 120)
+        where order_type = 'white' and plan_pro_date = #{planProDate}
     </select>
     <insert id="insertProOrder" parameterType="ProOrder">
         insert into pro_order