43605 装箱防错：扫描已经发运的条码，未报错

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

@@ -366,31 +366,28 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
 
         originBean.setStatus(MesExtEnumUtil.SHIPPING_ORDER_STATUS.CLOSE.getValue());
         ConvertBean.serviceModelUpdate(originBean, AuthUtil.getSessionUser().getUserName());
-        //修改当前发运单明细状态
+        if(!CollectionUtils.isEmpty(detailDeleteList)){
-        detailDeleteList.forEach(k -> {
+            //修改当前发运单明细状态
-            k.setActualQty(0);
+            detailDeleteList.forEach(k -> {
-            k.setStatus(MesExtEnumUtil.SHIPPING_ORDER_DETAIL_SHIPPING_STATUS.PUBLISHED.getValue());
+                k.setActualQty(0);
-            ConvertBean.serviceModelUpdate(k, AuthUtil.getSessionUser().getUserName());
+                k.setStatus(MesExtEnumUtil.SHIPPING_ORDER_DETAIL_SHIPPING_STATUS.PUBLISHED.getValue());
-
-            //若扫描过的条码 则恢复条码
-            if (!StringUtils.isEmpty(k.getBarcode())) {
-
-                DdlPackBean packBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode());
-                DdlPreparedPack.getStringEqualPack(k.getBarcode(), "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.OFFLINE.getValue());
                 ConvertBean.serviceModelUpdate(k, AuthUtil.getSessionUser().getUserName());
-                produceSnRepository.save(produceSn);
+                //若扫描过的条码 则恢复条码
-
+                if (!StringUtils.isEmpty(k.getBarcode())) {
-            }
+                    DdlPackBean packBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode());
-
+                    DdlPreparedPack.getStringEqualPack(k.getBarcode(), "productSn", packBean);
-        });
+                    DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, packBean);
-
+                    MesProduceSn produceSn = produceSnRepository.getByProperty(packBean);
-        baseRDao.save(originBean);
+                    if(!Objects.isNull(produceSn)){
-        detailService.updates(detailDeleteList);
+                        produceSn.setSnStatus(MesExtEnumUtil.PRODUCE_SN_STATUS.OFFLINE.getValue());
-
+                        ConvertBean.serviceModelUpdate(k, AuthUtil.getSessionUser().getUserName());
+                        produceSnRepository.update(produceSn);
+                    }
+                }
+            });
+            detailService.updates(detailDeleteList);
+        }
+        baseRDao.update(originBean);
     }
 
     @Override