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

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataGoodsAreaClient.java

@@ -17,6 +17,7 @@
 package com.logpm.basicdata.feign;
 
 import com.logpm.basicdata.entity.BasicdataGoodsAreaEntity;
+import com.logpm.basicdata.vo.BasicdataGoodsAreaVO;
 import org.springblade.common.constant.ModuleNameConstant;
 import org.springblade.core.mp.support.BladePage;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -25,6 +26,8 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.List;
+
 /**
  * 货区 Feign接口类
  *
@@ -38,6 +41,7 @@ public interface IBasicdataGoodsAreaClient {
 
     String API_PREFIX = "goodsArea/client";
     String TOP = API_PREFIX + "/top";
+    String GETDEPARTMENTID = API_PREFIX + "/departmentId";
 
     /**
      * 获取货区列表
@@ -55,4 +59,12 @@ public interface IBasicdataGoodsAreaClient {
 	@GetMapping(API_PREFIX+"/getEntityByGoodsAreaId")
     BasicdataGoodsAreaEntity getEntityByGoodsAreaId(@RequestParam Long goodsAreaId);
 
+	/**
+	 * 根据部门id查询备货区
+	 * @param goodsAreaId
+	 * @return
+	 */
+	@GetMapping(GETDEPARTMENTID)
+	List<BasicdataGoodsAreaVO> getDepartmentId(@RequestParam Long goodsAreaId);
+
 }

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

