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

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

@@ -1588,7 +1588,7 @@ public class WmsEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PO_SN_STATUS {
 
-        fOUND(10, "创建"),
+        FOUND(10, "创建"),
         PRINTED(20, "已打印"),
         RECEIPTED(30, "已收货");
 
@@ -1695,4 +1695,40 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 条码类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SN_TYPE {
+        ONE_DIMENSIONAL_CODE(10, "一维码"),
+        QR_CODE(20, "二维码"),
+        ALL(30, "ALL");
+
+        private int value;
+        private String description;
+
+        SN_TYPE(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-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserMessage.java

@@ -27,7 +27,7 @@ import javax.persistence.Table;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Table(name="SYS_REF_USER_MESSAGE")
-@Api(value="关系-表达式与触发器",description = "关系-表达式与触发器")
+@Api(value="关系-用户消息",description = "关系-用户消息")
 public class SysRefUserMessage extends BaseBean {
 
     @Column(name="MESSAGE_ID")

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java

@@ -341,6 +341,22 @@ public class CoreHqlPack {
     }
 
     /**
+     * 查询字典值是否重复
+     * @param dictionary
+     * @return
+     */
+    public static String packHqlSysDictionaryValue(SysDictionary dictionary){
+        StringBuffer result = new StringBuffer();
+
+        // and
+        HqlPack.getStringEqualPack(dictionary.getDictionaryValue(),"dictionaryValue",result);
+        // not
+        HqlPack.getNumNOEqualPack(dictionary.getId(),"id",result);
+
+        return result.toString();
+    }
+
+    /**
      * 用户信息 复杂查询拼接
      * @param userInfo
      * @return

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

@@ -105,4 +105,8 @@ public class WmsASNMasterDetails extends BaseBean {
     @Column(name="VENDOR_LOT_NO")
     @ApiParam("供应商批次")
     public String vendorLotNo;
+
+    @Column(name="REC_QTY")
+    @ApiParam(value = "已收数量", example = "0")
+    public double recQty;
 }

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

@@ -8,6 +8,7 @@ import lombok.NoArgsConstructor;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * @Description : PDA传输到后台的实体bean对象
@@ -35,10 +36,10 @@ public class WmsActionResponseBean {
     public String message;
 
     @ApiParam("列表信息")
-    public List<String> informations;
+    public Set<String> informations;
 
     @ApiParam("可选项")
-    public List<String> options;
+    public Map<String, Boolean> options;
 
     @ApiParam("选中的明细数据")
     public List<Map<String, Object>> details;
@@ -51,7 +52,7 @@ public class WmsActionResponseBean {
         this.message = message;
     }
 
-    public WmsActionResponseBean(Double percent, String message, List<String> informations,  List<Map<String, Object>> details, Boolean codeStatus) {
+    public WmsActionResponseBean(Double percent, String message, Set<String> informations,  List<Map<String, Object>> details, Boolean codeStatus) {
         this.percent = percent;
         this.message = message;
         this.informations = informations;

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

@@ -50,4 +50,8 @@ public class WmsActionStepCall extends BaseBean {
 
     @ApiParam(value = "组件描述")
     public transient String amDesc;
+
+    @Column(name="AM_TYPE")
+    @ApiParam(value = "组件类型")
+    public transient Integer amType;
 }

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

@@ -70,4 +70,8 @@ public class WmsMoveSn extends BaseBean {
     @Column(name="PACKAGE_NO")
     @ApiParam("容器编号")
     public String packAgeNo;
+
+    @Column(name="QTY")
+    @ApiParam(value = "已收数量", example = "0")
+    public double qty;
 }

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

@@ -25,6 +25,12 @@ public class WmsOperationBean extends BaseBean {
     @ApiParam("可选项的值")
     public List<String> options;
 
+    @ApiParam("设备编号")
+    public String fixNo;
+
+    @ApiParam("作业记录编号")
+    public String alId;
+
     /**
      * 触发源:10=扫描枪,
      * 20=提交按钮,30=重置按钮,40=查看明细， 50=明细(删除)

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

@@ -75,4 +75,8 @@ public class WmsPoSn extends BaseBean {
     @Column(name="GROUP_NO")
     @ApiParam("组条码")
     public String groupNo;
+
+    @Column(name="REC_QTY")
+    @ApiParam(value = "已收数量", example = "0")
+    public double recQty;
 }

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

@@ -45,6 +45,6 @@ public class WmsTransType extends BaseBean {
     @Column(name = "PROG_CODE")
     @ApiParam(value = "处理程序", example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)
-    private Long progCode;
+    private Long agId;
 
 }

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

@@ -240,9 +240,9 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
 
         //查询参数封装
-        HqlPack.getStringLikerPack(wmsTransType.getTransTypeCode(), "transTypeCode", result);
+        HqlPack.getStringEqualPack(wmsTransType.getTransTypeCode(), "transTypeCode", result);
         HqlPack.getStringLikerPack(wmsTransType.getTransTypeName(), "transTypeName", result);
-        HqlPack.getStringLikerPack(wmsTransType.getProgCode(), "progCode", result);
+        HqlPack.getNumEqualPack(wmsTransType.getAgId(), "agId", result);
 
         getStringBuilderPack(wmsTransType, result);
 
@@ -1000,8 +1000,10 @@ public class WmsHqlPack {
         //查询参数封装
         HqlPack.getNumEqualPack(wmsActionStepCall.getAsId(), "asId", result);
         HqlPack.getNumEqualPack(wmsActionStepCall.getAmId(), "amId", result);
+        HqlPack.getNumEqualPack(wmsActionStepCall.getAmType(), "amType", result);
 
         getStringBuilderPack(wmsActionStepCall, result);
+
         HqlPack.getOrderByPack(new Object[]{1}, new String[]{"seq"}, result);
 
         return result.toString();
@@ -1116,6 +1118,7 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
 
         HqlPack.getNumEqualPack(wmsActionStepCallParam.getAgdId(), "agdId", result);
+        HqlPack.getNumEqualPack(wmsActionStepCallParam.getAmId(), "amId", result);
         HqlPack.getNumEqualPack(wmsActionStepCallParam.getSeq(), "seq", result);
         getStringBuilderPack(wmsActionStepCallParam, result);
 
@@ -1155,6 +1158,8 @@ public class WmsHqlPack {
 
         //作业流程id（对应作业记录明细里自增的id）
         HqlPack.getNumEqualPack(wmsActionLogDetails.getAlId(),"alId",result);
+        HqlPack.getNumEqualPack(wmsActionLogDetails.getSeq(),"seq",result);
+
         getStringBuilderPack(wmsActionLogDetails, result);
 
         return  result.toString();