Merge branch 'uat' into uat-temp-wj-chongqingdaqu-prod

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

@@ -13,6 +13,7 @@ import cn.estsh.i3plus.pojo.mes.bean.MesPartShippingGroup;
 import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrderPart;
 import cn.estsh.i3plus.pojo.mes.bean.shipping.MesShippingOrderManagement;
 import cn.estsh.i3plus.pojo.mes.bean.shipping.MesShippingOrderManagementDetail;
+import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -81,6 +82,9 @@ public class MesJisShippingServiceImpl implements IMesJisShippingService {
         MesConfig useCustOrderNo = configService.getMesConfigNoError(orderManagement.getOrganizeCode(), MesPcnExtConstWords.USE_CUST_ORDER_NO);
         List<MesJisShipping> jisShippingList = new ArrayList<>();
         orderManagementDetailList.forEach(k -> {
+            if (k.getStatus() == MesExtEnumUtil.SHIPPING_ORDER_DETAIL_SHIPPING_STATUS.SKIP.getValue()) {
+                return;
+            }
             MesJisShipping jisShipping = new MesJisShipping();
             BeanUtils.copyProperties(orderManagement, jisShipping, MesPcnExtConstWords.BASE_BEAN_FIELDS);
             BeanUtils.copyProperties(k, jisShipping, MesPcnExtConstWords.BASE_BEAN_FIELDS);