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

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/CarsLoadScanInfoVO.java

@@ -0,0 +1,17 @@
+package com.logpm.trunkline.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class CarsLoadScanInfoVO implements Serializable {
+
+	private String scanCode;
+	private String loadCode;
+	private String scanStatus;
+	private Date createTime;
+	private Date signTime;
+
+}

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWayBillDetailAbolish.java

@@ -0,0 +1,84 @@
+package com.logpm.warehouse.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springblade.core.mp.base.BaseEntity;
+
+import java.math.BigDecimal;
+
+@Data
+@ApiModel(value = "运单作废明细",description = "")
+@TableName("logpm_warehouse_waybill_detail_abolish")
+public class WarehouseWayBillDetailAbolish extends BaseEntity {
+
+	/** 运单号 */
+	@ApiModelProperty(name = "运单号",notes = "")
+	private String waybillNo;
+
+	/** 运单号id */
+	@ApiModelProperty(name = "运单id",notes = "")
+	private Long waybillId;
+
+	/** 品名 */
+	@ApiModelProperty(name = "品名",notes = "")
+	private String productName;
+
+	/** 品名id */
+	@ApiModelProperty(name = "品名id",notes = "")
+	private Long productId;
+
+	/** 数量 */
+	@ApiModelProperty(name = "数量",notes = "")
+	private Integer num;
+
+	/** 体积 */
+	@ApiModelProperty(name = "体积",notes = "")
+	private BigDecimal volume;
+
+	/** 重量 */
+	@ApiModelProperty(name = "重量",notes = "")
+	private BigDecimal weight;
+
+	/** 单价 */
+	@ApiModelProperty(name = "单价",notes = "")
+	private BigDecimal price;
+
+	/** 小计运费 */
+	@ApiModelProperty(name = "小计运费",notes = "")
+	private BigDecimal subtotalFreight;
+
+	/** 计价方式 1件 2方 3公斤 */
+	@ApiModelProperty(name = "实际运费计价方式 1件 2方 3公斤",notes = "")
+	private Integer chargeType;
+
+	/** 单价 */
+	@ApiModelProperty(name = "配送单价",notes = "")
+	private BigDecimal deliveryPrice;
+
+	/** 小计运费 */
+	@ApiModelProperty(name = "小计配送费用",notes = "")
+	private BigDecimal subtotalDeliveryFee;
+
+	/** 单价 */
+	@ApiModelProperty(name = "提货单价",notes = "")
+	private BigDecimal pickupPrice;
+
+	/** 单价 */
+	@ApiModelProperty(name = "运费单价",notes = "")
+	private BigDecimal freightPrice;
+
+	@ApiModelProperty(name = "系统运费计价方式 1件 2方 3公斤",notes = "")
+	private Integer systemChargeType;
+
+	@ApiModelProperty(name = "系统配送计价方式 1件 2方 3公斤",notes = "")
+	private Integer systemDeliveryChargeType;
+
+	@ApiModelProperty(name = "系统提货计价方式 1件 2方 3公斤",notes = "")
+	private Integer systemPickupChargeType;
+
+	@ApiModelProperty(name = "系统仓库计价方式 1件 2方 3公斤",notes = "")
+	private Integer systemWarehouseChargeType;
+
+}

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWaybillAbolishEntity.java

