fix #bug 41559

fix #bug 41577

modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkOrderService.java

@@ -24,7 +24,7 @@ public interface IMesWorkOrderService extends IBaseMesService<MesWorkOrder> {
     void doProductReportExt(MesWorkOrder mesWorkOrder);
 
     @ApiOperation("非排序工单导入前删除")
-    void deleteUnSortOrder(String userName, String organizeCode, List<String> partNoList);
+    void deleteUnSortOrder(String organizeCode, List<String> partNoList);
 
     @ApiOperation("汇总工单给SAP")
     List<MesWorkOrderModel> sumMesWorkOrderQtyToSap(String organizeCode);

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesWorkOrderController.java

@@ -53,7 +53,7 @@ public class MesWorkOrderController extends BaseMesController<MesWorkOrder> {
             if(CollectionUtils.isEmpty(beanList)){
                 MesException.throwMesBusiException("导入数据不存在");
             }
-            String userName = AuthUtil.getSessionUser().getUserName();
+            String userName  = AuthUtil.getSessionUser().getUserName();
             String organizeCode = AuthUtil.getOrganize().getOrganizeCode();
             //非排序工单导入前删除
             if (MesExtEnumUtil.ORDER_TYPE.UN_SORT.getValue() == type) {
@@ -61,7 +61,7 @@ public class MesWorkOrderController extends BaseMesController<MesWorkOrder> {
                 if(CollectionUtils.isEmpty(partNoList)){
                     MesException.throwMesBusiException("导入物料信息数据无效");
                 }
-                mesWorkOrderService.deleteUnSortOrder(userName,organizeCode,partNoList);
+                mesWorkOrderService.deleteUnSortOrder(organizeCode,partNoList);
             }
             List<MesWorkOrder> mesWorkOrderList = new ArrayList<>();
             // 导入数据初始化

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

@@ -109,6 +109,10 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
             baseRDao.insert(copyMesWorkOrder);
             workOrderLogService.saveMesWorkOrderLog(copyMesWorkOrder);
             return bean;
+        }else if (bean.getWorkOrderType() == MesExtEnumUtil.ORDER_TYPE.UN_SORT.getValue()){
+            //生产工单-非排序手工插单，关闭该零件当天之前日期非排序工单
+            List<String> partNoList = Collections.singletonList(bean.getPartNo());
+            this.deleteUnSortOrder(bean.getOrganizeCode(),partNoList);
         } else if (bean.getWorkOrderType() == MesExtEnumUtil.ORDER_TYPE.BTO.getValue()) {
             Long produceSeq = 0L;
             if (null != result && result.getProduceSeq() != null) {
@@ -910,14 +914,14 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
     }
 
     @Override
-    public void deleteUnSortOrder(String userName, String organizeCode, List<String> partNoList) {
+    public void deleteUnSortOrder(String organizeCode, List<String> partNoList) {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode);
         DdlPreparedPack.getInPackList(partNoList, "partNo", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(MesExtEnumUtil.ORDER_TYPE.UN_SORT.getValue(), "workOrderType", ddlPackBean);
         DdlPreparedPack.getStringSmallerNotEqualPack(TimeTool.getToday(), "planStartTime", ddlPackBean);
         DdlPreparedPack.getNumberSmallerPack(MesExtEnumUtil.ORDER_STATUS.CLOSE.getValue(), "workOrderStatus", ddlPackBean);
         baseRDao.updateByProperties(new String[]{"modifyUser", "modifyDatetime", "workOrderStatus"},
-                new Object[]{userName, TimeTool.getNowTime(true), MesExtEnumUtil.ORDER_STATUS.CLOSE.getValue()}, ddlPackBean);
+                new Object[]{"CLOSE_JOB", TimeTool.getNowTime(true), MesExtEnumUtil.ORDER_STATUS.CLOSE.getValue()}, ddlPackBean);
     }