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

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

@@ -984,7 +984,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
         updateMesWorkOrder(mesWorkOrderDb,(MesExtEnumUtil.REPORT_TYPE.REPORT.getValue() == mesWorkOrder.getReportType()) ? MesExtEnumUtil.WORK_ORDER_LOG_TYPE.REPORT : MesExtEnumUtil.WORK_ORDER_LOG_TYPE.REPORT_ADJUST,mesWorkOrder.getNum());
         //试制单不报工
         if(Objects.isNull(mesWorkOrderDb.getOrderFlag()) || !MesExtEnumUtil.ORDER_TYPE_IDENTIFICATION.P.getValue().equals(mesWorkOrderDb.getOrderFlag())){
-            String sn = getStringList(mesWorkOrder.getOrganizeCode());
+            String sn = getStringList(mesWorkOrder.getOrganizeCode(), AuthUtilExt.getUserName());
             //保存数据
             List<MesProductOffLine> mesProductOffLineList = new ArrayList<>();
             String nowTime = StringUtil.isEmpty(mesWorkOrder.getDescription())?TimeTool.getNowTime(true):mesWorkOrder.getDescription();
@@ -1046,7 +1046,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
         //物料+生产版本获取bom信息
         List<MesBom> mesBoms = mesBomService.findBomList(mesPart.getOrganizeCode(), mesPart, mesProductVersion.getAlternativePartList());
         //生成条码
-        String sn = getStringList(mesWorkOrderNew.getOrganizeCode());
+        String sn = getStringList(mesWorkOrderNew.getOrganizeCode(), AuthUtilExt.getUserName());
         //保存数据
         List<MesProductOffLine> mesProductOffLineList = new ArrayList<>();
         List<MesMove> mesMoveList = new ArrayList<>();
@@ -1173,7 +1173,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
             //获取bom
             List<MesBom> mesBoms = mesBomService.findBomList(mesPart.getOrganizeCode(), mesPart, mesProductVersion.getAlternativePartList());
             //生成流水码
-            model.setSn(getStringList(model.getOrganizeCode()));
+            model.setSn(getStringList(model.getOrganizeCode(), model.getUserName()));
             for (MesBom mesBom : mesBoms) {
                 mesProductOffLineList.add(getMesProductOffLine(model, mesPart, mesProductVersion, mesBom, nowTime, mesBoms.size()));
             }
@@ -1562,8 +1562,8 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
         return mesProdRuleSortCfg;
     }
 
-    private String getStringList(String organizeCode) {
-        List<String> resultList = syncFuncService.syncSerialNo(new GenSerialNoModel(MesCommonConstant.REPORT_SN).organizeCode(organizeCode), AuthUtilExt.getUserName(), organizeCode, 1).getResultList();
+    private String getStringList(String organizeCode,String userName) {
+        List<String> resultList = syncFuncService.syncSerialNo(new GenSerialNoModel(MesCommonConstant.REPORT_SN).organizeCode(organizeCode), userName, organizeCode, 1).getResultList();
         return resultList.iterator().next();
     }