修改实体数字字段默认值0，不允许为空

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;
 

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")

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() {

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;

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")

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;

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")

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;
 
 }

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;

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")

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;

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")

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;
 
 }

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;
 }

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;

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")

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;

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;
 

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;
 

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;

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;
 }

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;

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;

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;

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;

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")

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")

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(){

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;

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;
 
     /**