Merge remote-tracking branch 'origin/pre-production' into pre-production

blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/entity/BasicDelineNodeEntity.java

@@ -35,6 +35,42 @@ import org.springblade.core.tenant.mp.TenantEntity;
 @EqualsAndHashCode(callSuper = true)
 public class BasicDelineNodeEntity extends TenantEntity {
 
+	/**
+	 * 预留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;
+
+	/**
+	 * 仓库id
+	 */
+	@ApiModelProperty(value = "仓库id")
+	private Long warehouseId;
+	/**
+	 * 仓库名称
+	 */
+	@ApiModelProperty(value = "仓库名称")
+	private String warehouseName;
 	/**
 	 * 关联提货路线Id
 	 */
@@ -71,19 +107,9 @@ public class BasicDelineNodeEntity extends TenantEntity {
 	@ApiModelProperty(value = "纬度")
 	private String latitude;
 	/**
-	 * 预留3
+	 * 备注
-	 */
-	@ApiModelProperty(value = "预留3")
-	private String reserve3;
-	/**
-	 * 预留4
 	 */
-	@ApiModelProperty(value = "预留4")
+	@ApiModelProperty(value = "备注")
-	private String reserve4;
+	private String remark;
-	/**
-	 * 预留5
-	 */
-	@ApiModelProperty(value = "预留5")
-	private String reserve5;
 
 }

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/BillladingDTO.java

@@ -0,0 +1,12 @@
+package com.logpm.trunkline.dto;
+
+import com.logpm.trunkline.entity.TrunklineBillladingEntity;
+import lombok.Data;
+
+@Data
+public class BillladingDTO extends TrunklineBillladingEntity {
+
+	private Integer pageNum;
+	private Integer pageSize;
+
+}

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineAdvanceDetailEntity.java

@@ -0,0 +1,92 @@
+package com.logpm.trunkline.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+@Data
+@TableName("logpm_trunkline_advance_detail")
+@ApiModel(value = "TrunklineAdvanceDetail对象", description = "暂存单包件数据表")
+@EqualsAndHashCode(callSuper = true)
+public class TrunklineAdvanceDetailEntity extends TenantEntity {
+
+	/** 预留1 */
+	@ApiModelProperty(name = "预留1",notes = "")
+	private String reserve1 ;
+	/** 预留2 */
+	@ApiModelProperty(name = "预留2",notes = "")
+	private String reserve2 ;
+	/** 预留3 */
+	@ApiModelProperty(name = "预留3",notes = "")
+	private String reserve3 ;
+	/** 预留4 */
+	@ApiModelProperty(name = "预留4",notes = "")
+	private String reserve4 ;
+	/** 预留5 */
+	@ApiModelProperty(name = "预留5",notes = "")
+	private String reserve5 ;
+	/** 仓库id */
+	@ApiModelProperty(name = "仓库id",notes = "")
+	private Long warehouseId ;
+	/** 仓库名称 */
+	@ApiModelProperty(name = "仓库名称",notes = "")
+	private String warehouseName ;
+	/** 暂存单id */
+	@ApiModelProperty(name = "暂存单id",notes = "")
+	private Long advanceId ;
+	/** 订单自编号 */
+	@ApiModelProperty(name = "订单自编号",notes = "")
+	private String orderCode ;
+	/** 品牌 */
+	@ApiModelProperty(name = "品牌",notes = "")
+	private String brand ;
+	/** 订单来源 */
+	@ApiModelProperty(name = "订单来源",notes = "")
+	private String systemType ;
+	/** 一级品类名称 */
+	@ApiModelProperty(name = "一级品类名称",notes = "")
+	private String firstPackName ;
+	/** 一级品类编码 */
+	@ApiModelProperty(name = "一级品类编码",notes = "")
+	private String firstPackCode ;
+	/** 二级品类名称 */
+	@ApiModelProperty(name = "二级品类名称",notes = "")
+	private String secondPackName ;
+	/** 二级品类编码 */
+	@ApiModelProperty(name = "二级品类编码",notes = "")
+	private String secondPackCode ;
+	/** 三级品类名称 */
+	@ApiModelProperty(name = "三级品类名称",notes = "")
+	private String thirdPackName ;
+	/** 三级品类编码 */
+	@ApiModelProperty(name = "三级品类编码",notes = "")
+	private String thirdPackCode ;
+	/** 基地名称 */
+	@ApiModelProperty(name = "基地名称",notes = "")
+	private String siteName ;
+	/** 基地编码 */
+	@ApiModelProperty(name = "基地编码",notes = "")
+	private String siteCode ;
+	/** 数量 */
+	@ApiModelProperty(name = "数量",notes = "")
+	private Integer quantity ;
+	/** 包件码 */
+	@ApiModelProperty(name = "包件码",notes = "")
+	private String orderPackageCode ;
+	/** 车次号 */
+	@ApiModelProperty(name = "车次号",notes = "")
+	private String trainNumber ;
+	/** 服务号 */
+	@ApiModelProperty(name = "服务号",notes = "")
+	private String serviceNum ;
+	/** 运单号 */
+	@ApiModelProperty(name = "运单号",notes = "")
+	private String waybillNo ;
+	/** 包件状态 */
+	@ApiModelProperty(name = "包件状态 0未入库 1已入库",notes = "")
+	private String packageStatus ;
+
+}

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineAdvanceEntity.java

@@ -0,0 +1,116 @@
+package com.logpm.trunkline.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+@Data
+@TableName("logpm_trunkline_advance")
+@ApiModel(value = "TrunklineAdvance对象", description = "暂存单数据表")
+@EqualsAndHashCode(callSuper = true)
+public class TrunklineAdvanceEntity extends TenantEntity {
+
+	/** 预留1 */
+	@ApiModelProperty(name = "预留1",notes = "")
+	private String reserve1 ;
+	/** 预留2 */
+	@ApiModelProperty(name = "预留2",notes = "")
+	private String reserve2 ;
+	/** 预留3 */
+	@ApiModelProperty(name = "预留3",notes = "")
+	private String reserve3 ;
+	/** 预留4 */
+	@ApiModelProperty(name = "预留4",notes = "")
+	private String reserve4 ;
+	/** 预留5 */
+	@ApiModelProperty(name = "预留5",notes = "")
+	private String reserve5 ;
+	/** 仓库id */
+	@ApiModelProperty(name = "仓库id",notes = "")
+	private Long warehouseId ;
+	/** 仓库名称 */
+	@ApiModelProperty(name = "仓库名称",notes = "")
+	private String warehouseName ;
+	/** 订单自编码 */
+	@ApiModelProperty(name = "订单自编码",notes = "")
+	private String orderCode ;
+	/** 基地 */
+	@ApiModelProperty(name = "基地",notes = "")
+	private String siteName ;
+	/** 区域 */
+	@ApiModelProperty(name = "区域",notes = "")
+	private String area ;
+	/** 订单类型 */
+	@ApiModelProperty(name = "订单类型",notes = "")
+	private String orderType ;
+	/** 品牌 */
+	@ApiModelProperty(name = "品牌",notes = "")
+	private String brand ;
+	/** 订单总数 */
+	@ApiModelProperty(name = "订单总数",notes = "")
+	private Integer totalNum ;
+	/** 品名 */
+	@ApiModelProperty(name = "品名",notes = "")
+	private String packName ;
+	/** 品名编码 */
+	@ApiModelProperty(name = "品名编码",notes = "")
+	private String packCode ;
+	/** 商场编码 */
+	@ApiModelProperty(name = "商场编码",notes = "")
+	private String dealerCode ;
+	/** 商场名称 */
+	@ApiModelProperty(name = "商场名称",notes = "")
+	private String dealerName ;
+	/** 承运商 */
+	@ApiModelProperty(name = "承运商",notes = "")
+	private String carrierName ;
+	/** 客户名称 */
+	@ApiModelProperty(name = "客户名称",notes = "")
+	private String customerName ;
+	/** 客户电话 */
+	@ApiModelProperty(name = "客户电话",notes = "")
+	private String customerPhone ;
+	/** 客户地址 */
+	@ApiModelProperty(name = "客户地址",notes = "")
+	private String customerAddress ;
+	/** 订单来源 */
+	@ApiModelProperty(name = "订单来源",notes = "")
+	private String systemType ;
+	/** 门店编码 */
+	@ApiModelProperty(name = "门店编码",notes = "")
+	private String storeCode ;
+	/** 门店名称 */
+	@ApiModelProperty(name = "门店名称",notes = "")
+	private String storeName ;
+	/** 服务号 */
+	@ApiModelProperty(name = "服务号",notes = "")
+	private String serviceNum ;
+	/** 齐套状态 0未齐套 1齐套 2多仓齐套 */
+	@ApiModelProperty(name = "齐套状态 0未齐套 1齐套 2多仓齐套",notes = "")
+	private String matingType ;
+	/** 发货人名称 */
+	@ApiModelProperty(name = "发货人名称",notes = "")
+	private String senderName ;
+	/** 发货人电话 */
+	@ApiModelProperty(name = "发货人电话",notes = "")
+	private String senderPhone ;
+	/** 发货人地址 */
+	@ApiModelProperty(name = "发货人地址",notes = "")
+	private String senderAddress ;
+	/** 开单状态 0未开单 1已开单 */
+	@ApiModelProperty(name = "开单状态 0未开单 1已开单",notes = "")
+	private String waybillStatus ;
+	/** 运单号 */
+	@ApiModelProperty(name = "运单号",notes = "")
+	private String waybillNo ;
+	/** 车次号 */
+	@ApiModelProperty(name = "车次号",notes = "")
+	private String trainNumber ;
+	/** 冻结状态 0未冻结 1已冻结 */
+	@ApiModelProperty(name = "冻结状态 0未冻结 1已冻结",notes = "")
+	private String freezeStatus ;
+
+}

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineBillladingEntity.java

@@ -0,0 +1,112 @@
+package com.logpm.trunkline.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+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.util.Date;
+
+@Data
+@TableName("logpm_trunkline_billlading")
+@ApiModel(value = "TrunklineBilllading对象", description = "干线提货表")
+@EqualsAndHashCode(callSuper = true)
+public class TrunklineBillladingEntity extends TenantEntity {
+
+	/** 预留1 */
+	@ApiModelProperty(name = "预留1",notes = "")
+	private String reserve1 ;
+	/** 预留2 */
+	@ApiModelProperty(name = "预留2",notes = "")
+	private String reserve2 ;
+	/** 预留3 */
+	@ApiModelProperty(name = "预留3",notes = "")
+	private String reserve3 ;
+	/** 预留4 */
+	@ApiModelProperty(name = "预留4",notes = "")
+	private String reserve4 ;
+	/** 预留5 */
+	@ApiModelProperty(name = "预留5",notes = "")
+	private String reserve5 ;
+	/** 仓库id */
+	@ApiModelProperty(name = "仓库id",notes = "")
+	private Long warehouseId ;
+	/** 仓库名称 */
+	@ApiModelProperty(name = "仓库名称",notes = "")
+	private String warehouseName ;
+	/** 提货单号 */
+	@ApiModelProperty(name = "提货单号",notes = "")
+	private String billladingCode ;
+	/** 车牌号 */
+	@ApiModelProperty(name = "车牌号",notes = "")
+	private String carNumber ;
+	/** 司机id */
+	@ApiModelProperty(name = "司机id",notes = "")
+	private Long driverId ;
+	/** 司机名称 */
+	@ApiModelProperty(name = "司机名称",notes = "")
+	private String driverName ;
+	/** 司机电话 */
+	@ApiModelProperty(name = "司机电话",notes = "")
+	private String driverPhone ;
+	/** 承运商 */
+	@ApiModelProperty(name = "承运商",notes = "")
+	private String carrierName ;
+	/** 线路关联id */
+	@ApiModelProperty(name = "线路关联id",notes = "")
+	private Long lineId ;
+	/** 线路名称 */
+	@ApiModelProperty(name = "线路名称",notes = "")
+	private String lineNameTitle ;
+	/** 预计件数 */
+	@ApiModelProperty(name = "预计件数",notes = "")
+	private int planNum ;
+	/** 预计重量 */
+	@ApiModelProperty(name = "预计重量",notes = "")
+	private Double planWeight ;
+	/** 预计体积 */
+	@ApiModelProperty(name = "预计体积",notes = "")
+	private Double planVolume ;
+	/** 实际件数 */
+	@ApiModelProperty(name = "实际件数",notes = "")
+	private int realNum ;
+	/** 实际重量 */
+	@ApiModelProperty(name = "实际重量",notes = "")
+	private Double realWeight ;
+	/** 实际体积 */
+	@ApiModelProperty(name = "实际体积",notes = "")
+	private Double realVolume ;
+	/** 计费模式 1按件 2按重量 3按体积 */
+	@ApiModelProperty(name = "计费模式 1按件 2按重量 3按体积",notes = "")
+	private String chargeType ;
+	/** 提货费用 */
+	@ApiModelProperty(name = "提货费用",notes = "")
+	private Double totalFee ;
+	/** 提货单状态 1=未开始，2=提货中，3=已完成，4=已取消 */
+	@ApiModelProperty(name = "提货单状态 1=未开始，2=提货中，3=已完成，4=已取消",notes = "")
+	private String billladingStatus ;
+	/** 提货开始时间 */
+	@ApiModelProperty(name = "提货开始时间",notes = "")
+	private Date startTime ;
+	/** 提货完成时间 */
+	@ApiModelProperty(name = "提货完成时间",notes = "")
+	private Date endTime ;
+	/** 结算时间 */
+	@ApiModelProperty(name = "结算时间",notes = "")
+	private Date settlementTime ;
+	/** 结算人id */
+	@ApiModelProperty(name = "结算人id",notes = "")
+	private Long settlementId ;
+	/** 结算人名称 */
+	@ApiModelProperty(name = "结算人名称",notes = "")
+	private String settlementName ;
+	/** 备注 */
+	@ApiModelProperty(name = "备注",notes = "")
+	private String remark ;
+	/** 创建用户名称 */
+	@ApiModelProperty(name = "创建用户名称",notes = "")
+	private String createUserName ;
+
+}

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineBillladingPackageEntity.java

@@ -0,0 +1,41 @@
+package com.logpm.trunkline.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+@Data
+@TableName("logpm_trunkline_billlading_package")
+@ApiModel(value = "TrunklineBillladingPackage对象", description = "提货单包件明细表")
+@EqualsAndHashCode(callSuper = true)
+public class TrunklineBillladingPackageEntity extends TenantEntity {
+
+	/** 预留1 */
+	@ApiModelProperty(name = "预留1",notes = "")
+	private String reserve1 ;
+	/** 预留2 */
+	@ApiModelProperty(name = "预留2",notes = "")
+	private String reserve2 ;
+	/** 预留3 */
+	@ApiModelProperty(name = "预留3",notes = "")
+	private String reserve3 ;
+	/** 预留4 */
+	@ApiModelProperty(name = "预留4",notes = "")
+	private String reserve4 ;
+	/** 预留5 */
+	@ApiModelProperty(name = "预留5",notes = "")
+	private String reserve5 ;
+	/** 仓库id */
+	@ApiModelProperty(name = "仓库id",notes = "")
+	private Long warehouseId ;
+	/** 仓库名称 */
+	@ApiModelProperty(name = "仓库名称",notes = "")
+	private String warehouseName ;
+	/** 包件码 */
+	@ApiModelProperty(name = "包件码",notes = "")
+	private String orderPackageCode ;
+
+}

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineBillladingWaybillEntity.java

@@ -0,0 +1,56 @@
+package com.logpm.trunkline.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+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;
+
+@Data
+@TableName("logpm_trunkline_billlading_waybill")
+@ApiModel(value = "TrunklineBillladingWaybill对象", description = "提货运单关联表")
+@EqualsAndHashCode(callSuper = true)
+public class TrunklineBillladingWaybillEntity extends TenantEntity {
+
+	/** 预留1 */
+	@ApiModelProperty(name = "预留1",notes = "")
+	private String reserve1 ;
+	/** 预留2 */
+	@ApiModelProperty(name = "预留2",notes = "")
+	private String reserve2 ;
+	/** 预留3 */
+	@ApiModelProperty(name = "预留3",notes = "")
+	private String reserve3 ;
+	/** 预留4 */
+	@ApiModelProperty(name = "预留4",notes = "")
+	private String reserve4 ;
+	/** 预留5 */
+	@ApiModelProperty(name = "预留5",notes = "")
+	private String reserve5 ;
+	/** 仓库id */
+	@ApiModelProperty(name = "仓库id",notes = "")
+	private Long warehouseId ;
+	/** 提货单id */
+	@ApiModelProperty(name = "提货单id",notes = "")
+	private Long billladingId ;
+	/** 提货单号 */
+	@ApiModelProperty(name = "提货单号",notes = "")
+	private String billadingCode ;
+	/** 运单号 */
+	@ApiModelProperty(name = "运单号",notes = "")
+	private String waybillNo ;
+	/** 提货数量 */
+	@ApiModelProperty(name = "提货数量",notes = "")
+	private Integer realNum ;
+	/** 提货重量 */
+	@ApiModelProperty(name = "提货重量",notes = "")
+	private BigDecimal realWeight ;
+	/** 提货体积 */
+	@ApiModelProperty(name = "提货体积",notes = "")
+	private BigDecimal realVolume ;
+
+
+}

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineDetailProductEntity.java

@@ -0,0 +1,50 @@
+package com.logpm.trunkline.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+@Data
+@TableName("logpm_trunkline_detail_product")
+@ApiModel(value = "TrunklineDetailProduct对象", description = "提货运单关联表")
+@EqualsAndHashCode(callSuper = true)
+public class TrunklineDetailProductEntity extends TenantEntity {
+
+	/** 预留1 */
+	@ApiModelProperty(name = "预留1",notes = "")
+	private String reserve1 ;
+	/** 预留2 */
+	@ApiModelProperty(name = "预留2",notes = "")
+	private String reserve2 ;
+	/** 预留3 */
+	@ApiModelProperty(name = "预留3",notes = "")
+	private String reserve3 ;
+	/** 预留4 */
+	@ApiModelProperty(name = "预留4",notes = "")
+	private String reserve4 ;
+	/** 预留5 */
+	@ApiModelProperty(name = "预留5",notes = "")
+	private String reserve5 ;
+	/** 仓库id */
+	@ApiModelProperty(name = "仓库id",notes = "")
+	private Long warehouseId ;
+	/** 仓库名称 */
+	@ApiModelProperty(name = "仓库名称",notes = "")
+	private String warehouseName ;
+	/** 包件码 */
+	@ApiModelProperty(name = "包件码",notes = "")
+	private String unitNo ;
+	/** 货品代码 */
+	@ApiModelProperty(name = "货品代码",notes = "")
+	private String productCode ;
+	/** 货品名称 */
+	@ApiModelProperty(name = "货品名称",notes = "")
+	private String productName ;
+	/** 数量 */
+	@ApiModelProperty(name = "数量",notes = "")
+	private Integer quantity ;
+
+}

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

@@ -0,0 +1,8 @@
+package com.logpm.trunkline.vo;
+
+import com.logpm.trunkline.entity.TrunklineAdvanceDetailEntity;
+import lombok.Data;
+
+@Data
+public class TrunklineAdvanceDetailVO extends TrunklineAdvanceDetailEntity {
+}

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

@@ -0,0 +1,8 @@
+package com.logpm.trunkline.vo;
+
+import com.logpm.trunkline.entity.TrunklineAdvanceEntity;
+import lombok.Data;
+
+@Data
+public class TrunklineAdvanceVO extends TrunklineAdvanceEntity {
+}

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

@@ -0,0 +1,8 @@
+package com.logpm.trunkline.vo;
+
+import com.logpm.trunkline.entity.TrunklineBillladingPackageEntity;
+import lombok.Data;
+
+@Data
+public class TrunklineBillladingPackageVO extends TrunklineBillladingPackageEntity {
+}

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

@@ -0,0 +1,17 @@
+package com.logpm.trunkline.vo;
+
+import com.logpm.trunkline.entity.TrunklineBillladingEntity;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class TrunklineBillladingVO extends TrunklineBillladingEntity {
+
+	private Integer nodeNub;
+	private Integer waybillCount;
+	private Integer totalNum;
+	private BigDecimal totalWeight;
+	private BigDecimal totalVolume;
+
+}

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

@@ -0,0 +1,11 @@
+package com.logpm.trunkline.vo;
+
+import com.logpm.trunkline.entity.TrunklineBillladingWaybillEntity;
+import lombok.Data;
+
+@Data
+public class TrunklineBillladingWaybillVO extends TrunklineBillladingWaybillEntity {
+
+
+
+}

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

@@ -0,0 +1,8 @@
+package com.logpm.trunkline.vo;
+
+import com.logpm.trunkline.entity.TrunklineDetailProductEntity;
+import lombok.Data;
+
+@Data
+public class TrunklineDetailProductVO extends TrunklineDetailProductEntity {
+}

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

@@ -30,7 +30,6 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import net.logstash.logback.encoder.org.apache.commons.lang3.StringEscapeUtils;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.mp.support.Condition;
@@ -47,6 +46,7 @@ import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * 提货路线 控制器
@@ -104,10 +104,8 @@ public class BasicDelineController extends BladeController {
 	@ApiOperation(value = "新增", notes = "传入basicDeline")
 	public R save(@Valid @RequestBody BasicDelineDTO basicDeline) {
 		//转义->
-		basicDeline.setLineName(StringEscapeUtils.unescapeHtml4(basicDeline.getLineName()));
+//		basicDeline.setLineName(StringEscapeUtils.unescapeHtml4(basicDeline.getLineName()));
-		basicDelineService.save(basicDeline);
+		return basicDelineService.saveDeline(basicDeline);
-		//新增关联表
-		return R.status(basicDelineMiddleService.saveByDTO(basicDeline));
 	}
 
 	/**
@@ -117,13 +115,12 @@ public class BasicDelineController extends BladeController {
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "修改", notes = "传入basicDeline")
 	public R update(@Valid @RequestBody BasicDelineDTO basicDeline) {
-		//转义->
+		Long id = basicDeline.getId();
-		basicDeline.setLineName(StringEscapeUtils.unescapeHtml4(basicDeline.getLineName()));
+		if(Objects.isNull(id)){
-		//删除所有中间表
+			log.warn("#############update: id不能为空");
-		basicDelineMiddleService.deleteBydelineId(Func.toLongList(String.valueOf(basicDeline.getId())));
+			return R.fail(403,"id不能为空");
-		//新增关联表
+		}
-		basicDelineMiddleService.saveByDTO(basicDeline);
+		return basicDelineService.updateDeline(basicDeline);
-		return R.status(basicDelineService.updateById(basicDeline));
 	}
 
 	/**

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

@@ -97,8 +97,9 @@ public class BasicDelineNodeController extends BladeController {
 	@GetMapping("/dictionary")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "字典", notes = "传入basicDelineNode")
-	public R<List<BasicDelineNodeVO>> dictionary() {
+	public R<List<BasicDelineNodeVO>> dictionary(BasicDelineNodeDTO basicDelineNode) {
-		List<BasicDelineNodeVO> basicDelineNodeVOS = basicDelineNodeService.selectBasicDelineNodeDictionary();
+		String customer = basicDelineNode.getCustomer();
+		List<BasicDelineNodeVO> basicDelineNodeVOS = basicDelineNodeService.selectBasicDelineNodeDictionary(customer);
 		return R.data(basicDelineNodeVOS);
 	}
 

blade-service/logpm-basic/src/main/java/com/logpm/basic/dto/BasicDelineNodeDTO.java

@@ -51,6 +51,6 @@ public class BasicDelineNodeDTO extends BasicDelineNodeEntity {
 	@ApiModelProperty(value = "主表Id")
 	private Long delineId;
 
-
+	private Integer sort;
 
 }

blade-service/logpm-basic/src/main/java/com/logpm/basic/mapper/BasicDelineNodeMapper.java

@@ -57,5 +57,5 @@ public interface BasicDelineNodeMapper extends BaseMapper<BasicDelineNodeEntity>
 	 *
 	 * @return
 	 */
-    List<BasicDelineNodeVO> selectBasicDelineNodeDictionary();
+    List<BasicDelineNodeVO> selectBasicDelineNodeDictionary(@Param("customer") String customer);
 }

blade-service/logpm-basic/src/main/java/com/logpm/basic/mapper/BasicDelineNodeMapper.xml

@@ -40,16 +40,13 @@
             lbdn.contacts contacts,
             lbdn.address address,
             lbdn.telephone telephone,
-            lbdm.ageing ageing,
+            lbdn.longitude longitude,
-            lbdm.route route
+            lbdn.latitude latitude,
+            ldbn.remark remark
         FROM
             logpm_basic_deline_node lbdn
-                JOIN logpm_basic_deline_middle lbdm  on lbdn.id = lbdm.node_id
         <where>
             lbdn.is_deleted = 0
-            AND lbdm.is_deleted = 0
-            <if test="param.delineId != null ">and lbdm.deline_id = #{param.delineId}</if>
-            <if test="param.id != null ">and lbdm.node_id = #{param.id}</if>
         </where>
     </select>
 
@@ -58,7 +55,12 @@
         SELECT * FROM logpm_basic_deline_node ${ew.customSqlSegment}
     </select>
     <select id="selectBasicDelineNodeDictionary" resultType="com.logpm.basic.vo.BasicDelineNodeVO">
-        select id,customer from logpm_basic_deline_node where is_deleted = 0
+        select id,customer
+        from logpm_basic_deline_node
+        where is_deleted = 0
+        <if test="customer != null and customer != ''">
+            customer like concat('%',#{customer},'%')
+        </if>
     </select>
 
 </mapper>

blade-service/logpm-basic/src/main/java/com/logpm/basic/service/IBasicDelineNodeService.java

@@ -55,5 +55,5 @@ public interface IBasicDelineNodeService extends BaseService<BasicDelineNodeEnti
 	 *
 	 * @return
 	 */
-	List<BasicDelineNodeVO> selectBasicDelineNodeDictionary();
+	List<BasicDelineNodeVO> selectBasicDelineNodeDictionary(String customer);
 }

blade-service/logpm-basic/src/main/java/com/logpm/basic/service/IBasicDelineService.java

@@ -18,10 +18,12 @@ package com.logpm.basic.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.basic.dto.BasicDelineDTO;
 import com.logpm.basic.entity.BasicDelineEntity;
 import com.logpm.basic.excel.BasicDelineExcel;
 import com.logpm.basic.vo.BasicDelineVO;
 import org.springblade.core.mp.base.BaseService;
+import org.springblade.core.tool.api.R;
 
 import java.util.List;
 
@@ -50,4 +52,8 @@ public interface IBasicDelineService extends BaseService<BasicDelineEntity> {
 	 */
 	List<BasicDelineExcel> exportBasicDeline(Wrapper<BasicDelineEntity> queryWrapper);
 
+    R saveDeline(BasicDelineDTO basicDelineDTO);
+
+	R updateDeline(BasicDelineDTO basicDeline);
+
 }

blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicDelineNodeServiceImpl.java

@@ -54,8 +54,8 @@ public class BasicDelineNodeServiceImpl extends BaseServiceImpl<BasicDelineNodeM
 	}
 
 	@Override
