From 21ceb1064d3e0a621cbc4533aac51c49b7b41f9f Mon Sep 17 00:00:00 2001
From: "xiangwei.zhang" <752558143@qq.com>
Date: Tue, 7 Jan 2025 14:09:30 +0800
Subject: [PATCH] =?UTF-8?q?44756=20=E9=9B=B6=E4=BB=B6=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E7=BB=84=E9=85=8D=E7=BD=AE-=E2=80=9C=E5=90=AF=E7=94=A8Bom?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7=E2=80=9D=E9=80=BB=E8=BE=91=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java
index 747e227..6f7a0c9 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java
@@ -975,7 +975,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
         DdlPreparedPack.getStringEqualPack(partProdGroupCode,"partProdGroupCode",ddlPackBean);
         List<MesPartProdGroup> mesPartProdGroupList = mesPartProdGroupRao.findByHqlTopWhere(ddlPackBean, 1);
         String bomVersion = "";
-        MesProductVersion mesProductVersion = new MesProductVersion();
+        MesProductVersion mesProductVersion = getMesProductVersion(mesWorkOrder.getOrganizeCode(), mesWorkOrder.getPartNo(), mesWorkOrder.getProductVersion());
         if (!mesPartProdGroupList.isEmpty()){
             MesPartProdGroup mesPartProdGroup = mesPartProdGroupList.get(0);
             if (mesPartProdGroup.getEnableBomVersion() == null || mesPartProdGroup.getEnableBomVersion() == CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()){
@@ -986,7 +986,8 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
         }
 
         //物料+生产版本获取bom信息
-        List<MesBom> mesBoms = mesBomService.findBomList(mesPart.getOrganizeCode(), mesPart, mesProductVersion.getAlternativePartList());
+        List<MesBom> mesBoms = mesBomService.findBomList(mesPart.getOrganizeCode(), mesPart, bomVersion);
+
         //报工类型
         if (MesExtEnumUtil.REPORT_TYPE.REPORT.getValue() == mesWorkOrder.getReportType()) {
             mesWorkOrderDb.setReportedQty(MathOperation.add(mesWorkOrder.getNum(), mesWorkOrderDb.getReportedQty()));
@@ -1686,8 +1687,8 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
         newMesProductOffLine.setWorkOrderType(mesWorkOrder.getWorkOrderType());
         newMesProductOffLine.setWorkCellCode(mesWorkOrder.getWorkCellCode());
         newMesProductOffLine.setReportType(mesWorkOrder.getReportType());
-        newMesProductOffLine.setWorkCenterCode(mesWorkOrder.getWorkCenterCode());
-        newMesProductOffLine.setSapWorkCenter(mesWorkOrder.getWorkCenterCode());
+        newMesProductOffLine.setWorkCenterCode(mesWorkOrder.getErpWorkCenter());
+        newMesProductOffLine.setSapWorkCenter(mesWorkOrder.getErpWorkCenter());
 
         newMesProductOffLine.setOrganizeCode(mesWorkOrder.getOrganizeCode());
         newMesProductOffLine.setDescription(nowTime);