@@ -0,0 +1,553 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.warehouse.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 运单表 实体类
+ *
+ * @author zhy
+ * @since 2023-07-10
+ */
+@Data
+@TableName("logpm_warehouse_waybill_abolish")
+@ApiModel(value = "WarehouseWaybillAbolish对象", description = "运单作废表")
+@EqualsAndHashCode(callSuper = true)
+public class WarehouseWaybillAbolishEntity extends TenantEntity {
+
+	/**
+	 * 运单号
+	 */
+	@ApiModelProperty(value = "运单号")
+	private String waybillNo;
+	/**
+	 * 订单自编号
+	 */
+	@ApiModelProperty(value = "订单自编号")
+	private String orderNo;
+	/**
+	 * 目的仓
+	 */
+	@ApiModelProperty(value = "目的仓")
+	private String destinationWarehouseName;
+	/**
+	 * 发站仓
+	 */
+	@ApiModelProperty(value = "发站仓")
+	private String departureWarehouseName;
+	/**
+	 * 客户车次
+	 */
+	@ApiModelProperty(value = "客户车次")
+	private String customerTrain;
+	/**
+	 * 品牌
+	 */
+	@ApiModelProperty(value = "品牌id")
+	private Long brandId;
+
+	/**
+	 * 品牌
+	 */
+	@ApiModelProperty(value = "品牌")
+	private String brand;
+
+	/**
+	 * 发货单位
+	 */
+	@ApiModelProperty(value = "发货单位")
+	private String shipper;
+	/**
+	 * 发货人
+	 */
+	@ApiModelProperty(value = "发货人")
+	private String shipperName;
+	/**
+	 * 发货方手机号
+	 */
+	@ApiModelProperty(value = "发货方手机号")
+	private String shipperMobile;
+	/**
+	 * 发货方地址
+	 */
+	@ApiModelProperty(value = "发货方地址")
+	private String shipperAddress;
+	/**
+	 * 收货单位
+	 */
+	@ApiModelProperty(value = "收货单位")
+	private String consignee;
+	/**
+	 * 收货人
+	 */
+	@ApiModelProperty(value = "收货人")
+	private String consigneeName;
+	/**
+	 * 收货方手机号
+	 */
+	@ApiModelProperty(value = "收货方手机号")
+	private String consigneeMobile;
+	/**
+	 * 收货方地址
+	 */
+	@ApiModelProperty(value = "收货方地址")
+	private String consigneeAddress;
+	/**
+	 * 到站
+	 */
+	@ApiModelProperty(value = "到站")
+	private String destination;
+	/**
+	 * 货物名称
+	 */
+	@ApiModelProperty(value = "货物名称")
+	private String goodsName;
+	/**
+	 * 总数
+	 */
+	@ApiModelProperty(value = "总数")
+	private Integer totalCount;
+	/**
+	 * 在库数
+	 */
+	@ApiModelProperty(value = "在库数")
+	private Integer stockCount;
+	/**
+	 * 总重量
+	 */
+	@ApiModelProperty(value = "总重量")
+	private BigDecimal totalWeight;
+	/**
+	 * 在库重量
+	 */
+	@ApiModelProperty(value = "在库重量")
+	private BigDecimal stockWeight;
+	/**
+	 * 总体积
+	 */
+	@ApiModelProperty(value = "总体积")
+	private BigDecimal totalVolume;
+	/**
+	 * 在库体积
+	 */
+	@ApiModelProperty(value = "在库体积")
+	private BigDecimal stockVolume;
+	/**
+	 * 送货方式
+	 */
+	@ApiModelProperty(value = "送货方式")
+	private Integer deliveryMethod;
+
+	@TableField(exist = false)
+	private String deliveryMethodStr;
+
+	@TableField(exist = false)
+	private String urgencyStr;
+
+	/**
+	 * 回单数
+	 */
+	@ApiModelProperty(value = "回单数")
+	private Integer receiptCount;
+	/**
+	 * 回单要求
+	 */
+	@ApiModelProperty(value = "回单要求")
+	private String receiptRequirement;
+	/**
+	 * 经办人
+	 */
+	@ApiModelProperty(value = "经办人")
+	private String agent;
+	/**
+	 * 经办人id
+	 */
+	@ApiModelProperty(value = "经办人id")
+	private Long agentId;
+	/**
+	 * 收货单位id
+	 */
+	@ApiModelProperty(value = "收货单位id")
+	private Long consigneeId;
+	/**
+	 * 发货单位id
+	 */
+	@ApiModelProperty(value = "发货单位id")
+	private Long shipperId;
+	/**
+	 * 发展仓id
+	 */
+	@ApiModelProperty(value = "发展仓id")
+	private Long departureWarehouseId;
+	/**
+	 * 目的仓id
+	 */
+	@ApiModelProperty(value = "目的仓id")
+	private Long destinationWarehouseId;
+	/**
+	 * 制单时间
+	 */
+	@ApiModelProperty(value = "制单时间")
+	private Date documentMakingTime;
+	/**
+	 * 备注
+	 */
+	@ApiModelProperty(value = "备注")
+	private String remark;
+	/**
+	 * 批次号
+	 */
+	@ApiModelProperty(value = "批次号")
+	private String batchNo;
+	/**
+	 * 服务类型
+	 */
+	@ApiModelProperty(value = "服务类型")
+	private Integer serviceType;
+
+	/**
+	 * 服务类型
+	 */
+	@TableField(exist = false)
+	private String serviceTypeStr;
+	/**
+	 * 服务号
+	 */
+	@ApiModelProperty(value = "服务号")
+	private String serviceNo;
+	/**
+	 * 冻结状态
+	 */
+	@ApiModelProperty(value = "冻结状态")
+	private Integer freezeStatus;
+
+	@TableField(exist = false)
+	private String freezeStatusStr;
+	/**
+	 * 预留1
+	 */
+	@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 Integer stats; //运单状态  弃用
+
+	@TableField(exist = false)
+	private String statsStr;
+
+	//-------------------2023-07-28----------------
+
+	@ApiModelProperty(value = "到付")
+	private BigDecimal collectPay;//到付
+
+	@ApiModelProperty(value = "已收到付")
+	private BigDecimal receivedCollectPay;//已收到付
+
+	@ApiModelProperty(value = "代收货款")
+	private BigDecimal replacePrice;//代收货款
+
+	@ApiModelProperty(value = "已收代收货款")
+	private BigDecimal receivedReplacePrice;//已收代收货款
+
+	@ApiModelProperty(value = "已收总金额")
+	private BigDecimal receivedTotalPrice;//已收总金额
+
+	@ApiModelProperty(value = "运单类型")
+	private Integer waybillType;//运单类型 1订制品  2零担
+
+	@ApiModelProperty(value = "收款状态 0未签收 1已签收")
+	private Integer receivedStatus;//收款状态 0未签收 1已签收
+
+	//--------------2023-11-18 干线新增字段
+	/**
+	 * 运费
+	 */
+	@ApiModelProperty(value = "运费")
+	private BigDecimal totalFreight;//运费
+	/**
+	 * 送货费
+	 */
+	@ApiModelProperty(value = "送货费")
+	private BigDecimal deliveryFee;//送货费
+	/**
+	 * 提货费
+	 */
+	@ApiModelProperty(value = "提货费")
+	private BigDecimal pickupFee;//提货费
+	/**
+	 * 仓库管理费
+	 */
+	@ApiModelProperty(value = "仓库管理费")
+	private BigDecimal warehouseManagementFee;//仓库管理费
+	/**
+	 * 仓储费
+	 */
+	@ApiModelProperty(value = "仓储费")
+	private BigDecimal storageFee;//仓储费
+
+	/**
+	 * 仓储费
+	 */
+	@ApiModelProperty(value = "仓储分拣费")
+	private BigDecimal sortingFee;//仓储分拣费
+
+	/**
+	 * 装卸费
+	 */
+	@ApiModelProperty(value = "仓库操作费")
+	private BigDecimal handlingFee;//仓库操作费
+	/**
+	 * 安装费
+	 */
+	@ApiModelProperty(value = "安装费")
+	private BigDecimal installFee;//安装费
+	/**
+	 * 其他费
+	 */
+	@ApiModelProperty(value = "其他费")
+	private BigDecimal otherFee;//其他费
+	/**
+	 * 保价费
+	 */
+	@ApiModelProperty(value = "保价费")
+	private BigDecimal insuranceFee;//保价费
+	/**
+	 * 申明价值
+	 */
+	@ApiModelProperty(value = "申明价值")
+	private BigDecimal claimingValue;//申明价值
+
+	/**
+	 * 回扣
+	 */
+	@ApiModelProperty(value = "回扣")
+	private BigDecimal rebate;//回扣
+
+	/**
+	 * 支付方式 1现金 2银行卡 3微信 4支付宝 5支票 6账本
+	 */
+	@ApiModelProperty(value = "支付方式 1现金 2银行卡 3微信 4支付宝 5支票 6账本")
+	private String payType;//支付方式 1现金 2银行卡 3微信 4支付宝 5支票 6账本
+	/**
+	 * 付款方式  1现付 2到付 3月结 4回付 5内部结算 6多笔付
+	 */
+	@ApiModelProperty(value = "付款方式  1现付 2到付 3月结 4回付 5内部结算 6多笔付")
+	private String payWay;//付款方式
+	/**
+	 * 现付金额
+	 */
+	@ApiModelProperty(value = "现付金额")
+	@JsonProperty("xPay")
+	private BigDecimal xPay;//现付金额
+	/**
+	 * 到付
+	 */
+	@ApiModelProperty(value = "到付")
+	@JsonProperty("dPay")
+	private BigDecimal dPay;//到付
+	/**
+	 * 月结
+	 */
+	@ApiModelProperty(value = "月结")
+	@JsonProperty("yPay")
+	private BigDecimal yPay;//月结
+	/**
+	 * 回付
+	 */
+	@ApiModelProperty(value = "回付")
+	@JsonProperty("hPay")
+	private BigDecimal hPay;//回付
+	/**
+	 * 三方操作费
+	 */
+	@ApiModelProperty(value = "三方操作费")
+	private BigDecimal thirdOperationFee;//三方操作费
+
+	/**
+	 * 送货方式  1自提 2送货 3送货上门 4送货上门(有电梯) 5送货上门(无电梯) 6送货卸货 7送货安装
+	 */
+	@ApiModelProperty(value = "送货方式  1自提 2送货 3送货上门 4送货上门(有电梯) 5送货上门(无电梯) 6送货卸货 7送货安装")
+	private String deliveryWay;//送货方式  1自提 2送货 3送货上门 4送货上门(有电梯) 5送货上门(无电梯) 6送货卸货 7送货安装
+	/**
+	 * 紧急度  1正常 2急 3加急 4特急
+	 */
+	@ApiModelProperty(value = "紧急度  1正常 2急 3加急 4特急")
+	private String urgency;//紧急度  1正常 2急 3加急 4特急
+	/**
+	 * 回单方式  1签回单 2签原单 3打收条 4签信封 5签回单盖章 6 1份回单 7 2份回单 8 3份回单 9 4份回单 10 5份回单
+	 */
+	@ApiModelProperty(value = "回单方式  1签回单 2签原单 3打收条 4签信封 5签回单盖章 6 1份回单 7 2份回单 8 3份回单 9 4份回单 10 5份回单")
+	private String receipt;//回单方式（多选）
+	/**
+	 * 运输方式  1公路快运 2海运 3卡车航班 4空运 5普通汽班 6快递
+	 */
+	@ApiModelProperty(value = "运输方式  1公路快运 2海运 3卡车航班 4空运 5普通汽班 6快递")
+	private String transportType;//运输方式  1公路快运 2海运 3卡车航班 4空运 5普通汽班 6快递
+
+	/**
+	 * 运单状态 0未入库 10部分入库 20已入库
+	 */
+	@ApiModelProperty(value = "运单状态")
+	private String waybillStatus;//运单状态 0未入库10部分入库20入库30部分中转40 中转50 目的仓部分到达60 目的仓到达70 配送部分装车80 配送装车90 部分签收100 已签收
+
+	@ApiModelProperty(value = "回单份数")
+	private Integer receiptNum;
+
+	@ApiModelProperty(value = "到站编码")
+	private String destinationCode;
+
+	@ApiModelProperty(value = "货号")
+	private String goodsCode;
+
+	@ApiModelProperty(value = "审核人id")
+	private Long checkUserId;
+	@ApiModelProperty(value = "审核人名称")
+	private String checkUserName;
+
+	@ApiModelProperty(value = "按件成本")
+	private BigDecimal costPiece;
+
+	@ApiModelProperty(value = "按张逻辑成本")
+	private BigDecimal costZhang;
+
+	@ApiModelProperty(value = "成本件数")
+	private Integer costNum;
+
+	@ApiModelProperty(value = "发站")
+	private String departure;
+
+	@ApiModelProperty(value = "发站编码")
+	private String departureCode;
+
+	@ApiModelProperty(value = "商场编码")
+	private String dealerCode;
+
+	@ApiModelProperty(value = "商场名称")
+	private String dealerName;
+
+	@ApiModelProperty(value = "提货是否整车 0否 1是")
+	private Integer pickupCompleteOrNot;
+
+	@ApiModelProperty(value = "干线是否整车 0否 1是")
+	private Integer trunklineCompleteOrNot;
+
+	@ApiModelProperty(value = "干线车型 ")
+	private Long trunklineVehicleTypeId;
+
+	@ApiModelProperty(value = "干线车型 ")
+	private String trunklineVehicleType;
+
+	@ApiModelProperty(value = "提货车型 ")
+	private String pickupVehicleType;
+
+	@ApiModelProperty(value = "作废状态 0否 1是 ")
+	private Integer abolishStatus;
+
+	@ApiModelProperty(value = "作废人名称 ")
+	private String abolishUserName;
+
+	@ApiModelProperty(value = "作废时间 ")
+	private Date abolishTime;
+
+	@ApiModelProperty(value = "冻结人名称 ")
+	private String freezeUserName;
+
+	@ApiModelProperty(value = "冻结时间 ")
+	private Date freezeTime;
+
+	@ApiModelProperty(value = "提货件数 ")
+	private Integer billladingNum;
+
+	@ApiModelProperty(value = "审核时间 ")
+	private Date checkTime;
+
+	@ApiModelProperty(value = "回单状态 ")
+	private Integer returnStatus;
+
+	@ApiModelProperty(value = "审核状态 ")
+	private Integer checkStatus;
+
+	@ApiModelProperty(value = "更新状态 ")
+	private Integer updateStatus;
+
+	@ApiModelProperty(value = "审核意见 ")
+	private String checkReson;
+
+	@ApiModelProperty(value = "审核备注 ")
+	private String checkRemark;
+
+
+	@ApiModelProperty(value = "取消审核备注 ")
+	private String cancleCheckRemark;
+
+	@ApiModelProperty(value = "取消审核人id")
+	private Long cancleCheckUserId;
+	@ApiModelProperty(value = "取消审核人名称")
+	private String cancleCheckUserName;
+	@ApiModelProperty(value = "取消审核时间 ")
+	private Date cancleCheckTime;
+
+
+	@ApiModelProperty(value = "签收件数 ")
+	private Integer signNum;
+
+	@ApiModelProperty(value = "签收人")
+	private String signUserName;
+	@ApiModelProperty(value = "签收时间 ")
+	private Date signTime;
+
+	@ApiModelProperty(value = "文员复核人")
+	private String signCheckUserName;
+	@ApiModelProperty(value = "文员复核时间 ")
+	private Date signCheckTime;
+
+
+
+
+}

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseWaybillAbolishClient.java

