合并代码

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

@@ -2853,4 +2853,39 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * PDA顶级菜单
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PDA_TOP_MENU {
+        RC("RC", "收货"),
+        QC("QC", "质检"),
+        PICK("PICK", "拣货"),
+        OUTSTOCK("OUTSTOCK", "出库"),
+        INSTOCK("INSTOCK", "入库"),
+        MOVESTOCK("MOVESTOCK", "移库"),
+        ASSIST("ASSIST", "辅助"),
+        NC("NC", "NC"),
+        CS("CS", "盘点");
+        private String value;
+        private String description;
+
+        PDA_TOP_MENU(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getCode() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+    }
 }

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

@@ -0,0 +1,20 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+import cn.estsh.i3plus.pojo.wms.bean.WmsMoveMaster;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description : JOB返回数据处理模型
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2019-07-03 15:50
+ * @Modify:
+ **/
+@Data
+public class WmsJOBModel implements Serializable {
+    private List<WmsMoveMasterModel> wmsMoveMasterModelList;
+    private String errorMessage;
+}

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

@@ -68,4 +68,8 @@ public class WmsTransType extends BaseBean {
     @Transient
     @ApiParam("菜单URL")
     private String menuUrl;
+
+    public String getMenuUrl() {
+        return "/handle?transCode=" + this.transTypeCode;
+    }
 }

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

@@ -118,7 +118,7 @@ public class WmsHqlPack {
         DdlPackBean packBean = new DdlPackBean();
 
         //查询参数封装
-        DdlPreparedPack.getStringRightLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", packBean);
+        DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", packBean);
         DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getMoveType(), "moveType", packBean);
         DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getBusiType(), "busiType", packBean);
         DdlPreparedPack.getStringEqualPack(wmsDocMovementMaster.getCustNo(), "custNo", packBean);
@@ -1014,6 +1014,8 @@ public class WmsHqlPack {
         DdlPackBean result = new DdlPackBean();
 
         DdlPreparedPack.getStringEqualPack(wmsMoveSn.getOrderNo(), "orderNo", result);
+        DdlPreparedPack.getNumEqualPack(wmsMoveSn.getItem(), "item", result);
+        DdlPreparedPack.getNumEqualPack(wmsMoveSn.getItemStatus(), "itemStatus", result);
         DdlPreparedPack.getStringEqualPack(wmsMoveSn.getSn(), "sn", result);
         DdlPreparedPack.getStringEqualPack(wmsMoveSn.getPartNo(), "partNo", result);
         DdlPreparedPack.getStringLikerPack(wmsMoveSn.getPartNameRdd(), "partNameRdd", result);