修改包装要求，FOB系数取不到问题

blade-service-api/blade-client-api/src/main/java/org/springblade/client/vo/CorpListVo.java

@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * 客户详情视图实体类
  *
@@ -71,4 +73,10 @@ public class CorpListVo {
 
 	@ApiModelProperty("地址")
 	private String addr;
+
+	/**
+	 * FOB系数
+	 */
+	@ApiModelProperty(value = "FOB系数")
+	private BigDecimal coefficient;
 }

blade-service-api/blade-deliver-goods-api/src/main/java/org/springblade/deliver/goods/entity/Delivery.java

@@ -453,4 +453,8 @@ public class Delivery implements Serializable {
 	private String voucherId;
 
 	private String voucherNo;
+
+	//包装要求
+	@TableField(exist = false)
+	private String packageRemarks;
 }

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/controller/DeliveryController.java

@@ -99,8 +99,6 @@ public class DeliveryController extends BladeController {
 		lambdaQueryWrapper.eq(Delivery::getTradeType,OrderTypeEnum.DOMESTIC.getType());
 		lambdaQueryWrapper.eq(delivery.getSalesCompany()!=null,Delivery::getSalesCompany,delivery.getSalesCompany());
 		lambdaQueryWrapper.like(StringUtils.isNotBlank(delivery.getPurchaseMode()),Delivery::getPurchaseMode,delivery.getPurchaseMode());
-		System.out.println("开始时间========================="+delivery.getCreateStartTime());
-		System.out.println("结束时间========================="+delivery.getCreateEndTime());
 		lambdaQueryWrapper.ge(Func.isNotEmpty(delivery.getCreateStartTime()),Delivery::getCreateTime,delivery.getCreateStartTime());//制单日期开始
 		lambdaQueryWrapper.le(Func.isNotEmpty(delivery.getCreateEndTime()),Delivery::getCreateTime,delivery.getCreateEndTime());//制单日期结束
 		lambdaQueryWrapper.ge(Func.isNotEmpty(delivery.getBusinessStartDate()),Delivery::getBusinessDate,delivery.getBusinessStartDate());//发货日期开始

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/service/impl/DeliveryServiceImpl.java

@@ -246,6 +246,14 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 	public Delivery getDeliveryMessage(Delivery delivery) {
 		//获取发货主表数据
 		Delivery selectById = baseMapper.selectById(delivery.getId());
+
+		//获得包装要求
+		Order order = new Order();
+		order.setOrderNo(selectById.getOrderNo());
+		Order listR = orderDescClient.getByOrder(order);
+		if (listR != null) {
+			selectById.setPackageRemarks(listR.getPackageRemarks());
+		}
 		//获取创建人中文名
 		R<User> createUser = userClient.userInfoById(selectById.getCreateUser());
 		if (createUser.isSuccess() || createUser.getData() != null) {