Merge remote-tracking branch 'origin/ext-dev' into ext-dev

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java

@@ -238,6 +238,11 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
     }
 
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsImportModel.java

@@ -58,4 +58,6 @@ public class SparePartsImportModel {
     @ApiParam("用量")
     private Integer qty;
 
+    @ApiParam("生成次数")
+    private Integer time;
 }

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java

@@ -56,6 +56,9 @@ public class WmsActionResponseBean<Obj> implements Serializable {
     @ApiParam("可选项")
     public List<WmsOptionModel> options;
 
+    @ApiParam("任务编号")
+    public String taskNo;
+
     public List<WmsOptionModel> getOptions() {
         if (options == null) {
             options = new ArrayList<>();

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java

@@ -5,16 +5,10 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-import lombok.EqualsAndHashCode;
 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.Version;
+import javax.persistence.*;
 import java.io.Serializable;
 
 /**
@@ -71,4 +65,7 @@ public class PtlControl extends BaseBean implements Serializable {
     @ApiParam(value = "乐观锁", example = "1")
     public transient Integer lockVersion;
 
+    @Column(name = "BACKOFF")
+    @ApiParam("是否需要回调")
+    private Integer backoff;
 }

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

@@ -330,7 +330,7 @@ public class WmsPOMasterDetails extends BaseBean {
     }
 
     public WmsPOMasterDetails(String orderNo, String partNo, String partNameRdd, String planDate, String planTime,
-                              Double snp, Long totalBoxes, Double qty) {
+                              Double snp, Long totalBoxes, Double qty,Double recQty,String modifyDatetime) {
         this.orderNo = orderNo;
         this.partNo = partNo;
         this.partNameRdd = partNameRdd;
@@ -339,6 +339,8 @@ public class WmsPOMasterDetails extends BaseBean {
         this.snp = snp;
         this.totalBoxes = totalBoxes.intValue();
         this.qty = qty;
+        this.rcQty = recQty;
+        this.modifyDatetime = modifyDatetime;
     }
 
     public WmsPOMasterDetails(String orderNo, String erpSrcNo, Integer item,String partNo,String partNameRdd, Double qty,

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

@@ -309,6 +309,11 @@ public class WmsPart extends BaseBean {
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Double weight ;
 
+    @Column(name = "PRODUCT_PLACE")
+    @ApiParam(value = "产地", example = "0")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2)
+    private String productPlace ;
+
 
     public int getIqcVal() {
         return this.iqc == null ? 0 : this.iqc.intValue();

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

@@ -149,6 +149,21 @@ public class WmsStockSn extends BaseBean {
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String packageNo;
 
+    @Column(name = "CARTON_WEIGHT")
+    @ApiParam("箱重量")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
+    private Double cartonWeight;
+
+    @Column(name = "PACKAGE_WEIGHT")
+    @ApiParam("托盘重量")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
+    private Double packageWeight;
+
+    @Column(name = "PRODUCT_PLACE")
+    @ApiParam(value = "产地", example = "0")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2)
+    private String productPlace;
+
     @Column(name = "UNIT")
     @ApiParam(value = "单位")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
@@ -633,6 +648,15 @@ public class WmsStockSn extends BaseBean {
         return inputNCQty == null ? 0L : this.inputNCQty.doubleValue();
     }
 
+    public Double getCartonWeightVal() {
+        return this.cartonWeight == null ? 0 : this.cartonWeight;
+    }
+
+    public Double getPackageWeightVal() {
+        return this.packageWeight == null ? 0 : this.packageWeight;
+    }
+
+
     public WmsStockSn(Long snCount, Double sumPartQty, String locateNo) {
         this.snCount = snCount;
         this.sumPartQty = sumPartQty;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpFgDetailsSnapshot.java

@@ -64,4 +64,12 @@ public class WmsErpFgDetailsSnapshot extends BaseBean {
 
     @ApiParam("存储区")
     private String zoneNo;
+
+    public WmsErpFgDetailsSnapshot(String snapshotTime,String createDatetime){
+        this.snapshotTime = snapshotTime;
+        this.createDatetime = createDatetime;
+    }
+
+    public WmsErpFgDetailsSnapshot(){
+    }
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -566,6 +566,8 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringLikerPack(wmsZones.getZoneNo(), "zoneNo", result);
         //存储区名称
         DdlPreparedPack.getStringLikerPack(wmsZones.getZoneName(), "zoneName", result);
+        //是否字节点
+        DdlPreparedPack.getNumEqualPack(wmsZones.getIsSonNode(), "isSonNode", result);
 
         getStringBuilderPack(wmsZones, result);