Merge branch 'uat-temp-copydevorderservice' into dev

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java

@@ -1577,10 +1577,7 @@ public class MesWorkOrderService implements IMesWorkOrderService {
 
     private MesProductVersion getMesProductVersion(Map<String, List<MesProductVersion>> productVersionMap, String reportPartNo, String productVersion) {
         Optional<MesProductVersion> optional = Objects.isNull(productVersionMap) || !productVersionMap.containsKey(reportPartNo) ? Optional.empty() : productVersionMap.get(reportPartNo).stream().filter(t -> t.getProductVersion().equals(productVersion)).findFirst();
-        if (!optional.isPresent()) {
+        return optional.orElse(null);
-            MesPcnException.throwMesBusiException("零件:【%s】生产版本:【%s】信息不存在", reportPartNo, productVersion);
-        }
-        return optional.get();
     }
 
     @Override
@@ -1628,8 +1625,11 @@ public class MesWorkOrderService implements IMesWorkOrderService {
         newMesProductOffLine.setItemPartNo(mesWorkOrderPart.getPartNo());
         newMesProductOffLine.setItemPartName(mesWorkOrderPart.getPartName());
         newMesProductOffLine.setItemQty(mesWorkOrderPart.getItemQty());
-        newMesProductOffLine.setAlort(mesProductVersion.getReceiveInventoryPoint());
+        if (mesProductVersion != null){
-        newMesProductOffLine.setStgeLoc(mesProductVersion.getShipInventoryPoint());
+            newMesProductOffLine.setAlort(mesProductVersion.getReceiveInventoryPoint());
+            newMesProductOffLine.setStgeLoc(mesProductVersion.getShipInventoryPoint());
+            newMesProductOffLine.setSapWorkCenter(mesProductVersion.getWorkCenterCode());
+        }
         newMesProductOffLine.setQty(1d);
         newMesProductOffLine.setReportSn(record.getProductSn());
         newMesProductOffLine.setBomVersion(workOrder.getProductVersion());
@@ -1640,7 +1640,6 @@ public class MesWorkOrderService implements IMesWorkOrderService {
         newMesProductOffLine.setWorkCenterCode(record.getWorkCenterCode());
         newMesProductOffLine.setWorkCellCode(record.getWorkCellCode());
         newMesProductOffLine.setReportType(record.getReportType());
-        newMesProductOffLine.setSapWorkCenter(mesProductVersion.getWorkCenterCode());
         newMesProductOffLine.setOrganizeCode(model.getOrganizeCode());
         newMesProductOffLine.setDescription(record.getCompleteDateTime());
         ConvertBean.serviceModelInitialize(newMesProductOffLine, model.getUserName());