Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBtoJobServiceImpl.java

@@ -110,7 +110,7 @@ public class MesBtoJobServiceImpl implements IMesBtoJobService {
             List<MesCustSortInfo> sortInfoList = mesCustSoftInfoService.queryCustSortInfoList(prodGroup.getCustCode(), prodGroup.getCustOrganizeCode(), prodGroup.getCustInfoPoint(), organizeCode, custPartNoList);
             if (sortInfoList.isEmpty()){
                 log.info("当前零件生产组:{}没有排序信息",prodGroup.getCustInfoPoint());
-                return;
+                continue;
             }
             //6. 根据零件生产组的RoundnessType 去做策略，现在只做 窗口时间 策略; 入参
             String roundnessService = MesExtEnumUtil.SHIPPING_GROUP_ROUND_METHOD.valueOfService(prodGroup.getRoundMethod());

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/roundness/MesPackageRoundnessService.java

@@ -453,11 +453,10 @@ public class MesPackageRoundnessService implements IRoundnessStrategy {
         }
         /**
          * 工单号修改
-         * {dynamicRule}{dynamicRule}{dynamicRule}{dynamicrule}{serialNo}
+         * {ORG}{dynamicRule}{dynamicRule}{dynamicrule}{serialNo}
          * 工厂代码+工单类型 +客户工厂代码+班次+流水号
          */
         GenSerialNoModel genSerialNoModel = new GenSerialNoModel("MES_WORK_ORDER_NO_WU_HAN");
-        genSerialNoModel.setPartNo(mesPartProdGroupDetail.getWorkCenterCode());
         List<String> resultList = syncFuncService.syncSerialNo(genSerialNoModel.organizeCode(organizeCode), "edi", mesPartProdGroupDetail.getOrganizeCode(), 1).getResultList();
         String serialNo = resultList.get(0).replace("MES_WORK_ORDER_NO_WU_HAN", "");
         String orderNoWuHan=organizeCode+mesWorkOrder.getOrderFlag()+sortInfo.getCustOrderCode()+mesWorkOrder.getShiftCode() + serialNo;
@@ -476,12 +475,11 @@ public class MesPackageRoundnessService implements IRoundnessStrategy {
          * 生产序号
          * 工厂-产线-9位流水号,跳号10
          */
-        GenSerialNoModel prodSeqSerialNoModel = new GenSerialNoModel("MES_WORK_ORDER_NO_WU_HAN");
+        GenSerialNoModel prodSeqSerialNoModel = new GenSerialNoModel("MES_WORK_ORDER_SEQ_WU_HAN");
         prodSeqSerialNoModel.setProdLocation(mesWorkOrder.getWorkCenterCode());
-
         List<String> proSeqResultList = syncFuncService.syncSerialNo(prodSeqSerialNoModel.organizeCode(organizeCode), "edi", mesPartProdGroupDetail.getOrganizeCode(), 1).getResultList();
         String proSeqStr = proSeqResultList.get(0);
-        mesWorkOrder.setProduceSeq(Long.parseLong(proSeqStr.replace(organizeCode, "").replace(mesWorkOrder.getWorkCenterCode(),"")));
+        mesWorkOrder.setProduceSeq(Long.parseLong(proSeqStr.replace("MES_WORK_ORDER_SEQ_WU_HAN", "")));
         mesWorkOrder.setPartProdGroupName(partProdGroup.getPartProdGroupName());
         ConvertBean.saveOrUpdate(mesWorkOrder, "MES-JOB");
         mesWorkOrderRao.insert(mesWorkOrder);
@@ -507,6 +505,7 @@ public class MesPackageRoundnessService implements IRoundnessStrategy {
             Map<String, List<MesWorkOrderAssembly>> cellCodeMap = assemblyList.stream().collect(Collectors.groupingBy(MesWorkOrderAssembly::getWorkCellCode));
             for (String cellCode : cellCodeList) {
                 MesQueueOrder mesQueueOrder = new MesQueueOrder();
+                mesQueueOrder.setCarModelCode(mesWorkOrder.getCarModelCode());
                 mesQueueOrder.setWorkOrderNo(mesWorkOrder.getWorkOrderNo());
                 mesQueueOrder.setOrganizeCode(organizeCode);
                 mesQueueOrder.setWorkCellCode(cellCode);