Merge remote-tracking branch 'origin/mode-min-unit' into mode-min-unit

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsProcessOperationServiceImpl.java

@@ -336,6 +336,8 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                             apsProcessOperationDo.setPlanoutput("[1]" + outputMeter + "*" + blanckdata.getInt("ROLLNUM") + "卷");
                             if (apsProcessOperationOutMaterDo.getPlanrollnum() > 1) {
                                 apsProcessOperationDo.setIssubsection("是");
+                            } else {
+                                apsProcessOperationDo.setIssubsection("否");
                             }
                             //输出成品
                             /*
@@ -496,6 +498,8 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                         apsProcessOperationDo.setPlanoutput("[1]" + outputMeter + "*" + blanckdata.getInt("ROLLNUM") + "卷");
                         if (blanckdata.getInt("ROLLNUM") > 1) {
                             apsProcessOperationDo.setIssubsection("是");
+                        } else {
+                            apsProcessOperationDo.setIssubsection("否");
                         }
                         //输出成品
                         /*
@@ -875,6 +879,8 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                         processOperationDo.setPlanoutput(planoutsb.toString());
                         if (planrollnum > 1) {
                             apsProcessOperationDo.setIssubsection("是");
+                        } else {
+                            apsProcessOperationDo.setIssubsection("否");
                         }
                         apsProcessOperationDoList.add(processOperationDo);
 
@@ -1040,6 +1046,8 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                     processOperationDo.setPlanoutput(planoutsb.toString());
                     if (planrollnum > 1) {
                         apsProcessOperationDo.setIssubsection("是");
+                    } else {
+                        apsProcessOperationDo.setIssubsection("否");
                     }
                     apsProcessOperationDoList.add(processOperationDo);
                 }
@@ -1428,6 +1436,8 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                     apsProcessOperationDo.setPlanoutput(planoutsb.toString());
                     if (planrollnum > 1) {
                         apsProcessOperationDo.setIssubsection("是");
+                    } else {
+                        apsProcessOperationDo.setIssubsection("否");
                     }
 
                     apsProcessOperationDoList.add(apsProcessOperationDo);
@@ -1751,6 +1761,8 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
         apsProcessOperationDo.setPlanoutput(planoutsb.toString());
         if (planrollnum > 1) {
             apsProcessOperationDo.setIssubsection("是");
+        } else {
+            apsProcessOperationDo.setIssubsection("否");
         }
 
         boolean bool1 = apsProcessOperationService.saveOrUpdate(apsProcessOperationDo);
@@ -2063,6 +2075,8 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
             apsProcessOperationDo.setPlanenddate(new Date(maxDate.get().getTime()));
             if (planrollnum > 1) {
                 apsProcessOperationDo.setIssubsection("是");
+            } else {
+                apsProcessOperationDo.setIssubsection("否");
             }
 
             boolean bool1 = apsProcessOperationService.saveOrUpdate(apsProcessOperationDo);

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsProductionOrderServiceImpl.java

@@ -352,7 +352,6 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
      */
     @Override
     public void orderOuttimeAudit() {
-        log.info("订单未及时评审提醒开始");
         List<ApsProductionOrderDo> apsProductionOrderDos = this.baseMapper.getOrderOuttimeAudit();
         for (ApsProductionOrderDo apsProductionOrderDo : apsProductionOrderDos) {
             //系统通知（移动端和PC端个人工作台）
@@ -376,7 +375,6 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
      */
     @Override
     public void auxiliaryMaterial() {
-        log.info("辅料申购提醒开始");
         List<ApsProductionOrderDo> apsProductionOrderDos = this.baseMapper.getAuxiliaryMaterial();
         for (ApsProductionOrderDo apsProductionOrderDo : apsProductionOrderDos) {
             //系统通知（移动端和PC端个人工作台）
@@ -461,7 +459,6 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
      */
     @Override
     public void processDelay() {
-        log.info("作业延期提醒开始");
         List<ApsProductionOrderDo> apsProductionOrderDos = this.baseMapper.getProcessDelay();
         for (ApsProductionOrderDo apsProductionOrderDo : apsProductionOrderDos) {
             //系统通知（移动端和PC端个人工作台）
@@ -485,7 +482,6 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
      */
     @Override
     public void reportUnqualify() {
-        log.info("报工不合格提醒开始");
         List<ApsProductionOrderDo> apsProductionOrderDos = this.baseMapper.getReportUnqualify();
         if (apsProductionOrderDos.isEmpty()) {
             return;

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/GanttServiceImpl.java

@@ -172,7 +172,7 @@ public class GanttServiceImpl implements GanttService {
             returnMsg = String.format(SCHEDULING_STR, sysUserVo.getName(), "正在排程", "");
         } else {
             if (StringUtils.isNotBlank(sysUserVo.getRoption())) {
-                returnMsg = String.format(SCHEDULING_STR, sysUserVo.getName(), ":" + sysUserVo.getRoption());
+                returnMsg = String.format(SCHEDULING_STR, sysUserVo.getName(),"排程异常" ,":" + sysUserVo.getRoption());
             } else {
                 returnMsg = String.format(SCHEDULING_STR, sysUserVo.getName(), "排程结束", "");
             }

cx-aps/cx-aps-server/src/main/java/com/rongwei/bsserver/controller/ApsProductionOrderController.java

@@ -2,11 +2,11 @@ package com.rongwei.bsserver.controller;
 
 import com.rongwei.bscommon.sys.service.ApsProductionOrderService;
 import com.rongwei.bsentity.domain.ApsProductionOrderDo;
-import com.rongwei.bsentity.domain.ApsProductionTechnicalRequirementDo;
 import com.rongwei.bsentity.vo.CheckAndSaveOrUpdateOrderReq;
 import com.rongwei.bsentity.vo.DeleteOrderVo;
 import com.rongwei.bsentity.vo.OrderHaveBeChangedReq;
 import com.rongwei.rwcommon.base.R;
+import lombok.SneakyThrows;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -67,8 +67,16 @@ public class ApsProductionOrderController {
     订单未及时评审提醒
      */
     @PostMapping("/orderOuttimeAudit")
-    public void orderOuttimeAudit() {
-        apsProductionOrderService.orderOuttimeAudit();
+    public R orderOuttimeAudit() {
+        log.info("订单未及时评审提醒开始...");
+        Thread thread = new Thread(new Runnable() {
+            @SneakyThrows
+            public void run() {
+                apsProductionOrderService.orderOuttimeAudit();
+            }
+        });
+        thread.start(); // 启动线程
+        return R.ok();
     }
 
     /**
@@ -83,16 +91,32 @@ public class ApsProductionOrderController {
     辅料申购提醒
      */
     @PostMapping("/auxiliaryMaterial")
-    public void auxiliaryMaterial() {
-        apsProductionOrderService.auxiliaryMaterial();
+    public R auxiliaryMaterial() {
+        log.info("辅料申购提醒开始");
+        Thread thread = new Thread(new Runnable() {
+            @SneakyThrows
+            public void run() {
+                apsProductionOrderService.auxiliaryMaterial();
+            }
+        });
+        thread.start(); // 启动线程
+        return R.ok();
     }
 
     /*
     作业延期提醒
      */
     @PostMapping("/processDelay")
-    public void processDelay() {
-        apsProductionOrderService.processDelay();
+    public R processDelay() {
+        log.info("作业延期提醒开始");
+        Thread thread = new Thread(new Runnable() {
+            @SneakyThrows
+            public void run() {
+                apsProductionOrderService.processDelay();
+            }
+        });
+        thread.start(); // 启动线程
+        return R.ok();
     }
 
     /**
@@ -107,8 +131,16 @@ public class ApsProductionOrderController {
     报工不合格提醒
      */
     @PostMapping("/reportUnqualify")
-    public void reportUnqualify() {
-        apsProductionOrderService.reportUnqualify();
+    public R reportUnqualify() {
+        log.info("报工不合格提醒开始");
+        Thread thread = new Thread(new Runnable() {
+            @SneakyThrows
+            public void run() {
+                apsProductionOrderService.reportUnqualify();
+            }
+        });
+        thread.start(); // 启动线程
+        return R.ok();
     }
 
 
@@ -129,7 +161,7 @@ public class ApsProductionOrderController {
      * 订单操作之前，判断是否有人更改
      */
     @PostMapping("/haveBeChanged")
-    public R haveBeChanged(@RequestBody OrderHaveBeChangedReq req){
+    public R haveBeChanged(@RequestBody OrderHaveBeChangedReq req) {
         return apsProductionOrderService.haveBeChanged(req);
     }
 }