排序返工作业1

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

@@ -23,6 +23,7 @@ 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.base.util.StringUtil;
 import cn.estsh.i3plus.pojo.mes.bean.*;
 import cn.estsh.i3plus.pojo.mes.bean.nc.MesPartInspection;
 import cn.estsh.i3plus.pojo.mes.bean.nc.MesPartInspectionDetail;
@@ -133,13 +134,20 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService {
     @Autowired
     private MesQmsScrapRepository mesQmsScrapRepository;
 
+    @Autowired
+    private IMesWorkOrderExtService workOrderExtService;
     @Override
     public ListPager<MesReworkTask> queryReworkTask(MesReworkTask mesReworkTask, Pager pager) {
         String organizeCode = !StringUtils.isEmpty(mesReworkTask.getOrganizeCode())?mesReworkTask.getOrganizeCode():AuthUtil.getOrganizeCode();
         DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
         if (mesReworkTask.getSn() != null) {
+            MesProduceSn produceSn = (MesProduceSn) workOrderExtService.getWorkOrderSort(organizeCode, mesReworkTask.getSn(), false);
+            if(!StringUtil.isEmpty(produceSn)){
+                DdlPreparedPack.getStringEqualPack(produceSn.getProductSn(), "sn", packBean);
+            }else {
                 DdlPreparedPack.getStringEqualPack(mesReworkTask.getSn(), "sn", packBean);
             }
+        }
         DdlPreparedPack.getStringEqualPack(mesReworkTask.getReworkOrder(), "reworkOrder", packBean);
         DdlPreparedPack.getNumEqualPack(MesExtEnumUtil.REWORK_TASK_STATUS.CREATE.getValue(), "status", packBean);
         DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, packBean);
@@ -824,8 +832,13 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService {
     private MesReworkTask getMesReworkTask(MesReworkTaskRequestModel requestModel) {
         DdlPackBean packBean = DdlPackBean.getDdlPackBean(requestModel.getOrganizeCode());
         if (!StringUtils.isEmpty(requestModel.getSn())) {
+            MesProduceSn produceSn = (MesProduceSn) workOrderExtService.getWorkOrderSort(requestModel.getOrganizeCode(), requestModel.getSn(), false);
+            if(!StringUtil.isEmpty(produceSn)){
+                DdlPreparedPack.getStringEqualPack(produceSn.getProductSn(), "sn", packBean);
+            }else {
                 DdlPreparedPack.getStringEqualPack(requestModel.getSn(), "sn", packBean);
             }
+        }
         if (!StringUtils.isEmpty(requestModel.getReworkOrder())) {
             DdlPreparedPack.getStringEqualPack(requestModel.getReworkOrder(), "reworkOrder", packBean);
         }

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

@@ -111,9 +111,9 @@ public class MesPullingOrderInfoService implements IMesPullingOrderInfoService {
 
         //强过码 如果强过为true 不校验顺序 直接扫描完成修改状态为已扫描
         //扫完单号 扫强过码校验通过后 单号顺序之前的单子变成无序 都可扫描
-        String spsPass = configService.getCfgValue(bean.getOrganizeCode(), MesPcnExtConstWords.SPS_STRONGER_PASS);
+//        String spsPass = configService.getCfgValue(bean.getOrganizeCode(), MesPcnExtConstWords.SPS_STRONGER_PASS);
         if (mesPullingOrderInfo.getIsPassCode()==CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()
-                ||(!Objects.isNull(bean.getIsPass()) && spsPass.equals(bean.getIsPass()))) {
+                ||(!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);
             mesPullingOrderInfoRepository.update(mesPullingOrderInfo);