15 changed files with 674 additions and 57 deletions
@ -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; |
||||
|
||||
} |
@ -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; |
||||
|
||||
|
||||
|
||||
|
||||
} |
@ -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; |
||||
|
||||
} |
@ -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; |
||||
} |
||||
|
Loading…
Reference in new issue