pref_mail@163.com
2 years ago
56 changed files with 1584 additions and 925 deletions
@ -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; //托盘名称
|
||||
|
||||
} |
||||
@ -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是
|
||||
|
||||
|
||||
|
||||
|
||||
} |
||||
@ -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; |
||||
|
||||
} |
||||
@ -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; |
||||
|
||||
|
||||
|
||||
|
||||
} |
||||
@ -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); |
||||
|
||||
} |
||||
@ -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); |
||||
|
||||
|
||||
} |
||||
@ -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); |
||||
} |
||||
|
||||
} |
||||
@ -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; |
||||
|
||||
} |
||||
@ -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; |
||||
|
||||
} |
||||
@ -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); |
||||
} |
||||
|
||||
} |
||||
@ -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") |
||||
); |
||||
} |
||||
} |
||||
@ -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); |
||||
|
||||
} |
||||
@ -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> |
||||
@ -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); |
||||
|
||||
} |
||||
@ -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; |
||||
} |
||||
|
||||
} |
||||
@ -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; |
||||
} |
||||
|
||||
|
||||
} |
||||
Loading…
Reference in new issue