Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java

@@ -52,15 +52,15 @@ public class SysParam extends BaseAPS {
 
     @Column(name="RECORD_RESULT")
     @ApiParam(value ="记录资源评估结果")
-    private Boolean recordResult;
+    private Boolean recordResult = false;
 
     @Column(name="SCHEDULE_RESULT")
     @ApiParam(value ="记录排程结果")
-    private Boolean scheduleResult;
+    private Boolean scheduleResult = false;
 
     @Column(name="SPLIT_BY_SHIFT")
     @ApiParam(value ="按班次分割下发的工作")
-    private Boolean splitByShift;
+    private Boolean splitByShift = true;
 
     @Column(name="RES_GANTT_LABEL")
     @ApiParam(value ="资源甘特图工作块显示标签")
@@ -68,5 +68,5 @@ public class SysParam extends BaseAPS {
 
     @Column(name="FOUR_FIRST_SUPPLY")
     @ApiParam(value ="是否牵纱补满模")
-    private Boolean fourFirstSupply;
+    private Boolean fourFirstSupply = false;
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java

@@ -1,7 +1,9 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -122,6 +124,11 @@ public class WmsCSFactTrans extends BaseBean {
     @ApiParam(value = "供应商编码")
     public String vendorNo;
 
+    @Column(name = "package_no")
+    @ApiParam(value = "包装编号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String packageNo;
+
     @Transient
     @AnnoOutputColumn(hidden = true)
     @ApiParam(value = "实盘箱数", example = "1")

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java

@@ -314,6 +314,11 @@ public class WmsPart extends BaseBean {
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2)
     private String productPlace ;
 
+    @Column(name = "STANDARD_BRACKET", columnDefinition = "decimal(18,8)")
+    @ApiParam(value = "标托", example = "1")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
+    private Double standardBracket;
+
 
     public int getIqcVal() {
         return this.iqc == null ? 0 : this.iqc.intValue();