From 7a1b06614d4f48edb491a7b641cf38d54c48871d Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Fri, 18 Oct 2024 11:56:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=94=B5=E6=B5=8B=E8=AF=95-?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=94=9F=E4=BA=A7=E8=AE=B0=E5=BD=95=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiservice/serviceimpl/busi/DcsForEquipmentServiceImpl.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/DcsForEquipmentServiceImpl.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/DcsForEquipmentServiceImpl.java index 011b4df..dd0dc80 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/DcsForEquipmentServiceImpl.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/DcsForEquipmentServiceImpl.java @@ -130,7 +130,10 @@ public class DcsForEquipmentServiceImpl implements IDcsForEquipmentService { //查询erp零件号 根据客户零件号 DdlPackBean custPartPackBean = DdlPackBean.getDdlPackBean(organizeCode); DdlPreparedPack.getStringEqualPack(partNo,"custPartNo",custPartPackBean); - DdlPreparedPack.getStringEqualPack(custCode,"custCode",custPartPackBean); + if (!StringUtils.isEmpty(custCode)){ + DdlPreparedPack.getStringEqualPack(custCode,"custCode",custPartPackBean); + } + DdlPreparedPack.getOrderBy("createDatetime",CommonEnumUtil.ASC_OR_DESC.DESC.getValue(), custPartPackBean); List customerPartList = customerPartRao.findByHqlTopWhere(custPartPackBean, 1); if (!customerPartList.isEmpty()){ erpPartNo = customerPartList.get(0).getErpPartNo(); @@ -138,7 +141,7 @@ public class DcsForEquipmentServiceImpl implements IDcsForEquipmentService { if (StringUtils.isNotBlank(erpPartNo)){ DdlPackBean erpPartPackBean = DdlPackBean.getDdlPackBean(organizeCode); - DdlPreparedPack.getStringEqualPack(erpPartNo,"erpPartNo",erpPartPackBean); + DdlPreparedPack.getStringEqualPack(erpPartNo,"partNo",erpPartPackBean); List partSapList = partSapRao.findByHqlTopWhere(erpPartPackBean, 1); String partName = ""; if (!partSapList.isEmpty()){