Merge remote-tracking branch 'origin/master' into dev

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/boxPkgOrder/BoxPkgOrderServiceImpl.java

@@ -8,6 +8,7 @@ import cn.iocoder.yudao.framework.mybatis.core.service.AbstractService;
 import cn.iocoder.yudao.framework.mybatis.core.vo.PageVO;
 import cn.iocoder.yudao.module.order.dal.dataobject.order.OrderDO;
 import cn.iocoder.yudao.module.order.dal.dataobject.orderItem.OrderItemDO;
+import cn.iocoder.yudao.module.order.enums.ErrorCodeConstants;
 import cn.iocoder.yudao.module.order.service.order.OrderItemService;
 import cn.iocoder.yudao.module.order.service.order.OrderService;
 import cn.iocoder.yudao.module.shipment.convert.BoxPkgOrderConvert;
@@ -38,6 +39,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.order.enums.ErrorCodeConstants.ORDER_IS_PRE_INSTALLED;
 import static cn.iocoder.yudao.module.shipment.enums.ErrorCodeConstants.BOX_PKG_ORDER_NOT_EXISTS;
 import static cn.iocoder.yudao.module.shipment.enums.ErrorCodeConstants.MERGE_PKG_IS_FINISH;
 
@@ -92,7 +94,10 @@ public class BoxPkgOrderServiceImpl extends AbstractService<BoxPkgOrderMapper, B
             vo.setOrderId(orderId);
             BoxMergePkgDO boxMergePkgDO = boxMergePkgService.selectOne(new LambdaQueryWrapperX<BoxMergePkgDO>().eq(BoxMergePkgDO::getPkgNum,createReqVO.getPkgNum()));
             vo.setPkgId(boxMergePkgDO.getId()) ;
-
+            BoxPkgOrderDO pkgOrderDO =  boxPkgOrderMapper.selectOne(new LambdaQueryWrapperX<BoxPkgOrderDO>().eq(BoxPkgOrderDO::getOrderId,orderId).eq(BoxPkgOrderDO::getPkgId,boxMergePkgDO.getId()));
+            if(pkgOrderDO!=null){
+                throw  exception(ORDER_IS_PRE_INSTALLED);
+            }
             if(vo.getOrderId()!=null && vo.getPkgId()!=null){//订单和包裹id 不为空，调用装箱方法
                 this.create(vo);
             }
@@ -101,7 +106,10 @@ public class BoxPkgOrderServiceImpl extends AbstractService<BoxPkgOrderMapper, B
             vo.setOrderId(orderId);
             BoxMergePkgDO boxMergePkgDO = boxMergePkgService.selectOne(new LambdaQueryWrapperX<BoxMergePkgDO>().eq(BoxMergePkgDO::getPkgNum,createReqVO.getPkgNum()));
             vo.setPkgId(boxMergePkgDO.getId()) ;
-
+            BoxPkgOrderDO pkgOrderDO =  boxPkgOrderMapper.selectOne(new LambdaQueryWrapperX<BoxPkgOrderDO>().eq(BoxPkgOrderDO::getOrderId,orderId).eq(BoxPkgOrderDO::getPkgId,boxMergePkgDO.getId()));
+            if(pkgOrderDO!=null){
+                throw  exception(ORDER_IS_PRE_INSTALLED);
+            }
             if(vo.getOrderId()!=null && vo.getPkgId()!=null){//订单和包裹id 不为空，调用装箱方法
                 this.create(vo);
             }

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/makeBillOfLading/MakeBillOfLadingServiceImpl.java

@@ -444,7 +444,11 @@ public class MakeBillOfLadingServiceImpl extends AbstractService<MakeBillOfLadin
 //            }
             paramMap.put("seaFreight", item.getOneSeaFreight() + currencyMap.get(item.getSeaFreightCurrency()) + "/m³");
             if (item.getOneClearanceFreight().compareTo(BigDecimal.ZERO) == 0) {
-                if (item.getClearanceFreightCurrency() == null) {
+                if (item.getClearanceFreightCurrency() == null ||
+                        item.getClearanceFreightCurrency() == 0 ||
+                        currencyMap.get(item.getClearanceFreightCurrency()) == null) {
+                    //lanbm 2024-05-07 调整逻辑判断，是币种字段为空则显示0
+                    //item.getClearanceFreightCurrency() 币种项在数据字典中不存在
                     paramMap.put("clearanceFreight", "0");
                 } else {
                     paramMap.put("clearanceFreight",