Merge remote-tracking branch 'origin/master'

blade-biz-common/src/main/java/org/springblade/common/constant/CodeNumConstant.java

@@ -12,5 +12,6 @@ public class CodeNumConstant {
 	public final static int SHELF = 8;//货架号
 	public final static int PSKH = 9;//配送客户号
 	public final static int ABNORMAL_ORDER = 10;//异常工单号
+	public final static int TRUNKLINEBILLLADING = 11;//干线提货单号
 
 }

blade-biz-common/src/main/java/org/springblade/common/constant/DictBizConstant.java

@@ -15,6 +15,7 @@ public class DictBizConstant {
 
 	public static final String BASIC_GROUNDING = "basic_grounding";//上架状态
 	public static final String STOCKUP_STATUS = "stockup_status";//备货状态
+	public static final String ORDER_STOCKUP_STATUS = "order_stockup_status";//订单备货状态
 	public static final String ORDER_RESERVATION_STATUS = "order_reservation_status";//订单预约状态
 	public static final String RESERVATION_STATUS = "reservation_status";//预约状态
 
@@ -103,4 +104,11 @@ public class DictBizConstant {
 	public static final String ORDER_PACKAGE_LOADING_STATUS = "order_package_loading_status";//预约签收状态
 	// --------------2023-10-12 ---------------------
 	public static final String WAREHOUSE_QUEST_STATUS = "warehouse_quest_status"; //盘点任务
+	// --------------2023-11-04 ---------------------
+	public static final String WAREHOUSE_RETENTION_TYPE = "warehouse_retention_type"; //滞留类型
+
+
+	//---------------2023-11-07---------------------
+	public static final String BILLLADING_CHARGE_TYPE = "billlading_charge_type"; //提货单计费方式
+
 }

blade-biz-common/src/main/java/org/springblade/common/constant/retention/RetentionTypeConstant.java

@@ -0,0 +1,47 @@
+package org.springblade.common.constant.retention;
+
+/**
+ * 订单冻结状态枚举
+ * 对应码表 freeze_status
+ * @author pref
+ */
+public enum RetentionTypeConstant {
+
+	zhuangchezhiliu("装车滞留",1),
+	peisongzhiliu("配送滞留",2),
+	chukuzhiliu("出库滞留",3),
+	quxiaozhiliu("取消滞留",4);
+
+
+	/**
+	 * 状态
+	 */
+	private String name;
+
+	/**
+	 * 值
+	 */
+	private Integer value;
+
+
+	private RetentionTypeConstant(String name, Integer value) {
+		this.name = name;
+		this.value = value;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public Integer getValue() {
+		return value;
+	}
+
+	public void setValue(Integer value) {
+		this.value = value;
+	}
+}

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataDriverArteryEntity.java

@@ -209,4 +209,16 @@ public class BasicdataDriverArteryEntity extends TenantEntity {
 	@ApiModelProperty(value = "预留5")
 	private String reserve5;
 
+	/**
+	 * 预留5
+	 */
+	@ApiModelProperty(value = "预留5")
+	private String warehouseId;
+
+	/**
+	 * 预留5
+	 */
+	@ApiModelProperty(value = "预留5")
+	private String warehouseName;
+
 }

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionAddvalueEntity.java

@@ -119,5 +119,17 @@ public class DistributionAddvalueEntity extends TenantEntity {
 	@ApiModelProperty(value = "配送Id")
 	private Long deliveryListId;
 
+	/**
+	 * 仓库Id
+	 */
+	@ApiModelProperty(value = "仓库Id")
+	private Long warehouseId;
+
+	/**
+	 * 仓库名称
+	 */
+	@ApiModelProperty(value = "仓库名称")
+	private String warehouseName;
+
 
 }

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java

@@ -141,6 +141,61 @@ public class DistributionParcelListEntity extends TenantEntity {
 	@ApiModelProperty(value = "客户id")
 	@TableField(exist = false)
 	private Long marketId;
+
+	/**
+	 * 商场名称
+	 */
+	@ApiModelProperty(value = "商场名称")
+	@TableField(exist = false)
+	private String mallName;
+	/**
+	 * 商场名称
+	 */
+	@ApiModelProperty(value = "分类")
+	@TableField(exist = false)
+	private String genre;
+	/**
+	 * 商场名称
+	 */
+	@ApiModelProperty(value = "零担标识")
+	@TableField(exist = false)
+	private String isZero;
+	/**
+	 * 商场名称
+	 */
+	@ApiModelProperty(value = "商场iD")
+	@TableField(exist = false)
+	private Long mallId;
+	/**
+	 * 托盘ID
+	 */
+	@ApiModelProperty(value = "托盘ID")
+	@TableField(exist = false)
+	private String trayId;
+	/**
+	 * 托盘编码
+	 */
+	@ApiModelProperty(value = "托盘编码")
+	@TableField(exist = false)
+	private String trayCode;
+	/**
+	 * 货位ID
+	 */
+	@ApiModelProperty(value = "货位ID")
+	@TableField(exist = false)
+	private String allocationId;
+	/**
+	 * 完整货位
+	 */
+	@ApiModelProperty(value = "完整货位")
+	@TableField(exist = false)
+	private String positionCode;
+	/**
+	 * 库存品ID
+	 */
+	@ApiModelProperty(value = "库存品ID")
+	@TableField(exist = false)
+	private Long stockId;
 	/**
 	 * 物料Id
 	 */

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockListEntity.java

@@ -275,11 +275,11 @@ public class DistributionStockListEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "拆包ID")
 	private Long pid;
-	/**
-	 * 托盘ID
-	 */
-	@ApiModelProperty(value = "托盘ID")
-	private Long trayId;
+//	/**
+//	 * 托盘ID
+//	 */
+//	@ApiModelProperty(value = "托盘ID")
+//	private Long trayId;
 	/**
 	 * 托盘名称
 	 */

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockupEntity.java

@@ -40,12 +40,17 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 public class DistributionStockupEntity extends TenantEntity {
 
-	/**
-	 * 备货时间
-	 */
+	@ApiModelProperty(value = "备货编号")
+	private String stockupCode;
+
 	@ApiModelProperty(value = "备货时间")
 	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
 	private Date stockupDate;
+
+	@ApiModelProperty(value = "出库时间")
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	private Date outboundDate;
+
 	/**
 	 * 备货人
 	 */
@@ -78,6 +83,13 @@ public class DistributionStockupEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "备货库位")
 	private String stockipAllocation;
+
+	/**
+	 * 托盘位
+	 */
+	@ApiModelProperty(value = "托盘位")
+	@TableField(exist = false)
+	private String pallet;
 	/**
 	 * 备货区ID
 	 */
@@ -155,12 +167,8 @@ public class DistributionStockupEntity extends TenantEntity {
 	@ApiModelProperty(value = "指派时间")
 	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
 	private Date assignTime;
-	/**
-	 * 出库时间
-	 */
-	@ApiModelProperty(value = "出库时间")
-	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-	private Date outboundDate;
+
+
 
 	/**
 	 * 班组职能
@@ -190,11 +198,6 @@ public class DistributionStockupEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "取消原因")
 	private String annulment;
-	/**
-	 * 备货编号
-	 */
-	@ApiModelProperty(value = "备货编号")
-	private String stockupCode;
 
 	@ApiModelProperty(value = "仓库Id")
 	private Long warehouseId;

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionDeliveryListClient.java

@@ -16,13 +16,20 @@
  */
 package com.logpm.distribution.feign;
 
+import com.logpm.distribution.entity.DistributionDeliveryDetailsEntity;
 import com.logpm.distribution.entity.DistributionDeliveryListEntity;
+import com.logpm.distribution.vo.DistributionDeliveryListVO;
+import com.logpm.distribution.vo.DistributionDeliverySelfVO;
+import com.logpm.distribution.vo.DistributionRetentionScanVo;
 import org.springblade.common.constant.ModuleNameConstant;
 import org.springblade.core.mp.support.BladePage;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.List;
+
 /**
  * 配送管理 Feign接口类
  *
@@ -45,6 +52,24 @@ public interface IDistributionDeliveryListClient {
      * @return BladePage
      */
     @GetMapping(TOP)
-    BladePage<DistributionDeliveryListEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
+    BladePage<DistributionDeliveryListEntity> deliveryListTop(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
+
+
+	/**
+	 * 根据配送任务ID查询配送司机信息
+	 * @param deliveryId
+	 * @return
+	 */
+    @GetMapping(TOP+"/getDeliveryDriverInfo")
+	DistributionDeliveryListVO getDeliveryDriverInfo(@RequestParam("current") Long deliveryId);
+
+
+//    /**
+//	 * 根据配送任务ID查询配送司机信息
+//	 * @param distributionRetentionScanVo
+//	 * @return
+//	 */
+//    @GetMapping(TOP+"/retentionCancelDeliveryPack")
+//	void retentionCancelDeliveryPack(@RequestBody DistributionRetentionScanVo distributionRetentionScanVo);
 
 }

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java

@@ -17,6 +17,8 @@
 package com.logpm.distribution.feign;
 
 import com.logpm.distribution.entity.DistributionParcelListEntity;
+import com.logpm.distribution.entity.DistributionStockArticleEntity;
+import com.logpm.distribution.vo.DistributionParcelListVO;
 import org.springblade.common.constant.ModuleNameConstant;
 import org.springblade.core.mp.support.BladePage;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -41,6 +43,7 @@ public interface IDistributionParcelListClient {
     String API_PREFIX = "/client";
     String TOP = API_PREFIX + "/top1";
     String TOPPARCELLIST = API_PREFIX + "/getParcelList";
+    String GETPARCELLISTINFO = API_PREFIX + "/getParcelListInfo";
 
 	@PostMapping(TOPPARCELLIST)
 	List<DistributionParcelListEntity> getParcelList(@RequestBody DistributionParcelListEntity parcelListEntity);
@@ -102,4 +105,7 @@ public interface IDistributionParcelListClient {
 
 	@GetMapping(API_PREFIX+"/updateStockArticleIdByOrderCode")
 	void updateStockArticleIdByOrderCode(@RequestParam Long orderId, @RequestParam String orderCode);
+
+	@PostMapping(GETPARCELLISTINFO)
+	List<DistributionParcelListEntity> getParcelListInfo(@RequestBody DistributionParcelListVO parcelListVO);
 }

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionReservationClient.java

@@ -17,10 +17,12 @@
 package com.logpm.distribution.feign;
 
 import com.logpm.distribution.entity.DistributionReservationEntity;
+import com.logpm.distribution.vo.DistributionRetentionScanVo;
 import org.springblade.common.constant.ModuleNameConstant;
 import org.springblade.core.mp.support.BladePage;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
 /**
@@ -47,4 +49,12 @@ public interface IDistributionReservationClient {
     @GetMapping(TOP)
     BladePage<DistributionReservationEntity> reservationTop(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
 
+	/**
+	 * 根据配送任务ID查询配送司机信息
+	 * @param distributionRetentionScanVo
+	 * @return
+	 */
+	@GetMapping(TOP+"/retentionCancelReservationPack")
+	boolean retentionCancelReservationPack(@RequestBody DistributionRetentionScanVo distributionRetentionScanVo);
+
 }

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockArticleClient.java

@@ -41,6 +41,7 @@ public interface IDistributionStockArticleClient {
 
     String API_PREFIX = "/client";
     String TOP = API_PREFIX + "/top12";
+    String GETSTOCKARTICLEINFO = API_PREFIX + "/getStockArticleInfo";
 
     /**
      * 获取配送在库订单列表
@@ -104,4 +105,11 @@ public interface IDistributionStockArticleClient {
 
 	@GetMapping(API_PREFIX + "/submitHandleNumByOrderId")
     void submitHandleNumByOrderId(@RequestParam Integer subNum, @RequestParam Long articleId);
+
+	/**
+	 * 查询订单信息数据
+	 * @return
+	 */
+	@PostMapping(GETSTOCKARTICLEINFO)
+    List<DistributionStockArticleEntity> getStockArticleInfo(@RequestBody DistributionStockArticleEntity distributionStockArticleEntity);
 }

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockListClient.java

@@ -47,6 +47,7 @@ public interface IDistributionStockListClient {
     String ADDSTOCKLIST = API_PREFIX + "/addStockList";
     String UPDATESTOCKLIST = API_PREFIX + "/updateStockList";
     String PUTSTOCKLIST = API_PREFIX + "/putStockList";
+    String GETSTOCKLISTINFO = API_PREFIX + "/getStockListInfo";
 
     /**
      * 获取库存品管理列表
@@ -116,12 +117,12 @@ public interface IDistributionStockListClient {
 	List<DistributionStockListEntity> getStockListByWarehouseIdAndMarketAndStockListInfo(@RequestParam("incomingBatch") String incomingBatch,@RequestParam("marketNames") List<String> marketNames,@RequestParam("warehouseId") Long warehouseId);
 
 
-//	/**
-//     * 修改某个客户信息及物品信息
-//     *
-//     * @return BladePage
-//     */
-//    @PutMapping(PUTSTOCKLIST)
-//    Boolean putStockList(@RequestBody DistributionStockListEntity distributionStockListEntity);
+	/**
+     * 修改某个客户信息及物品信息
+     *
+     * @return BladePage
+     */
+    @PostMapping(GETSTOCKLISTINFO)
+    List<DistributionStockListVO> getStockListInfo(@RequestBody DistributionStockListEntity distributionStockListEntity);
 
 }

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionAddvaluePackageVO.java

@@ -42,4 +42,45 @@ public class DistributionAddvaluePackageVO extends DistributionAddvaluePackageEn
 	 */
 	private Integer planQuantity;
 
+	/**
+	 * 总数量
+	 */
+	private Integer totalQuantity;
+
+	/**
+	 * 总数量
+	 */
+	private String firsts;
+
+	/**
+	 * 总数量
+	 */
+	private String second;
+
+	/**
+	 * 总数量
+	 */
+	private String thirdProduct;
+
+
+	/**
+	 * 总数量
+	 */
+	private Long reservationId;
+
+	/**
+	 * 总数量
+	 */
+	private String packageType;
+
+	/**
+	 * 总数量
+	 */
+	private String materialNumber;
+
+	/**
+	 * 总数量
+	 */
+	private String sku;
+
 }

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java

@@ -100,6 +100,19 @@ public class DistributionParcelListVO extends DistributionParcelListEntity {
 	 */
 	private List<Long>  warehouseIdList;
 
+	/**
+	 * 商场id
+	 */
+	private Long  mallId;
+	/**
+	 * 商场id
+	 */
+	private String  genre;
+	/**
+	 * 商场id
+	 */
+	private String  isZero;
+
 	/**
 	 * 装车数量
 	 */

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListZeroVO.java

@@ -38,11 +38,21 @@ public class DistributionParcelListZeroVO implements Serializable {
 	 */
 	@ApiModelProperty(value = "填写数量")
 	private Integer TiQuantity;
+	/**
+	 * 冻结数量
+	 */
+	@ApiModelProperty(value = "冻结数量")
+	private Integer deliveryQuantity;
 	/**
 	 * 配送数量
 	 */
 	@ApiModelProperty(value = "配送数量")
-	private Integer deliveryQuantity;
+	private Integer reservationQuantity;
+	/**
+	 * 配送数量
+	 */
+	@ApiModelProperty(value = "出库数量")
+	private Integer outboundQuantity;
 
 
 

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionRetentionScanVo.java

@@ -0,0 +1,84 @@
+package com.logpm.distribution.vo;
+
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 滞留扫描对象
+ */
+@Data
+//@EqualsAndHashCode(callSuper = true)
+public class DistributionRetentionScanVo {
+
+	/**
+	 * 预约Id
+	 */
+	private Long reservationId;
+
+	/**
+	 * 预约Id
+	 */
+	private String reservationCode;
+
+	/**
+	 * 订单Id
+	 */
+	private Long orderId;
+
+	/**
+	 * 订单自编码
+	 */
+	private String orderCode;
+
+	/**
+	 * 订单Id
+	 */
+	private Long inventoryId;
+
+
+
+	/**
+	 * 物料编码
+	 */
+	private String materialNumber;
+
+	/**
+	 * 物料名称
+	 */
+	private String materialName;
+
+	/**
+	 * 包件ID
+	 */
+	private Long orderPackageId;
+
+	/**
+	 * 包条码
+	 */
+	private String orderPackageCode;
+
+	/**
+	 * 滞留数量
+	 */
+	private Integer retentionQuantity;
+
+	/**
+	 * 类型
+	 */
+	private Integer conditions;
+
+
+	/**
+	 * 配送ID
+	 */
+	private Long deliveryId;
+
+
+	/**
+	 * 配送车次
+	 */
+	private String trainNumber;
+
+
+}

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSigndetailVO.java

@@ -38,6 +38,11 @@ public class DistributionSigndetailVO extends DistributionSigndetailEntity {
 	 */
 	@ApiModelProperty(value = "客户名称")
 	private String consignee;
+	/**
+	 * 配送类型
+	 */
+	@ApiModelProperty(value = "配送类型")
+	private String serveType;
 	/**
 	 * 客户Id
 	 */
@@ -58,6 +63,11 @@ public class DistributionSigndetailVO extends DistributionSigndetailEntity {
 	 */
 	@ApiModelProperty(value = "服务号")
 	private String serviceNumber;
+	/**
+	 * 门店名称
+	 */
+	@ApiModelProperty(value = "门店名称")
+	private String storeName;
 	/**
 	 * 配送类型
 	 */

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforVO.java

@@ -16,7 +16,6 @@
  */
 package com.logpm.distribution.vo;
 
-import com.logpm.distribution.entity.DistributionSignPrintEntity;
 import com.logpm.distribution.entity.DistributionSignforEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -34,12 +33,26 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 public class DistributionSignforVO extends DistributionSignforEntity {
 	private static final long serialVersionUID = 1L;
+
 	/**
 	 * 门店名称
 	 */
 	@ApiModelProperty(value = "门店名称")
 	private String storeName;
 
+	private List<String> ids;
+	/**
+	 * 仓库名称
+	 */
+	@ApiModelProperty(value = "仓库名称")
+	private String warehouseName;
+
+	/**
+	 * 门店名称
+	 */
+	@ApiModelProperty(value = "服务类型")
+	private String serveType;
+
 	/**
 	 * 配送单号
 	 */
@@ -95,6 +108,11 @@ public class DistributionSignforVO extends DistributionSignforEntity {
 	 */
 	@ApiModelProperty(value = "备注")
 	private String remarks;
+/**
+	 * 备注
+	 */
+	@ApiModelProperty(value = "订单自编号")
+	private String orderCode;
 
 	/**
 	 * 是否加急

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockListVO.java

@@ -102,10 +102,30 @@ public class DistributionStockListVO extends DistributionStockListEntity {
 	 */
 	@ApiModelProperty(value = "托盘id")
 	private String trayCode;
+	/**
+	 * 托盘id
+	 */
+	@ApiModelProperty(value = "托盘id")
+	private String trayId;
+	/**
+	 * 库位id
+	 */
+	@ApiModelProperty(value = "库位id")
+	private String allocationId;
 	/**
 	 * 货位信息
 	 */
 	@ApiModelProperty(value = "货位信息")
 	private String positionCode;
+	/**
+	 * 类型
+	 */
+	@ApiModelProperty(value = "类型")
+	private Integer conditions;
+	/**
+	 * 类型
+	 */
+	@ApiModelProperty(value = "shan")
+	private String mallName;
 
 }

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockVO.java

@@ -17,6 +17,7 @@
 package com.logpm.distribution.vo;
 
 import com.logpm.distribution.entity.DistributionStockEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -43,4 +44,10 @@ public class DistributionStockVO extends DistributionStockEntity {
 
 	private Integer whole;//全部
 
+	/**
+	 * 出库类型
+	 */
+	@ApiModelProperty(value = "出库类型")
+	private String outboundTypeName;
+
 }

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupOrderListVO.java

@@ -33,6 +33,8 @@ public class DistributionStockupOrderListVO implements Serializable {
 
 	private Long areaId; //货区id
 	private String trayId; //托盘id
+	private String customerAddress; //客户地址
+	private String firstsNumber; //品类数量
 	private Long shelfId; //货架id
 	private Long parcelListId; //包件id
 	private Long stockId; //备货id

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupVO.java

@@ -72,6 +72,7 @@ public class DistributionStockupVO extends DistributionStockupEntity {
 	private Integer number;
 	private String goodsAllocation; //货位
 	private String stockipAllocation; //货位
+	private String pallet; //托盘位
 	private Integer reservationStockListNum; //数量
 	private String reservationId; //预约ID
 	private String stockListId; //库存品ID

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistrilbutionBillLadingVO.java

@@ -19,8 +19,10 @@ package com.logpm.distribution.vo;
 import com.logpm.distribution.entity.DistributionDeliveryChargeEntity;
 import com.logpm.distribution.entity.DistrilbutionBillLadingEntity;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -33,6 +35,8 @@ import java.util.List;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+@AllArgsConstructor
 public class DistrilbutionBillLadingVO extends DistrilbutionBillLadingEntity {
 	private static final long serialVersionUID = 1L;
 

blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/oupai/entity/OpPackagePushLogEntity.java

@@ -37,4 +37,7 @@ public class OpPackagePushLogEntity extends BaseEntity {
     @ApiModelProperty(name = "关联ID 根据push_type来决定关联的表",notes = "")
     private Long refId ;
 
+	@ApiModelProperty(name="欧派节点 入库  出库  收货")
+	private String pushOupaiNode;
+
 }

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

@@ -1,12 +1,21 @@
 package com.logpm.trunkline.dto;
 
 import com.logpm.trunkline.entity.TrunklineBillladingEntity;
+import com.logpm.trunkline.vo.TrunklineBillladingLineVO;
+import com.logpm.trunkline.vo.TrunklineBillladingWaybillVO;
 import lombok.Data;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @Data
 public class BillladingDTO extends TrunklineBillladingEntity {
 
 	private Integer pageNum;
 	private Integer pageSize;
 
+	private List<TrunklineBillladingLineVO> billladingLineList = new ArrayList<>();
+
+	private List<TrunklineBillladingWaybillVO> billladingWaybillList = new ArrayList<>();
+
 }

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

@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.tenant.mp.TenantEntity;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 @Data
@@ -62,28 +63,28 @@ public class TrunklineBillladingEntity extends TenantEntity {
 	private String lineNameTitle ;
 	/** 预计件数 */
 	@ApiModelProperty(name = "预计件数",notes = "")
-	private int planNum ;
+	private Integer planNum ;
 	/** 预计重量 */
 	@ApiModelProperty(name = "预计重量",notes = "")
-	private Double planWeight ;
+	private BigDecimal planWeight ;
 	/** 预计体积 */
 	@ApiModelProperty(name = "预计体积",notes = "")
-	private Double planVolume ;
+	private BigDecimal planVolume ;
 	/** 实际件数 */
 	@ApiModelProperty(name = "实际件数",notes = "")
 	private int realNum ;
 	/** 实际重量 */
 	@ApiModelProperty(name = "实际重量",notes = "")
-	private Double realWeight ;
+	private BigDecimal realWeight ;
 	/** 实际体积 */
 	@ApiModelProperty(name = "实际体积",notes = "")
-	private Double realVolume ;
+	private BigDecimal realVolume ;
 	/** 计费模式 1按件 2按重量 3按体积 */
 	@ApiModelProperty(name = "计费模式 1按件 2按重量 3按体积",notes = "")
 	private String chargeType ;
 	/** 提货费用 */
 	@ApiModelProperty(name = "提货费用",notes = "")
-	private Double totalFee ;
+	private BigDecimal totalFee ;
 	/** 提货单状态 1=未开始，2=提货中，3=已完成，4=已取消 */
 	@ApiModelProperty(name = "提货单状态 1=未开始，2=提货中，3=已完成，4=已取消",notes = "")
 	private String billladingStatus ;
@@ -102,11 +103,8 @@ public class TrunklineBillladingEntity extends TenantEntity {
 	/** 结算人名称 */
 	@ApiModelProperty(name = "结算人名称",notes = "")
 	private String settlementName ;
-	/** 备注 */
-	@ApiModelProperty(name = "备注",notes = "")
-	private String remark ;
-	/** 创建用户名称 */
-	@ApiModelProperty(name = "创建用户名称",notes = "")
+	/** 创建人名称 */
+	@ApiModelProperty(name = "创建人名称",notes = "")
 	private String createUserName ;
 
 }

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

@@ -0,0 +1,62 @@
+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_line")
+@ApiModel(value = "TrunklineBillladingLine对象", description = "干线提货线路表")
+@EqualsAndHashCode(callSuper = true)
+public class TrunklineBillladingLineEntity 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 billladingId ;
+	/** 提货单id */
+	@ApiModelProperty(name = "客户id",notes = "")
+	private Long clientId ;
+	/** 客户名称 */
+	@ApiModelProperty(name = "客户名称",notes = "")
+	private String clientName ;
+	/** 客户类型 1 工厂  2 商场 3装饰 4个人 */
+	@ApiModelProperty(name = "客户类型 1 工厂 2 商场 3装饰 4个人",notes = "")
+	private String clientType ;
+	/** 联系人 */
+	@ApiModelProperty(name = "联系人",notes = "")
+	private String linkMan ;
+	/** 联系电话 */
+	@ApiModelProperty(name = "联系电话",notes = "")
+	private String linkPhone ;
+	/** 联系人地址 */
+	@ApiModelProperty(name = "联系人地址",notes = "")
+	private String linkAddress ;
+	/** 排序 */
+	@ApiModelProperty(name = "排序",notes = "")
+	private Integer sort ;
+
+}

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

@@ -0,0 +1,47 @@
+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_log")
+@ApiModel(value = "TrunklineBillladingLog对象", description = "干线提货单日志表")
+@EqualsAndHashCode(callSuper = true)
+public class TrunklineBillladingLogEntity 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 createUserName ;
+	/** 描述内容 */
+	@ApiModelProperty(name = "描述内容",notes = "")
+	private String content ;
+	/** 提货单id */
+	@ApiModelProperty(name = "提货单id",notes = "")
+	private Long billladingId ;
+
+}

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

@@ -37,5 +37,8 @@ public class TrunklineBillladingPackageEntity extends TenantEntity {
 	/** 包件码 */
 	@ApiModelProperty(name = "包件码",notes = "")
 	private String orderPackageCode ;
+	/** 提货单id */
+	@ApiModelProperty(name = "提货单id",notes = "")
+	private Long billladingId ;
 
 }

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

@@ -15,9 +15,6 @@ import java.math.BigDecimal;
 @EqualsAndHashCode(callSuper = true)
 public class TrunklineBillladingWaybillEntity extends TenantEntity {
 
-	/** 预留1 */
-	@ApiModelProperty(name = "预留1",notes = "")
-	private String reserve1 ;
 	/** 预留2 */
 	@ApiModelProperty(name = "预留2",notes = "")
 	private String reserve2 ;
@@ -33,6 +30,9 @@ public class TrunklineBillladingWaybillEntity extends TenantEntity {
 	/** 仓库id */
 	@ApiModelProperty(name = "仓库id",notes = "")
 	private Long warehouseId ;
+	/** 仓库名称 */
+	@ApiModelProperty(name = "仓库名称",notes = "")
+	private Long warehouseName ;
 	/** 提货单id */
 	@ApiModelProperty(name = "提货单id",notes = "")
 	private Long billladingId ;

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

@@ -0,0 +1,13 @@
+package com.logpm.trunkline.vo;
+
+import com.logpm.trunkline.entity.TrunklineBillladingLineEntity;
+import lombok.Data;
+
+@Data
+public class TrunklineBillladingLineVO extends TrunklineBillladingLineEntity {
+
+
+
+
+
+}

blade-service-api/logpm-warehouse-api/pom.xml

@@ -10,6 +10,10 @@
             <version>3.2.0.RELEASE</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
     </dependencies>
 
     <parent>

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

@@ -16,6 +16,7 @@
  */
 package com.logpm.warehouse.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -23,6 +24,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.tenant.mp.TenantEntity;
 
+import java.util.List;
+
 /**
  * 盘点明细 实体类
  *
@@ -120,6 +123,13 @@ public class QuestDetailEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "在库数量")
 	private Integer stockNum;
+
+
+	/**
+	 * 商场名称
+	 */
+	@TableField(exist = false)
+	private List<String> marketNames;
 	/**
 	 * 仓库id
 	 */
@@ -146,12 +156,12 @@ public class QuestDetailEntity extends TenantEntity {
 	 * 托盘id
 	 */
 	@ApiModelProperty(value = "托盘id")
-	private Long trayId;
+	private String trayId;
 	/**
 	 * 货位id
 	 */
 	@ApiModelProperty(value = "货位id")
-	private Long allocationId;
+	private String allocationId;
 
 	/**
 	 * 是否是新增数据

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

@@ -138,4 +138,36 @@ public class WarehouseRetentionRecordEntity extends TenantEntity {
 	@ApiModelProperty(value = "取消滞留备注")
 	private String cancelRemark;
 
+	/**
+	 * 任务Id
+	 */
+	@ApiModelProperty(value = "任务Id")
+	private Long taskId;
+
+	/**
+	 * 滞留数量
+	 */
+	@ApiModelProperty(value = "滞留数量")
+	private Integer retentionQuantity;
+
+	/**
+	 * 滞留任务创建人
+	 */
+	@ApiModelProperty(value = "滞留任务创建人")
+	private Long retentionCreateUserId;
+
+	/**
+	 * 滞留任务创建人
+	 */
+	@ApiModelProperty(value = "滞留任务创建人")
+	private String retentionCreateUserName;
+
+	/**
+	 * 滞留备注
+	 */
+	@ApiModelProperty(value = "滞留备注")
+	private String retentionRemarks;
+
+
+
 }

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

@@ -38,7 +38,7 @@ import java.io.Serializable;
 @Data
 @TableName("logpm_warehouse_retention_scan")
 @ApiModel(value = "WarehouseRetentionRecord对象", description = "滞留扫描记录")
-public class WarehouseRetentionScanEntity extends TenantEntity implements Serializable  {
+public class WarehouseRetentionScanEntity extends TenantEntity {
 
 	private static final long serialVersionUID = 1L;
 	/**
@@ -158,7 +158,7 @@ public class WarehouseRetentionScanEntity extends TenantEntity implements Serial
 	 * 滞留扫描操作人Id
 	 */
 	@ApiModelProperty(value = "滞留扫描操作人Id")
-	private String retentionScanUserId;
+	private Long retentionScanUserId;
 	/**
 	 * 滞留操作备注
 	 */
@@ -178,6 +178,12 @@ public class WarehouseRetentionScanEntity extends TenantEntity implements Serial
 	 * 配送任务ID
 	 */
 	@ApiModelProperty(value = "配送任务ID")
-	private Long deliveryListId;
+	private Long deliveryId;
+
+	/**
+	 * 配送任务ID
+	 */
+	@ApiModelProperty(value = "配送任务ID")
+	private Long refId;
 
 }

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

@@ -19,8 +19,11 @@ package com.logpm.warehouse.feign;
 import com.logpm.warehouse.entity.WarehouseRetentionScanEntity;
 import org.springblade.core.mp.support.BladePage;
 import com.logpm.warehouse.entity.WarehouseRetentionRecordEntity;
+import org.springblade.core.tool.api.R;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
 /**
@@ -47,4 +50,12 @@ public interface IWarehouseRetentionScanClient {
     @GetMapping(TOP)
     BladePage<WarehouseRetentionScanEntity> retentionScanTop(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
 
+
+    /**
+     * 保存扫描记录
+     * @return BladePage
+     */
+    @PostMapping(TOP+"/saveRetentionScan")
+	R saveRetentionScan(@RequestBody WarehouseRetentionScanEntity warehouseRetentionScanEntity);
+
 }

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

@@ -52,4 +52,10 @@ public interface IWarehouseUpdownTypeClient {
 
 	@PostMapping(TOP + "/packageChangeStock")
 	boolean packageChangeStock(@RequestBody List<String> orderPackageCodes);
+
+	@GetMapping(TOP + "/downPackageOrDelTray")
+	R downPackageOrDelTray(@RequestParam("orderPackageCodes") String orderPackageCodes, @RequestParam("warehouseId") Long warehouseId);
+
+
+
 }

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseRetentionRecordVO.java

@@ -20,6 +20,8 @@ import com.logpm.warehouse.entity.WarehouseRetentionRecordEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.List;
+
 /**
  * 滞留记录 视图实体类
  *
@@ -31,4 +33,9 @@ import lombok.EqualsAndHashCode;
 public class WarehouseRetentionRecordVO extends WarehouseRetentionRecordEntity {
 	private static final long serialVersionUID = 1L;
 
+
+	private List<WarehouseRetentionScanVO> retentionScanVOList;
+
+	private String retentionTypeName;
+
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java

@@ -144,7 +144,6 @@ public class BasicdataDriverArteryController extends BladeController {
 		if(list.size() > 0){
 			return R.fail("绑定的用户已存在！不要重复绑定！！！");
 		}
-
 		String phone = basicdataDriverArtery.getPhone();
 		R<User> userR = userClient
 			.userInfoByPhone(AuthUtil.getUser().getTenantId(), phone);

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java

@@ -289,15 +289,12 @@ public class BasicdataWarehouseController extends BladeController {
 	@GetMapping("/getMyWarehouseList")
 	@ApiOperationSupport(order = 3)
 	public R<List<BasicdataWarehouseEntity>> getMyWarehouseList() {
-
 		BladeUser user = AuthUtil.getUser();
 		List<BasicdataWarehouseEntity>  basicdataGoodsShelfVOList = CacheUtil.get(CacheObjNames.basic_data_warehourse_list.getCacheName(), CacheObjNames.basic_data_warehourse_list.getKeyPrefix(), user.getUserId(),List.class);
-
 		if(ObjectUtils.isNull(basicdataGoodsShelfVOList)){
 			basicdataGoodsShelfVOList = warehouseService.getMyWarehouseList();
 			CacheUtil.put(CacheObjNames.basic_data_warehourse_list.getCacheName(), CacheObjNames.basic_data_warehourse_list.getKeyPrefix(),user.getUserId(),basicdataGoodsShelfVOList);
 		}
-
 		return R.data(basicdataGoodsShelfVOList);
 	}
 

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java

@@ -269,6 +269,7 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl<BasicdataClientM
 	 * @param isCovered
 	 */
 	@Override
+	@Transactional(rollbackFor = Exception.class)
 	public void importClient(List<BasicdataClientExcel> data, Boolean isCovered) {
 		log.info("客户导入数据");
 		List<BasicdataStoreContactEntity> storeContactEntities = new ArrayList<>(); //	联系人
@@ -418,6 +419,9 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl<BasicdataClientM
 								case "自提":
 									business.setMold("3");
 									break;
+								case "三方中转":
+									business.setMold("4");
+									break;
 							}
 
 						}else{
@@ -442,6 +446,9 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl<BasicdataClientM
 							case "自提":
 								i.setMold("3");
 								break;
+							case "三方中转":
+								i.setMold("4");
+								break;
 						}
 
 					}else{

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCodeServiceImpl.java

@@ -72,12 +72,41 @@ public class BasicdataCodeServiceImpl implements IBasicdataCodeService {
 			case CodeNumConstant.ABNORMAL_ORDER:
 				code = generateExOrderCode(type,warehouseCode,orderCode);
 				break;
+			case CodeNumConstant.TRUNKLINEBILLLADING:
+				code = generateTrunklineBillladingCode(type,warehouseCode,orderCode);
+				break;
 			default:
 				log.info("##################getCodeByType: 暂不支持的编码类型 type={}", CodeDesEnum.getMes(type));
 		}
 		return code;
 	}
 
+	private String generateTrunklineBillladingCode(Integer type, String warehouseCode, String orderCode) {
+		if(!StringUtil.hasLength(warehouseCode)){
+			log.warn("############generateTrunklineBillladingCode: 仓库编码为空warehouseCode={}",warehouseCode);
+			return null;
+		}
+		//获得年月日短字符串
+		String dateShort = CommonUtil.dateToStringShort(new Date());
+
+		String key = warehouseCode+"TH"+":"+dateShort;
+
+		//获得序号
+		Boolean exists = bladeRedis.exists(key);
+		Long incr = null;
+		if(exists){
+			incr = bladeRedis.incr(key);
+		}else{
+			String value = dateShort+"00001";
+			incr = Long.parseLong(value);
+			bladeRedis.set(key,incr);
+			bladeRedis.expireAt(key,CommonUtil.getMonthDayEnd());
+
+		}
+
+		return warehouseCode+"TH"+incr;
+	}
+
 	private String generateExOrderCode(Integer type, String warehouseCode, String orderCode) {
 		if(!StringUtil.hasLength(warehouseCode)){
 			log.warn("############generateTraysCode: 仓库编码为空warehouseCode={}",warehouseCode);

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataDriverArteryServiceImpl.java

@@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.logpm.basic.entity.BasicDelineMiddleEntity;
 import com.logpm.basicdata.dto.BasicdataDriverArteryDTO;
 import com.logpm.basicdata.entity.*;
@@ -46,6 +47,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * 司机信息表 服务实现类
@@ -113,13 +115,17 @@ public class BasicdataDriverArteryServiceImpl extends BaseServiceImpl<BasicdataD
 	public List<BasicdataDriverArteryVO> getDriverList() {
 		BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
 		if (Func.isEmpty(myCurrentWarehouse)){
-			log.error("################无当前登录人仓库信息:{}",myCurrentWarehouse);
+			log.error("################getDriverList 无当前登录人仓库信息:{}",myCurrentWarehouse);
 			return null;
 		}
+		log.info("################ getDriverList 仓库信息:{}",myCurrentWarehouse);
 		ArrayList<BasicdataDriverArteryVO> basicdataDriverArteryVOS = new ArrayList<>();
 		List<BasicdataDriverArteryEntity> list = this.list();
-		if (Func.isNotEmpty(list)){
-			list.forEach(l->{
+		log.info("################getDriverList list:{}",list);
+		//Stream<BasicdataDriverArteryEntity> basicdataDriverArteryEntityStream = list.stream().filter(l -> l.getWarehouseId().contains(myCurrentWarehouse.getId().toString()));
+		Stream<BasicdataDriverArteryEntity> basicdataDriverArteryEntityStream = list.stream().filter(l -> Func.isNotEmpty(l.getWarehouseId()) && l.getWarehouseId().contains(myCurrentWarehouse.getId().toString()));
+		if (Func.isNotEmpty(basicdataDriverArteryEntityStream)){
+			basicdataDriverArteryEntityStream.forEach(l->{
 				BasicdataDriverArteryVO driverArteryVO = Func.copy(l, BasicdataDriverArteryVO.class);
 				List<Long> vehicleIds = basicdataDrivermiddleService.list(Wrappers.<BasicdataDrivermiddleEntity>query().lambda()
 					.eq(BasicdataDrivermiddleEntity::getDriverId, l.getId())).stream().filter(f -> Func.isNotEmpty(f.getBrandId())).map(BasicdataDrivermiddleEntity::getBrandId).collect(Collectors.toList());

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionDeliveryAppController.java

@@ -5,9 +5,11 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.logpm.distribution.bean.Resp;
 import com.logpm.distribution.dto.app.DistributionAppDeliveryListDTO;
 import com.logpm.distribution.dto.app.DistrilbutionloadingscanDTO;
+import com.logpm.distribution.entity.DistributionParcelListEntity;
 import com.logpm.distribution.service.IDistributionDeliveryInfoService;
 import com.logpm.distribution.service.IDistributionDeliveryListService;
 import com.logpm.distribution.vo.DisStockListDetailVO;
+import com.logpm.distribution.vo.DistributionParcelListVO;
 import com.logpm.distribution.vo.app.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -267,4 +269,37 @@ public class DistributionDeliveryAppController {
 	}
 
 
+
+	/**
+	 * 扫描查询配送任务下的包件信息
+	 */
+	@PostMapping("/retentionScan")
+	@ApiOperationSupport(order = 11)
+	public R retentionScan(@Valid @RequestBody DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
+		R r = distributionDeliveryListService.retentionScan(distrilbutionloadingscanDTO);
+		return r;
+	}
+
+
+	/**
+	 * 扫描查询配送任务下的包件信息
+	 */
+	@PostMapping("/getZeroPackageInfo")
+	@ApiOperationSupport(order = 11)
+	public R getZeroPackageInfo(@Valid @RequestBody DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
+		R distributionParcelListVOS	= distributionDeliveryListService.getZeroPackageInfo(distrilbutionloadingscanDTO);
+		return R.data(distributionParcelListVOS);
+	}
+
+
+	/**
+	 * 扫描查询配送任务下的包件信息
+	 */
+	@PostMapping("/getInventoryInfo")
+	@ApiOperationSupport(order = 11)
+	public R getInventoryInfo(@Valid @RequestBody DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
+		R r	= distributionDeliveryListService.getInventoryInfo(distrilbutionloadingscanDTO);
+		return R.data(r);
+	}
+
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java

@@ -162,7 +162,7 @@ public class DistributionSignforAppController {
 	@PostMapping("/positioning")
 	@ApiOperationSupport(order = 2)
 	public Resp positioning(@Valid @RequestBody DistributionSignforEntity distributionSignfor) {
-		Resp msg	= distributionSignforService.positioning(distributionSignfor);
+		Resp msg = distributionSignforService.positioning(distributionSignfor);
 		return msg;
 	}
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java

@@ -609,7 +609,10 @@ public class DistributionStockupAppController extends BladeController {
 						}
 						entity.setConditions("0");
 						entity.setType(2);
+						entity.setOutboundType(distributionStockupEntity.getTypeService());
 						distributionStockService.save(entity);
+						//修改订单备货状态
+						distributionAsyncService.updateStockArticleStock(one.getStockArticleId());
 //						dataSourceTransactionManager.commit(transactionStatus);//提交
 
 						Map<String, Object> map = new HashMap<>();

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java

@@ -244,12 +244,7 @@ public class DistributionDeliveryListController extends BladeController {
 	@ApiOperationSupport(order = 9)
 	@ApiOperation(value = "导出数据", notes = "传入distributionDeliveryList")
 	public void exportDistributionDeliveryList(@ApiIgnore @RequestParam Map<String, Object> distributionDeliveryList, BladeUser bladeUser, HttpServletResponse response) {
-		QueryWrapper<DistributionDeliveryListEntity> queryWrapper = Condition.getQueryWrapper(distributionDeliveryList, DistributionDeliveryListEntity.class);
-		//if (!AuthUtil.isAdministrator()) {
-		//	queryWrapper.lambda().eq(DistributionDeliveryList::getTenantId, bladeUser.getTenantId());
-		//}
-		queryWrapper.lambda().eq(DistributionDeliveryListEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
-		List<DistributionDeliveryListExcel> list = distributionDeliveryListService.exportDistributionDeliveryList(queryWrapper);
+		List<DistributionDeliveryListExcel> list = distributionDeliveryListService.exportDistributionDeliveryList(distributionDeliveryList);
 		ExcelUtil.export(response, "配送管理数据" + DateUtil.time(), "配送管理数据表", list, DistributionDeliveryListExcel.class);
 	}
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionParcelListController.java

@@ -163,10 +163,10 @@ public class DistributionParcelListController extends BladeController  {
 	/**
 	 * 修改零担在库数量
 	 */
-	@GetMapping("/zeroUpdateMaterial")
+	@PutMapping("/zeroUpdateMaterial")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "修改零担在库数量", notes = "传入distributionParcelList")
-	public R<List<DistributionParcelListVO>> getZeroUpdateMaterial(@ApiIgnore @RequestParam Map<String, Object> distributionParcelList, Query query) {
+	public R<List<DistributionParcelListVO>> getZeroUpdateMaterial(@RequestBody Map<String, Object> distributionParcelList, Query query) {
 		int a = distributionParcelListService.getZeroUpdateMaterial(distributionParcelList);
 		return a > 0 ?  R.success("修改成功！") : R.fail("修改失败！");
 	}
@@ -246,15 +246,10 @@ public class DistributionParcelListController extends BladeController  {
 	 */
 	@GetMapping("/export-distributionParcelList")
 	@ApiOperationSupport(order = 9)
-	@ApiOperation(value = "导出数据", notes = "传入distributionParcelList")
-	public void exportDistributionParcelList(@ApiIgnore @RequestParam Map<String, Object> distributionParcelList, BladeUser bladeUser, HttpServletResponse response) {
-		QueryWrapper<DistributionParcelListEntity> queryWrapper = Condition.getQueryWrapper(distributionParcelList, DistributionParcelListEntity.class);
-		//if (!AuthUtil.isAdministrator()) {
-		//	queryWrapper.lambda().eq(DistributionParcelList::getTenantId, bladeUser.getTenantId());
-		//}
-		queryWrapper.lambda().eq(DistributionParcelListEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
-		List<DistributionParcelListExcel> list = distributionParcelListService.exportDistributionParcelList(queryWrapper);
-		ExcelUtil.export(response, "在库订单包件清单数据" + DateUtil.time(), "在库订单包件清单数据表", list, DistributionParcelListExcel.class);
+	@ApiOperation(value = "导出包件明细数据", notes = "传入paramMap")
+	public void exportDistributionParcelList(@ApiIgnore @RequestParam Map<String, Object> paramMap, BladeUser bladeUser, HttpServletResponse response) {
+		List<DistributionParcelListExcel> list = distributionParcelListService.exportDistributionParcelList(paramMap);
+		ExcelUtil.export(response, "包件明细数据" + DateUtil.time(), "包件明细表", list, DistributionParcelListExcel.class);
 	}
 
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java

@@ -183,12 +183,8 @@ public class DistributionReservationController extends BladeController {
 	@ApiOperationSupport(order = 9)
 	@ApiOperation(value = "导出数据", notes = "传入distrbutionReservation")
 	public void exportDistrbutionReservation(@ApiIgnore @RequestParam Map<String, Object> distrbutionReservation, BladeUser bladeUser, HttpServletResponse response) {
-		QueryWrapper<DistributionReservationEntity> queryWrapper = Condition.getQueryWrapper(distrbutionReservation, DistributionReservationEntity.class);
-		//if (!AuthUtil.isAdministrator()) {
-		//	queryWrapper.lambda().eq(DistrbutionReservation::getTenantId, bladeUser.getTenantId());
-		//}
-		queryWrapper.lambda().eq(DistributionReservationEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
-		List<DistributionReservationExcel> list = reservationService.exportDistrbutionReservation(queryWrapper);
+
+		List<DistributionReservationExcel> list = reservationService.exportDistrbutionReservation(distrbutionReservation);
 		ExcelUtil.export(response, "预约列表数据" + DateUtil.time(), "预约列表数据表", list, DistributionReservationExcel.class);
 	}
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationPackageController.java

@@ -138,12 +138,8 @@ public class DistributionReservationPackageController extends BladeController {
 	@ApiOperationSupport(order = 9)
 	@ApiOperation(value = "导出数据", notes = "传入distributionReservationPackage")
 	public void exportDistributionReservationPackage(@ApiIgnore @RequestParam Map<String, Object> distributionReservationPackage, BladeUser bladeUser, HttpServletResponse response) {
-		QueryWrapper<DistributionReservationPackageEntity> queryWrapper = Condition.getQueryWrapper(distributionReservationPackage, DistributionReservationPackageEntity.class);
-		//if (!AuthUtil.isAdministrator()) {
-		//	queryWrapper.lambda().eq(DistributionReservationPackage::getTenantId, bladeUser.getTenantId());
-		//}
-		queryWrapper.lambda().eq(DistributionReservationPackageEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
-		List<DistributionReservationPackageExcel> list = distributionReservationPackageService.exportDistributionReservationPackage(queryWrapper);
+
+		List<DistributionReservationPackageExcel> list = distributionReservationPackageService.exportDistributionReservationPackage(distributionReservationPackage);
 		ExcelUtil.export(response, "预约包件中间表数据" + DateUtil.time(), "预约包件中间表数据表", list, DistributionReservationPackageExcel.class);
 	}
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationStockarticleController.java

@@ -149,12 +149,8 @@ public class DistributionReservationStockarticleController extends BladeControll
 	@ApiOperationSupport(order = 9)
 	@ApiOperation(value = "导出数据", notes = "传入distributionReservationStockarticle")
 	public void exportDistributionReservationStockarticle(@ApiIgnore @RequestParam Map<String, Object> distributionReservationStockarticle, BladeUser bladeUser, HttpServletResponse response) {
-		QueryWrapper<DistributionReservationStockarticleEntity> queryWrapper = Condition.getQueryWrapper(distributionReservationStockarticle, DistributionReservationStockarticleEntity.class);
-		//if (!AuthUtil.isAdministrator()) {
-		//	queryWrapper.lambda().eq(DistributionReservationStockarticle::getTenantId, bladeUser.getTenantId());
-		//}
-		queryWrapper.lambda().eq(DistributionReservationStockarticleEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
-		List<DistributionReservationStockarticleExcel> list = distributionReservationStockarticleService.exportDistributionReservationStockarticle(queryWrapper);
+
+		List<DistributionReservationStockarticleExcel> list = distributionReservationStockarticleService.exportDistributionReservationStockarticle(distributionReservationStockarticle);
 		ExcelUtil.export(response, "预约订单中间表数据" + DateUtil.time(), "预约订单中间表数据表", list, DistributionReservationStockarticleExcel.class);
 	}
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationStocklistController.java

@@ -138,12 +138,8 @@ public class DistributionReservationStocklistController extends BladeController
 	@ApiOperationSupport(order = 9)
 	@ApiOperation(value = "导出数据", notes = "传入distributionReservationStocklist")
 	public void exportDistributionReservationStocklist(@ApiIgnore @RequestParam Map<String, Object> distributionReservationStocklist, BladeUser bladeUser, HttpServletResponse response) {
-		QueryWrapper<DistributionReservationStocklistEntity> queryWrapper = Condition.getQueryWrapper(distributionReservationStocklist, DistributionReservationStocklistEntity.class);
-		//if (!AuthUtil.isAdministrator()) {
-		//	queryWrapper.lambda().eq(DistributionReservationStocklist::getTenantId, bladeUser.getTenantId());
-		//}
-		queryWrapper.lambda().eq(DistributionReservationStocklistEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
-		List<DistributionReservationStocklistExcel> list = distributionReservationStocklistService.exportDistributionReservationStocklist(queryWrapper);
+
+		List<DistributionReservationStocklistExcel> list = distributionReservationStocklistService.exportDistributionReservationStocklist(distributionReservationStocklist);
 		ExcelUtil.export(response, "预约库存中间表数据" + DateUtil.time(), "预约库存中间表数据表", list, DistributionReservationStocklistExcel.class);
 	}
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSigndetailController.java

@@ -16,7 +16,6 @@
  */
 package com.logpm.distribution.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.logpm.distribution.dto.DistributionDeliveryInfoDTO;
@@ -41,7 +40,6 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.constant.BladeConstant;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
@@ -186,12 +184,13 @@ public class DistributionSigndetailController extends BladeController {
 	@ApiOperationSupport(order = 9)
 	@ApiOperation(value = "导出数据", notes = "传入distributionSigndetail")
 	public void exportDistributionSigndetail(@ApiIgnore @RequestParam Map<String, Object> distributionSigndetail, BladeUser bladeUser, HttpServletResponse response) {
-		QueryWrapper<DistributionSigndetailEntity> queryWrapper = Condition.getQueryWrapper(distributionSigndetail, DistributionSigndetailEntity.class);
-		//if (!AuthUtil.isAdministrator()) {
-		//	queryWrapper.lambda().eq(DistributionSigndetail::getTenantId, bladeUser.getTenantId());
-		//}
-		queryWrapper.lambda().eq(DistributionSigndetailEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
-		List<DistributionSigndetailExcel> list = distributionSigndetailService.exportDistributionSigndetail(queryWrapper);
+//		QueryWrapper<DistributionSigndetailEntity> queryWrapper = Condition.getQueryWrapper(distributionSigndetail, DistributionSigndetailEntity.class);
+//		//if (!AuthUtil.isAdministrator()) {
+//		//	queryWrapper.lambda().eq(DistributionSigndetail::getTenantId, bladeUser.getTenantId());
+//		//}
+//		queryWrapper.lambda().eq(DistributionSigndetailEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+
+		List<DistributionSigndetailExcel> list = distributionSigndetailService.exportDistributionSigndetail(distributionSigndetail);
 		ExcelUtil.export(response, "签收明细数据" + DateUtil.time(), "签收明细数据表", list, DistributionSigndetailExcel.class);
 	}
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java

@@ -21,19 +21,22 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.logpm.distribution.dto.DistributionAddvalueDTO;
-import com.logpm.distribution.dto.DistributionReservationStocklistDTO;
 import com.logpm.distribution.dto.DistributionSignforDTO;
+import com.logpm.distribution.dto.app.DistributionAppAddvalueDTO;
 import com.logpm.distribution.entity.DistributionSignPrintEntity;
 import com.logpm.distribution.entity.DistributionSignforEntity;
 import com.logpm.distribution.excel.DistributionSignforExcel;
+import com.logpm.distribution.excel.DistributionSignforOwnExcel;
 import com.logpm.distribution.service.IDistributionReservationService;
 import com.logpm.distribution.service.IDistributionSignforService;
+import com.logpm.distribution.service.impl.DistributionAddvalueServiceImpl;
 import com.logpm.distribution.vo.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.formula.functions.T;
 import org.springblade.common.utils.GaoDeApiUtil;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.excel.util.ExcelUtil;
@@ -42,7 +45,6 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.constant.BladeConstant;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.ObjectUtil;
@@ -74,6 +76,9 @@ public class DistributionSignforController extends BladeController {
 
 	private final IDistributionReservationService reservationService;
 
+	private final DistributionAddvalueServiceImpl distributionAddvalueService;
+
+
 	/**
 	 * 签收管理 详情
 	 */
@@ -255,13 +260,10 @@ public class DistributionSignforController extends BladeController {
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "修改", notes = "传入distributionSignfor")
-	public R update(@Valid @RequestBody DistributionSignforEntity distributionSignfor) {
-		distributionSignfor.setSigneeId(AuthUtil.getUser().getUserId());
-		distributionSignfor.setSigneeName(AuthUtil.getUser().getUserName());
-		Date date = new Date();
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-		distributionSignfor.setSigningTime(sdf.format(date));
-		return R.status(distributionSignforService.updateById(distributionSignfor));
+	public R update(@Valid @RequestBody DistributionSignforDTO distributionSignfor) {
+		R r = distributionSignforService.updateSign(distributionSignfor);
+//		return R.status(distributionSignforService.updateById(distributionSignfor));
+		return r;
 	}
 
 	/**
@@ -286,19 +288,25 @@ public class DistributionSignforController extends BladeController {
 
 
 	/**
-	 * 导出数据
+	 * 待 导出数据
 	 */
 	@GetMapping("/export-distributionSignfor")
 	@ApiOperationSupport(order = 9)
 	@ApiOperation(value = "导出数据", notes = "传入distributionSignfor")
 	public void exportDistributionSignfor(@ApiIgnore @RequestParam Map<String, Object> distributionSignfor, BladeUser bladeUser, HttpServletResponse response) {
-		QueryWrapper<DistributionSignforEntity> queryWrapper = Condition.getQueryWrapper(distributionSignfor, DistributionSignforEntity.class);
-		//if (!AuthUtil.isAdministrator()) {
-		//	queryWrapper.lambda().eq(DistributionSignfor::getTenantId, bladeUser.getTenantId());
-		//}
-		queryWrapper.lambda().eq(DistributionSignforEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
-		List<DistributionSignforExcel> list = distributionSignforService.exportDistributionSignfor(queryWrapper);
-		ExcelUtil.export(response, "签收管理数据" + DateUtil.time(), "签收管理数据表", list, DistributionSignforExcel.class);
+
+		List<DistributionSignforExcel> list = distributionSignforService.exportDistributionSignfor(distributionSignfor);
+		ExcelUtil.export(response, "签收管理数据" + DateUtil.time(), "待签收管理数据表", list, DistributionSignforExcel.class);
+	}
+	/**
+	 * 已 导出数据
+	 */
+	@GetMapping("/export-distributionSignforOwn")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "导出数据", notes = "传入distributionSignfor")
+	public void exportDistributionSignforOwn(@ApiIgnore @RequestParam Map<String, Object> distributionSignfor, BladeUser bladeUser, HttpServletResponse response) {
+		List<DistributionSignforOwnExcel> list = distributionSignforService.exportDistributionSignforOwn(distributionSignfor);
+		ExcelUtil.export(response, "签收管理数据" + DateUtil.time(), "已签收管理数据表", list, DistributionSignforOwnExcel.class);
 	}
 
 
@@ -314,4 +322,69 @@ public class DistributionSignforController extends BladeController {
 	}
 
 
+
+	/**
+	 * 签收管理进行增值服务操作
+	 */
+	@GetMapping("/checkAddValuePackageList")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "PC查看增值服务列表", notes = "传入ids")
+	public IPage<DistributionAddvaluePackageVO> checkAddValuePackageList(@RequestParam Map<String, Object> addValueDTO, Query query) {
+		return distributionSignforService.checkAddValuePackageList(Condition.getPage(query),addValueDTO);
+	}
+
+
+	/**
+	 * 签收管理进行增值服务操作
+	 */
+	@PostMapping("/saveSignAddValuePackage")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "PC查看增值服务列表", notes = "传入ids")
+	public R checkAddValuePackageList(@RequestBody DistributionAppAddvalueDTO distributionAppAddvalueDTO) {
+		return distributionAddvalueService.saveAddvalueInfo(distributionAppAddvalueDTO);
+	}
+
+	/**
+	 * 签收管理进行增值服务操作
+	 */
+	@PostMapping("/updateSignAddValuePackage")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "PC查看增值服务列表", notes = "传入ids")
+	public R updateSignAddValuePackage(@RequestBody DistributionAppAddvalueDTO distributionAppAddvalueDTO) {
+		return distributionAddvalueService.updatePCAddvalueInfo(distributionAppAddvalueDTO);
+	}
+
+	/**
+	 * 签收管理进行增值服务操作
+	 */
+	@PostMapping("/cancelSignAddValuePackage")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "PC查看增值服务列表", notes = "传入ids")
+	public R cancelSignAddValuePackage(@RequestBody DistributionAppAddvalueDTO distributionAppAddvalueDTO) {
+		return distributionAddvalueService.cancelSignAddValuePackage(distributionAppAddvalueDTO);
+	}
+
+
+
+
+
+
+
+
+
+//	/**
+//	 * 签收管理 修改签收照片信息
+//	 */
+//	@PutMapping("/updatePCPicture")
+//	@ApiOperationSupport(order = 4)
+//	@ApiOperation(value = "修改签收照片信息", notes = "修改签收照片信息")
+//	public R updatePCPicture(@Valid @RequestBody DistributionSignforDTO distributionSignfor) {
+//		if(ObjectUtil.isNotEmpty(distributionSignfor.getReservationId())){
+//			return R.data(distributionSignforService.updatePicture(distributionSignfor));
+//		}else {
+//			return R.fail(3002,"参数不能为空不对！！");
+//		}
+//	}
+
+
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java

@@ -16,7 +16,6 @@
  */
 package com.logpm.distribution.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
@@ -42,7 +41,6 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.constant.BladeConstant;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.system.feign.IDictBizClient;
@@ -100,6 +98,7 @@ public class DistributionStockArticleController extends BladeController {
 		IPage<DistributionStockArticleEntity> pages = distributionStockArticleService.pageListOwe(Condition.getPage(query), distributionStockArticle);
 		return R.data(DistributionStockArticleWrapper.build().pageVO(pages));
 	}
+
 	/**
 	 * 配送在库订单 分页
 	 */
@@ -346,11 +345,11 @@ public class DistributionStockArticleController extends BladeController {
 	 */
 	@GetMapping("/export-distributionStockArticle")
 	@ApiOperationSupport(order = 9)
-	@ApiOperation(value = "导出数据", notes = "传入distributionStockArticle")
-	public void exportDistributionStockArticle(@ApiIgnore @RequestParam Map<String, Object> distributionStockArticle, BladeUser bladeUser, HttpServletResponse response) {
+	@ApiOperation(value = "导出已签订单数据", notes = "传入distributionStockArticle")
+	public void exportDistributionStockArticle(@ApiIgnore @RequestParam Map<String, Object> paramMap, BladeUser bladeUser, HttpServletResponse response) {
 
-		List<DistributionStockArticleExcel> list = distributionStockArticleService.exportDistributionStockArticle(distributionStockArticle);
-		ExcelUtil.export(response, "配送在库订单数据" + DateUtil.time(), "配送在库订单数据表", list, DistributionStockArticleExcel.class);
+		List<DistributionStockArticleExcel> list = distributionStockArticleService.exportDistributionStockArticle(paramMap);
+		ExcelUtil.export(response, "已签订单数据" + DateUtil.time(), "已签订单数据数据表", list, DistributionStockArticleExcel.class);
 	}
 
 //	/**

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockController.java

@@ -25,6 +25,7 @@ import com.logpm.distribution.entity.DistributionStockEntity;
 import com.logpm.distribution.excel.DistributionStockExcel;
 import com.logpm.distribution.service.IDistributionStockService;
 import com.logpm.distribution.vo.DistributionStockVO;
+import com.logpm.distribution.wrapper.DistributionStockWrapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -76,9 +77,9 @@ public class DistributionStockController extends BladeController  {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入distributionStock")
-	public R<IPage<DistributionStockEntity>> list(@ApiIgnore @RequestParam Map<String, Object> distributionStock, Query query) {
+	public R<IPage<DistributionStockVO>> list(@ApiIgnore @RequestParam Map<String, Object> distributionStock, Query query) {
 		IPage<DistributionStockEntity> pages = distributionStockService.page(Condition.getPage(query), Condition.getQueryWrapper(distributionStock, DistributionStockEntity.class));
-		return R.data(pages);
+		return R.data(DistributionStockWrapper.build().pageVO(pages));
 	}
 
 	/**

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockupController.java

@@ -16,13 +16,13 @@
  */
 package com.logpm.distribution.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.distribution.entity.DistributionStockupEntity;
-import com.logpm.distribution.excel.DistributionStockupExcel;
+import com.logpm.distribution.excel.DistributionCityExcel;
+import com.logpm.distribution.excel.DistributionMarketExcel;
+import com.logpm.distribution.excel.DistributionSelfExcel;
 import com.logpm.distribution.service.IDistributionStockupService;
 import com.logpm.distribution.service.IDistrilbutionBillLadingService;
 import com.logpm.distribution.vo.DistributionStockupVO;
@@ -32,15 +32,15 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
-import org.springblade.common.constant.DictBizConstant;
+import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.constant.BladeConstant;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.ObjectUtil;
@@ -63,6 +63,7 @@ import java.util.Map;
 @AllArgsConstructor
 @RequestMapping("/distributionStockup")
 @Api(value = "备货信息表", tags = "备货信息表接口")
+@Slf4j
 public class DistributionStockupController extends BladeController {
 
 	private final IDistributionStockupService distributionStockupService;
@@ -167,6 +168,34 @@ public class DistributionStockupController extends BladeController {
 		IPage<DistributionStockupEntity> pages = distributionStockupService.pageList(Condition.getPage(query),distributionStockup);
 		return R.data(DistributionStockupWrapper.build().pageVO(pages));
 	}
+
+	/**
+	 * 导出数据
+	 */
+	@GetMapping("/export-StockUp")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "导出备货数据", notes = "传入paramMap")
+	public void exportMarket(@ApiIgnore @RequestParam Map<String, Object> paramMap, HttpServletResponse response) {
+		Object typeService = paramMap.get("typeService");
+		if (Func.isEmpty(paramMap.get("typeService"))){
+			throw new ServiceException("导出备货数据失败!!!");
+		}
+		switch (typeService.toString()){
+			case "1":
+				List<DistributionMarketExcel> listMarket = distributionStockupService.exportMarket(paramMap);
+				ExcelUtil.export(response, "商配备货数据" + DateUtil.time(), "商配备货数据表", listMarket, DistributionMarketExcel.class);
+				break;
+			case "2":
+				List<DistributionCityExcel> listCity = distributionStockupService.exportCity(paramMap);
+				ExcelUtil.export(response, "市配备货数据" + DateUtil.time(), "市配备货数据表", listCity, DistributionCityExcel.class);
+				break;
+			case "3":
+				List<DistributionSelfExcel> listSelf = distributionStockupService.exportSelf(paramMap);
+				ExcelUtil.export(response, "自提备货数据" + DateUtil.time(), "自提备货数据表", listSelf, DistributionSelfExcel.class);
+				break;
+		}
+	}
+
 	/**
 	 * 备货信息表 查询备货人员信息
 	 */
@@ -247,22 +276,6 @@ public class DistributionStockupController extends BladeController {
 	}
 
 
-	/**
-	 * 导出数据
-	 */
-	@GetMapping("/export-distributionStockup")
-	@ApiOperationSupport(order = 9)
-	@ApiOperation(value = "导出数据", notes = "传入distributionStockup")
-	public void exportDistributionStockup(@ApiIgnore @RequestParam Map<String, Object> distributionStockup, BladeUser bladeUser, HttpServletResponse response) {
-		QueryWrapper<DistributionStockupEntity> queryWrapper = Condition.getQueryWrapper(distributionStockup, DistributionStockupEntity.class);
-		//if (!AuthUtil.isAdministrator()) {
-		//	queryWrapper.lambda().eq(DistributionStockup::getTenantId, bladeUser.getTenantId());
-		//}
-		queryWrapper.lambda().eq(DistributionStockupEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
-		List<DistributionStockupExcel> list = distributionStockupService.exportDistributionStockup(queryWrapper);
-		ExcelUtil.export(response, "备货信息表数据" + DateUtil.time(), "备货信息表数据表", list, DistributionStockupExcel.class);
-	}
-
 	/**
 	 * 根基备货任务查询备货任务关联的自提任务
 	 */

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistrilbutionBillLadingController.java

@@ -20,9 +20,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.logpm.distribution.dto.DistrilbutionBillLadingDTO;
 import com.logpm.distribution.entity.DistrilbutionBillLadingEntity;
+import com.logpm.distribution.excel.DistributionStockArticleExcel;
 import com.logpm.distribution.excel.DistrilbutionBillLadingExcel;
 import com.logpm.distribution.service.IDistrilbutionBillLadingService;
 import com.logpm.distribution.vo.DistrilbutionBillLadingDetailsVO;
@@ -33,7 +33,7 @@ import com.logpm.distribution.wrapper.DistrilbutionBillLadingWrapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import kotlin.Suppress;
+//import kotlin.Suppress;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.constant.DictBizConstant;
@@ -152,6 +152,18 @@ public class DistrilbutionBillLadingController extends BladeController {
 		return R.data(pages);
 	}
 
+	/**
+	 * 导出数据
+	 */
+	@GetMapping("/export-distributionBillLadingVO")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "导出提货数据", notes = "传入-distributionBillLading")
+	public void exportDistributionBillLading(@ApiIgnore @RequestParam Map<String, Object> distributionBillLading, HttpServletResponse response) {
+
+		List<DistrilbutionBillLadingExcel> list = distrilbutionBillLadingService.exportDistributionBillLading(distributionBillLading);
+		ExcelUtil.export(response, "提货数据" + DateUtil.time(), "提货数据表", list, DistrilbutionBillLadingExcel.class);
+	}
+
 	/**
 	 * 提货单 自定义分页
 	 */

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionAddvalueDTO.java

@@ -36,4 +36,6 @@ public class DistributionAddvalueDTO extends DistributionAddvalueEntity {
 	 */
 	private Long signforId;
 
+	private Long reservationId;
+
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionAddvaluePackageDTO.java

@@ -33,4 +33,6 @@ public class DistributionAddvaluePackageDTO extends DistributionAddvaluePackageE
 
 	private Integer zeroQuantity;
 
+	private Integer maxQuantity;
+
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionReservationPackageDTO.java

@@ -20,6 +20,8 @@ import com.logpm.distribution.entity.DistributionReservationPackageEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.Date;
+
 /**
  * 预约包件中间表 数据传输对象实体类
  *
@@ -30,5 +32,20 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 public class DistributionReservationPackageDTO extends DistributionReservationPackageEntity {
 	private static final long serialVersionUID = 1L;
-
+    private Long warehouseId;
+    private String waybillNumber;
+    private String serviceNumber;
+    private String orderCode;
+    private String warehouseName;
+    private String orderPackageCode;
+    private String sendWarehouseName;
+    private String acceptWarehouseName;
+    private Date reservationDate;
+    private String trainNumber;
+    private String firsts;
+    private String second;
+    private String thirdProduct;
+    private String materialName;
+    private String trayCode;
+    private String positionCode;
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionReservationStockarticleDTO.java

@@ -31,4 +31,14 @@ import lombok.EqualsAndHashCode;
 public class DistributionReservationStockarticleDTO extends DistributionReservationStockarticleEntity {
 	private static final long serialVersionUID = 1L;
 
+	private String waybillNumber;
+	private String orderCode;
+	private String mallName;
+	private String storeName;
+	private String descriptionGoods;
+	private String brand;
+	private String consigneeUnit;
+	private String resource;
+	private String deliveryType;
+
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionReservationStocklistDTO.java

@@ -30,5 +30,16 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 public class DistributionReservationStocklistDTO extends DistributionReservationStocklistEntity {
 	private static final long serialVersionUID = 1L;
+	private String  incomingBatch;
+	private String  orderCode;
+	private String  sku;
+	private String  marketName;
+	private String  cargoNumber;
+	private String  cargoUnit;
+	private String  descriptionGoods;
+	private String  brandName;
+	private String  trayCode;
+	private String  positionCode;
+	private String  stockupArea;
 
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionRetentionScanDTO.java

@@ -0,0 +1,71 @@
+package com.logpm.distribution.dto;
+
+
+import lombok.Data;
+
+/**
+ * 滞留扫描对象
+ */
+@Data
+//@EqualsAndHashCode(callSuper = true)
+public class DistributionRetentionScanDTO {
+
+    /**
+	 * 预约Id
+	 */
+	private Long reservationId;
+
+	/**
+	 * 预约Id
+	 */
+	private String reservationCode;
+
+	/**
+	 * 订单Id
+	 */
+	private Long orderId;
+
+	/**
+	 * 订单自编码
+	 */
+	private Long orderCode;
+
+	/**
+	 * 订单Id
+	 */
+	private Long inventoryId;
+
+
+
+	/**
+	 * 物料编码
+	 */
+	private String materialNumber;
+
+	/**
+	 * 物料名称
+	 */
+	private String materialName;
+
+	/**
+	 * 包件ID
+	 */
+	private Long orderPackageId;
+
+	/**
+	 * 包条码
+	 */
+	private Long orderPackageCode;
+
+	/**
+	 * 滞留数量
+	 */
+	private Long retentionQuantity;
+
+	/**
+     * 类型
+	 */
+	private Integer conditions;
+
+
+}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionSigndetailDTO.java

@@ -21,6 +21,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.List;
+
 /**
  * 签收明细 数据传输对象实体类
  *
@@ -36,6 +38,12 @@ public class DistributionSigndetailDTO extends DistributionSigndetailEntity {
 	 */
 	@ApiModelProperty(value = "客户名称")
 	private String consignee;
+
+	/**
+	 * 客户名称
+	 */
+	@ApiModelProperty(value = "客户名称")
+	private List<String> ids;
 	/**
 	 * 客户Id
 	 */

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/DistrilbutionloadingscanDTO.java

@@ -45,6 +45,12 @@ public class DistrilbutionloadingscanDTO {
 	@ApiModelProperty(value = "预约Id")
 	private Long orderId;
 
+	/**
+	 * 订单自编码
+	 */
+	@ApiModelProperty(value = "预约Id")
+	private String orderCode;
+
 
 //	/**
 //	 * 扫描类型
@@ -88,6 +94,13 @@ public class DistrilbutionloadingscanDTO {
 //	@NotEmpty(message = "扫描物品不能为空")
 	private Integer type;
 
+	/**
+	 * 滞留扫描类型
+	 */
+	@ApiModelProperty(value = "扫描物品(1-包条,2-订单,3-托盘)")
+//	@NotEmpty(message = "扫描物品不能为空")
+	private Integer retentionType;
+
 	/**
 	 * 是否库存品
 	 */

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionCityExcel.java

@@ -28,7 +28,7 @@ import java.util.Date;
 
 
 /**
- * 备货信息表 Excel实体类
+ * 市配备货
  *
  * @author cyz
  * @since 2023-06-15
@@ -37,117 +37,53 @@ import java.util.Date;
 @ColumnWidth(25)
 @HeadRowHeight(20)
 @ContentRowHeight(18)
-public class DistributionStockupExcel implements Serializable {
+public class DistributionCityExcel implements Serializable {
 
 	private static final long serialVersionUID = 1L;
 
-	/**
-	 * 租户号
-	 */
 	@ColumnWidth(20)
-	@ExcelProperty("租户号")
-	private Long tenantId;
-	/**
-	 * 是否已删除
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("是否已删除")
-	private Integer isDeleted;
-	/**
-	 * 备货时间
-	 */
+	@ExcelProperty("备货编码")
+	private String stockupCode;
+
 	@ColumnWidth(20)
 	@ExcelProperty("备货时间")
 	private Date stockupDate;
-	/**
-	 * 备货人
-	 */
+
 	@ColumnWidth(20)
-	@ExcelProperty("备货人")
-	private String stockupUser;
-	/**
-	 * 备货状态
-	 */
+	@ExcelProperty("出库时间")
+	private Date outboundDate;
+
 	@ColumnWidth(20)
 	@ExcelProperty("备货状态")
 	private String stockupStatus;
-	/**
-	 * 备货区
-	 */
+
 	@ColumnWidth(20)
 	@ExcelProperty("备货区")
 	private String stockupArea;
-	/**
-	 * 指派状态;1-未指派、2-已指派
-	 */
+
 	@ColumnWidth(20)
 	@ExcelProperty("指派状态;1-未指派、2-已指派")
 	private String assignStatus;
-	/**
-	 * 备货库位
-	 */
+
 	@ColumnWidth(20)
-	@ExcelProperty("备货库位")
+	@ExcelProperty("所在库位")
 	private String stockipAllocation;
-	/**
-	 * 预留1
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留1")
-	private String reserve1;
-	/**
-	 * 预留2
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留2")
-	private String reserve2;
-	/**
-	 * 预留3
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留3")
-	private String reserve3;
-	/**
-	 * 预留4
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留4")
-	private String reserve4;
-	/**
-	 * 预留5
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留5")
-	private String reserve5;
-	/**
-	 * 备货区编号
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("备货区编号")
-	private Long goodsAreaId;
-	/**
-	 * 叉车司机
-	 */
+
 	@ColumnWidth(20)
-	@ExcelProperty("叉车司机")
+	@ExcelProperty("备货人员")
 	private Long forklift;
-	/**
-	 * 装卸班组
-	 */
+
 	@ColumnWidth(20)
-	@ExcelProperty("装卸班组")
-	private Long loader;
-	/**
-	 * 确认完成备货时间
-	 */
+	@ExcelProperty("所在托盘")
+	private String pallet;
+
 	@ColumnWidth(20)
 	@ExcelProperty("确认完成备货时间")
 	private Date fixTime;
-	/**
-	 * 指派时间
-	 */
+
 	@ColumnWidth(20)
 	@ExcelProperty("指派时间")
 	private Date assignTime;
 
+
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryListExcel.java

@@ -41,71 +41,37 @@ public class DistributionDeliveryListExcel implements Serializable {
 
 	private static final long serialVersionUID = 1L;
 
+
 	/**
-	 * 租户号
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("租户号")
-	private String tenantId;
-	/**
-	 * 是否已删除
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("是否已删除")
-	private Integer isDeleted;
-	/**
-	 * 预留1
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留1")
-	private String reserve1;
-	/**
-	 * 预留2
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留2")
-	private String reserve2;
-	/**
-	 * 预留3
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留3")
-	private String reserve3;
-	/**
-	 * 预留4
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留4")
-	private String reserve4;
-	/**
-	 * 预留5
+	 * 车次
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("预留5")
-	private String reserve5;
+	@ExcelProperty("车次")
+	private String trainNumber;
 	/**
 	 * 车次
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("车次")
-	private String trainNumber;
+	@ExcelProperty("配送日期")
+	private String taskTime;
+
 	/**
 	 * 仓库
 	 */
 	@ColumnWidth(20)
 	@ExcelProperty("仓库")
-	private String warehouse;
+	private String warehouseName;
 	/**
 	 * 配送类型;1-自主配送,2-三方配送
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("配送类型;1-自主配送,2-三方配送")
+	@ExcelProperty("配送类型")
 	private String type;
 	/**
 	 * 配送种类;1-市配,2-商配
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("配送种类;1-市配,2-商配")
+	@ExcelProperty("配送种类")
 	private String kind;
 	/**
 	 * 配送车辆
@@ -123,13 +89,13 @@ public class DistributionDeliveryListExcel implements Serializable {
 	 * 配送公司;1-货拉拉,2-京东
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("配送公司;1-货拉拉,2-京东")
+	@ExcelProperty("配送公司")
 	private String distributionCompany;
 	/**
 	 * 配送状态;1-配送中,2-已完成
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("配送状态;1-配送中,2-已完成")
+	@ExcelProperty("配送状态")
 	private String state;
 	/**
 	 * 配送客户数
@@ -143,12 +109,12 @@ public class DistributionDeliveryListExcel implements Serializable {
 	@ColumnWidth(20)
 	@ExcelProperty("配送价格")
 	private BigDecimal price;
-	/**
-	 * 增值服务表id
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("增值服务表id")
-	private Integer addedServicesId;
+//	/**
+//	 * 增值服务表id
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("增值服务表id")
+//	private Integer addedServicesId;
 	/**
 	 * 订单总数
 	 */
@@ -159,8 +125,14 @@ public class DistributionDeliveryListExcel implements Serializable {
 	 * 配送件数
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("配送件数")
+	@ExcelProperty("配送包件数")
 	private Integer deliveryNumber;
+	/**
+	 * 配送件数
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("配送库存品数")
+	private Integer inventoryNub;
 	/**
 	 * 扫描件数
 	 */
@@ -173,11 +145,11 @@ public class DistributionDeliveryListExcel implements Serializable {
 	@ColumnWidth(20)
 	@ExcelProperty("装卸班组")
 	private String loadingTeam;
-	/**
-	 * 预约表id
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预约表id")
-	private String reservationId;
+//	/**
+//	 * 预约表id
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("预约表id")
+//	private String reservationId;
 
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionMarketExcel.java

@@ -0,0 +1,89 @@
+/*
+ *      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.distribution.excel;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 商配备货
+ *
+ * @author cyz
+ * @since 2023-06-15
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class DistributionMarketExcel implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@ColumnWidth(20)
+	@ExcelProperty("备货编码")
+	private String stockupCode;
+
+	@ColumnWidth(20)
+	@ExcelProperty("备货时间")
+	private Date stockupDate;
+
+	@ColumnWidth(20)
+	@ExcelProperty("出库时间")
+	private Date outboundDate;
+
+	@ColumnWidth(20)
+	@ExcelProperty("备货状态")
+	private String stockupStatus;
+
+	@ColumnWidth(20)
+	@ExcelProperty("备货区")
+	private String stockupArea;
+
+	@ColumnWidth(20)
+	@ExcelProperty("指派状态;1-未指派、2-已指派")
+	private String assignStatus;
+
+	@ColumnWidth(20)
+	@ExcelProperty("所在库位")
+	private String stockipAllocation;
+
+	@ColumnWidth(20)
+	@ExcelProperty("备货人员")
+	private Long forklift;
+
+	@ColumnWidth(20)
+	@ExcelProperty("所在托盘")
+	private String pallet;
+
+	@ColumnWidth(20)
+	@ExcelProperty("确认完成备货时间")
+	private Date fixTime;
+
+	@ColumnWidth(20)
+	@ExcelProperty("指派时间")
+	private Date assignTime;
+
+
+}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionParcelListExcel.java

@@ -40,119 +40,47 @@ public class DistributionParcelListExcel implements Serializable {
 
 	private static final long serialVersionUID = 1L;
 
-	/**
-	 * 租户号
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("租户号")
-	private String tenantId;
-	/**
-	 * 是否已删除
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("是否已删除")
-	private Integer isDeleted;
-	/**
-	 * 预留1
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留1")
-	private String reserve1;
-	/**
-	 * 预留2
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留2")
-	private String reserve2;
-	/**
-	 * 预留3
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留3")
-	private String reserve3;
-	/**
-	 * 预留4
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留4")
-	private String reserve4;
-	/**
-	 * 预留5
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留5")
-	private String reserve5;
-	/**
-	 * 仓库
-	 */
 	@ColumnWidth(20)
 	@ExcelProperty("仓库")
 	private String warehouse;
-	/**
-	 * 状态
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("状态")
-	private Integer conditions;
-	/**
-	 * 包条码
-	 */
+
 	@ColumnWidth(20)
 	@ExcelProperty("包条码")
-	private String packetBarCode;
-	/**
-	 * 货位信息
-	 */
+	private String orderPackageCode;
+
 	@ColumnWidth(20)
 	@ExcelProperty("货位信息")
 	private String goodsAllocation;
-	/**
-	 * 所在托盘
-	 */
+
 	@ColumnWidth(20)
 	@ExcelProperty("所在托盘")
 	private String pallet;
-	/**
-	 * 一级品
-	 */
+
 	@ColumnWidth(20)
 	@ExcelProperty("一级品")
 	private String firsts;
-	/**
-	 * 二级品
-	 */
+
 	@ColumnWidth(20)
 	@ExcelProperty("二级品")
 	private String second;
-	/**
-	 * 三级品
-	 */
+
 	@ColumnWidth(20)
 	@ExcelProperty("三级品")
 	private String thirdProduct;
-	/**
-	 * 物料
-	 */
+
 	@ColumnWidth(20)
-	@ExcelProperty("物料")
-	private String material;
-	/**
-	 * 数量
-	 */
+	@ExcelProperty("上架状态")
+	private String orderPackageGroundingStatus;
+
 	@ColumnWidth(20)
 	@ExcelProperty("数量")
-	private Integer quantity;
-	/**
-	 * 车次号
-	 */
+	private String quantity;
+
 	@ColumnWidth(20)
 	@ExcelProperty("车次号")
 	private String trainNumber;
-	/**
-	 * 在库订单ID
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("在库订单ID")
-	private String stockArticleId;
 
+	@ColumnWidth(20)
+	@ExcelProperty("订单自编号")
+	private String orderCode;
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionReservationExcel.java

@@ -42,24 +42,44 @@ public class DistributionReservationExcel implements Serializable {
 
 	private static final long serialVersionUID = 1L;
 
+
+	/**
+	 * 订单自编号;订单自编号，关联订单表
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预约单编号")
+	private String reservationCode;
+	/**
+	 * 订单自编号;订单自编号，关联订单表
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("订单号")
+	private String orderCode;
 	/**
-	 * 租户号
+	 * 订单自编号;订单自编号，关联订单表
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("租户号")
-	private String tenantId;
+	@ExcelProperty("服务号")
+	private String serviceNumber;
 	/**
-	 * 是否已删除
+	 * 订单自编号;订单自编号，关联订单表
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("是否已删除")
-	private Integer isDeleted;
+	@ExcelProperty("仓库")
+	private String warehouseName;
 	/**
 	 * 订单自编号;订单自编号，关联订单表
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("订单自编号;订单自编号，关联订单表")
-	private String orderId;
+	@ExcelProperty("商场")
+	private String mallName;
+	/**
+	 * 订单自编号;订单自编号，关联订单表
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("门店")
+	private String storeName;
+
 	/**
 	 * 收货人
 	 */
@@ -78,18 +98,43 @@ public class DistributionReservationExcel implements Serializable {
 	@ColumnWidth(20)
 	@ExcelProperty("预约时间")
 	private Date reservationData;
+	/**
+	 * 预约时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预约包件数")
+	private Integer reservationNumber;
+	/**
+	 * 预约时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预约库存品数")
+	private Integer stockListNumber;
+	/**
+	 * 预约时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("待收货款")
+	private BigDecimal dueSincere;
+
+	/**
+	 * 预约时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("时段")
+	private String periodTimeName;
 	/**
 	 * 服务类型;预约服务类型；1-上楼、2-超区、3-拆样、4-平移、5-分拣、6-搬运、7-返货；
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("服务类型;预约服务类型；1-上楼、2-超区、3-拆样、4-平移、5-分拣、6-搬运、7-返货；")
-	private String serveType;
+	@ExcelProperty("服务类型")
+	private String serveTypeName;
 	/**
 	 * 配送方式;预约添加送货方式；1-送货(商配的唯一方式)、2-送货上楼、3-送装一体、4-装
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("配送方式;预约添加送货方式；1-送货(商配的唯一方式)、2-送货上楼、3-送装一体、4-装")
-	private String deliveryType;
+	@ExcelProperty("配送方式")
+	private String deliveryTypeName;
 	/**
 	 * 到付运费
 	 */
@@ -107,66 +152,48 @@ public class DistributionReservationExcel implements Serializable {
 	 */
 	@ColumnWidth(20)
 	@ExcelProperty("代付运费")
-	private String replaceFee;
+	private BigDecimal replaceFee;
 	/**
 	 * 收件人电话
 	 */
 	@ColumnWidth(20)
 	@ExcelProperty("收件人电话")
 	private String deliveryPhone;
+//	/**
+//	 * 预约信息状态;预约列表信息状态；1-待确认、2-已确认
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("预约信息状态;预约列表信息状态；1-待确认、2-已确认")
+//	private String resvervationStatus;
 	/**
 	 * 预约信息状态;预约列表信息状态；1-待确认、2-已确认
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("预约信息状态;预约列表信息状态；1-待确认、2-已确认")
-	private String resvervationStatus;
-	/**
-	 * 订单来源
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("订单来源")
-	private String orderSource;
+	@ExcelProperty("预约信息状态")
+	private String resvervationStatusName;
+//	/**
+//	 * 订单来源
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("订单来源")
+//	private String orderSource;
+//	/**
+//	 * 备货状态;备货状态；1-未备货、2-待备货、3-已备货
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("备货状态")
+//	private String stockupStatus;
 	/**
 	 * 备货状态;备货状态；1-未备货、2-待备货、3-已备货
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("备货状态;备货状态；1-未备货、2-待备货、3-已备货")
-	private String stockupStatus;
-	/**
-	 * 备货区编号
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("备货区编号")
-	private String goodsShelfId;
-	/**
-	 * 预留1
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留1")
-	private String reserve1;
-	/**
-	 * 预留2
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留2")
-	private String reserve2;
-	/**
-	 * 预留3
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留3")
-	private String reserve3;
-	/**
-	 * 预留4
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留4")
-	private String reserve4;
-	/**
-	 * 预留5
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留5")
-	private String reserve5;
+	@ExcelProperty("备货状态")
+	private String stockupStatusName;
+//	/**
+//	 * 备货区编号
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("备货区编号")
+//	private String goodsShelfId;
 
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionReservationPackageExcel.java

@@ -24,6 +24,7 @@ import com.alibaba.excel.annotation.write.style.HeadRowHeight;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 
 /**
@@ -40,65 +41,145 @@ public class DistributionReservationPackageExcel implements Serializable {
 
 	private static final long serialVersionUID = 1L;
 
+
 	/**
-	 * 租户号
+	 * 预约编号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("租户号")
-	private String tenantId;
+	@ExcelProperty("预约编号")
+	private String reservationCode;
 	/**
-	 * 是否已删除
+	 * 包件编号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("是否已删除")
-	private Integer isDeleted;
+	@ExcelProperty("预约时间")
+	private Date reservationDate;
+
 	/**
-	 * 预约编号
+	 * 订单编号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("预约编号")
-	private String reservationId;
+	@ExcelProperty("服务类型")
+	private String deliveryType;
 	/**
-	 * 包件编号
+	 * 订单编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("收货人")
+	private String consignee;
+	/**
+	 * 订单编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("手机号码")
+	private String deliveryPhone;
+	/**
+	 * 订单编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("收货地址")
+	private String deliveryAddress;
+	/**
+	 * 订单编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("运单号")
+	private String waybillNumber;
+	/**
+	 * 订单编号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("包件编号")
-	private String parceListId;
+	@ExcelProperty("服务号")
+	private String serviceNumber;
 	/**
-	 * 预留1
+	 * 订单编号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("预留1")
-	private String reserve1;
+	@ExcelProperty("订单自编号")
+	private String orderCode;
 	/**
-	 * 预留2
+	 * 订单编号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("预留2")
-	private String reserve2;
+	@ExcelProperty("仓库")
+	private String warehouseName;
 	/**
-	 * 预留3
+	 * 订单编号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("预留3")
-	private String reserve3;
+	@ExcelProperty("包条码")
+	private String orderPackageCode;
 	/**
-	 * 预留4
+	 * 订单编号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("预留4")
-	private String reserve4;
+	@ExcelProperty("发站仓")
+	private String sendWarehouseName;
 	/**
-	 * 预留5
+	 * 订单编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("目的仓")
+	private String acceptWarehouseName;
+	/**
+	 * 订单编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("入库时间")
+	private String warehouseEntryTimeEnd;
+	/**
+	 * 订单编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("车次号")
+	private String trainNumber;
+	/**
+	 * 订单编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("一级品")
+	private Long firsts;
+	/**
+	 * 订单编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("二级品")
+	private Long second;
+	/**
+	 * 订单编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("三级品")
+	private Long thirdProduct;
+	/**
+	 * 订单编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("物料名称")
+	private Long materialName;
+	/**
+	 * 订单编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("数量")
+	private Long quantity;
+//	/**
+//	 * 订单编号
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("计划数量")
+//	private Long stockArticle;
+	/**
+	 * 订单编号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("预留5")
-	private String reserve5;
+	@ExcelProperty("货位数量")
+	private Long positionCode;
 	/**
 	 * 订单编号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("订单编号")
-	private Long stockArticle;
+	@ExcelProperty("所在托盘")
+	private Long trayCode;
 
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionReservationStockarticleExcel.java

@@ -24,6 +24,7 @@ import com.alibaba.excel.annotation.write.style.HeadRowHeight;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 
 /**
@@ -40,65 +41,100 @@ public class DistributionReservationStockarticleExcel implements Serializable {
 
 	private static final long serialVersionUID = 1L;
 
+
+	/**
+	 * 预约编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预约单号")
+	private String reservationCode;
+	/**
+	 * 预约编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("运单号")
+	private String waybillNumber;
+	/**
+	 * 预约编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("订单自编号")
+	private String orderCode;
+	/**
+	 * 预约编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("商场名称")
+	private String mallName;
+
 	/**
-	 * 租户号
+	 * 预约编号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("租户号")
-	private String tenantId;
+	@ExcelProperty("门店名称")
+	private String storeName;
 	/**
-	 * 是否已删除
+	 * 预约编号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("是否已删除")
-	private Integer isDeleted;
+	@ExcelProperty("货物名称")
+	private String descriptionGoods;
 	/**
 	 * 预约编号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("预约编号")
-	private String reservationId;
+	@ExcelProperty("品牌")
+	private String brand;
+	/**
+	 * 预约编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("收货单位")
+	private String consigneeUnit;
 	/**
 	 * 订单编号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("订单编号")
-	private String stockarticleId;
+	@ExcelProperty("订单来源")
+	private String resource;
+
 	/**
 	 * 预约数量
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("预约数量")
-	private String reservationNum;
+	@ExcelProperty("服务类型")
+	private String deliveryType;
 	/**
-	 * 预留1
+	 * 预约数量
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("预留1")
-	private String reserve1;
+	@ExcelProperty("预约时间	")
+	private Date reservationDate;
 	/**
-	 * 预留2
+	 * 预约数量
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("预留2")
-	private String reserve2;
+	@ExcelProperty("收货人")
+	private String consignee;
 	/**
-	 * 预留3
+	 * 预约数量
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("预留3")
-	private String reserve3;
+	@ExcelProperty("手机号")
+	private String deliveryPhone;
 	/**
-	 * 预留4
+	 * 预约数量
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("预留4")
-	private String reserve4;
+	@ExcelProperty("收货地址")
+	private String deliveryAddress;
 	/**
-	 * 预留5
+	 * 预约数量
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("预留5")
-	private String reserve5;
+	@ExcelProperty("包件数量")
+	private String reservationNum;
+
+
 
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionReservationStocklistExcel.java

@@ -24,6 +24,7 @@ import com.alibaba.excel.annotation.write.style.HeadRowHeight;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 
 /**
@@ -40,65 +41,132 @@ public class DistributionReservationStocklistExcel implements Serializable {
 
 	private static final long serialVersionUID = 1L;
 
+
 	/**
-	 * 租户号
+	 * 预约编号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("租户号")
-	private String tenantId;
+	@ExcelProperty("预约编号")
+	private String reservationCode;
 	/**
-	 * 是否已删除
+	 * 包件编号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("是否已删除")
-	private Integer isDeleted;
+	@ExcelProperty("预约时间")
+	private Date reservationDate;
+
 	/**
-	 * 预约编号
+	 * 订单编号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("预约编号")
-	private String reservationId;
+	@ExcelProperty("服务类型")
+	private String deliveryType;
+	/**
+	 * 订单编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("收货人")
+	private String consignee;
+	/**
+	 * 订单编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("手机号码")
+	private String deliveryPhone;
+	/**
+	 * 订单编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("收货地址")
+	private String deliveryAddress;
+
+//	/**
+//	 * 订单编号
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("服务号")
+//	private String serviceNumber;
+
+	/**
+	 * 订单编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("订单自编号")
+	private String orderCode;
+
+	/**
+	 * 订单编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("SKU")
+	private String sku;
 	/**
-	 * 库存编号
+	 * 订单编号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("库存编号")
-	private String stocklistId;
+	@ExcelProperty("商场名称")
+	private String marketName;
 	/**
-	 * 预约数量
+	 * 订单编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("物料编码")
+	private String cargoNumber;
+	/**
+	 * 订单编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("单位")
+	private String cargoUnit;
+	/**
+	 * 订单编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("物料名称")
+	private String descriptionGoods;
+	/**
+	 * 订单编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("品牌")
+	private String brandName;
+
+	/**
+	 * 订单编号
 	 */
 	@ColumnWidth(20)
 	@ExcelProperty("预约数量")
 	private String reservationNum;
 	/**
-	 * 预留1
+	 * 订单编号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("预留1")
-	private String reserve1;
+	@ExcelProperty("备货数量")
+	private String stockNumber;
 	/**
-	 * 预留2
+	 * 订单编号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("预留2")
-	private String reserve2;
+	@ExcelProperty("已备件数")
+	private String realityNum;
 	/**
-	 * 预留3
+	 * 订单编号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("预留3")
-	private String reserve3;
+	@ExcelProperty("备货区")
+	private String stockupArea;
 	/**
-	 * 预留4
+	 * 订单编号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("预留4")
-	private String reserve4;
+	@ExcelProperty("托盘码")
+	private String trayCode;
 	/**
-	 * 预留5
+	 * 订单编号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("预留5")
-	private String reserve5;
+	@ExcelProperty("库位信息")
+	private String positionCode;
+
 
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionSelfExcel.java

@@ -0,0 +1,89 @@
+/*
+ *      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.distribution.excel;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 自提备货
+ *
+ * @author cyz
+ * @since 2023-06-15
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class DistributionSelfExcel implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@ColumnWidth(20)
+	@ExcelProperty("备货编码")
+	private String stockupCode;
+
+	@ColumnWidth(20)
+	@ExcelProperty("备货时间")
+	private Date stockupDate;
+
+	@ColumnWidth(20)
+	@ExcelProperty("出库时间")
+	private Date outboundDate;
+
+	@ColumnWidth(20)
+	@ExcelProperty("备货状态")
+	private String stockupStatus;
+
+	@ColumnWidth(20)
+	@ExcelProperty("备货区")
+	private String stockupArea;
+
+	@ColumnWidth(20)
+	@ExcelProperty("指派状态;1-未指派、2-已指派")
+	private String assignStatus;
+
+	@ColumnWidth(20)
+	@ExcelProperty("所在库位")
+	private String stockipAllocation;
+
+	@ColumnWidth(20)
+	@ExcelProperty("备货人员")
+	private Long forklift;
+
+	@ColumnWidth(20)
+	@ExcelProperty("所在托盘")
+	private String pallet;
+
+	@ColumnWidth(20)
+	@ExcelProperty("确认完成备货时间")
+	private Date fixTime;
+
+	@ColumnWidth(20)
+	@ExcelProperty("指派时间")
+	private Date assignTime;
+
+
+}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionSigndetailExcel.java

@@ -21,6 +21,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -41,132 +42,90 @@ public class DistributionSigndetailExcel implements Serializable {
 
 	private static final long serialVersionUID = 1L;
 
-	/**
-	 * 租户号
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("租户号")
-	private String tenantId;
-	/**
-	 * 是否已删除
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("是否已删除")
-	private Integer isDeleted;
-	/**
-	 * 预留1
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留1")
-	private String reserve1;
-	/**
-	 * 预留2
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留2")
-	private String reserve2;
-	/**
-	 * 预留3
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留3")
-	private String reserve3;
-	/**
-	 * 预留4
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留4")
-	private String reserve4;
-	/**
-	 * 预留5
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留5")
-	private String reserve5;
-	/**
-	 * 签收表id
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("签收表id")
-	private Integer masterId;
 	/**
 	 * 服务号
 	 */
 	@ColumnWidth(20)
 	@ExcelProperty("服务号")
 	private String serviceNumber;
-	/**
-	 * 配送/自提单号
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("配送/自提单号")
-	private String deliveryNumber;
+
 	/**
 	 * 配送车次号
 	 */
 	@ColumnWidth(20)
 	@ExcelProperty("配送车次号")
 	private String trainNumber;
+
 	/**
-	 * 服务类型
+	 * 配送/自提单号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("服务类型")
-	private String serveType;
+	@ExcelProperty("配送类型")
+	private String deliveryNumber;
+
 	/**
-	 * 订单自编号
+	 * 订单自提单号
 	 */
 	@ColumnWidth(20)
 	@ExcelProperty("订单自编号")
-	private String orderId;
+	private String orderCode;
 	/**
 	 * 商城名称
 	 */
 	@ColumnWidth(20)
 	@ExcelProperty("商城名称")
 	private String mallName;
-	/**
-	 * 货物名称
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("货物名称")
-	private String goodsName;
 	/**
 	 * 仓库
 	 */
 	@ColumnWidth(20)
 	@ExcelProperty("仓库")
-	private String warehouse;
+	private String warehouseName;
+
 	/**
 	 * 入库时间
 	 */
 	@ColumnWidth(20)
 	@ExcelProperty("入库时间")
-	private Date warehousingTime;
+	private String warehouseEntryTime;
+
 	/**
-	 * 备货时间
+	 * 司机签收时间
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("备货时间")
-	private Date leadTime;
+	@ExcelProperty("司机签收时间")
+	private String sjsigningTime;
+	/**
+	 * 文员签收时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("文员签收时间")
+	private String signingTime;
+
+
 	/**
 	 * 在库时长;(天)
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("在库时长;(天)")
-	private Integer durationInStock;
+	@ExcelProperty("在库时长(天)")
+	private String storeTime;
+
+
 	/**
-	 * 签收件数
+	 * 订单总件数
 	 */
+	@ApiModelProperty(value = "订单总件数")
 	@ColumnWidth(20)
-	@ExcelProperty("签收件数")
-	private Integer signedNumber;
+	@ExcelProperty("订单总件数")
+	private Integer totalNumber;
+
+
 	/**
-	 * 是否齐套
+	 * 签收件数
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("是否齐套")
-	private String isKitting;
+	@ExcelProperty("签收件数")
+	private Integer signfornum;
 	/**
 	 * 品牌
 	 */
@@ -174,4 +133,71 @@ public class DistributionSigndetailExcel implements Serializable {
 	@ExcelProperty("品牌")
 	private String brand;
 
+	/**
+	 * 服务类型
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("顾客名称")
+	private String consignee;
+	/**
+	 * 服务类型
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("客户电话")
+	private String deliveryPhone;
+
+	/**
+	 * 服务类型
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("客户地址")
+	private String deliveryAddress;
+
+
+
+
+//	/**
+//	 * 配送/自提单号
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("配送/自提单号")
+//	private String deliveryNumber;
+//
+//	/**
+//	 * 服务类型
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("服务类型")
+//	private String serveType;
+//
+//
+//	/**
+//	 * 货物名称
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("货物名称")
+//	private String goodsName;
+//	/**
+//	 * 仓库
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("仓库")
+//	private String warehouse;
+//
+//	/**
+//	 * 备货时间
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("备货时间")
+//	private Date leadTime;
+//
+//
+//	/**
+//	 * 是否齐套
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("是否齐套")
+//	private String isKitting;
+
+
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionSignforExcel.java

@@ -41,66 +41,37 @@ public class DistributionSignforExcel implements Serializable {
 
 	private static final long serialVersionUID = 1L;
 
+
 	/**
-	 * 租户号
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("租户号")
-	private String tenantId;
-	/**
-	 * 是否已删除
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("是否已删除")
-	private Integer isDeleted;
-	/**
-	 * 预留1
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留1")
-	private String reserve1;
-	/**
-	 * 预留2
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留2")
-	private String reserve2;
-	/**
-	 * 预留3
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留3")
-	private String reserve3;
-	/**
-	 * 预留4
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留4")
-	private String reserve4;
-	/**
-	 * 预留5
+	 * 配送车次
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("预留5")
-	private String reserve5;
+	@ExcelProperty("配送车次")
+	private String trainNumber;
 	/**
 	 * 订单自编号;订单关联id
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("订单自编号;订单关联id")
-	private String orderId;
+	@ExcelProperty("订单自编号")
+	private String orderCode;
 	/**
 	 * 预约关联Id;预约关联id
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("预约关联Id;预约关联id")
-	private Long reservationId;
+	@ExcelProperty("服务类型")
+	private String deliveryTypeName;
 	/**
 	 * 收货人
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("收货人")
+	@ExcelProperty("客户名称")
 	private String consignee;
+	/**
+	 * 收货人
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("客户电话")
+	private String deliveryPhone;
 	/**
 	 * 收货地址
 	 */
@@ -108,35 +79,49 @@ public class DistributionSignforExcel implements Serializable {
 	@ExcelProperty("收货地址")
 	private String deliveryAddress;
 	/**
-	 * 服务类型
+	 * 配送仓库
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("服务类型")
-	private String serveType;
+	@ExcelProperty("配送仓库")
+	private String warehouseName;
 	/**
 	 * 配送仓库
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("配送仓库")
-	private String distributingWarehouse;
+	@ExcelProperty("商城名称")
+	private String mallName;
 	/**
-	 * 配送车次
+	 * 配送仓库
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("配送车次")
-	private String trainNumber;
+	@ExcelProperty("门店名称")
+	private String storeName;
 	/**
-	 * 订单总数
+	 * 服务类型
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("订单总数")
-	private Integer orderTotal;
+	@ExcelProperty("配送服务类型")
+	private String deliveryWayName;
 	/**
-	 * 总件数
+	 * 服务类型
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("总件数")
-	private Integer total;
+	@ExcelProperty("装车时间")
+	private String deliveryTime;
+
+
+	/**
+	 * 订单总数
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("配送件数")
+	private Integer reservationNum;
+//	/**
+//	 * 总件数
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("总件数")
+//	private Integer orderTotal;
 	/**
 	 * 装车件数
 	 */
@@ -149,65 +134,65 @@ public class DistributionSignforExcel implements Serializable {
 	@ColumnWidth(20)
 	@ExcelProperty("签收数")
 	private Integer receivedQuantity;
-	/**
-	 * 送货司机
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("送货司机")
-	private String deliveryDriver;
-	/**
-	 * 送货司机手机号
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("送货司机手机号")
-	private String deliveryDriverPhone;
+//	/**
+//	 * 送货司机
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("送货司机")
+//	private String deliveryDriver;
+//	/**
+//	 * 送货司机手机号
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("送货司机手机号")
+//	private String deliveryDriverPhone;
 	/**
 	 * 签收时间
 	 */
 	@ColumnWidth(20)
 	@ExcelProperty("签收时间")
-	private Date signingTime;
-	/**
-	 * 签收人
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("签收人")
-	private String signee;
+	private Date sjsigningTime;
+//	/**
+//	 * 签收人
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("签收人")
+//	private String signee;
 	/**
 	 * 签收状态;1-未签收,2-司机签收,3-文员签收
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("签收状态;1-未签收,2-司机签收,3-文员签收")
-	private String signingStatus;
+	@ExcelProperty("司机签收状态")
+	private String driverSigningName;
 	/**
 	 * 签收类型;1-签收,2-代签收
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("签收类型;1-签收,2-代签收")
-	private String signingType;
-	/**
-	 * 文员复核图片
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("文员复核图片")
-	private String clerkSignPictures;
-	/**
-	 * 司机签收图片
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("司机签收图片")
-	private String deliverySignPictures;
-	/**
-	 * 服务号
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("服务号")
-	private String serviceNumber;
-	/**
-	 * 备注
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("备注")
-	private String notes;
+	@ExcelProperty("文员审核状态")
+	private String signingStatusName;
+//	/**
+//	 * 文员复核图片
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("文员复核图片")
+//	private String clerkSignPictures;
+//	/**
+//	 * 司机签收图片
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("司机签收图片")
+//	private String deliverySignPictures;
+//	/**
+//	 * 服务号
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("服务号")
+//	private String serviceNumber;
+//	/**
+//	 * 备注
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("备注")
+//	private String notes;
 
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionSignforOwnExcel.java

@@ -0,0 +1,419 @@
+/*
+ *      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.distribution.excel;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * 签收管理 Excel实体类
+ *
+ * @author lmy
+ * @since 2023-06-13
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class DistributionSignforOwnExcel implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 配送车次
+	 */
+	@ApiModelProperty(value = "配送车次")
+	@ColumnWidth(20)
+	@ExcelProperty("配送车次")
+	private String trainNumber;
+
+	/**
+	 * 订单自编号;订单关联id
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("订单自编号")
+	private String orderCode;
+
+	/**
+	 * 配送仓库(名称)
+	 */
+	@ApiModelProperty(value = "配送仓库(名称)")
+	@ColumnWidth(20)
+	@ExcelProperty("配送仓库")
+	private String warehouseName;
+
+	/**
+	 * 收货人
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("客户名称")
+	private String consignee;
+	/**
+	 * 收货人
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("客户电话")
+	private String deliveryPhone;
+	/**
+	 * 收货地址
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("收货地址")
+	private String deliveryAddress;
+
+	/**
+	 * 配送类型
+	 */
+	@ApiModelProperty(value = "配送类型；1-商配、2-市配")
+	@ColumnWidth(20)
+	@ExcelProperty("配送类型")
+	private String deliveryTypeName;
+
+	/**
+	 * 门店名称
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("服务类型")
+	private String deliveryWayName;
+
+	/**
+	 * 总件数
+	 */
+	@ApiModelProperty(value = "总件数")
+	@ColumnWidth(20)
+	@ExcelProperty("总件数")
+	private Integer reservationNum;
+
+	/**
+	 * 装车件数
+	 */
+	@ApiModelProperty(value = "装车件数")
+	@ColumnWidth(20)
+	@ExcelProperty("装车件数")
+	private Integer loadedNumber;
+
+	/**
+	 * 签收数
+	 */
+	@ApiModelProperty(value = "签收数")
+	@ColumnWidth(20)
+	@ExcelProperty("签收数")
+	private Integer receivedQuantity;
+
+	/**
+	 * 装车未扫数
+	 */
+	@ApiModelProperty(value = "装车未扫数")
+	@ColumnWidth(20)
+	@ExcelProperty("装车未扫数")
+	private String withoutScanning;
+
+	/**
+	 * 未签收数目
+	 */
+	@ApiModelProperty(value = "未签收数目")
+	@ColumnWidth(20)
+	@ExcelProperty("未签收数目")
+	private String unsigneds;
+
+	/**
+	 * 送货司机(名称)
+	 */
+	@ApiModelProperty(value = "送货司机(名称)")
+	@ColumnWidth(20)
+	@ExcelProperty("送货司机")
+	private String deliveryDriverName;
+
+	/**
+	 * 送货司机手机号
+	 */
+	@ApiModelProperty(value = "送货司机手机号")
+	@ColumnWidth(20)
+	@ExcelProperty("送货司机手机号")
+	private String deliveryDriverPhone;
+
+	/**
+	 * 文员签收时间
+	 */
+	@ApiModelProperty(value = "签收时间")
+	@ColumnWidth(20)
+	@ExcelProperty("签收时间")
+	private String signingTime;
+
+	/**
+	 * 司机签收时间
+	 */
+	@ApiModelProperty(value = "司机签收时间")
+	@ColumnWidth(20)
+	@ExcelProperty("司机签收时间")
+	private String sjsigningTime;
+
+	/**
+	 * 签收人(名称)
+	 */
+	@ApiModelProperty(value = "签收人(名称)")
+	@ColumnWidth(20)
+	@ExcelProperty("签收人")
+	private String signeeName;
+
+
+	/**
+	 * 文员签收状态;1-未签收，2-签收
+	 */
+	@ApiModelProperty(value = "文员签收状态;1-未签收，2-签收")
+	@ColumnWidth(20)
+	@ExcelProperty("文员签收状态")
+	private String signingStatusName;
+
+	/**
+	 * 司机签收状态;1-未签收，2-签收
+	 */
+	@ApiModelProperty(value = "司机签收状态;1-未签收，2-签收")
+	@ColumnWidth(20)
+	@ExcelProperty("司机签收状态")
+	private String driverSigningName;
+
+
+
+
+
+
+//	/**
+//	 * 服务类型
+//	 */
+//	@ApiModelProperty(value = "预约服务类型；1-上楼、2-超区、3-拆样、4-平移、5-分拣、6-搬运、7-返货；")
+//	@ColumnWidth(20)
+//	@ExcelProperty("预约服务类型")
+//	private String deliveryWay;
+//
+//	/**
+//	 * 商城名称
+//	 */
+//	@ApiModelProperty(value = "商城名称")
+//	@ColumnWidth(20)
+//	@ExcelProperty("商城名称")
+//	private String mallName;
+//
+//
+//
+//	/**
+//	 * 订单总数
+//	 */
+//	@ApiModelProperty(value = "订单总数")
+//	@ColumnWidth(20)
+//	@ExcelProperty("订单总数")
+//	private Integer orderTotal;
+//
+//
+//	/**
+//	 * 签收类型;1-签收,2-代签收
+//	 */
+//	@ApiModelProperty(value = "签收类型;1-签收,2-代签收")
+//	@ColumnWidth(20)
+//	@ExcelProperty("签收类型")
+//	private String signingType;
+//	/**
+//	 * 服务号
+//	 */
+//	@ApiModelProperty(value = "服务号")
+//	@ColumnWidth(20)
+//	@ExcelProperty("服务号")
+//	private String serviceNumber;
+//	/**
+//	 * 司机备注
+//	 */
+//	@ApiModelProperty(value = "司机备注")
+//	@ColumnWidth(20)
+//	@ExcelProperty("司机备注")
+//	private String driverRemarks;
+//	/**
+//	 * 文员备注
+//	 */
+//	@ApiModelProperty(value = "文员备注")
+//	@ColumnWidth(20)
+//	@ExcelProperty("文员备注")
+//	private String clerkSignRemarks;
+//
+//	/**
+//	 * 送货车辆(值)
+//	 */
+//	@ApiModelProperty(value = "送货车辆(值)")
+//	@ColumnWidth(20)
+//	@ExcelProperty("送货车辆")
+//	private String deliveryVehicleName;
+//
+//	/**
+//	 * 编号
+//	 */
+//	@ApiModelProperty(value = "编号")
+//	@ColumnWidth(20)
+//	@ExcelProperty("编号")
+//	private String number;
+//
+//	/**
+//	 * 配送单号
+//	 */
+//	@ApiModelProperty(value = "配送单号")
+//	@ColumnWidth(20)
+//	@ExcelProperty("配送单号")
+//	private String noteNumber;
+//
+//
+//	/**
+//	 * 配送时间
+//	 */
+//	@ApiModelProperty(value = "配送时间")
+//	@ColumnWidth(20)
+//	@ExcelProperty("配送时间")
+//	private String deliveryTime;
+//	/**
+//	 * 装车时间
+//	 */
+//	@ApiModelProperty(value = "装车时间")
+//	@ColumnWidth(20)
+//	@ExcelProperty("装车时间")
+//	private String loadingTime;
+//
+//	/**
+//	 * 定位打卡
+//	 */
+//	@ApiModelProperty(value = "定位打卡")
+//	@ColumnWidth(20)
+//	@ExcelProperty("定位打卡")
+//	private String positioning;
+//	/**
+//	 * 定位打卡地址
+//	 */
+//	@ApiModelProperty(value = "定位打卡地址")
+//	@ColumnWidth(20)
+//	@ExcelProperty("定位打卡地址")
+//	private String positioningAdr;
+//
+//
+//
+//	/**
+//	 * 预约关联Id;预约关联id
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("服务类型")
+//	private String deliveryTypeName;
+//
+//
+//
+//	/**
+//	 * 配送仓库
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("门店名称")
+//	private String storeName;
+//	/**
+//	 * 服务类型
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("配送服务类型")
+//	private String deliveryWayName;
+//
+//	/**
+//	 * 签收状态;1-未签收,2-司机签收,3-文员签收
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("司机签收状态")
+//	private String driverSigningName;
+//	/**
+//	 * 签收类型;1-签收,2-代签收
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("文员审核状态")
+//	private String signingStatusName;
+//
+//
+//	/**
+//	 * 门店名称
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("服务类型")
+//	private String serveType;
+//
+//	/**
+//	 * 配送单号
+//	 */
+//	@ApiModelProperty(value = "配送单号")
+//	@ColumnWidth(20)
+//	@ExcelProperty("服务类型")
+//	private String reservationCode;
+//	/**
+//	 * 预约时间
+//	 */
+//	@ApiModelProperty(value = "预约时间")
+//	@ColumnWidth(20)
+//	@ExcelProperty("服务类型")
+//	private String reservationDate;
+//
+//
+//	/**
+//	 * 签收状态
+//	 */
+//	@ApiModelProperty(value = "签收状态")
+//	@ColumnWidth(20)
+//	@ExcelProperty("签收状态")
+//	private String signingStatusAll;
+//
+//
+//	/**
+//	 * 备注
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("备注")
+//	private String remarks;
+//
+//
+//	/**
+//	 * 是否加急
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("是否加急")
+//	private String isUrgent;
+//
+//	/**
+//	 * 配送车牌号
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("配送车牌号")
+//	private String vehicleName;
+//
+//	/**
+//	 * 配送司机
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("配送司机")
+//	private String driverName;
+
+
+
+
+
+}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistrilbutionBillLadingExcel.java

@@ -21,6 +21,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -41,83 +42,97 @@ public class DistrilbutionBillLadingExcel implements Serializable {
 
 	private static final long serialVersionUID = 1L;
 
-	/**
-	 * 租户号
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("租户号")
-	private String tenantId;
-	/**
-	 * 是否已删除
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("是否已删除")
-	private Integer isDeleted;
-	/**
-	 * 预留1
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留1")
-	private String reserve1;
-	/**
-	 * 预留2
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留2")
-	private String reserve2;
-	/**
-	 * 预留3
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留3")
-	private String reserve3;
-	/**
-	 * 预留4
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留4")
-	private String reserve4;
-	/**
-	 * 预留5
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留5")
-	private String reserve5;
-	/**
-	 * 提货时间
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("提货时间")
-	private String pickUpTime;
-	/**
-	 * 提货人
-	 */
+	@ColumnWidth(20)
+	@ExcelProperty("提货批次")
+	private String pickupBatch;
+
+	@ColumnWidth(20)
+	@ExcelProperty("服务号")
+	private String serviceNumber;
+
+	@ColumnWidth(20)
+	@ExcelProperty("运单号")
+	private String waybillNumber;
+
+	@ColumnWidth(20)
+	@ExcelProperty("收货单位")
+	private String consigneeUnit;
+
+	@ColumnWidth(20)
+	@ExcelProperty("收货人")
+	private String customerName;
+
+	@ColumnWidth(20)
+	@ExcelProperty("联系电话")
+	private String customerTelephone;
+
+	@ColumnWidth(20)
+	@ExcelProperty("仓库")
+	private String warehouse;
+
+	@ColumnWidth(20)
+	@ExcelProperty("入库时间")
+	private String warehouseEntryTime;
+
+	@ColumnWidth(20)
+	@ExcelProperty("到付运费")
+	private String collectFee;
+
+	@ColumnWidth(20)
+	@ExcelProperty("搬运费")
+	private String transport; //搬运
+
+	@ColumnWidth(20)
+	@ExcelProperty("仓储费")
+	private String storageFee;
+
+	@ColumnWidth(20)
+	@ExcelProperty("叉车费")
+	private String forklift; //叉车
+
+	@ColumnWidth(20)
+	@ExcelProperty("其他增值费用")
+	private String otherFee;
+
+	@ColumnWidth(20)
+	@ExcelProperty("应提件数")
+	private String totalNumber;
+
+	@ColumnWidth(20)
+	@ExcelProperty("实提件数")
+	private Integer stopNum; //已
+
+	@ColumnWidth(20)
+	@ExcelProperty("品牌")
+	private String brand;
+
+	@ColumnWidth(20)
+	@ExcelProperty("货品信息")
+	private String productInformation;
+
 	@ColumnWidth(20)
 	@ExcelProperty("提货人")
 	private String consignee;
-	/**
-	 * 提货车牌
-	 */
+
 	@ColumnWidth(20)
 	@ExcelProperty("提货车牌")
 	private String pickUpPlate;
-	/**
-	 * 提货证件
-	 */
+
 	@ColumnWidth(20)
 	@ExcelProperty("提货证件")
 	private String deliveryDocument;
-	/**
-	 * 证件类型
-	 */
+
 	@ColumnWidth(20)
 	@ExcelProperty("证件类型")
-	private String certificateType;
-	/**
-	 * 费用合计
-	 */
+	@ApiModelProperty(value = "证件类型名称")
+	private String certificateTypeName;
+
+	@ColumnWidth(20)
+	@ExcelProperty("状态")
+	private String conditionName;
+
 	@ColumnWidth(20)
 	@ExcelProperty("费用合计")
-	private BigDecimal totalCost;
+	private BigDecimal totalCost; //费用
 
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionDeliveryListClient.java

@@ -19,6 +19,9 @@ package com.logpm.distribution.feign;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.distribution.entity.DistributionDeliveryListEntity;
 import com.logpm.distribution.service.IDistributionDeliveryListService;
+import com.logpm.distribution.vo.DistributionDeliveryListVO;
+import com.logpm.distribution.vo.DistributionDeliverySelfVO;
+import com.logpm.distribution.vo.DistributionRetentionScanVo;
 import lombok.AllArgsConstructor;
 import org.springblade.core.mp.support.BladePage;
 import org.springblade.core.mp.support.Condition;
@@ -27,6 +30,8 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
+import java.util.List;
+
 /**
  * 配送管理 Feign实现类
  *
@@ -42,7 +47,7 @@ public class DistributionDeliveryListClient implements IDistributionDeliveryList
 
     @Override
     @GetMapping(TOP)
-    public BladePage<DistributionDeliveryListEntity> top(Integer current, Integer size) {
+    public BladePage<DistributionDeliveryListEntity> deliveryListTop(Integer current, Integer size) {
         Query query = new Query();
         query.setCurrent(current);
         query.setSize(size);
@@ -50,4 +55,14 @@ public class DistributionDeliveryListClient implements IDistributionDeliveryList
         return BladePage.of(page);
     }
 
+	@Override
+	public DistributionDeliveryListVO getDeliveryDriverInfo(Long deliveryId) {
+		return distributionDeliveryListService.getDeliveryList(deliveryId);
+	}
+
+//	@Override
+//	public void retentionCancelDeliveryPack(DistributionRetentionScanVo distributionRetentionScanVo) {
+//		distributionDeliveryListService.retentionCancelDeliveryPack(distributionRetentionScanVo);
+//	}
+
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java

@@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.logpm.distribution.entity.DistributionParcelListEntity;
 import com.logpm.distribution.service.IDistributionParcelListService;
+import com.logpm.distribution.vo.DistributionParcelListVO;
 import lombok.AllArgsConstructor;
 import org.springblade.core.mp.support.BladePage;
 import org.springblade.core.mp.support.Condition;
@@ -172,4 +173,10 @@ public class DistributionParcelListClient implements IDistributionParcelListClie
 			.eq("order_code",orderCode);
 		distributionParcelListService.update(updateWrapper);
 	}
+
+	@Override
+	@PostMapping(GETPARCELLISTINFO)
+	public List<DistributionParcelListEntity> getParcelListInfo(DistributionParcelListVO parcelListVO) {
+		return distributionParcelListService.getParcelListInfo(parcelListVO);
+	}
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionReservationClient.java

@@ -19,6 +19,7 @@ package com.logpm.distribution.feign;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.distribution.entity.DistributionReservationEntity;
 import com.logpm.distribution.service.IDistributionReservationService;
+import com.logpm.distribution.vo.DistributionRetentionScanVo;
 import lombok.AllArgsConstructor;
 import org.springblade.core.mp.support.BladePage;
 import org.springblade.core.mp.support.Condition;
@@ -50,4 +51,9 @@ public class DistributionReservationClient implements IDistributionReservationCl
         return BladePage.of(page);
     }
 
+	@Override
+	public boolean retentionCancelReservationPack(DistributionRetentionScanVo distributionRetentionScanVo) {
+		return reservationService.retentionCancelReservationPack(distributionRetentionScanVo);
+	}
+
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockArticleClient.java

@@ -19,6 +19,8 @@ package com.logpm.distribution.feign;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.logpm.distribution.entity.DistributionParcelListEntity;
 import com.logpm.distribution.entity.DistributionStockArticleEntity;
 import com.logpm.distribution.service.IDistributionParcelListService;
@@ -191,4 +193,22 @@ public class DistributionStockArticleClient implements IDistributionStockArticle
 		distributionStockArticleService.submitHandleNumByOrderId(subNum,articleId);
 	}
 
+	/**
+	 * 查询订单数据
+	 * @param stockArticleEntity
+	 * @return
+	 */
+	@Override
+	@PostMapping(GETSTOCKARTICLEINFO)
+	public List<DistributionStockArticleEntity> getStockArticleInfo(DistributionStockArticleEntity stockArticleEntity) {
+		return distributionStockArticleService.list(Wrappers.<DistributionStockArticleEntity>query().lambda()
+			.eq(DistributionStockArticleEntity::getWarehouseId,stockArticleEntity.getWarehouseId())
+			.eq(ObjectUtils.isNotNull(stockArticleEntity.getMallId()),DistributionStockArticleEntity::getMallId,stockArticleEntity.getMallId())
+			.eq(ObjectUtils.isNotNull(stockArticleEntity.getId()),DistributionStockArticleEntity::getId,stockArticleEntity.getId())
+			.eq(ObjectUtils.isNotNull(stockArticleEntity.getGenre()),DistributionStockArticleEntity::getGenre,stockArticleEntity.getGenre())
+			.eq(ObjectUtils.isNotNull(stockArticleEntity.getIsZero()),DistributionStockArticleEntity::getIsZero,stockArticleEntity.getIsZero())
+		);
+
+	}
+
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockListClient.java

@@ -173,4 +173,16 @@ public class DistributionStockListClient implements IDistributionStockListClient
 		return distributionStockListService.list(stockListEntityLambdaQueryWrapper);
 	}
 
+	/**
+	 * 查询商场库存平
+	 *
+	 * @param distributionStockListEntity
+	 * @return
+	 */
+	@Override
+	@PostMapping(GETSTOCKLISTINFO)
+	public List<DistributionStockListVO> getStockListInfo(DistributionStockListEntity distributionStockListEntity) {
+		return distributionStockListService.getStockListInfo(distributionStockListEntity);
+	}
+
 }

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

@@ -23,9 +23,11 @@ import com.logpm.distribution.dto.DistributionAddvalueDTO;
 import com.logpm.distribution.entity.DistributionAddvalueEntity;
 import com.logpm.distribution.entity.DistributionAddvaluePackageEntity;
 import com.logpm.distribution.excel.DistributionAddvalueExcel;
+import com.logpm.distribution.vo.DistributionAddvaluePackageVO;
 import com.logpm.distribution.vo.DistributionAddvalueVO;
 import org.apache.ibatis.annotations.Param;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 配送增值服务表 Mapper 接口
@@ -81,6 +83,54 @@ public interface DistributionAddvalueMapper extends BaseMapper<DistributionAddva
 	 */
 	DistributionAddvalueVO getAddvalueBySignfor(@Param("par")DistributionAddvalueDTO distributionAddvalueDTO);
 
+	/**
+	 * 查询增值服务包件详情
+	 * @param packageId
+	 * @param addvalueId
+	 * @return
+	 */
+    DistributionAddvaluePackageVO selectAddvaluePackageDetail(@Param("packageId") Long packageId,@Param("addvalueId") String addvalueId,@Param("reservationId")Long reservationId);
+
+
+	/**
+	 * 查询零担增值服务包件详情
+	 * @param packageId
+	 * @param addvalueId
+	 * @param reservationId
+	 * @return
+	 */
+	DistributionAddvaluePackageVO selectAddvalueZeroPackageDetail(@Param("packageId") Long packageId,@Param("addvalueId") String addvalueId,@Param("reservationId")Long reservationId);
+
+	/**
+	 * 查询零担增值服务详情
+	 * @param packageId
+	 * @param addvalueId
+	 * @param reservationId
+	 * @return
+	 */
+	DistributionAddvaluePackageVO selectAddvalueInventoryPackageDetail(Long packageId, String addvalueId, Long reservationId);
+
+	/**
+	 * 查询订制品增值服务包件列表
+	 * @param reservationId
+	 * @param stockArticleId
+	 * @return
+	 */
+	List<DistributionAddvaluePackageVO> selectAddvaluePackageVO(@Param("reservationId") Long reservationId, @Param("stockArticleId") Long stockArticleId,@Param("obj") Map<String, Object> addValueDTO);
+
+
+	List<DistributionAddvaluePackageVO> selectAddvalueZeroPackageVO(@Param("reservationId")Long reservationId,@Param("stockArticleId")Long stockArticleId,@Param("obj")Map<String, Object> addValueDTO);
+
+	List<DistributionAddvaluePackageVO> selectAddvalueInventoryPackageVO(@Param("reservationId")Long reservationId,@Param("stockListId")Long stockListId,@Param("obj")Map<String, Object> addValueDTO);
+
+	/**
+	 *
+	 * @param reservationId
+	 * @param addvalueType
+	 * @return
+	 */
+	List<DistributionAddvaluePackageEntity> selectAddvaluePackageListByAddvalueType(@Param("reservationId")Long reservationId,@Param("addvalueType") String addvalueType);
+
 //	/**
 //	 * 删除增值服务
 //	 * @param reservationId

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

@@ -92,5 +92,184 @@
             GROUP BY
                 lda.id
     </select>
+    <select id="selectAddvaluePackageDetail"
+            resultType="com.logpm.distribution.vo.DistributionAddvaluePackageVO">
+         SELECT
+            ldpl.firsts AS firsts,
+            ldpl.second AS second,
+            ldpl.third_product AS third_product,
+            ldap.order_package_code AS order_package_code,
+            ldap.order_code AS order_code,
+            ldpl.quantity AS quantity,
+            ldap.id AS id,
+            ldap.stock_article_id AS  stockArticleId,
+            ldap.package_id AS packageId,
+            lda.ref_id AS reservationId,
+            ldap.conditions AS conditions,
+            CASE
+            WHEN ldap.conditions =1 THEN    '订制品'
+            WHEN ldap.conditions =2 THEN   '库存品'
+            WHEN ldap.conditions =3 THEN    '零担'
+            END AS packageType
+        FROM
+            logpm_distribution_addvalue AS lda
+            INNER JOIN logpm_distribution_addvalue_detail AS ldad ON ldad.addvalue_id = lda.id
+            INNER JOIN logpm_distribution_addvalue_package AS ldap ON ldap.addvalue_detail_id = ldad.id AND ldap.conditions = 1
+            INNER JOIN logpm_distribution_parcel_list AS ldpl ON ldap.package_id = ldpl.id
+        WHERE
+            lda.addvalue_id = #{addvalueId} AND ldap.package_id = #{packageId} AND lda.ref_id = #{reservationId} AND ref_type = 1
+    </select>
+    <select id="selectAddvalueZeroPackageDetail"
+            resultType="com.logpm.distribution.vo.DistributionAddvaluePackageVO">
+		  SELECT
+            ldpl.firsts AS firsts,
+            ldpl.second AS second,
+            ldpl.third_product AS third_product,
+            ldap.order_package_code AS order_package_code,
+            ldap.order_code AS order_code,
+            ldpl.quantity AS quantity,
+            ldrzp.quantity AS maxQuantity,
+            ldap.id AS id,
+            ldap.stock_article_id AS  stockArticleId,
+            ldap.package_id AS packageId,
+            lda.ref_id AS reservationId,
+            ldap.conditions AS conditions,
+            CASE
+            WHEN ldap.conditions =1 THEN    '订制品'
+            WHEN ldap.conditions =2 THEN   '库存品'
+            WHEN ldap.conditions =3 THEN    '零担'
+            END AS packageType
+        FROM
+            logpm_distribution_addvalue AS lda
+            INNER JOIN logpm_distribution_addvalue_detail AS ldad ON ldad.addvalue_id = lda.id
+            INNER JOIN logpm_distribution_addvalue_package AS ldap ON ldap.addvalue_detail_id = ldad.id AND ldap.conditions = 3
+            INNER JOIN logpm_distribution_parcel_list AS ldpl ON ldap.package_id = ldpl.id
+            INNER JOIN logpm_distribution_reservation_zero_package AS ldrzp ON ldrzp.parcel_list_id = ldap.package_id AND ldap.reservation_id=ldrzp.reservation_id
+        WHERE
+            lda.addvalue_id = #{addvalueId} AND ldap.package_id = #{packageId} AND lda.ref_id = #{reservationId} AND ref_type = 1
+    </select>
+    <select id="selectAddvalueInventoryPackageDetail"
+            resultType="com.logpm.distribution.vo.DistributionAddvaluePackageVO">
+        	         SELECT
+            ldap.stock_article_id AS inventoryId,
+            ldap.material_name AS materialName,
+            ldap.order_package_code AS orderPackageCode,
+            ldap.package_id AS packageId,
+            ldap.reservation_id AS reservationId,
+            ldsld.num AS quantity,
+            ldsl.sku AS sku,
+            ldsl.cargo_number AS materialNumber,
+            ldap.conditions AS conditions,
+            CASE
+            WHEN ldap.conditions =1 THEN   '订制品'
+            WHEN ldap.conditions =2 THEN   '库存品'
+            WHEN ldap.conditions =3 THEN   '零担'
+            END AS packageType
+        FROM
+            logpm_distribution_addvalue AS lda
+            INNER JOIN logpm_distribution_addvalue_detail AS ldad ON ldad.addvalue_id = lda.id
+            INNER JOIN logpm_distribution_addvalue_package AS ldap ON ldap.addvalue_detail_id = ldad.id AND ldap.conditions = 2
+            INNER JOIN logpm_dis_stock_list_detail AS ldsld ON ldsld.id = ldap.package_id
+						INNER JOIN logpm_distribution_stock_list AS ldsl ON ldsld.stock_list_id = ldsl.id
+        WHERE
+            lda.addvalue_id = #{addvalueId} AND ldap.package_id = #{packageId} AND lda.ref_id = #{reservationId} AND ref_type = 1
+    </select>
+    <select id="selectAddvaluePackageVO" resultType="com.logpm.distribution.vo.DistributionAddvaluePackageVO">
+        SELECT
+            ldpl.id AS packageId,
+            ldpl.firsts,
+            ldpl.second,
+            ldpl.third_product,
+            ldpl.order_package_code,
+            ldpl.order_code,
+            ldpl.stock_article_id,
+            ldpl.quantity,
+            ldrp.reservation_id,
+            1 AS conditions,
+            '订制品' AS packageType
+        FROM
+        logpm_distribution_reservation_package AS ldrp
+        INNER JOIN logpm_distribution_parcel_list AS ldpl ON ldrp.parce_list_id = ldpl.id
+	    WHERE
+	        ldrp.reservation_id = #{reservationId} and ldrp.stock_article_id = #{stockArticleId} and ldrp.packet_bar_status in ('1','3')
+	        <if test="obj.orderPackageCode != null and obj.orderPackageCode != ''">
+                and ldpl.order_package_code =#{obj.orderPackageCode}
+            </if>
+    </select>
+    <select id="selectAddvalueZeroPackageVO"
+            resultType="com.logpm.distribution.vo.DistributionAddvaluePackageVO">
+        	SELECT
+                ldpl.id,
+                ldpl.firsts,
+                ldpl.`second`,
+                ldpl.third_product,
+                ldpl.order_package_code,
+                ldpl.order_code,
+                ldpl.stock_article_id,
+                ldpl.quantity,
+                ldrzp.reservation_id,
+                ldrzp.quantity AS maxQuantity,
+                3 AS conditions,
+                '零担' AS packageType
+            FROM
+                logpm_distribution_reservation_zero_package AS ldrzp
+                INNER JOIN logpm_distribution_parcel_list AS ldpl ON ldrzp.parcel_list_id = ldpl.id
+    </select>
+    <select id="selectAddvalueInventoryPackageVO"
+            resultType="com.logpm.distribution.vo.DistributionAddvaluePackageVO">
+        SELECT
+            ldsld.sku,
+            ldsld.stock_package_code,
+            ldsld.reservation_id,
+            ldsld.stock_list_id,
+            ldsld.id AS packageId,
+            ldsld.num AS quantity,
+            ldsl.description_goods,
+            ldsl.cargo_number,
+            2 AS conditions,
+            '库存品' AS packageType
+        FROM
+            logpm_dis_stock_list_detail AS ldsld
+            INNER JOIN logpm_distribution_stock_list AS ldsl ON ldsld.stock_list_id = ldsl.id
+        WHERE
+            ldsld.reservation_id = #{reservationId} AND ldsld.stock_package_status in ('1','3') AND ldsld.stock_list_id =#{stockListId}
+            <if test="obj.orderPackageCode != null and obj.orderPackageCode != ''">
+                AND ldsld.stock_package_code like concat ('%',#{obj.orderPackageCode},'%')
+            </if>
+    </select>
+    <select id="selectAddvaluePackageListByAddvalueType"
+            resultType="com.logpm.distribution.entity.DistributionAddvaluePackageEntity">
+        SELECT
+            ldap.tenant_id,
+            ldap.create_user,
+            ldap.create_time,
+            ldap.update_user,
+            ldap.update_time,
+            ldap.status,
+            ldap.is_deleted,
+            ldap.create_dept,
+            ldap.id,
+            ldap.reserve1,
+            ldap.reserve2,
+            ldap.reserve3,
+            ldap.reserve4,
+            ldap.reserve5,
+            ldap.package_id,
+            ldap.conditions,
+            ldap.order_package_code,
+            ldap.order_code,
+            ldap.material_name,
+            ldap.stock_article_id,
+            ldap.quantity,
+            ldap.reservation_id,
+            ldap.addvalue_detail_id,
+            ldap.record_type
+        FROM
+            logpm_distribution_addvalue AS lda
+            INNER JOIN logpm_distribution_addvalue_detail AS ldad ON lda.id = ldad.addvalue_id
+            INNER JOIN logpm_distribution_addvalue_package AS ldap ON lda.ref_id = ldap.reservation_id AND ldap.addvalue_detail_id = ldad.id
+        WHERE
+            lda.ref_id = #{reservationId} AND lda.addvalue_id = #{addvalueType} and lda.ref_type = '1'
+    </select>
 
 </mapper>

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

@@ -235,6 +235,8 @@
                             ldsa.customer_name,
                             ldsa.customer_telephone,
                             ldsa.customer_address,
+                            ldsa.total_number,
+                            ldsa.hand_quantity,
                             ldrs.reservation_num AS deliveryNumber,
                      ldsa.description_goods descriptionGoods,
                      (
@@ -278,7 +280,7 @@
                      (   select  sum(loaded_nub) FROM
                         logpm_distribution_loadscan AS ldl
                         WHERE  ldl.order_id=ldrs.stock_article_id and ldl.scan_status != 1 and ldl.reservation_id = lds.reservation_id
-                      ) AS loadingNumber ,
+                      ) AS loadingNumber,
                       (   select  count(*) FROM
                         logpm_distribution_stock AS lstock
                         WHERE  lstock.stock_article=ldrs.stock_article_id

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

@@ -57,7 +57,7 @@ public interface DistributionDeliveryListMapper extends BaseMapper<DistributionD
 	 * @param queryWrapper
 	 * @return
 	 */
-	List<DistributionDeliveryListExcel> exportDistributionDeliveryList(@Param("ew") Wrapper<DistributionDeliveryListEntity> queryWrapper);
+	List<DistributionDeliveryListVO> exportDistributionDeliveryList(@Param("ew") Wrapper<DistributionDeliveryListEntity> queryWrapper);
 	/**
 	 * 商配车次
 	 *
@@ -410,4 +410,22 @@ public interface DistributionDeliveryListMapper extends BaseMapper<DistributionD
 	 * @return
 	 */
 	List<DistributionParcelNumberVO> selectDeliveryZeroOrderDetail(@Param("orderId") Long orderId,@Param("deliveryListId") Long deliveryId);
+
+	/**
+	 * 查询滞留库存品包件
+	 * @param stockPackageCode
+	 * @param deliveryId
+	 * @return
+	 */
+	DistributionRetentionScanVo selectRetentionInventoryPackage(@Param("stockPackageCode") String stockPackageCode,@Param("deliveryId") Long deliveryId);
+
+	/**
+	 * 查询滞留包件细腻系
+	 * @param orderPackageCode
+	 * @param deliveryId
+	 * @return
+	 */
+	DistributionRetentionScanVo selectRetentionPackage(@Param("orderPackageCode")String orderPackageCode,@Param("deliveryId") Long deliveryId);
+
+	List<DistributionRetentionScanVo> selectRetentionZeroPackage(@Param("deliveryId")Long deliveryId, @Param("orderCode")String barcode);
 }

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

@@ -260,7 +260,7 @@
     </select>
 
 
-    <select id="exportDistributionDeliveryList" resultType="com.logpm.distribution.excel.DistributionDeliveryListExcel">
+    <select id="exportDistributionDeliveryList" resultType="com.logpm.distribution.vo.DistributionDeliveryListVO">
         SELECT * FROM logpm_distribution_delivery_list ${ew.customSqlSegment}
     </select>
     <select id="selectBycommercialNub" resultType="java.lang.Integer">
@@ -1590,5 +1590,78 @@
         WHERE
             ldrs.stock_article_id = #{orderId} AND lddl.id=#{deliveryListId} and ldrs.stock_article_status in ('1','3') AND ldrzp.zero_package_status IN ( '1', '3' )
     </select>
+    <select id="selectRetentionInventoryPackage"
+            resultType="com.logpm.distribution.vo.DistributionRetentionScanVo">
+         SELECT
+            lddl.id,
+            ldr.id AS reservationId,
+            lddl.train_number AS trainNumber,
+            ldr.reservation_code AS reservationCode,
+            ldsld.id AS orderPackageId,
+            ldsld.stock_package_code AS orderPackageCode,
+            ldsld.stock_list_id AS inventoryId,
+            ldsld.num AS reservationQuantity,
+            ldsl.cargo_number AS  materialNumber,
+            ldsl.description_goods AS materialName,
+            2 AS conditions,
+            ldsl.incoming_batch AS 入库批次
+         FROM
+            logpm_distribution_delivery_list AS lddl
+            LEFT JOIN logpm_distribution_signfor AS lds ON lds.delivery_id = lddl.id
+            LEFT JOIN logpm_distribution_reservation AS ldr ON lds.reservation_id = ldr.id
+            LEFT JOIN logpm_distribution_reservation_stocklist AS ldrs ON ldrs.reservation_id = ldr.id
+            LEFT JOIN logpm_distribution_stock_list AS ldsl ON ldsl.id = ldrs.stocklist_id
+            INNER JOIN logpm_dis_stock_list_detail AS ldsld ON ldsld.stock_list_id = ldrs.stocklist_id and  ldsld.reservation_id = ldr.id
+        WHERE lddl.id=#{deliveryId} and ldrs.stock_list_status in ('1','2') and ldsld.stock_package_code =#{stockPackageCode}
+    </select>
+    <select id="selectRetentionPackage" resultType="com.logpm.distribution.vo.DistributionRetentionScanVo">
+         SELECT
+			lddl.id AS deliveryId,
+			lddl.train_number AS trainNumber,
+			ldr.id AS reservationId,
+			ldr.reservation_code AS reservationCode,
+			ldsa.id AS orderId,
+			ldsa.order_code AS orderCode,
+			ldpl.id AS orderPackageId,
+			ldpl.order_package_code AS orderPackageCode,
+			ldpl.quantity AS retentionQuantity,
+			1 AS conditions
+	 FROM
+			logpm_distribution_delivery_list AS lddl
+			LEFT JOIN logpm_distribution_signfor AS lds ON lds.delivery_id = lddl.id
+			LEFT JOIN logpm_distribution_reservation AS ldr ON lds.reservation_id = ldr.id
+			LEFT JOIN logpm_distribution_reservation_stockarticle AS ldrs ON ldrs.reservation_id = ldr.id
+			LEFT JOIN logpm_distribution_stock_article AS ldsa ON ldsa.id = ldrs.stock_article_id
+			LEFT JOIN logpm_distribution_reservation_package AS ldrp ON ldrp.stock_article_id = ldrs.stock_article_id and  ldrp.reservation_id = ldr.id
+			LEFT JOIN logpm_distribution_parcel_list AS ldpl ON ldpl.id = ldrp.parce_list_id and ldpl.stock_article_id = ldsa.id
+		WHERE
+			lddl.id=#{deliveryId} AND ldrp.packet_bar_status in ('1','3') AND ldrs.is_zero = 0  AND ldpl.order_package_code = #{orderPackageCode}
+    </select>
+    <select id="selectRetentionZeroPackage" resultType="com.logpm.distribution.vo.DistributionRetentionScanVo">
+
+	SELECT
+			lddl.id AS deliveryId,
+			lddl.train_number AS trainNumber,
+			ldr.id AS reservationId,
+			ldr.reservation_code AS reservationCode,
+			ldsa.id AS orderId,
+			ldsa.order_code AS orderCode,
+			ldrs.reservation_num AS maxRetention,
+			ldrzp.parcel_list_id AS orderPackageId,
+			ldpl.firsts AS materialName,
+            3 AS conditions
+	 FROM
+			logpm_distribution_delivery_list AS lddl
+			LEFT JOIN logpm_distribution_signfor AS lds ON lds.delivery_id = lddl.id
+			LEFT JOIN logpm_distribution_reservation AS ldr ON lds.reservation_id = ldr.id
+			LEFT JOIN logpm_distribution_reservation_stockarticle AS ldrs ON ldrs.reservation_id = ldr.id
+			LEFT JOIN logpm_distribution_stock_article AS ldsa ON ldsa.id = ldrs.stock_article_id
+			LEFT JOIN logpm_distribution_reservation_zero_package AS ldrzp ON ldrzp.stock_article_id = ldrs.stock_article_id and  ldrzp.reservation_id = ldr.id
+			LEFT JOIN logpm_distribution_parcel_list AS ldpl ON ldrzp.parcel_list_id = ldpl.id
+			WHERE  ldrs.is_zero = '1' AND lddl.id=#{deliveryId}
+			AND ldsa.order_code = #{orderCode}
+			AND ldrs.stock_article_status in ('1','3')
+			AND ldrzp.zero_package_status IN ('1','3')
+    </select>
 
 </mapper>

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

@@ -67,4 +67,11 @@ public interface DistributionDeliveryTripartiteMapper extends BaseMapper<Distrib
 	 * @param id
 	 */
 	void deleteDeliveryTripartite(@Param("id")Long id);
+
+	/**
+	 * 查询外协司机信息
+	 * @param deliveryId
+	 * @return
+	 */
+    DistributionDeliveryTripartiteEntity selectTripartiteInfo(@Param("deliveryId")Long deliveryId);
 }

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

@@ -53,5 +53,9 @@
     <select id="selectListcustom" resultType="com.logpm.distribution.vo.app.DistributionAppDeliverySelfVO">
          select id id,driver_name driverName,vehicle_num vehicleNub FROM logpm_distribution_delivery_tripartite  where delivery_id = #{deliveryId}
     </select>
+    <select id="selectTripartiteInfo"
+            resultType="com.logpm.distribution.entity.DistributionDeliveryTripartiteEntity">
+        SELECT * logpm_distribution_delivery_tripartite WHERE delivery_id = #{deliveryId}
+    </select>
 
 </mapper>

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

@@ -31,6 +31,7 @@ import org.apache.ibatis.annotations.Param;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 在库订单包件清单 Mapper 接口
@@ -49,15 +50,6 @@ public interface DistributionParcelListMapper extends BaseMapper<DistributionPar
 	 */
 	List<DistributionParcelListEntity> selectDistributionParcelListPage(IPage page,@Param("param") DistributionParcelListVO distributionParcelList);
 
-
-	/**
-	 * 获取导出数据
-	 *
-	 * @param queryWrapper
-	 * @return
-	 */
-	List<DistributionParcelListExcel> exportDistributionParcelList(@Param("ew") Wrapper<DistributionParcelListEntity> queryWrapper);
-
     int submitNumByOrderIdAndName(@Param("articleId") Long articleId,@Param("productName") String productName, @Param("num") Integer num);
 
     List<PackageStockupVO> selectOrderInfoList(@Param("param") StockupDTO stockupDTO);
@@ -86,9 +78,9 @@ public interface DistributionParcelListMapper extends BaseMapper<DistributionPar
 
 	/**
 	 *  自提查询订单包件信息
-	 * @param reservationId
-	 * @param stockupId
-	 * @param stockArticleId
+	 * @param
+	 * @param
+	 * @param
 	 * @return
 	 */
     List<PackageStockupVO> selectOrderInfoSelfList(@Param("param") StockupDTO stockupDTO);
@@ -109,7 +101,6 @@ public interface DistributionParcelListMapper extends BaseMapper<DistributionPar
 	 */
 	List<DistributionParcelListEntity> getPackageList(@Param("stockArticleId") Long id);
 
-
 	List<DistributionParcelListEntity> selectListByOderId(@Param("id")Long id,@Param("collect") List<Long> collect);
 
 	ArrayList<String> selectorderPackageCodeByLike(@Param("condition") String condition,@Param("collect") List<Long> collect);
@@ -117,4 +108,8 @@ public interface DistributionParcelListMapper extends BaseMapper<DistributionPar
 	ArrayList<String> selectorderCodeByLike(@Param("condition") String condition,@Param("collect") List<Long> collect);
 
     List<DistributionStockListVO> selectStockListByOderId(@Param("id")Long id,@Param("collect") List<Long> collect);
+
+    List<DistributionParcelListEntity> getParcelListInfo(@Param("param")DistributionParcelListVO parcelListVO);
+
+	List<DistributionParcelListExcel> exportDistributionParcelList(@Param("paramMap")Map<String, Object> paramMap, @Param("idArr") List<String> idArr);
 }

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

@@ -34,9 +34,79 @@
         <result column="stock_article_id" property="stockArticleId"/>
     </resultMap>
 
+    <select id="getParcelListInfo" resultType="com.logpm.distribution.entity.DistributionParcelListEntity">
+        select ldsa.mall_name mallName,ldpl.order_code orderCode,ldpl.id,ldpl.conditions,ldpl.order_package_code orderPackageCode,ldsa.id stockArticleId,
+        ldsa.mall_id mallId,ldsa.genre ,ldsa.is_zero isZero,
+        ldpl.waybill_number waybillNumber,ldpl.firsts,ldpl.quantity,ldpl.warehouse_id warehouseId,ldpl.material_name materialName,ldpl.material_code materialCode,
+            CASE   WHEN ldpl.conditions = 1 THEN
+            (select GROUP_CONCAT(tray_id)
+            from logpm_warehouse_tray_goods
+            where association_id = ldpl.id )
+            WHEN ldpl.conditions = 2 THEN
+            (select GROUP_CONCAT(tray_id)
+            from logpm_warehouse_tray_goods
+            where association_id = ldpl.material_id and incoming_batch = ldpl.order_code and market_id = ldsa.mall_id)
+            ELSE
+            ( select GROUP_CONCAT(tray_id)
+            from logpm_warehouse_tray_goods
+            where association_id = ldpl.stock_article_id)
+            END  trayId,
+            CASE   WHEN ldpl.conditions = 1 THEN
+            (select GROUP_CONCAT(tray_code)
+            from logpm_warehouse_tray_goods
+            where association_id = ldpl.id )
+            WHEN ldpl.conditions = 2 THEN
+            (select GROUP_CONCAT(tray_code)
+            from logpm_warehouse_tray_goods
+            where association_id = ldpl.material_id and incoming_batch = ldpl.order_code and market_id = ldsa.mall_id)
+            ELSE
+            ( select GROUP_CONCAT(tray_code)
+            from logpm_warehouse_tray_goods
+            where association_id = ldpl.stock_article_id)
+            END  trayCode,
+            CASE   WHEN ldpl.conditions = 1 THEN
+            (select GROUP_CONCAT(allocation_id)
+            from logpm_warehouse_updown_goods
+            where association_id = ldpl.id )
+            WHEN ldpl.conditions = 2 THEN
+            (select GROUP_CONCAT(allocation_id)
+            from logpm_warehouse_updown_goods
+            where association_id = ldpl.material_id and incoming_batch = ldpl.order_code and market_id = ldsa.mall_id)
+            ELSE
+            ( select GROUP_CONCAT(allocation_id)
+            from logpm_warehouse_updown_goods
+            where association_id = ldpl.stock_article_id)
+            END  allocationId,
+            CASE   WHEN ldpl.conditions = 1 THEN
+            (select GROUP_CONCAT(position_code)
+            from logpm_warehouse_updown_goods
+            where association_id = ldpl.id )
+            WHEN ldpl.conditions = 2 THEN
+            (select GROUP_CONCAT(position_code)
+            from logpm_warehouse_updown_goods
+            where association_id = ldpl.material_id and incoming_batch = ldpl.order_code and market_id = ldsa.mall_id)
+            ELSE
+            ( select GROUP_CONCAT(position_code)
+            from logpm_warehouse_updown_goods
+            where association_id = ldpl.stock_article_id)
+            END  positionCode,
+        CASE   WHEN ldpl.conditions = 2 THEN
+        (select GROUP_CONCAT(DISTINCT id)
+        from logpm_distribution_stock_list
+        where material_id = ldpl.material_id and incoming_batch = ldpl.order_code and market_id = ldsa.mall_id)
+        END  stockId
 
-    <select id="selectDistributionParcelListPage"
-            resultType="com.logpm.distribution.entity.DistributionParcelListEntity">
+        from logpm_distribution_stock_article ldsa
+        LEFT JOIN logpm_distribution_parcel_list ldpl on ldsa.id = ldpl.stock_article_id
+        <where>
+            ldsa.warehouse_id = #{param.warehouseId} and ldpl.order_package_status != '70'
+            <if test="param.mallId != null and param.mallId != ''">  and ldsa.mall_id = #{param.mallId} </if>
+            <if test="param.genre != null and param.genre != ''">and  ldsa.genre = #{param.genre}</if>
+            <if test="param.isZero != null and param.isZero != ''">and ldsa.is_zero = #{param.isZero}</if>
+        </where>
+    </select>
+
+    <select id="selectDistributionParcelListPage" resultType="com.logpm.distribution.entity.DistributionParcelListEntity">
         SELECT
         ldpl.warehouse_id warehouseId,
         ldpl.id id,
@@ -268,11 +338,6 @@
         </where>
     </select>
 
-    <select id="exportDistributionParcelList" resultType="com.logpm.distribution.excel.DistributionParcelListExcel">
-        SELECT *
-        FROM logpm_distribution_parcel_list ${ew.customSqlSegment}
-    </select>
-
     <update id="submitNumByOrderIdAndName">
         update logpm_distribution_parcel_list
         set quantity = quantity - #{num}
@@ -708,5 +773,58 @@
         lwtg.tray_code,
         lwug.position_code;
     </select>
+    <select id="exportDistributionParcelList"
+            resultType="com.logpm.distribution.excel.DistributionParcelListExcel">
+        SELECT
+            ldpl.warehouse_id warehouseId,
+            ldpl.id id,
+            lww.name warehouse,
+            ldpl.conditions conditions,
+            ldpl.order_package_code orderPackageCode,
+            ldpl.firsts firsts,
+            ldpl.second second,
+            ldpl.third_product thirdProduct,
+            ldpl.quantity quantity,
+            ldpl.train_number trainNumber,
+            ldpl.stock_article_id stockArticleId,
+            ldpl.order_code orderCode,
+            ldpl.service_number serviceNumber,
+            ldpl.material_id materialId,
+            ldpl.material_name materialName,
+            ldpl.brand_name brandName,
+            ldpl.order_package_freeze_status orderPackageFreezeStatus,
+            ldpl.order_package_grounding_status orderPackageGroundingStatus,
+            ldpl.order_package_stockup_status orderPackageStockupStatus,
+            ldpl.order_package_reservation_status orderPackageReservationStatus,
+            ldpl.order_package_loading_status orderPackageLoadingStatus,
+            ldpl.waybill_number waybillNumber,
+            ldpl.warehouse_entry_time_end warehouseEntryTimeEnd,
+            ldpl.waybill_number waybillNumber,
+            lwug.position_code goodsAllocation,
+            lwtg.tray_code pallet
+        FROM
+            logpm_platform.logpm_distribution_parcel_list ldpl
+        LEFT JOIN logpm_platform.logpm_warehouse_updown_goods lwug ON ldpl.id = lwug.association_id
+        LEFT JOIN logpm_platform.logpm_warehouse_tray_goods lwtg ON ldpl.id = lwtg.association_id
+        Left join logpm_platform.logpm_warehouse_warehouse lww on lww.id = ldpl.warehouse_id
+        <where>
+            ldpl.is_deleted = 0
+            <if test="paramMap.warehouseId != null and paramMap.warehouseId != ''">
+                and ldpl.warehouse_id = #{paramMap.warehouseId}
+            </if>
+            <if test="paramMap.tenantId != null and paramMap.tenantId != ''">
+                and ldpl.tenant_id = #{paramMap.tenantId}
+            </if>
+            <if test="paramMap.serviceNumber != null and paramMap.serviceNumber != ''">
+                and ldpl.service_Number = #{paramMap.serviceNumber}
+            </if>
+            <if test="idArr != null and idArr != ''">
+                and ldpl.id in
+                <foreach collection="idArr" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
 
 </mapper>

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

@@ -55,7 +55,7 @@ public interface DistributionReservationMapper extends BaseMapper<DistributionRe
 	 * @param queryWrapper
 	 * @return
 	 */
-	List<DistributionReservationExcel> exportDistrbutionReservation(@Param("ew") Wrapper<DistributionReservationEntity> queryWrapper);
+	List<DistributionReservationVO> exportDistrbutionReservation(@Param("ew") Wrapper<DistributionReservationEntity> queryWrapper);
 
 	Integer addReservations(@Param("list")List<Long> toLongList);
 

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

@@ -73,8 +73,8 @@
     </select>
 
 
-    <select id="exportDistrbutionReservation" resultType="com.logpm.distribution.excel.DistributionReservationExcel">
-        SELECT * FROM logpm_distrbution_reservation ${ew.customSqlSegment}
+    <select id="exportDistrbutionReservation" resultType="com.logpm.distribution.vo.DistributionReservationVO">
+        SELECT * FROM logpm_distribution_reservation ${ew.customSqlSegment}
     </select>
     <!--    查询预约列表详情，包含订单信息，详细的增值服务-->
     <select id="getReservationDetail" resultType="com.logpm.distribution.vo.DistributionReservationVO">
@@ -927,7 +927,7 @@
     </select>
 
     <select id="getAllocationByStockArticleIdAndReservationId" resultType="java.lang.String">
-        select CONCAT(lwug.area_title,'-',lwug.shelf_title,'-',lwug.allocation_title)
+        select DISTINCT CONCAT(lwug.area_title,'-',lwug.shelf_title,'-',lwug.allocation_title)
         from logpm_distribution_reservation_package ldrp
          left join logpm_distribution_parcel_list ldpl on ldpl.id = ldrp.parce_list_id and ldpl.is_deleted = 0
          left join logpm_warehouse_updown_goods lwug on lwug.association_id = ldpl.id

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

@@ -56,7 +56,7 @@ public interface DistributionReservationPackageMapper extends BaseMapper<Distrib
 	 * @param queryWrapper
 	 * @return
 	 */
-	List<DistributionReservationPackageExcel> exportDistributionReservationPackage(@Param("ew") Wrapper<DistributionReservationPackageEntity> queryWrapper);
+	List<DistributionReservationPackageExcel> exportDistributionReservationPackage(@Param("param") DistributionReservationPackageDTO queryWrapper);
 
 	/**
 	 * 删除预约单和包件绑定关系
@@ -143,6 +143,8 @@ public interface DistributionReservationPackageMapper extends BaseMapper<Distrib
 
     List<DistributionParcelTrayVO> listPackageTray(@Param("reservationId") Long reservationId);
 
+    String getConcatThirdProductByOrderId(@Param("reservationId") Long reservationId,@Param("stockArticleId") Long stockArticleId);
+
 //	/**
 //	 * 根据预约ID和订单ID查询预约包件中间表
 //	 * @param id

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

@@ -42,9 +42,40 @@
     </select>
 
 
-    <select id="exportDistributionReservationPackage"
-            resultType="com.logpm.distribution.excel.DistributionReservationPackageExcel">
-        SELECT * FROM logpm_distribution_reservation_package ${ew.customSqlSegment}
+    <select id="exportDistributionReservationPackage" resultType="com.logpm.distribution.excel.DistributionReservationPackageExcel">
+      <!--  SELECT * FROM logpm_distribution_reservation_package ${ew.customSqlSegment}-->
+        select DISTINCT ldr.reservation_code reservationCode,ldr.reservation_date reservationDate,ldr.delivery_type deliveryType,ldr.consignee,ldr.delivery_address deliveryAddress
+        ,ldr.delivery_phone deliveryPhone,ldr.reservation_num reservationNum,ldr.warehouse_name warehouseName,
+        ldpl.waybill_number waybillNumber,ldpl.service_number serviceNumber,ldpl.order_code orderCode,ldpl.order_package_code orderPackageCode,ldpl.send_warehouse_name sendWarehouseName
+        ,ldpl.accept_warehouse_name acceptWarehouseName,ldpl.warehouse_entry_time_end warehouseEntryTimeEnd,
+        ldpl.train_number trainNumber,ldpl.firsts,ldpl.second,ldpl.third_product thirdProduct,ldpl.material_name materialName,ldpl.quantity, lwtg.tray_code trayCode,
+        lwug.position_code positionCode
+
+        from  logpm_distribution_reservation_package ldrp
+        LEFT JOIN logpm_distribution_reservation ldr on ldr.id = ldrp.reservation_id
+        LEFT JOIN logpm_distribution_parcel_list ldpl on ldpl.id = ldrp.parce_list_id
+        LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldpl.id and lwtg.warehouse_id = #{param.warehouseId}
+        LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldpl.id  and lwug.warehouse_id = #{param.warehouseId}
+        <where>
+            ldrp.packet_bar_status in (1,3)
+            <if test="param.reservationId != null and param.reservationId != ''"> and ldrs.reservation_id  = #{param.reservationId } </if>
+            <if test="param.waybillNumber != null and param.waybillNumber != ''"> and ldpl.waybill_number like concat('%',#{param.waybillNumber },'%')  </if>
+            <if test="param.serviceNumber != null and param.serviceNumber != ''"> and ldpl.service_number  like concat('%', #{param.serviceNumber },'%') </if>
+            <if test="param.orderCode != null and param.orderCode != ''"> and ldpl.order_code  like concat('%', #{param.orderCode },'%') </if>
+            <if test="param.warehouseName != null and param.warehouseName != ''"> and ldr.warehouse_name like concat('%', #{param.warehouseName },'%') </if>
+            <if test="param.orderPackageCode != null and param.orderPackageCode != ''"> and ldpl.order_package_code  like concat('%', #{param.orderPackageCode },'%') </if>
+            <if test="param.sendWarehouseName != null and param.sendWarehouseName != ''"> and ldpl.send_warehouse_name like concat('%', #{param.sendWarehouseName },'%') </if>
+            <if test="param.acceptWarehouseName != null and param.acceptWarehouseName != ''"> and ldpl.accept_warehouse_name like concat('%', #{param.acceptWarehouseName },'%') </if>
+            <if test="param.reservationDate != null "> and  date_format(ldr.reservation_date,'%Y-%m-%d') = #{param.reservationDate} </if>
+            <if test="param.trainNumber != null and param.trainNumber != ''"> and ldpl.train_number like concat('%', #{param.trainNumber },'%') </if>
+            <if test="param.firsts != null and param.firsts != ''"> and ldpl.firsts like concat('%', #{param.firsts },'%') </if>
+            <if test="param.second != null and param.second != ''"> and ldpl.second like concat('%', #{param.second } ,'%')</if>
+            <if test="param.thirdProduct != null and param.thirdProduct != ''"> and ldpl.third_product like concat('%', #{param.thirdProduct } ,'%')</if>
+            <if test="param.materialName != null and param.materialName != ''"> and ldpl.material_name like concat('%', #{param.materialName },'%') </if>
+            <if test="param.trayCode != null and param.trayCode != ''"> and lwtg.tray_code like concat('%',#{param.trayCode },'%') </if>
+            <if test="param.positionCode != null and param.positionCode != ''"> and lwug.position_code like concat('%', #{param.positionCode } ,'%')</if>
+        </where>
+
     </select>
     <select id="getReservationPackage" resultType="com.logpm.distribution.entity.DistributionParcelListEntity">
         SELECT
@@ -357,4 +388,15 @@ WHERE
 <!--    </select>-->
 
 
+    <select id="getConcatThirdProductByOrderId" resultType="String">
+        select GROUP_CONCAT(t.title)
+        from (select CONCAT(ldpl.third_product,'(',count(ldpl.id),')') title
+              from logpm_distribution_reservation_package ldrp
+                       left join logpm_distribution_parcel_list ldpl on ldrp.stock_article_id = ldpl.stock_article_id
+              where ldrp.reservation_id = #{reservationId}
+                and ldrp.stock_article_id = #{stockArticleId}
+                and ldrp.packet_bar_status != 2
+              group by ldpl.third_product) t
+    </select>
+
 </mapper>

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

@@ -19,6 +19,7 @@ package com.logpm.distribution.mapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.distribution.dto.DistributionReservationStockarticleDTO;
 import com.logpm.distribution.entity.DistributionReservationStockarticleEntity;
 import com.logpm.distribution.excel.DistributionReservationStockarticleExcel;
 import com.logpm.distribution.vo.DistributionReservationStockarticleVO;
@@ -52,7 +53,7 @@ public interface DistributionReservationStockarticleMapper extends BaseMapper<Di
 	 * @param queryWrapper
 	 * @return
 	 */
-	List<DistributionReservationStockarticleExcel> exportDistributionReservationStockarticle(@Param("ew") Wrapper<DistributionReservationStockarticleEntity> queryWrapper);
+	List<DistributionReservationStockarticleExcel> exportDistributionReservationStockarticle(@Param("param") DistributionReservationStockarticleDTO queryWrapper);
 
 	/**
 	 * 物理删除预约订单中间表

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

@@ -45,9 +45,31 @@
     </select>
 
 
-    <select id="exportDistributionReservationStockarticle"
-            resultType="com.logpm.distribution.excel.DistributionReservationStockarticleExcel">
-        SELECT * FROM logpm_distribution_reservation_stockarticle ${ew.customSqlSegment}
+    <select id="exportDistributionReservationStockarticle" resultType="com.logpm.distribution.excel.DistributionReservationStockarticleExcel">
+<!--        SELECT * FROM logpm_distribution_reservation_stockarticle ${ew.customSqlSegment}-->
+
+        select ldr.reservation_code reservationCode,ldr.reservation_date reservationDate,ldr.delivery_type deliveryType,ldr.consignee,ldr.delivery_address deliveryAddress
+        ,ldr.delivery_phone deliveryPhone,ldr.reservation_num reservationNum,
+        ldsa.waybill_number waybillNumber,ldsa.order_code orderCode,ldsa.mall_name mallName,ldsa.store_name storeName,ldsa.description_goods descriptionGoods,ldsa.brand,
+        ldsa.consignee_unit consigneeUnit ,ldsa.resource
+        from logpm_distribution_reservation ldr
+        LEFT JOIN logpm_distribution_reservation_stockarticle ldrs on ldr.id = ldrs.reservation_id
+        LEFT JOIN logpm_distribution_stock_article ldsa on ldsa.id = ldrs.stock_article_id
+        <where>
+            ldrs.stock_article_status in (1,3)
+            <if test="param.reservationId != null and param.reservationId != ''"> and ldrs.reservation_id  = #{param.reservationId } </if>
+            <if test="param.waybillNumber != null and param.waybillNumber != ''"> and ldsa.waybill_number like concat('%',#{param.waybillNumber },'%')  </if>
+            <if test="param.orderCode != null and param.orderCode != ''"> and ldsa.order_code  like concat('%', #{param.orderCode },'%') </if>
+            <if test="param.mallName != null and param.mallName != ''"> and ldsa.mall_name like concat('%', #{param.mallName },'%')  </if>
+            <if test="param.storeName != null and param.storeName != ''"> and ldsa.store_name  like concat('%', #{param.storeName },'%')  </if>
+            <if test="param.descriptionGoods != null and param.descriptionGoods != ''"> and  ldsa.description_goods like concat('%', #{param.descriptionGoods },'%')  </if>
+            <if test="param.brand != null and param.brand != ''"> and ldsa.brand  like concat('%', #{param.brand },'%')  </if>
+            <if test="param.consigneeUnit != null and param.consigneeUnit != ''"> and ldsa.consignee_unit like concat('%', #{param.consigneeUnit },'%')  </if>
+            <if test="param.resource != null and param.resource != ''"> and ldsa.resource like concat('%',#{param.resource },'%')  </if>
+            <if test="param.deliveryType != null and param.deliveryType != ''"> and ldr.delivery_type = #{param.deliveryType} </if>
+        </where>
+
+
     </select>
     <select id="selectDistributionReservationStockarticleorderPage"
             resultType="com.logpm.distribution.vo.DistributionReservationStockarticleVO">