41200 MES：演示问题汇总

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

@@ -9,6 +9,7 @@ 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.MesJisShipping;
 import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn;
 import cn.estsh.i3plus.pojo.mes.bean.shipping.MesLoadingList;
@@ -23,10 +24,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @Description :
@@ -353,25 +352,33 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
         DdlPackBean orderManagementDetailPackBean = DdlPackBean.getDdlPackBean(org);
         DdlPreparedPack.getNumEqualPack(orderManagement.getId(), "pid", orderManagementDetailPackBean);
         List<MesShippingOrderManagementDetail> orderManagementDetailList = shippingOrderManagementDetailRepository.findByHqlWhere(orderManagementDetailPackBean);
+        List<MesShippingOrderManagementDetail> detailList = model.getDetailList();
+        Map<Long, List<MesShippingOrderManagementDetail>> custInfoSeqMap = detailList.stream().collect(Collectors.groupingBy(MesShippingOrderManagementDetail::getCustInfoSeq));
 
         List<MesProduceSn> produceSnList = new ArrayList<>();
         for (MesShippingOrderManagementDetail detail : orderManagementDetailList) {
+            //根据扫描的条码查询条码是否存在
+            DdlPackBean packBean = DdlPackBean.getDdlPackBean(org);
+            if (orderManagement.getIsEnableMemory() == MesCommonConstant.TRUE_INTEGER) {
+                detail.setBarcode(StringUtil.isEmpty(detail.getBarcode()) ? model.getSn() : detail.getBarcode());
+                DdlPreparedPack.getStringEqualPack(StringUtil.isEmpty(detail.getBarcode()) ? model.getSn() : detail.getBarcode(), "productSn", packBean);
+            } else {
+                List<MesShippingOrderManagementDetail> mesShippingOrderManagementDetails = custInfoSeqMap.get(detail.getCustInfoSeq());
+                MesShippingOrderManagementDetail managementDetail = mesShippingOrderManagementDetails.get(0);
 
+                detail.setBarcode(StringUtil.isEmpty(managementDetail.getBarcode()) ? model.getSn() : detail.getBarcode());
+                DdlPreparedPack.getStringEqualPack(StringUtil.isEmpty(managementDetail.getBarcode()) ? model.getSn() : detail.getBarcode(), "productSn", packBean);
+            }
             detail.setActualQty(1);
             detail.setStatus(MesExtEnumUtil.SHIPPING_ORDER_DETAIL_SHIPPING_STATUS.SHIPPINGED.getValue());
-            detail.setBarcode(model.getSn());
             ConvertBean.serviceModelUpdate(detail, AuthUtil.getSessionUser().getUserName());
 
-            //根据扫描的条码查询条码是否存在
-            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);
             MesProduceSn produceSn = produceSnRepository.getByProperty(packBean);
 
             produceSn.setSnStatus(MesExtEnumUtil.PRODUCE_SN_STATUS.SHIPPED.getValue());
             ConvertBean.serviceModelUpdate(produceSn, AuthUtil.getSessionUser().getUserName());
             produceSnList.add(produceSn);
-
         }
 
         //当前发运单明细 需要报工的数据