1.查询库存品

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

@@ -0,0 +1,149 @@
+/*
+ *      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.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+/**
+ * 物料基础信息 实体类
+ *
+ * @author tjj
+ * @since 2023-05-26
+ */
+@Data
+@TableName("logpm_warehouse_material")
+@ApiModel(value = "Warehouse对象", description = "物料基础信息")
+@EqualsAndHashCode(callSuper = true)
+public class WarehouseMaterialEntity 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 = "产品编码")
+	private String productCode;
+	/**
+	 * 名称
+	 */
+	@ApiModelProperty(value = "名称")
+	private String name;
+	/**
+	 * 品牌
+	 */
+	@ApiModelProperty(value = "品牌")
+	private String brandId;
+	/**
+	 * 属性
+	 */
+	@ApiModelProperty(value = "属性")
+	private String property;
+	/**
+	 * 规格
+	 */
+	@ApiModelProperty(value = "规格")
+	private String specification;
+	/**
+	 * 包装规格
+	 */
+	@ApiModelProperty(value = "包装规格")
+	private String packingSpecification;
+	/**
+	 * 包装材质
+	 */
+	@ApiModelProperty(value = "包装材质")
+	private String packagingMaterial;
+	/**
+	 * 长
+	 */
+	@ApiModelProperty(value = "长")
+	private String extent;
+	/**
+	 * 宽
+	 */
+	@ApiModelProperty(value = "宽")
+	private String breadth;
+	/**
+	 * 高度
+	 */
+	@ApiModelProperty(value = "高度")
+	private String altitude;
+	/**
+	 * 体积
+	 */
+	@ApiModelProperty(value = "体积")
+	private String volume;
+	/**
+	 * 总量
+	 */
+	@ApiModelProperty(value = "总量")
+	private String weight;
+	/**
+	 * 备注
+	 */
+	@ApiModelProperty(value = "备注")
+	private String remark;
+
+
+	/**
+	 * 计量单位
+	 */
+	@ApiModelProperty(value = "计量单位")
+	private String logpmUnit;
+
+
+	@ApiModelProperty(value = "sku")
+	private String sku;
+
+	@ApiModelProperty(value = "父id")
+	private Long pid;
+
+	@ApiModelProperty(value = "是否隐藏(1-否,2-是)")
+	private Integer hide;
+
+	@ApiModelProperty(value = "包装数量")
+	private String packageNum;
+
+}

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

@@ -0,0 +1,286 @@
+/*
+ *      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/vo/WarehouseStockListCopyVO.java

@@ -0,0 +1,103 @@
+/*
+ *      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.vo;
+
+
+import com.logpm.warehouse.entity.WarehouseStockListCopyEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 库存品管理 视图实体类
+ *
+ * @author cyz
+ * @since 2023-06-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class WarehouseStockListCopyVO extends WarehouseStockListCopyEntity {
+	private static final long serialVersionUID = 1L;
+	/**
+	 * 备货数
+	 */
+	@ApiModelProperty(value = "备货数")
+	private String deliveryNumber;
+	/**
+	 * 添加数量
+	 */
+	private Integer inventoryQuantity;
+
+	/**
+	 * 物料名称
+	 */
+	@ApiModelProperty(value = "物料名称")
+	private String descriptionGoods;
+	/**
+	 * 货位名称
+	 */
+	@ApiModelProperty(value = "货位名称")
+	private String goodsAllocation;
+
+
+	//8.10
+
+	/**
+	 * 货位名称
+	 */
+	@ApiModelProperty(value = "货位名称")
+	private String goodsAllocationName;
+	/**
+	 * 所在列
+	 */
+	@ApiModelProperty(value = "所在列")
+	private String columnNum;
+	/**
+	 * 所在行
+	 */
+	@ApiModelProperty(value = "所在行")
+	private String layerNum;
+
+	/**
+	 * 关系类型
+	 */
+	@ApiModelProperty(value = "关系类型")
+	private String bindingType;
+
+	/**
+	 * 操作时间
+	 */
+	@ApiModelProperty(value = "操作时间")
+	private String operateTime;
+
+	/**
+	 * 操作人（k）
+	 */
+	@ApiModelProperty(value = "作人（k）")
+	private Long operateUser;
+	/**
+	 * 操作人(v)
+	 */
+	@ApiModelProperty(value = "操作人(v)")
+	private String operateUserName;
+	/**
+	 * 操作数量
+	 */
+	@ApiModelProperty(value = "操作数量")
+	private String num;
+
+}

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

