41606 BTO工单的生成规则需要根据产线独立排序

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

@@ -562,8 +562,15 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
             }
         }
         //生成工单号
-        GenSerialNoModel genSerialNoModel = new GenSerialNoModel(MesCommonConstant.MES_WORK_ORDER_NO);
-        List<String> orderList = syncFuncService.syncSerialNo(genSerialNoModel, next.getCreateUser(), next.getOrganizeCode(), mesWorkOrderList.size()).getResultList();
+        List<String> orderList=new ArrayList<>();
+        if(next.getWorkOrderType() != MesExtEnumUtil.ORDER_TYPE.UN_SORT.getValue()){
+            GenSerialNoModel genSerialNoModel = new GenSerialNoModel(MesCommonConstant.MES_WORK_CENTER_ORDER_NO);
+            genSerialNoModel.setPartNo(next.getWorkCenterCode());
+            orderList = syncFuncService.syncSerialNo(genSerialNoModel, next.getCreateUser(), next.getOrganizeCode(), 1).getResultList();
+        }else {
+            GenSerialNoModel genSerialNoModel = new GenSerialNoModel(MesCommonConstant.MES_WORK_ORDER_NO);
+            orderList = syncFuncService.syncSerialNo(genSerialNoModel, next.getCreateUser(), next.getOrganizeCode(), mesWorkOrderList.size()).getResultList();
+        }
         //查询工单是否已经存在
         DdlPackBean orderPackBean = DdlPackBean.getDdlPackBean(next.getOrganizeCode());
         DdlPreparedPack.getInPackList(orderList, "workOrderNo", orderPackBean);
@@ -817,7 +824,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
         //更新工单
         updateMesWorkOrder(mesWorkOrderDb);
 
-        //生成条码
+        //生成条码 todo 有条码 不生成
         String sn = getStringList(mesWorkOrder);
         //保存数据
         List<MesProductOffLine> mesProductOffLineList = new ArrayList<>();

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

@@ -103,8 +103,11 @@ public class MesTimeRoundnessService implements IRoundnessStrategy {
                 }
                 MesWorkOrder mesWorkOrder = new MesWorkOrder();
                 //工单号生成规则 【工厂号+yyyyMMdd+5位流水】
-                GenSerialNoModel genSerialNoModel = new GenSerialNoModel(MesCommonConstant.MES_WORK_ORDER_NO);
-                List<String> resultList = syncFuncService.syncSerialNo(genSerialNoModel,"JOB", detail.getOrganizeCode(), 1).getResultList();
+                GenSerialNoModel genSerialNoModel = new GenSerialNoModel(MesCommonConstant.MES_WORK_CENTER_ORDER_NO);
+                genSerialNoModel.setPartNo(detail.getWorkCenterCode());
+                List<String> resultList = syncFuncService.syncSerialNo(genSerialNoModel, "JOB", detail.getOrganizeCode(), 1).getResultList();
+//                GenSerialNoModel genSerialNoModel = new GenSerialNoModel(MesCommonConstant.MES_WORK_ORDER_NO);
+//                List<String> resultList = syncFuncService.syncSerialNo(genSerialNoModel,"JOB", detail.getOrganizeCode(), 1).getResultList();
                 mesWorkOrder.setWorkOrderNo(resultList.get(0));
                 mesWorkOrder.setWorkOrderType(MesExtEnumUtil.ORDER_TYPE.BTO.getValue());
                 mesWorkOrder.setWorkOrderSeq(createSeq.toString());