-	public List<BasicDelineNodeVO> selectBasicDelineNodeDictionary() {
+	public List<BasicDelineNodeVO> selectBasicDelineNodeDictionary(String customer) {
-		return baseMapper.selectBasicDelineNodeDictionary();
+		return baseMapper.selectBasicDelineNodeDictionary(customer);
 	}
 
 }

blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicDelineServiceImpl.java

@@ -18,14 +18,23 @@ package com.logpm.basic.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.basic.dto.BasicDelineDTO;
+import com.logpm.basic.dto.BasicDelineNodeDTO;
 import com.logpm.basic.entity.BasicDelineEntity;
+import com.logpm.basic.entity.BasicDelineMiddleEntity;
 import com.logpm.basic.excel.BasicDelineExcel;
 import com.logpm.basic.mapper.BasicDelineMapper;
+import com.logpm.basic.service.IBasicDelineMiddleService;
 import com.logpm.basic.service.IBasicDelineService;
 import com.logpm.basic.vo.BasicDelineVO;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.BeanUtil;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -34,9 +43,13 @@ import java.util.List;
  * @author lmy
  * @since 2023-05-24
  */
+@Slf4j
 @Service
+@AllArgsConstructor
 public class BasicDelineServiceImpl extends BaseServiceImpl<BasicDelineMapper, BasicDelineEntity> implements IBasicDelineService {
 
+	private final IBasicDelineMiddleService basicDelineMiddleService;
+
 	@Override
 	public IPage<BasicDelineVO> selectBasicDelinePage(IPage<BasicDelineVO> page, BasicDelineVO basicDeline) {
 		return page.setRecords(baseMapper.selectBasicDelinePage(page, basicDeline));
@@ -52,4 +65,56 @@ public class BasicDelineServiceImpl extends BaseServiceImpl<BasicDelineMapper, B
 		return basicDelineList;
 	}
 
+	@Override
+	public R saveDeline(BasicDelineDTO basicDelineDTO) {
+		log.info("#############saveDeline: 保存提货路线");
+		List<BasicDelineNodeDTO> delinenode = basicDelineDTO.getDelinenode();
+		if(delinenode.size() < 2){
+			log.warn("##############saveDeline: 节点选择有误");
+			return R.fail(403,"节点选择有误");
+		}
+		BasicDelineEntity basicDelineEntity = new BasicDelineEntity();
+		BeanUtil.copy(basicDelineDTO,basicDelineEntity);
+		save(basicDelineEntity);
+		Long delineId = basicDelineEntity.getId();
+		for (BasicDelineNodeDTO basicDelineNodeDTO:delinenode){
+			BasicDelineMiddleEntity basicDelineMiddleEntity = new BasicDelineMiddleEntity();
+			basicDelineMiddleEntity.setDelineId(delineId);
+			basicDelineMiddleEntity.setNodeId(basicDelineNodeDTO.getId());
+			basicDelineMiddleEntity.setAgeing(basicDelineNodeDTO.getAgeing());
+			basicDelineMiddleEntity.setRoute(basicDelineNodeDTO.getRoute());
+			basicDelineMiddleService.save(basicDelineMiddleEntity);
+		}
+		return R.success("保存成功");
+	}
+
+	@Override
+	public R updateDeline(BasicDelineDTO basicDeline) {
+		log.info("#############updateDeline: 更新提货路线");
+		List<BasicDelineNodeDTO> delinenode = basicDeline.getDelinenode();
+		if(delinenode.size() < 2){
+			log.warn("##############saveDeline: 节点选择有误");
+			return R.fail(403,"节点选择有误");
+		}
+		BasicDelineEntity basicDelineEntity = new BasicDelineEntity();
+		BeanUtil.copy(basicDeline,basicDelineEntity);
+		updateById(basicDelineEntity);
+		Long delineId = basicDelineEntity.getId();
+		//先删除以前的关联数据
+		List<Long> delineIds = new ArrayList<>();
+		delineIds.add(delineId);
+		basicDelineMiddleService.deleteBydelineId(delineIds);
+
+		for (BasicDelineNodeDTO basicDelineNodeDTO:delinenode){
+			BasicDelineMiddleEntity basicDelineMiddleEntity = new BasicDelineMiddleEntity();
+			basicDelineMiddleEntity.setDelineId(delineId);
+			basicDelineMiddleEntity.setNodeId(basicDelineNodeDTO.getId());
+			basicDelineMiddleEntity.setAgeing(basicDelineNodeDTO.getAgeing());
+			basicDelineMiddleEntity.setRoute(basicDelineNodeDTO.getRoute());
+			basicDelineMiddleService.save(basicDelineMiddleEntity);
+		}
+
+		return R.success("更新成功");
+	}
+
 }

blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java

@@ -246,7 +246,7 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService {
 	@Override
 	public void supplementOrderInfo(String orderCode, Long newWarehouseId, Integer oldWarehouseId) {
 		//通过订单号查询暂存单
-		AdvanceEntity advanceEntity = advanceClient.getQueryDataOne(orderCode);
+		AdvanceEntity advanceEntity = advanceClient.getQueryDataOne(orderCode);//这个地方有问题
 		if(Objects.isNull(advanceEntity)){
 			log.warn("#################saveOrderInfo: 未查询单订单信息 orderCode={}",orderCode);
 			throw new CustomerException(403,"未查询单订单信息");

blade-service/logpm-trunkline/pom.xml

@@ -39,6 +39,12 @@
             <version>3.2.0.RELEASE</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>logpm-basicdata-api</artifactId>
+            <version>3.2.0.RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/BillladingController.java

@@ -0,0 +1,61 @@
+package com.logpm.trunkline.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
+import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
+import com.logpm.trunkline.dto.BillladingDTO;
+import com.logpm.trunkline.service.ITrunklineBillladingService;
+import com.logpm.trunkline.vo.TrunklineBillladingVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.common.exception.CustomerException;
+import org.springblade.core.tool.api.R;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Objects;
+
+@Slf4j
+@RestController
+@AllArgsConstructor
+@RequestMapping("/billlading")
+@Api(value = "提货单控制类", tags = "提货单接口")
+public class BillladingController {
+
+	private final IBasicdataWarehouseClient warehouseClient;
+
+	private final ITrunklineBillladingService trunklineBillladingService;
+
+	@ResponseBody
+	@PostMapping("/pageList")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "提货单列表", notes = "传入waybillDTO")
+	public R pageList(@RequestBody BillladingDTO billladingDTO) {
+		String method = "############pageList: ";
+		log.info(method+"请求参数{}",billladingDTO);
+		try{
+
+			//当前登录人选择的仓库
+			BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
+			if(Objects.isNull(myCurrentWarehouse)){
+				log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse);
+				return R.fail(403,"仓库信息为空");
+			}
+			billladingDTO.setWarehouseId(myCurrentWarehouse.getId());
+
+			IPage<TrunklineBillladingVO> pages = trunklineBillladingService.pageList(billladingDTO);
+
+			return R.data(pages);
+		}catch (CustomerException e){
+			log.error(e.message,e);
+			return R.fail(e.code,e.message);
+		}catch (Exception e){
+			log.error("############sendOrders: 系统异常",e);
+			return R.fail(500,"############sendOrders: 系统异常");
+		}
+	}
+
+
+}

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

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

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.logpm.trunkline.mapper.TrunklineAdvanceDetailMapper">
+
+
+</mapper>

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

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

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.logpm.trunkline.mapper.TrunklineAdvanceMapper">
+
+
+</mapper>

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

@@ -0,0 +1,16 @@
+package com.logpm.trunkline.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.trunkline.dto.BillladingDTO;
+import com.logpm.trunkline.entity.TrunklineBillladingEntity;
+import com.logpm.trunkline.vo.TrunklineBillladingVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface TrunklineBillladingMapper extends BaseMapper<TrunklineBillladingEntity> {
+
+    IPage<TrunklineBillladingVO> pageList(IPage<Object> page, @Param("param") BillladingDTO billladingDTO);
+
+}

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

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.logpm.trunkline.mapper.TrunklineBillladingMapper">
+
+    <select id="pageList" resultType="com.logpm.trunkline.vo.TrunklineBillladingVO">
+        select ltb.id id,
+               ltb.billlading_code billladingCode,
+               ltb.car_number carNumber,
+               ltb.driver_name driverName,
+               ltb.driver_phone driverPhone,
+               ltb.warehouse_id warehouseId,
+               ltb.warehouse_name warehouseName,
+               ltb.line_id lineId,
+               ltb.line_name_title lineNameTitle,
+               lbd.node_nub nodeNub,
+               ltb.start_time startTime,
+               ltb.end_time endTime,
+               ltb.plan_num planNum,
+               ltb.billlading_status billladingStatus,
+               ltb.charge_type chargeType,
+               ltb.total_fee totalFee,
+               ltb.remark remark,
+               ltb.carrier_name carrierName,
+               ltb.create_user_name createUserName,
+               count(ltbw.id) waybillCount,
+               sum(ltbw.real_num) totalNum,
+               sum(ltbw.real_weight) totalWeight,
+               sum(ltbw.real_volume) totalVolume
+        from logpm_trunkline_billlading ltb
+                 left join logpm_basic_deline lbd on lbd.id = ltb.line_id
+                 left join logpm_trunkline_billlading_waybill ltbw on ltbw.billlading_id = ltb.id
+        where ltb.is_deleted = 0
+        <if test="param.billladingCode != null and param.billladingCode != '' ">
+            and ltb.billlading_code = #{param.billladingCode}
+        </if>
+        <if test="param.carNumber != null and param.carNumber != '' ">
+            and ltb.car_number = #{param.carNumber}
+        </if>
+        <if test="param.driverName != null and param.driverName != '' ">
+            and ltb.driver_name = #{param.driverName}
+        </if>
+        <if test="param.driverPhone != null and param.driverPhone != '' ">
+            and ltb.driver_phone = #{param.driverPhone}
+        </if>
+        <if test="param.warehouseName != null and param.warehouseName != '' ">
+            and ltb.warehouse_name = #{param.warehouseName}
+        </if>
+        <if test="param.billladingStatus != null and param.billladingStatus != '' ">
+            and ltb.billlading_status = #{param.billladingStatus}
+        </if>
+        <if test="param.chargeType != null and param.chargeType != '' ">
+            and ltb.charge_type = #{param.chargeType}
+        </if>
+        <if test="param.createUserName != null and param.createUserName != '' ">
+            and ltb.create_user_name = #{param.createUserName}
+        </if>
+        group by ltb.id,ltb.billlading_code,
+                 ltb.car_number,
+                 ltb.driver_name,
+                 ltb.driver_phone,
+                 ltb.warehouse_id,
+                 ltb.warehouse_name,
+                 ltb.line_id,
+                 ltb.line_name_title,
+                 lbd.node_nub,
+                 ltb.start_time,
+                 ltb.end_time,
+                 ltb.plan_num,
+                 ltb.billlading_status,
+                 ltb.charge_type,
+                 ltb.total_fee,
+                 ltb.remark,
+                 ltb.carrier_name,
+                 ltb.create_user_name
+        order by ltb.create_time desc
+    </select>
+
+</mapper>

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

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

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

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

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.logpm.trunkline.mapper.TrunklineBillladingWaybillMapper">
+
+
+</mapper>

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

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

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceDetailService.java

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

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceService.java

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

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineBillladingPackageServicie.java

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

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineBillladingService.java

@@ -0,0 +1,13 @@
+package com.logpm.trunkline.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.trunkline.dto.BillladingDTO;
+import com.logpm.trunkline.entity.TrunklineBillladingEntity;
+import com.logpm.trunkline.vo.TrunklineBillladingVO;
+import org.springblade.core.mp.base.BaseService;
+
+public interface ITrunklineBillladingService extends BaseService<TrunklineBillladingEntity> {
+
+    IPage<TrunklineBillladingVO> pageList(BillladingDTO billladingDTO);
+
+}

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineBillladingWaybillService.java

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

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineDetailProductService.java

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

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

@@ -0,0 +1,15 @@
+package com.logpm.trunkline.service.impl;
+
+import com.logpm.trunkline.entity.TrunklineAdvanceDetailEntity;
+import com.logpm.trunkline.mapper.TrunklineAdvanceDetailMapper;
+import com.logpm.trunkline.service.ITrunklineAdvanceDetailService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+@AllArgsConstructor
+public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl<TrunklineAdvanceDetailMapper, TrunklineAdvanceDetailEntity> implements ITrunklineAdvanceDetailService {
+}

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

@@ -0,0 +1,15 @@
+package com.logpm.trunkline.service.impl;
+
+import com.logpm.trunkline.entity.TrunklineAdvanceEntity;
+import com.logpm.trunkline.mapper.TrunklineAdvanceMapper;
+import com.logpm.trunkline.service.ITrunklineAdvanceService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+@AllArgsConstructor
+public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanceMapper, TrunklineAdvanceEntity> implements ITrunklineAdvanceService {
+}

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

@@ -0,0 +1,15 @@
+package com.logpm.trunkline.service.impl;
+
+import com.logpm.trunkline.entity.TrunklineBillladingPackageEntity;
+import com.logpm.trunkline.mapper.TrunklineBillladingPackageMapper;
+import com.logpm.trunkline.service.ITrunklineBillladingPackageServicie;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+@AllArgsConstructor
+public class TrunklineBillladingPackageServiceImpl extends BaseServiceImpl<TrunklineBillladingPackageMapper, TrunklineBillladingPackageEntity> implements ITrunklineBillladingPackageServicie {
+}

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

@@ -0,0 +1,30 @@
+package com.logpm.trunkline.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.logpm.trunkline.dto.BillladingDTO;
+import com.logpm.trunkline.entity.TrunklineBillladingEntity;
+import com.logpm.trunkline.mapper.TrunklineBillladingMapper;
+import com.logpm.trunkline.service.ITrunklineBillladingService;
+import com.logpm.trunkline.vo.TrunklineBillladingVO;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+@AllArgsConstructor
+public class TrunklineBillladingServiceImpl extends BaseServiceImpl<TrunklineBillladingMapper, TrunklineBillladingEntity> implements ITrunklineBillladingService {
+
+	@Override
+	public IPage<TrunklineBillladingVO> pageList(BillladingDTO billladingDTO) {
+		IPage<Object> page = new Page<>();
+		page.setCurrent(billladingDTO.getPageNum());
+		page.setSize(billladingDTO.getPageSize());
+
+		IPage<TrunklineBillladingVO> pageList =  baseMapper.pageList(page,billladingDTO);
+
+		return null;
+	}
+}

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

@@ -0,0 +1,15 @@
+package com.logpm.trunkline.service.impl;
+
+import com.logpm.trunkline.entity.TrunklineBillladingWaybillEntity;
+import com.logpm.trunkline.mapper.TrunklineBillladingWaybillMapper;
+import com.logpm.trunkline.service.ITrunklineBillladingWaybillService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+@AllArgsConstructor
+public class TrunklineBillladingWaybillServiceImpl extends BaseServiceImpl<TrunklineBillladingWaybillMapper, TrunklineBillladingWaybillEntity> implements ITrunklineBillladingWaybillService {
+}

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

@@ -0,0 +1,15 @@
+package com.logpm.trunkline.service.impl;
+
+import com.logpm.trunkline.entity.TrunklineDetailProductEntity;
+import com.logpm.trunkline.mapper.TrunklineDetailProductMapper;
+import com.logpm.trunkline.service.ITrunklineDetailProductService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+@AllArgsConstructor
+public class TrunklineDetailProductServiceImpl extends BaseServiceImpl<TrunklineDetailProductMapper, TrunklineDetailProductEntity> implements ITrunklineDetailProductService {
+}

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

@@ -14,4 +14,5 @@ public interface WarehouseTaryAllocationMapper extends BaseMapper<WarehouseTaryA
 	BasicdataTrayEntity getTrayByAllocationId(@Param("allocationId") Long allocationId);
 
     void deleteByTrayIdAndAllocationId(@Param("trayId") Long trayId, @Param("allocationId") Long allocationId);
+
 }

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

