Merge branch 'dev' into test

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

@@ -717,7 +717,9 @@ public class WmsEnumUtil {
         OUTSTOCK("OUTSTOCK", "出库"),
         INSTOCK("INSTOCK", "入库"),
         MOVESTOCK("MOVESTOCK", "移库"),
-        CS("CS", "盘点");
+        CS("CS", "盘点"),
+        VDARC("VDARC", "VDA收货");
+
         private String value;
         private String description;
 
@@ -3339,4 +3341,57 @@ public class WmsEnumUtil {
         }
     }
 
+    /**
+     * 收货状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum REC_STATUS{
+        UNRECEIVED("UNRECEIVED", "未收货"),
+        COMPLETE_RECEIPT("COMPLETE_RECEIPT", "完成收货"),
+        PARTIAL_RECEIPT("PARTIAL_RECEIPT", "部分收货"),
+        OVER_RECEIVED_GOODS("OVER_RECEIVED_GOODS", "超量收货"),
+        OTHER("ELSE", "其他"),;
+
+        private String value;
+        private String description;
+
+        REC_STATUS(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return value;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+
+        public static String getDes(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(val) ) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -542,7 +542,7 @@ public class MesHqlPack {
      * @return
      */
     public static DdlPackBean getMesAction(MesAction mesAction) {
-        DdlPackBean packBean = getAllBaseDataByNormalPro(mesAction.getOrganizeCode());
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesAction, mesAction.getOrganizeCode());
         DdlPreparedPack.getStringRightLikerPack(mesAction.getActionCode(), "actionCode", packBean);
         DdlPreparedPack.getStringLikerPack(mesAction.getActionName(), "actionName", packBean);
         DdlPreparedPack.getNumEqualPack(mesAction.getActionType(), "actionType", packBean);
@@ -1182,4 +1182,17 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+    /**
+     * 系统业务动作
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesActionAllData(String organizeCode) {
+        DdlPackBean packBean = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
+        return packBean;
+    }
 }

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

@@ -41,6 +41,9 @@ public class WmsActionResponseBean<Obj> implements Serializable {
     @ApiParam("总步数")
     public int totalStep;
 
+    @ApiParam("错误提示信息")
+    public String errorMsg;
+
     @ApiParam("提示信息")
     public String message;
 
@@ -49,14 +52,16 @@ public class WmsActionResponseBean<Obj> implements Serializable {
 
     @ApiParam("可选项")
     public List<WmsOptionModel> options;
-    public List<WmsOptionModel> getOptions(){
-        if(options == null){
+
+    public List<WmsOptionModel> getOptions() {
+        if (options == null) {
             options = new ArrayList<>();
         }
         return options;
     }
-    public void setOptions(List<WmsOptionModel> opt){
-        if(opt == null){
+
+    public void setOptions(List<WmsOptionModel> opt) {
+        if (opt == null) {
             opt = new ArrayList<>();
         }
         options = opt;

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -41,6 +43,7 @@ public class WmsASNMaster extends BaseBean {
 
     @Column(name = "ASN_STATUS")
     @ApiParam(value = "状态", example = "0")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class,refForeignKey = "value",value = "description")
     public Integer asnStatus;
 
     @Column(name = "VENDOR_NO")
@@ -65,6 +68,7 @@ public class WmsASNMaster extends BaseBean {
 
     @Column(name = "IS_TASK")
     @ApiParam(value = "是否生产任务", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class,refForeignKey = "value",value = "description")
     public Integer isTask;
 
     @ApiParam("ASN详情列表")
@@ -129,7 +133,7 @@ public class WmsASNMaster extends BaseBean {
 
     @Transient
     @ApiParam("物料名称")
-    private String partNoNameRdd;
+    private String partNameRdd;
 
     @Transient
     @ApiParam("收货数量")
@@ -165,6 +169,7 @@ public class WmsASNMaster extends BaseBean {
 
     @Transient
     @ApiParam("收货状态")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.REC_STATUS.class,refForeignKey = "value",value = "description")
     private String recStatus;
 
     @Transient
@@ -173,7 +178,7 @@ public class WmsASNMaster extends BaseBean {
 
     public  WmsASNMaster(){}
 
-    public  WmsASNMaster(String orderNo,Integer asnStatus,String vendorNo,String partNo,String partNoNameRdd,
+    public  WmsASNMaster(String orderNo,Integer asnStatus,String vendorNo,String partNo,String partNameRdd,
                                        Double sumQty,Double sumRecQty,String planDate,String planTime,Double diffQty,String orderType,
                                        String recStatus){
 
@@ -181,7 +186,7 @@ public class WmsASNMaster extends BaseBean {
         this.asnStatus = asnStatus;
         this.vendorNo = vendorNo;
         this.partNo = partNo;
-        this.partNoNameRdd = partNoNameRdd;
+        this.partNameRdd = partNameRdd;
         this.sumQty = sumQty;
         this.sumRecQty = sumRecQty;
         this.planDate = planDate;