@@ -1,10 +1,56 @@
 package com.logpm.warehouse.vo;
 
 import com.logpm.warehouse.entity.WarehouseUpdownGoodsLogEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class WarehouseUpdownGoodsLogVO extends WarehouseUpdownGoodsLogEntity {
+	/**
+	 * 仓库名称
+	 * */
+	@ApiModelProperty(name = "仓库名称",notes = "")
+	private String warehouseName ;
+
+	/**
+	 * 订单自编码
+	 * */
+	@ApiModelProperty(name = "订单自编码",notes = "")
+	private String orderCode;
+
+	/**
+	 * 包件编码
+	 * */
+	@ApiModelProperty(name = "包件编码",notes = "")
+	private String orderPackageCode ;
+
+	/**
+	 * 托盘码
+	 * */
+	@ApiModelProperty(name = "托盘码",notes = "")
+	private String palletCode ;
+
+	/**
+	 * 操作员
+	 * */
+	@ApiModelProperty(name = "操作员",notes = "")
+	private String createUserName;
+	/**
+	 * 物料编码
+	 * */
+	@ApiModelProperty(name = "物料编码",notes = "")
+	private String materialCode;
+
+	/**
+	 * 物料名称
+	 * */
+	@ApiModelProperty(name = "物料名称",notes = "")
+	private String materialName;
+	/**
+	 * sku
+	 * */
+	@ApiModelProperty(name = "sku",notes = "")
+	private String sku;
 }

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

@@ -88,13 +88,13 @@ public class WarehouseUpdownTypeApiController {
 		}
 	}
 