@@ -48,4 +48,5 @@ public class WarehouseTaryAllocationServiceImpl extends BaseServiceImpl<Warehous
 	public void deleteByTrayIdAndAllocationId(Long trayId, Long allocationId) {
 		baseMapper.deleteByTrayIdAndAllocationId(trayId,allocationId);
 	}
+
 }

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

@@ -1270,6 +1270,11 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 			baseMapper.deleteById(trayTypeId);
 			//更新托盘状态
 			basicdataTrayClient.updateTrayStatus(trayId,1);
+
+			Long allocationIdByTrayId = warehouseTaryAllocationService.getAllocationIdByTrayId(trayId);
+			if(!Objects.isNull(allocationIdByTrayId)){
+				warehouseTaryAllocationService.deleteByTrayIdAndAllocationId(trayId,allocationIdByTrayId);
+			}
 		}
 
 		updateNumByTrayTypeId(trayTypeEntity);

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

@@ -1210,8 +1210,8 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 					//绑定了托盘
 					warehouseTrayTypeService.deleteZeroOrderByTrayCode(orderCode,trayEntity.getPalletCode(),warehouseId);
 
-					//解除托盘与库位绑定
+//					//解除托盘与库位绑定
-					warehouseTaryAllocationService.deleteByTrayIdAndAllocationId(trayEntity.getId(),allocationId);
+//					warehouseTaryAllocationService.deleteByTrayIdAndAllocationId(trayEntity.getId(),allocationId);
 
 				}
 				//全部下架