Merge branch 'uat-temp-nht-2503130000-chengdu-shipping' into uat-temp-wj-chongqingdaqu-dev

# Conflicts:
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java
#	modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java

modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesSortShippingCheckService.java

@@ -20,6 +20,9 @@ public interface IMesSortShippingCheckService {
     @ApiOperation(value = "扫描发运单")
     MesSortShippingCheckModel doShippingOrderNoQuery(MesShippingOrderManagement shippingOrderManagement);
 
+    @ApiOperation(value = "保存料架条码")
+    MesSortShippingCheckModel saveRackNo(MesSortShippingCheckModel model, String organizeCode, String userInfo);
+
     @ApiOperation(value = "保存条码")
     MesSortShippingCheckModel saveSn(MesSortShippingCheckModel model);
 

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesSortShippingCheckController.java

@@ -94,6 +94,49 @@ public class MesSortShippingCheckController {
         }
     }
 
+    @PostMapping("/scan-rack-no")
+    @ApiOperation(value = "扫描料架条码")
+    public ResultBean saveRackNo(@RequestBody MesSortShippingCheckModel model) {
+        Boolean lockFlg = false;
+        String moduleKey = null;
+        String organizeCode = null;
+        String userInfo = null;
+        try {
+
+            if (StringUtils.isEmpty(model.getVolvoRackNo())) MesPcnException.throwBusiException("请扫描料架号!");
+
+            organizeCode = !StringUtils.isEmpty(model.getOrganizeCode()) ? model.getOrganizeCode() : AuthUtil.getOrganize().getOrganizeCode();
+
+            userInfo = !StringUtils.isEmpty(model.getUserInfo()) ? model.getUserInfo() : AuthUtil.getSessionUser().getUserName();
+
+            moduleKey = organizeCode + key + "VOLVO_RACK_NO:" + model.getVolvoRackNo();
+
+            log.info("工厂:{} 排序发运扫描料架条码 --- {} --- START --- 操作人:{} --- THREAD:{}", organizeCode, moduleKey, userInfo, Thread.currentThread().getName());
+
+            //加锁
+            lockFlg = redisLockUtil.redisLock(moduleKey);
+
+            log.info("工厂:{} 排序发运扫描料架条码 --- {} --- LOCKED --- 操作人:{} --- THREAD:{}", organizeCode, moduleKey, userInfo, Thread.currentThread().getName());
+
+            // 数据校验
+            ValidatorBean.checkNotNull(model.getShippingCode(), "发运单不能为空");
+            ValidatorBean.checkNotNull(model.getDetailList(), "发运明细不能为空");
+
+            sortShippingCheckService.saveRackNo(model, organizeCode, userInfo);
+            return ResultBean.success("查询成功").setResultObject(model);
+        } catch (ImppBusiException imppException) {
+            return ResultBean.fail(imppException);
+        } catch (Exception e) {
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        } finally {
+            //解锁
+            if (lockFlg) {
+                redisLockUtil.redisUnLock(lockFlg, moduleKey);
+                log.info("工厂:{} 排序发运扫描位置码 --- {} --- UNLOCK --- 操作人:{} --- THREAD:{}", organizeCode, moduleKey, userInfo, Thread.currentThread().getName());
+            }
+        }
+    }
+
     @PostMapping("/scan-sn")
     @ApiOperation(value = "扫描条码")
     public ResultBean saveSn(@RequestBody MesSortShippingCheckModel model) {

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

@@ -184,8 +184,6 @@ public class MesShippingLoadingCheckService implements IMesShippingLoadingCheckS
                             throw new ImppBusiException(String.format("【%s】此发运单扫描顺序错误，请检查数据！", model.getShippingCode()));
                         }
                     }
-                    //更新页面状态
-                    updateLoadingListDetail(model, userInfo, loadingList, loadingListDetail,"扫描完成",MesExtEnumUtil.LOADING_ORDER_DETAIL_SHIPPING_STATUS.SHIPPINGED.getValue(),userInfo);
 
                     //根据扫描的装车单找到是否先装车配置
                     //若配置为否，则查询装车单中所有的发运单是否都进行【排序发运校验】完成，若【排序发运校验】没完成，则提示，先进行排序发运校验。
@@ -193,10 +191,13 @@ public class MesShippingLoadingCheckService implements IMesShippingLoadingCheckS
                         DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
                         DdlPreparedPack.getNumEqualPack(loadingListDetail.getShippingId(),"id",packBean);
                         MesShippingOrderManagement orderManagement = shippingOrderManagementRepository.getByProperty(packBean);
-                        if (!StringUtils.isEmpty(orderManagement)) {
+                        if (orderManagement == null || orderManagement.getStatus() != MesExtEnumUtil.SHIPPING_ORDER_STATUS.SHIPPED.getValue()) {
                             throw new ImppBusiException(String.format("【%s】此装车单中发运单为【%s】，还未做完【排序发运校验】，请检查数据", model.getShippingCode(), loadingListDetail.getShippingCode()));
                         }
                     }
