Merge branch 'refs/heads/mes-uat-changshu0609-temp-logic-20250613-3533' into mes-dev

modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/base/IMesContainerSnService.java

@@ -15,6 +15,6 @@ public interface IMesContainerSnService {
 
     ListPager<MesContainerSn> queryMesContainerSnByPager(MesContainerSn mesContainerSn, Pager pager);
 
-    boolean checkContainerSnIsExist(String containerSn, String organizeCode);
+    void checkContainerSnIsExist(String containerSn, String organizeCode);
 
 }

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesContainerSnServiceImpl.java

@@ -1,13 +1,16 @@
 package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.base;
 
 import cn.estsh.i3plus.ext.mes.pcn.api.base.IMesContainerSnService;
+import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.common.PagerHelper;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.mes.bean.MesContainerSn;
 import cn.estsh.i3plus.pojo.mes.repository.MesContainerSnRepository;
+import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -39,10 +42,16 @@ public class MesContainerSnServiceImpl implements IMesContainerSnService {
     }
 
     @Override
-    public boolean checkContainerSnIsExist(String containerSn, String organizeCode) {
+    public void checkContainerSnIsExist(String containerSn, String organizeCode) {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode);
         DdlPreparedPack.getStringEqualPack(containerSn, "containerSn", ddlPackBean);
-        return mesContainerSnRepository.isExitByHql(ddlPackBean);
+        if (!mesContainerSnRepository.isExitByHql(ddlPackBean)) {
+            throw ImppExceptionBuilder.newInstance()
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.MES_PCN.getCode())
+                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+                    .setErrorDetail("容器条码【%s】不存在!", containerSn)
+                    .build();
+        }
     }
 
 }