2025-12-02

机台工作台异常下机

src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java

@@ -1314,6 +1314,20 @@ public class ScheduleController extends AbstractController {
                 .put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
     }
 
+    /**
+     * @Description 材料生产过程中异常退料
+     * @DateTime  2025/12/2
+     * @Param [inData]
+     * @return com.gaotao.common.utils.R
+     **/
+    @RequestMapping(value = "materialReturnDuringProduction")
+    public R materialReturnDuringProduction(@RequestBody SearchScheduleData inData){
+        scheduleService.materialReturnDuringProduction(inData);
+        return R.ok()
+                .put("code", 200)
+                .put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
+    }
+
 
     /**
      * @Author LR

src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java

@@ -105,6 +105,7 @@ public class SearchScheduleData extends BaseData {
     private String showNoFinishedMaterialFlag;//显示材料
     private String autoTool;//是否自动处理工具
     private Float transQty;//交易的数量
+    private Float returnQty;//退料数量（异常下机）
     private String oriRollNo;//原始卷号
     private String newRollNo;//新切换的卷号
     private Float newRollQty;//新卷的数量
@@ -879,6 +880,14 @@ public class SearchScheduleData extends BaseData {
         this.transQty = transQty;
     }
 
+    public Float getReturnQty() {
+        return returnQty;
+    }
+
+    public void setReturnQty(Float returnQty) {
+        this.returnQty = returnQty;
+    }
+
     public String getOriRollNo() {
         return oriRollNo;
     }

src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java

@@ -762,6 +762,13 @@ public interface ScheduleService {
      **/
     void processFinishMaterialWithNoRemainder(SearchScheduleData inData);
 
+    /**
+     * @Description 材料生产过程中异常退料
+     * @DateTime 2025/12/2
+     * @Param [inData]
+     **/
+    void materialReturnDuringProduction(SearchScheduleData inData);
+
     /**
      * @Author LR
      * @Description 产量报告  --检查报告一部分卷数量

src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java

@@ -3720,6 +3720,53 @@ public class ScheduleServiceImpl implements ScheduleService {
         return resultList.get(0);
     }
 
+    @Override
+    @Transactional
+    public void materialReturnDuringProduction(SearchScheduleData inData) {
+        //公共参数
+        String site = inData.getSite();
+        String orderNo = inData.getOrderNo();
+        Integer itemNo = inData.getItemNo();
+        String seqNo = inData.getSeqNo();
+        String rollNo = inData.getRollNo();
+        Float returnQty = inData.getReturnQty();
+        int histSeqNo = inData.getHistSeqNo();
+        String operatorId = inData.getOperatorId();
+        String remark = inData.getRemark();
+
+        //存储过程  执行材料生产过程中异常退料
+        Map<String, Object> resultMap = this.callMaterialReturnDuringProduction(site, orderNo, itemNo, seqNo, rollNo, returnQty, histSeqNo, operatorId, remark);
+        //判断结果是否成功
+        String resultCode = String.valueOf(resultMap.get("Code"));
+        if ("400".equalsIgnoreCase(resultCode)) {
+            String msg = String.valueOf(resultMap.get("Message"));
+            throw new XJException(msg, 400);
+        }
+    }
+
+    /**
+     * @Description 调用材料生产过程中异常退料存储过程
+     * @DateTime 2025/12/2
+     * @Param [site, orderNo, itemNo, seqNo, rollNo, returnQty, histSeqNo, operatorId, remark]
+     * @return java.util.Map<java.lang.String, java.lang.Object>
+     **/
+    public Map<String, Object> callMaterialReturnDuringProduction(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, Float returnQty, int histSeqNo, String operatorId, String remark) {
+        List<Object> params = new ArrayList<>();
+        params.add(site);
+        params.add(orderNo);
+        params.add(itemNo);
+        params.add(seqNo);
+        params.add(rollNo);
+        params.add(returnQty);
+        params.add(histSeqNo);
+        params.add(operatorId);
+        params.add(remark); // 添加备注参数
+        //调用存储过程
+        List<Map<String, Object>> resultList = procedureMapper.getProcedureData("MaterialReturnDuringTheProductionProcess", params);
+        //处理返回的结果
+        return resultList.get(0);
+    }
+
     @Override
     public void checkFinishPartRollWithNoFqc(Map<String, Object> inMap) {
         String strPageData = String.valueOf(inMap.get("pageData"));