46229 PCN：客退品电子化检验，排序线需要支持扫描客户条码和工单号

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

@@ -364,6 +364,7 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService {
             String workCenterCode = "";
             if (mesPartInspection != null) {
                 workCenterCode = mesPartInspection.getWorkCenterCode();
+                requestModel.setSn(mesPartInspection.getSn());
             }
             requestModel.setReworkedQty(mesReworkTask.getQty());
             if (MesExtEnumUtil.NC_TYPE.REWORK.getValue() == requestModel.getType()) {
@@ -1207,7 +1208,7 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService {
         move.setPostTime(TimeTool.getTimeShortWithColon());
         move.setMoveType(MesExtEnumUtil.MOVE_TYPE.RETURN_MOVE.getValue());
         move.setProductSn(requestModel.getSn());
-        move.setWorkCenter(workCenterCode);
+        move.setWorkCenter(prodOrgExtService.getErpWorkCenterCode(requestModel.getOrganizeCode(), workCenterCode));
         ConvertBean.serviceModelInitialize(move, requestModel.getUserName());
         moveRepository.insert(move);
     }

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

@@ -67,8 +67,13 @@ public class MesProduceSnExtService implements IMesProduceSnExtService {
 
         DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
         DdlPreparedPack.getStringEqualPack(productSn, MesPcnExtConstWords.PRODUCT_SN, packBean);
-
+        List<MesProduceSn> snList = produceSnRepository.findByHqlWhere(packBean);
-        return produceSnRepository.findByHqlWhere(packBean);
+        if (CollectionUtils.isEmpty(snList)) {
+            DdlPackBean packCustSnBean = DdlPackBean.getDdlPackBean(organizeCode);
+            DdlPreparedPack.getStringEqualPack(productSn, MesPcnExtConstWords.CUST_SN, packCustSnBean);
+            snList = produceSnRepository.findByHqlWhere(packCustSnBean);
+        }
+        return snList;
     }
 
     //根据零件条码查询零件条码信息, 创建时间倒序