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

# Conflicts:
#	modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java
#	modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java
#	modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java

modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java

@@ -48,7 +48,7 @@ public class AndonManageQueue extends BaseBean {
 
     @Column(name = "ALARM_CODE")
     @ApiParam(value = "安灯类型")
-    @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "code",value = "description")
+    @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
     private String alarmCode;
 
     @Column(name = "ACTION_CODE")

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

@@ -17,12 +17,12 @@ public class BlockSoftSwitchEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum CASE_TYPE{
-        SOCKET(1,"SOCKET"),
+        SOCKET(10,"SOCKET"),
-        RESTFUL(2,"RESTFUL"),
+        RESTFUL(20,"RESTFUL"),
-        DATASOURCE(3,"数据源"),
+        DATASOURCE(30,"数据源"),
-        WEBSERVICE(4,"WebService"),
+        WEBSERVICE(40,"WebService"),
-        MQ(5,"消息队列"),
+        MQ(50,"消息队列"),
-        WebSocket(6,"WebSocket");
+        WebSocket(60,"WebSocket");
 
         private int value;
         private String description;
@@ -67,7 +67,8 @@ public class BlockSoftSwitchEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum REQUEST_SOURCE{
         ACTIVE(1,"主动请求"),
-        SCHEDULE(2,"定时调度");
+        SCHEDULE(2,"定时调度"),
+        RABBITMQ(3,"MQ 调用");
 
         private int value;
         private String description;
@@ -244,7 +245,7 @@ public class BlockSoftSwitchEnumUtil {
             return tmp;
         }
 
-        public static DATA_SOURCE_TYPE valueOf(int val) {
+        public static BlockSoftSwitchEnumUtil.DATA_SOURCE_TYPE valueOf(int val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
                 if (values()[i].value == val) {
@@ -277,7 +278,7 @@ public class BlockSoftSwitchEnumUtil {
             return null;
         }
 
-        public static DATA_SOURCE_TYPE getDataSourceURL(String databaseProductName){
+        public static BlockSoftSwitchEnumUtil.DATA_SOURCE_TYPE getDataSourceURL(String databaseProductName){
             if(StringUtils.isNotBlank(databaseProductName)){
                 if(databaseProductName.indexOf(":mysql:") != -1){
                     return SOURCE_MARIA_DB;
@@ -314,11 +315,11 @@ public class BlockSoftSwitchEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PARAM_VALUE_TYPE{
-        NUM(1,"数字"),
+        NUM(10,"数字"),
-        STRING(2,"字符串"),
+        STRING(20,"字符串"),
-        BOOLEAN(3,"布尔"),
+        BOOLEAN(30,"布尔"),
-        MAP(4,"字典"),
+        MAP(40,"字典"),
-        LIST(5,"列表");
+        LIST(50,"列表");
 
         private int value;
         private String description;
@@ -388,8 +389,8 @@ public class BlockSoftSwitchEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum SUIT_MODE{
-        ACTIVE(1,"主动"),
+        ACTIVE(1,"客户端"),
-        PASSIVE(2,"被动");
+        PASSIVE(2,"服务端");
 
         private int value;
         private String description;
@@ -488,4 +489,41 @@ public class BlockSoftSwitchEnumUtil {
         }
     }
 
+    /**
+     * 适配方式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SUIT_SERVER_WEB_SERVICE{
+        ACTIVE(40001,"serverWebServiceHello","hello"),
+        SCHEDULE(40002,"serverWebServiceSendEmail","邮件测试");
+
+        private int value;
+        private String description;
+        private String clazzName;
+
+        SUIT_SERVER_WEB_SERVICE(int value, String clazzName,String description) {
+            this.value = value;
+            this.clazzName = clazzName;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(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-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-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java

@@ -79,6 +79,10 @@ public class BfElement extends BaseBean {
     @ApiParam(value = "是否删除")
     private Integer isObjectDel;
 
+    @Column(name = "IS_OBJECT_EXPORT")
+    @ApiParam(value = "是否导出")
+    private Integer isObjectExport;
+
     @Column(name="ELEMENT_SORT_ATTR_ID")
     @ApiParam(value ="默认排序属性")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java

@@ -136,7 +136,7 @@ public class BfElementProperty extends BaseBean {
     @AnnoOutputColumn(hidden = true)
     private BfDataObjectProperty objectProperty;
 
-    public Object getFormValue() {
+//    public Object getFormValue() {
-        return propertyFormValue;
+//        return propertyFormValue == null ? propertyDefaultValue : propertyFormValue;
-    }
+//    }
 }

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java

@@ -77,10 +77,6 @@ public class MesPcnTask extends BaseBean {
     @ApiParam("任务周期描述")
     private String taskCycleDescription;
 
-    @Column(name="TASK_STATUS")
-    @ApiParam("任务状态")
-    private Integer taskStatus;
-
     @Column(name="TASK_PARAM")
     @ApiParam("任务参数")
     private String taskParam;
@@ -89,7 +85,4 @@ public class MesPcnTask extends BaseBean {
         return this.taskType == null ? 0 : this.taskType;
     }
 
-    public int getTaskStatusVal() {
-        return this.taskStatus == null ? 0 : this.taskStatus;
-    }
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java

@@ -77,10 +77,6 @@ public class MesPcnTask extends BaseBean {
     @ApiParam("任务周期描述")
     private String taskCycleDescription;
 
-    @Column(name="TASK_STATUS")
-    @ApiParam("任务状态")
-    private Integer taskStatus;
-
     @Column(name="TASK_PARAM")
     @ApiParam("任务参数")
     private String taskParam;
@@ -89,7 +85,4 @@ public class MesPcnTask extends BaseBean {
         return this.taskType == null ? 0 : this.taskType;
     }
 
-    public int getTaskStatusVal() {
-        return this.taskStatus == null ? 0 : this.taskStatus;
-    }
 }

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);
@@ -1161,9 +1161,6 @@ public class MesHqlPack {
         DdlPackBean packBean = getAllBaseDataByNormalPro(mesPcnTask, organizeCode);
         DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskCode(), "taskCode", packBean);
         DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskName(), "taskName", packBean);
-        if (null != mesPcnTask.getTaskStatus()) {
-            DdlPreparedPack.getNumEqualPack(mesPcnTask.getTaskStatus(), "taskStatus", packBean);
-        }
         packBean.setOrderByStr(mesPcnTask.orderBy());
         return packBean;
     }
@@ -1185,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/softswitch/BsSuitCaseModel.java

@@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.softswitch.bean.BsSocketSuitCase;
 import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCase;
 import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseDataSource;
+import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseWebService;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
@@ -21,11 +22,14 @@ import javax.persistence.Transient;
 public class BsSuitCaseModel {
 
     @ApiParam(value = "适配器")
-    BsSuitCase bsSuitCase;
+    private BsSuitCase bsSuitCase;
 
     @ApiParam(value = "数据源适配套件")
-    BsSuitCaseDataSource bsDataSourceSuitCase;
+    private BsSuitCaseDataSource bsDataSourceSuitCase;
 
     @ApiParam(value = "socket适配套件")
-    BsSocketSuitCase bsSocketSuitCase;
+    private BsSocketSuitCase bsSocketSuitCase;
+    @ApiParam(value = "Web Service 适配套件")
+    private BsSuitCaseWebService webService;
+
 }

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/DataSwitchModel.java

@@ -1,26 +1,26 @@
-package cn.estsh.i3plus.pojo.model.softswitch;
+//package cn.estsh.i3plus.pojo.model.softswitch;
-
+//
-import java.util.List;
+//import java.util.List;
-import java.util.Map;
+//import java.util.Map;
-
+//
-/**
+///**
- * @Description : 数据模型转换对象
+// * @Description : 数据模型转换对象
- * @Reference :
+// * @Reference :
- * @Author : alwaysfrin
+// * @Author : alwaysfrin
- * @CreateDate : 2019-04-29 11:11
+// * @CreateDate : 2019-04-29 11:11
- * @Modify:
+// * @Modify:
- **/
+// **/
-public class DataSwitchModel {
+//public class DataSwitchModel {
-
+//
-    private String stringVal;
+//    private String stringVal;
-
+//
-    private Long longVal;
+//    private Long longVal;
-
+//
-    private Double doubleVal;
+//    private Double doubleVal;
-
+//
-    private List<?> listVal;
+//    private List<?> listVal;
-
+//
-    private Map<String,?> mapVal;
+//    private Map<String,?> mapVal;
-
+//
-    private Object[] arrayVal;
+//    private Object[] arrayVal;
-}
+//}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/PojoAuth.java

@@ -1,50 +1,50 @@
-package cn.estsh.i3plus.pojo.model.softswitch;
+//package cn.estsh.i3plus.pojo.model.softswitch;
-
+//
-import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA;
+//import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA;
-import com.thoughtworks.xstream.annotations.XStreamAlias;
+//import com.thoughtworks.xstream.annotations.XStreamAlias;
-import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
+//import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
-import com.thoughtworks.xstream.annotations.XStreamImplicit;
+//import com.thoughtworks.xstream.annotations.XStreamImplicit;
-import lombok.Data;
+//import lombok.Data;
-
+//
-import java.util.List;
+//import java.util.List;
-import java.util.Map;
+//import java.util.Map;
-
+//
-/**
+///**
- * @Description :
+// * @Description :
- * @Reference :
+// * @Reference :
- * @Author : wei.peng
+// * @Author : wei.peng
- * @CreateDate : 19-7-25 下午3:31
+// * @CreateDate : 19-7-25 下午3:31
- * @Modify:
+// * @Modify:
- **/
+// **/
-@Data
+//@Data
-@XStreamAlias("auth")
+//@XStreamAlias("auth")
-public class PojoAuth{
+//public class PojoAuth{
-
+//
-    @XStreamAsAttribute
+//    @XStreamAsAttribute
-    private Long id;
+//    private Long id;
-    @XStreamAsAttribute
+//    @XStreamAsAttribute
-    private Integer authType;
+//    private Integer authType;
-
+//
-    @XStreamImplicit
+//    @XStreamImplicit
-    private List<Prop> params;
+//    private List<Prop> params;
-
+//
-    private String authPath;
+//    private String authPath;
-    private String userName ="登录名称";
+//    private String userName ="登录名称";
-    private String password ="登录名称";
+//    private String password ="登录名称";
-    private String languageCode ="登录名称";
+//    private String languageCode ="登录名称";
-
+//
-    // 认证令牌
+//    // 认证令牌
-    private String token;
+//    private String token;
-//    // 认证令牌集合(复杂认证令牌)
+////    // 认证令牌集合(复杂认证令牌)
-//    private List<Prop> tokenList;
+////    private List<Prop> tokenList;
-    // 原始认证数据
+//    // 原始认证数据
-    @XStreamCDATA
+//    @XStreamCDATA
-    private String result;
+//    private String result;
-
+//
-    public PojoAuth(Long id, Integer authType,String authPath, List<Prop> params) {
+//    public PojoAuth(Long id, Integer authType,String authPath, List<Prop> params) {
-        this.id = id;
+//        this.id = id;
-        this.authType = authType;
+//        this.authType = authType;
-        this.authPath = authPath;
+//        this.authPath = authPath;
-        this.params = params;
+//        this.params = params;
-    }
+//    }
-}
+//}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/Prop.java

@@ -1,28 +1,28 @@
-package cn.estsh.i3plus.pojo.model.softswitch;
+//package cn.estsh.i3plus.pojo.model.softswitch;
-
+//
-import com.thoughtworks.xstream.annotations.XStreamAlias;
+//import com.thoughtworks.xstream.annotations.XStreamAlias;
-import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
+//import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
-import lombok.Data;
+//import lombok.Data;
-
+//
-/**
+///**
- * @Description :
+// * @Description :
- * @Reference :
+// * @Reference :
- * @Author : wei.peng
+// * @Author : wei.peng
- * @CreateDate : 19-7-25 下午5:18
+// * @CreateDate : 19-7-25 下午5:18
- * @Modify:
+// * @Modify:
- **/
+// **/
-@Data
+//@Data
-@XStreamAlias("prop")
+//@XStreamAlias("prop")
-public class Prop {
+//public class Prop {
-
+//
-    @XStreamAsAttribute
+//    @XStreamAsAttribute
-    private Long id;
+//    private Long id;
-    private String paramName;
+//    private String paramName;
-    private String paramValue;
+//    private String paramValue;
-
+//
-    public Prop(Long id, String paramName, String paramValue) {
+//    public Prop(Long id, String paramName, String paramValue) {
-        this.id = id;
+//        this.id = id;
-        this.paramName = paramName;
+//        this.paramName = paramName;
-        this.paramValue = paramValue;
+//        this.paramValue = paramValue;
-    }
+//    }
-}
+//}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/Request.java

@@ -1,33 +1,33 @@
-package cn.estsh.i3plus.pojo.model.softswitch;
+//package cn.estsh.i3plus.pojo.model.softswitch;
-
+//
-import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA;
+//import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA;
-import com.thoughtworks.xstream.annotations.XStreamAlias;
+//import com.thoughtworks.xstream.annotations.XStreamAlias;
-import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
+//import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
-import lombok.Data;
+//import lombok.Data;
-
+//
-/**
+///**
- * @Description :
+// * @Description :
- * @Reference :
+// * @Reference :
- * @Author : wei.peng
+// * @Author : wei.peng
- * @CreateDate : 19-7-25 下午3:31
+// * @CreateDate : 19-7-25 下午3:31
- * @Modify:
+// * @Modify:
- **/
+// **/
-@Data
+//@Data
-@XStreamAlias("request")
+//@XStreamAlias("request")
-public class Request{
+//public class Request{
-
+//
-    @XStreamAsAttribute
+//    @XStreamAsAttribute
-    private Long id;
+//    private Long id;
-    @XStreamAsAttribute
+//    @XStreamAsAttribute
-    private Integer requestType;
+//    private Integer requestType;
-    private String requestPath;
+//    private String requestPath;
-
+//
-    @XStreamCDATA
+//    @XStreamCDATA
-    private String result;
+//    private String result;
-
+//
-    public Request(Long id, Integer requestType,String requestPath) {
+//    public Request(Long id, Integer requestType,String requestPath) {
-        this.id = id;
+//        this.id = id;
-        this.requestType = requestType;
+//        this.requestType = requestType;
-        this.requestPath = requestPath;
+//        this.requestPath = requestPath;
-    }
+//    }
-}
+//}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java

@@ -0,0 +1,35 @@
+package cn.estsh.i3plus.pojo.model.softswitch;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 19-9-5 下午7:30
+ * @Modify:
+ **/
+@Data
+@XStreamAlias("model")
+public class SuitServerModel {
+
+    // 执行方法命令
+    private String action;
+    // 执行类型固定类型(SoftSwitchEnumUtil.CASE_TYPE)
+    private Integer caseType;
+    /* 认证使用 以后使用 */
+    private String token;
+    // 传输单对象
+    private Object obj;
+    // 传输集合
+    private List list;
+    // 传输键值对
+    private Map<String,Object> map;
+    // 传输 JSON 数据
+    private String json;
+
+}

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java

@@ -63,9 +63,9 @@ public class BsSuitCase extends BaseBean {
         return suitTypeId.longValue();
     }
 
-    @Column(name = "SUIT_TYPE_NAME")
+    @Column(name = "SUIT_TYPE_NAME_RDD")
     @ApiParam(value = "适配类型名称")
-    private String suitTypeName;
+    private String suitTypeNameRdd;
 
     @Column(name = "SUIT_CASE_CODE")
     @ApiParam(value = "适配器代码")
@@ -75,6 +75,10 @@ public class BsSuitCase extends BaseBean {
     @ApiParam(value = "适配模式(枚举,主动，被动)")
     private Integer suitModeId;
 
+    @Column(name = "SUIT_SERVER_ACTION_ID")
+    @ApiParam(value = "Server 适配命令")
+    private Integer suitServerActionId;
+
     @Column(name = "SUIT_CASE_HOST")
     @ApiParam(value = "适配主机")
     private String suitCaseHost;
@@ -137,3 +141,4 @@ public class BsSuitCase extends BaseBean {
     private List<BsParamAdapter> bsOutParamAdapterList;
 }
 
+

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseWebService.java

@@ -0,0 +1,46 @@
+package cn.estsh.i3plus.pojo.softswitch.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :   WebService 适配套件
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 2019/9/9 上午11:09
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "BS_SUIT_CASE_WEB_SERVICE")
+@Api(value = "WebService", description = "WebService 适配套件")
+public class BsSuitCaseWebService extends BaseBean {
+
+    @Column(name = "SUIT_CASE_ID")
+    @ApiParam(value = "套件id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long suitCaseId;
+
+    @Column(name = "SERVICE_TAG_NAME")
+    @ApiParam(value = "Service Tag Name(包名称)")
+    private String serviceTagName;
+
+    @Column(name = "SERVICE_FUNCTION_NAME")
+    @ApiParam(value = "Service Function Name(方法名称)")
+    private String serviceFunctionName;
+
+}

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseWebServiceRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.softswitch.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseWebService;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 2019/9/9 上午11:41
+ * @Modify:
+ **/
+public interface BsSuitCaseWebServiceRepository extends BaseRepository<BsSuitCaseWebService,Long> {
+}

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java

@@ -47,7 +47,7 @@ public class SoftSwitchHqlPack {
      * @return
      */
     public static DdlPackBean packHqlBsSuitCaseParam(BsSuitCaseParam bsSuitCaseParam){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getStringLikerPack(bsSuitCaseParam.getParamName(),"paramName",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitCaseParam.getParamTypeId(), "paramTypeId", ddlPackBean);
@@ -65,7 +65,7 @@ public class SoftSwitchHqlPack {
      * @return
      */
     public static DdlPackBean packHqlCheckBsSuitCaseParamOnly(BsSuitCaseParam bsSuitCaseParam){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getNumNOEqualPack(bsSuitCaseParam.getId(),"id",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitCaseParam.getSuitCaseId(), "suitCaseId", ddlPackBean);
@@ -80,7 +80,7 @@ public class SoftSwitchHqlPack {
      * @return
      */
     public static DdlPackBean packHqlBsSuitCaseParam(BsSuitCase bsSuitCase){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getStringLikerPack(bsSuitCase.getSuitCaseName(),"suitCaseName",ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bsSuitCase.getSuitCaseCode(),"suitCaseCode",ddlPackBean);
@@ -98,7 +98,7 @@ public class SoftSwitchHqlPack {
      * @return
      */
     public static DdlPackBean packHqlCheckBsSuitCaseOnly(BsSuitCase bsSuitCase){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getNumNOEqualPack(bsSuitCase.getId(),"id",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitCase.getSuitCaseCode(), "suitCaseCode", ddlPackBean);
@@ -112,7 +112,7 @@ public class SoftSwitchHqlPack {
      * @return
      */
     public static DdlPackBean packHqlBsParamAdapter(BsParamAdapter bsParamAdapter){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getNumEqualPack(bsParamAdapter.getSuitCaseId(),"suitCaseId",ddlPackBean);
         DdlPreparedPack.getStringEqualPack(bsParamAdapter.getSuitCaseCode(),"suitCaseCode",ddlPackBean);
@@ -130,7 +130,7 @@ public class SoftSwitchHqlPack {
      * @return
      */
     public static DdlPackBean packHqlCheckBsParamAdapterOnly(BsParamAdapter bsParamAdapter){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getNumEqualPack(bsParamAdapter.getId(), "id", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsParamAdapter.getSuitCaseId(), "suitCaseId", ddlPackBean);
@@ -146,7 +146,7 @@ public class SoftSwitchHqlPack {
      * @return
      */
     public static DdlPackBean packHqlBsSuitSchedule(BsSuitSchedule bsSuitSchedule){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getStringLikerPack(bsSuitSchedule.getScheduleName(),"scheduleName",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitSchedule.getSuitCaseId(),"suitCaseId",ddlPackBean);
@@ -164,7 +164,7 @@ public class SoftSwitchHqlPack {
      * @return
      */
     public static DdlPackBean packHqlCheckBsSuitScheduleOnly(BsSuitSchedule bsSuitSchedule){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getNumEqualPack(bsSuitSchedule.getId(),"id",ddlPackBean);
         DdlPreparedPack.getStringEqualPack(bsSuitSchedule.getScheduleName(),"scheduleName",ddlPackBean);
@@ -179,7 +179,7 @@ public class SoftSwitchHqlPack {
      * @return
      */
     public static DdlPackBean packHqlBsSslKey(BsSslKey bsSslKey){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getStringEqualPack(bsSslKey.getKeyName(),"keyName",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSslKey.getKeyTypeId(),"keyTypeId",ddlPackBean);
@@ -195,7 +195,7 @@ public class SoftSwitchHqlPack {
      * @return
      */
     public static DdlPackBean packHqlCheckBsSslKeyOnly(BsSslKey bsSslKey){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getNumEqualPack(bsSslKey.getId(),"id",ddlPackBean);
         DdlPreparedPack.getStringEqualPack(bsSslKey.getKeyName(), "keyName", ddlPackBean);
@@ -209,7 +209,7 @@ public class SoftSwitchHqlPack {
      * @return
      */
     public static DdlPackBean packHqlBsSslKeyParam(BsSslKeyParam bsSslKeyParam){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getNumEqualPack(bsSslKeyParam.getSslKeyId(), "sslKeyId", ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bsSslKeyParam.getParamName(), "paramName", ddlPackBean);
@@ -225,7 +225,7 @@ public class SoftSwitchHqlPack {
      * @return
      */
     public static DdlPackBean packHqlCheckBsSslKeyParamOnly(BsSslKeyParam bsSslKeyParam){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getNumEqualPack(bsSslKeyParam.getSslKeyId(), "sslKeyId", ddlPackBean);
         DdlPreparedPack.getStringEqualPack(bsSslKeyParam.getParamName(), "paramName", ddlPackBean);
@@ -239,7 +239,7 @@ public class SoftSwitchHqlPack {
      * @return
      */
     public static DdlPackBean packHqlBsDataSource(BsDataSource bsDataSource){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getStringLikerPack(bsDataSource.getDataSourceName(), "dataSourceName", ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bsDataSource.getDataSourceCode(), "dataSourceCode", ddlPackBean);
@@ -257,7 +257,7 @@ public class SoftSwitchHqlPack {
      * @return
      */
     public static DdlPackBean packHqlCheckBsDataSourceOnly(BsDataSource bsDataSource){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getNumEqualPack(bsDataSource.getId(), "id", ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bsDataSource.getDataSourceCode(), "dataSourceCode", ddlPackBean);
@@ -294,4 +294,14 @@ public class SoftSwitchHqlPack {
         return ddlPackBean;
     }
 
+    /**
+     * WebService 唯一校验
+     * @param webService
+     * @return
+     */
+    public static DdlPackBean packHqlCheckWebService(BsSuitCaseWebService webService){
+        DdlPackBean result = DdlPackBean.getDdlPackBean();
+
+        return result;
+    }
 }

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详情列表")
@@ -122,4 +126,75 @@ public class WmsASNMaster extends BaseBean {
     @Transient
     @ApiParam("手机")
     private String vendorPhone;
+
+    @Transient
+    @ApiParam("物料代码")
+    private String partNo;
+
+    @Transient
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @Transient
+    @ApiParam("收货数量")
+    private Double sumRecQty;
+
+    @Transient
+    @ApiParam("需求数量")
+    private Double sumQty;
+
+    @Transient
+    @ApiParam("计划日期")
+    private String planDate;
+
+    @Transient
+    @ApiParam("计划日期开始")
+    private String planDateStart;
+
+    @Transient
+    @ApiParam("计划日期结束")
+    private String planDateEnd;
+
+    @Transient
+    @ApiParam("计划时间")
+    private String planTime;
+
+    @Transient
+    @ApiParam("差异数量")
+    private Double diffQty;
+
+    @Transient
+    @ApiParam("单据类型") // PO/ASN
+    private String orderType;
+
+    @Transient
+    @ApiParam("收货状态")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.REC_STATUS.class,refForeignKey = "value",value = "description")
+    private String recStatus;
+
+    @Transient
+    @ApiParam("项目代码")
+    private String prodCfgTypeCode;
+
+    public  WmsASNMaster(){}
+
+    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){
+
+        this.orderNo = orderNo;
+        this.asnStatus = asnStatus;
+        this.vendorNo = vendorNo;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.sumQty = sumQty;
+        this.sumRecQty = sumRecQty;
+        this.planDate = planDate;
+        this.planTime = planTime;
+        this.diffQty = diffQty;
+        this.orderType = orderType;
+        this.recStatus = recStatus;
+    }
+
+
 }

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

@@ -116,7 +116,7 @@ public class WmsCSFactTrans extends BaseBean {
     public Double sumPartQty;
 
     @Transient
-    @ApiParam("存储区编号")
+    @ApiParam("存储区编号组")
     public String[] zoneNos;
 
     public WmsCSFactTrans(){}

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

@@ -3,7 +3,6 @@ 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 com.alibaba.fastjson.annotation.JSONField;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -174,6 +173,10 @@ public class WmsMoveDetails extends BaseBean {
     @ApiParam("创建时间")
     private String createDateTime;
 
+    @Version
+    @Column(name = "LOCK_VERSION")
+    @ApiParam(value = "乐观锁", example = "1")
+    public  Integer lockVersion;
    /* @JSONField(name="fPartNo")
     public String getfPartNo() {
         return fPartNo;

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

@@ -144,6 +144,11 @@ public class WmsMoveMaster extends BaseBean {
     @ApiParam(value = "设备编号")
     public String fixId;
 
+    @Version
+    @Column(name = "LOCK_VERSION")
+    @ApiParam(value = "乐观锁", example = "1")
+    public  Integer lockVersion;
+
     public WmsMoveMaster(){};
 
     public WmsMoveMaster(String orderNo, Integer orderStatus,  String transTypeCode, String errorMessage,

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

@@ -183,7 +183,13 @@ public class WmsMoveSn extends BaseBean {
     @ApiParam("交易类型名称")
     private String transTypeName;
 
-    public WmsMoveSn(){}
+    @Version
+    @Column(name = "LOCK_VERSION")
+    @ApiParam(value = "乐观锁", example = "1")
+    public  Integer lockVersion;
+
+    public WmsMoveSn() {
+    }
 
     public WmsMoveSn(String partNo, Long finishedCounts, Long waitingCounts) {
         this.partNo = partNo;
@@ -207,6 +213,7 @@ public class WmsMoveSn extends BaseBean {
         this.transTypeCode = transTypeCode;
         this.refSrc = refSrc;
     }
+
     public WmsMoveSn(String partNo, String partNameRdd, Double destQty, String transTypeCode, String refSrc) {
         this.partNo = partNo;
         this.partNameRdd = partNameRdd;

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

@@ -166,11 +166,12 @@ public class WmsPOMasterDetails extends BaseBean {
 
     public WmsPOMasterDetails(){}
 
-    public WmsPOMasterDetails(String orderNo,String containerNo,String partNo,Integer item,String organizeCode){
+    public WmsPOMasterDetails(String orderNo,String containerNo,String partNo,Integer item,String organizeCode,String erpAreaNo){
         this.orderNo = orderNo;
         this.containerNo = containerNo;
         this.partNo = partNo;
         this.item = item;
         this.organizeCode = organizeCode;
+        this.erpAreaNo = erpAreaNo;
     }
 }

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

@@ -0,0 +1,52 @@
+package cn.estsh.i3plus.pojo.wms.bean.iotio;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : 开口合同主表
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2019-09-09 11:14
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="SWEB_PROCUREMENT_PLAN_ORDER")
+@Api("开口合同主表")
+public class SwebProcurementPlanOrder extends BaseBean {
+
+    private static final long serialVersionUID = -4332932784803175933L;
+    @Column(name = "ORDER_NO")
+    @ApiParam(value = "合同号")
+    private String orderNo;
+
+    @Column(name = "VENDOR_CODE")
+    @ApiParam(value = "物料名称")
+    private String vendorCode;
+
+    @Column(name = "VENDOR_NAME")
+    @ApiParam(value = "物料名称")
+    private String vendorName;
+
+    @Column(name = "PART_NO")
+    @ApiParam(value = "物料名称")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam(value = "物料名称")
+    private String partName;
+
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/SwebProcurementPlanOrderRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.iotio.SwebProcurementPlanOrder;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2019-09-09 14:49
+ * @Modify:
+ **/
+@Repository
+public interface SwebProcurementPlanOrderRepository extends BaseRepository<SwebProcurementPlanOrder, Long> {
+}