From db7d86acc19389dd4830cce50220ea43091c155c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Mon, 13 Apr 2020 13:49:47 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E6=95=B0=E5=AD=97=E5=AD=97=E6=AE=B5=E9=BB=98=E8=AE=A4=E5=80=BC?= =?UTF-8?q?0=EF=BC=8C=E4=B8=8D=E5=85=81=E8=AE=B8=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java | 7 ++-- .../cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java | 7 ++-- .../estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 10 ++++-- .../cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 6 ++-- .../estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java | 10 ++++-- .../i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 12 +++---- .../cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java | 7 ++-- .../estsh/i3plus/pojo/wms/bean/WmsPickCount.java | 4 ++- .../cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java | 4 +-- .../i3plus/pojo/wms/bean/WmsPullTaskDetails.java | 37 +++++++++++++++------- .../estsh/i3plus/pojo/wms/bean/WmsQCDetails.java | 8 ++--- .../cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java | 7 ++-- .../i3plus/pojo/wms/bean/WmsRoutingDetail.java | 13 +++++--- .../i3plus/pojo/wms/bean/WmsRoutingMaster.java | 4 ++- .../cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java | 2 +- .../i3plus/pojo/wms/bean/WmsSnOperateRecord.java | 4 ++- .../i3plus/pojo/wms/bean/WmsStockInitialize.java | 6 ++-- .../estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 18 +++++------ .../cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 4 ++- .../estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java | 4 +-- .../cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java | 3 ++ .../cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java | 2 +- .../estsh/i3plus/pojo/wms/bean/WmsTransQuan.java | 18 +++++------ .../cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java | 2 +- .../cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java | 4 +-- .../cn/estsh/i3plus/pojo/wms/bean/WmsWaveRule.java | 19 +++++++---- .../pojo/wms/bean/dynamictable/WmsListElement.java | 7 ++-- .../wms/bean/snapshot/WmsMoveDetailsSnapshot.java | 7 ++-- .../wms/bean/snapshot/WmsStockQuanSnapshot.java | 18 +++++------ .../pojo/wms/bean/snapshot/WmsStockSnSnapshot.java | 4 ++- 30 files changed, 162 insertions(+), 96 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java index 512e255..c87d03b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java @@ -9,6 +9,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -49,8 +50,9 @@ public class WmsBom extends BaseBean { @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String unit; - @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false) @ApiParam(value = "数量") + @ColumnDefault("0") @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double qty; @@ -69,8 +71,9 @@ public class WmsBom extends BaseBean { @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String itemUnit; - @Column(name = "ITEM_QTY", columnDefinition = "decimal(18,8)") + @Column(name = "ITEM_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ApiParam(value = "子用量") + @ColumnDefault("0") @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double itemQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java index 263cc0e..b1643f2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -40,8 +41,9 @@ public class WmsBomTotal extends BaseBean { @ApiParam("计量单位") private String UNIT; - @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false) @ApiParam("数量") + @ColumnDefault("0") private Double qty; @Column(name = "ITEM_PART_NO") @@ -56,8 +58,9 @@ public class WmsBomTotal extends BaseBean { @ApiParam(value = "子计量单位") private String itemUnit; - @Column(name = "ITEM_QTY", columnDefinition = "decimal(18,8)") + @Column(name = "ITEM_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ApiParam(value = "子用量") + @ColumnDefault("0") private Double itemQty; @Column(name = "BOM_NUM") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index e9f1cd8..d221a61 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -7,6 +7,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -58,16 +59,19 @@ public class WmsMoveDetails extends BaseBean { @ApiParam("客户编号") public String custNo; - @Column(name = "TRANS_QTY", columnDefinition = "decimal(18,8)") + @Column(name = "TRANS_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ApiParam(value = "处理数量", example = "0") + @ColumnDefault("0") public Double transQty; - @Column(name = "HANDLED_QTY", columnDefinition = "decimal(18,8)") + @Column(name = "HANDLED_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ApiParam(value = "已处理数量", example = "0") + @ColumnDefault("0") public Double handledQty; - @Column(name = "REJECT_QTY", columnDefinition = "decimal(18,8)") + @Column(name = "REJECT_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ApiParam(value = "不合格处理数量", example = "0") + @ColumnDefault("0") public Double rejectQty; public Double getRejectQty() { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index 4581410..5ea2ac2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -84,7 +84,7 @@ public class WmsMoveSn extends BaseBean { @ApiParam("容器编号") public String packAgeNo; - @Column(name = "SRC_QTY", columnDefinition = "decimal(18,8)") + @Column(name = "SRC_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "源数量", example = "0") public Double srcQty; @@ -121,12 +121,12 @@ public class WmsMoveSn extends BaseBean { @Transient private Long finishedCounts; - @Column(name = "DEST_QTY", columnDefinition = "decimal(18,8)") + @Column(name = "DEST_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "目标数量", example = "0") public Double destQty; - @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "数量", example = "0") public Double qty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java index c3f31f2..0f8d64f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -89,12 +90,14 @@ public class WmsMoveToERP extends BaseBean { @ApiParam("客户编号") public String custNo; - @Column(name="TRANS_QTY", columnDefinition = "decimal(18,8)") + @Column(name="TRANS_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ApiParam(value = "处理数量", example = "0") + @ColumnDefault("0") public Double transQty; - @Column(name="REJECT_QTY", columnDefinition = "decimal(18,8)") + @Column(name="REJECT_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ApiParam(value = "不合格处理数量", example = "0") + @ColumnDefault("0") public Double rejectQty; @Column(name="UNIT") @@ -147,8 +150,9 @@ public class WmsMoveToERP extends BaseBean { @ApiParam("关联单位") public String refUnit; - @Column(name="REF_QTY", columnDefinition = "decimal(18,8)") + @Column(name="REF_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ApiParam("关联数量") + @ColumnDefault("0") public Double refQty; @Column(name = "SRC_AREA_NO") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java index 529c486..0544b33 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java @@ -39,7 +39,7 @@ public class WmsPOMasterDetails extends BaseBean { @ApiParam("物料编码") private String partNo; - @Column(name = "BOX_QTY") + @Column(name = "BOX_QTY", nullable = false) @ColumnDefault("0") @ApiParam(value = "箱数", example = "0") private Integer boxQty; @@ -52,7 +52,7 @@ public class WmsPOMasterDetails extends BaseBean { @ApiParam("行号") private Integer item; - @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "需求数量", example = "0") private Double qty; @@ -69,28 +69,28 @@ public class WmsPOMasterDetails extends BaseBean { @ApiParam("订单号") private String orderNo; - @Column(name = "PRINT_QTY", columnDefinition = "decimal(18,8)") + @Column(name = "PRINT_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "条码打印数量", example = "0") private Double printQty; //private Double getPrintQty(){ return this.printQty == null ? new Double(0) : this.printQty; } - @Column(name = "RC_QTY", columnDefinition = "decimal(18,8)") + @Column(name = "RC_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "收货数量", example = "0") private Double rcQty = 0d; //private Double getRcQty(){ return this.rcQty == null ? new Double(0) : this.rcQty; } - @Column(name = "PASS_QTY", columnDefinition = "decimal(18,8)") + @Column(name = "PASS_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "质检合格数量", example = "0") private Double passQty; //private Double getPassQty(){ return this.passQty == null ? new Double(0) : this.passQty; } - @Column(name = "NG_QTY", columnDefinition = "decimal(18,8)") + @Column(name = "NG_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "质检不合格数量", example = "0") private Double ngQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java index 22dc007..98f1b1b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -41,12 +42,14 @@ public class WmsPackSn extends BaseBean { @ApiParam(value = "物料名称") private String partNameAdd; - @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false) @ApiParam("数量") + @ColumnDefault("0") private Double qty; - @Column(name = "SID", columnDefinition = "decimal(18,8)") + @Column(name = "SID", columnDefinition = "decimal(18,8)", nullable = false) @ApiParam("SID") + @ColumnDefault("0") private Double sId; @Column(name = "COMMIT_DATE") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickCount.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickCount.java index 69e19ef..236cf72 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickCount.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickCount.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -46,8 +47,9 @@ public class WmsPickCount extends BaseBean { @ApiParam(value = "物料号") private String partNo; - @Column(name = "QTY") + @Column(name = "QTY", nullable = false) @ApiParam(value = "数量") + @ColumnDefault("0") private Double qty; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java index 6c78826..b8eff5a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java @@ -51,7 +51,7 @@ public class WmsPoSn extends BaseBean { @ApiParam("物料名称") public String partNameRdd; - @Column(name="QTY", columnDefinition = "decimal(18,8)") + @Column(name="QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "数量", example = "0") public Double qty; @@ -89,7 +89,7 @@ public class WmsPoSn extends BaseBean { @ApiParam("组条码") public String groupNo; - @Column(name="REC_QTY", columnDefinition = "decimal(18,8)") + @Column(name="REC_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "收货数量", example = "0") public Double recQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java index 4eaabf1..eccb351 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -46,8 +47,9 @@ public class WmsPullTaskDetails extends BaseBean{ @ApiParam("库位代码") private String locateNo; - @Column(name="LOCATE_CAPACITY") + @Column(name="LOCATE_CAPACITY", nullable = false) @ApiParam(value = "库位容量", example = "0") + @ColumnDefault("0") private Integer locateCapacity = 0; @Column(name="PART_NO") @@ -58,52 +60,63 @@ public class WmsPullTaskDetails extends BaseBean{ @ApiParam("零件名称") private String partNameRdd; - @Column(name="PLAN_PACK_QTY") + @Column(name="PLAN_PACK_QTY", nullable = false) @ApiParam(value = "计划数量", example = "0d") + @ColumnDefault("0") private Double planPackQty = 0d; - @Column(name="PLAN_PACK_COUNT") + @Column(name="PLAN_PACK_COUNT", nullable = false) @ApiParam(value = "计划容器数", example = "0d") + @ColumnDefault("0") private Double planPackCount = 0d; - @Column(name="FIRST_BATCH_QTY") + @Column(name="FIRST_BATCH_QTY", nullable = false) @ApiParam(value = "首批批量", example = "0d") + @ColumnDefault("0") private Double firstBatchQty = 0d; - @Column(name="FIRST_PACK_COUNT") + @Column(name="FIRST_PACK_COUNT", nullable = false) @ApiParam(value = "首批容器数", example = "0d") + @ColumnDefault("0") private Double firstPackCount = 0d; - @Column(name="REQUEST_QTY") + @Column(name="REQUEST_QTY", nullable = false) @ApiParam(value = "补货批量", example = "0d") + @ColumnDefault("0") private Double requestQty = 0d; - @Column(name="REQUEST_PACK_COUNT") + @Column(name="REQUEST_PACK_COUNT", nullable = false) @ApiParam(value = "补货容器数", example = "0d") + @ColumnDefault("0") private Double requestPackCount = 0d; - @Column(name="REQUEST_LOT_NO") + @Column(name="REQUEST_LOT_NO", nullable = false) @ApiParam(value = "补货批次", example = "0d") + @ColumnDefault("0") private Double requestLotNo = 0d; - @Column(name="REQUEST_TOTAL_COUNT") + @Column(name="REQUEST_TOTAL_COUNT", nullable = false) @ApiParam(value = "补货累加次数", example = "0d") + @ColumnDefault("0") private Double requestTotalCount = 0d; @Column(name="LAST_REQUEST_TIME") @ApiParam("上一次补货时间") private String lastRequestTtime; - @Column(name="BOOT_QTY") + @Column(name="BOOT_QTY", nullable = false) @ApiParam(value = "尾箱批量", example = "0d") + @ColumnDefault("0") private Double bootQty = 0d; - @Column(name="BOOT_PACK_COUNT") + @Column(name="BOOT_PACK_COUNT", nullable = false) @ApiParam(value = "尾箱容器数", example = "0d") + @ColumnDefault("0") private Double bootPackCount = 0d; - @Column(name="BOOT_LOT_NO") + @Column(name="BOOT_LOT_NO", nullable = false) @ApiParam(value = "尾箱批次", example = "0d") + @ColumnDefault("0") private Double bootLotNo = 0d; @Column(name="ORDER_STATUS") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java index d0275ca..8d77ca7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java @@ -42,7 +42,7 @@ public class WmsQCDetails extends BaseBean { @ApiParam("行号") public String item; - @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "需求数量", example = "0") public Double qty; @@ -67,17 +67,17 @@ public class WmsQCDetails extends BaseBean { public String remark; - @Column(name = "FACT_QTY", columnDefinition = "decimal(18,8)") + @Column(name = "FACT_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "实检数量", example = "0") public Double factQty; - @Column(name = "PASS_QTY", columnDefinition = "decimal(18,8)") + @Column(name = "PASS_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "合格数量", example = "0") public Double passQty; - @Column(name = "REJECT_QTY", columnDefinition = "decimal(18,8)") + @Column(name = "REJECT_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "不合格数量", example = "0") public Double rejectQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java index bbc0e78..d02e9b0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -49,12 +50,14 @@ public class WmsQCTrans extends BaseBean { @ApiParam("备注") public String remark; - @Column(name="PASS_QTY") + @Column(name="PASS_QTY", nullable = false) @ApiParam("合格数量") + @ColumnDefault("0") public double passQty; - @Column(name="REJECT_QTY") + @Column(name="REJECT_QTY", nullable = false) @ApiParam("不合格数量") + @ColumnDefault("0") public double rejectQty; @Column(name="UNIT") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingDetail.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingDetail.java index 25e42ae..4fe577d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingDetail.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingDetail.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -36,20 +37,24 @@ public class WmsRoutingDetail extends BaseBean { @ApiParam(value = "作业步骤") private String opStep; - @Column(name = "OK_SEQ") + @Column(name = "OK_SEQ", nullable = false) @ApiParam(value = "成功跳转序号", example = "1") + @ColumnDefault("0") private Integer okSeq; - @Column(name = "NG_SEQ") + @Column(name = "NG_SEQ", nullable = false) @ApiParam(value = "失败跳转序号", example = "1") + @ColumnDefault("0") private Integer ngSeq; - @Column(name = "SEQ") + @Column(name = "SEQ", nullable = false) @ApiParam(value = "序号", example = "1") + @ColumnDefault("0") private Integer seq; - @Column(name = "PARENT_SEQ") + @Column(name = "PARENT_SEQ", nullable = false) @ApiParam(value = "上级步骤序号", example = "1") + @ColumnDefault("0") private Integer parentSeq; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingMaster.java index b7c6c2b..db8be1d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingMaster.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -36,7 +37,8 @@ public class WmsRoutingMaster extends BaseBean { @ApiParam(value = "路线名称") private String routingName; - @Column(name = "SEQ") + @Column(name = "SEQ", nullable = false) @ApiParam(value = "序号", example = "1") + @ColumnDefault("0") private Integer seq; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java index f740e9c..46b0051 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java @@ -44,7 +44,7 @@ public class WmsShipping extends BaseBean { @ApiParam("物料名称") public String partNameRdd; - @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "需求数量", example = "0") public Double qty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java index 468634a..127238a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java @@ -8,6 +8,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -48,8 +49,9 @@ public class WmsSnOperateRecord extends BaseBean { @ApiParam(value = "库位代码") private String locateNo; - @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false) @ApiParam(value = "数量", example = "0") + @ColumnDefault("0") private Double qty = 0d; @Column(name = "PART_NO") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockInitialize.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockInitialize.java index 001b0a6..32fddf1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockInitialize.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockInitialize.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -60,12 +61,13 @@ public class WmsStockInitialize extends BaseBean { @AnnoOutputColumn private String unit; - @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false) @ApiParam(value = "可用数量", example = "0") + @ColumnDefault("0") @AnnoOutputColumn private Double qty = 0d; - @Column(name = "SNP", columnDefinition = "decimal(18,8)") + @Column(name = "SNP", columnDefinition = "decimal(18,8)", nullable = false) @ApiParam(value = "标准包装", example = "1") @AnnoOutputColumn private Double snp; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java index 837cbf2..a587db3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java @@ -79,39 +79,39 @@ public class WmsStockQuan extends BaseBean { private WmsLocate wmsLocate; - @Column(name = "QTY", columnDefinition = "decimal(18,8) default 0") + @Column(name = "QTY", columnDefinition = "decimal(18,8) default 0", nullable = false) @ApiParam(value = "可用数量") public Double qty; - @Column(name = "FAIL_QTY", columnDefinition = "decimal(18,8) default 0") + @Column(name = "FAIL_QTY", columnDefinition = "decimal(18,8) default 0", nullable = false) @ApiParam(value = "不合格数量") private Double failQty; - @Column(name = "HOLD_QTY", columnDefinition = "decimal(18,8) default 0") + @Column(name = "HOLD_QTY", columnDefinition = "decimal(18,8) default 0", nullable = false) @ApiParam(value = "隔离数量") private Double holdQty; - @Column(name = "QC_QTY", columnDefinition = "decimal(18,8) default 0") + @Column(name = "QC_QTY", columnDefinition = "decimal(18,8) default 0", nullable = false) @ApiParam(value = "质检中数量") private Double qcQty; - @Column(name = "RIN_QTY", columnDefinition = "decimal(18,8) default 0") + @Column(name = "RIN_QTY", columnDefinition = "decimal(18,8) default 0", nullable = false) @ApiParam(value = "待入库数量") private Double rinQty; - @Column(name = "FREEZE_QTY", columnDefinition = "decimal(18,8) default 0") + @Column(name = "FREEZE_QTY", columnDefinition = "decimal(18,8) default 0", nullable = false) @ApiParam(value = "冻结数量") private Double freezeQty; - @Column(name = "CONSIGN_QTY", columnDefinition = "decimal(18,8) default 0") + @Column(name = "CONSIGN_QTY", columnDefinition = "decimal(18,8) default 0", nullable = false) @ApiParam(value = "寄售数量") private Double consignQty; - @Column(name = "LOCK_QTY", columnDefinition = "decimal(18,8) default 0") + @Column(name = "LOCK_QTY", columnDefinition = "decimal(18,8) default 0", nullable = false) @ApiParam(value = "锁定数量") private Double lockQty; - @Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8) default 0") + @Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8) default 0", nullable = false) @ApiParam(value = "报废数量") private Double scrapQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 647c116..9c83839 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -7,6 +7,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import org.springframework.format.annotation.DateTimeFormat; @@ -113,7 +114,8 @@ public class WmsStockSn extends BaseBean { @ApiParam(value = "单位") private String unit; - @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false) + @ColumnDefault("0") @ApiParam(value = "数量", example = "0") private Double qty = 0d; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java index 61cb767..be8dd7d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java @@ -61,12 +61,12 @@ public class WmsTaskDetails extends BaseBean { @ApiParam(value = "供应商编号") private String vendorNo; - @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "需求数量", example = "1") private Double qty; - @Column(name = "TRANS_QTY", columnDefinition = "decimal(18,8)") + @Column(name = "TRANS_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "处理数量", example = "1") private Double transQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java index 4b798fd..9927324 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -47,6 +48,7 @@ public class WmsTaskSrc extends BaseBean { @Column(name = "IS_SN") @ApiParam("是否有条码") + @ColumnDefault("0") public Integer isSn; @Column(name = "TRANS_CODE") @@ -55,5 +57,6 @@ public class WmsTaskSrc extends BaseBean { @Column(name = "IS_ONE_STEP") @ApiParam("是否一步法") + @ColumnDefault("0") public Integer isOneStep; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java index 674df38..5818f82 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java @@ -58,7 +58,7 @@ public class WmsTrans extends BaseBean{ @ApiParam(value ="交易状态",example = "1") private Integer transStatus; - @Column(name="QTY", columnDefinition = "decimal(18,8)") + @Column(name="QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value ="需求数") private Double qty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java index d5e6146..b163bbb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java @@ -98,47 +98,47 @@ public class WmsTransQuan extends BaseBean { @ApiParam(value = "错误信息") private String errorMessage; - @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "可用数量", example = "0") public Double qty; - @Column(name = "FAIL_QTY", columnDefinition = "decimal(18,8)") + @Column(name = "FAIL_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "不合格数量", example = "0") private Double failQty; - @Column(name = "HOLD_QTY", columnDefinition = "decimal(18,8)") + @Column(name = "HOLD_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "隔离数量", example = "0") private Double holdQty; - @Column(name = "QC_QTY", columnDefinition = "decimal(18,8)") + @Column(name = "QC_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "质检中数量", example = "0") private Double qcQty; - @Column(name = "RIN_QTY", columnDefinition = "decimal(18,8)") + @Column(name = "RIN_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "待入库数量", example = "0") private Double rinQty; - @Column(name = "FREEZE_QTY", columnDefinition = "decimal(18,8)") + @Column(name = "FREEZE_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "冻结数量", example = "0") private Double freezeQty; - @Column(name = "CONSIGN_QTY", columnDefinition = "decimal(18,8)") + @Column(name = "CONSIGN_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "寄售数量", example = "0") private Double consignQty; - @Column(name = "LOCK_QTY", columnDefinition = "decimal(18,8)") + @Column(name = "LOCK_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "锁定数量", example = "0") private Double lockQty; - @Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8)") + @Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "报废数量", example = "0") private Double scrapQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java index 1e47d2e..fe49873 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java @@ -58,7 +58,7 @@ public class WmsTransRcd extends BaseBean{ @ApiParam(value ="交易状态",example = "1") private Integer transStatus; - @Column(name="QTY", columnDefinition = "decimal(18,8)") + @Column(name="QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value ="需求数") private Double qty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java index 447bdf9..b4f5ed5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java @@ -66,12 +66,12 @@ public class WmsTransSn extends BaseBean { @ApiParam("事务代码") public String transCode; - @Column(name="QTY", columnDefinition = "decimal(18,8)") + @Column(name="QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "交易数量", example = "0") public Double qty; - @Column(name="REJECT_QTY", columnDefinition = "decimal(18,8)") + @Column(name="REJECT_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "不合格交易数量", example = "0") public Double rejectQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWaveRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWaveRule.java index a9b02e2..dad3549 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWaveRule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWaveRule.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -67,28 +68,34 @@ public class WmsWaveRule extends BaseBean { @ApiParam(value = "单据控制时间") public String orderControlTime; - @Column(name = "FIXED_ORDER_QTY") + @Column(name = "FIXED_ORDER_QTY", nullable = false) @ApiParam(value = "固定单据数量", example = "0") + @ColumnDefault("0") public Integer fixedOrderQty; - @Column(name = "FIXED_PART_QTY") + @Column(name = "FIXED_PART_QTY", nullable = false) @ApiParam(value = "固定物料箱数", example = "0") + @ColumnDefault("0") public Integer fixedPartQty; - @Column(name = "WAVE_QTY") + @Column(name = "WAVE_QTY", nullable = false) @ApiParam(value = "波次数量", example = "0") + @ColumnDefault("0") public Integer waveQty; - @Column(name = "ORDER_MAX_QTY") + @Column(name = "ORDER_MAX_QTY", nullable = false) @ApiParam(value = "最大单据数量", example = "0") + @ColumnDefault("0") public Integer orderMaxQty; - @Column(name = "PART_MAX_QTY") + @Column(name = "PART_MAX_QTY", nullable = false) @ApiParam(value = "最大物料数量", example = "0") + @ColumnDefault("0") public Double partMaxQty; - @Column(name = "ORDER_TIMEOUT_TIME") + @Column(name = "ORDER_TIMEOUT_TIME", nullable = false) @ApiParam(value = "单据等待时间", example = "0") + @ColumnDefault("0") public Integer orderTimeOutTime; @Column(name = "NEXT_WAVE_TIME") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsListElement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsListElement.java index 1359939..63c7ee5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsListElement.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsListElement.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -46,12 +47,14 @@ public class WmsListElement extends BaseBean { @ApiParam(value = "序列号:字段标题排序使用默认0（不排序）") private Integer seq; - @Column(name = "IS_REQUIRE") + @Column(name = "IS_REQUIRE", nullable = false) + @ColumnDefault("2") @ApiParam(value = "是否必选:默认1-必选，2-非必选") private Integer isRequire; - @Column(name = "WIDTH", columnDefinition = "decimal(18,8)") + @Column(name = "WIDTH", columnDefinition = "decimal(18,8)", nullable = false) @ApiParam(value = "宽度", example = "0") + @ColumnDefault("0") private Double width; @Column(name = "SORT") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveDetailsSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveDetailsSnapshot.java index 40fdf34..29477e4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveDetailsSnapshot.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveDetailsSnapshot.java @@ -7,6 +7,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -63,16 +64,18 @@ public class WmsMoveDetailsSnapshot extends BaseBean { @ApiParam("客户编号") public String custNo; - @Column(name="TRANS_QTY", columnDefinition = "decimal(18,8)") + @Column(name="TRANS_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ApiParam(value = "处理数量", example = "0") + @ColumnDefault("0") public Double transQty; public Double getTransQty(){ return this.transQty == null ? 0 : this.transQty.doubleValue(); } - @Column(name="REJECT_QTY", columnDefinition = "decimal(18,8)") + @Column(name="REJECT_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ApiParam(value = "不合格处理数量", example = "0") + @ColumnDefault("0") public Double rejectQty; public Double getRejectQty(){ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockQuanSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockQuanSnapshot.java index 7b9e473..724a81d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockQuanSnapshot.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockQuanSnapshot.java @@ -87,47 +87,47 @@ public class WmsStockQuanSnapshot extends BaseBean { private WmsLocate wmsLocate; - @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "可用数量", example = "0") public Double qty; - @Column(name = "FAIL_QTY", columnDefinition = "decimal(18,8)") + @Column(name = "FAIL_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "不合格数量", example = "0") private Double failQty; - @Column(name = "HOLD_QTY", columnDefinition = "decimal(18,8)") + @Column(name = "HOLD_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "隔离数量", example = "0") private Double holdQty; - @Column(name = "QC_QTY", columnDefinition = "decimal(18,8)") + @Column(name = "QC_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "质检中数量", example = "0") private Double qcQty; - @Column(name = "RIN_QTY", columnDefinition = "decimal(18,8)") + @Column(name = "RIN_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "待入库数量", example = "0") private Double rinQty; - @Column(name = "FREEZE_QTY", columnDefinition = "decimal(18,8)") + @Column(name = "FREEZE_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "冻结数量", example = "0") private Double freezeQty; - @Column(name = "CONSIGN_QTY", columnDefinition = "decimal(18,8)") + @Column(name = "CONSIGN_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "寄售数量", example = "0") private Double consignQty; - @Column(name = "LOCK_QTY", columnDefinition = "decimal(18,8)") + @Column(name = "LOCK_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "锁定数量", example = "0") private Double lockQty; - @Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8)") + @Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8)", nullable = false) @ColumnDefault("0") @ApiParam(value = "报废数量", example = "0") private Double scrapQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockSnSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockSnSnapshot.java index b13c8f0..8d15ecc 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockSnSnapshot.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockSnSnapshot.java @@ -7,6 +7,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import org.springframework.format.annotation.DateTimeFormat; @@ -116,8 +117,9 @@ public class WmsStockSnSnapshot extends BaseBean { @ApiParam(value = "单位") private String unit; - @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false) @ApiParam(value = "数量", example = "0") + @ColumnDefault("0") private Double qty = 0d; /** From 214fbb8da2acf336fb62adef0287b92874254355 Mon Sep 17 00:00:00 2001 From: qianhs Date: Tue, 14 Apr 2020 10:28:02 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E3=80=901613=20=E8=A3=85=E8=BD=A6=E5=8D=95?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=AD=E8=88=AA=E6=89=93=E5=8D=B0=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java | 10 + .../i3plus/pojo/wms/bean/WmsTmsShippingExt.java | 24 ++ .../pojo/wms/bean/WmsTmsShippingExtDetail.java | 304 +++++++++++++++++++++ .../i3plus/pojo/wms/bean/WmsTmsShippingExtSn.java | 148 ++++++++++ .../i3plus/pojo/wms/dto/WmsTmsShipBacthDto.java | 23 ++ .../modelbean/WmsTmsShippingExtDeatilModel.java | 41 +++ .../pojo/wms/modelbean/WmsTmsShippingExtModel.java | 133 +++++++++ .../IWmsTmsShippingExtDetailRepository.java | 17 ++ .../repository/IWmsTmsShippingExtSnRepository.java | 17 ++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 116 +++++++- 10 files changed, 831 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtDetail.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtSn.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipBacthDto.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsTmsShippingExtDeatilModel.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsTmsShippingExtModel.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsTmsShippingExtDetailRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsTmsShippingExtSnRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java index 7223d70..3561345 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java @@ -53,41 +53,51 @@ public class WmsCsStrategy extends BaseBean implements Serializable { @Column(name = "CYCLE_RULE") @ApiParam(value = "循环规则") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String cycleRule; @Column(name = "START_DATE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam(value = "开始日期", example = "0") private String startDate; @Column(name = "END_DATE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam(value = "结束日期", example = "0") private String endDate; @Column(name = "NUM_MAX") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam(value = "明细数量上限") private Integer numMax; @Column(name = "COVERAGE_RATE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam(value = "抽盘覆盖率") private Double coverageRate; @Column(name = "ZONE_NOS") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam(value = "存储区") private String zoneNos; @Column(name = "LOCATES") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam(value = "盘点库位") private String locates; @Column(name = "last_run_time") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam(value = "上次运行时间") private String lastRunTime; @Column(name = "next_run_time") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam(value = "下次运行时间") private String nextRunTime; @Column(name = "REMAKE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam(value = "备注") private String remake; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java index c0cbe93..bf0c626 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java @@ -116,4 +116,28 @@ public class WmsTmsShippingExt extends BaseBean { @Transient @ApiParam("打印模板列表") private List shipModels; + + //需求仓库-目的仓库 + @Column(name="DESC_WAREHOUSE") + @ApiParam("目的仓库") + private String descWarehouse; + + //承运商-物流供应商 + @Column(name="LOGISTICS_VENDOR_NO") + @ApiParam("物流供应商") + private String logisticsVendorNo; + + //运输方式-单据运输方式（维护内容） + @Column(name="DOCUMENT_TRANSPORT_METHOD") + @ApiParam("单据运输方式") + private Integer documentTransportMethod; + + //是否不良品调拨—调拨单录入字段 + @Column(name="DEFECTIVE_ALLOCATION") + @ApiParam("调拨单录入字段") + private String defectiveAllocation; + +// @Transient +// @ApiParam("打印模板列表") +// private String defectiveAllocation; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtDetail.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtDetail.java new file mode 100644 index 0000000..c1013d5 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtDetail.java @@ -0,0 +1,304 @@ +package cn.estsh.i3plus.pojo.wms.bean; + + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import javax.persistence.Version; + +/** + * @Description : 车辆信息明细 + * @Reference : + * @Author : qianhuasheng + * @CreateDate : 2019-12-06 15:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_TMS_SHIPPING_EXT_DETAIL") +@Api("装车单信息明细") +public class WmsTmsShippingExtDetail extends BaseBean { + private static final long serialVersionUID = -4800308354250386102L; + + @Column(name="MOVE_NO") + @ApiParam("装车单") + public String moveNo; + + @Column(name = "PART_NO") + @ApiParam("物料编码") + public String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + public String partNameRdd; + + @Column(name = "ITEM") + @ApiParam("行号") + public String item; + + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "需求数量", example = "0") + public Double qty; + + @Column(name = "UNIT") + @ApiParam("单位") + public String unit; + + @Column(name = "ORDER_NO") + @ApiParam("订单号") + public String orderNo; + + @Column(name = "SRC_WH_NO") + @ApiParam("源仓库代码") + public String srcWhNo; + + @Column(name = "SRC_ZONE_NO") + @ApiParam("源存储区代码") + public String srcZoneNo; + + @Column(name = "SRC_LOCATE_NO") + @ApiParam("源库位代码") + public String srcLocateNo; + + @Column(name = "DEST_WH_NO") + @ApiParam("目标仓库代码") + public String destWhNo; + + @Column(name = "DEST_ZONE_NO") + @ApiParam("目标存储区代码") + public String destZoneNo; + + @Column(name = "DEST_LOCATE_NO") + @ApiParam("目标库位代码") + public String destLocateNo; + + @Column(name = "PRINT_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "条码打印数量", example = "1") + private Double printQty; + + @Column(name = "PLAN_DATE") + @ApiParam(value = "计划日期") + private String planDate; + + @Column(name = "PLAN_TIME") + @ApiParam(value = "计划时间") + private String planTime; + + @Column(name = "SRC_NO") + @ApiParam(value = "源单号") + private String srcNo; + /** + * 状态:N=正常,C=行取消 + */ + @Column(name = "ITEM_STATUS") + @ApiParam(value = "状态", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_DETAILS_STATUS.class, refForeignKey = "value", value = "description") + private Integer itemStatus; + + /** + * 是否免费:0=计费,1=免费 + */ + @Column(name = "IS_FREE") + @ApiParam(value = "是否免费", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") + public Integer isFree; + + @Column(name = "REMARK") + @ApiParam(value = "操作原因") + private String remark; + + @Column(name = "PICK_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "已拣货数量", example = "1") + private Double pickQty; + + @Column(name = "OUT_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "已出库数量", example = "1") + private Double outQty; + + @Column(name = "REC_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "已收货数量", example = "1") + private Double recQty; + + @Column(name = "MOVE_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "已移库数量", example = "1") + private Double moveQty; + + @Column(name = "TASK_GENERATE_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "任务生成数量", example = "1") + private Double taskGenerateQty; + + @Column(name = "SRC_AREA_NO") + @ApiParam("源库存地代码") + public String srcAreaNo; + + @Column(name = "DEST_AREA_NO") + @ApiParam("目的库存地代码") + public String destAreaNo; + + @Column(name = "LOT_NO") + @ApiParam("批次") + public String lotNo; + + @Column(name="SRC_ITEM", columnDefinition="varchar(50) default ''",nullable=false) + @ApiParam("源单行号") + public String srcItem; + + @Column(name = "CUST_ORDER_NO") + @ApiParam("客户订单号") + public String custOrderNo; + + @Column(name = "ASSIGN_DATE_CODE") + @ApiParam(value = "指定生产日期") + private String assignDateCode; + + @Transient + @ApiParam("实际批次") + private String actualLot; + + @Transient + @ApiParam("实际数量") + private Double actualQty; + + @Transient + @ApiParam("推荐批次") + private String recommondLot; + + @Transient + @ApiParam("推荐库位") + private String recommondLocateNo; + + @Transient + @ApiParam("前端表格编辑使用") + private Boolean isSet = false; + + @Transient + @ApiParam("生产日期") + public String dateCode; + + @ApiParam(value = "散件移库输入移库数量") + @Transient + public Double inputMoveQty; + + @Transient + @ApiParam(value = "标准包装", example = "1") + private Double snp; + + @Transient + @ApiParam(value = "条码总数量", example = "1") + private Double detailsSnCount; + + @Transient + @ApiParam(value = "余数", example = "1") + private Double restQty; + + @Transient + @ApiParam("任务状态") + @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class, refForeignKey = "value", value = "description") + private Integer isTask; + + @Transient + @ApiParam("主表单据状态") + @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description") + private Integer orderMasterStatus; + + @Transient + @ApiParam("打印状态") + @AnnoOutputColumn(refClass = WmsEnumUtil.PRINT_STATUS.class, refForeignKey = "value", value = "description") + private Integer printStatus; + + @Transient + @ApiParam("优先级") + private Integer priority; + + @Transient + @ApiParam(value = "汇总需求数量", example = "0") + public Double sumQty; + + @Transient + @ApiParam(value = "汇总拣货数量", example = "0") + public Double sumPickQty; + + @Transient + @ApiParam("执行状态") + @AnnoOutputColumn(refClass = WmsEnumUtil.PICKING_EXECUTE_STATUS.class, refForeignKey = "value", value = "description") + private Integer executeStatus; + + @Version + @Column(name = "LOCK_VERSION") + @ApiParam(value = "乐观锁", example = "1") + public transient Integer lockVersion; + + @Transient + @ApiParam("移动类型") + public Integer moveType; + + @Transient + @ApiParam("业务类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description") + public Integer busiType; + + @Column(name = "IS_SN") + @ApiParam(value = "条码生成状态", example = "20") + public Integer isSn; + + + public WmsTmsShippingExtDetail () { + + } + + + public String getRecommondLot() { + return recommondLot == null ? "无" : this.recommondLot; + } + + public Double getQty() { + return qty == null ? 0D : this.qty.doubleValue(); + } + + public Double getOutQty() { + return outQty == null ? 0D : this.outQty.doubleValue(); + } + + public Double getPickQty() { + return pickQty == null ? 0D : this.pickQty.doubleValue(); + } + + public Double getActualQty() { + return actualQty == null ? 0D : this.actualQty.doubleValue(); + } + + public Double getRecQty() { + return recQty == null ? 0D : this.recQty.doubleValue(); + } + + public Integer getIsTaskVal() { + return isTask == null ? 0 : this.isTask.intValue(); + } + + public Integer getOrderMasterStatus() { + return orderMasterStatus == null ? 0 : this.orderMasterStatus.intValue(); + } + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtSn.java new file mode 100644 index 0000000..8c415bd --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtSn.java @@ -0,0 +1,148 @@ +package cn.estsh.i3plus.pojo.wms.bean; + + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; + +/** + * @Description : 车辆信息明细 + * @Reference : + * @Author : qianhuasheng + * @CreateDate : 2019-12-06 15:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_TMS_SHIPPING_EXT_SN") +@Api("装车单条码明细") +public class WmsTmsShippingExtSn extends BaseBean { + + private static final long serialVersionUID = 5704546384179442907L; + + @Column(name="MOVE_NO") + @ApiParam("装车单") + public String moveNo; + + @Column(name="ORDER_NO") + @ApiParam("订单号") + public String orderNo; + + @Column(name="ITEM") + @ApiParam("行号") + public String item; + + @Column(name="PART_NO") + @ApiParam("物料编码") + public String partNo; + + @Column(name="PART_NAME_RDD") + @ApiParam("物料名称") + public String partNameRdd; + + @Column(name="QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "数量", example = "0") + public Double qty; + + + @Column(name="UNIT") + @ApiParam("单位") + public String unit; + + /** + * 状态：操作状态 itemStatus + */ + @Column(name="SN_STATUS") + @ApiParam(value = "操作状态", example = "10") + @AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_SN_STATUS.class,refForeignKey = "value",value = "description") + public Integer snStatus; + + @Column(name="SN") + @ApiParam("条码") + public String sn; + + @Column(name = "VENDOR_NO") + @ApiParam(value = "供应商编码") + public String vendorNo; + + @Column(name = "SN_TYPE") + @ApiParam(value = "条码类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_STOCK_TYPE.class, refForeignKey = "value", value = "description") + private Integer snType; + + @Transient + @ApiParam("前端表格编辑使用") + private Boolean isSet = false; + + @Transient + @ApiParam("目标库位代码") + public String destLocateNo; + + @Transient + @ApiParam("源库位代码") + public String srcLocateNo; + + @Transient + @ApiParam("生产日期") + public String dateCode; + + @ApiParam(value = "散件移库输入移库数量") + @Transient + public Double inputMoveQty; + + @Transient + @ApiParam("计划交货日期") + private String planDate; + + @Transient + @ApiParam("计划交货时间") + private String planTime; + + @Transient + @ApiParam("ERP库存地") + private String erpWhNo; + + @Transient + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description") + public Integer itemStatus; + + @Transient + @ApiParam("客户零件号") + private String customerPartNo; + + @Transient + @ApiParam("父层级packcode对应的可回用零件号") + private String parentReturnPart; + + + @Transient + @ApiParam("打印模板") + private String templateNo; + + @Transient + @ApiParam("剩余箱数量") + private Long countBox; + + public WmsTmsShippingExtSn(){} + + public WmsTmsShippingExtSn(Long countBox,String partNo) { + this.countBox = countBox; + this.partNo = partNo; + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipBacthDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipBacthDto.java new file mode 100644 index 0000000..04c9772 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipBacthDto.java @@ -0,0 +1,23 @@ +package cn.estsh.i3plus.pojo.wms.dto; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +/** + * @Description :装车单入参 + * @Reference : + * @Author : gcj + * @CreateDate : 2019-12-07 16:06 + * @Modify: + **/ +@Api("装车单批量入参") +@Data +public class WmsTmsShipBacthDto extends BaseDto implements Serializable { + @ApiParam("装车单集合") + private List wmsTmsShipDtoList=new ArrayList<>(); +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsTmsShippingExtDeatilModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsTmsShippingExtDeatilModel.java new file mode 100644 index 0000000..0aef73a --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsTmsShippingExtDeatilModel.java @@ -0,0 +1,41 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import javax.persistence.Column; + +/** + * @Description :装车单打印输出model + * @Reference : + * @Author :QianHuaSheng + * @CreateDate : 2020-04-10 3:21 下午 + * @Modify: + **/ +@Data +@Api("静态盘点查询输出model") +public class WmsTmsShippingExtDeatilModel { + + @ApiParam(value ="零件号") + private String partNo; + + @Column(name="PART_NAME_RDD") + @ApiParam(value ="零件名称") + private String partNameRdd; + + @ApiParam("需求数量") + private Double qty; + + @ApiParam("发运数量") + private Double shippQty; + + @ApiParam("箱数") + private Integer boxQty; + + @ApiParam("标准包装") + private Double snp; + + @ApiParam("收货数量") + private String receivedQuantity=""; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsTmsShippingExtModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsTmsShippingExtModel.java new file mode 100644 index 0000000..7ab26ec --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsTmsShippingExtModel.java @@ -0,0 +1,133 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import cn.estsh.i3plus.pojo.wms.bean.WmsTmsShippingExt; +import cn.estsh.i3plus.pojo.wms.dto.WmsTmsShipModel; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Description :装车单打印输出model + * @Reference : + * @Author :QianHuaSheng + * @CreateDate : 2020-04-10 3:21 下午 + * @Modify: + **/ +@Data +@Api("静态盘点查询输出model") +public class WmsTmsShippingExtModel { + + @ApiParam(value = "移库单号") + private String moveNo=""; + + @ApiParam(value = "到货地点") + private String destination=""; + + @ApiParam(value = "接收人") + private String recUser=""; + + @ApiParam(value = "接收人电话") + private String recPhone=""; + + @ApiParam(value = "道口") + private String dockNo=""; + + @ApiParam(value = "承运商编号") + private String vendorNo=""; + + @ApiParam(value = "承运商名称RDD") + private String vendorName=""; + + @ApiParam(value = "驾驶员编号") + private String driverNo=""; + + @ApiParam(value = "驾驶员名称RDD") + private String driverName=""; + + @ApiParam(value = "驾驶员联系方式RDD") + private String phone=""; + + @ApiParam(value = "单据状态") + private Integer orderStatus=0; + + @ApiParam(value = "客户名称RDD") + private String custName=""; + + @ApiParam(value = "客户编号RDD") + private String custNo=""; + + @ApiParam(value = "车牌号RDD") + private String carNo=""; + + @ApiParam(value = "计划发车时间") + private String deliveryTime=""; + + @ApiParam(value = "要求到货时间") + private String arrivelTime=""; + + @ApiParam(value = " 申请部门") + private String depart=""; + + @ApiParam("物料编码") + private String partNo=""; + + @ApiParam("关联单号") + private String refOrderNo=""; + + @ApiParam("回执单地址") + private String pathUrl=""; + + @ApiParam("打印模板列表") + private List shipModels=new ArrayList<>(); + + //需求仓库-目的仓库 + @ApiParam("目的仓库") + private String descWarehouse=""; + + //承运商-物流供应商 + @ApiParam("物流供应商") + private String logisticsVendorNo=""; + + //运输方式-单据运输方式（维护内容） + @ApiParam("单据运输方式") + private Integer documentTransportMethod=0; + + //是否不良品调拨—调拨单录入字段 + @ApiParam("调拨单录入字段") + private String defectiveAllocation=""; + + @ApiParam("发运时间") + private String shippingTime=""; + + @ApiParam("发运人") + private String shippingUser=""; + + @ApiParam("下单日期") + private String orderDate=""; + + @ApiParam("模板编号") + private String templateNo=""; + + //装车单明细已物料区分 + @ApiParam("各个物料详情") + private List tmsShippingExtDeatilModels = new ArrayList<>(); + + public WmsTmsShippingExtModel() { + + } + + public WmsTmsShippingExtModel(WmsTmsShippingExt wmsTmsShippingExt) { + this.moveNo = wmsTmsShippingExt.getMoveNo(); + this.descWarehouse=wmsTmsShippingExt.getDescWarehouse(); + this.vendorName=wmsTmsShippingExt.getVendorName(); + this.documentTransportMethod=wmsTmsShippingExt.getDocumentTransportMethod(); + this.shippingTime=wmsTmsShippingExt.getCreateDatetime(); + this.shippingUser=wmsTmsShippingExt.getCreateUser(); + this.defectiveAllocation=wmsTmsShippingExt.getDefectiveAllocation(); + this.refOrderNo=wmsTmsShippingExt.getRefOrderNo(); + this.orderDate=wmsTmsShippingExt.getCreateDatetime(); + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsTmsShippingExtDetailRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsTmsShippingExtDetailRepository.java new file mode 100644 index 0000000..4e8030b --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsTmsShippingExtDetailRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsTmsShippingExtDetail; +import org.springframework.stereotype.Repository; + +/** +* @Description : 装车单明细 +* @Reference : +* @author: qianhuasheng +* @date: 2019/9/19 14:22 +* @Modify: +*/ + +@Repository +public interface IWmsTmsShippingExtDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsTmsShippingExtSnRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsTmsShippingExtSnRepository.java new file mode 100644 index 0000000..0a0065b --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsTmsShippingExtSnRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsTmsShippingExtSn; +import org.springframework.stereotype.Repository; + +/** +* @Description : 装车单条码明细 +* @Reference : +* @author: qianhuasheng +* @date: 2019/9/19 14:22 +* @Modify: +*/ + +@Repository +public interface IWmsTmsShippingExtSnRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 17793d9..d07d0b9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -7,7 +7,101 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.base.util.StringUtil; -import cn.estsh.i3plus.pojo.wms.bean.*; +import cn.estsh.i3plus.pojo.wms.bean.BasCustomer; +import cn.estsh.i3plus.pojo.wms.bean.BasVendor; +import cn.estsh.i3plus.pojo.wms.bean.MesPpDetails; +import cn.estsh.i3plus.pojo.wms.bean.MesPpMaster; +import cn.estsh.i3plus.pojo.wms.bean.SwebProcurementPlanOrder; +import cn.estsh.i3plus.pojo.wms.bean.WareHouse; +import cn.estsh.i3plus.pojo.wms.bean.WmsASNMaster; +import cn.estsh.i3plus.pojo.wms.bean.WmsASNMasterDetails; +import cn.estsh.i3plus.pojo.wms.bean.WmsActionGroup; +import cn.estsh.i3plus.pojo.wms.bean.WmsActionGroupDetails; +import cn.estsh.i3plus.pojo.wms.bean.WmsActionLog; +import cn.estsh.i3plus.pojo.wms.bean.WmsActionLogData; +import cn.estsh.i3plus.pojo.wms.bean.WmsActionLogDetails; +import cn.estsh.i3plus.pojo.wms.bean.WmsActionModule; +import cn.estsh.i3plus.pojo.wms.bean.WmsActionModuleParam; +import cn.estsh.i3plus.pojo.wms.bean.WmsActionStep; +import cn.estsh.i3plus.pojo.wms.bean.WmsActionStepCall; +import cn.estsh.i3plus.pojo.wms.bean.WmsActionStepCallParam; +import cn.estsh.i3plus.pojo.wms.bean.WmsActionStepType; +import cn.estsh.i3plus.pojo.wms.bean.WmsAreaOwner; +import cn.estsh.i3plus.pojo.wms.bean.WmsBom; +import cn.estsh.i3plus.pojo.wms.bean.WmsBusiType; +import cn.estsh.i3plus.pojo.wms.bean.WmsCSFactTrans; +import cn.estsh.i3plus.pojo.wms.bean.WmsCSLocate; +import cn.estsh.i3plus.pojo.wms.bean.WmsCSOrderDetails; +import cn.estsh.i3plus.pojo.wms.bean.WmsCSOrderMaster; +import cn.estsh.i3plus.pojo.wms.bean.WmsCSPart; +import cn.estsh.i3plus.pojo.wms.bean.WmsCSRange; +import cn.estsh.i3plus.pojo.wms.bean.WmsCSZone; +import cn.estsh.i3plus.pojo.wms.bean.WmsCheckFactRecord; +import cn.estsh.i3plus.pojo.wms.bean.WmsConfig; +import cn.estsh.i3plus.pojo.wms.bean.WmsDataAuth; +import cn.estsh.i3plus.pojo.wms.bean.WmsDataMigrationConfig; +import cn.estsh.i3plus.pojo.wms.bean.WmsDocMovementDetails; +import cn.estsh.i3plus.pojo.wms.bean.WmsDocMovementMaster; +import cn.estsh.i3plus.pojo.wms.bean.WmsDocMovementSn; +import cn.estsh.i3plus.pojo.wms.bean.WmsFGInStock; +import cn.estsh.i3plus.pojo.wms.bean.WmsFix; +import cn.estsh.i3plus.pojo.wms.bean.WmsIbCheckPlan; +import cn.estsh.i3plus.pojo.wms.bean.WmsLineLocatePart; +import cn.estsh.i3plus.pojo.wms.bean.WmsLocate; +import cn.estsh.i3plus.pojo.wms.bean.WmsLocatePart; +import cn.estsh.i3plus.pojo.wms.bean.WmsMoveDetails; +import cn.estsh.i3plus.pojo.wms.bean.WmsMoveMaster; +import cn.estsh.i3plus.pojo.wms.bean.WmsMoveSn; +import cn.estsh.i3plus.pojo.wms.bean.WmsOpType; +import cn.estsh.i3plus.pojo.wms.bean.WmsPOMaster; +import cn.estsh.i3plus.pojo.wms.bean.WmsPOMasterDetails; +import cn.estsh.i3plus.pojo.wms.bean.WmsPackage; +import cn.estsh.i3plus.pojo.wms.bean.WmsPart; +import cn.estsh.i3plus.pojo.wms.bean.WmsPartGroup; +import cn.estsh.i3plus.pojo.wms.bean.WmsPartGroupDetails; +import cn.estsh.i3plus.pojo.wms.bean.WmsPartGroupRoute; +import cn.estsh.i3plus.pojo.wms.bean.WmsPartRelation; +import cn.estsh.i3plus.pojo.wms.bean.WmsPoSn; +import cn.estsh.i3plus.pojo.wms.bean.WmsPrinterConfigure; +import cn.estsh.i3plus.pojo.wms.bean.WmsPrintingQueue; +import cn.estsh.i3plus.pojo.wms.bean.WmsProdCfgType; +import cn.estsh.i3plus.pojo.wms.bean.WmsPullRule; +import cn.estsh.i3plus.pojo.wms.bean.WmsPullTaskDetails; +import cn.estsh.i3plus.pojo.wms.bean.WmsPullTaskMaster; +import cn.estsh.i3plus.pojo.wms.bean.WmsQCDetails; +import cn.estsh.i3plus.pojo.wms.bean.WmsQCMaster; +import cn.estsh.i3plus.pojo.wms.bean.WmsQCTrans; +import cn.estsh.i3plus.pojo.wms.bean.WmsRouting; +import cn.estsh.i3plus.pojo.wms.bean.WmsRoutingAssign; +import cn.estsh.i3plus.pojo.wms.bean.WmsRoutingDetail; +import cn.estsh.i3plus.pojo.wms.bean.WmsRoutingMaster; +import cn.estsh.i3plus.pojo.wms.bean.WmsRoutingRule; +import cn.estsh.i3plus.pojo.wms.bean.WmsShift; +import cn.estsh.i3plus.pojo.wms.bean.WmsShiftRest; +import cn.estsh.i3plus.pojo.wms.bean.WmsShipping; +import cn.estsh.i3plus.pojo.wms.bean.WmsShippingFlag; +import cn.estsh.i3plus.pojo.wms.bean.WmsSnOperateRecord; +import cn.estsh.i3plus.pojo.wms.bean.WmsSnPrint; +import cn.estsh.i3plus.pojo.wms.bean.WmsSnPrintRcd; +import cn.estsh.i3plus.pojo.wms.bean.WmsStockInitialize; +import cn.estsh.i3plus.pojo.wms.bean.WmsStockQuan; +import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn; +import cn.estsh.i3plus.pojo.wms.bean.WmsTaskCreateLog; +import cn.estsh.i3plus.pojo.wms.bean.WmsTaskDetails; +import cn.estsh.i3plus.pojo.wms.bean.WmsTaskInfo; +import cn.estsh.i3plus.pojo.wms.bean.WmsTaskSrc; +import cn.estsh.i3plus.pojo.wms.bean.WmsTempOrderLock; +import cn.estsh.i3plus.pojo.wms.bean.WmsTerminal; +import cn.estsh.i3plus.pojo.wms.bean.WmsTransModule; +import cn.estsh.i3plus.pojo.wms.bean.WmsTransQuan; +import cn.estsh.i3plus.pojo.wms.bean.WmsTransType; +import cn.estsh.i3plus.pojo.wms.bean.WmsTransportRule; +import cn.estsh.i3plus.pojo.wms.bean.WmsUnit; +import cn.estsh.i3plus.pojo.wms.bean.WmsUnitConvert; +import cn.estsh.i3plus.pojo.wms.bean.WmsVendorPart; +import cn.estsh.i3plus.pojo.wms.bean.WmsWaveRule; +import cn.estsh.i3plus.pojo.wms.bean.WmsZonePart; +import cn.estsh.i3plus.pojo.wms.bean.WmsZones; import cn.estsh.i3plus.pojo.wms.bean.dynamictable.WmsFieldInfo; import cn.estsh.i3plus.pojo.wms.bean.dynamictable.WmsSearchElementFunction; import cn.estsh.i3plus.pojo.wms.bean.plugin.BasPlugin; @@ -18,7 +112,11 @@ import com.alibaba.fastjson.JSONObject; import com.google.common.base.Strings; import org.apache.commons.lang3.StringUtils; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.stream.Collectors; /** @@ -2921,4 +3019,18 @@ public class WmsHqlPack { getStringBuilderPack(wmsTransportRule, result); return result; } + + /** + * 获取 DdlPackBean(三个基础) + * + * @param organizeCode + * @return + */ + public static DdlPackBean packHqlWms(String organizeCode) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + return result; + } } From 1caea6bf365229040ee1f3054d3ba8ba0d1ba9c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Tue, 14 Apr 2020 10:34:14 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E6=95=B0=E5=AD=97=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java index 1cb16f8..2e166b2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java @@ -43,7 +43,6 @@ public class AmpJisRec extends BaseBean { public String partNameRdd; @Column(name = "QTY", columnDefinition = "decimal(18,8) default 0", nullable = false) - @ColumnDefault("0") @ApiParam(value = "数量", example = "0") public Double qty; From 99e055da3ce1e08fa62bb4beebe7395ba09a168e Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Tue, 14 Apr 2020 10:46:02 +0800 Subject: [PATCH 4/4] =?UTF-8?q?[=E7=8E=B0=E5=9C=BA=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=9A111=20=E6=A3=80=E6=B5=8B=E9=A1=B9=E6=8A=A5=E8=A1=A8]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataModel.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataModel.java index e568519..b4f282e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataModel.java @@ -132,7 +132,7 @@ public class QcCheckDataModel { } public QcCheckDataModel(Long id, String organizeCode, String createUser, String createDatetime, String partNo, String workCenterCode - , String workCellCode, String partName, String modifyUser, String modifyDatetime, String startTime, String endTime) { + , String workCellCode, String partName, String modifyUser, String modifyDatetime, String startTime, String endTime, String orderNo) { this.id = id; this.organizeCode = organizeCode; this.createUser = createUser; @@ -145,6 +145,7 @@ public class QcCheckDataModel { this.modifyDatetime = modifyDatetime; this.startTime = startTime; this.endTime = endTime; + this.orderNo = orderNo; } public QcCheckDataModel(Long id, String organizeCode, String createUser, String createDatetime, Integer checkType) {