fix: 1.修改取消预约的限制

blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/entity/StatisticsReconciliationOrderInfoEntity.java

@@ -21,86 +21,300 @@ public class StatisticsReconciliationOrderInfoEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "预留1")
 	private String reserve1;
+
 	/**
 	 * 预留2
 	 */
 	@ApiModelProperty(value = "预留2")
 	private String reserve2;
+
 	/**
 	 * 预留3
 	 */
 	@ApiModelProperty(value = "预留3")
 	private String reserve3;
+
 	/**
 	 * 预留4
 	 */
 	@ApiModelProperty(value = "预留4")
 	private String reserve4;
+
 	/**
 	 * 预留5
 	 */
 	@ApiModelProperty(value = "预留5")
 	private String reserve5;
 
+	/**
+	 * 对账单号
+	 */
 	@ApiModelProperty(value = "对账单号")
-	private String reconciliationOrderNo;//对账单号
+	private String reconciliationOrderNo;
 
-	private String waybillNo;//运单号
+	/**
+	 * 运单号
+	 */
+	@ApiModelProperty(value = "运单号")
+	private String waybillNo;
 
-	private String orderCode;//订单号
+	/**
+	 * 运单制单时间
+	 */
+	@ApiModelProperty(value = "运单号")
+	private Date waybillCreateTime;
+
+	/**
+	 * 订单号
+	 */
+	@ApiModelProperty(value = "订单号")
+	private String orderCode;
 
+	/**
+	 * 品牌
+	 */
 	@ApiModelProperty(value = "品牌")
-	private String brand;//品牌
-
-	private Long consigneeId;//收货单位ID
-	private String consignee;//收货单位
-
-	private Long destinationWarehouseId;//目的仓id
-	private String destinationWarehouseName;//目的仓名称
-
-	private Integer totalNum;//总数量
-	private BigDecimal totalWeight;//总重量
-	private BigDecimal totalVolume;//总体积
-
-	private BigDecimal systemTotalFee;//开单预估价
-	private BigDecimal realTotalFee;//实际费用
-	private BigDecimal pickupFee;//提货费
-	private BigDecimal freightFee;//运费
-	private BigDecimal warehouseServiceFee;//仓库服务费
-	private BigDecimal warehouseFee;//仓储费
-	private BigDecimal warehouseManageFee;//仓储管理费
-	private BigDecimal warehouseSortingFee;//仓储分拣费
-	private BigDecimal warehouseOperatingFee;//仓储操作费
-	private BigDecimal deliveryFee;//配送费
-	private BigDecimal deliveryServiceFee;//配送服务费
-	private BigDecimal deliveryLoadingFee;//配送装卸费
-	private BigDecimal deliverySortingFee;//配送分拣费
-	private BigDecimal deliveryUpfloorFee;//配送上楼费
-	private BigDecimal deliveryMoveFee;//配送平移费
-	private BigDecimal deliveryOtherFee;//配送其他费
-	private BigDecimal deliveryCrossingFee;//超区费
-	private BigDecimal installFee;//安装费
-	private BigDecimal otherFee;//其他费
-
-	private Integer isAftersale;//是否有售后
-	private String aftersaleOrder;//售后单号
-	private BigDecimal aftersalesFee;//售后金额
+	private String brand;
+
+	/**
+	 * 收货单位ID
+	 */
+	@ApiModelProperty(value = "收货单位ID")
+	private Long consigneeId;
+
+	/**
+	 * 收货单位
+	 */
+	@ApiModelProperty(value = "收货单位")
+	private String consignee;
+
+	/**
+	 * 目的仓id
+	 */
+	@ApiModelProperty(value = "目的仓id")
+	private Long destinationWarehouseId;
+
+	/**
+	 * 目的仓名称
+	 */
+	@ApiModelProperty(value = "目的仓名称")
+	private String destinationWarehouseName;
+
+	/**
+	 * 总数量
+	 */
+	@ApiModelProperty(value = "总数量")
+	private Integer totalNum;
+
+	/**
+	 * 总重量
+	 */
+	@ApiModelProperty(value = "总重量")
+	private BigDecimal totalWeight;
+
+	/**
+	 * 总体积
+	 */
+	@ApiModelProperty(value = "总体积")
+	private BigDecimal totalVolume;
+
+	/**
+	 * 开单预估价
+	 */
+	@ApiModelProperty(value = "开单预估价")
+	private BigDecimal systemTotalFee;
+
+	/**
+	 * 实际费用
+	 */
+	@ApiModelProperty(value = "实际费用")
+	private BigDecimal realTotalFee;
+
+	/**
+	 * 提货费
+	 */
+	@ApiModelProperty(value = "提货费")
+	private BigDecimal pickupFee;
+
+	/**
+	 * 运费
+	 */
+	@ApiModelProperty(value = "运费")
+	private BigDecimal freightFee;
+
+	/**
+	 * 仓库服务费
+	 */
+	@ApiModelProperty(value = "仓库服务费")
+	private BigDecimal warehouseServiceFee;
+
+	/**
+	 * 仓储费
+	 */
+	@ApiModelProperty(value = "仓储费")
+	private BigDecimal warehouseFee;
+
+	/**
+	 * 仓储管理费
+	 */
+	@ApiModelProperty(value = "仓储管理费")
+	private BigDecimal warehouseManageFee;
+
+	/**
+	 * 仓储分拣费
+	 */
+	@ApiModelProperty(value = "仓储分拣费")
+	private BigDecimal warehouseSortingFee;
+
+	/**
+	 * 仓储操作费
+	 */
+	@ApiModelProperty(value = "仓储操作费")
+	private BigDecimal warehouseOperatingFee;
+
+	/**
+	 * 配送费
+	 */
+	@ApiModelProperty(value = "配送费")
+	private BigDecimal deliveryFee;
 
