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

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java

@@ -41,12 +41,17 @@ public class Pager {
      */
     public Pager(int totalRows) {
         this.totalRows = totalRows;
-        totalPages = totalRows / pageSize;
+        if(pageSize != 0) {
-
+            totalPages = totalRows / pageSize;
-        int mod = totalRows % pageSize;
+
-        if (mod > 0) {
+            int mod = totalRows % pageSize;
-            totalPages++;
+            if (mod > 0) {
+                totalPages++;
+            }
+        }else{
+            totalPages = 0;
         }
+
         currentPage = 1;
         startRow = 0;
         resetEndRow();
@@ -56,12 +61,16 @@ public class Pager {
         this.totalRows = totalRows;
         this.pageSize = pageSize;
 
-        totalPages = totalRows / pageSize;
+        if(pageSize != 0) {
-
+            totalPages = totalRows / pageSize;
-        int mod = totalRows % pageSize;
+            int mod = totalRows % pageSize;
-        if (mod > 0) {
+            if (mod > 0) {
-            totalPages++;
+                totalPages++;
+            }
+        }else{
+            totalPages = 0;
         }
+
         currentPage = 1;
         startRow = 0;
         resetEndRow();

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

@@ -1446,7 +1446,8 @@ public class WmsEnumUtil {
     public enum ACTION_MOUDULE_PARAM_TYPE {
         CHECKLIST(1, "可选列表"),
         NUMBER(10, "数字"),
-        STRING(20, "字符串");
+        STRING(20, "字符串"),
+        OUT_OR_UNNECESSARY(30, "出参或者不必需的参数");
 
         private int value;
         private String description;
@@ -1553,7 +1554,8 @@ public class WmsEnumUtil {
         RESET(30, "重置按钮"),
         CHECK_DETAILS(40, "查看明细"),
         DELETE_DETAILS(50, "明细(删除)"),
-        CLEAR_DETAILS(60, "明细（清空）");
+        CLEAR_DETAILS(60, "明细（清空）"),
+        CUSTOM_BUTTON(70, "自定义按钮");
 
         private int value;
         private String description;
@@ -1837,5 +1839,36 @@ public class WmsEnumUtil {
         }
     }
 
+    /**
+     * 可选项类型枚举
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum OPTION_TYPE {
+        OPTIONS(10, "OPTIONS", "可选项"),
+        BUTTON(20, "BUTTON", "按钮");
+
+        private String code;
+        private String description;
+        int value;
+
+        OPTION_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
 
 }

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

@@ -17,4 +17,15 @@ public class OptionModel {
     private String name;
 
     private Integer value;
+
+    /**
+     * 10=复选框，20=按钮，显示到查看历史左侧
+     */
+    private Integer type;
+
+    /**
+     * 当Type=20时，此值代表需要跳转的步骤，前台要把此值放到
+     * OperationBean. barcode字段并反馈给后台，流程管家使用此值处理
+     */
+    private String content;
 }

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

@@ -73,5 +73,13 @@ public class WmsActionGroupDetails extends BaseBean {
     @ApiParam(value = "流程名称")
     private String agName;
 
+    @Column(name = "GOTO_BTN_CODE")
+    @ApiParam(value = "跳转按钮代码")
+    private String goToBtnCode;
+
+    @Column(name = "GOTO_BTN_NAME")
+    @ApiParam(value = "跳转按钮名称")
+    private String goToBtnName;
+
 
 }

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

@@ -101,6 +101,14 @@ public class WmsActionLogDetails extends BaseBean {
     @ApiParam(value = "结束执行时间")
     public String endTime;
 
+    @Column(name = "GOTO_BTN_CODE")
+    @ApiParam(value = "跳转按钮代码")
+    private String goToBtnCode;
+
+    @Column(name = "GOTO_BTN_NAME")
+    @ApiParam(value = "跳转按钮名称")
+    private String goToBtnName;
+
     public WmsActionLogDetails() {
 
     }

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

@@ -30,7 +30,7 @@ public class WmsActionResponseBean<Obj> {
     public Map<String, Obj> barCode;
 
     @ApiParam("进度")
-    public String percent ="0";
+    public String percent ="消息提示：";
 
     @ApiParam("当前步骤")
     public Integer currentStep;

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

@@ -41,7 +41,7 @@ public class WmsCSOrderMaster extends BaseBean {
     public Integer orderType;
 
     @Column(name="ORDER_STATUS")
-    @ApiParam(value = "状态", example = "1" )
+    @ApiParam(value = "状态 (1-创建 10-已冻结 20-盘点中  30-盘点完成  40-已解冻  50-已关闭)", example = "1" )
     public Integer orderStatus;
 
     @Column(name="ACTION_PERSENT")

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

@@ -122,4 +122,10 @@ public class WmsMoveDetails extends BaseBean {
         this.waitingCounts = waitingCounts;
         this.finishedCounts = finishedCounts;
     }
+
+    public WmsMoveDetails(String partNo, double qty ,double transQty){
+        this.partNo = partNo;
+        this.qty = qty;
+        this.transQty = transQty;
+    }
 }

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

@@ -68,7 +68,7 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
 
         //查询参数封装
-        HqlPack.getStringLikerPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result);
+        HqlPack.getStringEqualPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result);
 
         getStringBuilderPack(wmsDocMovementDetails, result);