From fd82011fab879a58ded1428a24cbbc64084558a4 Mon Sep 17 00:00:00 2001
From: "xiangwei.zhang" <752558143@qq.com>
Date: Thu, 9 Jan 2025 17:04:45 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=A5=E7=B1=BB=E6=94=B9=E5=8A=A0=E5=B7=A5?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=AF=AB=E7=A7=92=20=E5=9B=9E=E9=80=80?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java
index 14c6142..76f7197 100644
--- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java
+++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java
@@ -36,7 +36,6 @@ import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.exception.ImppBusiException;
 import cn.estsh.impp.framework.boot.util.SpringContextsUtil;
-import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONArray;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.map.HashedMap;
@@ -303,7 +302,7 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService {
             mesReworkTask.setReworkedQty(requestModel.getReworkedQty());
             mesReworkTask.setScrapQty(requestModel.getScrapQty());
             // 如果是批次还需要移库
-            DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
+            DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(mesReworkTask.getOrganizeCode());
             DdlPreparedPack.getStringEqualPack(requestModel.getPartNo(), "partNo", ddlPackBean);
 
             MesProductVersion version = productVersionRepository.getByProperty(ddlPackBean);
@@ -466,7 +465,7 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService {
         DdlPreparedPack.getStringEqualPack(sn.getPartNo(),"partNo",packBean);
         //更新加工记录
         mesProductionRecordRepository.updateByProperties(new String[]{"modifyUser", "modifyDatetime", "productSn", "description", "systemSyncStatus"},
-                new Object[]{userName, DateUtil.format(new Date(), MesPcnExtConstWords.DATE_FORMAT_SSS), sn.getProductSn(), sn.getDescription(), CommonEnumUtil.FALSE}, packBean);
+                new Object[]{userName, TimeTool.getNowTime(true), sn.getProductSn(), sn.getDescription(), CommonEnumUtil.FALSE}, packBean);
         //更新装配记录
         mesProductionAssemblyRepository.updateByProperties(new String[]{"modifyUser", "modifyDatetime", "productSn", "description", "systemSyncStatus"},
                 new Object[]{userName, TimeTool.getNowTime(true), sn.getProductSn(), sn.getDescription(), CommonEnumUtil.FALSE}, packBean);