From e602f615b9759b1fc02cada7001845c3bfe44250 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sat, 28 Dec 2024 17:14:12 +0800 Subject: [PATCH] =?UTF-8?q?44423=20=E8=BF=94=E5=B7=A5=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=E6=8E=92=E5=BA=8F=E6=8B=86?= =?UTF-8?q?=E8=A7=A3=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java | 6 +++--- 1 file changed, 3 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 c7c4b62..d883b1f 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 @@ -393,10 +393,10 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService { for (MesProductionAssembly productionAssembly : productionAssemblyList) { if (null == productionAssembly) continue; if (productionAssembly.getMatchType().compareTo(MesExtEnumUtil.ASSEMBLY_MATCH_TYPE.MATCH_TYPE_10.getValue()) != 0) continue; - if (StringUtils.isEmpty(productionAssembly.getProductSn()) || StringUtils.isEmpty(productionAssembly.getPartNo())) continue; + if (StringUtils.isEmpty(productionAssembly.getAssemblySn()) || StringUtils.isEmpty(productionAssembly.getAssemblyPartNo())) continue; packBean = DdlPackBean.getDdlPackBean(requestModel.getOrganizeCode()); - DdlPreparedPack.getStringEqualPack(productionAssembly.getProductSn(), MesPcnExtConstWords.PRODUCT_SN, packBean); - DdlPreparedPack.getStringEqualPack(productionAssembly.getPartNo(), MesPcnExtConstWords.PART_NO, packBean); + DdlPreparedPack.getStringEqualPack(productionAssembly.getAssemblySn(), MesPcnExtConstWords.PRODUCT_SN, packBean); + DdlPreparedPack.getStringEqualPack(productionAssembly.getAssemblyPartNo(), MesPcnExtConstWords.PART_NO, packBean); DdlPreparedPack.getNumEqualPack(MesExtEnumUtil.PRODUCE_SN_STATUS.ASSEMBLY.getValue(), MesPcnExtConstWords.SN_STATUS, packBean); produceSnExtService.saveProduceSntatusByDdlPackBean(packBean, requestModel.getUserName(), MesExtEnumUtil.PRODUCE_SN_STATUS.ASSEMBLY_BACK.getValue()); }