Merge branch 'dev-temp-castle-2412191916-44449' into dev

modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesProduceSnExtService.java

@@ -71,4 +71,7 @@ public interface IMesProduceSnExtService {
 
     @ApiOperation(value = "根据零件条码信息")
     ListPager<MesProduceSn> queryMesProduceSn(MesProduceSn mesProduceSn, Pager pager);
+
+    @ApiOperation(value = "根据条码和工厂获取")
+    String queryPartNoByProduceSn(String productSn,String organizeCode);
 }

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);
+
+    }
+}

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesProduceSnExtService.java

@@ -264,4 +264,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();
+    }
 }