From a2b776ca0718bc5f8e04ba4b36b1131cc1920128 Mon Sep 17 00:00:00 2001
From: "DESKTOP-J7ED0MB\\yinjinlu" <411641505@qq.com>
Date: Tue, 1 Nov 2022 23:21:32 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=8A=A5=E5=B7=A5=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pro/controller/ProFeedbackController.java | 23 +++++++++++++++----
 .../mes/pro/controller/ProTaskController.java |  7 ++++++
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProFeedbackController.java b/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProFeedbackController.java
index 83fd40e..4844aba 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProFeedbackController.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProFeedbackController.java
@@ -116,11 +116,13 @@ public class ProFeedbackController extends BaseController
     public AjaxResult add(@RequestBody ProFeedback proFeedback)
     {
         MdWorkstation workstation = mdWorkstationService.selectMdWorkstationByWorkstationId(proFeedback.getWorkstationId());
-        proFeedback.setProcessId(workstation.getProcessId());
-        proFeedback.setProcessCode(workstation.getProcessCode());
-        proFeedback.setProcessName(workstation.getProcessName());
-
-        //根据生产工单，工作站，工序 查找对应的生产任务
+        if(StringUtils.isNotNull(workstation)){
+            proFeedback.setProcessId(workstation.getProcessId());
+            proFeedback.setProcessCode(workstation.getProcessCode());
+            proFeedback.setProcessName(workstation.getProcessName());
+        }else {
+            return AjaxResult.error("当前生产任务对应的工作站不存在！");
+        }
 
         return toAjax(proFeedbackService.insertProFeedback(proFeedback));
     }
@@ -161,7 +163,15 @@ public class ProFeedbackController extends BaseController
     @PutMapping("/{recordId}")
     public AjaxResult execute(@PathVariable("recordId") Long recordId){
 
+        if(!StringUtils.isNotNull(recordId)){
+            return AjaxResult.error("请先保存单据");
+        }
+
         ProFeedback feedback= proFeedbackService.selectProFeedbackByRecordId(recordId);
+        if(feedback.getQuantityFeedback().compareTo(BigDecimal.ZERO) !=1){
+            return AjaxResult.error("报工数量必须大于0");
+        }
+
         ProWorkorder workorder = proWorkorderService.selectProWorkorderByWorkorderId(feedback.getWorkorderId());
         //更新生产任务的生产数量
         ProTask task = proTaskService.selectProTaskByTaskId(feedback.getTaskId());
@@ -196,6 +206,9 @@ public class ProFeedbackController extends BaseController
             executeItemConsume(itemConsume);
         }
 
+        //更新报工单的状态
+        feedback.setStatus(UserConstants.ORDER_STATUS_FINISHED);
+        proFeedbackService.updateProFeedback(feedback);
         return AjaxResult.success();
     }
 
diff --git a/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProTaskController.java b/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProTaskController.java
index c0a0e8b..55a8d9c 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProTaskController.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProTaskController.java
@@ -166,6 +166,9 @@ public class ProTaskController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody ProTask proTask)
     {
+        if(proTask.getQuantity().compareTo(BigDecimal.ZERO) !=1){
+            return AjaxResult.error("排产数量必须大于0！");
+        }
 
         //生产工单
         ProWorkorder order = proWorkorderService.selectProWorkorderByWorkorderId(proTask.getWorkorderId());
@@ -191,6 +194,7 @@ public class ProTaskController extends BaseController
         proTask.setTaskName(new StringBuilder().append(proTask.getItemName()).append("【").append(proTask.getQuantity().toString()).append("】").append(proTask.getUnitOfMeasure()).toString());
 
 
+
         return toAjax(proTaskService.insertProTask(proTask));
     }
 
@@ -202,6 +206,9 @@ public class ProTaskController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody ProTask proTask)
     {
+        if(proTask.getQuantity().compareTo(BigDecimal.ZERO) !=1){
+            return AjaxResult.error("排产数量必须大于0！");
+        }
 
         return toAjax(proTaskService.updateProTask(proTask));
     }