From ad4c284b58c7a56fb7d46969b2470331ef70801e Mon Sep 17 00:00:00 2001 From: "xiangwei.zhang" <752558143@qq.com> Date: Thu, 10 Apr 2025 15:37:02 +0800 Subject: [PATCH] =?UTF-8?q?46229=20PCN=EF=BC=9A=E5=AE=A2=E9=80=80=E5=93=81?= =?UTF-8?q?=E7=94=B5=E5=AD=90=E5=8C=96=E6=A3=80=E9=AA=8C=EF=BC=8C=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=E7=BA=BF=E9=9C=80=E8=A6=81=E6=94=AF=E6=8C=81=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E5=AE=A2=E6=88=B7=E6=9D=A1=E7=A0=81=E5=92=8C=E5=B7=A5?= =?UTF-8?q?=E5=8D=95=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java | 3 ++- .../pcn/apiservice/serviceimpl/busi/MesProduceSnExtService.java | 9 +++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java index 7d7a0c8..2c09905 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java @@ -364,6 +364,7 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService { String workCenterCode = ""; if (mesPartInspection != null) { workCenterCode = mesPartInspection.getWorkCenterCode(); + requestModel.setSn(mesPartInspection.getSn()); } requestModel.setReworkedQty(mesReworkTask.getQty()); if (MesExtEnumUtil.NC_TYPE.REWORK.getValue() == requestModel.getType()) { @@ -1207,7 +1208,7 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService { move.setPostTime(TimeTool.getTimeShortWithColon()); move.setMoveType(MesExtEnumUtil.MOVE_TYPE.RETURN_MOVE.getValue()); move.setProductSn(requestModel.getSn()); - move.setWorkCenter(workCenterCode); + move.setWorkCenter(prodOrgExtService.getErpWorkCenterCode(requestModel.getOrganizeCode(), workCenterCode)); ConvertBean.serviceModelInitialize(move, requestModel.getUserName()); moveRepository.insert(move); } 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 52d5752..85a5178 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 @@ -67,8 +67,13 @@ public class MesProduceSnExtService implements IMesProduceSnExtService { DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); DdlPreparedPack.getStringEqualPack(productSn, MesPcnExtConstWords.PRODUCT_SN, packBean); - - return produceSnRepository.findByHqlWhere(packBean); + List snList = produceSnRepository.findByHqlWhere(packBean); + if (CollectionUtils.isEmpty(snList)) { + DdlPackBean packCustSnBean = DdlPackBean.getDdlPackBean(organizeCode); + DdlPreparedPack.getStringEqualPack(productSn, MesPcnExtConstWords.CUST_SN, packCustSnBean); + snList = produceSnRepository.findByHqlWhere(packCustSnBean); + } + return snList; } //根据零件条码查询零件条码信息, 创建时间倒序