huyuanxiang
/
nherp_boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[init]创建能辉erp 系统

Browse Source
master
NH-LHG 2 years ago
parent 799e1b7133
commit 4bd07e6e25
2 changed files with 53 additions and 6 deletions
Show Stats Download Patch File Download Diff File

38
jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/erp/entity/Order.java
Unescape View File

@ -67,6 +67,24 @@ public class Order implements Serializable {
/**更新人*/ /**更新人*/
@ApiModelProperty(value = "更新人") @ApiModelProperty(value = "更新人")
private java.lang.String updateBy; private java.lang.String updateBy;
/**物控员id*/
@Excel(name = "物控员id", width = 15)
@ApiModelProperty(value = "物控员id")
private java.lang.String materialId;
/**物控员*/
@Excel(name = "物控员", width = 15)
@ApiModelProperty(value = "物控员")
private java.lang.String materialClerk;
/**物控员备注*/
@Excel(name = "物控员备注", width = 15)
@ApiModelProperty(value = "物控员备注")
private java.lang.String materialRemark;
/**物控审核时间*/
@Excel(name = "物控审核时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "物控审核时间")
private java.util.Date materialTime;
/**审核人id*/ /**审核人id*/
@Excel(name = "审核人id", width = 15) @Excel(name = "审核人id", width = 15)
@ApiModelProperty(value = "审核人id") @ApiModelProperty(value = "审核人id")
@ -85,6 +103,10 @@ public class Order implements Serializable {
@Excel(name = "审核意见", width = 15) @Excel(name = "审核意见", width = 15)
@ApiModelProperty(value = "审核意见") @ApiModelProperty(value = "审核意见")
private java.lang.String financeRemark; private java.lang.String financeRemark;
/**付款回执url*/
@Excel(name = "付款回执url", width = 15)
@ApiModelProperty(value = "付款回执url")
private java.lang.String financeUrl;
/**派单人Id*/ /**派单人Id*/
@Excel(name = "派单人Id", width = 15) @Excel(name = "派单人Id", width = 15)
@ApiModelProperty(value = "派单人Id") @ApiModelProperty(value = "派单人Id")
@ -93,6 +115,16 @@ public class Order implements Serializable {
@Excel(name = "派单人", width = 15) @Excel(name = "派单人", width = 15)
@ApiModelProperty(value = "派单人") @ApiModelProperty(value = "派单人")
private java.lang.String dispacher; private java.lang.String dispacher;
/**提货时间*/
@Excel(name = "提货时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "提货时间")
private java.util.Date dispacherTime;
/**出库回执url*/
@Excel(name = "出库回执url", width = 15)
@ApiModelProperty(value = "出库回执url")
private java.lang.String dispacherUrl;
/**物流单号*/ /**物流单号*/
@Excel(name = "物流单号", width = 15) @Excel(name = "物流单号", width = 15)
@ApiModelProperty(value = "物流单号") @ApiModelProperty(value = "物流单号")
@ -101,12 +133,6 @@ public class Order implements Serializable {
@Excel(name = "派单备注", width = 15) @Excel(name = "派单备注", width = 15)
@ApiModelProperty(value = "派单备注") @ApiModelProperty(value = "派单备注")
private java.lang.String dispacherRemark; private java.lang.String dispacherRemark;
/**派发时间*/
@Excel(name = "派发时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "派发时间")
private java.util.Date dispacherTime;
/**状态,0:待付款 默认，1：待发货，2：已发货，3：完结，4：退换货*/ /**状态,0:待付款 默认，1：待发货，2：已发货，3：完结，4：退换货*/
@Excel(name = "状态,0:待付款 默认，1：待发货，2：已发货，3：完结，4：退换货", width = 15, dicCode = "orderState") @Excel(name = "状态,0:待付款 默认，1：待发货，2：已发货，3：完结，4：退换货", width = 15, dicCode = "orderState")
@Dict(dicCode = "orderState") @Dict(dicCode = "orderState")

21
jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/erp/vo/OrderPage.java
Unescape View File

@ -64,6 +64,18 @@ public class OrderPage {
/**更新人*/ /**更新人*/
@ApiModelProperty(value = "更新人") @ApiModelProperty(value = "更新人")
private java.lang.String updateBy; private java.lang.String updateBy;
/**物控员id*/
@Excel(name = "物控员id", width = 15)
@ApiModelProperty(value = "物控员id")
private java.lang.String materialId;
/**物控员*/
@Excel(name = "物控员", width = 15)
@ApiModelProperty(value = "物控员")
private java.lang.String materialClerk;
/**物控员备注*/
@Excel(name = "物控员备注", width = 15)
@ApiModelProperty(value = "物控员备注")
private java.lang.String materialRemark;
/**审核人id*/ /**审核人id*/
@Excel(name = "审核人id", width = 15) @Excel(name = "审核人id", width = 15)
@ApiModelProperty(value = "审核人id") @ApiModelProperty(value = "审核人id")
@ -86,6 +98,10 @@ public class OrderPage {
@Excel(name = "审核意见", width = 15) @Excel(name = "审核意见", width = 15)
@ApiModelProperty(value = "审核意见") @ApiModelProperty(value = "审核意见")
private java.lang.String financeRemark; private java.lang.String financeRemark;
/**付款回执url*/
@Excel(name = "付款回执url", width = 15)
@ApiModelProperty(value = "付款回执url")
private java.lang.String financeUrl;
/**派单人*/ /**派单人*/
@Excel(name = "派单人", width = 15) @Excel(name = "派单人", width = 15)
@ApiModelProperty(value = "派单人") @ApiModelProperty(value = "派单人")
@ -100,6 +116,11 @@ public class OrderPage {
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "派发时间") @ApiModelProperty(value = "派发时间")
private java.util.Date dispacherTime; private java.util.Date dispacherTime;
/**出库回执url*/
@Excel(name = "出库回执url", width = 15)
@ApiModelProperty(value = "出库回执url")
private java.lang.String dispacherUrl;
/**物流单号*/ /**物流单号*/
@Excel(name = "物流单号", width = 15) @Excel(name = "物流单号", width = 15)
@ApiModelProperty(value = "物流单号") @ApiModelProperty(value = "物流单号")

Write Preview
Loading…
Cancel
Save