@@ -0,0 +1,24 @@
+package com.logpm.warehouse.feign;
+
+import com.logpm.warehouse.entity.WarehouseWaybillAbolishEntity;
+import org.springblade.common.constant.ModuleNameConstant;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+@FeignClient(
+    value = ModuleNameConstant.APPLICATION_WAREHOUSE_NAME
+)
+public interface IWarehouseWaybillAbolishClient {
+
+	String API_PREFIX = "/client12";
+    String TOP = API_PREFIX + "/top";
+
+    @PostMapping(API_PREFIX)
+    void saveBatch(@RequestBody List<WarehouseWaybillAbolishEntity> waybillAbolishEntities);
+
+
+
+}

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseWaybillDetailAbolishClient.java

@@ -0,0 +1,24 @@
+package com.logpm.warehouse.feign;
+
+import com.logpm.warehouse.entity.WarehouseWayBillDetailAbolish;
+import org.springblade.common.constant.ModuleNameConstant;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+@FeignClient(
+    value = ModuleNameConstant.APPLICATION_WAREHOUSE_NAME
+)
+public interface IWarehouseWaybillDetailAbolishClient {
+
+	String API_PREFIX = "/waybillDetailAbolish";
+    String TOP = API_PREFIX + "/top";
+
+    @PostMapping(API_PREFIX+"/saveBatch")
+    void saveBatch(@RequestBody List<WarehouseWayBillDetailAbolish> waybillDetailAbolishEntities);
+
+
+
+}

blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicMaterialController.java

@@ -51,6 +51,7 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -202,8 +203,9 @@ public class BasicMaterialController extends BladeController {
 			log.info("物料添加失败！");
 			return R.fail("添加失败，必填物料信息不完整为空！");
 		}
-
+		if (Objects.isNull(basicMaterial.getId())){
-		checkBasicMaterialEntity(basicMaterial);
+			checkBasicMaterialEntity(basicMaterial);
+		}
 
 		return R.status(basicMaterialService.saveOrUpdateOwn(basicMaterial));
 	}

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

@@ -236,7 +236,7 @@
         </where>
         ) AS c ON c.parcel_list_id = ldpl.id
         <where>
-            ldpl.is_deleted = 0
+            ldpl.is_deleted = 0 AND ldpl.is_transfer = 0
             <if test="param.warehouse !='' and param.warehouse != null">
                 and lww.name like concat('%',#{param.warehouse},'%')
             </if>
@@ -1205,7 +1205,7 @@
     </select>
     <select id="selectByOrderPackageCode"
             resultType="com.logpm.distribution.entity.DistributionParcelListEntity">
-        SELECT * FROM logpm_distribution_parcel_list WHERE order_package_code = #{orderPackageCode} and warehouse_id = #{warehouseId}
+        SELECT * FROM logpm_distribution_parcel_list WHERE order_package_code = #{orderPackageCode} and warehouse_id = #{warehouseId} AND is_transfer = 0
     </select>
     <select id="getPackageListByMap" resultType="com.logpm.distribution.entity.DistributionParcelListEntity">
         SELECT

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java

@@ -3626,6 +3626,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			List<DistributionParcelListEntity> parcelListEntityList = distributionParcelListService.list(Wrappers.<DistributionParcelListEntity>query().lambda()
 				.eq(DistributionParcelListEntity::getOrderPackageCode, distrilbutionloadingscanDTO.getBarcode())
 				.eq(DistributionParcelListEntity::getWarehouseId, myCurrentWarehouse.getId())
+				.eq(DistributionParcelListEntity::getIsTransfer, 0)
 			);
 			DistributionDeliveryListEntity distributionDeliveryListEntity = distributionDeliveryListMapper.selectById(distrilbutionloadingscanDTO.getDeliveryId());
 			DistributionDeliverySelfEntity deliverySelfEntity = distributionDeliveryListService.getDriver(distributionDeliveryListEntity, user, null, driver);

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.java

@@ -98,4 +98,7 @@ public interface TrunklineAdvanceDetailMapper extends BaseMapper<TrunklineAdvanc
 	List<JSONObject> findAllUnloadData();
 
 	void updateSyncUnloadDataStatus(@Param("id") Integer id, @Param("status") int status);
+
+	List<CarsLoadScanInfoVO> findCarsLoadScanInfoByOrderPackageCodes(@Param("orderPackageCodes") List<String> orderPackageCodes);
+
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml

@@ -257,10 +257,6 @@
             ltad.weight weight,
             ltad.volume volume,
             ltad.send_date_str sendDateStr,
-            m.load_code trunklineCarsNo,
-            m.scan_status scanStatus,
-            m.create_time trunklineLoadingTime,
-            m.sign_time trunklineSignTime,
             lddl.train_number deliveryTrainNumber,
             ldl.scan_time deliveryLoadingTime,
             ldl.signing_time deliverySignTime,
@@ -271,13 +267,6 @@
         from logpm_trunkline_advance_detail ltad
          left join logpm_trunkline_advance lta on lta.id = ltad.advance_id
          left join logpm_distribution_parcel_list ldpl on ldpl.order_package_code = ltad.order_package_code and ldpl.warehouse_id = ltad.now_warehouse_id
-         left join (select ltcls.* from logpm_trunkline_cars_load_scan ltcls
-         join (
-            select cls.scan_code,
-                   max(cls.update_time) cupdateTime
-            from  logpm_trunkline_cars_load_scan cls
-            group by cls.scan_code
-        ) cmax on cmax.scan_code = ltcls.scan_code and cmax.cupdateTime = ltcls.update_time) m on m.scan_code = ltad.order_package_code
          left join logpm_distribution_loadscan ldl on ldl.order_package_code = ltad.order_package_code and ldl.scan_status != 1 and ldl.is_deleted = 0
         left join logpm_distribution_delivery_list lddl on lddl.id = ldl.delivery_id
         where 1=1
@@ -306,9 +295,6 @@
         <if test="param.brand != null and param.brand != ''  ">
             and ltad.brand  = #{param.brand}
         </if>
-        <if test="param.trunklineCarsNo != null and param.trunklineCarsNo != ''  ">
-            and m.load_code  = #{param.trunklineCarsNo}
-        </if>
         <if test="param.deliveryTrainNumber != null and param.deliveryTrainNumber != ''  ">
             and lddl.train_number  = #{param.deliveryTrainNumber}
         </if>
@@ -604,4 +590,21 @@
         where id = #{id}
     </update>
 
+    <select id="findCarsLoadScanInfoByOrderPackageCodes" resultType="com.logpm.trunkline.vo.CarsLoadScanInfoVO">
+        select ltcls.scan_code scanCode,
+               ltcls.load_code loadCode,
+               ltcls.scan_status scanStatus,
+               cmax.cupdateTime createTime,
+               ltcls.sign_time signTime
+        from logpm_trunkline_cars_load_scan ltcls
+        join (select cls.scan_code, max( cls.create_time ) cupdateTime
+            FROM logpm_trunkline_cars_load_scan cls
+            WHERE cls.scan_code in
+            <foreach collection="orderPackageCodes" item="item" open="(" separator="," close=")">
+             #{item}
+            </foreach>
+            GROUP BY cls.scan_code ) cmax ON cmax.scan_code = ltcls.scan_code
+        AND cmax.cupdateTime = ltcls.create_time
+    </select>
+
 </mapper>

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java

@@ -13,24 +13,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.logpm.basic.entity.BasicMaterialEntity;
 import com.logpm.basic.feign.IBasicMaterialClient;
-import com.logpm.basicdata.entity.BasicdataBrandEntity;
+import com.logpm.basicdata.entity.*;
-import com.logpm.basicdata.entity.BasicdataCategoryEntity;
+import com.logpm.basicdata.feign.*;
-import com.logpm.basicdata.entity.BasicdataClientEntity;
-import com.logpm.basicdata.entity.BasicdataFreightDetailEntity;
-import com.logpm.basicdata.entity.BasicdataStorageServicesEntity;
-import com.logpm.basicdata.entity.BasicdataStoreBusinessEntity;
-import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
-import com.logpm.basicdata.feign.IBasicdataBrandClient;
-import com.logpm.basicdata.feign.IBasicdataCategoryClient;
-import com.logpm.basicdata.feign.IBasicdataClientClient;
-import com.logpm.basicdata.feign.IBasicdataCodeClient;
-import com.logpm.basicdata.feign.IBasicdataForwardingUnitClient;
-import com.logpm.basicdata.feign.IBasicdataFreightClient;
-import com.logpm.basicdata.feign.IBasicdataOpenIncomingClient;
-import com.logpm.basicdata.feign.IBasicdataStorageServicesClient;
-import com.logpm.basicdata.feign.IBasicdataStoreBusinessClient;
-import com.logpm.basicdata.feign.IBasicdataTripartiteMallClient;
-import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
 import com.logpm.basicdata.vo.BasicdataClientVO;
 import com.logpm.basicdata.vo.BasicdataFreightApiVO;
 import com.logpm.distribution.dto.FindParamterDTO;
@@ -47,54 +31,17 @@ import com.logpm.factorydata.util.FactoryDataMessageSender;
 import com.logpm.factorydata.vo.NodePushMsg;
 import com.logpm.factorydata.vo.PushData;
 import com.logpm.statistics.feign.IOrderInfoClient;
-import com.logpm.trunkline.dto.AdvanceDTO;
+import com.logpm.trunkline.dto.*;
-import com.logpm.trunkline.dto.CheckWaybillListDTO;
+import com.logpm.trunkline.entity.*;
-import com.logpm.trunkline.dto.ImportCustomizedOuPaiDTO;
+import com.logpm.trunkline.service.*;
-import com.logpm.trunkline.dto.ImportOrderNoPackageExcelDTO;
+import com.logpm.trunkline.vo.*;
-import com.logpm.trunkline.dto.ImportStandardOuPaiDTO;
-import com.logpm.trunkline.dto.OpenLabelDTO;
-import com.logpm.trunkline.dto.OpenOrderDTO;
-import com.logpm.trunkline.dto.PacakgeDetailExcelDTO;
-import com.logpm.trunkline.dto.WaybillDetailDTO;
-import com.logpm.trunkline.entity.TrunklineAdvanceDetailEntity;
-import com.logpm.trunkline.entity.TrunklineAdvanceEntity;
-import com.logpm.trunkline.entity.TrunklineAdvanceMergeEntity;
-import com.logpm.trunkline.entity.TrunklineBillladingEntity;
-import com.logpm.trunkline.entity.TrunklineBillladingWaybillEntity;
-import com.logpm.trunkline.entity.TrunklineWaybillOrderEntity;
-import com.logpm.trunkline.entity.TrunklineWaybillPackageEntity;
-import com.logpm.trunkline.entity.TrunklineWaybillReturnEntity;
-import com.logpm.trunkline.entity.TrunklineWaybillTrackEntity;
-import com.logpm.trunkline.service.IAsyncService;
-import com.logpm.trunkline.service.ICarsLoadAsyncService;
-import com.logpm.trunkline.service.IOpenOrderAsyncService;
-import com.logpm.trunkline.service.IOpenOrderService;
-import com.logpm.trunkline.service.ISendFanoutService;
-import com.logpm.trunkline.service.ITrunklineAdvanceDetailService;
-import com.logpm.trunkline.service.ITrunklineAdvanceMergeService;
-import com.logpm.trunkline.service.ITrunklineAdvanceService;
-import com.logpm.trunkline.service.ITrunklineBillladingService;
-import com.logpm.trunkline.service.ITrunklineBillladingWaybillService;
-import com.logpm.trunkline.service.ITrunklineCarsLoadScanService;
-import com.logpm.trunkline.service.ITrunklineCarsLoadService;
-import com.logpm.trunkline.service.ITrunklineWaybillOrderService;
-import com.logpm.trunkline.service.ITrunklineWaybillPackageService;
-import com.logpm.trunkline.service.ITrunklineWaybillReturnService;
-import com.logpm.trunkline.service.ITrunklineWaybillTrackService;
-import com.logpm.trunkline.vo.AdvanceDetailGoodsVO;
-import com.logpm.trunkline.vo.AdvanceDetailStockNumVO;
-import com.logpm.trunkline.vo.AdvanceDetailVO;
-import com.logpm.trunkline.vo.AdvancenceTotalNumberVO;
-import com.logpm.trunkline.vo.BillladingPackageVO;
-import com.logpm.trunkline.vo.CustomerInfoVO;
-import com.logpm.trunkline.vo.EditOrderMsgVO;
-import com.logpm.trunkline.vo.OpenOrderVO;
-import com.logpm.trunkline.vo.TrunklineAdvanceDetailVO;
-import com.logpm.trunkline.vo.TrunklineAdvanceVO;
-import com.logpm.trunkline.vo.TrunklineWaybillTrackVO;
 import com.logpm.warehouse.entity.WarehouseWayBillDetail;
+import com.logpm.warehouse.entity.WarehouseWayBillDetailAbolish;
+import com.logpm.warehouse.entity.WarehouseWaybillAbolishEntity;
 import com.logpm.warehouse.entity.WarehouseWaybillEntity;
+import com.logpm.warehouse.feign.IWarehouseWaybillAbolishClient;
 import com.logpm.warehouse.feign.IWarehouseWaybillClient;
+import com.logpm.warehouse.feign.IWarehouseWaybillDetailAbolishClient;
 import com.logpm.warehouse.feign.IWarehouseWaybillDetailClient;
 import com.logpm.warehouse.vo.WarehouseWaybillVO;
 import lombok.AllArgsConstructor;
@@ -106,12 +53,7 @@ import org.springblade.common.constant.DictBizConstant;
 import org.springblade.common.constant.IncomingTypeEnum;
 import org.springblade.common.constant.WorkNodeEnums;
 import org.springblade.common.constant.broadcast.FanoutConstants;
-import org.springblade.common.constant.order.OrderFreezeStatusConstant;
+import org.springblade.common.constant.order.*;
-import org.springblade.common.constant.order.OrderGroundingStatusConstant;
-import org.springblade.common.constant.order.OrderReceiveStatusConstant;
-import org.springblade.common.constant.order.OrderReservationStatusConstant;
-import org.springblade.common.constant.order.OrderStatusConstant;
-import org.springblade.common.constant.order.OrderStockupStatusConstant;
 import org.springblade.common.enums.BizOperationEnums;
 import org.springblade.common.enums.PackageTypeEnums;
 import org.springblade.common.exception.CustomerException;
@@ -134,16 +76,7 @@ import org.springframework.web.multipart.MultipartFile;
 import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigDecimal;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.TreeSet;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Function;
@@ -192,6 +125,8 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 	private final BladeRedis bladeRedis;
 	private final ITrunklineAdvanceMergeService advanceMergeService;
 	private final FactoryDataMessageSender factoryDataMessageSender;
+	private final IWarehouseWaybillAbolishClient waybillAbolishClient;
+	private final IWarehouseWaybillDetailAbolishClient waybillDetailAbolishClient;
 
 
 	@Override
@@ -1786,6 +1721,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 						advanceDetailModel.setOrderCode(orderCode);
 						advanceDetailModel.setOrderPackageCode(orderPackageCode);
 						String brand = advanceEntity.getBrand();
+						advanceDetailModel.setBrand(brand);
 						BasicdataBrandEntity brandEntity = brandMap.get(brand);
 						if (Objects.isNull(brandEntity)) {
 							brandEntity = brandMap.get("其他");
@@ -2814,32 +2750,32 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		Integer waybillType = waybillEntity.getWaybillType();
 		Long departureWarehouseId = waybillEntity.getDepartureWarehouseId();
 		Long destinationWarehouseId = waybillEntity.getDestinationWarehouseId();
-		if(warehouseId.equals(departureWarehouseId) || warehouseId.equals(destinationWarehouseId)){
+//		if(warehouseId.equals(departureWarehouseId) || warehouseId.equals(destinationWarehouseId)){
-			if (waybillType.equals(2)) {
+//			if (waybillType.equals(2)) {
-				//零担改单限制
+//				//零担改单限制
-
+//
-				Integer totalCount = waybillEntity.getTotalCount();
+//				Integer totalCount = waybillEntity.getTotalCount();
-				DistributionStockArticleEntity endStockArticleEntity = distributionStockArticleClient.findZeroByOrderCodeAndWarehouseId(waybillNo, destinationWarehouseId);
+//				DistributionStockArticleEntity endStockArticleEntity = distributionStockArticleClient.findZeroByOrderCodeAndWarehouseId(waybillNo, destinationWarehouseId);
-				if (Objects.isNull(endStockArticleEntity)) {
+//				if (Objects.isNull(endStockArticleEntity)) {
-					DistributionStockArticleEntity startStockArticleEntity = distributionStockArticleClient.findZeroByOrderCodeAndWarehouseId(waybillNo, departureWarehouseId);
+//					DistributionStockArticleEntity startStockArticleEntity = distributionStockArticleClient.findZeroByOrderCodeAndWarehouseId(waybillNo, departureWarehouseId);
-					if (Objects.isNull(startStockArticleEntity)) {
+//					if (Objects.isNull(startStockArticleEntity)) {
-						log.warn("#############updateWaybill: 订单信息不存在！ waybillId={}", waybillId);
+//						log.warn("#############updateWaybill: 订单信息不存在！ waybillId={}", waybillId);
-						return R.fail(405, "订单信息不存在！");
+//						return R.fail(405, "订单信息不存在！");
-					}
+//					}
-					Integer handQuantity = startStockArticleEntity.getHandQuantity();
+//					Integer handQuantity = startStockArticleEntity.getHandQuantity();
-					if (!NumberUtil.equals(handQuantity, totalCount)) {
+//					if (!NumberUtil.equals(handQuantity, totalCount)) {
-						log.warn("#############updateWaybill: 始发仓数据已发运 waybillId={}", waybillId);
+//						log.warn("#############updateWaybill: 始发仓数据已发运 waybillId={}", waybillId);
-						return R.fail(405, "始发仓数据已发运");
+//						return R.fail(405, "始发仓数据已发运");
-					}
+//					}
-				}else{
+//				}else{
-					Integer incomingQuantity = endStockArticleEntity.getIncomingNum();
+//					Integer incomingQuantity = endStockArticleEntity.getIncomingNum();
-					if(!NumberUtil.equals(incomingQuantity,totalCount)){
+//					if(!NumberUtil.equals(incomingQuantity,totalCount)){
-						log.warn("#############updateWaybill: 目的仓数据还未完全到达 waybillId={}", waybillId);
+//						log.warn("#############updateWaybill: 目的仓数据还未完全到达 waybillId={}", waybillId);
-						return R.fail(405, "目的仓数据还未完全到达");
+//						return R.fail(405, "目的仓数据还未完全到达");
-					}
+//					}
-				}
+//				}
-			}
+//			}
-		}
+//		}
 
 //		//验证运单是否有配送任务
 //		//查询运单下所有订单号
@@ -4316,8 +4252,27 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		List<String> deleteZeroWaybillNoList = new ArrayList<>();
 
 		List<WarehouseWaybillEntity> waybillList = warehouseWaybillClient.findListByWaybillIds(waybillIds);
+		List<WarehouseWaybillAbolishEntity> waybillAbolishEntities = new ArrayList<>();
+		List<WarehouseWayBillDetailAbolish> waybillDetailAbolishEntities = new ArrayList<>();
+		List<WarehouseWayBillDetail> waybillDetailList = warehouseWaybillDetailClient.findByWaybillIds(waybillIds);
+		//把waybillDetailList通过waybillId进行分组
+		Map<Long, List<WarehouseWayBillDetail>> waybillDetailMap = waybillDetailList.stream().collect(Collectors.groupingBy(WarehouseWayBillDetail::getWaybillId));
+
 		waybillList.forEach(waybillEntity -> {
 			Long waybillId = waybillEntity.getId();
+			WarehouseWaybillAbolishEntity warehouseWaybillAbolishEntity = new WarehouseWaybillAbolishEntity();
+			BeanUtil.copy(waybillEntity, warehouseWaybillAbolishEntity);
+			waybillAbolishEntities.add(warehouseWaybillAbolishEntity);
+			List<WarehouseWayBillDetail> warehouseWayBillDetails = waybillDetailMap.get(waybillId);
+			if(CollUtil.isNotEmpty(warehouseWayBillDetails)){
+				warehouseWayBillDetails.forEach(warehouseWayBillDetail -> {
+					WarehouseWayBillDetailAbolish waybillDetailAbolish = new WarehouseWayBillDetailAbolish();
+					BeanUtil.copy(warehouseWayBillDetail, waybillDetailAbolish);
+					waybillDetailAbolishEntities.add(waybillDetailAbolish);
+				});
+			}
+
+
 			String waybillNo = waybillEntity.getWaybillNo();
 			String waybillStatus = waybillEntity.getWaybillStatus();
 			if (StringUtil.isBlank(waybillStatus)) {
@@ -4392,7 +4347,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 			openOrderAsyncService.saveLog(waybillEntity.getId(), waybillEntity.getWaybillNo(), "1000", "作废运单", createOperationRemark + " 原因：" + abolishReson, AuthUtil.getNickName(), AuthUtil.getUserId(), warehouseId, warehouseName);
 		});
 
-		warehouseWaybillClient.deleteByWaybillIds(waybillIds);
+
 		if (CollUtil.isNotEmpty(clearWaybillInfoParceListIds)) {
 			distributionParcelListClient.clearWaybillInfoByParceListIds(clearWaybillInfoParceListIds);
 		}
@@ -4400,6 +4355,16 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 			distributionStockArticleClient.deleteZeroOrderByWaybillNoList(deleteZeroWaybillNoList);
 		}
 
+
+		if(CollUtil.isNotEmpty(waybillAbolishEntities)){
+			waybillAbolishClient.saveBatch(waybillAbolishEntities);
+		}
+		if(CollUtil.isNotEmpty(waybillDetailAbolishEntities)){
+			waybillDetailAbolishClient.saveBatch(waybillDetailAbolishEntities);
+		}
+
+		warehouseWaybillClient.deleteByWaybillIds(waybillIds);
+
 		return R.success("作废成功");
 	}
 

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java

@@ -327,6 +327,24 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl<Trunkline
 		orderDetailsDTO.setCreateTimeEnd(CommonUtil.getEndByDateStr(orderDetailsDTO.getCreateTimeEndStr()));
 
 		IPage<OrderDetailInfoVO> pageList = baseMapper.findOrderDetails(page, orderDetailsDTO);
+		List<OrderDetailInfoVO> records = pageList.getRecords();
+		//获取records所有元素的scanCode放入一个List
+		List<String> orderPackageCodes = records.stream().map(OrderDetailInfoVO::getOrderPackageCode).collect(Collectors.toList());
+		//查询所有orderPackageCodes中包件最后一次的装车时间
+		List<CarsLoadScanInfoVO> carsLoadScanVOList = baseMapper.findCarsLoadScanInfoByOrderPackageCodes(orderPackageCodes);
+		//把carsLoadScanVOList转化成以scanCode为key的Map
+		Map<String, CarsLoadScanInfoVO> carsLoadScanInfoMap = carsLoadScanVOList.stream().collect(Collectors.toMap(CarsLoadScanInfoVO::getScanCode, carsLoadScanInfoVO -> carsLoadScanInfoVO));
+		records.forEach(orderDetailInfoVO -> {
+			String scanCode = orderDetailInfoVO.getOrderPackageCode();
+			CarsLoadScanInfoVO carsLoadScanInfoVO = carsLoadScanInfoMap.get(scanCode);
+			if (Objects.nonNull(carsLoadScanInfoVO)) {
+				orderDetailInfoVO.setTrunklineCarsNo(carsLoadScanInfoVO.getLoadCode());
+				orderDetailInfoVO.setScanStatus(carsLoadScanInfoVO.getScanStatus());
+				orderDetailInfoVO.setTrunklineLoadingTime(carsLoadScanInfoVO.getCreateTime());
+				orderDetailInfoVO.setTrunklineSignTime(carsLoadScanInfoVO.getSignTime());
+			}
+		});
+		pageList.setRecords(records);
 
 		return R.data(pageList);
 	}

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseWaybillAbolishClient.java