@@ -77,9 +77,9 @@ public class DistributionStockupEntity extends TenantEntity {
 	@ApiModelProperty(value = "备货库位")
 	private String stockipAllocation;
 	/**
-	 * 预约信息编号
+	 * 备货区ID
 	 */
-	@ApiModelProperty(value = "预约信息编号")
+	@ApiModelProperty(value = "备货区ID")
 	private Long goodsAreaId;
 	/**
 	 * 预留1

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

@@ -0,0 +1,17 @@
+package com.logpm.distribution.vo;
+
+import lombok.Data;
+
+/**
+ * @program: LogisticsPlatform-Service
+ * @description: 客户货物托盘
+ * @author: cyz
+ * @create: 2023-08-24 11:32
+ **/
+@Data
+public class DistributionParcelTrayVO {
+	private String trayId; //托盘id
+	private String trayCode; //托盘名称
+	private String trayPackNum; //托盘名称
+
+}

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

@@ -105,6 +105,12 @@ public class DistributionStockArticleVO extends DistributionStockArticleEntity {
 	@ApiModelProperty(value = "是否齐套名称")
 	private String completeSetName;
 
+	/**
+	 * 配送司机
+	 */
+	@ApiModelProperty(value = "配送司机")
+	private String driverName;
+
 	/**
 	 * 所有包件信息
 	 */

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

@@ -7,6 +7,7 @@ import java.io.Serializable;
 @Data
 public class DistributionStockupListVO implements Serializable {
 
+	private Long id;//预约单id
 	private Long reservationId;//预约单id
 	private String reservation;//预约单id
 

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

@@ -32,4 +32,8 @@ public class DistributionStockupOrderListVO implements Serializable {
 	@ApiModelProperty(value = "扫描件数")
 	private Integer scanNum;//扫描件数
 
+	private Long areaId; //货区id
+	private Long shelfId; //货架id
+	private Long allocationId; //货位id
+
 }

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

@@ -24,6 +24,8 @@ public class DistributionStockupStockListVO implements Serializable {
 
 	private String  trayName;//托盘信息
 
+	private Boolean  trayLean;//整托状态
+
 	private Integer unpack;//是否拆包 0 没有 1 拆了
 
 }

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

@@ -1,438 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package com.logpm.warehouse.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springblade.core.tenant.mp.TenantEntity;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 配送在库订单 实体类
- *
- * @author cyz
- * @since 2023-06-13
- */
-@Data
-@TableName("logpm_distribution_stock_article")
-@ApiModel(value = "WarehouseStockArticleCopyEntity对象", description = "配送在库订单")
-@EqualsAndHashCode(callSuper = true)
-public class WarehouseStockArticleCopyEntity extends TenantEntity {
-
-	/**
-	 * 预留1
-	 */
-	@ApiModelProperty(value = "预留1")
-	private String reserve1;
-	/**
-	 * 预留2
-	 */
-	@ApiModelProperty(value = "预留2")
-	private String reserve2;
-	/**
-	 * 预留3
-	 */
-	@ApiModelProperty(value = "预留3")
-	private String reserve3;
-	/**
-	 * 预留4
-	 */
-	@ApiModelProperty(value = "预留4")
-	private String reserve4;
-	/**
-	 * 预留5
-	 */
-	@ApiModelProperty(value = "预留5")
-	private String reserve5;
-
-	/**
-	 * 创建用户名称
-	 */
-	@ApiModelProperty(value = "创建用户名称 ")
-	@TableField(exist = false)
-	private String createUserName;
-
-	/**
-	 * 服务号
-	 */
-	@ApiModelProperty(value = "服务号")
-	private String serviceNumber;
-	/**
-	 * 订单自编号
-	 */
-	@ApiModelProperty(value = "订单自编号")
-	private String orderCode;
-	/**
-	 * 寄件信息
-	 */
-	@ApiModelProperty(value = "寄件信息")
-	private String sending;
-
-	/**
-	 * 门店id
-	 */
-	@ApiModelProperty(value = "门店id")
-	private Long storeId;
-
-
-	/**
-	 * 商场id
-	 */
-	@ApiModelProperty(value = "商场id")
-	private Long mallId;
-
-	/**
-	 * 商场名称
-	 */
-	@ApiModelProperty(value = "商场名称")
-	private String mallName;
-	/**
-	 * 商场编号
-	 */
-	@ApiModelProperty(value = "商场编码")
-	private String mallCode;
-
-
-	/**
-	 * 门店编号
-	 */
-	@ApiModelProperty(value = "门店编码")
-	private String storeCode;
-
-
-	/**
-	 * 门店名称
-	 */
-	@ApiModelProperty(value = "门店名称")
-	private String storeName;
-	/**
-	 * 货物名称
-	 */
-	@ApiModelProperty(value = "货物名称")
-	private String descriptionGoods;
-	/**
-	 * 仓库
-	 */
-	@ApiModelProperty(value = "仓库")
-	private String warehouse;
-	/**
-	 * 车次号
-	 */
-	@ApiModelProperty(value = "车次号")
-	private String trainNumber;
-
-	/**
-	 * 仓库ID
-	 */
-	@ApiModelProperty(value = "仓库ID")
-	private Long warehouseId;
-
-
-
-	/**
-	 * 入库时间
-	 */
-	@ApiModelProperty(value = "入库时间")
-	@JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
-	private Date warehouseEntryTime;
-	/**
-	 * 在库时间
-	 */
-	@ApiModelProperty(value = "在库时间")
-	private String storeTime;
-	/**
-	 * 订单总件数
-	 */
-	@ApiModelProperty(value = "订单总件数")
-	private Integer totalNumber;
-	/**
-	 * 在库件数
-	 */
-	@ApiModelProperty(value = "在库件数")
-	private Integer handQuantity;
-	/**
-	 * 是否齐套
-	 */
-	@ApiModelProperty(value = "是否齐套")
-	private Integer completeSet;
-
-	/**
-	 * 品牌
-	 */
-	@ApiModelProperty(value = "品牌")
-	private String brand;
-	/**
-	 * 服务类型
-	 */
-	@ApiModelProperty(value = "服务类型")
-	private String typeService;
-	/**
-	 * 顾客名字
-	 */
-	@ApiModelProperty(value = "顾客名字")
-	private String customerName;
-	/**
-	 * 顾客电话
-	 */
-	@ApiModelProperty(value = "顾客电话")
-	private String customerTelephone;
-	/**
-	 * 顾客地址
-	 */
-	@ApiModelProperty(value = "顾客地址")
-	private String customerAddress;
-	/**
-	 * 类型;1 预约单  2库存单
-	 */
-	@ApiModelProperty(value = "类型;1 预约单  2库存单")
-	private Integer genre;
-
-//	/**
-//	 * 状态;1 配送 2 待配送 3部分入库 4已入库
-//	 */
-//	@ApiModelProperty(value = "状态;1 配送 2 待配送 3部分入库 4已入库")
-//	@TableField(exist = false)
-//	private String stateName;
-
-	/**
-	 * 状态;1 已通知 2 未通知
-	 */
-	@ApiModelProperty(value = "状态;1 已通知 2 未通知")
-	private Integer notification;
-
-	/**
-	 * 增值服务总费用
-	 */
-	@ApiModelProperty(value = "增值服务总费用")
-	private BigDecimal fee;
-
-	/**
-	 * 协商费用
-	 */
-	@ApiModelProperty(value = "协商费用")
-	private BigDecimal rate;
-
-	/**
-	 * 老系统advanceId
-	 */
-	@ApiModelProperty(value = "老系统advanceId")
-	private Integer advanceId;
-	/**
-	 * 预约数量
-	 */
-	@TableField(exist = false)
-	@ApiModelProperty(value = "预约数量")
-	private Integer reservationNum;
-	/**
-	 * 运单号
-	 */
-	@ApiModelProperty(value = "运单号")
-	private String waybillNumber;
-	/**
-	 * 收货单位
-	 */
-	@ApiModelProperty(value = "收货单位")
-	private String consigneeUnit;
-	/**
-	 * 到付费用
-	 */
-	@ApiModelProperty(value = "到付费用")
-	private BigDecimal collectFee;
-	/**
-	 * 仓储费
-	 */
-	@ApiModelProperty(value = "仓储费")
-	private BigDecimal storageFee;
-
-
-
-
-
-
-
-	//-------------2023-07-16 新增在库订单字段
-
-	/**
-	 * 收货人
-	 */
-	@ApiModelProperty(value = "收货人")
-	private String consigneePerson;
-
-	/**
-	 * 收货人地址
-	 */
-	@ApiModelProperty(value = "收货人地址")
-	private String consigneeAddress;
-
-
-	/**
-	 * 收货人电话
-	 */
-	@ApiModelProperty(value = "收货人电话")
-	private String consigneeMobile;
-
-
-
-	// -----------2023-07-18 增加字段
-
-
-
-	@ApiModelProperty(value = "经销商名称")
-	private String dealerName;
-
-	@ApiModelProperty(value = "经销商编码")
-	private String dealerCode;
-
-
-
-	/**
-	 * 可用数量(在库数-已经预约的包件数)
-	 */
-	@ApiModelProperty(value = "可用数量")
-	private Integer availableQuantity;
-
-	/**
-	 * 入库时间-终
-	 */
-	@ApiModelProperty(value = "入库时间-终")
-	@JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
-	private Date warehouseEntryTimeEnd;
-
-	/**
-	 * 分拣件数
-	 */
-	@ApiModelProperty(value = "分拣件数")
-	private Integer sortingQuantity;
-
-	/**
-	 * 配送件数
-	 */
-	@ApiModelProperty(value = "配送件数")
-	private Integer deliveryQuantity;
-
-	/**
-	 * 中转件数
-	 */
-	@ApiModelProperty(value = "中转件数")
-	private Integer transferQuantity;
-
-	/**
-	 * 签收件数
-	 */
-	@ApiModelProperty(value = "签收件数")
-	private Integer signinQuantity;
-
-
-
-	/**
-	 * 货位信息
-	 */
-	@ApiModelProperty(value = "货位信息")
-	private String allocation;
-
-	/**
-	 * 订单来源
-	 */
-	@ApiModelProperty(value = "订单来源")
-	private String resource;
-
-	/**
-	 * 托盘
-	 */
-	@ApiModelProperty(value = "托盘")
-	private String trays;
-
-	/**
-	 * 干仓配
-	 */
-	@ApiModelProperty(value = "干仓配")
-	private Integer isOpai;
-
-
-	/**
-	 * 盘点时间
-	 */
-	@ApiModelProperty(value = "盘点时间")
-	private Date inventoryDate;
-
-	/**
-	 * 盘点人
-	 */
-	@ApiModelProperty(value = "盘点人")
-	private String inventoryPerson;
-
-	/**
-	 * 盘点人id
-	 */
-	@ApiModelProperty(value = "盘点人id")
-	private Long inventoryPersonId;
-
-	@ApiModelProperty(value = "冻结状态")
-	private String freezeStatus;
-	/**
-	 * 上架状态
-	 */
-	@ApiModelProperty(value = "上架状态")
-	private String groundingStatus;
-
-
-	@ApiModelProperty(value = "订单状态")
-	private String orderStatus;
-
-	@ApiModelProperty(value = "预约状态")
-	private String reservationStatus;
-
-	@ApiModelProperty(value = "备货状态")
-	private String stockupStatus;
-
-	@ApiModelProperty(value = "收货状态")
-	private String orderReceiveStatus;
-
-
-
-
-
-	/**
-	 * 有无数据源
-	 */
-	@ApiModelProperty(value = "有无数据源；1-否、2-是")
-	private Integer isHaveData;
-
-	/**
-	 * 订单码
-	 */
-	@ApiModelProperty(value = "订单码")
-	private String stockArticleCode;
-	/**
-	 * 工厂车次
-	 */
-	@ApiModelProperty(value = "工厂车次")
-	private String factoryTrain;
-	@ApiModelProperty(value = "是否零担 0否 1是")
-	private String isZero;//是否零担 0否 1是
-
-
-
-
-}

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

@@ -0,0 +1,185 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  ReWarehouse and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  ReWarehouses of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  ReWarehouses 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 Warehouse.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.warehouse.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+/**
+ * 备货扫描记录 实体类
+ *
+ * @author lmy
+ * @since 2023-08-24
+ */
+@Data
+@TableName("logpm_distribution_stock")
+@ApiModel(value = "WarehouseStock对象", description = "备货扫描记录")
+@EqualsAndHashCode(callSuper = true)
+public class WarehouseStockEntity extends TenantEntity {
+
+	/**
+	 *
+	 */
+	@ApiModelProperty(value = "")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ApiModelProperty(value = "预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ApiModelProperty(value = "预留3")
+	private String reserve3;
+	/**
+	 *
+	 */
+	@ApiModelProperty(value = "")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ApiModelProperty(value = "预留5")
+	private String reserve5;
+	/**
+	 * 货位信息
+	 */
+	@ApiModelProperty(value = "货位信息")
+	private String goodsAllocation;
+	/**
+	 * 在库订单ID
+	 */
+	@ApiModelProperty(value = "在库订单ID")
+	private String stockArticle;
+	/**
+	 * 包条码
+	 */
+	@ApiModelProperty(value = "包条码")
+	private String coding;
+	/**
+	 *  状态 1 配送  2自提
+	 */
+	@ApiModelProperty(value = " 状态 1 配送  2自提")
+	private Integer conditions;
+	/**
+	 * 货物名称
+	 */
+	@ApiModelProperty(value = "货物名称")
+	private String goodsName;
+	/**
+	 * 库存品ID
+	 */
+	@ApiModelProperty(value = "库存品ID")
+	private String stockListId;
+	/**
+	 * 拆包数
+	 */
+	@ApiModelProperty(value = "拆包数")
+	private Integer unpackingQuantity;
+	/**
+	 * 在库包件ID
+	 */
+	@ApiModelProperty(value = "在库包件ID")
+	private Long parcelListId;
+	/**
+	 * 单位
+	 */
+	@ApiModelProperty(value = "单位")
+	private String unit;
+	/**
+	 * 工厂车次(无用)
+	 */
+	@ApiModelProperty(value = "工厂车次(无用)")
+	private String factory;
+	/**
+	 * 物流车次（无用）
+	 */
+	@ApiModelProperty(value = "物流车次（无用）")
+	private String logistics;
+	/**
+	 * 商城名称（无用）
+	 */
+	@ApiModelProperty(value = "商城名称（无用）")
+	private String mallName;
+	/**
+	 * 订单自编号
+	 */
+	@ApiModelProperty(value = "订单自编号")
+	private String orderSelfNumbering;
+	/**
+	 * 预约id
+	 */
+	@ApiModelProperty(value = "预约id")
+	private Long reservationId;
+	/**
+	 * 预约单号
+	 */
+	@ApiModelProperty(value = "预约单号")
+	private String reservationCode;
+	/**
+	 * 出库类型 1商 2市 3自
+	 */
+	@ApiModelProperty(value = "出库类型 1商 2市 3自")
+	private String outboundType;
+	/**
+	 * 配送ID
+	 */
+	@ApiModelProperty(value = "配送ID")
+	private Long deliveryListId;
+	/**
+	 * 配送编号
+	 */
+	@ApiModelProperty(value = "配送编号")
+	private String deliveryListCode;
+	/**
+	 * 备货区
+	 */
+	@ApiModelProperty(value = "备货区")
+	private String stockupArea;
+	/**
+	 * 自提ID
+	 */
+	@ApiModelProperty(value = "自提ID")
+	private Long billLadingId;
+	/**
+	 * 扫码类型 1包件 2库存品
+	 */
+	@ApiModelProperty(value = "扫码类型 1包件 2库存品")
+	private String type;
+	/**
+	 * 物料id
+	 */
+	@ApiModelProperty(value = "物料id")
+	private Long materialId;
+	/**
+	 * 商场/客户
+	 */
+	@ApiModelProperty(value = "商场/客户")
+	private Long marketId;
+	/**
+	 * 备货id
+	 */
+	@ApiModelProperty(value = "备货id")
+	private Long stockupId;
+
+}

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

@@ -1,286 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package com.logpm.warehouse.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springblade.core.tenant.mp.TenantEntity;
-
-import java.util.Date;
-
-/**
- * 库存品管理 实体类
- *
- * @author cyz
- * @since 2023-06-15
- */
-@Data
-@TableName("logpm_distribution_stock_list")
-@ApiModel(value = "DistributionStockList对象", description = "库存品管理")
-@EqualsAndHashCode(callSuper = true)
-public class WarehouseStockListCopyEntity extends TenantEntity {
-
-	/**
-	 * 预留1
-	 */
-	@ApiModelProperty(value = "预留1")
-	private String reserve1;
-	/**
-	 * sku
-	 */
-	@ApiModelProperty(value = "sku")
-	private String sku;
-	/**
-	 * 预留2
-	 */
-	@ApiModelProperty(value = "预留2")
-	private String reserve2;
-	/**
-	 * 预留3
-	 */
-	@ApiModelProperty(value = "预留3")
-	private String reserve3;
-	/**
-	 * 预留4
-	 */
-	@ApiModelProperty(value = "预留4")
-	private String reserve4;
-	/**
-	 * 预留5
-	 */
-	@ApiModelProperty(value = "预留5")
-	private String reserve5;
-	/**
-	 * 服务类型
-	 */
-	@ApiModelProperty(value = "服务类型")
-	private String serviceType;
-	/**
-	 * 订单自编号
-	 */
-	@ApiModelProperty(value = "订单自编号")
-	private String orderCode;
-	/**
-	 * 在库订单ID
-	 */
-	@ApiModelProperty(value = "在库订单ID")
-	private Long stockArticleId;
-	/**
-	 * 在库订单ID
-	 */
-	@ApiModelProperty(value = "在库订单ID")
-	private Long parcelListId;
-	/**
-	 * 入库批次号
-	 */
-	@ApiModelProperty(value = "入库批次号")
-	private String incomingBatch;
-	/**
-	 * 货物名称
-	 */
-	@ApiModelProperty(value = "货物名称")
-	private String descriptionGoods;
-	/**
-	 * 货物规则
-	 */
-	@ApiModelProperty(value = "货物规则")
-	private String cargoNorms;
-
-	/**
-	 * 车牌
-	 */
-	@ApiModelProperty(value = "车牌")
-	private String licensePlate;
-	/**
-	 * 品牌名称
-	 */
-	@ApiModelProperty(value = "品牌名称")
-	private String brandName;
-	/**
-	 * 品牌Id
-	 */
-	@ApiModelProperty(value = "品牌ID")
-	private Long brandId;
-	/**
-	 * 入库时间
-	 */
-	@ApiModelProperty(value = "入库时间")
-	private Date warehousingTime;
-	/**
-	 * 上架时间
-	 */
-	@ApiModelProperty(value = "上架时间")
-	private Date groundingTime;
-	/**
-	 * 拆包数
-	 */
-	@ApiModelProperty(value = "拆包数")
-	private Integer unpackingQuantity;
-	/**
-	 * 货物编号
-	 */
-	@ApiModelProperty(value = "货物编号")
-	private String cargoNumber;
-	/**
-	 * 货物ID
-	 */
-	@ApiModelProperty(value = "货物id")
-	private Long materialId;
-
-
-	@ApiModelProperty(value = "仓库Id")
-	private Long warehouseId;
-//	/**
-//	 * 拆分包件
-//	 */
-//	@ApiModelProperty(value = "拆分包件")
-//	@TableField(exist = false)
-//	private List<DistributionStockEntity> parcels;
-	/**
-	 * 工厂车次
-	 */
-	@ApiModelProperty(value = "工厂车次")
-	private String factory;
-	/**
-	 * 品分类
-	 */
-	@ApiModelProperty(value = "品分类")
-	private String category;
-	/**
-	 * 商场ID
-	 */
-	@ApiModelProperty(value = "商场ID")
-	private Long marketId;
-	/**
-	 * 货物单位
-	 */
-	@ApiModelProperty(value = "货物单位")
-	private String cargoUnit;
-//	/**
-//	 * 门店
-//	 */
-//	@ApiModelProperty(value = "门店")
-//	private String shop;
-	/**
-	 * 库位信息
-	 */
-	@ApiModelProperty(value = "库位信息")
-	private String storageLocation;
-	/**
-	 * 商城名称
-	 */
-	@ApiModelProperty(value = "商城名称")
-	private String mallName;
-	/**
-	 * 拆包状态
-	 */
-	@ApiModelProperty(value = "拆包")
-	private Boolean unpack;
-	/**
-	 * 库存数量
-	 */
-	@ApiModelProperty(value = "库存数量")
-	private Integer quantityStock;
-	/**
-	 * 出库数量
-	 */
-	@ApiModelProperty(value = "出库数量")
-	private Integer outboundQuantity;
-	/**
-	 * 发运车次
-	 */
-	@ApiModelProperty(value = "发运车次")
-	private String despatch;
-	/**
-	 * 服务号
-	 */
-	@ApiModelProperty(value = "服务号")
-	private String serviceNumber;
-
-	/**
-	 * 预约数量
-	 */
-	@ApiModelProperty(value = "预约数量")
-	@TableField(exist = false)
-	private Integer reservationNum;
-	/**
-	 * 仓库名称
-	 */
-	@ApiModelProperty(value = "仓库名称")
-	private String warehouseName;
-	/**
-	 * 门店ID
-	 */
-	@ApiModelProperty(value = "门店ID")
-	private Long storeId;
-	/**
-	 * 所属商场
-	 */
-	@ApiModelProperty(value = "所属商场")
-	private Long  shoppingMall;
-	/**
-	 * 商场编码
-	 */
-	@ApiModelProperty(value = "商场编码")
-	private String marketCode;
-	/**
-	 * 商场名称
-	 */
-	@ApiModelProperty(value = "商场名称")
-	private String marketName;
-	/**
-	 * 门店编码
-	 */
-	@ApiModelProperty(value = "门店编码")
-	private String storeCode;
-
-	/**
-	 * 门店名称
-	 */
-	@ApiModelProperty(value = "门店名称")
-	private String storeName;
-
-	/**
-	* 冻结数量
-	*/
-	@ApiModelProperty(value = "冻结数量")
-	private Integer quantityOccupied;
-
-	/**
-	 * 拆包ID
-	 */
-	@ApiModelProperty(value = "拆包ID")
-	private Long pid;
-	/**
-	 * 托盘ID
-	 */
-	@ApiModelProperty(value = "托盘ID")
-	private Long trayId;
-	/**
-	 * 托盘名称
-	 */
-	@ApiModelProperty(value = "托盘名称")
-	private String trayName;
-
-
-
-
-}

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

@@ -0,0 +1,50 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  ReWarehouse and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  ReWarehouses of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  ReWarehouses 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 Warehouse.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.warehouse.feign;
+
+import org.springblade.common.constant.ModuleNameConstant;
+import org.springblade.core.mp.support.BladePage;
+import com.logpm.warehouse.entity.WarehouseStockEntity;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 备货扫描记录 Feign接口类
+ *
+ * @author lmy
+ * @since 2023-08-24
+ */
+@FeignClient(
+	value = ModuleNameConstant.APPLICATION_WAREHOUSE_NAME
+)
+public interface IWarehouseStockClient {
+
+    String API_PREFIX = "WarehouseStock/client";
+    String TOP = API_PREFIX + "/top";
+
+    /**
+     * 获取备货扫描记录列表
+     *
+     * @param current   页号
+     * @param size      页数
+     * @return BladePage
+     */
+    @GetMapping(TOP)
+    BladePage<WarehouseStockEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
+
+}

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

@@ -0,0 +1,31 @@
+package com.logpm.warehouse.feign;
+
+
+import com.logpm.warehouse.entity.WarehouseTaryAllocationEntity;
+import org.springblade.common.constant.ModuleNameConstant;
+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.RequestParam;
+
+import java.util.List;
+
+@FeignClient(
+	value = ModuleNameConstant.APPLICATION_WAREHOUSE_NAME
+)
+public interface IWarehouseTaryAllocationClient {
+
+	String API_PREFIX = "/client";
+	String TOP = API_PREFIX + "/top";
+	String GETALLOCATIONID = API_PREFIX + "/allocationId";
+
+	/**
+	 * 查询货位上的托盘
+	 * @param allocationId
+	 * @return
+	 */
+	@PostMapping(GETALLOCATIONID)
+	List<WarehouseTaryAllocationEntity> getAllocationId(@RequestParam Long allocationId);
+
+
+}

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

@@ -17,6 +17,7 @@
 package com.logpm.warehouse.feign;
 
 
+import com.logpm.warehouse.entity.WarehouseTrayGoodsEntity;
 import org.springblade.common.constant.ModuleNameConstant;
 
 import org.springframework.cloud.openfeign.FeignClient;
@@ -25,6 +26,8 @@ import org.springframework.web.bind.annotation.PostMapping;
 
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.List;
+
 /**
  * 托盘 货物 绑定 Feign接口类
  *
@@ -38,6 +41,7 @@ public interface IWarehouseTrayGoodsClient {
 
 	String API_PREFIX = "warehousetraygoods/client";
 	String TOP = API_PREFIX + "/top10";
+	String GETTRAYIDLIST = API_PREFIX + "/trayIdList";
 
 	/**
 	 * 通过主键删除
@@ -62,5 +66,11 @@ public interface IWarehouseTrayGoodsClient {
 	 */
 	@PostMapping(TOP+"/delByTrayByCode")
 	Boolean delByTrayByCode(@RequestParam String code);
+	/**
+	 * 通过托盘id查询托盘上面的货物
+	 * @param trayId
+	 */
+	@PostMapping(GETTRAYIDLIST)
+	List<WarehouseTrayGoodsEntity> getTrayIdList(@RequestParam Long trayId);
 
 }

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

@@ -19,7 +19,6 @@ package com.logpm.warehouse.vo;
 
 import com.logpm.distribution.entity.DistributionStockArticleEntity;
 
-import com.logpm.warehouse.entity.WarehouseStockArticleCopyEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -37,8 +36,8 @@ import java.util.List;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "WarehouseStockArticleCopyVO对象", description = "配送在库订单")
+@ApiModel(value = "WarehouseStockArticleZationVO对象", description = "可视化配送在库订单")
-public class WarehouseStockArticleCopyVO extends WarehouseStockArticleCopyEntity{
+public class WarehouseStockArticleZationVO extends DistributionStockArticleEntity{
 	private static final long serialVersionUID = 1L;
 
 	/**

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

@@ -17,7 +17,7 @@
 package com.logpm.warehouse.vo;
 
 
-import com.logpm.warehouse.entity.WarehouseStockListCopyEntity;
+import com.logpm.distribution.entity.DistributionStockListEntity;;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -31,8 +31,8 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "WarehouseStockListCopyVO对象", description = "库存品管理VO")
+@ApiModel(value = "WarehouseStockListZationVO对象", description = "可视化库存品管理")
-public class WarehouseStockListCopyVO extends WarehouseStockListCopyEntity {
+public class WarehouseStockListZationVO extends DistributionStockListEntity {
 	private static final long serialVersionUID = 1L;
 	/**
 	 * 备货数

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

@@ -1,14 +1,14 @@
 /*
  *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
  *
- *  Redistribution and use in source and binary forms, with or without
+ *  ReWarehouse 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,
+ *  ReWarehouses 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
+ *  ReWarehouses 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.
+ *  documentation and/or other materials provided with the Warehouse.
  *  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.
@@ -16,19 +16,20 @@
  */
 package com.logpm.warehouse.vo;
 
-import com.logpm.distribution.entity.DistributionStockEntity;
+import com.logpm.warehouse.entity.WarehouseStockEntity;
+import org.springblade.core.tool.node.INode;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * 库存品详情信息 视图实体类
+ * 备货扫描记录 视图实体类
  *
- * @author cyz
+ * @author lmy
- * @since 2023-06-26
+ * @since 2023-08-24
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class WarehouseStockVO extends DistributionStockEntity {
+public class WarehouseStockVO extends WarehouseStockEntity {
 	private static final long serialVersionUID = 1L;
 
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataGoodsAreaClient.java

@@ -19,6 +19,9 @@ package com.logpm.basicdata.feign;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.basicdata.entity.BasicdataGoodsAreaEntity;
 import com.logpm.basicdata.service.IBasicdataGoodsAreaService;
+import com.logpm.basicdata.vo.BasicdataGoodsAreaVO;
+import com.logpm.basicdata.wrapper.WarehouseGoodsAreaWrapper;
+import com.logpm.warehouse.entity.WarehouseGoodsAreaEntity;
 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实现类
  *
@@ -65,4 +70,18 @@ public class BasicdataGoodsAreaClient implements IBasicdataGoodsAreaClient {
 		return basicdataGoodsAreaService.getById(goodsAreaId);
 	}
 
+	/**
+	 * 查询部门备货区
+	 * @param goodsAreaId
+	 * @return
+	 */
+	@Override
+	@GetMapping(GETDEPARTMENTID)
+	public List<BasicdataGoodsAreaVO> getDepartmentId(Long goodsAreaId) {
+		BasicdataGoodsAreaEntity warehouseWarehouse = new BasicdataGoodsAreaEntity();
+		warehouseWarehouse.setDepartment(String.valueOf(goodsAreaId));
+		List<BasicdataGoodsAreaVO> pages = basicdataGoodsAreaService.stockUp(warehouseWarehouse);
+		return pages;
+	}
+
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml

@@ -33,9 +33,8 @@
     <select id="stockUp" resultType="com.logpm.basicdata.vo.BasicdataGoodsAreaVO">
         select wga.id,wga.headline ,wga.enable_status ,wga.area_type ,ww.name
         from logpm_warehouse_goods_area wga
-                 left JOIN logpm_warehouse_warehouse ww on wga.warehouse_id = ww.id
+        left JOIN logpm_warehouse_warehouse ww on wga.warehouse_id = ww.id
-        where warehouse_id in (select id
+        where wga.warehouse_id in (select id from logpm_warehouse_warehouse where department = #{par.department})
-                               from logpm_warehouse_warehouse where department = #{par.department})
           and wga.area_type = 1 and wga.enable_status = 1
     </select>
 

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

@@ -19,11 +19,14 @@ package com.logpm.distribution.appcontroller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.logpm.basicdata.feign.IBasicdataGoodsAreaClient;
+import com.logpm.basicdata.vo.BasicdataGoodsAreaVO;
 import com.logpm.distribution.bean.Resp;
 import com.logpm.distribution.dto.app.StockupDTO;
 import com.logpm.distribution.entity.DistributionReservationEntity;
 import com.logpm.distribution.entity.DistributionStockEntity;
 import com.logpm.distribution.entity.DistributionStockListEntity;
+import com.logpm.distribution.entity.DistributionStockupEntity;
 import com.logpm.distribution.service.*;
 import com.logpm.distribution.vo.*;
 import io.swagger.annotations.Api;
@@ -34,6 +37,7 @@ import org.springblade.common.constant.DictBizConstant;
 import org.springblade.common.constant.RabbitConstant;
 import org.springblade.common.utils.CommonUtil;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.system.cache.DictBizCache;
@@ -58,6 +62,7 @@ public class DistributionStockupAppController extends BladeController {
 	private final IDistributionStockupService distributionStockupService;
 
 	private final IDistributionReservationService distributionReservationService;
+	private final IBasicdataGoodsAreaClient basicdataGoodsAreaClient;
 
 	private final IDistributionStockService distributionStockService;
 	private final IDistributionReservationPackageService distributionReservationPackageService;
@@ -103,7 +108,7 @@ public class DistributionStockupAppController extends BladeController {
 	public R<Map<String,Object>> homePageList(@RequestBody StockupDTO stockupDTO) {
 //		Integer current = stockupDTO.getCurrent();
 //		Integer size = stockupDTO.getSize();
-		String stockupId = stockupDTO.getStockupId();
+		Long stockupId = stockupDTO.getStockupId();
 //		if(Objects.isNull(current)){
 //			log.info("#################pageList: 当前页码不能为空");
 //			return R.fail(401,"当前页码不能为空");
@@ -143,7 +148,8 @@ public class DistributionStockupAppController extends BladeController {
 			for (DistributionStockupOrderListVO vo:list){
 				planNum = planNum + vo.getPlanNum();
 				scanNum = scanNum + vo.getScanNum();
-				Boolean aBoolean = distributionReservationPackageService.selectClientStockupState(reservationId, vo.getStockArticleId());
+				Boolean aBoolean = distributionStockupService.getClientStockupTray(reservationId, vo.getAllocationId());
+//				Boolean aBoolean = distributionReservationPackageService.selectClientStockupState(reservationId, vo.getStockArticleId());
 				vo.setTrayLean(aBoolean);
 			}
 			map.put("planNum",planNum);
@@ -158,6 +164,8 @@ public class DistributionStockupAppController extends BladeController {
 			for (DistributionStockupStockListVO vo:list){
 				planNum = planNum + vo.getPlanNum();
 				scanNum = scanNum + vo.getRealNum();
+//				Boolean aBoolean = distributionStockupService.getClientStockupTray(reservationId, vo.getAllocationId());
+//				vo.setTrayLean(aBoolean);
 			}
 			map.put("planNum",planNum);
 			map.put("scanNum",scanNum);
@@ -240,8 +248,8 @@ public class DistributionStockupAppController extends BladeController {
 		return R.data(list);
 	}
 
-	@PostMapping("scanningCode")
+	@PostMapping("/scanningCode")
-	@ApiOperation(value = "整托扫码")
+	@ApiOperation(value = "整托备货")
 	public R scanningCodelist(@RequestBody StockupDTO stockupDTO){
 		if(ObjectUtils.isNull(stockupDTO.getStockupId())){
 			return R.fail(3002,"备货id不能为空");
@@ -249,12 +257,48 @@ public class DistributionStockupAppController extends BladeController {
 		if(ObjectUtils.isNull(stockupDTO.getReservationId())){
 			return R.fail(3002,"预约Id不能为空");
 		}
-		if(ObjectUtils.isNull(stockupDTO.getTrayBarCode())){
+		if(ObjectUtils.isNull(stockupDTO.getTrayId())){
 			return R.fail(3002,"托盘码不能为空");
 		}
-		boolean b = distributionStockupService.addPackTrayList(stockupDTO);
+		R b = distributionStockupService.addPackTrayList(stockupDTO);
+		return b;
+	};
+
+
+	@PutMapping("/updateStockArea")
+	@ApiOperation(value = "修改备货区")
+	public R updateStockArea(@RequestBody StockupDTO stockupDTO){
+		if(ObjectUtils.isNull(stockupDTO.getStockupId())){
+			return R.fail(3002,"备货任务id不能为空");
+		}
+		if(ObjectUtils.isNull(stockupDTO.getStockupAreaId())){
+			return R.fail(3002,"备货区Id不能为空");
+		}
+		if(ObjectUtils.isNull(stockupDTO.getStockupArea())){
+			return R.fail(3002,"备货区名称不能为空");
+		}
+		DistributionStockupEntity distributionStockupEntity = new DistributionStockupEntity();
+		distributionStockupEntity.setGoodsAreaId(stockupDTO.getStockupAreaId());
+		distributionStockupEntity.setId(stockupDTO.getStockupId());
+		distributionStockupEntity.setStockupArea(stockupDTO.getStockupArea());
+		return R.data(distributionStockupService.updateById(distributionStockupEntity));
+	};
+
+	@PostMapping("/getStockupArea")
+	@ApiOperation(value = "查询可修改备货区")
+	public R getGoodsArea(@RequestBody StockupDTO stockupDTO){
 
-		return R.data(b);
+		if(ObjectUtils.isNull(stockupDTO.getUserId())){
+			return R.fail(3002,"当前操作人ID不能为空");
+		}
+		Long userId = AuthUtil.getUserId();
+		if(stockupDTO.getUserId().equals(userId)){
+			String deptId = AuthUtil.getDeptId();
+			return R.data(basicdataGoodsAreaClient.getDepartmentId(Long.parseLong(deptId)));
+		}else{
+			R.fail(3005,"操作人不对！");
+		}
+		return R.fail(500,"未知错误！");
 	};
 
 
@@ -269,7 +313,8 @@ public class DistributionStockupAppController extends BladeController {
 			//包件扫描
 			String orderCode = stockupDTO.getOrderCode();//订单自编号
 			String packetBarCode = stockupDTO.getPacketBarCode();//包件码
-			String stockupArea = stockupDTO.getStockupArea();//备货区
+//			String stockupArea = stockupDTO.getStockupArea();//备货区
+			Long stockupId = stockupDTO.getStockupId();//备货任务ID
 			Long reservationId = stockupDTO.getReservationId();//预约单id
 			if(StringUtil.isBlank(orderCode)){
 				log.warn("##################stockupScan: 包件扫码，订单自编号为空");
@@ -279,9 +324,9 @@ public class DistributionStockupAppController extends BladeController {
 				log.warn("##################stockupScan: 包件扫码，包件码为空");
 				return R.fail("包件扫码:包件码不能为空");
 			}
-			if(StringUtil.isBlank(stockupArea)){
+			if(ObjectUtils.isNull(stockupId)){
-				log.warn("##################stockupScan: 包件扫码，备货区为空");
+				log.warn("##################stockupId: 包件扫码，备货区为空");
-				return R.fail("包件扫码:备货区不能为空");
+				return R.fail("包件扫码:备货任务ID不能为空");
 			}
 			if(Objects.isNull(reservationId)){
 				log.warn("##################stockupScan: 包件扫码，预约单id为空");
@@ -292,7 +337,8 @@ public class DistributionStockupAppController extends BladeController {
 			DistributionStockEntity entity = new DistributionStockEntity();
 			entity.setOrderSelfNumbering(orderCode);
 			entity.setCoding(packetBarCode);
-			entity.setStockupArea(stockupArea);
+//			entity.setStockupArea(stockupArea);
+			entity.setStockupId(stockupId);
 			entity.setReservationId(reservationId);
 			entity.setConditions("0");
 			entity.setType(2);
@@ -315,14 +361,15 @@ public class DistributionStockupAppController extends BladeController {
 			Long reservationId = stockupDTO.getReservationId();
 			Long stockListId = stockupDTO.getStockListId();
 			String packetBarCode = stockupDTO.getPacketBarCode();
-			String stockupArea = stockupDTO.getStockupArea();//备货区
+//			String stockupArea = stockupDTO.getStockupArea();//备货区
+			Long stockupId = stockupDTO.getStockupId();//备货区
 			if(StringUtil.isBlank(packetBarCode)){
 				log.warn("##################stockupScan: 库存品扫码，包件码为空");
 				return R.fail("库存品扫码:包件码不能为空");
 			}
-			if(StringUtil.isBlank(stockupArea)){
+			if(ObjectUtils.isNull(stockupId)){
 				log.warn("##################stockupScan: 库存品扫码，备货区为空");
-				return R.fail("库存品扫码:备货区不能为空");
+				return R.fail("库存品扫码:备货任务ID不能为空");
 			}
 			if(Objects.isNull(stockListId)){
 				log.warn("##################stockupScan: 库存品扫码，库存品id为空");
@@ -336,7 +383,8 @@ public class DistributionStockupAppController extends BladeController {
 			//先保存扫码包件信息,后续由队列来出来余下补充信息
 			DistributionStockEntity entity = new DistributionStockEntity();
 			entity.setCoding(packetBarCode);
-			entity.setStockupArea(stockupArea);
+//			entity.setStockupArea(stockupArea);
+			entity.setStockupId(stockupId);
 			entity.setReservationId(reservationId);
 			entity.setStockListId(stockListId);
 			//添加物料信息

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

@@ -43,8 +43,10 @@ public class StockupDTO implements Serializable {
 	private Integer scanType;//备货扫码类型 1 包件 2库存品
 	private String packetBarCode;//包件码
 	private String trayBarCode;//托盘码
+	private Long trayId;//货位ID
 	private String stockupArea;//备货区
-	private String stockupId;//备货区Id
+	private Long stockupAreaId;//备货区ID
+	private Long stockupId;//备货任务区Id
 	private Long stockListId;//库存品id
 	private Integer packageNum;//包条数量
 

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

@@ -76,4 +76,10 @@ public interface DistributionLoadscanMapper extends BaseMapper<DistributionLoads
 	 */
 	Integer updatecutSumById(@Param("id") Long id,@Param("param") DistrilbutionloadingscanDTO distrilbutionloadingscanDTO);
 
+	/**
+	 * 查询司机
+	 * @param id
+	 * @return
+	 */
+    String selectDriverNameByOrderId(@Param("id") Long id);
 }

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

@@ -223,6 +223,9 @@
             ldl.is_deleted = 0 and ldl.reservation_id = #{id} and  (ldl.scan_status =2 or  ldl.scan_status =3)
         </where>
     </select>
+    <select id="selectDriverNameByOrderId" resultType="java.lang.String">
+        SELECT GROUP_CONCAT(DISTINCT ldl.driver_name SEPARATOR ',' )  FROM logpm_distribution_loadscan ldl where  ldl.order_id =#{id}
+    </select>
 
 
 </mapper>

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

@@ -175,7 +175,7 @@
     </select>
 
     <select id="selectStockupOrderList" resultType="com.logpm.distribution.vo.DistributionStockupOrderListVO">
-        select CONCAT(ldpl.cargo_title,'-',ldpl.shelf_title,'-',ldpl.goods_allocation) allocation,
+      <!--  select CONCAT(ldpl.cargo_title,'-',ldpl.shelf_title,'-',ldpl.goods_allocation) allocation,
                ldsa.order_code orderCode,
                ldrs.stock_article_id stockArticleId,
                ldpl.pallet pallet,
@@ -195,7 +195,33 @@
                  ldpl.goods_allocation,
                  ldsa.order_code,
                  ldrs.stock_article_id,
-                 ldpl.pallet
+                 ldpl.pallet -->
+        select DISTINCT  GROUP_CONCAT(lwug.area_title,'-',lwug.shelf_title,'-',lwug.allocation_title ) allocation ,  lwtg.tray_code pallet,
+                        lwug.area_id areaId,lwug.shelf_id shelfId,lwug.allocation_id allocationId,lwtg.tray_id  trayId
+        ,(
+        select COUNT(drp.id)
+        from logpm_distribution_reservation_package drp
+        where drp.reservation_id = ldrp.reservation_id  and drp.packet_bar_status in (1,3)
+        ) planNum,
+        (
+        select COUNT(lds.id)
+        from logpm_distribution_reservation_package drp
+        LEFT JOIN logpm_distribution_stock lds on lds.parcel_list_id = drp.parce_list_id
+        where drp.reservation_id = ldrp.reservation_id and drp.packet_bar_status in (1,3)
+        ) scanNum
+        from logpm_distribution_reservation_package ldrp
+        LEFT JOIN logpm_warehouse_updown_goods lwug on ldrp.parce_list_id = lwug.association_id
+        LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = lwug.association_id
+        <where>
+            ldrp.reservation_id = #{reservationId}   and ldrp.packet_bar_status in (1,3)
+          <!--  and lwug.association_type = '3' and lwtg.association_type = '3' -->
+        </where>
+
+
+
+
+
+
     </select>
 
     <select id="selectStockupStockList" resultType="com.logpm.distribution.vo.DistributionStockupStockListVO">

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

@@ -20,14 +20,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.logpm.distribution.dto.DistributionReservationPackageDTO;
 import com.logpm.distribution.entity.DistributionParcelListEntity;
 import com.logpm.distribution.entity.DistributionReservationPackageEntity;
-import com.logpm.distribution.vo.DistributionClientTrayStateStockupVO;
+import com.logpm.distribution.vo.*;
-import com.logpm.distribution.vo.DistributionReservationPackageVO;
 import com.logpm.distribution.excel.DistributionReservationPackageExcel;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.logpm.distribution.vo.DistributionStockPackageVO;
-import com.logpm.distribution.vo.DistributionStockupTrayVO;
 import com.logpm.distribution.vo.app.DistributionAppParcelListVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -142,4 +139,6 @@ public interface DistributionReservationPackageMapper extends BaseMapper<Distrib
 	List<DistributionStockupTrayVO> selectTrayList(@Param("trayId") String trayId);
 
 	List<DistributionStockPackageVO> listPackage(@Param("reservationId") Long reservationId);
+
+    List<DistributionParcelTrayVO> listPackageTray(@Param("reservationId") Long reservationId);
 }

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

@@ -282,4 +282,16 @@ WHERE
         </where>
     </select>
 
+    <select id="listPackageTray" resultType="com.logpm.distribution.vo.DistributionParcelTrayVO">
+        SELECT DISTINCT lwtg.tray_id trayId, lwtg.tray_code trayCode, COUNT(lwttg.id)  trayPackNum
+        FROM logpm_distribution_reservation_package ldrp
+                 LEFT JOIN logpm_warehouse_tray_goods lwtg ON lwtg.association_id = ldrp.parce_list_id
+                 LEFT JOIN logpm_warehouse_tray_goods lwttg ON lwttg.association_id = lwtg.association_id AND lwttg.association_type = '3'
+        <where>
+            ldrp.reservation_id = #{reservationId} AND ldrp.packet_bar_status IN (1,3)
+        </where>
+        GROUP BY lwtg.tray_id, lwtg.tray_code;
+    </select>
+
+
 </mapper>

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionLoadscanService.java

@@ -49,4 +49,10 @@ public interface IDistributionLoadscanService extends BaseService<DistributionLo
 	 */
 	List<DistributionLoadscanExcel> exportDistributionLoadscan(Wrapper<DistributionLoadscanEntity> queryWrapper);
 
+	/**
+	 * 查询司机姓名
+	 * @param id
+	 * @return
+	 */
+    String selectDriverNameByOrderId(Long id);
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationPackageService.java

@@ -22,6 +22,7 @@ import com.logpm.distribution.dto.DistributionStockArticleDTO;
 import com.logpm.distribution.entity.DistributionParcelListEntity;
 import com.logpm.distribution.entity.DistributionReservationPackageEntity;
 import com.logpm.distribution.vo.DistributionParcelListVO;
+import com.logpm.distribution.vo.DistributionParcelTrayVO;
 import com.logpm.distribution.vo.DistributionReservationPackageVO;
 import com.logpm.distribution.excel.DistributionReservationPackageExcel;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -86,4 +87,6 @@ public interface IDistributionReservationPackageService extends BaseService<Dist
 	 * @return
 	 */
 	List<DistributionParcelListVO> getStockArticlePackageList(List<DistributionReservationPackageEntity> reservationPackageEntity);
+
+	List<DistributionParcelTrayVO> selectClientStockupPackTray(Long reservationId);
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupService.java

@@ -23,6 +23,7 @@ import com.logpm.distribution.entity.DistributionStockupEntity;
 import com.logpm.distribution.excel.DistributionStockupExcel;
 import com.logpm.distribution.vo.*;
 import org.springblade.core.mp.base.BaseService;
+import org.springblade.core.tool.api.R;
 
 import java.util.List;
 import java.util.Map;
@@ -119,5 +120,13 @@ public interface IDistributionStockupService extends BaseService<DistributionSto
 	 * @param stockupDTO
 	 * @return
 	 */
-	boolean addPackTrayList(StockupDTO stockupDTO);
+	R addPackTrayList(StockupDTO stockupDTO);
+
+	/**
+	 * 查询状态
+	 * @param reservationId
+	 * @param allocationId
+	 * @return
+	 */
+	Boolean getClientStockupTray(Long reservationId, Long allocationId);
 }

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

@@ -51,4 +51,9 @@ public class DistributionLoadscanServiceImpl extends BaseServiceImpl<Distributio
 		return distributionLoadscanList;
 	}
 
+	@Override
+	public String selectDriverNameByOrderId(Long id) {
+		return baseMapper.selectDriverNameByOrderId(id);
+	}
+
 }

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

@@ -20,15 +20,11 @@ import com.logpm.distribution.dto.DistributionReservationPackageDTO;
 import com.logpm.distribution.dto.DistributionStockArticleDTO;
 import com.logpm.distribution.entity.DistributionParcelListEntity;
 import com.logpm.distribution.entity.DistributionReservationPackageEntity;
-import com.logpm.distribution.vo.DistributionClientTrayStateStockupVO;
+import com.logpm.distribution.vo.*;
 import com.logpm.distribution.service.IDistributionParcelListService;
-import com.logpm.distribution.vo.DistributionParcelListVO;
-import com.logpm.distribution.vo.DistributionReservationPackageVO;
 import com.logpm.distribution.excel.DistributionReservationPackageExcel;
 import com.logpm.distribution.mapper.DistributionReservationPackageMapper;
 import com.logpm.distribution.service.IDistributionReservationPackageService;
-import com.logpm.distribution.vo.DistributionStockPackageVO;
-import com.logpm.distribution.vo.DistributionStockupTrayVO;
 import com.logpm.distribution.vo.app.DistributionAppParcelListVO;
 import com.logpm.distribution.wrapper.DistributionParcelListWrapper;
 import lombok.AllArgsConstructor;
@@ -123,5 +119,15 @@ public class DistributionReservationPackageServiceImpl extends BaseServiceImpl<D
 		return parcelListVOS;
 	}
 
+	/**
+	 *
+	 * @param reservationId
+	 * @return
+	 */
+	@Override
+	public List<DistributionParcelTrayVO> selectClientStockupPackTray(Long reservationId) {
+		return baseMapper.listPackageTray(reservationId);
+	}
+
 
 }

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

@@ -347,7 +347,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 				distributionReservationStocklistEntity.setReservationId(reservationId);
 				distributionReservationStocklistEntity.setStocklistId(stocklistId);
 				distributionReservationStocklistEntity.setUnit(i.getCargoUnit());
-				if (Func.isBlank(i.getPid().toString())) {
+				if (ObjectUtil.isEmpty(i.getPid())) {
 					distributionReservationStocklistEntity.setIsUnpackProduct(ServiceConstant.ORDER_NOT_HAVE_DATA);
 				} else {
 					distributionReservationStocklistEntity.setIsUnpackProduct(ServiceConstant.ORDER_HAVE_DATA);

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

@@ -64,6 +64,8 @@ public class DistributionStockServiceImpl extends BaseServiceImpl<DistributionSt
 	@Autowired
 	private IDistributionDeliveryListService  distributionDeliveryListService;
 
+	private IDistributionStockupInfoService distributionStockupInfoService;
+
 	@Autowired
 	private IDistributionStockListService distributionStockListService;
 	@Autowired
@@ -93,16 +95,23 @@ public class DistributionStockServiceImpl extends BaseServiceImpl<DistributionSt
 		return baseMapper.selectRealNum(reservationId);
 	}
 
+	/**
+	 * MQ备货扫描数据处理
+	 * @param distributionStockEntity
+	 */
 	@Override
 	public void repairPackageScanInfo(DistributionStockEntity distributionStockEntity) {
-		String coding = distributionStockEntity.getCoding();
+		String coding = distributionStockEntity.getCoding(); //包条码
-		Long reservationId = distributionStockEntity.getReservationId();
+		Long reservationId = distributionStockEntity.getReservationId(); //预约ID
 		log.info("#############repairPackageScanInfo: 补全包件扫码信息开始 coding={}",coding);
 		//查询包件信息
 		QueryWrapper<DistributionParcelListEntity> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("packet_bar_code",coding);
 		DistributionParcelListEntity parcelListEntity = distributionParcelListService.getOne(queryWrapper);//包件信息
 		DistributionReservationEntity reservationEntity = distributionReservationService.getById(reservationId);
+		DistributionStockupEntity distributionStockupEntity = distributionStockupMapper.selectOne(Wrappers.<DistributionStockupEntity>query().lambda()
+			.eq(DistributionStockupEntity::getId, distributionStockEntity.getStockupId())
+		);
 		if(!Objects.isNull(parcelListEntity)){
 			String cargoTitle = parcelListEntity.getCargoTitle();//货区
 			String shelfTitle = parcelListEntity.getShelfTitle();//货位
@@ -111,13 +120,20 @@ public class DistributionStockServiceImpl extends BaseServiceImpl<DistributionSt
 			distributionStockEntity.setStockArticle(parcelListEntity.getStockArticleId());
 			distributionStockEntity.setGoodsName(parcelListEntity.getFirsts());
 			distributionStockEntity.setParcelListId(parcelListEntity.getId());
+			distributionStockEntity.setStockupArea(distributionStockupEntity.getStockupArea());
 			distributionStockEntity.setReservationCode(reservationEntity.getReservationCode());
+			distributionStockEntity.setMaterialId(parcelListEntity.getMaterialId());
+			distributionStockEntity.setMarketId(Long.parseLong(parcelListEntity.getMarketId()));
 		}
 		distributionStockEntity.setConditions("1");
 		baseMapper.updateById(distributionStockEntity);
 		log.info("#############repairPackageScanInfo: 补全包件扫码信息完成 coding={}",coding);
 	}
 
+	/**
+	 * MQ备货库存品扫描
+	 * @param distributionStockEntity
+	 */
 	@Override
 	public void repairStockListScanInfo(DistributionStockEntity distributionStockEntity) {
 		Long stockListId = distributionStockEntity.getStockListId();
@@ -128,13 +144,19 @@ public class DistributionStockServiceImpl extends BaseServiceImpl<DistributionSt
 		queryWrapper.eq("id",stockListId);
 		DistributionStockListEntity stockListEntity = distributionStockListService.getOne(queryWrapper);//包件信息
 		DistributionReservationEntity reservationEntity = distributionReservationService.getById(reservationId);
+		DistributionStockupEntity distributionStockupEntity = distributionStockupMapper.selectOne(Wrappers.<DistributionStockupEntity>query().lambda()
+			.eq(DistributionStockupEntity::getId, distributionStockEntity.getStockupId())
+		);
 		if(!Objects.isNull(stockListEntity)){
 			distributionStockEntity.setGoodsAllocation(stockListEntity.getStorageLocation());
 			distributionStockEntity.setGoodsName(stockListEntity.getDescriptionGoods());
 			distributionStockEntity.setUnpackingQuantity(stockListEntity.getUnpackingQuantity());
 			distributionStockEntity.setUnit(stockListEntity.getCargoUnit());
 			distributionStockEntity.setParcelListId(stockListEntity.getParcelListId());
+			distributionStockEntity.setStockupArea(distributionStockupEntity.getStockupArea());
 			distributionStockEntity.setReservationCode(reservationEntity.getReservationCode());
+			distributionStockEntity.setMaterialId(stockListEntity.getMaterialId());
+			distributionStockEntity.setMarketId(stockListEntity.getMarketId());
 		}
 		distributionStockEntity.setConditions("1");
 		baseMapper.updateById(distributionStockEntity);

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

@@ -22,7 +22,6 @@ 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.StringUtils;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
 import com.logpm.basicdata.feign.IBasicdataCodeClient;
@@ -34,6 +33,10 @@ import com.logpm.distribution.mapper.DistributionStockupMapper;
 import com.logpm.distribution.service.*;
 import com.logpm.distribution.vo.*;
 import com.logpm.distribution.wrapper.DistributionStockupWrapper;
+import com.logpm.warehouse.entity.WarehouseTaryAllocationEntity;
+import com.logpm.warehouse.entity.WarehouseTrayGoodsEntity;
+import com.logpm.warehouse.feign.IWarehouseTaryAllocationClient;
+import com.logpm.warehouse.feign.IWarehouseTrayGoodsClient;
 import org.springblade.common.constant.CodeDesEnum;
 import org.springblade.common.constant.DictBizConstant;
 import org.springblade.common.constant.stockup.StockAssignStatusConstant;
@@ -42,6 +45,7 @@ import org.springblade.common.exception.CustomerException;
 import org.springblade.core.mp.base.BaseServiceImpl;
 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.utils.StringUtil;
 import org.springblade.system.cache.DictBizCache;
 import org.springframework.beans.BeanUtils;
@@ -51,6 +55,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
+import java.util.concurrent.atomic.AtomicReference;
 
 /**
  * 备货信息表 服务实现类
@@ -64,6 +69,10 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 	@Lazy
 	@Autowired
 	private IDistributionReservationService distributionReservationService;
+	@Autowired
+	private IWarehouseTrayGoodsClient warehouseTrayGoodsClient;
+	@Autowired
+	private IWarehouseTaryAllocationClient warehouseTaryAllocationClient;
 
 	@Autowired
 	private IDistributionReservationPackageService distributionReservationPackageService;
@@ -143,8 +152,8 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 		stockupDTO.setUserId(AuthUtil.getUserId());
 		stockupDTO.setStockupDateStart(stockupDTO.getStockupDateStart()+" 00:00:00");
 		stockupDTO.setStockupDateEnd(stockupDTO.getStockupDateEnd()+" 23:59:59");
-//		IPage<DistributionStockupListVO> distributionStockupEntityIPage = baseMapper.selectHomeStockupPage(page, stockupDTO);
+		IPage<DistributionStockupListVO> distributionStockupEntityIPage = baseMapper.selectHomeStockupPage(page, stockupDTO);
-		IPage<DistributionStockupListVO> distributionStockupEntityIPage = baseMapper.selectStockupPage(page, stockupDTO);
+//		IPage<DistributionStockupListVO> distributionStockupEntityIPage = baseMapper.selectStockupPage(page, stockupDTO);
 		List<DistributionStockupListVO> records = distributionStockupEntityIPage.getRecords();
 		for (DistributionStockupListVO vo : records) {
 			intToStrDistributionStockupListVO(vo);
@@ -554,28 +563,82 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 	 */
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public boolean addPackTrayList(StockupDTO stockupDTO) {
+	public R addPackTrayList(StockupDTO stockupDTO) {
+		AtomicReference<Boolean> stock = new AtomicReference<>(false);
+		//查询包件信息
 		List<DistributionStockPackageVO> list = distributionReservationPackageService.listPackage(stockupDTO.getReservationId());
-		List<DistributionStockEntity> list1 = new ArrayList<>();
+		//查询托盘上面的包件
-		list.forEach(i ->{
+		List<WarehouseTrayGoodsEntity> trayIdList = warehouseTrayGoodsClient.getTrayIdList(stockupDTO.getTrayId());
-			DistributionStockEntity distributionStock = new DistributionStockEntity();
+		List<DistributionStockPackageVO> voList = new ArrayList<>();
-			distributionStock.setStockupId(Long.parseLong(stockupDTO.getStockupId()));
+		trayIdList.forEach( t ->{
-			distributionStock.setStockArticle(i.getStockArticleId());
+			Optional<DistributionStockPackageVO> first = list.stream().filter(l -> l.getParcelListId().equals(t.getAssociationId())).findFirst();
-			distributionStock.setGoodsAllocation(i.getGoodsAllocation());//货位信息
+			if (first.isPresent()) {
-			distributionStock.setConditions("1");
+				DistributionStockPackageVO distributionStockPackageVO = first.get();
-			distributionStock.setParcelListId(i.getParcelListId());
+				log.warn("找到了匹配的对象：" + distributionStockPackageVO);
-			distributionStock.setOrderSelfNumbering(i.getOrderCode());
+				voList.add(distributionStockPackageVO);
-			distributionStock.setType(1);
+			} else{
-			distributionStock.setDeliveryListCode(i.getNoteNumber());
+				log.warn("没有找到了匹配的对象;");
-			distributionStock.setDeliveryListId(i.getDeliveryId());
+				stock.set(true);
-			distributionStock.setReservationId(i.getReservationId());
+			}
-			distributionStock.setReservationCode(i.getReservationCode());
+		});
-			distributionStock.setCoding(i.getPacketBarCode());
+		if(stock.get()){
-			list1.add(distributionStock);
+			return R.fail(3001,"备货失败！");
+		}else{
+			List<DistributionStockEntity> list1 = new ArrayList<>();
+			voList.forEach(i ->{
+				DistributionStockEntity distributionStock = new DistributionStockEntity();
+				distributionStock.setStockupId(stockupDTO.getStockupId());
+				distributionStock.setStockArticle(i.getStockArticleId());
+				distributionStock.setGoodsAllocation(i.getGoodsAllocation());//货位信息
+				distributionStock.setConditions("1");
+				distributionStock.setParcelListId(i.getParcelListId());
+				distributionStock.setOrderSelfNumbering(i.getOrderCode());
+				distributionStock.setType(1);
+				distributionStock.setDeliveryListCode(i.getNoteNumber());
+				distributionStock.setDeliveryListId(i.getDeliveryId());
+				distributionStock.setReservationId(i.getReservationId());
+				distributionStock.setReservationCode(i.getReservationCode());
+				distributionStock.setCoding(i.getPacketBarCode());
+				list1.add(distributionStock);
+			});
+			//TODO 其他操作
+			//添加扫描记录
+			distributionStockService.saveBatch(list1);
+			return R.fail(200,"备货成功");
+		}
+
+	}
+
+	/**
+	 * 查询这个货位是否有整托
+	 * @param reservationId
+	 * @param allocationId
+	 * @return
+	 */
+	@Override
+	public Boolean getClientStockupTray(Long reservationId, Long allocationId) {
+
+		List<DistributionParcelTrayVO> list = distributionReservationPackageService.selectClientStockupPackTray(reservationId);//查询在那些托盘
+		List<WarehouseTaryAllocationEntity> allocationId1 = warehouseTaryAllocationClient.getAllocationId(allocationId);//查询托盘
+		AtomicReference<Boolean> trays = new AtomicReference<>(false);
+		allocationId1.forEach( i ->{
+			boolean b = list.stream().anyMatch(a -> a.getTrayId().equals(i.getTrayId()));
+			if(b){
+				//有
+				Iterator<DistributionParcelTrayVO> iterator = list.iterator();
+				while (iterator.hasNext()){
+					if(i.getTrayId().equals(iterator.next().getTrayId())){
+						String trayPackNum = iterator.next().getTrayPackNum(); //在这个托盘的数量
+						List<WarehouseTrayGoodsEntity> trayIdList = warehouseTrayGoodsClient.getTrayIdList(i.getTrayId());
+						if(trayPackNum.equals(trayIdList.size())){
+							trays.set(true);
+						}
+
+					}
+				}
+			}
 		});
-		//TODO 其他操作
+		return trays.get();
-		//添加扫描记录
-		return distributionStockService.saveBatch(list1);
 	}
 
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionStockArticleWrapper.java

@@ -1,9 +1,13 @@
 package com.logpm.distribution.wrapper;
 
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.logpm.distribution.entity.DistributionStockArticleEntity;
+import com.logpm.distribution.service.IDistributionLoadscanService;
 import com.logpm.distribution.service.IDistributionParcelListService;
 import com.logpm.distribution.vo.DistributionStockArticleVO;
+import lombok.extern.log4j.Log4j2;
+import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.constant.DictBizConstant;
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
@@ -19,10 +23,11 @@ import java.util.Objects;
 /**
  * 在库订单实体VO 转换
  */
+@Log4j2
 public class DistributionStockArticleWrapper extends BaseEntityWrapper<DistributionStockArticleEntity, DistributionStockArticleVO> {
 	private IUserClient userCliient = SpringUtil.getBean(IUserClient.class);
 	private IDistributionParcelListService distributionParcelListService = SpringUtil.getBean(IDistributionParcelListService.class);
-
+	private IDistributionLoadscanService distributionLoadscanService = SpringUtil.getBean(IDistributionLoadscanService.class);
 
 
 	public static DistributionStockArticleWrapper build() {
@@ -39,6 +44,12 @@ public class DistributionStockArticleWrapper extends BaseEntityWrapper<Distribut
 			String orderPackageCode = distributionParcelListService.getOrderPackageCode(distributionStockupVO.getId());
 			distributionStockupVO.setOrderPackageCode( orderPackageCode);
 		}
+
+		if (entity.getOrderStatus().equals("80")){
+			//查询配送完毕的所有司机
+		String DriverName   =distributionLoadscanService.selectDriverNameByOrderId(entity.getId());
+			distributionStockupVO.setDriverName(DriverName);
+		}
 		//计算在库天数
 		if (Func.isNotEmpty(entity.getWarehouseEntryTime().getTime())){
 

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseGoodsAllocationController.java

@@ -21,7 +21,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.logpm.warehouse.dto.*;
 import com.logpm.warehouse.entity.WarehouseGoodsAllocationEntity;
-import com.logpm.warehouse.entity.WarehouseMaterialEntity;
 import com.logpm.warehouse.excel.WarehouseGoodsAllocationExcel;
 import com.logpm.warehouse.service.IWarehouseGoodsAllocationService;
 import com.logpm.warehouse.service.IWarehouseUpdownTypeService;
@@ -39,14 +38,12 @@ import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.redis.cache.BladeRedis;
-import org.springblade.core.redis.lock.RedisLock;
 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.core.tool.utils.StringUtil;
-import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
@@ -55,7 +52,6 @@ import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -141,8 +137,8 @@ public class WarehouseGoodsAllocationController extends BladeController {
 	@GetMapping("/order")
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "货位上架 查询订单", notes = "传入warehouseGoodsAllocation")
-	public R<IPage<WarehouseStockArticleCopyVO>> order(WarehouseStockArticleCopyDTO warehouseGoodsAllocation, Query query) {
+	public R<IPage<WarehouseStockArticleZationVO>> order(WarehouseStockArticleZationDTO warehouseGoodsAllocation, Query query) {
-		IPage<WarehouseStockArticleCopyVO> pages = warehouseGoodsAllocationService.selectorder(warehouseGoodsAllocation, Condition.getPage(query));
+		IPage<WarehouseStockArticleZationVO> pages = warehouseGoodsAllocationService.selectorder(warehouseGoodsAllocation, Condition.getPage(query));
 		return R.data(pages);
 	}
 
@@ -152,8 +148,8 @@ public class WarehouseGoodsAllocationController extends BladeController {
 	@GetMapping("/servicenub")
 	@ApiOperationSupport(order = 7)
 	@ApiOperation(value = "货位上架 查询服务号", notes = "传入warehouseGoodsAllocation")
-	public R<IPage<WarehouseStockArticleCopyVO>> servicenub(WarehouseStockArticleCopyDTO warehouseGoodsAllocation, Query query) {
+	public R<IPage<WarehouseStockArticleZationVO>> servicenub(WarehouseStockArticleZationDTO warehouseGoodsAllocation, Query query) {
-		IPage<WarehouseStockArticleCopyVO> pages = warehouseGoodsAllocationService.selectservicenub(warehouseGoodsAllocation, Condition.getPage(query));
+		IPage<WarehouseStockArticleZationVO> pages = warehouseGoodsAllocationService.selectservicenub(warehouseGoodsAllocation, Condition.getPage(query));
 		return R.data(pages);
 	}
 
@@ -175,8 +171,8 @@ public class WarehouseGoodsAllocationController extends BladeController {
 	@GetMapping("/Inventory")
 	@ApiOperationSupport(order = 9)
 	@ApiOperation(value = "货位上架 查询库存品", notes = "传入warehouseGoodsAllocation")
-	public R<IPage<WarehouseStockListCopyVO>> Inventory(WarehouseStockListCopyDTO warehouseGoodsAllocation, Query query) {
+	public R<IPage<WarehouseStockListZationVO>> Inventory(WarehouseStockListZationDTO warehouseGoodsAllocation, Query query) {
-		IPage<WarehouseStockListCopyVO> pages = warehouseGoodsAllocationService.selectInventory(warehouseGoodsAllocation, Condition.getPage(query));
+		IPage<WarehouseStockListZationVO> pages = warehouseGoodsAllocationService.selectInventory(warehouseGoodsAllocation, Condition.getPage(query));
 		return R.data(pages);
 	}
 
@@ -186,8 +182,8 @@ public class WarehouseGoodsAllocationController extends BladeController {
 	@GetMapping("/ZeroOrder")
 	@ApiOperationSupport(order = 10)
 	@ApiOperation(value = "货位上架 查询零担", notes = "传入warehouseGoodsAllocation")
-	public R<IPage<WarehouseStockArticleCopyVO>> ZeroOrder(WarehouseStockArticleCopyDTO warehouseStockArticleCopyDTO, Query query) {
+	public R<IPage<WarehouseStockArticleZationVO>> ZeroOrder(WarehouseStockArticleZationDTO warehouseStockArticleZationDTO, Query query) {
-		IPage<WarehouseStockArticleCopyVO> pages = warehouseGoodsAllocationService.selectZeroOrder(warehouseStockArticleCopyDTO, Condition.getPage(query));
+		IPage<WarehouseStockArticleZationVO> pages = warehouseGoodsAllocationService.selectZeroOrder(warehouseStockArticleZationDTO, Condition.getPage(query));
 		return R.data(pages);
 	}
 
@@ -390,8 +386,8 @@ public class WarehouseGoodsAllocationController extends BladeController {
 	@GetMapping("/selectInventory")
 	@ApiOperationSupport(order = 21)
 	@ApiOperation(value = "货位 查询库存品", notes = "传入warehouseGoodsAllocation")
-	public R<IPage<WarehouseStockListCopyVO>> selectInventory(WarehouseGoodsAllocationDTO warehouseGoodsAllocation, Query query) {
+	public R<IPage<WarehouseStockListZationVO>> selectInventory(WarehouseGoodsAllocationDTO warehouseGoodsAllocation, Query query) {
-		IPage<WarehouseStockListCopyVO> pages = warehouseGoodsAllocationService.selectAllInventory(warehouseGoodsAllocation, Condition.getPage(query));
+		IPage<WarehouseStockListZationVO> pages = warehouseGoodsAllocationService.selectAllInventory(warehouseGoodsAllocation, Condition.getPage(query));
 		return R.data(pages);
 	}
 
@@ -401,8 +397,8 @@ public class WarehouseGoodsAllocationController extends BladeController {
 	@GetMapping("/selectZeroOrder")
 	@ApiOperationSupport(order = 22)
 	@ApiOperation(value = "货位 查询零担", notes = "传入warehouseGoodsAllocation")
-	public R<IPage<WarehouseStockArticleCopyVO>> selectZeroOrder(WarehouseStockArticleCopyDTO warehouseStockArticleCopyDTO, Query query) {
+	public R<IPage<WarehouseStockArticleZationVO>> selectZeroOrder(WarehouseStockArticleZationDTO warehouseStockArticleZationDTO, Query query) {
-		IPage<WarehouseStockArticleCopyVO> pages = warehouseGoodsAllocationService.selectAllZeroOrder(warehouseStockArticleCopyDTO, Condition.getPage(query));
+		IPage<WarehouseStockArticleZationVO> pages = warehouseGoodsAllocationService.selectAllZeroOrder(warehouseStockArticleZationDTO, Condition.getPage(query));
 		return R.data(pages);
 	}
 

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseStockController.java

@@ -0,0 +1,151 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  ReWarehouse and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  ReWarehouses of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  ReWarehouses 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 Warehouse.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.warehouse.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.warehouse.entity.WarehouseStockEntity;
+import com.logpm.warehouse.vo.WarehouseStockVO;
+import com.logpm.warehouse.excel.WarehouseStockExcel;
+import com.logpm.warehouse.wrapper.WarehouseStockWrapper;
+import com.logpm.warehouse.service.IWarehouseStockService;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.tool.constant.BladeConstant;
+import springfox.documentation.annotations.ApiIgnore;
+import java.util.Map;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 备货扫描记录 控制器
+ *
+ * @author lmy
+ * @since 2023-08-24
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/warehouseStock")
+@Api(value = "备货扫描记录", tags = "备货扫描记录接口")
+public class WarehouseStockController extends BladeController {
+
+	private final IWarehouseStockService warehouseStockService;
+
+	/**
+	 * 备货扫描记录 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入WarehouseStock")
+	public R<WarehouseStockVO> detail(WarehouseStockEntity WarehouseStock) {
+		WarehouseStockEntity detail = warehouseStockService.getOne(Condition.getQueryWrapper(WarehouseStock));
+		return R.data(WarehouseStockWrapper.build().entityVO(detail));
+	}
+	/**
+	 * 备货扫描记录 分页
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入WarehouseStock")
+	public R<IPage<WarehouseStockVO>> list(@ApiIgnore @RequestParam Map<String, Object> WarehouseStock, Query query) {
+		IPage<WarehouseStockEntity> pages = warehouseStockService.page(Condition.getPage(query), Condition.getQueryWrapper(WarehouseStock, WarehouseStockEntity.class));
+		return R.data(WarehouseStockWrapper.build().pageVO(pages));
+	}
+
+	/**
+	 * 备货扫描记录 自定义分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入WarehouseStock")
+	public R<IPage<WarehouseStockVO>> page(WarehouseStockVO WarehouseStock, Query query) {
+		IPage<WarehouseStockVO> pages = warehouseStockService.selectWarehouseStockPage(Condition.getPage(query), WarehouseStock);
+		return R.data(pages);
+	}
+
+	/**
+	 * 备货扫描记录 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入WarehouseStock")
+	public R save(@Valid @RequestBody WarehouseStockEntity WarehouseStock) {
+		return R.status(warehouseStockService.save(WarehouseStock));
+	}
+
+	/**
+	 * 备货扫描记录 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入WarehouseStock")
+	public R update(@Valid @RequestBody WarehouseStockEntity WarehouseStock) {
+		return R.status(warehouseStockService.updateById(WarehouseStock));
+	}
+
+	/**
+	 * 备货扫描记录 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入WarehouseStock")
+	public R submit(@Valid @RequestBody WarehouseStockEntity WarehouseStock) {
+		return R.status(warehouseStockService.saveOrUpdate(WarehouseStock));
+	}
+
+	/**
+	 * 备货扫描记录 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(warehouseStockService.deleteLogic(Func.toLongList(ids)));
+	}
+
+
+	/**
+	 * 导出数据
+	 */
+	@GetMapping("/export-WarehouseStock")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "导出数据", notes = "传入WarehouseStock")
+	public void exportWarehouseStock(@ApiIgnore @RequestParam Map<String, Object> WarehouseStock, BladeUser bladeUser, HttpServletResponse response) {
+		QueryWrapper<WarehouseStockEntity> queryWrapper = Condition.getQueryWrapper(WarehouseStock, WarehouseStockEntity.class);
+		//if (!AuthUtil.isAdministrator()) {
+		//	queryWrapper.lambda().eq(WarehouseStock::getTenantId, bladeUser.getTenantId());
+		//}
+		queryWrapper.lambda().eq(WarehouseStockEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		List<WarehouseStockExcel> list = warehouseStockService.exportWarehouseStock(queryWrapper);
+		ExcelUtil.export(response, "备货扫描记录数据" + DateUtil.time(), "备货扫描记录数据表", list, WarehouseStockExcel.class);
+	}
+
+}

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/WarehouseStockArticleZationDTO.java

@@ -17,6 +17,7 @@
 package com.logpm.warehouse.dto;
 
 
+
 import com.logpm.distribution.entity.DistributionStockArticleEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -30,7 +31,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class WarehouseStockArticleCopyDTO extends DistributionStockArticleEntity {
+public class WarehouseStockArticleZationDTO extends DistributionStockArticleEntity {
 	private static final long serialVersionUID = 1L;
 
 

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/WarehouseStockDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  ReWarehouse and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  ReWarehouses of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  ReWarehouses 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 Warehouse.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.warehouse.dto;
+
+import com.logpm.warehouse.entity.WarehouseStockEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 备货扫描记录 数据传输对象实体类
+ *
+ * @author lmy
+ * @since 2023-08-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class WarehouseStockDTO extends WarehouseStockEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/WarehouseStockListZationDTO.java

@@ -17,11 +17,13 @@
 package com.logpm.warehouse.dto;
 
 
-import com.logpm.warehouse.entity.WarehouseStockListCopyEntity;
+
+import com.logpm.distribution.entity.DistributionStockListEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+
 /**
  * 库存品管理 视图实体类
  *
@@ -30,7 +32,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class WarehouseStockListCopyDTO extends WarehouseStockListCopyEntity {
+public class WarehouseStockListZationDTO extends DistributionStockListEntity {
 	private static final long serialVersionUID = 1L;
 	/**
 	 * 备货数

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/excel/WarehouseStockExcel.java

@@ -0,0 +1,231 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  ReWarehouse and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  ReWarehouses of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  ReWarehouses 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 Warehouse.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.warehouse.excel;
+
+
+import lombok.Data;
+
+import java.util.Date;
+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 java.io.Serializable;
+
+
+/**
+ * 备货扫描记录 Excel实体类
+ *
+ * @author lmy
+ * @since 2023-08-24
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class WarehouseStockExcel implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 租户号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("租户号")
+	private Long tenantId;
+	/**
+	 * 是否已删除
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("是否已删除")
+	private Integer isDeleted;
+	/**
+	 *
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留3")
+	private String reserve3;
+	/**
+	 *
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留5")
+	private String reserve5;
+	/**
+	 * 货位信息
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("货位信息")
+	private String goodsAllocation;
+	/**
+	 * 在库订单ID
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("在库订单ID")
+	private String stockArticle;
+	/**
+	 * 包条码
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("包条码")
+	private String coding;
+	/**
+	 *  状态 1 配送  2自提
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty(" 状态 1 配送  2自提")
+	private Integer conditions;
+	/**
+	 * 货物名称
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("货物名称")
+	private String goodsName;
+	/**
+	 * 库存品ID
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("库存品ID")
+	private String stockListId;
+	/**
+	 * 拆包数
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("拆包数")
+	private Integer unpackingQuantity;
+	/**
+	 * 在库包件ID
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("在库包件ID")
+	private Long parcelListId;
+	/**
+	 * 单位
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("单位")
+	private String unit;
+	/**
+	 * 工厂车次(无用)
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("工厂车次(无用)")
+	private String factory;
+	/**
+	 * 物流车次（无用）
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("物流车次（无用）")
+	private String logistics;
+	/**
+	 * 商城名称（无用）
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("商城名称（无用）")
+	private String mallName;
+	/**
+	 * 订单自编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("订单自编号")
+	private String orderSelfNumbering;
+	/**
+	 * 预约id
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预约id")
+	private Long reservationId;
+	/**
+	 * 预约单号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预约单号")
+	private String reservationCode;
+	/**
+	 * 出库类型 1商 2市 3自
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("出库类型 1商 2市 3自")
+	private String outboundType;
+	/**
+	 * 配送ID
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("配送ID")
+	private Long deliveryListId;
+	/**
+	 * 配送编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("配送编号")
+	private String deliveryListCode;
+	/**
+	 * 备货区
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("备货区")
+	private String stockupArea;
+	/**
+	 * 自提ID
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("自提ID")
+	private Long billLadingId;
+	/**
+	 * 扫码类型 1包件 2库存品
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("扫码类型 1包件 2库存品")
+	private String type;
+	/**
+	 * 物料id
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("物料id")
+	private Long materialId;
+	/**
+	 * 商场/客户
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("商场/客户")
+	private Long marketId;
+	/**
+	 * 备货id
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("备货id")
+	private Long stockupId;
+
+}

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

@@ -0,0 +1,53 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  ReWarehouse and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  ReWarehouses of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  ReWarehouses 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 Warehouse.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.warehouse.feign;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.AllArgsConstructor;
+import org.springblade.core.mp.support.BladePage;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import com.logpm.warehouse.entity.WarehouseStockEntity;
+import com.logpm.warehouse.service.IWarehouseStockService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+/**
+ * 备货扫描记录 Feign实现类
+ *
+ * @author lmy
+ * @since 2023-08-24
+ */
+@ApiIgnore()
+@RestController
+@AllArgsConstructor
+public class WarehouseStockClient implements IWarehouseStockClient {
+
+    private final IWarehouseStockService WarehouseStockService;
+
+    @Override
+    @GetMapping(TOP)
+    public BladePage<WarehouseStockEntity> top(Integer current, Integer size) {
+        Query query = new Query();
+        query.setCurrent(current);
+        query.setSize(size);
+        IPage<WarehouseStockEntity> page = WarehouseStockService.page(Condition.getPage(query));
+        return BladePage.of(page);
+    }
+
+}

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

@@ -0,0 +1,33 @@
+package com.logpm.warehouse.feign;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.logpm.warehouse.entity.WarehouseTaryAllocationEntity;
+import com.logpm.warehouse.service.IWarehouseTaryAllocationService;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @program: LogisticsPlatform-Service
+ * @description:
+ * @author: cyz
+ * @create: 2023-08-24 11:20
+ **/
+@RestController
+@AllArgsConstructor
+public class WarehouseTaryAllocationClient implements IWarehouseTaryAllocationClient {
+
+	private IWarehouseTaryAllocationService warehouseTaryAllocationService;
+
+	@Override
+	@PostMapping(GETALLOCATIONID)
+	public List<WarehouseTaryAllocationEntity> getAllocationId(Long allocationId) {
+		return warehouseTaryAllocationService.list(Wrappers.<WarehouseTaryAllocationEntity>query().lambda()
+			.eq(WarehouseTaryAllocationEntity::getAllocationId,allocationId)
+			.eq(WarehouseTaryAllocationEntity::getBindStatus , "1")
+		);
+	}
+}

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

@@ -1,22 +1,18 @@
 package com.logpm.warehouse.feign;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.logpm.warehouse.entity.WarehouseWaybillEntity;
+import com.logpm.warehouse.entity.WarehouseTrayGoodsEntity;
 import com.logpm.warehouse.service.IWarehouseTrayGoodsService;
 import com.logpm.warehouse.service.IWarehouseTrayTypeService;
-import com.logpm.warehouse.service.IWarehouseWaybillService;
 import lombok.AllArgsConstructor;
-import org.springblade.core.mp.support.BladePage;
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.mp.support.Query;
-import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
+import java.util.List;
+
 @ApiIgnore()
 @RestController
 @AllArgsConstructor
@@ -48,4 +44,13 @@ public class WarehouseTrayGoodsClient implements IWarehouseTrayGoodsClient {
 		R r = warehouseTrayTypeService.trayToNull(code);
 		return r.isSuccess() ;
 	}
+
+	@Override
+	@PostMapping(GETTRAYIDLIST)
+	public List<WarehouseTrayGoodsEntity> getTrayIdList(Long trayId) {
+		return warehouseTrayGoodsService.list(Wrappers.<WarehouseTrayGoodsEntity>query().lambda()
+			.eq(WarehouseTrayGoodsEntity::getTrayId,trayId)
+			.eq(WarehouseTrayGoodsEntity::getAssociationType,"3")
+		);
+	}
 }

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

@@ -90,13 +90,13 @@ public interface WarehouseGoodsAllocationMapper extends BaseMapper<WarehouseGood
 	 */
 	List<WarehouseMaterialEntity> selectStockList(@Param("id")Long id);
 
-    List<WarehouseStockArticleCopyVO> selectOrder(IPage<WarehouseStockArticleCopyVO> page,@Param("param") WarehouseStockArticleCopyDTO warehouseGoodsAllocation);
+    List<WarehouseStockArticleZationVO> selectOrder(IPage<WarehouseStockArticleZationVO> page, @Param("param") WarehouseStockArticleZationDTO warehouseGoodsAllocation);
 	/**
 	 * 查询服务号
 	 *
 	 * @return
 	 */
-	List<WarehouseStockArticleCopyVO> selectservicenub(IPage<WarehouseStockArticleCopyVO> page,@Param("param") WarehouseStockArticleCopyDTO warehouseGoodsAllocation);
+	List<WarehouseStockArticleZationVO> selectservicenub(IPage<WarehouseStockArticleZationVO> page, @Param("param") WarehouseStockArticleZationDTO warehouseGoodsAllocation);
 	/**
 	 * 根据服务号查询订单
 	 *
@@ -126,14 +126,14 @@ public interface WarehouseGoodsAllocationMapper extends BaseMapper<WarehouseGood
 	 *
 	 * @return
 	 */
-	List<WarehouseStockListCopyVO> selectAllInventory(IPage<WarehouseStockListCopyVO> page,@Param("param") WarehouseGoodsAllocationDTO warehouseGoodsAllocation);
+	List<WarehouseStockListZationVO> selectAllInventory(IPage<WarehouseStockListZationVO> page, @Param("param") WarehouseGoodsAllocationDTO warehouseGoodsAllocation);
 
 	/**
 	 *货位  查询库存品
 	 *
 	 * @return
 	 */
-	List<WarehouseStockListCopyVO> selectInventory(IPage<WarehouseStockListCopyVO> page,@Param("param") WarehouseStockListCopyDTO warehouseGoodsAllocation);
+	List<WarehouseStockListZationVO> selectInventory(IPage<WarehouseStockListZationVO> page, @Param("param") WarehouseStockListZationDTO warehouseGoodsAllocation);
 	/**
 	 *查询货位托盘
 	 *
@@ -145,13 +145,13 @@ public interface WarehouseGoodsAllocationMapper extends BaseMapper<WarehouseGood
 	 *
 	 * @return
 	 */
-    List<WarehouseStockArticleCopyVO> selectZeroOrder(IPage<WarehouseStockArticleCopyVO> page,@Param("param") WarehouseStockArticleCopyDTO warehouseStockArticleCopyDTO);
+    List<WarehouseStockArticleZationVO> selectZeroOrder(IPage<WarehouseStockArticleZationVO> page, @Param("param") WarehouseStockArticleZationDTO warehouseStockArticleZationDTO);
 	/**
 	 *查询货位零担
 	 *
 	 * @return
 	 */
-	List<WarehouseStockArticleCopyVO> selectAllZeroOrder(IPage<WarehouseStockArticleCopyVO> page,@Param("param") WarehouseStockArticleCopyDTO warehouseStockArticleCopyDTO);
+	List<WarehouseStockArticleZationVO> selectAllZeroOrder(IPage<WarehouseStockArticleZationVO> page, @Param("param") WarehouseStockArticleZationDTO warehouseStockArticleZationDTO);
 	/**
 	 *查询货区
 	 *

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

@@ -39,19 +39,22 @@
     <select id="selectStockList" resultType="com.logpm.warehouse.entity.WarehouseMaterialEntity">
         select  lbm.product_code productCode, lbm.name name   from logpm_basicdata_material lbm join logpm_warehouse_updown_goods  lwug on lbm.id = lwug.association_id WHERE lwug.association_type = '4' and  lwug.allocation_id = #{id}
     </select>
-    <select id="selectOrder" resultType="com.logpm.warehouse.vo.WarehouseStockArticleCopyVO">
+    <select id="selectOrder" resultType="com.logpm.warehouse.vo.WarehouseStockArticleZationVO">
         select ldsa.* from logpm_distribution_stock_article ldsa
         <where>
             ldsa.is_deleted = 0 and ldsa.is_zero ='0'
             <if test="param.serviceNumber!=null and param.serviceNumber!=''">
                 and ldsa.service_number like concat('%',#{param.serviceNumber},'%')
             </if>
+            <if test="param.warehouseId!=null and param.warehouseId!=''">
+                and ldsa.warehouse_id = #{param.warehouseId}
+            </if>
             <if test="param.orderCode!=null and param.orderCode!=''">
                 and ldsa.order_code like concat('%',#{param.orderCode},'%')
             </if>
         </where>
     </select>
-    <select id="selectservicenub" resultType="com.logpm.warehouse.vo.WarehouseStockArticleCopyVO">
+    <select id="selectservicenub" resultType="com.logpm.warehouse.vo.WarehouseStockArticleZationVO">
         select GROUP_CONCAT( ldsa.order_Code SEPARATOR ',' ) orderCode, ldsa.service_number
         serviceNumber,GROUP_CONCAT(ldsa.customer_name SEPARATOR ',' ) customerName,ldsa.customer_address
         customerAddress, ldsa.customer_telephone customerTelephone from logpm_distribution_stock_article ldsa
@@ -147,7 +150,7 @@
             AND ldpl.is_deleted = 0 and lwug.allocation_id =#{param.id}
         </where>
     </select>
-    <select id="selectAllInventory" resultType="com.logpm.warehouse.vo.WarehouseStockListCopyVO">
+    <select id="selectAllInventory" resultType="com.logpm.warehouse.vo.WarehouseStockListZationVO">
         SELECT
             ldsl.order_code orderCode,
             ldsl.service_number serviceNumber,
@@ -168,7 +171,7 @@
             lwug.association_type = 4 and ldsl.market_id = lwug.market_id AND ldsl.is_deleted = 0 and lwug.allocation_id =#{param.id}
         </where>
     </select>
-    <select id="selectInventory" resultType="com.logpm.warehouse.vo.WarehouseStockListCopyVO">
+    <select id="selectInventory" resultType="com.logpm.warehouse.vo.WarehouseStockListZationVO">
         SELECT
             ldsl.material_id materialId,
             ldsl.order_code orderCode,
@@ -217,10 +220,10 @@
             and lwta.allocation_id =#{param.id}
         </where>
     </select>
-    <select id="selectZeroOrder" resultType="com.logpm.warehouse.vo.WarehouseStockArticleCopyVO">
+    <select id="selectZeroOrder" resultType="com.logpm.warehouse.vo.WarehouseStockArticleZationVO">
         SELECT ldsa.*  FROM logpm_distribution_stock_article ldsa WHERE ldsa.is_zero ='1'
     </select>
-    <select id="selectAllZeroOrder" resultType="com.logpm.warehouse.vo.WarehouseStockArticleCopyVO">
+    <select id="selectAllZeroOrder" resultType="com.logpm.warehouse.vo.WarehouseStockArticleZationVO">
         SELECT ldsa.*  FROM logpm_distribution_stock_article ldsa join logpm_warehouse_updown_goods lwug on lwug.association_id = ldsa.id WHERE ldsa.is_zero ='1'
     </select>
     <select id="selectCargoSumId" resultType="com.logpm.warehouse.vo.WarehouseCargoSumVO">

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

@@ -0,0 +1,54 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  ReWarehouse and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  ReWarehouses of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  ReWarehouses 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 Warehouse.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.warehouse.mapper;
+
+import com.logpm.warehouse.entity.WarehouseStockEntity;
+import com.logpm.warehouse.vo.WarehouseStockVO;
+import com.logpm.warehouse.excel.WarehouseStockExcel;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
+/**
+ * 备货扫描记录 Mapper 接口
+ *
+ * @author lmy
+ * @since 2023-08-24
+ */
+public interface WarehouseStockMapper extends BaseMapper<WarehouseStockEntity> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param WarehouseStock
+	 * @return
+	 */
+	List<WarehouseStockVO> selectWarehouseStockPage(IPage page, WarehouseStockVO WarehouseStock);
+
+
+	/**
+	 * 获取导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<WarehouseStockExcel> exportWarehouseStock(@Param("ew") Wrapper<WarehouseStockEntity> queryWrapper);
+
+}

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

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.logpm.warehouse.mapper.WarehouseStockMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="WarehouseStockResultMap" type="com.logpm.warehouse.entity.WarehouseStockEntity">
+        <result column="tenant_id" property="tenantId"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="id" property="id"/>
+        <result column="reserve1" property="reserve1"/>
+        <result column="reserve2" property="reserve2"/>
+        <result column="reserve3" property="reserve3"/>
+        <result column="reserve4" property="reserve4"/>
+        <result column="reserve5" property="reserve5"/>
+        <result column="goods_allocation" property="goodsAllocation"/>
+        <result column="stock_article" property="stockArticle"/>
+        <result column="coding" property="coding"/>
+        <result column="conditions" property="conditions"/>
+        <result column="goods_name" property="goodsName"/>
+        <result column="stock_list_id" property="stockListId"/>
+        <result column="unpacking_quantity" property="unpackingQuantity"/>
+        <result column="parcel_list_id" property="parcelListId"/>
+        <result column="unit" property="unit"/>
+        <result column="factory" property="factory"/>
+        <result column="logistics" property="logistics"/>
+        <result column="mall_name" property="mallName"/>
+        <result column="order_self_numbering" property="orderSelfNumbering"/>
+        <result column="reservation_id" property="reservationId"/>
+        <result column="reservation_code" property="reservationCode"/>
+        <result column="outbound_type" property="outboundType"/>
+        <result column="delivery_list_id" property="deliveryListId"/>
+        <result column="delivery_list_code" property="deliveryListCode"/>
+        <result column="stockup_area" property="stockupArea"/>
+        <result column="bill_lading_id" property="billLadingId"/>
+        <result column="type" property="type"/>
+        <result column="material_id" property="materialId"/>
+        <result column="market_id" property="marketId"/>
+        <result column="stockup_id" property="stockupId"/>
+    </resultMap>
+
+
+    <select id="selectWarehouseStockPage" resultMap="WarehouseStockResultMap">
+        select * from logpm_Warehouse_stock where is_deleted = 0
+    </select>
+
+
+    <select id="exportWarehouseStock" resultType="com.logpm.warehouse.excel.WarehouseStockExcel">
+        SELECT * FROM logpm_Warehouse_stock ${ew.customSqlSegment}
+    </select>
+
+</mapper>

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

@@ -18,7 +18,7 @@
     </select>
 
     <select id="getUpListByTrayTypeId" resultType="com.logpm.warehouse.vo.UpShelfDataVO">
-        select ldsa.order_code orderCode,
+        select ldpl.order_code orderCode,
                lwtg.tray_code trayCode,
                1 goodsType,
                sum(lwtg.num) shelfNum
@@ -27,7 +27,7 @@
         where 1=1
           and lwtg.is_deleted = 0
           and lwtg.tray_type_id = #{trayTypeId}
-        group by ldsa.order_code,
+        group by ldpl.order_code,
                lwtg.tray_code
     </select>
 

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

@@ -23,9 +23,7 @@ import com.logpm.warehouse.vo.*;
 import com.logpm.warehouse.excel.WarehouseGoodsAllocationExcel;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
-import org.springblade.core.mp.support.Query;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -63,11 +61,11 @@ public interface IWarehouseGoodsAllocationService extends BaseService<WarehouseG
 	/**
 	 * 上架 查询订单
 	 */
-	IPage<WarehouseStockArticleCopyVO> selectorder(WarehouseStockArticleCopyDTO warehouseGoodsAllocation, IPage<WarehouseStockArticleCopyVO> page);
+	IPage<WarehouseStockArticleZationVO> selectorder(WarehouseStockArticleZationDTO warehouseGoodsAllocation, IPage<WarehouseStockArticleZationVO> page);
 	/**
 	 * 上架 查询服务号
 	 */
-	IPage<WarehouseStockArticleCopyVO> selectservicenub(WarehouseStockArticleCopyDTO warehouseGoodsAllocation, IPage<WarehouseStockArticleCopyVO> page);
+	IPage<WarehouseStockArticleZationVO> selectservicenub(WarehouseStockArticleZationDTO warehouseGoodsAllocation, IPage<WarehouseStockArticleZationVO> page);
 	/**
 	 * 上架 查询服务号对应的订单
 	 */
@@ -87,11 +85,11 @@ public interface IWarehouseGoodsAllocationService extends BaseService<WarehouseG
 	/**
 	 * 查询货位库存品
 	 */
-	IPage<WarehouseStockListCopyVO> selectAllInventory(WarehouseGoodsAllocationDTO warehouseGoodsAllocation, IPage<WarehouseStockListCopyVO> page);
+	IPage<WarehouseStockListZationVO> selectAllInventory(WarehouseGoodsAllocationDTO warehouseGoodsAllocation, IPage<WarehouseStockListZationVO> page);
 	/**
 	 * 货位 查询库存品
 	 */
-	IPage<WarehouseStockListCopyVO> selectInventory(WarehouseStockListCopyDTO warehouseGoodsAllocation, IPage<WarehouseStockListCopyVO> page);
+	IPage<WarehouseStockListZationVO> selectInventory(WarehouseStockListZationDTO warehouseGoodsAllocation, IPage<WarehouseStockListZationVO> page);
 	/**
 	 * 货位 查询托盘
 	 */
@@ -99,11 +97,11 @@ public interface IWarehouseGoodsAllocationService extends BaseService<WarehouseG
 	/**
 	 * 货位 查询零担
 	 */
-	IPage<WarehouseStockArticleCopyVO> selectZeroOrder(WarehouseStockArticleCopyDTO updownZeroOrderDTO, IPage<WarehouseStockArticleCopyVO> page);
+	IPage<WarehouseStockArticleZationVO> selectZeroOrder(WarehouseStockArticleZationDTO updownZeroOrderDTO, IPage<WarehouseStockArticleZationVO> page);
 	/**
 	 * 查询货位零担
 	 */
-	IPage<WarehouseStockArticleCopyVO> selectAllZeroOrder(WarehouseStockArticleCopyDTO warehouseStockArticleCopyDTO, IPage<WarehouseStockArticleCopyVO> page);
+	IPage<WarehouseStockArticleZationVO> selectAllZeroOrder(WarehouseStockArticleZationDTO warehouseStockArticleZationDTO, IPage<WarehouseStockArticleZationVO> page);
 	/**
 	 * 货位 统计库位数量
 	 */

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

@@ -0,0 +1,52 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  ReWarehouse and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  ReWarehouses of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  ReWarehouses 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 Warehouse.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.warehouse.service;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.logpm.warehouse.entity.WarehouseStockEntity;
+import com.logpm.warehouse.vo.WarehouseStockVO;
+import com.logpm.warehouse.excel.WarehouseStockExcel;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseService;
+import java.util.List;
+
+/**
+ * 备货扫描记录 服务类
+ *
+ * @author lmy
+ * @since 2023-08-24
+ */
+public interface IWarehouseStockService extends BaseService<WarehouseStockEntity> {
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param WarehouseStock
+	 * @return
+	 */
+	IPage<WarehouseStockVO> selectWarehouseStockPage(IPage<WarehouseStockVO> page, WarehouseStockVO WarehouseStock);
+
+
+	/**
+	 * 导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<WarehouseStockExcel> exportWarehouseStock(Wrapper<WarehouseStockEntity> queryWrapper);
+
+}

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

@@ -17,22 +17,15 @@
 package com.logpm.warehouse.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
-import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
 import com.logpm.warehouse.dto.*;
 import com.logpm.warehouse.entity.*;
-import com.logpm.warehouse.mapper.WarehouseUpdownGoodsMapper;
 import com.logpm.warehouse.service.IWarehouseUpdownGoodsService;
 import com.logpm.warehouse.vo.*;
 import com.logpm.warehouse.excel.WarehouseGoodsAllocationExcel;
 import com.logpm.warehouse.mapper.WarehouseGoodsAllocationMapper;
 import com.logpm.warehouse.service.IWarehouseGoodsAllocationService;
 import lombok.AllArgsConstructor;
-import lombok.extern.log4j.Log4j;
 import lombok.extern.log4j.Log4j2;
-import org.springblade.core.mp.support.BladePage;
-import org.springblade.core.mp.support.Query;
-import org.springblade.core.redis.cache.BladeRedis;
 import org.springblade.core.tool.utils.Func;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
@@ -41,9 +34,7 @@ import org.springblade.core.mp.base.BaseServiceImpl;
 
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
-import java.util.concurrent.TimeUnit;
 
 /**
  * 货位 服务实现类
@@ -131,14 +122,14 @@ public class WarehouseGoodsAllocationServiceImpl extends BaseServiceImpl<Warehou
 	}
 
 	@Override
-	public IPage<WarehouseStockArticleCopyVO> selectorder(WarehouseStockArticleCopyDTO warehouseGoodsAllocation, IPage<WarehouseStockArticleCopyVO> page) {
+	public IPage<WarehouseStockArticleZationVO> selectorder(WarehouseStockArticleZationDTO warehouseGoodsAllocation, IPage<WarehouseStockArticleZationVO> page) {
-	  List<WarehouseStockArticleCopyVO> list =	baseMapper.selectOrder(page,warehouseGoodsAllocation);
+	  List<WarehouseStockArticleZationVO> list =	baseMapper.selectOrder(page,warehouseGoodsAllocation);
 		return page.setRecords(list);
 	}
 
 	@Override
-	public IPage<WarehouseStockArticleCopyVO> selectservicenub(WarehouseStockArticleCopyDTO warehouseGoodsAllocation, IPage<WarehouseStockArticleCopyVO> page) {
+	public IPage<WarehouseStockArticleZationVO> selectservicenub(WarehouseStockArticleZationDTO warehouseGoodsAllocation, IPage<WarehouseStockArticleZationVO> page) {
-		List<WarehouseStockArticleCopyVO> list  =	baseMapper.selectservicenub(page,warehouseGoodsAllocation);
+		List<WarehouseStockArticleZationVO> list  =	baseMapper.selectservicenub(page,warehouseGoodsAllocation);
 		return page.setRecords(list);
 	}
 
@@ -168,16 +159,16 @@ public class WarehouseGoodsAllocationServiceImpl extends BaseServiceImpl<Warehou
 	}
 
 	@Override
-	public IPage<WarehouseStockListCopyVO> selectAllInventory(WarehouseGoodsAllocationDTO warehouseGoodsAllocation, IPage<WarehouseStockListCopyVO> page) {
+	public IPage<WarehouseStockListZationVO> selectAllInventory(WarehouseGoodsAllocationDTO warehouseGoodsAllocation, IPage<WarehouseStockListZationVO> page) {
 		//查询货位库存品
-		List<WarehouseStockListCopyVO> list = baseMapper.selectAllInventory(page,warehouseGoodsAllocation);
+		List<WarehouseStockListZationVO> list = baseMapper.selectAllInventory(page,warehouseGoodsAllocation);
 		return page.setRecords(list);
 	}
 
 	@Override
-	public IPage<WarehouseStockListCopyVO> selectInventory(WarehouseStockListCopyDTO warehouseGoodsAllocation, IPage<WarehouseStockListCopyVO> page) {
+	public IPage<WarehouseStockListZationVO> selectInventory(WarehouseStockListZationDTO warehouseGoodsAllocation, IPage<WarehouseStockListZationVO> page) {
 		//查询没有上架的库存品
-		List<WarehouseStockListCopyVO>list = baseMapper.selectInventory(page,warehouseGoodsAllocation);
+		List<WarehouseStockListZationVO>list = baseMapper.selectInventory(page,warehouseGoodsAllocation);
 		return page.setRecords(list);
 	}
 
@@ -189,16 +180,16 @@ public class WarehouseGoodsAllocationServiceImpl extends BaseServiceImpl<Warehou
 	}
 
 	@Override
-	public IPage<WarehouseStockArticleCopyVO> selectZeroOrder(WarehouseStockArticleCopyDTO warehouseStockArticleCopyDTO, IPage<WarehouseStockArticleCopyVO> page) {
+	public IPage<WarehouseStockArticleZationVO> selectZeroOrder(WarehouseStockArticleZationDTO warehouseStockArticleZationDTO, IPage<WarehouseStockArticleZationVO> page) {
 		//查询的零担
-		List<WarehouseStockArticleCopyVO>	list = baseMapper.selectZeroOrder(page,warehouseStockArticleCopyDTO);
+		List<WarehouseStockArticleZationVO>	list = baseMapper.selectZeroOrder(page, warehouseStockArticleZationDTO);
-		for (WarehouseStockArticleCopyVO warehouseStockArticleCopyVO : list) {
+		for (WarehouseStockArticleZationVO warehouseStockArticleZationVO : list) {
 			List<WarehouseUpdownGoodsEntity>  warehouseUpdownGoodsEntityList= warehouseUpdownGoodsService.list(new QueryWrapper<WarehouseUpdownGoodsEntity>().lambda()
-				.eq(WarehouseUpdownGoodsEntity::getAssociationValue,warehouseStockArticleCopyVO.getOrderCode())
+				.eq(WarehouseUpdownGoodsEntity::getAssociationValue, warehouseStockArticleZationVO.getOrderCode())
 				.eq(WarehouseUpdownGoodsEntity::getAssociationType,"1")
 			);
 			Integer useNum = 0;
-			Integer totalNumber = warehouseStockArticleCopyVO.getTotalNumber();//合同数量
+			Integer totalNumber = warehouseStockArticleZationVO.getTotalNumber();//合同数量
 			List<ZeroOrderAllocationVO> ls = new ArrayList<>();
 			for (WarehouseUpdownGoodsEntity warehouseUpdownGoodsEntity : warehouseUpdownGoodsEntityList) {
 				Integer num = warehouseUpdownGoodsEntity.getNum();
@@ -208,23 +199,23 @@ public class WarehouseGoodsAllocationServiceImpl extends BaseServiceImpl<Warehou
 				zeroOrderAllocationVO.setNum(num);
 				ls.add(zeroOrderAllocationVO);
 			}
-			warehouseStockArticleCopyVO.setResidueNumber(totalNumber-useNum);
+			warehouseStockArticleZationVO.setResidueNumber(totalNumber-useNum);
-			warehouseStockArticleCopyVO.setList(ls);
+			warehouseStockArticleZationVO.setList(ls);
 		}
 		return page.setRecords(list);
 	}
 
 	@Override
-	public IPage<WarehouseStockArticleCopyVO> selectAllZeroOrder(WarehouseStockArticleCopyDTO warehouseStockArticleCopyDTO, IPage<WarehouseStockArticleCopyVO> page) {
+	public IPage<WarehouseStockArticleZationVO> selectAllZeroOrder(WarehouseStockArticleZationDTO warehouseStockArticleZationDTO, IPage<WarehouseStockArticleZationVO> page) {
 		//查询库位的零担
-		List<WarehouseStockArticleCopyVO>	list = baseMapper.selectAllZeroOrder(page,warehouseStockArticleCopyDTO);
+		List<WarehouseStockArticleZationVO>	list = baseMapper.selectAllZeroOrder(page, warehouseStockArticleZationDTO);
-		for (WarehouseStockArticleCopyVO warehouseStockArticleCopyVO : list) {
+		for (WarehouseStockArticleZationVO warehouseStockArticleZationVO : list) {
 			List<WarehouseUpdownGoodsEntity>  warehouseUpdownGoodsEntityList= warehouseUpdownGoodsService.list(new QueryWrapper<WarehouseUpdownGoodsEntity>().lambda()
-				.eq(WarehouseUpdownGoodsEntity::getAssociationValue,warehouseStockArticleCopyVO.getOrderCode())
+				.eq(WarehouseUpdownGoodsEntity::getAssociationValue, warehouseStockArticleZationVO.getOrderCode())
 				.eq(WarehouseUpdownGoodsEntity::getAssociationType,"1")
 			);
 			Integer useNum = 0;
-			Integer totalNumber = warehouseStockArticleCopyVO.getTotalNumber();//合同数量
+			Integer totalNumber = warehouseStockArticleZationVO.getTotalNumber();//合同数量
 			List<ZeroOrderAllocationVO> ls = new ArrayList<>();
 			for (WarehouseUpdownGoodsEntity warehouseUpdownGoodsEntity : warehouseUpdownGoodsEntityList) {
 				Integer num = warehouseUpdownGoodsEntity.getNum();
@@ -234,8 +225,8 @@ public class WarehouseGoodsAllocationServiceImpl extends BaseServiceImpl<Warehou
 				zeroOrderAllocationVO.setNum(num);
 				ls.add(zeroOrderAllocationVO);
 			}
-			warehouseStockArticleCopyVO.setResidueNumber(totalNumber-useNum);
+			warehouseStockArticleZationVO.setResidueNumber(totalNumber-useNum);
-			warehouseStockArticleCopyVO.setList(ls);
+			warehouseStockArticleZationVO.setList(ls);
 		}
 		return page.setRecords(list);
 	}

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

@@ -0,0 +1,54 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  ReWarehouse and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  ReWarehouses of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  ReWarehouses 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 Warehouse.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.warehouse.service.impl;
+
+import com.logpm.warehouse.entity.WarehouseStockEntity;
+import com.logpm.warehouse.vo.WarehouseStockVO;
+import com.logpm.warehouse.excel.WarehouseStockExcel;
+import com.logpm.warehouse.mapper.WarehouseStockMapper;
+import com.logpm.warehouse.service.IWarehouseStockService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import java.util.List;
+
+/**
+ * 备货扫描记录 服务实现类
+ *
+ * @author lmy
+ * @since 2023-08-24
+ */
+@Service
+public class WarehouseStockServiceImpl extends BaseServiceImpl<WarehouseStockMapper, WarehouseStockEntity> implements IWarehouseStockService {
+
+	@Override
+	public IPage<WarehouseStockVO> selectWarehouseStockPage(IPage<WarehouseStockVO> page, WarehouseStockVO WarehouseStock) {
+		return page.setRecords(baseMapper.selectWarehouseStockPage(page, WarehouseStock));
+	}
+
+
+	@Override
+	public List<WarehouseStockExcel> exportWarehouseStock(Wrapper<WarehouseStockEntity> queryWrapper) {
+		List<WarehouseStockExcel> WarehouseStockList = baseMapper.exportWarehouseStock(queryWrapper);
+		//WarehouseStockList.forEach(WarehouseStock -> {
+		//	WarehouseStock.setTypeName(DictCache.getValue(DictEnum.YES_NO, WarehouseStock.getType()));
+		//});
+		return WarehouseStockList;
+	}
+
+}

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

@@ -19,14 +19,11 @@ import com.logpm.warehouse.dto.ZeroOrderVO;
 import com.logpm.warehouse.entity.WarehouseTrayGoodsEntity;
 import com.logpm.warehouse.entity.WarehouseTrayGoodsLogEntity;
 import com.logpm.warehouse.entity.WarehouseTrayTypeEntity;
+import com.logpm.warehouse.entity.WarehouseUpdownGoodsEntity;
 import com.logpm.warehouse.mapper.WarehouseTrayTypeMapper;
-import com.logpm.warehouse.service.IWarehouseTaryAllocationService;
+import com.logpm.warehouse.service.*;
-import com.logpm.warehouse.service.IWarehouseTrayGoodsLogService;
-import com.logpm.warehouse.service.IWarehouseTrayGoodsService;
-import com.logpm.warehouse.service.IWarehouseTrayTypeService;
 import com.logpm.warehouse.vo.*;
 import com.logpm.warehouse.wrapper.WarehouseTrayTypeWrapper;
-import lombok.AllArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.springblade.common.constant.DictBizConstant;
 import org.springblade.common.constant.apiwarehouse.PalletProductTypeConstant;
@@ -35,6 +32,8 @@ import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.system.cache.DictBizCache;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -45,24 +44,27 @@ import java.util.Objects;
 
 @Log4j2
 @Service
-@AllArgsConstructor
 public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayTypeMapper, WarehouseTrayTypeEntity> implements IWarehouseTrayTypeService {
 
-	private final IWarehouseTrayGoodsService warehouseTrayGoodsService;
+	@Autowired
-
+	private IWarehouseTrayGoodsService warehouseTrayGoodsService;
-	private final IDistributionStockArticleClient distributionStockArticleClient;
+	@Autowired
-
+	private IDistributionStockArticleClient distributionStockArticleClient;
-	private final IDistributionParcelListClient distributionParcelListClient;
+	@Autowired
-
+	private IDistributionParcelListClient distributionParcelListClient;
-	private final IBasicMaterialClient basicMaterialClient;
+	@Autowired
-
+	private IBasicMaterialClient basicMaterialClient;
-	private final IDistributionStockListClient distributionStockListClient;
+	@Autowired
-
+	private IDistributionStockListClient distributionStockListClient;
-	private final IBasicdataTrayClient basicdataTrayClient;
+	@Autowired
-
+	private IBasicdataTrayClient basicdataTrayClient;
-	private final IWarehouseTrayGoodsLogService warehouseTrayGoodsLogService;
+	@Autowired
-
+	private IWarehouseTrayGoodsLogService warehouseTrayGoodsLogService;
-	private final IWarehouseTaryAllocationService warehouseTaryAllocationService;
+	@Autowired
+	private IWarehouseTaryAllocationService warehouseTaryAllocationService;
+	@Autowired
+	@Lazy
+	private IWarehouseUpdownGoodsService warehouseUpdownGoodsService;
 
 	@Override
 	public IPage<WarehouseTrayTypeVO> orderPageList(TrayTypeDTO trayTypeDTO) {
@@ -107,6 +109,13 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 			log.warn("###############getEntityByTrayCode: 该托盘已被禁用 trayCode={}",trayCode);
 			throw new CustomerException(403,"该托盘已被禁用");
 		}
+		Long trayId = basicdataTrayEntity.getId();
+		Long allocationId = warehouseTaryAllocationService.getAllocationIdByTrayId(trayId);
+		if(!Objects.isNull(allocationId)){
+			log.warn("###############getEntityByTrayCode: 托盘已上架 allocationId={}",allocationId);
+			throw new CustomerException(403,"托盘已上架");
+		}
+
 		//根据托盘编码查询是否有托盘编码存在打托数据
 		QueryWrapper<WarehouseTrayTypeEntity> queryTrayTypeWrapper = new QueryWrapper<>();
 		queryTrayTypeWrapper.eq("tray_code",trayCode)
@@ -167,6 +176,14 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 		qw.eq("association_value",orderPackageCode);
 		WarehouseTrayGoodsEntity trayGoodsEntity = warehouseTrayGoodsService.getOne(qw);
 
+		QueryWrapper<WarehouseUpdownGoodsEntity> updownGoodsEntityQueryWrapper = new QueryWrapper<>();
+		updownGoodsEntityQueryWrapper.eq("association_value",orderPackageCode);
+		WarehouseUpdownGoodsEntity updownGoodsEntity = warehouseUpdownGoodsService.getOne(updownGoodsEntityQueryWrapper);
+		if(!Objects.isNull(updownGoodsEntity)){
+			log.warn("#########orderScanOrderPackageCode: 包件已上架 orderPackageCode={}",orderPackageCode);
+			return R.fail(403,"包件已上架");
+		}
+
 		BasicdataTrayEntity basicdataTrayEntity = basicdataTrayClient.getTrayByTrayCode(trayCode);
 		if(Objects.isNull(basicdataTrayEntity)){
 			log.warn("#########orderScanOrderPackageCode: 未找到托盘信息 trayCode={}",trayCode);
@@ -482,9 +499,46 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 
 	@Override
 	public List<TrayTypeDataListVO> getZeroOrderByWaybillCode(String waybillCode) {
+//		List<TrayTypeDataListVO> zeroOrderByWaybillCode = baseMapper.getZeroOrderByWaybillCode(waybillCode);
+//		for (TrayTypeDataListVO trayTypeDataListVO:zeroOrderByWaybillCode){
+//
+//			String ordeCode = trayTypeDataListVO.getDataCode();
+//			Long orderId = trayTypeDataListVO.getDataId();
+//			//计算零担订单可用数量
+//			countZeroAvailableNum(orderId);
+//
+//		}
 		return baseMapper.getZeroOrderByWaybillCode(waybillCode);
 	}
 
+	/**
+	 * 计算零担订单的可用数量
+	 * @param orderId
+	 * @return
+	 */
+	private Integer countZeroAvailableNum(Long orderId) {
+		//计算已打托数量
+		QueryWrapper<WarehouseTrayGoodsEntity> trayGoodsEntityQueryWrapper = new QueryWrapper<>();
+		trayGoodsEntityQueryWrapper.eq("association_id",orderId)
+			.eq("association_type",1);
+		List<WarehouseTrayGoodsEntity> trayGoodsList = warehouseTrayGoodsService.list(trayGoodsEntityQueryWrapper);
+		QueryWrapper<WarehouseUpdownGoodsEntity> updownGoodsEntityQueryWrapper = new QueryWrapper<>();
+		trayGoodsEntityQueryWrapper.eq("association_id",orderId)
+			.eq("association_type",1);
+		List<WarehouseUpdownGoodsEntity> updownGoodsList = warehouseUpdownGoodsService.list(updownGoodsEntityQueryWrapper);
+		for (WarehouseTrayGoodsEntity trayGoodsEntity:trayGoodsList){
+
+			for (WarehouseUpdownGoodsEntity updownGoodsEntity:updownGoodsList){
+
+			}
+
+		}
+
+
+
+		return 0;
+	}
+
 	@Transactional(rollbackFor = Exception.class)
 	@Override
 	public R enterZeroOrderByTrayCode(String trayType,String trayCode, List<ZeroOrderVO> zeroList) {
@@ -1225,12 +1279,13 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 		//删除绑定关系
 		warehouseTrayGoodsService.deleteByIdList(trayGoodsList);
 		//删除打托方式
-		trayTypeEntity.setTotalNum(0);
+		removeById(trayTypeEntity.getId());
-		trayTypeEntity.setOrderTotalNum(0);
+//		trayTypeEntity.setTotalNum(0);
-		trayTypeEntity.setStockNum(0);
+//		trayTypeEntity.setOrderTotalNum(0);
-		trayTypeEntity.setStockTotalNum(0);
+//		trayTypeEntity.setStockNum(0);
-		trayTypeEntity.setIsDeleted(1);
+//		trayTypeEntity.setStockTotalNum(0);
-		updateById(trayTypeEntity);
+//		trayTypeEntity.setIsDeleted(1);
+//		updateById(trayTypeEntity);
 		//空置托盘
 		basicdataTrayClient.updateTrayStatus(trayId,1);
 	}

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

@@ -104,14 +104,12 @@ public class WarehouseUpdownGoodsServiceImpl extends BaseServiceImpl<WarehouseUp
 		updownGoodsEntity.setAreaTitle(updownTypeEntity.getAreaTitle());
 		updownGoodsEntity.setShelfId(updownTypeEntity.getShelfId());
 		updownGoodsEntity.setShelfTitle(updownTypeEntity.getShelfTitle());
-		updownGoodsEntity.setAllocationId(updownGoodsEntity.getAllocationId());
+		updownGoodsEntity.setAllocationId(updownTypeEntity.getAllocationId());
-		updownGoodsEntity.setAllocationTitle(updownGoodsEntity.getAllocationTitle());
+		updownGoodsEntity.setAllocationTitle(updownTypeEntity.getAllocationTitle());
-		updownGoodsEntity.setPositionCode(updownGoodsEntity.getPositionCode());
+		updownGoodsEntity.setPositionCode(updownTypeEntity.getPositionCode());
-		updownGoodsEntity.setGoodsType(updownGoodsEntity.getGoodsType());
 		updownGoodsEntity.setAssociationId(parcelListEntity.getId());
 		updownGoodsEntity.setAssociationValue(parcelListEntity.getOrderPackageCode());
 		updownGoodsEntity.setAssociationType("3");//包件
-		updownGoodsEntity.setGoodsName(updownGoodsEntity.getGoodsName());
 		updownGoodsEntity.setNum(parcelListEntity.getQuantity());
 		save(updownGoodsEntity);
 		//存入包件货物上架记录

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

@@ -799,8 +799,12 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 			Long updownGoodsId = updownGoodsEntity.getId();
 			Long updownTypeId = updownGoodsEntity.getUpdownTypeId();
 			WarehouseUpdownTypeEntity updownTypeEntity = baseMapper.selectById(updownTypeId);
-			BasicdataTrayEntity trayEntity = warehouseTaryAllocationService.getTrayByAllocationId(allocationId);
+			QueryWrapper<WarehouseTaryAllocationEntity> taryAllocationEntityQueryWrapper = new QueryWrapper<>();
-			if(!Objects.isNull(trayEntity)){
+			taryAllocationEntityQueryWrapper.eq("allocation_id",allocationId)
+				.eq("is_deleted",0);
+			WarehouseTaryAllocationEntity taryAllocationEntity = warehouseTaryAllocationService.getOne(taryAllocationEntityQueryWrapper);
+//			BasicdataTrayEntity trayEntity = warehouseTaryAllocationService.getTrayByAllocationId(allocationId);
+			if(!Objects.isNull(taryAllocationEntity)){
 				//有托盘，托盘下托
 				warehouseTrayTypeService.downPackageByOrderPackageCode(orderPackageCode,"包件下架:同步下托");
 			}
@@ -810,6 +814,10 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 				removeById(updownTypeId);
 				//修改库位状态为空闲
 				basicdataGoodsAllocationClient.updateAllocationStatus(allocationId,"1");
+				//如果有托盘还要删除托盘与库位的绑定
+				if(!Objects.isNull(taryAllocationEntity)){
+					warehouseTaryAllocationService.deleteById(taryAllocationEntity);
+				}
 			}
 			warehouseUpdownGoodsLogService.saveAllocationAndPackage(updownTypeEntity,parcelListEntity,"2",0,"包件下架:包件下架");
 			updateUpdownTypeNum(updownTypeEntity);
@@ -992,20 +1000,19 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 		//删除绑定关系
 		warehouseUpdownGoodsService.deleteEntityList(updownGoodsList);
 		//上架方式删除
-		updownTypeEntity.setTotalNum(0);
+		removeById(updownTypeEntity.getId());
-		updownTypeEntity.setOrderTotalNum(0);
-		updownTypeEntity.setStockNum(0);
-		updownTypeEntity.setStockTotalNum(0);
-		updownTypeEntity.setIsDeleted(1);
-		updateById(updownTypeEntity);
 		//修改库位状态
 		basicdataGoodsAllocationClient.updateAllocationStatus(allocationId,"1");
 
 		//查询库位是否绑定了托盘
-		BasicdataTrayEntity trayEntity = warehouseTaryAllocationService.getTrayByAllocationId(allocationId);
+		QueryWrapper<WarehouseTaryAllocationEntity> taryAllocationEntityQueryWrapper = new QueryWrapper<>();
-		if(!Objects.isNull(trayEntity)){
+		taryAllocationEntityQueryWrapper.eq("allocation_id",allocationId)
+			.eq("is_deleted",0);
+		WarehouseTaryAllocationEntity taryAllocationEntity = warehouseTaryAllocationService.getOne(taryAllocationEntityQueryWrapper);
+		if(!Objects.isNull(taryAllocationEntity)){
 			//绑定了托盘
-			warehouseTrayTypeService.downTrayGoodsByTrayId(trayEntity.getId(),"下架:按库位下架");
+			warehouseTaryAllocationService.deleteById(taryAllocationEntity);
+//			warehouseTrayTypeService.downTrayGoodsByTrayId(trayEntity.getId(),"下架:按库位下架");
 		}
 		return R.success("下架成功");
 	}
@@ -1020,7 +1027,7 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 		}
 		Long trayId = trayEntity.getId();
 		QueryWrapper<WarehouseTaryAllocationEntity> queryWrapper = new QueryWrapper<>();
-		queryWrapper.eq("tary_id",trayId)
+		queryWrapper.eq("tray_id",trayId)
 			.eq("is_deleted",0);
 		WarehouseTaryAllocationEntity taryAllocationEntity = warehouseTaryAllocationService.getOne(queryWrapper);
 		if(Objects.isNull(taryAllocationEntity)){
@@ -1029,7 +1036,7 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 		}
 		Long allocationId = taryAllocationEntity.getAllocationId();//库位id
 		//解绑托盘
-		warehouseTaryAllocationService.deleteById(taryAllocationEntity);
+//		warehouseTaryAllocationService.deleteById(taryAllocationEntity);
 		R r = downAllocation(allocationId);
 		return r;
 	}

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/wrapper/WarehouseStockWrapper.java

@@ -0,0 +1,51 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  ReWarehouse and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  ReWarehouses of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  ReWarehouses 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 Warehouse.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.warehouse.wrapper;
+
+import com.logpm.warehouse.entity.WarehouseStockEntity;
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+
+import com.logpm.warehouse.vo.WarehouseStockVO;
+import java.util.Objects;
+
+/**
+ * 备货扫描记录 包装类,返回视图层所需的字段
+ *
+ * @author lmy
+ * @since 2023-08-24
+ */
+public class WarehouseStockWrapper extends BaseEntityWrapper<WarehouseStockEntity, WarehouseStockVO>  {
+
+	public static WarehouseStockWrapper build() {
+		return new WarehouseStockWrapper();
+ 	}
+
+	@Override
+	public WarehouseStockVO entityVO(WarehouseStockEntity WarehouseStock) {
+		WarehouseStockVO WarehouseStockVO = Objects.requireNonNull(BeanUtil.copy(WarehouseStock, WarehouseStockVO.class));
+
+		//User createUser = UserCache.getUser(WarehouseStock.getCreateUser());
+		//User updateUser = UserCache.getUser(WarehouseStock.getUpdateUser());
+		//WarehouseStockVO.setCreateUserName(createUser.getName());
+		//WarehouseStockVO.setUpdateUserName(updateUser.getName());
+
+		return WarehouseStockVO;
+	}
+
+
+}