wms / hhwms · Commits

Commit 8d97d92278e2d763063cb0c6556d910bc825818e

Authored by 周鸿
1 parent f44ac5a2

多仓:快递调试修改

Inline Side-by-side
Showing 1 changed file with 218 additions and 138 deletions
src/main/java/com/huaheng/pc/shipment/kuaidiHeader/domain/KuaidiHeader.java
  View file @8d97d92
... ... @@ -9,6 +9,7 @@ import lombok.Data;
9 9 import org.apache.commons.lang3.builder.ToStringBuilder;
10 10 import org.apache.commons.lang3.builder.ToStringStyle;
11 11 import io.swagger.annotations.ApiModelProperty;
  12 +
12 13 import javax.validation.constraints.*;
13 14 import java.io.Serializable;
14 15 import java.math.BigDecimal;
... ... @@ -16,148 +17,227 @@ import java.util.Date;
16 17  
17 18 /**
18 19 * 【请填写功能名称】表 kuaidi_header
19   - *
  20 + *
20 21 * @author huaheng
21 22 * @date 2022-09-07
22 23 */
23 24 @TableName(value = "kuaidi_header")
24 25 @Data
25   -public class KuaidiHeader implements Serializable{
26   - private static final long serialVersionUID = 1L;
27   -
28   - /** 出库id */
29   - @TableId(value = "id", type = IdType.AUTO)
30   - private Integer id;
31   - /** 出库单号 */
32   - @TableField(value = "code")
33   - private String code;
34   - /** 仓库Id */
35   - @TableField(value = "warehouseId")
36   - private Integer warehouseId;
37   - /** 仓库编码 */
38   - @TableField(value = "warehouseCode")
39   - private String warehouseCode;
40   - /** u8仓库 */
41   - @TableField(value = "uWarehouseCode")
42   - private String uWarehouseCode;
43   - /** 货主id */
44   - @TableField(value = "companyId")
45   - private Integer companyId;
46   - /** 货主code */
47   - @TableField(value = "companyCode")
48   - private String companyCode;
49   - /** 上游系统单号 */
50   - @TableField(value = "orderBill")
51   - private String orderBill;
52   - /** 发货单号 */
53   - @TableField(value = "sourceCode")
54   - @Excel(name = "发货单号")
55   - private String sourceCode;
56   - /** 出库单类型 */
57   - @TableField(value = "type")
58   - private String type;
59   - /** 数量 */
60   - @TableField(value = "totalQty")
61   - private BigDecimal totalQty;
62   - /** 重量 */
63   - @TableField(value = "totalWeight")
64   - private String totalWeight;
65   - /** 总行数 */
66   - @TableField(value = "totalLines")
67   - private Integer totalLines;
68   - /** 备注 */
69   - @TableField(value = "remark")
70   - @Excel(name = "备注")
71   - private String remark;
72   - /** 创建时间 */
73   - @TableField(value = "created")
74   - private Date created;
75   - /** 创建用户 */
76   - @TableField(value = "createdBy")
77   - private String createdBy;
78   - /** 最后修改时间 */
79   - @TableField(value = "lastUpdated")
80   - private Date lastUpdated;
81   - /** 更新用户 */
82   - @TableField(value = "lastUpdatedBy")
83   - private String lastUpdatedBy;
84   - /** 是否有效 */
85   - @TableField(value = "enable")
86   - private Integer enable;
87   - /** 删除标记 */
88   - @TableField(value = "deleted")
89   - private Boolean deleted;
90   - /** 自定义字段1 */
91   - @TableField(value = "userDef1")
92   - private String userDef1;
93   - /** 自定义字段1 */
94   - @TableField(value = "userDef2")
95   - private String userDef2;
96   - /** 自定义字段1 */
97   - @TableField(value = "userDef3")
98   - private String userDef3;
99   - /** 部门 */
100   - @TableField(value = "cDepName")
101   - @Excel(name = "部门")
102   - private String cDepName;
103   - /** 收件人 */
104   - @TableField(value = "recName")
105   - @Excel(name = "收件人")
106   - private String recName;
107   - /** 收件人号码 */
108   - @TableField(value = "recMobile")
109   - @Excel(name = "收件人号码")
110   - private String recMobile;
111   - /** 收件人地址 */
112   - @TableField(value = "recAddr")
113   - @Excel(name = "收件人地址")
114   - private String recAddr;
115   - /** 收件人公司 */
116   - @TableField(value = "recCompany")
117   - @Excel(name = "收件人公司")
118   - private String recCompany;
119   - /** 发件人 */
120   - @TableField(value = "sendName")
121   - @Excel(name = "发件人")
122   - private String sendName;
123   - /** 发件人号码 */
124   - @TableField(value = "sendMobile")
125   - @Excel(name = "发件人号码")
126   - private String sendMobile;
127   - /** 发件人地址 */
128   - @TableField(value = "sendAddr")
129   - @Excel(name = "发件人地址")
130   - private String sendAddr;
131   - /** 发件人公司 */
132   - @TableField(value = "sendCompany")
133   - @Excel(name = "发件人公司")
134   - private String sendCompany;
135   - /** 快递单号 */
136   - @TableField(value = "trackCode")
137   - @Excel(name = "快递单号")
138   - private String trackCode;
139   - /** $column.columnComment */
140   - @TableField(value = "kdEable")
141   - private Long kdEable;
142   - /** $column.columnComment */
143   - @TableField(value = "kuaidiCom")
144   - @Excel(name = "快递公司")
145   - private String kuaidiCom;
146   - /** $column.columnComment */
147   - @TableField(value = "uploadStatus")
148   - private Long uploadStatus;
149   - /** $column.columnComment */
150   - @TableField(value = "kuaidiNum")
151   - private String kuaidiNum;
152   - /** $column.columnComment */
153   - @TableField(value = "picture")
154   - private String picture;
155   - /** $column.columnComment */
156   - @TableField(value = "status")
157   - private Long status;
158   -
159   - @TableField(value = "status")
160   - @Excel(name = "出库单号")
161   - private String fromCode;
  26 +public class KuaidiHeader implements Serializable {
  27 + private static final long serialVersionUID = 1L;
  28 +
  29 + /**
  30 + * 出库id
  31 + */
  32 + @TableId(value = "id", type = IdType.AUTO)
  33 + private Integer id;
  34 + /**
  35 + * 出库单号
  36 + */
  37 + @TableField(value = "code")
  38 + private String code;
  39 + /**
  40 + * 仓库Id
  41 + */
  42 + @TableField(value = "warehouseId")
  43 + private Integer warehouseId;
  44 + /**
  45 + * 仓库编码
  46 + */
  47 + @TableField(value = "warehouseCode")
  48 + private String warehouseCode;
  49 + /**
  50 + * u8仓库
  51 + */
  52 + @TableField(value = "uWarehouseCode")
  53 + private String uWarehouseCode;
  54 + /**
  55 + * 货主id
  56 + */
  57 + @TableField(value = "companyId")
  58 + @Excel(name = "公司ID")
  59 + private Integer companyId;
  60 + /**
  61 + * 货主code
  62 + */
  63 + @TableField(value = "companyCode")
  64 + private String companyCode;
  65 + /** 上游系统单号 */
  66 +
  67 +
  68 + /**
  69 + * 出库单类型
  70 + */
  71 + @TableField(value = "type")
  72 + private String type;
  73 + /**
  74 + * 数量
  75 + */
  76 + @TableField(value = "totalQty")
  77 + private BigDecimal totalQty;
  78 +
  79 + /**
  80 + * 总行数
  81 + */
  82 + @TableField(value = "totalLines")
  83 + private Integer totalLines;
  84 + /**
  85 + * 备注
  86 + */
  87 + @TableField(value = "remark")
  88 + @Excel(name = "备注")
  89 + private String remark;
  90 + /**
  91 + * 创建时间
  92 + */
  93 + @TableField(value = "created")
  94 + private Date created;
  95 + /**
  96 + * 创建用户
  97 + */
  98 + @TableField(value = "createdBy")
  99 + private String createdBy;
  100 + /**
  101 + * 最后修改时间
  102 + */
  103 + @TableField(value = "lastUpdated")
  104 + private Date lastUpdated;
  105 + /**
  106 + * 更新用户
  107 + */
  108 + @TableField(value = "lastUpdatedBy")
  109 + private String lastUpdatedBy;
  110 + /**
  111 + * 是否有效
  112 + */
  113 + @TableField(value = "enable")
  114 + private Integer enable;
  115 + /**
  116 + * 删除标记
  117 + */
  118 + @TableField(value = "deleted")
  119 + private Boolean deleted;
  120 + /**
  121 + * 自定义字段1
  122 + */
  123 + @TableField(value = "userDef1")
  124 + private String userDef1;
  125 + /**
  126 + * 自定义字段1
  127 + */
  128 + @TableField(value = "userDef2")
  129 + private String userDef2;
  130 + /**
  131 + * 自定义字段1
  132 + */
  133 + @TableField(value = "userDef3")
  134 + private String userDef3;
  135 + /**
  136 + * 部门
  137 + */
  138 + @TableField(value = "cDepName")
  139 + @Excel(name = "部门")
  140 + private String cDepName;
  141 + /**
  142 + * 收件人
  143 + */
  144 + @TableField(value = "recName")
  145 + @Excel(name = "收件人")
  146 + private String recName;
  147 + /**
  148 + * 收件人号码
  149 + */
  150 + @TableField(value = "recMobile")
  151 + @Excel(name = "收件人号码")
  152 + private String recMobile;
  153 + /**
  154 + * 收件人地址
  155 + */
  156 + @TableField(value = "recAddr")
  157 + @Excel(name = "收件人地址")
  158 + private String recAddr;
  159 + /**
  160 + * 收件人公司
  161 + */
  162 + @TableField(value = "recCompany")
  163 + @Excel(name = "收件人公司")
  164 + private String recCompany;
  165 +
  166 +
  167 + /**
  168 + * 发件人
  169 + */
  170 + @TableField(value = "sendName")
  171 + @Excel(name = "发件人")
  172 + private String sendName;
  173 + /**
  174 + * 发件人号码
  175 + */
  176 + @TableField(value = "sendMobile")
  177 + @Excel(name = "发件人号码")
  178 + private String sendMobile;
  179 + /**
  180 + * 发件人地址
  181 + */
  182 + @TableField(value = "sendAddr")
  183 + @Excel(name = "发件人地址")
  184 + private String sendAddr;
  185 + /**
  186 + * 发件人公司
  187 + */
  188 + @TableField(value = "sendCompany")
  189 + @Excel(name = "发件人公司")
  190 + private String sendCompany;
  191 +
  192 +
  193 + /**
  194 + * 重量
  195 + */
  196 + @TableField(value = "totalWeight")
  197 + @Excel(name = "重量")
  198 + private String totalWeight;
  199 + /**
  200 + * 发货单号
  201 + */
  202 + @TableField(value = "sourceCode")
  203 + @Excel(name = "发货单号")
  204 + private String sourceCode;
  205 +
  206 + @TableField(value = "orderBill")
  207 + @Excel(name = "出库单号")
  208 + private String orderBill;
  209 +
  210 + @TableField(value = "kuaidiCom")
  211 + @Excel(name = "快递公司")
  212 + private String kuaidiCom;
  213 +
  214 + /**
  215 + * 快递单号
  216 + */
  217 + @TableField(value = "trackCode")
  218 + @Excel(name = "快递单号")
  219 + private String trackCode;
  220 +
  221 +
  222 +
  223 +
  224 + @TableField(value = "kdEable")
  225 + private Long kdEable;
  226 +
  227 +
  228 + @TableField(value = "uploadStatus")
  229 + private Long uploadStatus;
  230 +
  231 + @TableField(value = "kuaidiNum")
  232 + private String kuaidiNum;
  233 +
  234 + @TableField(value = "picture")
  235 + private String picture;
  236 +
  237 + @TableField(value = "status")
  238 + private Long status;
162 239  
  240 + /** 上游系统单号 */
  241 + @TableField(exist = false)
  242 + private String fromCode;
163 243 }
... ...