From 82556d70a1761a764ef12a2c7bb5cd14b4b5a014 Mon Sep 17 00:00:00 2001
From: "xiangwei.zhang" <752558143@qq.com>
Date: Thu, 15 May 2025 18:57:38 +0800
Subject: [PATCH] =?UTF-8?q?46824=20[PCN]=201.=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E7=94=B5=E5=AD=90=E5=8C=96=E6=A3=80=E9=AA=8C?=
 =?UTF-8?q?=E6=AC=A1=E6=95=B0=E5=8A=9F=E8=83=BD=E9=9C=80=E6=B1=82;=202.=20?=
 =?UTF-8?q?=E5=AE=A2=E9=80=80=E7=94=B5=E5=AD=90=E5=8C=96=E6=A3=80=E9=AA=8C?=
 =?UTF-8?q?=EF=BC=8CNC=E5=A4=84=E7=90=86=E6=8B=86=E8=A7=A3=E9=9C=80?=
 =?UTF-8?q?=E6=8C=89=E7=85=A7pisces=E5=8A=9F=E8=83=BD=E6=8C=89=E5=B7=A5?=
 =?UTF-8?q?=E5=BA=8F=E9=80=80=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/busi/MesReworkTaskController.java      | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesReworkTaskController.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesReworkTaskController.java
index ac46965..5a39d46 100644
--- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesReworkTaskController.java
+++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesReworkTaskController.java
@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.ext.mes.pcn.apiservice.controller.busi;
 
 import cn.estsh.i3plus.ext.mes.pcn.api.base.IMesReworkTaskService;
+import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionRecordService;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.constant.MesCommonConstant;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.model.MesReworkTaskModel;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.model.MesReworkTaskRequestModel;
@@ -33,6 +34,9 @@ public class MesReworkTaskController {
     @Autowired
     private IMesReworkTaskService mesReworkTaskService;
 
+    @Autowired
+    private IMesProductionRecordService mesProductionRecordService;
+
     @GetMapping("/query-pager")
     @ApiOperation(value = "查询所有返工单")
     public ResultBean queryReworkTaskByPager(MesReworkTask reworkTask, Pager pager) {
@@ -192,4 +196,19 @@ public class MesReworkTaskController {
             return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
         }
     }
+
+    @GetMapping("/queryProductionRecord")
+    @ApiOperation(value = "查询加工记录")
+    public ResultBean queryProductionRecord(MesReworkTaskRequestModel requestModel) {
+        // 数据校验
+        ValidatorBean.checkNotNull(requestModel.getSn(), "条码不能为空");
+        ValidatorBean.checkNotNull(requestModel.getOrganizeCode(), "工厂代码不能为空");
+        try {
+            return ResultBean.success("查询成功").setResultObject(mesProductionRecordService.findProductionRecordList(requestModel.getOrganizeCode(),requestModel.getSn()));
+        } catch (ImppBusiException imppException) {
+            return ResultBean.fail(imppException);
+        } catch (Exception e) {
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
 }