@@ -0,0 +1,22 @@
+package com.logpm.warehouse.feign;
+
+import com.logpm.warehouse.entity.WarehouseWaybillAbolishEntity;
+import com.logpm.warehouse.service.IWarehouseWaybillAbolishService;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+import java.util.List;
+
+@ApiIgnore()
+@RestController
+@AllArgsConstructor
+public class WarehouseWaybillAbolishClient implements IWarehouseWaybillAbolishClient {
+
+	private final IWarehouseWaybillAbolishService warehouseWaybillAbolishService;
+
+	@Override
+	public void saveBatch(List<WarehouseWaybillAbolishEntity> waybillAbolishEntities) {
+		warehouseWaybillAbolishService.saveBatch(waybillAbolishEntities);
+	}
+}

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseWaybillDetailAbolishClient.java

@@ -0,0 +1,22 @@
+package com.logpm.warehouse.feign;
+
+import com.logpm.warehouse.entity.WarehouseWayBillDetailAbolish;
+import com.logpm.warehouse.service.IWarehouseWayBillDetailAbolishService;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+import java.util.List;
+
+@ApiIgnore()
+@RestController
+@AllArgsConstructor
+public class WarehouseWaybillDetailAbolishClient implements IWarehouseWaybillDetailAbolishClient {
+
+	private final IWarehouseWayBillDetailAbolishService warehouseWaybillDetailAbolishService;
+
+	@Override
+	public void saveBatch(List<WarehouseWayBillDetailAbolish> waybillDetailAbolishEntities) {
+		warehouseWaybillDetailAbolishService.saveBatch(waybillDetailAbolishEntities);
+	}
+}

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWayBillDetailAbolishMapper.java

