排序发运打印 龙兴

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, "模版配置代码不能为空");
             }

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<MesCimSeresSrmRunSheetJisDetail> 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());
     }
 
 }