订单入仓时，对发货人不是代理或同行时执行的业务逻辑判断bug修复

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

@@ -427,9 +427,10 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
                         customerService.getCustomer(orderConsignorDO.getCustomerId());
                 // 发货人不是代理或同行
                 if (orderConsignorCustomer != null &&
-                        StringUtils.isNotEmpty(orderConsignorCustomer.getRoles())
-                        && !orderConsignorCustomer.getRoles().contains("2") &&
-                        !orderConsignorCustomer.getRoles().contains("3")) {
+                        (StringUtils.isBlank(orderConsignorCustomer.getRoles()) ||
+                                (StringUtils.isNotEmpty(orderConsignorCustomer.getRoles())
+                                    && !orderConsignorCustomer.getRoles().contains("2")
+                                    && !orderConsignorCustomer.getRoles().contains("3")))) {
                     // 收货人信息
                     OrderConsigneeDO orderConsigneeDO =
                             orderConsigneeService.getOrderConsigneeByOrderId(orderId);

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/boxLadingBill/BoxLadingBillServiceImpl.java

 package cn.iocoder.yudao.module.shipment.service.boxLadingBill;
 
-import java.io.*;
 import java.util.*;
 import java.util.stream.Collectors;
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
-import cn.iocoder.yudao.framework.common.exception.ServiceException;
 import cn.iocoder.yudao.framework.dict.core.dto.DictDataRespDTO;
 import cn.iocoder.yudao.framework.dict.core.util.DictFrameworkUtils;
 import cn.iocoder.yudao.framework.i18n.core.I18nMessage;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.ecw.dal.dataobject.cabinet.CabinetDO;
-import cn.iocoder.yudao.module.ecw.dal.dataobject.clearanceFileNo.ClearanceFileNoDO;
 import cn.iocoder.yudao.module.ecw.dal.dataobject.supplier.SupplierDO;
 import cn.iocoder.yudao.module.ecw.dal.dataobject.supplier.SupplierExternalDO;
-import cn.iocoder.yudao.module.ecw.dal.dataobject.unit.UnitDO;
 import cn.iocoder.yudao.module.ecw.service.cabinet.CabinetService;
 import cn.iocoder.yudao.module.ecw.service.clearanceFileNo.ClearanceFileNoService;
 import cn.iocoder.yudao.module.ecw.service.dock.DockService;
@@ -33,23 +28,13 @@ import cn.iocoder.yudao.module.shipment.dal.mysql.BoxLadingBillMapper;
 import cn.iocoder.yudao.module.shipment.dal.mysql.BoxMapper;
 import cn.iocoder.yudao.module.shipment.enums.BlStatueEnum;
 import cn.iocoder.yudao.module.shipment.enums.OperateTypeEnum;
-import cn.iocoder.yudao.module.shipment.enums.TlStatueEnum;
-import cn.iocoder.yudao.module.shipment.service.box.BoxService;
 import cn.iocoder.yudao.module.shipment.service.boxAgent.BoxAgentService;
 import cn.iocoder.yudao.module.shipment.service.boxShipping.BoxShippingService;
 import cn.iocoder.yudao.module.shipment.vo.boxLadingBill.BoxLadingBillCreateReqVO;
 import cn.iocoder.yudao.module.shipment.vo.boxLadingBill.BoxLadingBillQueryVO;
 import cn.iocoder.yudao.module.shipment.vo.boxLadingBill.BoxLadingBillUpdateReqVO;
 import cn.iocoder.yudao.module.system.api.dict.DictDataApi;
-import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
-import com.alibaba.excel.EasyExcel;
-import com.alibaba.excel.ExcelWriter;
-import com.alibaba.excel.write.metadata.WriteSheet;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.itextpdf.text.pdf.AcroFields;
-import com.itextpdf.text.pdf.BaseFont;
-import com.itextpdf.text.pdf.PdfReader;
-import com.itextpdf.text.pdf.PdfStamper;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -62,7 +47,6 @@ import cn.iocoder.yudao.framework.mybatis.core.service.AbstractService;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.module.ecw.enums.ErrorCodeConstants.*;
 import static cn.iocoder.yudao.module.shipment.enums.ErrorCodeConstants.BOX_NOT_EXISTS;
 import static cn.iocoder.yudao.module.shipment.enums.ErrorCodeConstants.MAKE_BILL_OF_LADING_NOT_EXISTS;