Merge branch 'uat-temp-nht-2504300000-46708' into yfai-20250418-dev

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesShippingKanbanCfgServiceImpl.java

@@ -56,6 +56,9 @@ public class MesShippingKanbanCfgServiceImpl implements IMesShippingKanbanCfgSer
     @Override
     public MesShippingKanbanCfgModel queryShippingKanbanCfg(String organizeCode, String shippingGroupCode) {
         MesShippingKanbanCfgModel model = new MesShippingKanbanCfgModel();
+        if (StringUtils.isEmpty(shippingGroupCode)) {
+            return model;
+        }
         DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
         DdlPreparedPack.getStringEqualPack(shippingGroupCode, "shippingGroupCode", packBean);
         MesShippingKanbanCfg kanbanCfg = shippingKanbanCfgRDao.getByProperty(packBean);