Merge remote-tracking branch 'origin/master'

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/classSchedule/ScheduleUserDateController.java

@@ -121,7 +121,7 @@ public class ScheduleUserDateController extends SuperController<ScheduleUserDate
             ScheduleUserDate scheduleUserDate = baseService.getById(1L);
             //本地默认班组数据
             boolean bool = scheduleUserDate.getStartTime()!=null && scheduleUserDate.getEndTime()!=null && scheduleUserDate.getMonthId()!=null && scheduleUserDate.getMonthId() != scheduleUserDate.getOrderId();
-            if(bool || LocalDate.now().isAfter(scheduleUserDate.getCreateTime().toLocalDate())){
+            if(bool || (LocalDate.now().isAfter(scheduleUserDate.getCreateTime().toLocalDate()) && scheduleUserDate.getMonthId()!=null)){
                 scheduleUserDate.setStartTime(null).setEndTime(null).setMonthId(null);
                 baseService.updateAllById(scheduleUserDate);
             }

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/externalApi/MesController.java

@@ -900,18 +900,22 @@ public class MesController extends SuperController<MesNoticeService, Long, MesNo
 
             case "QUALITYREPORT":
                 msgUtil.httpForPost(url, JSONObject.toJSONString(returnData));
+                log.warn("质检订单{}完成报工发送成功", returnData.getString("taskCode"));
                 break;
 
             case "MESABNORMALREPORT":
                 msgUtil.httpForPost(url, JSONObject.toJSONString(returnData));
+                log.warn("异常报工发送成功");
                 break;
 
             case "MESPROCESSREPORT":
                 msgUtil.httpForPost(url, JSONObject.toJSONString(returnData));
+                log.warn("MES加工订单{}报工发送成功", returnData.getString("auidnr"));
                 break;
 
             case "CUTTERNEED":
                 msgUtil.httpForPost(url, JSONObject.toJSONString(returnData));
+                log.warn("刀具分拣结果报工发送成功");
                 break;
         }
     }