+
+                    //更新页面状态
+                    updateLoadingListDetail(model, userInfo, loadingList, loadingListDetail,"扫描完成",MesExtEnumUtil.LOADING_ORDER_DETAIL_SHIPPING_STATUS.SHIPPINGED.getValue(),userInfo);
                     scanflg = true;
                     break;
                 }

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

@@ -18,8 +18,11 @@ 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.shipping.*;
+import cn.estsh.i3plus.pojo.mes.bean.edi.cd.MesCimVolvoJisRackIdDetail;
+import cn.estsh.i3plus.pojo.mes.bean.shipping.*;
 import cn.estsh.i3plus.pojo.mes.model.MesEquipVariableRwResult;
 import cn.estsh.i3plus.pojo.mes.repository.*;
+import cn.estsh.i3plus.pojo.mes.repository.edi.cd.MesCimVolvoJisRackIdDetailRepository;
 import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
 import cn.estsh.impp.framework.boot.exception.ImppBusiException;
 import cn.estsh.impp.framework.boot.util.SpringContextsUtil;
@@ -120,6 +123,13 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
     @Autowired
     private IMesConfigService mesConfigService;
 
+    @Autowired
+    private MesVolvoRackRepository mesVolvoRackRDao;
+    @Autowired
+    private MesCustSoftInfoRepository custSoftInfoRDao;
+    @Autowired
+    private MesCimVolvoJisRackIdDetailRepository rackIdDetailRDao;
+
     @Override
     public MesSortShippingCheckModel doShippingOrderNoQuery(MesShippingOrderManagement shippingOrderManagement) {
         //校验发运单
@@ -152,6 +162,15 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
     }
 
     @Override
