From 7bc4ce0d6a3c9b1693f082cbf3af1da6d2ef9730 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Sun, 27 Apr 2025 11:24:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=A5=E5=85=B7=E9=A2=86?=
 =?UTF-8?q?=E7=94=A8=E5=92=8C=E6=8A=A5=E5=B7=A5=E6=8F=90=E7=A4=BA=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ScheduleController.java        |  4 +-
 .../Schedule/service/ScheduleService.java     |  2 +-
 .../service/impl/ScheduleServiceImpl.java     | 43 +++++++++++++++----
 3 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/jtem/modules/Schedule/controller/ScheduleController.java b/src/main/java/com/jtem/modules/Schedule/controller/ScheduleController.java
index b2010b5..fc00ddf 100644
--- a/src/main/java/com/jtem/modules/Schedule/controller/ScheduleController.java
+++ b/src/main/java/com/jtem/modules/Schedule/controller/ScheduleController.java
@@ -307,8 +307,8 @@ public class ScheduleController {
      */
     @PostMapping("/toolReport")
     public R toolReport(@RequestBody ToolOutData inData){
-        scheduleService.toolReport(inData);
-        return R.ok();
+        String msg = scheduleService.toolReport(inData);
+        return R.ok(msg);
     }
     /**
      * @Description TODO
diff --git a/src/main/java/com/jtem/modules/Schedule/service/ScheduleService.java b/src/main/java/com/jtem/modules/Schedule/service/ScheduleService.java
index cc4083a..c929f24 100644
--- a/src/main/java/com/jtem/modules/Schedule/service/ScheduleService.java
+++ b/src/main/java/com/jtem/modules/Schedule/service/ScheduleService.java
@@ -226,7 +226,7 @@ public interface ScheduleService {
      * @return void
      * @throw
      */
-    void toolReport(ToolOutData inData);
+    String toolReport(ToolOutData inData);
 
     /**
      * @Description 报工使用记录
diff --git a/src/main/java/com/jtem/modules/Schedule/service/impl/ScheduleServiceImpl.java b/src/main/java/com/jtem/modules/Schedule/service/impl/ScheduleServiceImpl.java
index 3cd1412..39c54cb 100644
--- a/src/main/java/com/jtem/modules/Schedule/service/impl/ScheduleServiceImpl.java
+++ b/src/main/java/com/jtem/modules/Schedule/service/impl/ScheduleServiceImpl.java
@@ -321,15 +321,15 @@ public class ScheduleServiceImpl implements ScheduleService {
     public String toolIssuance(SfdcToolingHist inData){
         //存储过程判断
         List<Object> params = new ArrayList<>();
-//        工厂编码
+        //工厂编码
         params.add(inData.getSite());
-//        工单号
+        //工单号
         params.add(inData.getOrderNo());
-        //        工序号
+        //工序号
         params.add(inData.getItemNo());
-//        派工单号
+        //派工单号
         params.add(inData.getSeqNo());
-//        工具实例编码
+        //工具实例编码
         params.add(inData.getToolInstanceId());
 
         List<Map<String, Object>> resultList = procedureMapper.getProcedureData("checkToolInstanceIdForSfdc", params);
@@ -339,12 +339,11 @@ public class ScheduleServiceImpl implements ScheduleService {
         }else if(Integer.parseInt(String.valueOf(map.get("resultCode")))  == 400) {
             throw new RuntimeException(String.valueOf(map.get("resultMsg")));
         }
-        String result="领用成功！";
+        String result = "";
         if(Integer.parseInt(String.valueOf(map.get("resultCode")))  == 201){
-            result=result+String.valueOf(map.get("resultMsg"));
+            result =  result + String.valueOf(map.get("resultMsg"));
         }
         scheduleMapper.saveToolIssuance(inData);
-
         return  result;
     }
 
@@ -369,13 +368,39 @@ public class ScheduleServiceImpl implements ScheduleService {
 
     @Override
     @Transactional
-    public void toolReport(ToolOutData inData){
+    public String toolReport(ToolOutData inData){
         inData.setUseQty(Math.ceil(inData.getFinishQty()/inData.getMoQty()));
         scheduleMapper.updateToolSfdc(inData);
         // scheduleMapper.updateToolActualUseQty(inData.getSite(),inData.getToolInstanceId(),inData.getUseQty());
         String toolId=scheduleMapper.getToolIdWithToolInstanceID(inData.getSite(),inData.getToolInstanceId());
         inData.setToolId(toolId);
         scheduleMapper.saveToolUsageHist(inData);
+        // 工具报工后执行 工具领用函数
+
+        //存储过程判断
+        List<Object> params = new ArrayList<>();
+        //工厂编码
+        params.add(inData.getSite());
+        //工单号
+        params.add(inData.getOrderNo());
+        //工序号
+        params.add(inData.getItemNo());
+        //派工单号
+        params.add(inData.getSeqNo());
+        //工具实例编码
+        params.add(inData.getToolInstanceId());
+
+        List<Map<String, Object>> resultList = procedureMapper.getProcedureData("checkToolInstanceIdForSfdc", params);
+        Map<String ,Object> map = resultList.get(0);
+        String result = "";
+        if(map == null){
+            throw new RuntimeException("返回结果错误！");
+        }else if(Integer.parseInt(String.valueOf(map.get("resultCode")))  == 400) {
+            result =  result + String.valueOf(map.get("resultMsg"));
+        }else if(Integer.parseInt(String.valueOf(map.get("resultCode")))  == 201){
+            result =  result + String.valueOf(map.get("resultMsg"));
+        }
+        return result;
     }
 
     @Override