-	@ResponseBody
+//	@ResponseBody
-	@PostMapping("/upShelfScanAllocation")
+//	@PostMapping("/upShelfScanAllocation")
-	@ApiOperationSupport(order = 1)
+//	@ApiOperationSupport(order = 1)
-	@ApiOperation(value = "上架扫描库位", notes = "传入trayTypeDTO")
+//	@ApiOperation(value = "上架扫描库位", notes = "传入trayTypeDTO")
-	public R upShelfScanAllocation(@RequestBody UpdownTypeDTO updownTypeDTO) {
+//	public R upShelfScanAllocation(@RequestBody UpdownTypeDTO updownTypeDTO) {
-		String method = "###########upShelfScanAllocation: ";
+//		String method = "###########upShelfScanAllocation: ";
-		log.info(method + "上架扫描库位 updownTypeDTO={}", updownTypeDTO);
+//		log.info(method + "上架扫描库位 updownTypeDTO={}", updownTypeDTO);
 
 
 

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

@@ -65,9 +65,9 @@ public class WarehouseUpdownGoodsLogController extends BladeController {
 	@GetMapping("/detail")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "详情", notes = "传入warehouseUpdownGoodsLog")
-	public R<WarehouseUpdownGoodsLogVO> detail(WarehouseUpdownGoodsLogEntity warehouseUpdownGoodsLog) {
+	public R<WarehouseUpdownGoodsLogEntity> detail(WarehouseUpdownGoodsLogEntity warehouseUpdownGoodsLog) {
 		WarehouseUpdownGoodsLogEntity detail = warehouseUpdownGoodsLogService.getOne(Condition.getQueryWrapper(warehouseUpdownGoodsLog));
-		return R.data(WarehouseUpdownGoodsLogWrapper.build().entityVO(detail));
+		return R.data(detail);
 	}
 	/**
 	 * 上下架记录表 分页
@@ -75,9 +75,9 @@ public class WarehouseUpdownGoodsLogController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入warehouseUpdownGoodsLog")
-	public R<IPage<WarehouseUpdownGoodsLogVO>> list(@ApiIgnore @RequestParam Map<String, Object> warehouseUpdownGoodsLog, Query query) {
+	public R<IPage<WarehouseUpdownGoodsLogEntity>> list(@ApiIgnore @RequestParam Map<String, Object> warehouseUpdownGoodsLog, Query query) {
 		IPage<WarehouseUpdownGoodsLogEntity> pages = warehouseUpdownGoodsLogService.page(Condition.getPage(query), Condition.getQueryWrapper(warehouseUpdownGoodsLog, WarehouseUpdownGoodsLogEntity.class));
-		return R.data(WarehouseUpdownGoodsLogWrapper.build().pageVO(pages));
+		return R.data(pages);
 	}
 
 	/**
@@ -88,7 +88,7 @@ public class WarehouseUpdownGoodsLogController extends BladeController {
 	@ApiOperation(value = "分页", notes = "传入warehouseUpdownGoodsLog")
 	public R<IPage<WarehouseUpdownGoodsLogVO>> page(WarehouseUpdownGoodsLogVO warehouseUpdownGoodsLog, Query query) {
 		IPage<WarehouseUpdownGoodsLogVO> pages = warehouseUpdownGoodsLogService.selectWarehouseUpdownGoodsLogPage(Condition.getPage(query), warehouseUpdownGoodsLog);
-		return R.data(pages);
+		return R.data(WarehouseUpdownGoodsLogWrapper.build().pageVO(pages));
 	}
 
 	/**

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

@@ -16,18 +16,12 @@
  */
 package com.logpm.warehouse.mapper;
 
-import com.logpm.warehouse.entity.WarehouseGoodsAllocationEntity;
+import com.logpm.warehouse.entity.*;
-import com.logpm.warehouse.entity.WarehouseGoodsAreaEntity;
+import com.logpm.warehouse.vo.*;
-import com.logpm.warehouse.entity.WarehouseGoodsShelfEntity;
-import com.logpm.warehouse.entity.WarehouseWarehouseEntity;
-import com.logpm.warehouse.vo.WarehouseGoodsAllocationVO;
 import com.logpm.warehouse.excel.WarehouseGoodsAllocationExcel;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.logpm.warehouse.vo.WarehouseGoodsAreaVO;
-import com.logpm.warehouse.vo.WarehouseVisCargo;
-import com.logpm.warehouse.vo.WarehouseVisualizationVO;
 import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
@@ -88,5 +82,10 @@ public interface WarehouseGoodsAllocationMapper extends BaseMapper<WarehouseGood
 	 */
     List<WarehouseVisualizationVO> selectServe(@Param("id")Long id);
 
-
+	/**
+	 * 查询物料
+	 *
+	 * @return
+	 */
+	List<WarehouseMaterialEntity> selectStockList(@Param("id")Long id);
 }

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

@@ -36,5 +36,8 @@
     <select id="selectServe" resultType="com.logpm.warehouse.vo.WarehouseVisualizationVO">
         select  ldpl.*   from logpm_distribution_parcel_list ldpl join logpm_warehouse_updown_goods  lwug on ldpl.id = lwug.association_id WHERE lwug.association_type = '3' and  lwug.allocation_id = #{id}
     </select>
+    <select id="selectStockList" resultType="com.logpm.warehouse.entity.WarehouseMaterialEntity">
+        select  lbm.*   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>
 
 </mapper>

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

@@ -40,7 +40,7 @@ public interface WarehouseUpdownGoodsLogMapper extends BaseMapper<WarehouseUpdow
 	 * @param warehouseUpdownGoodsLog
 	 * @return
 	 */
-	List<WarehouseUpdownGoodsLogVO> selectWarehouseUpdownGoodsLogPage(IPage page, WarehouseUpdownGoodsLogVO warehouseUpdownGoodsLog);
+	List<WarehouseUpdownGoodsLogVO> selectWarehouseUpdownGoodsLogPage(IPage page,@Param("param") WarehouseUpdownGoodsLogVO warehouseUpdownGoodsLog);
 
 
 	/**

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

@@ -18,21 +18,21 @@
         <result column="reserve3" property="reserve3"/>
         <result column="reserve4" property="reserve4"/>
         <result column="reserve5" property="reserve5"/>
-        <result column="warehouse_id" property="warehouseId"/>
+<!--        <result column="warehouse_id" property="warehouseId"/>-->
-        <result column="warehouse_name" property="warehouseName"/>
+<!--        <result column="warehouse_name" property="warehouseName"/>-->
-        <result column="order_code" property="orderCode"/>
+<!--        <result column="order_code" property="orderCode"/>-->
-        <result column="order_package_code" property="orderPackageCode"/>
+<!--        <result column="order_package_code" property="orderPackageCode"/>-->
         <result column="binding_type" property="bindingType"/>
-        <result column="goods_area_id" property="goodsAreaId"/>
+<!--        <result column="goods_area_id" property="goodsAreaId"/>-->
-        <result column="goods_shelf_id" property="goodsShelfId"/>
+<!--        <result column="goods_shelf_id" property="goodsShelfId"/>-->
-        <result column="goods_allocation_id" property="goodsAllocationId"/>
+<!--        <result column="goods_allocation_id" property="goodsAllocationId"/>-->
         <result column="is_alltrays" property="isAlltrays"/>
         <result column="goods_type" property="goodsType"/>
         <result column="association_type" property="associationType"/>
         <result column="association_value" property="associationValue"/>
         <result column="association_id" property="associationId"/>
         <result column="num" property="num"/>
-        <result column="is_zero" property="isZero"/>
+<!--        <result column="is_zero" property="isZero"/>-->
         <result column="updown_type_id" property="updownTypeId"/>
         <result column="remark" property="remark"/>
         <result column="market_id" property="marketId"/>
@@ -40,13 +40,45 @@
     </resultMap>
 
 
-    <select id="selectWarehouseUpdownGoodsLogPage" resultMap="warehouseUpdownGoodsLogResultMap">
+
-        select * from logpm_warehouse_updown_goods_log where is_deleted = 0
-    </select>
 
 
     <select id="exportWarehouseUpdownGoodsLog" resultType="com.logpm.warehouse.excel.WarehouseUpdownGoodsLogExcel">
         SELECT * FROM logpm_warehouse_updown_goods_log ${ew.customSqlSegment}
     </select>
+    <select id="selectWarehouseUpdownGoodsLogPage" resultType="com.logpm.warehouse.vo.WarehouseUpdownGoodsLogVO">
+        SELECT
+        lwup.id id,
+        ldpl.warehouse warehouseName,
+        ldpl.order_code orderCode,
+        ldpl.order_package_code orderPackageCode,
+        lwup.area_title areaTitle,
+        lwup.allocation_title allocationTitle,
+        lwup.shelf_title shelfTitle,
+        lwup.create_user createUser,
+        lwup.create_time createTime,
+        ldpl.pallet palletCode,
+        lbm.product_code materialCode,
+        lbm.name materialName,
+        lbm.sku sku,
+        lwup.binding_type bindingType
+        FROM
+        logpm_warehouse_updown_goods_log lwup
+        left join logpm_distribution_parcel_list ldpl  on ldpl.id =lwup.association_id
+        left join logpm_basicdata_material lbm on lbm.id = lwup.association_id
+        <where>
+            <if test="param.warehouseName!=null and param.warehouseName!=''">
+                and ldpl.warehouse like concat('%',#{param.warehouseName},'%')
+            </if>
+            <if test="param.orderCode!=null and param.orderCode!=''">
+                and ldpl.order_code like concat('%',#{param.orderCode},'%')
+            </if>
+            <if test="param.orderPackageCode!=null and param.orderPackageCode!=''">
+                and ldpl.order_package_code like concat('%',#{param.orderPackageCode},'%')
+            </if>
+            lwup.is_deleted = 0
+        </where>
+
+    </select>
 
 </mapper>

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

@@ -19,17 +19,13 @@ 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.entity.WarehouseGoodsAllocationEntity;
+import com.logpm.warehouse.entity.*;
-import com.logpm.warehouse.entity.WarehouseGoodsAreaEntity;
+import com.logpm.warehouse.mapper.WarehouseUpdownGoodsMapper;
-import com.logpm.warehouse.entity.WarehouseGoodsShelfEntity;
+import com.logpm.warehouse.vo.*;
-import com.logpm.warehouse.entity.WarehouseWarehouseEntity;
-import com.logpm.warehouse.vo.WarehouseGoodsAllocationVO;
 import com.logpm.warehouse.excel.WarehouseGoodsAllocationExcel;
 import com.logpm.warehouse.mapper.WarehouseGoodsAllocationMapper;
 import com.logpm.warehouse.service.IWarehouseGoodsAllocationService;
-import com.logpm.warehouse.vo.WarehouseGoodsAreaVO;
+import lombok.AllArgsConstructor;
-import com.logpm.warehouse.vo.WarehouseVisCargo;
-import com.logpm.warehouse.vo.WarehouseVisualizationVO;
 import lombok.extern.log4j.Log4j;
 import lombok.extern.log4j.Log4j2;
 import org.springblade.core.mp.support.BladePage;
@@ -52,8 +48,10 @@ import java.util.List;
  */
 @Service
 @Log4j2
+@AllArgsConstructor
 public class WarehouseGoodsAllocationServiceImpl extends BaseServiceImpl<WarehouseGoodsAllocationMapper, WarehouseGoodsAllocationEntity> implements IWarehouseGoodsAllocationService {
 
+		private final WarehouseUpdownGoodsMapper warehouseUpdownGoodsMapper;
 
 	@Override
 	public IPage<WarehouseGoodsAllocationVO> selectWarehouseGoodsAllocationPage(IPage<WarehouseGoodsAllocationVO> page, WarehouseGoodsAllocationVO warehouseGoodsAllocation) {
@@ -99,6 +97,8 @@ public class WarehouseGoodsAllocationServiceImpl extends BaseServiceImpl<Warehou
 			//查询包条信息
 			List<WarehouseVisualizationVO> list =	baseMapper.selectServe(warehouseGoodsAllocationVO.getId());
 			warehouseGoodsAllocationVO.setServeNub(list);
+			//查询库存品
+			List<WarehouseMaterialEntity>listCopyVOS =baseMapper.selectStockList(warehouseGoodsAllocationVO.getId());
 			map.get(layerNum).add(warehouseGoodsAllocationVO);
 		}
 		ArrayList<List<WarehouseGoodsAllocationVO>> arrayListTwo = new ArrayList<>(map.values());

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

@@ -38,7 +38,8 @@ public class WarehouseUpdownGoodsLogServiceImpl extends BaseServiceImpl<Warehous
 
 	@Override
 	public IPage<WarehouseUpdownGoodsLogVO> selectWarehouseUpdownGoodsLogPage(IPage<WarehouseUpdownGoodsLogVO> page, WarehouseUpdownGoodsLogVO warehouseUpdownGoodsLog) {
-		return page.setRecords(baseMapper.selectWarehouseUpdownGoodsLogPage(page, warehouseUpdownGoodsLog));
+		List<WarehouseUpdownGoodsLogVO> warehouseUpdownGoodsLogVOS = baseMapper.selectWarehouseUpdownGoodsLogPage(page, warehouseUpdownGoodsLog);
+		return page.setRecords(warehouseUpdownGoodsLogVOS);
 	}
 
 

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

@@ -20,6 +20,9 @@ import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
 import com.logpm.warehouse.entity.WarehouseRetentionRecordEntity;
 import com.logpm.warehouse.vo.WarehouseRetentionRecordVO;
+import org.springblade.core.tool.utils.SpringUtil;
+import org.springblade.system.feign.IUserClient;
+
 import java.util.Objects;
 
 /**

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

@@ -20,6 +20,9 @@ import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
 import com.logpm.warehouse.entity.WarehouseUpdownGoodsLogEntity;
 import com.logpm.warehouse.vo.WarehouseUpdownGoodsLogVO;
+import org.springblade.core.tool.utils.SpringUtil;
+import org.springblade.system.feign.IUserClient;
+
 import java.util.Objects;
 
 /**
@@ -28,21 +31,15 @@ import java.util.Objects;
  * @author lmy
  * @since 2023-08-15
  */
-public class WarehouseUpdownGoodsLogWrapper extends BaseEntityWrapper<WarehouseUpdownGoodsLogEntity, WarehouseUpdownGoodsLogVO>  {
+public class WarehouseUpdownGoodsLogWrapper extends BaseEntityWrapper<WarehouseUpdownGoodsLogVO, WarehouseUpdownGoodsLogVO>  {
-
+	IUserClient userCliient = SpringUtil.getBean(IUserClient.class);
 	public static WarehouseUpdownGoodsLogWrapper build() {
 		return new WarehouseUpdownGoodsLogWrapper();
  	}
 
 	@Override
-	public WarehouseUpdownGoodsLogVO entityVO(WarehouseUpdownGoodsLogEntity warehouseUpdownGoodsLog) {
+	public WarehouseUpdownGoodsLogVO entityVO(WarehouseUpdownGoodsLogVO warehouseUpdownGoodsLogVO) {
-		WarehouseUpdownGoodsLogVO warehouseUpdownGoodsLogVO = Objects.requireNonNull(BeanUtil.copy(warehouseUpdownGoodsLog, WarehouseUpdownGoodsLogVO.class));
+		warehouseUpdownGoodsLogVO.setCreateUserName(userCliient.userInfoById(warehouseUpdownGoodsLogVO.getCreateUser()).getData().getName());
-
-		//User createUser = UserCache.getUser(warehouseUpdownGoodsLog.getCreateUser());
-		//User updateUser = UserCache.getUser(warehouseUpdownGoodsLog.getUpdateUser());
-		//warehouseUpdownGoodsLogVO.setCreateUserName(createUser.getName());
-		//warehouseUpdownGoodsLogVO.setUpdateUserName(updateUser.getName());
-
 		return warehouseUpdownGoodsLogVO;
 	}
 

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

@@ -20,6 +20,9 @@ import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
 import com.logpm.warehouse.entity.WarehouseUpdownGoodsEntity;
 import com.logpm.warehouse.vo.WarehouseUpdownGoodsVO;
+import org.springblade.core.tool.utils.SpringUtil;
+import org.springblade.system.feign.IUserClient;
+
 import java.util.Objects;
 
 /**
@@ -38,11 +41,6 @@ public class WarehouseUpdownGoodsWrapper extends BaseEntityWrapper<WarehouseUpdo
 	public WarehouseUpdownGoodsVO entityVO(WarehouseUpdownGoodsEntity warehouseUpdownGoods) {
 		WarehouseUpdownGoodsVO warehouseUpdownGoodsVO = Objects.requireNonNull(BeanUtil.copy(warehouseUpdownGoods, WarehouseUpdownGoodsVO.class));
 
-		//User createUser = UserCache.getUser(warehouseUpdownGoods.getCreateUser());
-		//User updateUser = UserCache.getUser(warehouseUpdownGoods.getUpdateUser());
-		//warehouseUpdownGoodsVO.setCreateUserName(createUser.getName());
-		//warehouseUpdownGoodsVO.setUpdateUserName(updateUser.getName());
-
 		return warehouseUpdownGoodsVO;
 	}