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 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 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 produceSnList = produceSnRepository.findByHqlWhere(ddlPackBean); + return produceSnList.isEmpty() ? "" : produceSnList.get(0).getPartNo(); + } }