+    public MesSortShippingCheckModel saveRackNo(MesSortShippingCheckModel model, String organizeCode, String userInfo) {
+        checkVolvoRack(model, organizeCode);
+        MesShippingOrderManagement orderManagement = checkMesShippingOrderManagement(model);
+        orderManagement.setRackNo(model.getVolvoRackNo());
+        shippingOrderManagementRepository.update(orderManagement);
+        return model;
+    }
+
+    @Override
     public MesSortShippingCheckModel saveSn(MesSortShippingCheckModel model) {
         //校验发运单是否存在
         MesShippingOrderManagement orderManagement = checkMesShippingOrderManagement(model);
@@ -209,7 +228,9 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
         }else{
             //自制件校验前道工艺 零件发运组详情中的优先
             MesPartShippingGroupDetail groupDetail = mesPartShippingGroupService.getMesPartShippingGroupDetailByPartNo(organizeCode, shippingGroup.getShippingGroupCode(), produceSn.getPartNo());
-            if (null == groupDetail) return true;
+            if (null == groupDetail) {
+                return true;
+            }
             if (!StringUtils.isEmpty(groupDetail.getFrontProcessCode())){
                 Integer count = mesProductionRecordService.findFrontProcessProductionRecord(organizeCode, produceSn.getProductSn(), groupDetail.getFrontProcessCode());
                 if (count > 0){
@@ -235,6 +256,10 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
         MesProduceSn produceSn = checkMesProduceSn(model, organizeCode);
         //校验发运单是否存在
         MesShippingOrderManagement orderManagement = checkMesShippingOrderManagement(model);
+        final String confirmPartType = getConfirmPartType(orderManagement);
+        if (Objects.equals(confirmPartType, String.valueOf(MesExtEnumUtil.SHIPPING_GROUP_CONFIRM_PART_TYPE.SHIPPING_GROUP_CONFIRM_PART_TYPE_50.getValue()))) {
+            return saveChengDuSnAndLocationCode(model, organizeCode, userInfo);
+        }
         //根据条码找到对应的物料号，若物料号一致，则修改扫描flg，将flg改为true.
         boolean scanFlg = false;
         for (MesShippingOrderManagementDetail detail : model.getDetailList()) {
@@ -260,6 +285,79 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
         return model;
     }
 
+    private MesSortShippingCheckModel saveChengDuSnAndLocationCode(MesSortShippingCheckModel model, String organizeCode, String userInfo) {
+        //校验条码
+        MesProduceSn produceSn = checkMesProduceSn(model, organizeCode);
+        //校验发运单是否存在
+        MesShippingOrderManagement orderManagement = checkMesShippingOrderManagement(model);
+        //根据条码找到对应的物料号，若物料号一致，则修改扫描flg，将flg改为true.
+        boolean scanFlg = false;
+        for (MesShippingOrderManagementDetail detail : model.getDetailList()) {
+            if (detail.getPartNo().equals(produceSn.getPartNo()) && StringUtils.isEmpty(detail.getPartPosition())) {
+                scanFlg = true;
+                String tmpAfterBarCode = model.getLocationCode().replaceAll("\\p{Cc}", "");
+                String tmpMidStr = tmpAfterBarCode.replace("[)>061B", "");
+                String[] splitStrArray = tmpMidStr.split("1Y");
+                if (splitStrArray.length > 0) {
+                    if (StringUtils.isEmpty(orderManagement.getRackNo()) || !orderManagement.getRackNo().contains(splitStrArray[0])) {
+                        throw new ImppBusiException(String.format("料箱类型与顺序不一致，请检查数据"));
+                    }
+                }
+                String detailPosition = ddddd(model, detail);
+                String tmpPosition = tmpAfterBarCode.substring(tmpAfterBarCode.length() - 2);
+                StringBuilder splitPosition = new StringBuilder();
+                for (char c : tmpPosition.toCharArray()) {
+                    if (Character.isDigit(c)) {
+                        splitPosition.append(c);
+                    }
+                }
+                //验证位置号
+                if (!detailPosition.contentEquals(splitPosition)) {
+                    throw new ImppBusiException(String.format("零件与位置信息不符，请检查数据"));
+                }
+
+                detail.setIsScanFlg(MesCommonConstant.TRUE_INTEGER);
+//                detail.setBarcode(detail.getBarcode() + "," + model.getLocationCode());
+                detail.setPartPosition(model.getLocationCode());
+//                detail.setStatus(MesExtEnumUtil.SHIPPING_ORDER_STATUS.CREATE.getValue());
+                shippingOrderManagementDetailRepository.update(detail);
+                break;
+            }
+
+            final String confirmPartType = getConfirmPartType(orderManagement);
+        }
+
+        if (!scanFlg) {
+            throw new ImppBusiException(String.format("【%s】此条码对应的【%s】物料号与发运单中物料号不匹配，请检查数据！", model.getSn(), produceSn.getPartNo()));
+        }
+
+        Long count = model.getDetailList().stream().filter(k -> Objects.equals(k.getIsScanFlg(), MesCommonConstant.TRUE_INTEGER)).count();
+
+        //当前发运单全部扫描完成
+        if (count.intValue() == model.getDetailList().size()) {
+            //保存数据库
+            saveDate(orderManagement, model, organizeCode, userInfo);
+        }
+        return model;
+    }
+
+    private String ddddd(MesSortShippingCheckModel model, MesShippingOrderManagementDetail detail) {
+        MesWorkOrder workOrder = mesWorkOrderService.getWorkOrderNoByCustSn(model.getOrganizeCode(), model.getSn());
+        if (workOrder == null || StringUtils.isEmpty(workOrder.getWorkOrderSource())) {
+            return "";
+        }
+
+        MesCustSortInfo custSoftInfo = custSoftInfoRDao.getById(Long.parseLong(workOrder.getWorkOrderSource()));
+        if (custSoftInfo != null) {
+            MesCimVolvoJisRackIdDetail rackIdDetail = rackIdDetailRDao.getById(custSoftInfo.getSourceId());
+                if (rackIdDetail != null) {
+                    detail.setVisualOrderNo(workOrder.getWorkOrderNo());
+                    return rackIdDetail.getPosition();
+                }
+            }
+        return "";
+    }
+
     @Override
     public MesShippingOrderManagement queryShippingOrderNoByAutoPushOrder(String shippingGroupNo, String org) {
         //查询最近扫描完成的装车单号
@@ -273,7 +371,7 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
 
     private MesPartShippingGroup getMesPartShippingGroup(String org, String partShippingGroupCode) {
         if(StringUtil.isEmpty(org) ||StringUtil.isEmpty(partShippingGroupCode)){
-            return null;
+            throw new ImppBusiException("零件发运组信息不存在，请检查数据！");
         }
         MesPartShippingGroup shippingGroup = mesPartShippingGroupService.getMesPartShippingGroup(org, partShippingGroupCode);
         if(Objects.isNull(shippingGroup)){
@@ -476,10 +574,10 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
 
     private MesProduceSn checkMesProduceSn(MesSortShippingCheckModel model, String org) {
         //校验条码是否已经扫描
-        Optional<MesShippingOrderManagementDetail> optional = model.getDetailList().stream().filter(k -> !StringUtils.isEmpty(k.getBarcode()) && k.getBarcode().equals(model.getSn())).findFirst();
+//        Optional<MesShippingOrderManagementDetail> optional = model.getDetailList().stream().filter(k -> !StringUtils.isEmpty(k.getBarcode()) && k.getBarcode().equals(model.getSn())).findFirst();
-        if (optional.isPresent()) {
+//        if (optional.isPresent()) {
-            throw new ImppBusiException(String.format("【%s】此条码已经扫描过，请检查数据！", model.getSn()));
+//            throw new ImppBusiException(String.format("【%s】此条码已经扫描过，请检查数据！", model.getSn()));
-        }
+//        }
         DdlPackBean packBean = DdlPackBean.getDdlPackBean(org);
         DdlPreparedPack.getStringEqualPack(model.getSn(), "productSn", packBean);
         DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, packBean);
@@ -507,6 +605,16 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
         }
     }
 
+    // 判断维护的条码是否和扫描的条码一致
+    private void checkVolvoRack(MesSortShippingCheckModel model, String organizeCode) {
+        DdlPackBean rackPackBean = DdlPackBean.getDdlPackBean(model.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(model.getVolvoRackNo(), "barCode", rackPackBean);
+        MesVolvoRack volvoRack = mesVolvoRackRDao.getByProperty(rackPackBean);
+        if (volvoRack == null) {
+            throw new ImppBusiException(String.format("无效料架条码【%s】，请重新扫描！", model.getVolvoRackNo()));
+        }
+    }
+
     private MesShippingOrderManagement checkMesShippingOrderManagement(MesSortShippingCheckModel model) {
         //校验发运单是否存在
         DdlPackBean orderManagementPackBean = DdlPackBean.getDdlPackBean(model.getOrganizeCode());
@@ -592,11 +700,15 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
                     // 保存到发运队列，后续发运单的条码会拼接，而保存到发运队列中的为拼接前的数据，因此要在拼接前调用。
                     saveShippingQueue(orderManagement, detail, userInfo);
                     if (!Objects.equals(confirmPartType, String.valueOf(MesExtEnumUtil.SHIPPING_GROUP_CONFIRM_PART_TYPE.SHIPPING_GROUP_CONFIRM_PART_TYPE_40.getValue()))) {
+                        if (Objects.equals(confirmPartType, String.valueOf(MesExtEnumUtil.SHIPPING_GROUP_CONFIRM_PART_TYPE.SHIPPING_GROUP_CONFIRM_PART_TYPE_50.getValue()))) {
+                            detail.setBarcode(detail.getBarcode() + "," + detail.getPartPosition());
+                        } else {
                             //条码格式(扫描目视单,扫描条码)
                             detail.setBarcode(new StringJoiner(MesPcnExtConstWords.COMMA).add(detail.getVisualOrderNo()).add(detail.getBarcode()).toString());
                         }
                     }
                 }
+            }
             //客供品移库
             customerSupplyMove(orderManagement, userInfo, sortShippingModel, shippingList, detail);
 
@@ -637,7 +749,9 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
             DdlPreparedPack.getNumEqualPack(orderManagement.getLoadingListId(),"pid",orderManagementPackBean);
             DdlPreparedPack.getNumberSmallerEqualPack(MesExtEnumUtil.LOADING_ORDER_DETAIL_SHIPPING_STATUS.SKIP.getValue(),"status",orderManagementPackBean);
             List<MesLoadingListDetail> listDetails = vehiclesOrderDetailRepository.findByHqlWhere(orderManagementPackBean);
-            if(CollectionUtils.isEmpty(listDetails)) return;
+            if(CollectionUtils.isEmpty(listDetails)) {
+                return;
+            }
 
             List<String> shippingCodeList = listDetails.stream().map(MesLoadingListDetail::getShippingCode).collect(Collectors.toList());
             orderManagementPackBean = DdlPackBean.getDdlPackBean(organizeCode);
@@ -711,6 +825,7 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
         return rule;
     }
 
+    @Override
     public List<MesJisShipping> getMesJisShippings(MesShippingOrderManagement mesShippingOrderManagement,List<MesShippingOrderManagementDetail> shippingOrderManagementDetails,String userName) {
         if (CollectionUtils.isEmpty(shippingOrderManagementDetails)) {
             DdlPackBean detailPackBean = DdlPackBean.getDdlPackBean(mesShippingOrderManagement.getOrganizeCode());
@@ -735,7 +850,9 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
     }
 
     private void updateShippingOrderDetails(String organizeCode, String userName, long id) {
-        if(StringUtils.isEmpty(id) || StringUtils.isEmpty(organizeCode)) return;
+        if(StringUtils.isEmpty(id) || StringUtils.isEmpty(organizeCode)) {
+            return;
+        }
         DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
         DdlPreparedPack.getNumEqualPack(id, "pid",packBean);
         shippingOrderManagementDetailRepository.updateByProperties(new String[]{"modifyUser", "modifyDatetime", "status","remark"},

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

@@ -0,0 +1,298 @@
+package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.busi.shippingscan.strategy;
+
+import cn.estsh.i3plus.ext.mes.pcn.api.busi.*;
+import cn.estsh.i3plus.ext.mes.pcn.apiservice.aspect.MonitorLog;
+import cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.busi.shippingscan.IMesShippingScanStrategyService;
+import cn.estsh.i3plus.ext.mes.pcn.apiservice.util.MesPcnException;
+import cn.estsh.i3plus.ext.mes.pcn.pojo.constant.MesCommonConstant;
+import cn.estsh.i3plus.ext.mes.pcn.pojo.model.MesSortShippingCheckModel;
+import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords;
+import cn.estsh.i3plus.platform.common.convert.ConvertBean;
+import cn.estsh.i3plus.platform.common.tool.TimeTool;
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+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.MesPartShippingGroup;
+import cn.estsh.i3plus.pojo.mes.bean.MesPartShippingGroupDetail;
+import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn;
+import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder;
+import cn.estsh.i3plus.pojo.mes.bean.edi.cd.MesCimVolvoJisRackIdDetail;
+import cn.estsh.i3plus.pojo.mes.bean.shipping.MesCustSortInfo;
+import cn.estsh.i3plus.pojo.mes.bean.shipping.MesShippingOrderManagement;
+import cn.estsh.i3plus.pojo.mes.bean.shipping.MesShippingOrderManagementDetail;
+import cn.estsh.i3plus.pojo.mes.repository.*;
+import cn.estsh.i3plus.pojo.mes.repository.edi.cd.MesCimVolvoJisRackIdDetailRepository;
+import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
+import cn.estsh.impp.framework.boot.exception.ImppBusiException;
+import cn.estsh.impp.framework.boot.util.SpringContextsUtil;
+import groovy.util.logging.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * @Description : 扫描条码
+ * @Reference :
+ * @Author : junsheng.li
+ * @CreateDate 2024/9/25 10:54
+ * @Modify:
+ **/
+@Service
+@Slf4j
+public class mesShippingCheckVolvoRackNoAndPartNoStrategyServiceImpl implements IMesShippingScanStrategyService {
+    @Autowired
+    private MesShippingOrderManagementRepository shippingOrderManagementRepository;
+    @Autowired
+    private MesShippingOrderManagementDetailRepository shippingOrderManagementDetailRepository;
+    @Autowired
+    private MesProduceSnRepository produceSnRepository;
+
+    @Autowired
+    private IMesProduceSnExtService produceSnExtService;
+
+    @Autowired
+    private MesCustomerPartRepository mesCustomerPartRepository;
+
+    @Autowired
+    private IMesConfigService mesConfigService;
+
+    @Autowired
+    private IMesPartShippingGroupService mesPartShippingGroupService;
+
+    @Autowired
+    private IMesShippingSnUniqueService mesShippingSnUniqueService;
+    @Autowired
+    private MesWorkOrderRepository workOrderRDao;
+    @Autowired
+    private MesCustSoftInfoRepository custSoftInfoRDao;
+    @Autowired
+    private MesCimVolvoJisRackIdDetailRepository rackIdDetailRDao;
+
+    @Override
+    public MesSortShippingCheckModel doScan(MesSortShippingCheckModel model, MesShippingOrderManagement orderManagement, MesPartShippingGroup shippingGroup) {
+        //校验条码
+        MesProduceSn produceSn = checkSn(model);
+        MesWorkOrder workOrder = checkWorkOrder(model);
+        if (!Objects.equals(workOrder.getPartNo(), produceSn.getPartNo())) {
+            throw new ImppBusiException(String.format("产品条码物料【%s】与工单物料【%s】不一致，请检查数据！",  produceSn.getPartNo(), workOrder.getPartNo()));
+        }
+        boolean scanFlg = false;
+        for (MesShippingOrderManagementDetail detail : model.getDetailList()) {
+            if (detail.getPartNo().equals(produceSn.getPartNo()) && StringUtils.isEmpty(detail.getBarcode()) && !Objects.equals(detail.getIsScanFlg(), MesCommonConstant.TRUE_INTEGER)) {
+                if (Objects.equals(detail.getVin(), workOrder.getVinCode())) {
+                    throw new ImppBusiException(String.format("产品条码明细【%s】与发运单明细不匹配，请重新扫描！", model.getSn()));
+                }
+                //校验发运明细
+                checkShippingDetails(model, orderManagement, shippingGroup, produceSn, detail);
+                scanFlg = true;
+                //明细更新
+                updateOrderManagementDetails(produceSn, orderManagement, detail, workOrder, model.getUserInfo());
+                break;
+            }
+        }
+        if (!scanFlg) {
+            throw new ImppBusiException(String.format("【%s】此条码对应的【%s】物料号与发运单中物料号不匹配，请检查数据！", model.getSn(), produceSn.getPartNo()));
+        }
+        model.setMsg(String.format("条码【%s】扫描完成，请扫描下一个条码", model.getSn()));
+        return model;
+    }
+
+    private void checkShippingDetails(MesSortShippingCheckModel model, MesShippingOrderManagement orderManagement, MesPartShippingGroup shippingGroup, MesProduceSn produceSn, MesShippingOrderManagementDetail detail) {
+
+
+        //校验发运单明细顺序
+        if (!Objects.isNull(shippingGroup) && !StringUtils.isEmpty(shippingGroup.getIsEnableShippingFailSafe()) && CommonEnumUtil.VALID == shippingGroup.getIsEnableShippingFailSafe()) {
+            Optional<MesShippingOrderManagementDetail> first = model.getDetailList().stream().filter(k -> k.getCustInfoSeq().compareTo(detail.getCustInfoSeq()) < 0 && !Objects.equals(k.getIsScanFlg(), MesCommonConstant.TRUE_INTEGER)).findFirst();
+            if (first.isPresent()) {
+                throw new ImppBusiException(String.format("发运单【%s】启用明细顺序防错，序号【%s】前还有未扫描的发运单明细，请检查数据！", orderManagement.getShippingCode(), detail.getCustInfoSeq()));
+            }
+        }
+        //判断是否需要排序校验 默认排序则需要校验
+        if (!StringUtils.isEmpty(orderManagement.getScanSeqWay()) && !Objects.isNull(MesExtEnumUtil.SHIPPING_GROUP_SCAN_CONFIRM_SEQ_MODE.valueOfDescription(orderManagement.getScanSeqWay()))) {
+            //按照页面显示顺序校验
+            Optional<MesShippingOrderManagementDetail> nextShippingDetail = model.getDetailList().stream().filter(k -> StringUtils.isEmpty(k.getBarcode()) && !Objects.equals(k.getIsScanFlg(), MesCommonConstant.TRUE_INTEGER)).findFirst();
+            if (nextShippingDetail.isPresent() && !StringUtils.isEmpty(nextShippingDetail.get().getPartTypeCode()) && !nextShippingDetail.get().getPartNo().equals(produceSn.getPartNo())) {
+                throw new ImppBusiException(String.format("【%s】此条码扫描顺序错误，请检查数据！", model.getSn()));
+            }
+        }
+
+        //校验客户零件信息是否存在 (默认需要验证, 值可能是[空/0/20])
+//        if (StringUtils.isEmpty(shippingGroup.getScanMethodJudgment()) || !shippingGroup.getScanMethodJudgment().equals(MesExtEnumUtil.SHIPPING_GROUP_SCAN_METHOD_JUDGMENT.PART_NO.getValueStr())) {
+//            DdlPackBean packBean = DdlPackBean.getDdlPackBean(model.getOrganizeCode());
+//            DdlPreparedPack.getStringEqualPack(detail.getPartNo(), "erpPartNo", packBean);
+//            DdlPreparedPack.getStringEqualPack(detail.getCustPartNo(), "custPartNo", packBean);
+//            if (!mesCustomerPartRepository.isExitByHql(packBean)) {
+//                throw new ImppBusiException(String.format("零件号【%s】客户零件号【%s】关系不存在，请检查数据！", detail.getPartNo(), detail.getCustPartNo()));
+//            }
+//        }
+
+    }
+
+    private MesWorkOrder checkWorkOrder(MesSortShippingCheckModel model) {
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(model.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(model.getSn(), "custSn", packBean);
+        MesWorkOrder workOrder = workOrderRDao.getByProperty(packBean);
+        if (workOrder == null) {
+            throw new ImppBusiException(String.format("客户条码【%s】对应的工单号不存在，请检查数据！", model.getSn()));
+        }
+        if (workOrder.getWorkOrderStatus() == MesExtEnumUtil.ORDER_STATUS.SHIPPING.getValue()) {
+            throw new ImppBusiException(String.format("工单【%s】状态为已发运，请检查数据！", workOrder.getWorkOrderNo()));
+        }
+        if (workOrder.getWorkOrderStatus() == MesExtEnumUtil.ORDER_STATUS.RELEASE.getValue()) {
+            throw new ImppBusiException(String.format("工单【%s】状态为已发布，请检查数据！", workOrder.getWorkOrderNo()));
+        }
+        if (workOrder.getWorkOrderStatus() != MesExtEnumUtil.ORDER_STATUS.PROCESS.getValue() &&
+                workOrder.getWorkOrderStatus() != MesExtEnumUtil.ORDER_STATUS.COMPLETE.getValue() &&
+                workOrder.getWorkOrderStatus() != MesExtEnumUtil.ORDER_STATUS.DISMANTLE.getValue()) {
+            throw new ImppBusiException(String.format("工单【%s】状态为【%s】，请检查数据！", workOrder.getWorkOrderNo(), workOrder.getWorkOrderStatus()));
+        }
+        if (Objects.equals(workOrder.getOrderFlag(), MesExtEnumUtil.ORDER_TYPE_IDENTIFICATION.X.getValue())) {
+            throw new ImppBusiException(String.format("工单【%s】的工单标识为空单，请检查数据！", workOrder.getWorkOrderNo()));
+        }
+        return workOrder;
+    }
+
+    private MesProduceSn checkSn(MesSortShippingCheckModel model) {
+        //校验条码是否重复扫描 (不区分大小写)
+        Optional<MesShippingOrderManagementDetail> optional = model.getDetailList().stream().filter(k -> !StringUtils.isEmpty(k.getBarcode()) && k.getBarcode().equalsIgnoreCase(model.getSn())).findFirst();
+        if (optional.isPresent()) {
+            throw new ImppBusiException(String.format("【%s】此条码已经扫描过，请检查数据！", model.getSn()));
+        }
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(model.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(model.getSn(), "productSn", packBean);
+        DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, packBean);
+        MesProduceSn produceSn = produceSnRepository.getByProperty(packBean);
+        if (!StringUtils.isEmpty(produceSn)) {
+            //校验状态
+            checkStatus(model, produceSn);
+        } else {
+            //外部条码解析
+            MesShippingOrderManagementDetail mesShippingOrderManagementDetail = getMesShippingOrderManagementDetail(model);
+            //封装信息
+            produceSn = new MesProduceSn();
+            produceSn.setSerialNumber(model.getSn());
+            produceSn.setProductSn(model.getSn());
+            produceSn.setPartNo(mesShippingOrderManagementDetail.getPartNo());
+            produceSn.setOrganizeCode(model.getOrganizeCode());
+        }
+        return produceSn;
+    }
+
+    private void checkStatus(MesSortShippingCheckModel model, MesProduceSn produceSn) {
+        //校验产品条码状态 必须是状态为已下线条码
+        if (produceSn.getSnStatus() != MesExtEnumUtil.PRODUCE_SN_STATUS.OFFLINE.getValue() && produceSn.getSnStatus() != MesExtEnumUtil.PRODUCE_SN_STATUS.CREATE.getValue()) {
+            throw new ImppBusiException(String.format("【%s】此条码状态为【%s】,请选择状态为【%s】或【%s】状态的条码，请检查数据！", model.getSn(), MesExtEnumUtil.PRODUCE_SN_STATUS.valueOfDescription(produceSn.getSnStatus()),
+                    MesExtEnumUtil.PRODUCE_SN_STATUS.OFFLINE.getDescription(), MesExtEnumUtil.PRODUCE_SN_STATUS.CREATE.getDescription()));
+        }
+        //校验产品质量状态 必须是状态为合格条码
+        List<Integer> statusList = Stream.of(MesExtEnumUtil.PRODUCE_QC_STATUS.QUALIFIED.getValue(), MesExtEnumUtil.PRODUCE_QC_STATUS.SUSPICIOUS_TO_QUALIFIED.getValue()).collect(Collectors.toList());
+        if (!statusList.contains(produceSn.getQcStatus())){
+            throw new ImppBusiException(String.format("【%s】此条码质量状态为【%s】,请选择【%s】状态的条码，请检查数据！", model.getSn(), MesExtEnumUtil.PRODUCE_QC_STATUS.valueOfDescription(produceSn.getQcStatus()),
+                    MesExtEnumUtil.PRODUCE_QC_STATUS.QUALIFIED.getDescription()));
+        }
+    }
+
+    private MesShippingOrderManagementDetail getMesShippingOrderManagementDetail(MesSortShippingCheckModel model) {
+        //外部解析条码长度卡控
+        String cfgValue = mesConfigService.getCfgValue(model.getOrganizeCode(), MesPcnExtConstWords.MAX_SHIPPING_BARCODE_LENGTH);
+        if (Integer.parseInt(cfgValue) < model.getSn().length()) {
+            MesPcnException.throwMesBusiException("【%s】此条码长度超过【%s】位，请检查数据！", model.getSn(), cfgValue);
+        }
+        //唯一性校验
+        if (mesShippingSnUniqueService.checkMesShippingSnUnique(model.getOrganizeCode(),model.getSn())) {
+            throw new ImppBusiException(String.format("【%s】条码唯一性校验数据已存在，请检查数据！", model.getSn()));
+        }
+        //发运组代码不存在
+        if (Objects.isNull(model.getMesPartShippingGroup())) {
+            MesPcnException.throwMesBusiException("发运组信息不存在，请检查数据！");
+        }
+        List<MesShippingOrderManagementDetail> detailList = model.getDetailList().stream().filter(k -> !StringUtils.isEmpty(k.getCustPartNo()) && StringUtils.isEmpty(k.getBarcode()) && !Objects.equals(k.getIsScanFlg(), MesCommonConstant.TRUE_INTEGER)).collect(Collectors.toList());
+        MesShippingOrderManagementDetail mesShippingOrderManagementDetail = null;
+        for (MesShippingOrderManagementDetail managementDetail : detailList) {
+            DdlPackBean packBean = DdlPackBean.getDdlPackBean(model.getOrganizeCode());
+            DdlPreparedPack.getStringEqualPack(managementDetail.getPartNo(), "erpPartNo", packBean);
+            DdlPreparedPack.getStringEqualPack(managementDetail.getCustPartNo(), "custPartNo", packBean);
+            if (checkMesPartShippingGroupDetailRule(model, managementDetail) && mesCustomerPartRepository.isExitByHql(packBean)) {
+                mesShippingOrderManagementDetail = managementDetail;
+                break;
+            }
+        }
+        if (Objects.isNull(mesShippingOrderManagementDetail)) {
+            throw new ImppBusiException(String.format("【%s】此条码未匹配到数据，请检查数据！", model.getSn()));
+        }
+        return mesShippingOrderManagementDetail;
+    }
+
+    private void updateOrderManagementDetails(MesProduceSn produceSn, MesShippingOrderManagement orderManagement, MesShippingOrderManagementDetail detail, MesWorkOrder workOrder, String userInfo) {
+//        if (StringUtils.isEmpty(orderManagement.getCheckSeqCode())) {
+            detail.setBarcode(produceSn.getProductSn());
+            detail.setIsScanFlg(MesCommonConstant.TRUE_INTEGER);
+            detail.setStatus(MesExtEnumUtil.SHIPPING_ORDER_DETAIL_SHIPPING_STATUS.SHIPPINGED.getValue());
+            detail.setRemark("扫描完成");
+            updateDetail(detail);
+            orderManagement.setCheckSeqCode("1");
+            update(orderManagement);
+
+//            MesCustSortInfo custSoftInfo = custSoftInfoRDao.getById(Long.parseLong(workOrder.getWorkOrderSource()));
+//            if (custSoftInfo != null) {
+//                MesCimVolvoJisRackIdDetail rackIdDetail = rackIdDetailRDao.getById(custSoftInfo.getSourceId());
+//                if (rackIdDetail != null) {
+//                    detail.setPartPosition(rackIdDetail.getPosition());
+//                }
+//            }
+
+            //根据是否启动记忆判断 若启用记忆，则根据保存数据库
+            if (!StringUtils.isEmpty(orderManagement.getIsEnableMemory()) && Objects.equals(orderManagement.getIsEnableMemory(), MesCommonConstant.TRUE_INTEGER)) {
+
+                //若发运单状态为创建或发布 则写入开始扫描时间
+                if (!StringUtils.isEmpty(orderManagement.getStatus()) && (orderManagement.getStatus() == MesExtEnumUtil.SHIPPING_ORDER_STATUS.CREATE.getValue() ||
+                        orderManagement.getStatus() == MesExtEnumUtil.SHIPPING_ORDER_STATUS.PUBLISHED.getValue())) {
+                    orderManagement.setStartScanTime(TimeTool.getNowTime(true));
+                }
+
+                orderManagement.setStatus(MesExtEnumUtil.SHIPPING_ORDER_STATUS.SHIPPING.getValue());
+                orderManagement.setSystemSyncStatus(CommonEnumUtil.FALSE);
+                ConvertBean.serviceModelUpdate(orderManagement, userInfo);
+                update(orderManagement);
+
+                detail.setActualQty(1);
+                detail.setSystemSyncStatus(CommonEnumUtil.FALSE);
+                detail.setVisualOrderNo(workOrder.getWorkOrderNo());
+                ConvertBean.serviceModelUpdate(detail, userInfo);
+                updateDetail(detail);
+                //内部条码更新条码状态
+                if (!Objects.isNull(produceSn.getId())) {
+                    produceSn.setSnStatus(MesExtEnumUtil.PRODUCE_SN_STATUS.SHIPPED.getValue());
+                    produceSn.setSystemSyncStatus(CommonEnumUtil.FALSE);
+                    ConvertBean.serviceModelUpdate(produceSn, userInfo);
+                    produceSnExtService.update(produceSn);
+                }else{
+                    //记录唯一性校验表
+                    mesShippingSnUniqueService.insertMesShippingSnUnique(orderManagement.getOrganizeCode(),detail.getBarcode(),orderManagement.getShippingCode(),userInfo);
+                }
+            }
+//        }
+    }
+
+    @MonitorLog
+    public void update(MesShippingOrderManagement item) {
+        shippingOrderManagementRepository.update(item);
+    }
+
+    @MonitorLog
+    public void updateDetail(MesShippingOrderManagementDetail item) {
+        shippingOrderManagementDetailRepository.update(item);
+    }
+
+    private Boolean checkMesPartShippingGroupDetailRule(MesSortShippingCheckModel model, MesShippingOrderManagementDetail managementDetail) {
+        MesPartShippingGroupDetail mesPartShippingGroupDetail = mesPartShippingGroupService.getMesPartShippingGroupDetail(model.getOrganizeCode(), model.getMesPartShippingGroup().getShippingGroupCode(), managementDetail.getPartNo(), managementDetail.getCustPartNo());
+        return !Objects.isNull(mesPartShippingGroupDetail) && !StringUtil.isEmpty(mesPartShippingGroupDetail.getSnRule()) && ((Boolean) ((IMesNumberRuleMatchDispatchService) SpringContextsUtil.getBean(MesExtEnumUtil.ASSEMBLY_MATCH_TYPE.MATCH_TYPE_20.getStrategyClass())).matchNumberRule(model.getOrganizeCode(), model.getSn(), mesPartShippingGroupDetail.getSnRule(), mesPartShippingGroupDetail.getSnRule()).get(MesPcnExtConstWords.RESULT));
+    }
+}

modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesSortShippingCheckModel.java

@@ -54,6 +54,9 @@ public class MesSortShippingCheckModel {
     @ApiParam("提示引导信息")
     private String msg;
 
+    @ApiParam("料架条码")
+    private String volvoRackNo;
+
     public void setDetailList(List<MesShippingOrderManagementDetail> detailList) {
         this.detailList = detailList;
         this.isScanCount = (int) detailList.stream().filter(k -> Objects.equals(k.getIsScanFlg(), MesCommonConstant.TRUE_INTEGER)).count();