Merge branch 'dev'

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderBusinessServiceImpl.java

@@ -2182,6 +2182,7 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
                                 Long consigneeCustomerContactsId,
                                 List<OrderItemDO> orderItemDOList,
                                 Integer type) {
+
         //2023-7月之前应收金额没有按四舍五入取整，之后都是按四舍五入取整处理的
 
         LogisticsInfoDto logisticsInfoDto =
@@ -2503,8 +2504,10 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
                                 if (Objects.isNull(warehouseInInfoVO)) {
                                     s += " warehouseInInfoVO 为空，";
                                 }
-                                s += "getCartonsNum:" +
-                                        warehouseInInfoVO.getCartonsNum();
+                                if(Objects.isNull(warehouseInInfoVO)==false) {
+                                    s += "getCartonsNum:" +
+                                            warehouseInInfoVO.getCartonsNum();
+                                }
                                 zTest m = new zTest();
                                 m.setTestname(s);
                                 m.setCreatedate(new Date());

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderWarehouseIn/OrderWarehouseInServiceImpl.java

@@ -1114,11 +1114,9 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
         boolean isNotRollbackIn =
                 Boolean.FALSE.equals(finishReqVO.getIsRollbackIn());
         if (isNotRollbackIn && !finishReqVO.getIsSplitIn()) {
-
             // 订单排单校验
             applicationContext.publishEvent(
                     new BoxCheckOrderSchedulingEvent(orderId));
-
             // 校验是否有已核销的应收单，如果有，则不能再次入仓修改
             receivableService.verificationReceivableIsWriteOff(orderDO.getOrderId(), null);
         }
@@ -1133,11 +1131,9 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
         String manualExceptionType = finishReqVO.getManualExceptionType();
         if (StringUtils.isNotEmpty(manualExceptionType)) {
             msg = "订单转异";
-
             // 异常影像
             orderWarehousePictureService.createWarehousePictureBatch(
                     finishReqVO.getExceptionUrls(), 4, orderId);
-
             // 异常
             String descZh = getOrderOtherExceptionDesc(manualExceptionType, 0, finishReqVO.getDescZh(), finishReqVO.getDescEn());
             String descEn = getOrderOtherExceptionDesc(manualExceptionType, 1, finishReqVO.getDescZh(), finishReqVO.getDescEn());
@@ -1184,7 +1180,6 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
 
         // 生成特需应收
         orderSpecialNeedService.buildSpecialReceivable(orderId, 1);
-
         List<OrderWarehouseInDO> orderWarehouseInDOList =
                 orderWarehouseInMapper.selectList(OrderWarehouseInDO::getOrderId,
                         orderDO.getOrderId());
@@ -1196,7 +1191,8 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
                 finishReqVO.getIsSumWeightNoChange(),
                 finishReqVO.getIsSumVolumeNoChange());
 
-        List<ChannelPackagingOverWeightAdditionalBo> channelPackagingOverWeightAdditionalBoList = new ArrayList<>();
+        List<ChannelPackagingOverWeightAdditionalBo>
+                channelPackagingOverWeightAdditionalBoList = new ArrayList<>();
         if (!isSplitOrderChildren && isNotRollbackIn) {
             channelPackagingOverWeightAdditionalBoList =
                     genChannelPackagingOverweightAdditionalBoList(orderDO, orderWarehouseInDOList);
@@ -1256,7 +1252,6 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
         // 20230115 拆单子订单入仓不需要产生除转异外的其他异常，
         // 同时也不需要重新计算价格;  退场入仓也不需要产生异常
         if (!isSplitOrderChildren && isNotRollbackIn) {
-
             //处理重泡货异常
             boolean finishStocked = false;
             if ((Objects.equals(orderDO.getTransportId(), TransportTypeShortEnum.AIR_FREIGHT_LINE.getValue())

yudao-module-order/yudao-module-order-rest/src/main/java/cn/iocoder/yudao/module/order/controller/admin/orderWarehouseIn/OrderWarehouseInController.java

@@ -74,7 +74,7 @@ public class OrderWarehouseInController {
 
 
     /*
-     创建入仓，保存入仓记录 lanbm 2024-05-28 添加注释
+     创建入仓，保存入仓记录
      渠道，关联可出商品属性
      SELECT * from ecw_channel
      SELECT * from ecw_product_attr