From f2fdb8eb36881a71d2cc1ef5bf068ca319561ab4 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Thu, 11 Dec 2025 16:12:19 +0800 Subject: [PATCH] =?UTF-8?q?2025-12-11=20=E8=BF=87=E7=AB=99=E9=87=87?= =?UTF-8?q?=E9=9B=86-=E3=80=8B=E8=BD=A6=E9=97=B4=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0->=E6=9D=90=E6=96=99=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E3=80=90=E6=9D=90=E6=96=99=E6=9A=82=E5=AD=98?= =?UTF-8?q?=E3=80=91=E3=80=90=E6=9D=90=E6=96=99=E6=8B=BC=E5=8D=B7=E3=80=91?= =?UTF-8?q?=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../YieldReportCommonsController.java | 76 ++++++++++ .../Impl/YieldReportCommonsServiceImpl.java | 131 ++++++++++++++++++ .../service/YieldReportCommonsService.java | 28 ++++ 3 files changed, 235 insertions(+) create mode 100644 src/main/java/com/gaotao/modules/pms/controller/YieldReportCommonsController.java create mode 100644 src/main/java/com/gaotao/modules/pms/service/Impl/YieldReportCommonsServiceImpl.java create mode 100644 src/main/java/com/gaotao/modules/pms/service/YieldReportCommonsService.java diff --git a/src/main/java/com/gaotao/modules/pms/controller/YieldReportCommonsController.java b/src/main/java/com/gaotao/modules/pms/controller/YieldReportCommonsController.java new file mode 100644 index 0000000..cd39057 --- /dev/null +++ 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 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 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", "操作成功"); + } +} + diff --git a/src/main/java/com/gaotao/modules/pms/service/Impl/YieldReportCommonsServiceImpl.java b/src/main/java/com/gaotao/modules/pms/service/Impl/YieldReportCommonsServiceImpl.java new file mode 100644 index 0000000..169bfc0 --- /dev/null +++ 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 + **/ + @Override + public Map 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 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 + **/ + private Map callMaterialProcessLoss(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, Float returnQty, int histSeqNo, String operatorId, String remark) { + List 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> resultList = procedureMapper.getProcedureData("MaterialProcessLoss", params); + // 处理返回的结果 + return resultList.get(0); + } + + /** + * @Description 材料接卷 + * @DateTime 2025/12/11 + * @Param [inData] + * @return java.util.Map + **/ + @Override + public Map 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 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 + **/ + private Map callMaterialProcessRollUp(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, Float returnQty, int histSeqNo, String operatorId, String remark) { + List 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> resultList = procedureMapper.getProcedureData("MaterialProcessRollUp", params); + // 处理返回的结果 + return resultList.get(0); + } +} + diff --git a/src/main/java/com/gaotao/modules/pms/service/YieldReportCommonsService.java b/src/main/java/com/gaotao/modules/pms/service/YieldReportCommonsService.java new file mode 100644 index 0000000..4752246 --- /dev/null +++ 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 + **/ + Map materialProcessLoss(SearchScheduleData inData); + + /** + * @Description 材料接卷 + * @DateTime 2025/12/11 + * @Param [inData] + * @return java.util.Map + **/ + Map materialProcessRollUp(SearchScheduleData inData); +} +