Merge remote-tracking branch 'remotes/origin/dev' into test

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

@@ -3,6 +3,7 @@ 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 com.alibaba.fastjson.annotation.JSONField;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -158,11 +159,11 @@ public class WmsMoveDetails extends BaseBean {
 
     @Transient
     @ApiParam("父物料编码")
-    private String fPartNo;
+    private String fpartNo;
 
     @Transient
     @ApiParam("父物料名称")
-    private String fPartName;
+    private String fpartName;
 
     @Transient
     @ApiParam("数量")
@@ -172,6 +173,16 @@ public class WmsMoveDetails extends BaseBean {
     @ApiParam("创建时间")
     private String createDateTime;
 
+   /* @JSONField(name="fPartNo")
+    public String getfPartNo() {
+        return fPartNo;
+    }
+
+    @JSONField(name="fPartName")
+    public String getfPartName() {
+        return fPartName;
+    }*/
+
     public WmsMoveDetails(){}
 
     public WmsMoveDetails(String partNo, Long waitingCounts ,Long finishedCounts){
@@ -203,8 +214,8 @@ public class WmsMoveDetails extends BaseBean {
         this.partNo = partNo;
         this.partNameRdd = partNameRdd;
         this.workCenterCode = workCenterCode;
-        this.fPartNo = fPartNo;
-        this.fPartName = fPartName;
+        this.fpartNo = fPartNo;
+        this.fpartName = fPartName;
         this.unit = unit;
         this.qty = qty;
         this.createDateTime = createDateTime;

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

@@ -92,7 +92,7 @@ public class WmsPart extends BaseBean {
 
     @ColumnDefault("2")
     @Column(name = "IQC")
-    @ApiParam(value = "收货检验否", example = "1")
+    @ApiParam(value = "是否免检", example = "1")
     private Integer iqc;
 
     @Column(name = "MIN")

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

@@ -95,6 +95,11 @@ public class WmsZones extends BaseBean {
         this.zoneNo = zoneNo;
     }
 
+    public WmsZones(String zoneNo,String areaNo){
+        this.zoneNo = zoneNo;
+        this.areaNo = areaNo;
+    }
+
     public WmsZones(){}
 
 }

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

@@ -1305,6 +1305,10 @@ public class WmsHqlPack {
 
         //查询参数封装
         DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getOrderNo(), "orderNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getPartNo(), "partNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getLocateNo(), "locateNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getZoneNo(), "zoneNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getSn(), "sn", result);
 
         getStringBuilderPack(wmsCSOrderDetails, result);
 
@@ -1323,6 +1327,9 @@ public class WmsHqlPack {
         //查询参数封装
         DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getOrderNo(), "orderNo", result);
         DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getPartNo(), "partNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getLocateNo(), "locateNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getZoneNo(), "zoneNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getSn(), "sn", result);
 
         getStringBuilderPack(wmsCSFactTrans, result);