Jenkins自动合并

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

@@ -210,9 +210,6 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam("优先级")
     private Integer priority;
 
-    @Transient
-    @ApiParam("优先级描述")
-    private String priorityStr;
 
     public String getRecommondLot() {
         return recommondLot == null ? "无" : this.recommondLot;

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

@@ -62,6 +62,10 @@ public class WmsMoveDetails extends BaseBean {
     @ApiParam(value = "处理数量", example = "0")
     public Double transQty;
 
+    @Column(name = "HANDLED_QTY", columnDefinition = "decimal(18,8)")
+    @ApiParam(value = "已处理数量", example = "0")
+    public Double handledQty;
+
     public Double getTransQty() {
         return this.transQty == null ? 0 : this.transQty.doubleValue();
     }

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

@@ -124,14 +124,18 @@ public class WmsStockQuan extends BaseBean {
     private String prodCfgTypeName;
 
     @Transient
-    @ApiParam(value = "箱数", example = "-1")
+    @ApiParam(value = "箱数")
     private Integer boxQty;
 
     @Transient
-    @ApiParam(value = "零件数", example = "-1")
+    @ApiParam(value = "零件数")
     private Double partQty;
 
     @Transient
+    @ApiParam(value = "处理中数量")
+    private Double transQty;
+
+    @Transient
     @ApiParam(value = "ERP库存地")
     private String areaNo;
 
@@ -281,5 +285,6 @@ public class WmsStockQuan extends BaseBean {
         this.consignQty = consignQty;
         this.lockQty = lockQty;
         this.scrapQty = scrapQty;
+        this.totalQty = qty + failQty + holdQty + qcQty + rinQty + freezeQty + consignQty + lockQty + scrapQty;
     }
 }

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

@@ -1613,7 +1613,9 @@ public class WmsHqlPack {
         DdlPackBean result = new DdlPackBean();
         DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result);
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getOrganizeCode(), "organizeCode", result);
-        DdlPreparedPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result);
+        DdlPreparedPack.getOrderByPack(
+                new Object[]{CommonEnumUtil.FALSE, CommonEnumUtil.FALSE},
+                new String[]{"sn", "createDatetime"}, result);
         return result;
     }