标签添加的字段

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

@@ -539,6 +539,7 @@ public class ScheduleServiceImpl<main> implements ScheduleService {
         String rollQty = String.valueOf(resultMap.get("rollQty"));
         String fqcBy = String.valueOf(resultMap.get("fqcBy"));
         String orderNo = String.valueOf(resultMap.get("orderNo"));
+        String rawMaterialType = String.valueOf(resultMap.get("rawMaterialType"));
 
         //设置可以直接获取的时间参数
         printMap.put("stockTime", stockTime);
@@ -569,14 +570,14 @@ public class ScheduleServiceImpl<main> implements ScheduleService {
             String stockFoutTimeCode = DateUtils.getFourTimeCodeByStringDate(stockTime.replace("/", "-"));
             String expiredFoutTimeCode = DateUtils.getFourTimeCodeByStringDate(expiredTime.replace("/", "-"));
             //获取当前物料的
-            String newRawMaterialBatchNo = "CCL"+stockFoutTimeCode+expiredFoutTimeCode+projectCode+primaryMaterial+phaseCode;
+            String newRawMaterialBatchNo = "CCL"+stockFoutTimeCode+expiredFoutTimeCode+rawMaterialType+phaseCode;
             //获取校验位
             String checkNum = StringUtils.getLabelCheckNum(newRawMaterialBatchNo);
             String hexHoutCode = Integer.toHexString(exposureHours).toUpperCase();
             if(hexHoutCode.length() == 1){
                 hexHoutCode = "0"+hexHoutCode;
             }
-            newRawMaterialBatchNo = newRawMaterialBatchNo+checkNum+"+"+reheatingNums+hexHoutCode+"0"+serialNo;
+            newRawMaterialBatchNo = newRawMaterialBatchNo+checkNum+"+"+reheatingNums+hexHoutCode+serialNo;
             //设置两个生成的序列号数据
             printMap.put("rawMaterialBatchNo", newRawMaterialBatchNo);
             printMap.put("systemBatchNo", newSystemBatchNo);