+	/**
+	 * 配送服务费
+	 */
+	@ApiModelProperty(value = "配送服务费")
+	private BigDecimal deliveryServiceFee;
+
+	/**
+	 * 配送装卸费
+	 */
+	@ApiModelProperty(value = "配送装卸费")
+	private BigDecimal deliveryLoadingFee;
+
+	/**
+	 * 配送分拣费
+	 */
+	@ApiModelProperty(value = "配送分拣费")
+	private BigDecimal deliverySortingFee;
+
+	/**
+	 * 配送上楼费
+	 */
+	@ApiModelProperty(value = "配送上楼费")
+	private BigDecimal deliveryUpfloorFee;
+
+	/**
+	 * 配送平移费
+	 */
+	@ApiModelProperty(value = "配送平移费")
+	private BigDecimal deliveryMoveFee;
+
+	/**
+	 * 配送其他费
+	 */
+	@ApiModelProperty(value = "配送其他费")
+	private BigDecimal deliveryOtherFee;
+
+	/**
+	 * 超区费
+	 */
+	@ApiModelProperty(value = "超区费")
+	private BigDecimal deliveryCrossingFee;
+
+	/**
+	 * 安装费
+	 */
+	@ApiModelProperty(value = "安装费")
+	private BigDecimal installFee;
+
+	/**
+	 * 其他费
+	 */
+	@ApiModelProperty(value = "其他费")
+	private BigDecimal otherFee;
+
+	/**
+	 * 是否有售后
+	 */
+	@ApiModelProperty(value = "是否有售后")
+	private Integer isAftersale;
+
+	/**
+	 * 售后单号
+	 */
+	@ApiModelProperty(value = "售后单号")
+	private String aftersaleOrder;
+
+	/**
+	 * 售后金额
+	 */
+	@ApiModelProperty(value = "售后金额")
+	private BigDecimal aftersalesFee;
+
+	/**
+	 * 创建用户名
+	 */
+	@ApiModelProperty(value = "创建用户名")
 	private String createUserName;
 
-	private Integer isChanges;//是否有异动 0 否 1是
-	private BigDecimal changesFee;//异动金额
-	private String changesItems;//异动栏目
-	private String changesRemark;//异动备注
-	private Date changesTime;//异动时间
+	/**
+	 * 是否有异动 0 否 1是
+	 */
+	@ApiModelProperty(value = "是否有异动 0 否 1是")
+	private Integer isChanges;
 
