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()){