From 03f6e6fbce108ff34bebefaa2440ad486889fe12 Mon Sep 17 00:00:00 2001
From: "castle.zang" <castle.zang@estsh.com>
Date: Thu, 19 Dec 2024 19:41:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9ELeo=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=EF=BC=8C=E9=80=9A=E8=BF=87=E6=8A=A5=E5=B7=A5=E6=9D=A1=E7=A0=81?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=9B=B6=E4=BB=B6=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mes/pcn/api/busi/IMesProduceSnExtService.java  |  3 +++
 .../controller/base/MesWhiteController.java        | 30 ++++++++++++++++++++++
 .../serviceimpl/busi/MesProduceSnExtService.java   |  8 ++++++
 3 files changed, 41 insertions(+)
 create mode 100644 modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/base/MesWhiteController.java

diff --git a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesProduceSnExtService.java b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesProduceSnExtService.java
index 9d89691..d4b6928 100644
--- a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesProduceSnExtService.java
+++ b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesProduceSnExtService.java
@@ -59,4 +59,7 @@ public interface IMesProduceSnExtService {
 
     @ApiOperation(value = "根据零件条码信息")
     ListPager<MesProduceSn> queryMesProduceSn(MesProduceSn mesProduceSn, Pager pager);
+
+    @ApiOperation(value = "根据条码和工厂获取")
+    String queryPartNoByProduceSn(String productSn,String organizeCode);
 }
diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/base/MesWhiteController.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/base/MesWhiteController.java
new file mode 100644
index 0000000..c75ac3b
--- /dev/null
+++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/base/MesWhiteController.java
@@ -0,0 +1,30 @@
+package cn.estsh.i3plus.ext.mes.pcn.apiservice.controller.base;
+
+import cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.busi.MesProduceSnExtService;
+import cn.estsh.impp.framework.boot.util.ResultBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/white")
+public class MesWhiteController {
+
+    @Autowired
+    private MesProduceSnExtService mesProduceSnExtService;
+
+    @GetMapping("/mesPartSap/{productSn}/{organizeCode}")
+    public ResultBean getPartNo(@PathVariable String productSn,@PathVariable String organizeCode){
+
+        String partNo;
+        try {
+            partNo = mesProduceSnExtService.queryPartNoByProduceSn(productSn, organizeCode);
+        } catch (Exception e) {
+           return ResultBean.fail("查询失败").setErrorMsg(e.getMessage());
+        }
+        return ResultBean.success("查询成功").setResultObject(partNo);
+
+    }
+}
diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesProduceSnExtService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesProduceSnExtService.java
index 0708879..1adc1c4 100644
--- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesProduceSnExtService.java
+++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesProduceSnExtService.java
@@ -224,4 +224,12 @@ public class MesProduceSnExtService implements IMesProduceSnExtService {
         List<MesProduceSn> resultList = produceSnRepository.findByHqlWherePage(packBean, pager);
         return new ListPager<>(resultList, pager);
     }
+
+    @Override
+    public String queryPartNoByProduceSn(String productSn, String organizeCode) {
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode);
+        DdlPreparedPack.getStringEqualPack(productSn,"productSn",ddlPackBean);
+        List<MesProduceSn> produceSnList = produceSnRepository.findByHqlWhere(ddlPackBean);
+        return produceSnList.isEmpty() ? "" : produceSnList.get(0).getPartNo();
+    }
 }