FQC 标签修改

src/main/java/com/spring/modules/schedule/service/impl/ScheduleServiceImpl.java

@@ -540,6 +540,8 @@ public class ScheduleServiceImpl<main> implements ScheduleService {
         String fqcBy = String.valueOf(resultMap.get("fqcBy"));
         String orderNo = String.valueOf(resultMap.get("orderNo"));
         String rawMaterialType = String.valueOf(resultMap.get("rawMaterialType"));
+        //2024-08-09 后加的字段
+        String sysBatchTime = String.valueOf(resultMap.get("sysBatchTime"));
 
         //设置可以直接获取的时间参数
         printMap.put("stockTime", stockTime);
@@ -559,7 +561,7 @@ public class ScheduleServiceImpl<main> implements ScheduleService {
         if(null == systemBatchNo || "".equals(systemBatchNo) || null == rawMaterialBatchNo || "".equals(rawMaterialBatchNo)){
             //查询当前卷信息
             //获取时间的部分编码
-            String sixTimeCode = this.getFqcSixTimeCode(stockTime);
+            String sixTimeCode = this.getFqcSixTimeCode(sysBatchTime);
             String newSystemBatchNo = "WM"+sixTimeCode+"30"+projectCode+primaryMaterial;
             //获取三位流水号
             String serialNo = this.getCustomerSerialNo("ALL", "FQCLabel", newSystemBatchNo, 3);
@@ -646,7 +648,8 @@ public class ScheduleServiceImpl<main> implements ScheduleService {
     public static String getFqcSixTimeCode(String stockTime) {
         String sixTimeCode = stockTime.substring(2, 10);
         ///替换成空字符串
-        sixTimeCode = sixTimeCode.replace("/", "");
+        sixTimeCode = sixTimeCode.replace("-", "");
+        //sixTimeCode = sixTimeCode.replace("/", "");
         return sixTimeCode;
     }