From 4439c61f4ea779e2a5c7a2bb1ec21e9804176c77 Mon Sep 17 00:00:00 2001
From: DouDou <877258667@qq.com>
Date: Thu, 4 Jul 2024 13:06:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=B7=BB=E5=8A=A0=E7=9A=84?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/schedule/service/impl/ScheduleServiceImpl.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/spring/modules/schedule/service/impl/ScheduleServiceImpl.java b/src/main/java/com/spring/modules/schedule/service/impl/ScheduleServiceImpl.java
index 702e133..70eeb2f 100644
--- a/src/main/java/com/spring/modules/schedule/service/impl/ScheduleServiceImpl.java
+++ b/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);