0.0
2 years ago
21 changed files with 711 additions and 8 deletions
@ -0,0 +1,438 @@
|
||||
/* |
||||
* 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 = "DistributionStockArticle对象", 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; |
||||
|
||||
private String isZero;//是否零担 0否 1是
|
||||
|
||||
|
||||
|
||||
|
||||
} |
||||
@ -0,0 +1,39 @@
|
||||
/* |
||||
* 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.distribution.entity.DistributionStockArticleEntity; |
||||
|
||||
import lombok.Data; |
||||
import lombok.EqualsAndHashCode; |
||||
|
||||
|
||||
|
||||
/** |
||||
* 配送在库订单 视图实体类 |
||||
* |
||||
* @author cyz |
||||
* @since 2023-06-13 |
||||
*/ |
||||
@Data |
||||
@EqualsAndHashCode(callSuper = true) |
||||
public class WarehouseStockArticleCopyVO extends DistributionStockArticleEntity { |
||||
private static final long serialVersionUID = 1L; |
||||
|
||||
|
||||
} |
||||
Loading…
Reference in new issue