From aeeaa698476ec21771f5ee5dbb66327ff9ac8df4 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 17 Mar 2025 09:24:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E5=BA=8F=E5=8F=91=E8=BF=90=E6=89=93?= =?UTF-8?q?=E5=8D=B0=20=E9=BE=99=E5=85=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiservice/controller/base/MesLabelTemplateExtController.java | 3 ++- .../sortshipping/strategy/CqLxSortShippingPrintStrategyService.java | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesLabelTemplateExtController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesLabelTemplateExtController.java index ded11da..b93157b 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesLabelTemplateExtController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesLabelTemplateExtController.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.ext.mes.api.base.IMesConfigService; import cn.estsh.i3plus.ext.mes.api.base.IMesLabelTemplateService; import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant; import cn.estsh.i3plus.ext.mes.pojo.util.MesExtConstWords; +import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.util.ResultBean; @@ -33,7 +34,7 @@ public class MesLabelTemplateExtController { @ApiOperation(value = "获取系统配置的模版信息") public ResultBean queryMesLabelTemplate(String organizeCode, String moduleCode, String templateCode) { try { - ValidatorBean.checkNotNull(organizeCode, "工厂代码不能为空"); + if (StringUtils.isEmpty(organizeCode)) organizeCode = AuthUtil.getOrganize().getOrganizeCode(); if (StringUtils.isEmpty(moduleCode) && StringUtils.isEmpty(templateCode)) { ValidatorBean.checkNotNull(moduleCode, "模版配置代码不能为空"); } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/print/sortshipping/strategy/CqLxSortShippingPrintStrategyService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/print/sortshipping/strategy/CqLxSortShippingPrintStrategyService.java index 99573ba..35dc4a1 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/print/sortshipping/strategy/CqLxSortShippingPrintStrategyService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/print/sortshipping/strategy/CqLxSortShippingPrintStrategyService.java @@ -147,7 +147,10 @@ public class CqLxSortShippingPrintStrategyService extends SortShippingDispatchSt DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); if (jisIdList.size() == 1) DdlPreparedPack.getNumEqualPack(jisIdList.get(0), MesExtConstWords.PID, packBean); else DdlPreparedPack.getInPackList(jisIdList, MesExtConstWords.PID, packBean); - return cimSeresSrmRunSheetJisDetailRepository.findByHqlWhere(packBean); + List cimSeresSrmRunSheetJisDetailList = cimSeresSrmRunSheetJisDetailRepository.findByHqlWhere(packBean); + return CollectionUtils.isEmpty(cimSeresSrmRunSheetJisDetailList) ? null : + cimSeresSrmRunSheetJisDetailList.stream().filter(o -> (null != o && !StringUtils.isEmpty(o.getSerialNumber()))) + .sorted(Comparator.comparing(MesCimSeresSrmRunSheetJisDetail::getSerialNumber)).collect(Collectors.toList()); } }