2025-12-11

过站采集-》车间工作平台->材料清单新增【材料暂存】【材料拼卷】操作
1 month ago · f2fdb8eb36
3 changed files with 235 additions and 0 deletions
--- a/src/main/java/com/gaotao/modules/pms/controller/YieldReportCommonsController.java
+++ b/src/main/java/com/gaotao/modules/pms/controller/YieldReportCommonsController.java
@ -0,0 +1,76 @@
+package com.gaotao.modules.pms.controller;
+
+import com.gaotao.common.utils.R;
+import com.gaotao.modules.schedule.data.SearchScheduleData;
+import com.gaotao.modules.pms.service.YieldReportCommonsService;
+import com.gaotao.modules.sys.controller.AbstractController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * 过站采集公共Controller
+ */
+@RestController
+@RequestMapping("pms/yieldReportCommons")
+public class YieldReportCommonsController extends AbstractController {
+
+    @Autowired
+    private YieldReportCommonsService yieldReportCommonsService;
+
+    /**
+     * @Description 材料损耗
+     * @DateTime 2025/12/11
+     * @Param [inData]
+     * @return com.gaotao.common.utils.R
+     **/
+    @RequestMapping(value = "materialProcessLoss")
+    public R materialProcessLoss(@RequestBody SearchScheduleData inData) {
+        Map<String, Object> resultMap = yieldReportCommonsService.materialProcessLoss(inData);
+        // 获取存储过程返回的code
+        String resultCode = String.valueOf(resultMap.get("Code"));
+        String resultMsg = String.valueOf(resultMap.get("Message"));
+
+        if ("201".equalsIgnoreCase(resultCode)) {
+            // code=201 表示需要打印，返回打印参数
+            return R.ok()
+                    .put("code", 201)
+                    .put("msg", resultMsg)
+                    .put("printData", resultMap);
+        }
+
+        return R.ok()
+                .put("code", 200)
+                .put("msg", "操作成功");
+    }
+
+    /**
+     * @Description 材料接卷
+     * @DateTime 2025/12/11
+     * @Param [inData]
+     * @return com.gaotao.common.utils.R
+     **/
+    @RequestMapping(value = "materialProcessRollUp")
+    public R materialProcessRollUp(@RequestBody SearchScheduleData inData) {
+        Map<String, Object> resultMap = yieldReportCommonsService.materialProcessRollUp(inData);
+        // 获取存储过程返回的code
+        String resultCode = String.valueOf(resultMap.get("Code"));
+        String resultMsg = String.valueOf(resultMap.get("Message"));
+
+        if ("201".equalsIgnoreCase(resultCode)) {
+            // code=201 表示需要打印，返回打印参数
+            return R.ok()
+                    .put("code", 201)
+                    .put("msg", resultMsg)
+                    .put("printData", resultMap);
+        }
+
+        return R.ok()
+                .put("code", 200)
+                .put("msg", "操作成功");
+    }
+}
+
--- a/src/main/java/com/gaotao/modules/pms/service/Impl/YieldReportCommonsServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/pms/service/Impl/YieldReportCommonsServiceImpl.java
@ -0,0 +1,131 @@
+package com.gaotao.modules.pms.service.Impl;
+
+import com.gaotao.common.exception.XJException;
+import com.gaotao.modules.pms.service.YieldReportCommonsService;
+import com.gaotao.modules.schedule.data.SearchScheduleData;
+import com.gaotao.modules.schedule.mapper.ProcedureMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 过站采集公共Service实现类
+ */
+@Service
+public class YieldReportCommonsServiceImpl implements YieldReportCommonsService {
+
+    @Autowired
+    private ProcedureMapper procedureMapper;
+
+    /**
+     * @Description 材料损耗
+     * @DateTime 2025/12/11
+     * @Param [inData]
+     * @return java.util.Map<java.lang.String, java.lang.Object>
+     **/
+    @Override
+    public Map<String, Object> materialProcessLoss(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.callMaterialProcessLoss(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);
+        }
+        // 返回存储过程的结果（包含code和打印参数）
+        return resultMap;
+    }
+
+    /**
+     * @Description 调用材料损耗存储过程
+     * @DateTime 2025/12/11
+     * @Param [site, orderNo, itemNo, seqNo, rollNo, returnQty, histSeqNo, operatorId, remark]
+     * @return java.util.Map<java.lang.String, java.lang.Object>
+     **/
+    private Map<String, Object> callMaterialProcessLoss(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("MaterialProcessLoss", params);
+        // 处理返回的结果
+        return resultList.get(0);
+    }
+
+    /**
+     * @Description 材料接卷
+     * @DateTime 2025/12/11
+     * @Param [inData]
+     * @return java.util.Map<java.lang.String, java.lang.Object>
+     **/
+    @Override
+    public Map<String, Object> materialProcessRollUp(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.callMaterialProcessRollUp(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);
+        }
+        // 返回存储过程的结果（包含code和打印参数）
+        return resultMap;
+    }
+
+    /**
+     * @Description 调用材料接卷存储过程
+     * @DateTime 2025/12/11
+     * @Param [site, orderNo, itemNo, seqNo, rollNo, returnQty, histSeqNo, operatorId, remark]
+     * @return java.util.Map<java.lang.String, java.lang.Object>
+     **/
+    private Map<String, Object> callMaterialProcessRollUp(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("MaterialProcessRollUp", params);
+        // 处理返回的结果
+        return resultList.get(0);
+    }
+}
+
--- a/src/main/java/com/gaotao/modules/pms/service/YieldReportCommonsService.java
+++ b/src/main/java/com/gaotao/modules/pms/service/YieldReportCommonsService.java
@ -0,0 +1,28 @@
+package com.gaotao.modules.pms.service;
+
+import com.gaotao.modules.schedule.data.SearchScheduleData;
+
+import java.util.Map;
+
+/**
+ * 过站采集公共Service接口
+ */
+public interface YieldReportCommonsService {
+
+    /**
+     * @Description 材料损耗
+     * @DateTime 2025/12/11
+     * @Param [inData]
+     * @return java.util.Map<java.lang.String, java.lang.Object>
+     **/
+    Map<String, Object> materialProcessLoss(SearchScheduleData inData);
+
+    /**
+     * @Description 材料接卷
+     * @DateTime 2025/12/11
+     * @Param [inData]
+     * @return java.util.Map<java.lang.String, java.lang.Object>
+     **/
+    Map<String, Object> materialProcessRollUp(SearchScheduleData inData);
+}
+