@@ -0,0 +1,9 @@
+package com.logpm.warehouse.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.logpm.warehouse.entity.WarehouseWayBillDetailAbolish;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface WarehouseWayBillDetailAbolishMapper extends BaseMapper<WarehouseWayBillDetailAbolish> {
+}

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWayBillDetailMapper.java

@@ -7,7 +7,6 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 @Mapper
 public interface WarehouseWayBillDetailMapper extends BaseMapper<WarehouseWayBillDetail> {
@@ -16,4 +15,6 @@ public interface WarehouseWayBillDetailMapper extends BaseMapper<WarehouseWayBil
     void deleteByWaybillNo(@Param("waybillNo") String waybillNo);
 
 	List<WaybillOrderTotalWeightAndVolumeVO> findWaybillOrderTotalWeightAndVolumeByWaybillNoList(@Param("waybillNoList") List<String> waybillNoList);
+
+	void deleteByWaybillIds(@Param("waybillIds") List<Long> waybillIds);
 }

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillAbolishMapper.java

@@ -0,0 +1,9 @@
+package com.logpm.warehouse.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.logpm.warehouse.entity.WarehouseWaybillAbolishEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface WarehouseWaybillAbolishMapper extends BaseMapper<WarehouseWaybillAbolishEntity> {
+}

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillDetailMapper.xml

