43289 SPS拉动提示系统异常

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

@@ -54,6 +54,7 @@ public class MesPullingOrderInfoService implements IMesPullingOrderInfoService {
 
     @Autowired
     private IMesConfigService configService;
+
     @Override
     public ListPager<MesPullingOrderInfo> queryMesPullingOrderInfoByPager(MesPullingOrderInfo bean, Pager pager) {
         DdlPackBean packBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode());
@@ -110,9 +111,9 @@ public class MesPullingOrderInfoService implements IMesPullingOrderInfoService {
         }
 
         //强过码 如果强过为true 不校验顺序 直接扫描完成修改状态为已扫描
-        //扫完单号 扫强过码校验通过后 单号顺序之前的单子变成无序 都可扫描
+        //扫完单号 扫强过码校验通过后 单号顺序之前的单子变成无序 都可扫描 43289 SPS拉动提示系统异常
 //        String spsPass = configService.getCfgValue(bean.getOrganizeCode(), MesPcnExtConstWords.SPS_STRONGER_PASS);
-        if (mesPullingOrderInfo.getIsPassCode()==CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()
+        if ((!Objects.isNull(mesPullingOrderInfo.getIsPassCode()) && mesPullingOrderInfo.getIsPassCode() == CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue())
                 || (!Objects.isNull(bean.getIsPass()) && CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue() == bean.getIsPass())) {
             mesPullingOrderInfo.setPullOrderStatus(MesExtEnumUtil.PULL_ORDER_STATUS.JIS_PULL.getValue());
             ConvertBean.serviceModelUpdate(mesPullingOrderInfo, userName);
@@ -135,7 +136,7 @@ public class MesPullingOrderInfoService implements IMesPullingOrderInfoService {
             DdlPackBean packBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode());
             DdlPreparedPack.getStringEqualPack(bean.getPullCode(), "pullCode", packBean);
             DdlPreparedPack.getStringEqualPack(bean.getWorkCenterCode(), "workCenterCode", packBean);
-            DdlPreparedPack.getNumEqualPack(bean.getPullOrderType(), "pullOrderType", packBean);
+            DdlPreparedPack.getNumEqualPack(MesExtEnumUtil.PART_PULL_ORDER_TYPE.SPS_PULL.getValue(), "pullOrderType", packBean);
             DdlPreparedPack.getNumEqualPack(MesExtEnumUtil.PULL_ORDER_STATUS.KITTING_PULL.getValue(), "pullOrderStatus", packBean);
 
             //顺序校验 根据未扫描单号 1 、2 、3，如果没有强过码 必须先扫1 再扫2  pullingOrderNo修改位workOrderNo
@@ -252,7 +253,7 @@ public class MesPullingOrderInfoService implements IMesPullingOrderInfoService {
                 ConvertBean.serviceModelUpdate(partInfo, userName);
                 mesPullingOrderPartInfoRepository.update(partInfo);
             } else {
-                MesPcnException.throwMesBusiException("工单拉动组明细【%s】数据为空", mesPullingOrderInfo.getWorkOrderNo());
+                MesPcnException.throwMesBusiException("工单拉动组明细【%s】校验规则失败", mesPullingOrderInfo.getWorkOrderNo());
             }
         } else {
             MesPcnException.throwMesBusiException("工单拉动组明细【%s】数据为空", mesPullingOrderInfo.getWorkOrderNo());