-	private Integer checkStatus;//确认结算状态 0为确认  1已确认
+	/**
+	 * 异动金额
+	 */
+	@ApiModelProperty(value = "异动金额")
+	private BigDecimal changesFee;
+
+	/**
+	 * 异动栏目
+	 */
+	@ApiModelProperty(value = "异动栏目")
+	private String changesItems;
+
+	/**
+	 * 异动备注
+	 */
+	@ApiModelProperty(value = "异动备注")
+	private String changesRemark;
+
+	/**
+	 * 异动时间
+	 */
+	@ApiModelProperty(value = "异动时间")
+	private Date changesTime;
+
+	/**
+	 * 确认结算状态 0为确认  1已确认
+	 */
+	@ApiModelProperty(value = "确认结算状态 0为确认  1已确认")
+	private Integer checkStatus;
+
+	/**
+	 * 确认结算用户名
+	 */
+	@ApiModelProperty(value = "确认结算用户名")
 	private String checkUserName;
+
+	/**
+	 * 确认结算时间
+	 */
+	@ApiModelProperty(value = "确认结算时间")
 	private Date checkTime;
 
+	/**
+	 * 结算单号
+	 */
+	@ApiModelProperty(value = "结算单号")
 	private String balanceOrderNo;
-	private Long balanceOrderId;
 
+	/**
+	 * 结算单ID
+	 */
+	@ApiModelProperty(value = "结算单ID")
+	private Long balanceOrderId;
 
 
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml

@@ -758,8 +758,8 @@
         ldsa.is_zero, ldsa.accept_warehouse_id, ldsa.accept_warehouse_name, ldsa.order_delivery_status
         from logpm_distribution_stock_article ldsa
         LEFT JOIN logpm_distribution_parcel_list ldpl on ldsa.id = ldpl.stock_article_id
-        LEFT JOIN logpm_trunkline_waybill_order AS ltwo ON ldsa.waybill_number = ltwo.waybill_no
-        LEFT JOIN logpm_warehouse_waybill AS lww ON lww.id = ltwo.waybill_id
+        LEFT JOIN logpm_trunkline_waybill_order AS ltwo ON ldsa.order_code = ltwo.order_code
+        LEFT JOIN logpm_warehouse_waybill AS lww ON lww.waybill_no = ltwo.waybill_no
         <where>
             ldsa.order_status in ('10','20','30','70')
             AND lww.check_status = 1

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsReconciliationOrderInfoMapper.xml

@@ -26,6 +26,10 @@
         <if test="param.openTimeEnd != null">
             and create_time &lt;= #{param.openTimeEnd}
         </if>
+        <if test="param.consignee != null">
+            and consignee &lt;= #{param.consignee}
+        </if>
+
         <if test="param.isAftersales != null">
             and is_aftersale &lt;= #{param.isAftersales}
         </if>

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsOrderInfoServiceImpl.java

@@ -482,6 +482,9 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl<StatisticsOr
 		reconciliationOrder.setReconciliationOrderNo(reconciliationOrdeCode);
 		//把orderInfoEntities中所有waybillNo去重拼接起来
 		reconciliationOrder.setWaybillNo(orderInfoEntities.stream().map(StatisticsOrderInfoEntity::getWaybillNo).distinct().collect(Collectors.joining(",")));
+		// 增加运单的制单时间
+//		reconciliationOrder.setWaybillCreateTime(orderInfoEntities.get(0).getWaybillCreateTime());
+
 		reconciliationOrder.setOrderCode(orderInfoEntities.stream().map(StatisticsOrderInfoEntity::getOrderCode).distinct().collect(Collectors.joining(",")));
 		reconciliationOrder.setBrand(orderInfoEntities.stream().map(StatisticsOrderInfoEntity::getBrand).distinct().collect(Collectors.joining(",")));
 		reconciliationOrder.setConsigneeId(consigneeId);
@@ -522,6 +525,7 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl<StatisticsOr
 
 		reconciliationOrder.setCheckStatus(0);
 
+
 		boolean saveFlag = reconciliationOrderInfoService.save(reconciliationOrder);
 		if(saveFlag){
 			Long reconciliationOrderId = reconciliationOrder.getId();