@@ -27,4 +27,12 @@
         GROUP BY waybill_no
     </select>
 
+    <delete id="deleteByWaybillIds" >
+        delete from logpm_warehouse_waybill_detail
+        where waybill_id in
+        <foreach collection="waybillIds" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </delete>
+
 </mapper>

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWayBillDetailAbolishService.java

@@ -0,0 +1,8 @@
+package com.logpm.warehouse.service;
+
+import com.logpm.warehouse.entity.WarehouseWayBillDetailAbolish;
+import org.springblade.core.mp.base.BaseService;
+
+public interface IWarehouseWayBillDetailAbolishService extends BaseService<WarehouseWayBillDetailAbolish> {
+
+}

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWayBillDetailService.java

@@ -5,7 +5,6 @@ import com.logpm.warehouse.vo.WaybillOrderTotalWeightAndVolumeVO;
 import org.springblade.core.mp.base.BaseService;
 
 import java.util.List;
-import java.util.Map;
 
 public interface IWarehouseWayBillDetailService extends BaseService<WarehouseWayBillDetail> {
 	WarehouseWayBillDetail findByProductName(String productName);
@@ -36,4 +35,6 @@ public interface IWarehouseWayBillDetailService extends BaseService<WarehouseWay
 	 * @return
 	 */
     List<WaybillOrderTotalWeightAndVolumeVO> findWaybillOrderTotalWeightAndVolumeByWaybillNoList(List<String> waybillNoList);
+
+	void deleteByWaybillIds(List<Long> waybillIds);
 }

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWaybillAbolishService.java

