From 1176053fe94c8c650295c2aa5aa82419e61f4d2b Mon Sep 17 00:00:00 2001 From: "yihang.lv" Date: Mon, 25 Mar 2019 15:42:08 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=A7=BB=E5=BA=93=E5=8D=95=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E8=A1=A8=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) 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 7276557..fe46746 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 @@ -1544,4 +1544,20 @@ public class WmsHqlPack { return result.toString(); } + /** + * 移库单订单条码表 分页查询 + * + * @param wmsDocMovementSn + * @return + */ + public static String packHqlWmsDocMovementSn(WmsDocMovementSn wmsDocMovementSn) { + StringBuffer result = new StringBuffer(); + HqlPack.getStringLikerPack(wmsDocMovementSn.getOrderNo(), "orderNo", result); + HqlPack.getStringLikerPack(wmsDocMovementSn.getPartNo(), "partNo", result); + HqlPack.getStringLikerPack(wmsDocMovementSn.getPartNameRdd(), "partNameRdd", result); + + getStringBuilderPack(wmsDocMovementSn, result); + + return result.toString(); + } } From f9a820dae4cfcb4a477cd570bb1d80af0675a6a6 Mon Sep 17 00:00:00 2001 From: "yihang.lv" Date: Mon, 25 Mar 2019 16:56:27 +0800 Subject: [PATCH 2/3] =?UTF-8?q?bean=20=E6=89=80=E6=9C=89QTY=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E9=BB=98=E8=AE=A4=E4=B8=BA0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java | 3 +++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 2 ++ .../cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 7 +++++++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java | 2 ++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 6 ++++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java | 5 +++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShopping.java | 2 ++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrintRcd.java | 2 ++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 9 +++++++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 2 ++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java | 2 ++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java | 9 +++++++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java | 3 +++ 19 files changed, 71 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java index 640d69e..ce33950 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.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,6 +42,7 @@ public class WmsASNMasterDetails extends BaseBean { public Integer item; @Column(name = "QTY") + @ColumnDefault("0") @ApiParam(value = "需求数量", example = "0") public Double qty; @@ -107,6 +109,7 @@ public class WmsASNMasterDetails extends BaseBean { public String vendorLotNo; @Column(name = "REC_QTY") + @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/WmsCSFactTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java index 96eb0b1..5d950d3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.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; @@ -57,6 +58,7 @@ public class WmsCSFactTrans extends BaseBean { public String sn; @Column(name="QTY") + @ColumnDefault("0") @ApiParam(value = "库存数量", example = "0") public Double qty; @@ -65,6 +67,7 @@ public class WmsCSFactTrans extends BaseBean { public String unit; @Column(name="FACT_QTY") + @ColumnDefault("0") @ApiParam(value = "实盘数量", example = "0") public Double factQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index a9391f9..411d07a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.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,6 +41,7 @@ public class WmsCSOrderDetails extends BaseBean { public Integer item; @Column(name = "QTY") + @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/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index ff54102..caaad9d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.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,6 +41,7 @@ public class WmsDocMovementDetails extends BaseBean { public Integer item; @Column(name = "QTY") + @ColumnDefault("0") @ApiParam(value = "需求数量", example = "0") public Double qty; @@ -76,6 +78,7 @@ public class WmsDocMovementDetails extends BaseBean { public String destLocateNo; @Column(name = "PRINT_QTY") + @ColumnDefault("0") @ApiParam(value = "条码打印数量", example = "1") private Double printQty; @@ -109,18 +112,22 @@ public class WmsDocMovementDetails extends BaseBean { private String remark; @Column(name = "PICK_QTY") + @ColumnDefault("0") @ApiParam(value = "已拣货数量", example = "1") private Double pickQty; @Column(name = "OUT_QTY") + @ColumnDefault("0") @ApiParam(value = "已出库数量", example = "1") private Double outQty; @Column(name = "REC_QTY") + @ColumnDefault("0") @ApiParam(value = "已收货数量", example = "1") private Double recQty; @Column(name = "MOVE_QTY") + @ColumnDefault("0") @ApiParam(value = "已移库数量", example = "1") private Double moveQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java index 0a1030e..1a0230a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.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,6 +47,7 @@ public class WmsDocMovementSn extends BaseBean { public String partNameRdd; @Column(name="QTY") + @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/WmsFGInStock.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java index 9be8adb..f720f6a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.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; @@ -45,6 +46,7 @@ public class WmsFGInStock extends BaseBean { public String partNameRdd; @Column(name="QTY") + @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/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index 2020250..4231c17 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 @@ -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; @@ -73,6 +74,7 @@ public class WmsMoveSn extends BaseBean { public String packAgeNo; @Column(name="SRC_QTY") + @ColumnDefault("0") @ApiParam(value = "源数量", example = "0") public Double srcQty; @@ -109,10 +111,12 @@ public class WmsMoveSn extends BaseBean { private Long finishedCounts; @Column(name="DEST_QTY") + @ColumnDefault("0") @ApiParam(value = "目标数量", example = "0") public Double destQty; @Column(name="QTY") + @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/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java index f65e744..364199b 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 @@ -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,6 +41,7 @@ public class WmsPOMasterDetails extends BaseBean { public Integer item; @Column(name = "QTY") + @ColumnDefault("0") @ApiParam(value = "需求数量", example = "0") public Double qty; @@ -52,18 +54,22 @@ public class WmsPOMasterDetails extends BaseBean { public String orderNo; @Column(name = "PRINT_QTY") + @ColumnDefault("0") @ApiParam(value = "条码打印数量", example = "0") public Double printQty; @Column(name = "RC_QTY") + @ColumnDefault("0") @ApiParam(value = "收货数量", example = "0") public Double rcQty; @Column(name = "PASS_QTY") + @ColumnDefault("0") @ApiParam(value = "质检合格数量", example = "0") public Double passQty; @Column(name = "NG_QTY") + @ColumnDefault("0") @ApiParam(value = "质检不合格数量", example = "0") public Double ngQty; 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 619f29a..9fdfdd0 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 @@ -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,6 +47,7 @@ public class WmsPoSn extends BaseBean { public String partNameRdd; @Column(name="QTY") + @ColumnDefault("0") @ApiParam(value = "数量", example = "0") public Double qty; @@ -78,6 +80,7 @@ public class WmsPoSn extends BaseBean { public String groupNo; @Column(name="REC_QTY") + @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/WmsQCDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java index 779e705..b7dd03a 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 @@ -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; @@ -41,6 +42,7 @@ public class WmsQCDetails extends BaseBean { public Integer item; @Column(name = "QTY") + @ColumnDefault("0") @ApiParam(value = "需求数量", example = "0") public Double qty; @@ -65,14 +67,17 @@ public class WmsQCDetails extends BaseBean { @Column(name = "FACT_QTY") + @ColumnDefault("0") @ApiParam(value = "实检数量", example = "0") public Double factQty; @Column(name = "PASS_QTY") + @ColumnDefault("0") @ApiParam(value = "合格数量", example = "0") public Double passQty; @Column(name = "REJECT_QTY") + @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/WmsShopping.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShopping.java index 9d9c2a2..429f415 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShopping.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShopping.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; @@ -42,6 +43,7 @@ public class WmsShopping extends BaseBean { public String partNameRdd; @Column(name="QTY") + @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/WmsSnPrintRcd.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrintRcd.java index d2fa686..0ab7b22 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrintRcd.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrintRcd.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; import org.springframework.format.annotation.DateTimeFormat; @@ -60,6 +61,7 @@ public class WmsSnPrintRcd extends BaseBean { private String unit; @Column(name = "QTY") + @ColumnDefault("0") @ApiParam(value = "数量", example = "0") private Double qty; 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 d34efd0..d10fe0b 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 @@ -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; @@ -57,34 +58,42 @@ public class WmsStockQuan extends BaseBean { private String custNo; @Column(name = "QTY") + @ColumnDefault("0") @ApiParam(value = "可用数量", example = "0") public Double qty; @Column(name = "FAIL_QTY") + @ColumnDefault("0") @ApiParam(value = "不合格数量", example = "0") private Double failQty; @Column(name = "HOLD_QTY") + @ColumnDefault("0") @ApiParam(value = "隔离数量", example = "0") private Double holdQty; @Column(name = "QC_QTY") + @ColumnDefault("0") @ApiParam(value = "质检中数量", example = "0") private Double qcQty; @Column(name = "RIN_QTY") + @ColumnDefault("0") @ApiParam(value = "待入库数量", example = "0") private Double rinQty; @Column(name = "FREEZE_QTY") + @ColumnDefault("0") @ApiParam(value = "冻结数量", example = "0") private Double freezeQty; @Column(name = "CONSIGN_QTY") + @ColumnDefault("0") @ApiParam(value = "寄售数量", example = "0") private Double consignQty; @Column(name = "LOCK_QTY") + @ColumnDefault("0") @ApiParam(value = "锁定数量", example = "0") private Double lockQty; } 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 6333860..33e4d70 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 @@ -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; import org.springframework.format.annotation.DateTimeFormat; @@ -96,6 +97,7 @@ public class WmsStockSn extends BaseBean { private String unit; @Column(name = "QTY") + @ColumnDefault("0") @ApiParam(value = "数量", example = "0") private Double qty; /** 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 34ab3f6..76f34f9 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 @@ -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; @@ -57,10 +58,12 @@ public class WmsTaskDetails extends BaseBean { private String vendorNo; @Column(name = "QTY") + @ColumnDefault("0") @ApiParam(value = "需求数量", example = "1") private Double qty; @Column(name = "TRANS_QTY") + @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/WmsTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java index 421e07e..52e7883 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 @@ -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; @@ -57,6 +58,7 @@ public class WmsTrans extends BaseBean{ private Integer transStatus; @Column(name="QTY") + @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 893a13b..7c4009d 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 @@ -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; @@ -93,34 +94,42 @@ public class WmsTransQuan extends BaseBean { private String errorMessage; @Column(name = "QTY") + @ColumnDefault("0") @ApiParam(value = "可用数量", example = "0") public Double qty; @Column(name = "FAIL_QTY") + @ColumnDefault("0") @ApiParam(value = "不合格数量", example = "0") private Double failQty; @Column(name = "HOLD_QTY") + @ColumnDefault("0") @ApiParam(value = "隔离数量", example = "0") private Double holdQty; @Column(name = "QC_QTY") + @ColumnDefault("0") @ApiParam(value = "质检中数量", example = "0") private Double qcQty; @Column(name = "RIN_QTY") + @ColumnDefault("0") @ApiParam(value = "待入库数量", example = "0") private Double rinQty; @Column(name = "FREEZE_QTY") + @ColumnDefault("0") @ApiParam(value = "冻结数量", example = "0") private Double freezeQty; @Column(name = "CONSIGN_QTY") + @ColumnDefault("0") @ApiParam(value = "寄售数量", example = "0") private Double consignQty; @Column(name = "LOCK_QTY") + @ColumnDefault("0") @ApiParam(value = "锁定数量", example = "0") private Double lockQty; } 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 6fd02b2..c74b56c 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 @@ -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; @@ -57,6 +58,7 @@ public class WmsTransRcd extends BaseBean{ private Integer transStatus; @Column(name="QTY") + @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 4a69c08..3adc50e 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 @@ -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; @@ -65,10 +66,12 @@ public class WmsTransSn extends BaseBean { public String transCode; @Column(name="QTY") + @ColumnDefault("0") @ApiParam(value = "交易数量", example = "0") public Double qty; @Column(name="REJECT_QTY") + @ColumnDefault("0") @ApiParam(value = "不合格交易数量", example = "0") public Double rejectQty; From 2cf97f8ed1a3c62aa392937f6b33fedb7fe3b4b1 Mon Sep 17 00:00:00 2001 From: "yihang.lv" Date: Mon, 25 Mar 2019 17:06:39 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=A7=BB=E5=BA=93=E5=8D=95=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=9D=A1=E7=A0=81=E8=A1=A8=20=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=20=E6=9D=A1=E4=BB=B6=E5=8E=BB=E6=8E=89=20par?= =?UTF-8?q?tNameRdd?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 1 - 1 file changed, 1 deletion(-) 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 fe46746..dcf9d94 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 @@ -1554,7 +1554,6 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); HqlPack.getStringLikerPack(wmsDocMovementSn.getOrderNo(), "orderNo", result); HqlPack.getStringLikerPack(wmsDocMovementSn.getPartNo(), "partNo", result); - HqlPack.getStringLikerPack(wmsDocMovementSn.getPartNameRdd(), "partNameRdd", result); getStringBuilderPack(wmsDocMovementSn, result);