pref_mail@163.com
2 years ago
6 changed files with 561 additions and 730 deletions
Binary file not shown.
@ -1,182 +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; |
||||
|
||||
/** |
||||
* 在库订单包件清单 实体类 |
||||
* |
||||
* @author cyz |
||||
* @since 2023-06-13 |
||||
*/ |
||||
@Data |
||||
@TableName("logpm_distribution_parcel_list") |
||||
@ApiModel(value = "DistributionParcelList对象", description = "在库订单包件清单") |
||||
@EqualsAndHashCode(callSuper = true) |
||||
public class WarehouseParcelListEntity 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 orderSelfNumbering; |
||||
/** |
||||
* 仓库 |
||||
*/ |
||||
@ApiModelProperty(value = "仓库") |
||||
private String warehouse; |
||||
|
||||
@ApiModelProperty(value = "仓库ID") |
||||
private Long warehouseId; |
||||
/** |
||||
* 状态 |
||||
*/ |
||||
@ApiModelProperty(value = "状态") |
||||
private Integer conditions; |
||||
/** |
||||
* 包条码 |
||||
*/ |
||||
@ApiModelProperty(value = "包条码") |
||||
private String packetBarCode; |
||||
|
||||
@ApiModelProperty(value = "货区信息") |
||||
private String cargoTitle; |
||||
|
||||
@ApiModelProperty(value = "货架信息") |
||||
private String shelfTitle; |
||||
/** |
||||
* 货位信息 |
||||
*/ |
||||
@ApiModelProperty(value = "货位信息") |
||||
private String goodsAllocation; |
||||
/** |
||||
* 所在托盘 |
||||
*/ |
||||
@ApiModelProperty(value = "所在托盘") |
||||
private String pallet; |
||||
/** |
||||
* 一级品 |
||||
*/ |
||||
@ApiModelProperty(value = "一级品") |
||||
private String firsts; |
||||
/** |
||||
* 二级品 |
||||
*/ |
||||
@ApiModelProperty(value = "二级品") |
||||
private String second; |
||||
/** |
||||
* 三级品 |
||||
*/ |
||||
@ApiModelProperty(value = "三级品") |
||||
private String thirdProduct; |
||||
/** |
||||
* 客户id |
||||
*/ |
||||
@ApiModelProperty(value = "客户id") |
||||
@TableField(exist = false) |
||||
private String marketId; |
||||
/** |
||||
* 物料Id |
||||
*/ |
||||
@ApiModelProperty(value = "物料ID") |
||||
private Long materialId; |
||||
|
||||
/** |
||||
* 物料名称 |
||||
*/ |
||||
@ApiModelProperty(value = "物料名称") |
||||
private String materialName; |
||||
/** |
||||
* 物料编号 |
||||
*/ |
||||
@ApiModelProperty(value = "物料编号") |
||||
private String materialCode; |
||||
/** |
||||
* 物料单位 |
||||
*/ |
||||
@ApiModelProperty(value = "物料单位") |
||||
private String materialUnit; |
||||
/** |
||||
* 数量 |
||||
*/ |
||||
@ApiModelProperty(value = "数量") |
||||
private Integer quantity; |
||||
/** |
||||
* 车次号 |
||||
*/ |
||||
@ApiModelProperty(value = "车次号") |
||||
private String trainNumber; |
||||
/** |
||||
* 在库订单ID |
||||
*/ |
||||
@ApiModelProperty(value = "在库订单ID") |
||||
private Long stockArticleId; |
||||
|
||||
/** |
||||
* 服务号 |
||||
*/ |
||||
@ApiModelProperty(value = "服务号") |
||||
private String serviceNumber; |
||||
/** |
||||
* 品牌ID |
||||
*/ |
||||
@ApiModelProperty(value = "品牌ID") |
||||
private String brandId; |
||||
/** |
||||
* 品牌名称 |
||||
*/ |
||||
@ApiModelProperty(value = "品牌名称") |
||||
private String brandName; |
||||
/** |
||||
* 配送状态 |
||||
*/ |
||||
@ApiModelProperty(value = "配送状态") |
||||
private String deliveryState; |
||||
|
||||
} |
||||
@ -1,415 +1,415 @@
|
||||
/* |
||||
* 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; |
||||
import java.util.List; |
||||
|
||||
/** |
||||
* 配送在库订单 实体类 |
||||
* |
||||
* @author cyz |
||||
* @since 2023-06-13 |
||||
*/ |
||||
@Data |
||||
@TableName("logpm_distribution_stock_article") |
||||
@ApiModel(value = "DistributionStockArticle对象", description = "配送在库订单") |
||||
@EqualsAndHashCode(callSuper = true) |
||||
public class WarehouseStockArticleEntity 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 orderSelfNumbering; |
||||
|
||||
/** |
||||
* 门店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已入库") |
||||
private String state; |
||||
|
||||
/** |
||||
* 状态;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; |
||||
|
||||
|
||||
|
||||
/** |
||||
* 包件数量 |
||||
*/ |
||||
@TableField(exist = false) |
||||
private List<WarehouseParcelListEntity> packageList; |
||||
|
||||
//-------------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; |
||||
|
||||
/** |
||||
* 上架状态（0未上架 1部分上架 2已上架 3已下架） |
||||
*/ |
||||
@ApiModelProperty(value = "上架状态") |
||||
private Integer groundingStatus; |
||||
|
||||
/** |
||||
* 货位信息 |
||||
*/ |
||||
@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; |
||||
|
||||
/** |
||||
* 冻结状态0未冻结 1已冻结 |
||||
*/ |
||||
@ApiModelProperty(value = "冻结状态0未冻结 1已冻结") |
||||
private Integer freezeStatus; |
||||
|
||||
/** |
||||
* 有无数据源 |
||||
*/ |
||||
@ApiModelProperty(value = "有无数据源；1-否、2-是") |
||||
private Integer isHaveData; |
||||
|
||||
/** |
||||
* 订单码 |
||||
*/ |
||||
@ApiModelProperty(value = "订单码") |
||||
private String stockArticleCode; |
||||
/** |
||||
* 工厂车次 |
||||
*/ |
||||
@ApiModelProperty(value = "工厂车次") |
||||
private String factoryTrain; |
||||
|
||||
|
||||
} |
||||
///*
|
||||
// * 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;
|
||||
//import java.util.List;
|
||||
//
|
||||
///**
|
||||
// * 配送在库订单 实体类
|
||||
// *
|
||||
// * @author cyz
|
||||
// * @since 2023-06-13
|
||||
// */
|
||||
//@Data
|
||||
//@TableName("logpm_distribution_stock_article")
|
||||
//@ApiModel(value = "DistributionStockArticle对象", description = "配送在库订单")
|
||||
//@EqualsAndHashCode(callSuper = true)
|
||||
//public class WarehouseStockArticleEntity 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 orderSelfNumbering;
|
||||
//
|
||||
// /**
|
||||
// * 门店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已入库")
|
||||
// private String state;
|
||||
//
|
||||
// /**
|
||||
// * 状态;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;
|
||||
//
|
||||
//
|
||||
//
|
||||
// /**
|
||||
// * 包件数量
|
||||
// */
|
||||
// @TableField(exist = false)
|
||||
// private List<WarehouseParcelListEntity> packageList;
|
||||
//
|
||||
// //-------------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;
|
||||
//
|
||||
// /**
|
||||
// * 上架状态（0未上架 1部分上架 2已上架 3已下架）
|
||||
// */
|
||||
// @ApiModelProperty(value = "上架状态")
|
||||
// private Integer groundingStatus;
|
||||
//
|
||||
// /**
|
||||
// * 货位信息
|
||||
// */
|
||||
// @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;
|
||||
//
|
||||
// /**
|
||||
// * 冻结状态0未冻结 1已冻结
|
||||
// */
|
||||
// @ApiModelProperty(value = "冻结状态0未冻结 1已冻结")
|
||||
// private Integer freezeStatus;
|
||||
//
|
||||
// /**
|
||||
// * 有无数据源
|
||||
// */
|
||||
// @ApiModelProperty(value = "有无数据源；1-否、2-是")
|
||||
// private Integer isHaveData;
|
||||
//
|
||||
// /**
|
||||
// * 订单码
|
||||
// */
|
||||
// @ApiModelProperty(value = "订单码")
|
||||
// private String stockArticleCode;
|
||||
// /**
|
||||
// * 工厂车次
|
||||
// */
|
||||
// @ApiModelProperty(value = "工厂车次")
|
||||
// private String factoryTrain;
|
||||
//
|
||||
//
|
||||
//}
|
||||
|
||||
@ -1,43 +1,42 @@
|
||||
/* |
||||
* 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.WarehouseParcelListEntity; |
||||
import lombok.Data; |
||||
import lombok.EqualsAndHashCode; |
||||
|
||||
import java.util.Date; |
||||
|
||||
/** |
||||
* 在库订单包件清单 视图实体类 |
||||
* |
||||
* @author cyz |
||||
* @since 2023-06-13 |
||||
*/ |
||||
@Data |
||||
@EqualsAndHashCode(callSuper = true) |
||||
public class WarehouseParcelListVO extends WarehouseParcelListEntity { |
||||
private static final long serialVersionUID = 1L; |
||||
|
||||
private String stockupStatus; |
||||
private Date stockupDate; |
||||
private String stockupArea; |
||||
private String goodsAllocation; |
||||
|
||||
|
||||
} |
||||
///*
|
||||
// * 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 lombok.Data;
|
||||
//import lombok.EqualsAndHashCode;
|
||||
//
|
||||
//import java.util.Date;
|
||||
//
|
||||
///**
|
||||
// * 在库订单包件清单 视图实体类
|
||||
// *
|
||||
// * @author cyz
|
||||
// * @since 2023-06-13
|
||||
// */
|
||||
//@Data
|
||||
//@EqualsAndHashCode(callSuper = true)
|
||||
//public class WarehouseParcelListVO extends WarehouseParcelListEntity {
|
||||
// private static final long serialVersionUID = 1L;
|
||||
//
|
||||
// private String stockupStatus;
|
||||
// private Date stockupDate;
|
||||
// private String stockupArea;
|
||||
// private String goodsAllocation;
|
||||
//
|
||||
//
|
||||
//}
|
||||
|
||||
@ -1,89 +1,88 @@
|
||||
/* |
||||
* 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.WarehouseParcelListEntity; |
||||
import com.logpm.warehouse.entity.WarehouseStockArticleEntity; |
||||
import io.swagger.annotations.ApiModelProperty; |
||||
import lombok.Data; |
||||
import lombok.EqualsAndHashCode; |
||||
|
||||
import java.util.List; |
||||
|
||||
/** |
||||
* 配送在库订单 视图实体类 |
||||
* |
||||
* @author cyz |
||||
* @since 2023-06-13 |
||||
*/ |
||||
@Data |
||||
@EqualsAndHashCode(callSuper = true) |
||||
public class WarehouseStockArticleVO extends WarehouseStockArticleEntity { |
||||
private static final long serialVersionUID = 1L; |
||||
/** |
||||
* 物料名称 |
||||
*/ |
||||
@ApiModelProperty(value = "物料名称") |
||||
private String materialName; |
||||
/** |
||||
* 已备货数量 |
||||
*/ |
||||
@ApiModelProperty(value = "已备货数量") |
||||
private String readyStock; |
||||
/** |
||||
* 备货数量 |
||||
*/ |
||||
@ApiModelProperty(value = "备货数量") |
||||
private String deliveryNumber; |
||||
/** |
||||
* 托盘 |
||||
*/ |
||||
@ApiModelProperty(value = "托盘") |
||||
private String pallet; |
||||
/** |
||||
* 货位信息 |
||||
*/ |
||||
@ApiModelProperty(value = "货位信息") |
||||
private String goodsAllocation; |
||||
/** |
||||
* 订单状态 |
||||
*/ |
||||
@ApiModelProperty(value = "订单状态") |
||||
private String stockArticleState; |
||||
|
||||
@ApiModelProperty(value = "服务类型 商 市 自") |
||||
private String typeServerName; |
||||
|
||||
@ApiModelProperty(value = "订单状态") |
||||
private String orderStateName; |
||||
|
||||
/** |
||||
* 是否齐套名称 |
||||
*/ |
||||
@ApiModelProperty(value = "是否齐套名称") |
||||
private String completeSetName; |
||||
|
||||
/** |
||||
* 是否齐套名称 |
||||
*/ |
||||
@ApiModelProperty(value = "是否齐套名称") |
||||
private List<WarehouseParcelListEntity> parcelListVOS; |
||||
|
||||
|
||||
|
||||
} |
||||
///*
|
||||
// * 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.WarehouseStockArticleEntity;
|
||||
//import io.swagger.annotations.ApiModelProperty;
|
||||
//import lombok.Data;
|
||||
//import lombok.EqualsAndHashCode;
|
||||
//
|
||||
//import java.util.List;
|
||||
//
|
||||
///**
|
||||
// * 配送在库订单 视图实体类
|
||||
// *
|
||||
// * @author cyz
|
||||
// * @since 2023-06-13
|
||||
// */
|
||||
//@Data
|
||||
//@EqualsAndHashCode(callSuper = true)
|
||||
//public class WarehouseStockArticleVO extends WarehouseStockArticleEntity {
|
||||
// private static final long serialVersionUID = 1L;
|
||||
// /**
|
||||
// * 物料名称
|
||||
// */
|
||||
// @ApiModelProperty(value = "物料名称")
|
||||
// private String materialName;
|
||||
// /**
|
||||
// * 已备货数量
|
||||
// */
|
||||
// @ApiModelProperty(value = "已备货数量")
|
||||
// private String readyStock;
|
||||
// /**
|
||||
// * 备货数量
|
||||
// */
|
||||
// @ApiModelProperty(value = "备货数量")
|
||||
// private String deliveryNumber;
|
||||
// /**
|
||||
// * 托盘
|
||||
// */
|
||||
// @ApiModelProperty(value = "托盘")
|
||||
// private String pallet;
|
||||
// /**
|
||||
// * 货位信息
|
||||
// */
|
||||
// @ApiModelProperty(value = "货位信息")
|
||||
// private String goodsAllocation;
|
||||
// /**
|
||||
// * 订单状态
|
||||
// */
|
||||
// @ApiModelProperty(value = "订单状态")
|
||||
// private String stockArticleState;
|
||||
//
|
||||
// @ApiModelProperty(value = "服务类型 商 市 自")
|
||||
// private String typeServerName;
|
||||
//
|
||||
// @ApiModelProperty(value = "订单状态")
|
||||
// private String orderStateName;
|
||||
//
|
||||
// /**
|
||||
// * 是否齐套名称
|
||||
// */
|
||||
// @ApiModelProperty(value = "是否齐套名称")
|
||||
// private String completeSetName;
|
||||
//
|
||||
// /**
|
||||
// * 是否齐套名称
|
||||
// */
|
||||
// @ApiModelProperty(value = "是否齐套名称")
|
||||
// private List<WarehouseParcelListEntity> parcelListVOS;
|
||||
//
|
||||
//
|
||||
//
|
||||
//}
|
||||
|
||||
Loading…
Reference in new issue