盘点pc端

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

@@ -2157,4 +2157,38 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 盘点物料 是否调差
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum CS_IS_ADJUST {
+        IS_ADJUST(1, "是调差"), ADJUST(2, "否调差");
+
+        private int value;
+        private String description;
+
+        CS_IS_ADJUST(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 }

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

@@ -29,6 +29,17 @@ import javax.persistence.Table;
 @Api("盘点实盘信息")
 public class WmsCSFactTrans extends BaseBean {
 
+    public WmsCSFactTrans(){}
+
+    public WmsCSFactTrans(Double factQty, String partNo){
+        if(factQty == null) {
+            this.factQty = 0d;
+        }else{
+            this.factQty = factQty;
+        }
+        this.partNo = partNo;
+    }
+
     @Column(name="ORDER_NO")
     @ApiParam("单号")
     public String orderNo;
@@ -81,11 +92,4 @@ public class WmsCSFactTrans extends BaseBean {
     @Column(name="REMARK")
     @ApiParam(value = "备注")
     public String reMark;
-
-    public WmsCSFactTrans(){}
-
-    public WmsCSFactTrans(double factQty, String partNo){
-        this.factQty = factQty;
-        this.partNo = partNo;
-    }
 }

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

@@ -95,11 +95,12 @@ public class WmsCSOrderDetails extends BaseBean {
     @ApiParam(value = "处理状态", example = "1")
     public Integer transStatus;
 
-    //虚拟字段（实盘数量、剩余数量）
     @Transient
+    @ApiParam(value = "实盘数量", example = "1")
     public Double factQty;
 
     @Transient
+    @ApiParam(value = "剩余数量", example = "1")
     public Double surplusQty;
 
     public Double getQty() {
@@ -108,8 +109,24 @@ public class WmsCSOrderDetails extends BaseBean {
 
     public WmsCSOrderDetails(){}
 
-    public WmsCSOrderDetails(double qty, String partNo){
+    public WmsCSOrderDetails(Double qty, String partNo,String orderNo,String whNo,String zoneNo,String locateNo,String partName){
         this.qty = qty;
         this.partNo = partNo;
+        this.orderNo = orderNo;
+        this.whNo = whNo;
+        this.zoneNo = zoneNo;
+        this.locateNo = locateNo;
+        this.partNameRdd = partName;
+    }
+
+    public WmsCSOrderDetails(Double qty, String partNo,String orderNo,String whNo,String zoneNo,String locateNo,String partName,String sn){
+        this.qty = qty;
+        this.partNo = partNo;
+        this.orderNo = orderNo;
+        this.whNo = whNo;
+        this.zoneNo = zoneNo;
+        this.locateNo = locateNo;
+        this.partNameRdd = partName;
+        this.sn = sn;
     }
 }

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

@@ -748,6 +748,7 @@ public class WmsHqlPack {
 
         HqlPack.getStringEqualPack(wmsCSPart.getOrderNo(), "orderNo", result);
         HqlPack.getStringEqualPack(wmsCSPart.getPartNo(), "partNo", result);
+        HqlPack.getNumEqualPack(wmsCSPart.getIsAdjust(), "isAdjust", result);
         HqlPack.getStringLikerPack(wmsCSPart.getPartNameRdd(), "partNameRdd", result);
 
         getStringBuilderPack(wmsCSPart, result);
@@ -1104,6 +1105,7 @@ public class WmsHqlPack {
 
         //查询参数封装
         HqlPack.getStringEqualPack(wmsCSFactTrans.getOrderNo(), "orderNo", result);
+        HqlPack.getStringEqualPack(wmsCSFactTrans.getPartNo(), "partNo", result);
 
         getStringBuilderPack(wmsCSFactTrans, result);