@@ -0,0 +1,7 @@
+package com.logpm.warehouse.service;
+
+import com.logpm.warehouse.entity.WarehouseWaybillAbolishEntity;
+import org.springblade.core.mp.base.BaseService;
+
+public interface IWarehouseWaybillAbolishService extends BaseService<WarehouseWaybillAbolishEntity> {
+}

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWayBillDetailAbolishServiceImpl.java

@@ -0,0 +1,18 @@
+package com.logpm.warehouse.service.impl;
+
+import com.logpm.warehouse.entity.WarehouseWayBillDetailAbolish;
+import com.logpm.warehouse.mapper.WarehouseWayBillDetailAbolishMapper;
+import com.logpm.warehouse.service.IWarehouseWayBillDetailAbolishService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@AllArgsConstructor
+@Service
+public class WarehouseWayBillDetailAbolishServiceImpl extends BaseServiceImpl<WarehouseWayBillDetailAbolishMapper, WarehouseWayBillDetailAbolish> implements IWarehouseWayBillDetailAbolishService {
+
+
+
+}

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWayBillDetailServiceImpl.java

@@ -11,7 +11,6 @@ import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
-import java.util.Map;
 
 @Slf4j
 @AllArgsConstructor
@@ -77,4 +76,9 @@ public class WarehouseWayBillDetailServiceImpl extends BaseServiceImpl<Warehouse
 	public List<WaybillOrderTotalWeightAndVolumeVO> findWaybillOrderTotalWeightAndVolumeByWaybillNoList(List<String> waybillNoList) {
 		return baseMapper.findWaybillOrderTotalWeightAndVolumeByWaybillNoList(waybillNoList);
 	}
+
+	@Override
+	public void deleteByWaybillIds(List<Long> waybillIds) {
+		baseMapper.deleteByWaybillIds(waybillIds);
+	}
 }

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillAbolishServiceImpl.java

@@ -0,0 +1,15 @@
+package com.logpm.warehouse.service.impl;
+
+import com.logpm.warehouse.entity.WarehouseWaybillAbolishEntity;
+import com.logpm.warehouse.mapper.WarehouseWaybillAbolishMapper;
+import com.logpm.warehouse.service.IWarehouseWaybillAbolishService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+@Slf4j
+public class WarehouseWaybillAbolishServiceImpl extends BaseServiceImpl<WarehouseWaybillAbolishMapper, WarehouseWaybillAbolishEntity> implements IWarehouseWaybillAbolishService {
+}

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java

@@ -1215,6 +1215,8 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 	@Override
 	public void deleteByWaybillIds(List<Long> waybillIds) {
 		baseMapper.deleteByWaybillIds(waybillIds);
+
+		warehouseWayBillDetailService.deleteByWaybillIds(waybillIds);
 	}
 
 	@Override