44756 零件生产组配置-“启用Bom版本号”逻辑优化

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);