武汉工单工单号拼接位工厂代码+工单类型 +客户工厂代码+班次+流水号,numberRule只需要生成流水号

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

@@ -428,10 +428,10 @@ public class MesPackageRoundnessService implements IRoundnessStrategy {
          */
         GenSerialNoModel genSerialNoModel = new GenSerialNoModel("MES_WORK_ORDER_NO_WU_HAN");
         genSerialNoModel.setPartNo(mesPartProdGroupDetail.getWorkCenterCode());
-        String dynamicRule=organizeCode+","+mesWorkOrder.getOrderFlag()+","+sortInfo.getCustOrderCode()+","+mesWorkOrder.getShiftCode();
-        genSerialNoModel.setDynamicRule(dynamicRule);
         List<String> resultList = syncFuncService.syncSerialNo(genSerialNoModel.organizeCode(organizeCode), "edi", mesPartProdGroupDetail.getOrganizeCode(), 1).getResultList();
-        mesWorkOrder.setWorkOrderNo(resultList.get(0));
+        String serialNo = resultList.get(0).replace("MES_WORK_ORDER_NO_WU_HAN", "");
+        String orderNoWuHan=organizeCode+mesWorkOrder.getOrderFlag()+sortInfo.getCustOrderCode()+mesWorkOrder.getShiftCode() + serialNo;
+        mesWorkOrder.setWorkOrderNo(orderNoWuHan);
 
         if (!workOrderPartList.isEmpty()) {
             for (MesWorkOrderPart orderPart : workOrderPartList) {