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

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/common/XStreamFactory.java

@@ -123,6 +123,16 @@ public class XStreamFactory {
     }
 
     /**
+     * Javabean 转XML
+     * @param <T>
+     * @return xml字符串
+     */
+    public static <T> String toXmlNoHeadLine(T t) {
+        xStream.processAnnotations(t.getClass());
+        return xStream.toXML(t);
+    }
+
+    /**
      * XML字符串转javabean
      *
      * @param xmlStr xml字符串

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

@@ -0,0 +1,25 @@
+package cn.estsh.i3plus.pojo.base.common.converter;
+
+import com.thoughtworks.xstream.converters.Converter;
+import com.thoughtworks.xstream.converters.collections.MapConverter;
+import com.thoughtworks.xstream.mapper.Mapper;
+import org.springframework.util.LinkedCaseInsensitiveMap;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2019-09-09 14:35
+ * @Modify:
+ **/
+public class LinkedCaseInsensitiveMapConverter extends MapConverter implements Converter {
+
+    public LinkedCaseInsensitiveMapConverter(Mapper mapper) {
+        super(mapper);
+    }
+
+    @Override
+    public boolean canConvert(Class aClass) {
+        return aClass.equals(LinkedCaseInsensitiveMap.class);
+    }
+}

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

@@ -49,6 +49,16 @@ public class BlockSoftSwitchEnumUtil {
             }
             return tmp;
         }
+
+        public static CASE_TYPE valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
     }
 
     /**

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/softswitch/BsSuitCaseModel.java

@@ -1,5 +1,7 @@
 package cn.estsh.i3plus.pojo.model.softswitch;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+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;
@@ -7,6 +9,8 @@ import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseWebService;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import javax.persistence.Transient;
+
 /**
  * @Description : 适配器model
  * @Reference :
@@ -25,7 +29,6 @@ public class BsSuitCaseModel {
 
     @ApiParam(value = "socket适配套件")
     private BsSocketSuitCase bsSocketSuitCase;
-
     @ApiParam(value = "Web Service 适配套件")
     private BsSuitCaseWebService webService;
 

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-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java

@@ -39,6 +39,13 @@ public class BsSuitCase extends BaseBean {
     @ApiParam(value = "套件类型id(枚举)")
     private Integer caseTypeId;
 
+    public int getCaseTypeIdVal(){
+        if(caseTypeId == null) {
+            return -1;
+        }
+        return caseTypeId.intValue();
+    }
+
     @Column(name = "CASE_DETAIL_ID")
     @ApiParam(value = "适配器明细id")
     @JsonSerialize(using = ToStringSerializer.class)
@@ -49,6 +56,13 @@ public class BsSuitCase extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long suitTypeId;
 
+    public long getSuitTypeIdVal(){
+        if(suitTypeId != null){
+            return -1;
+        }
+        return suitTypeId.longValue();
+    }
+
     @Column(name = "SUIT_TYPE_NAME_RDD")
     @ApiParam(value = "适配类型名称")
     private String suitTypeNameRdd;
@@ -119,7 +133,12 @@ public class BsSuitCase extends BaseBean {
     private List<BsSuitCaseParam> bsSuitCaseParamList;
 
     @Transient
-    @ApiParam(value = "参数转换")
+    @ApiParam(value = "入参转换")
-    private List<BsParamAdapter> bsParamAdapterList;
+    private List<BsParamAdapter> bsInParamAdapterList;
+
+    @Transient
+    @ApiParam(value = "出参转换")
+    private List<BsParamAdapter> bsOutParamAdapterList;
 }
 
+

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

@@ -36,10 +36,6 @@ public class BsSuitCaseDataSource extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long suitCaseId;
 
-    @Column(name = "DATA_SOURCE_MODE_ID")
-    @ApiParam(value = "数据源套件模式（枚举，被动读，主动写）")
-    private Integer dataSourceModeId;
-
     @Column(name = "DATA_SOURCE_CODE")
     @ApiParam(value = "数据源编码")
     private String dataSourceCode;

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

@@ -47,6 +47,10 @@ public class BsSuitCaseParam extends BaseBean {
     @ApiParam(value = "参数名称)")
     private String paramName;
 
+    @Column(name = "PARENT_PARAM_NAME")
+    @ApiParam(value = "上级参数名称)")
+    private String parentParamName;
+
     @Column(name = "PARAM_VAL_TYPE_ID")
     @ApiParam(value = "参数值类型")
     private Integer paramValTypeId;

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

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Repository;
  * @Modify:
  */
 @Repository
-public interface BsDataSourceSuitCaseRepository extends BaseRepository<BsSuitCaseDataSource,Long> {
+public interface BsSuitCaseDataSourceRepository extends BaseRepository<BsSuitCaseDataSource,Long> {
 
 }
 

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

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Repository;
  * @Modify:
  */
 @Repository
-public interface BsDataSourceSuitCaseTableRepository extends BaseRepository<BsSuitCaseDataSourceTable,Long> {
+public interface BsSuitCaseDataSourceTableRepository extends BaseRepository<BsSuitCaseDataSourceTable,Long> {
 
 }
 

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

@@ -85,7 +85,6 @@ public class SoftSwitchHqlPack {
         DdlPreparedPack.getStringLikerPack(bsSuitCase.getSuitCaseName(),"suitCaseName",ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bsSuitCase.getSuitCaseCode(),"suitCaseCode",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitCase.getSuitTypeId(), "suitTypeId", ddlPackBean);
-        DdlPreparedPack.getStringLikerPack(bsSuitCase.getSuitTypeNameRdd(),"suitTypeNameRdd",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitCase.getCaseTypeId(), "caseTypeId", ddlPackBean);
 
         ddlPackBean.setOrderByStr(bsSuitCase.orderBy());
@@ -267,6 +266,35 @@ public class SoftSwitchHqlPack {
     }
 
     /**
+     * 数据源适配操作查询条件封装
+     * @param bsSuitCaseDataSourceTable
+     * @return
+     */
+    public static DdlPackBean packHqlBsSuitCaseDataSourceTable(BsSuitCaseDataSourceTable bsSuitCaseDataSourceTable){
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
+
+        DdlPreparedPack.getNumEqualPack(bsSuitCaseDataSourceTable.getSuitCaseId(),"suitCaseId",ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bsSuitCaseDataSourceTable.getOperateName(),"operateName",ddlPackBean);
+
+        return ddlPackBean;
+    }
+
+    /**
+     * 数据适配操作操作唯一校验
+     * @param bsSuitCaseDataSourceTable
+     * @return
+     */
+    public static DdlPackBean packHqlCheckBsSuitCaseDataSourceTableOnly(BsSuitCaseDataSourceTable bsSuitCaseDataSourceTable){
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
+
+        DdlPreparedPack.getNumEqualPack(bsSuitCaseDataSourceTable.getId(), "id", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bsSuitCaseDataSourceTable.getSuitCaseId(), "suitCaseId", ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bsSuitCaseDataSourceTable.getOperateName(), "operateName", ddlPackBean);
+
+        return ddlPackBean;
+    }
+
+    /**
      * WebService 唯一校验
      * @param webService
      * @return

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详情列表")
@@ -124,12 +128,12 @@ public class WmsASNMaster extends BaseBean {
     private String vendorPhone;
 
     @Transient
-    @ApiParam("物料代码")
+    @ApiParam("物料编码")
     private String partNo;
 
     @Transient
     @ApiParam("物料名称")
-    private String partNoNameRdd;
+    private String partNameRdd;
 
     @Transient
     @ApiParam("收货数量")
@@ -165,15 +169,16 @@ public class WmsASNMaster extends BaseBean {
 
     @Transient
     @ApiParam("收货状态")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.REC_STATUS.class,refForeignKey = "value",value = "description")
     private String recStatus;
 
     @Transient
-    @ApiParam("项目代码")
+    @ApiParam("项目")
     private String prodCfgTypeCode;
 
     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;

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

@@ -176,7 +176,7 @@ public class WmsMoveDetails extends BaseBean {
     @Version
     @Column(name = "LOCK_VERSION")
     @ApiParam(value = "乐观锁", example = "1")
-    public transient Integer lockVersion;
+    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

@@ -147,7 +147,7 @@ public class WmsMoveMaster extends BaseBean {
     @Version
     @Column(name = "LOCK_VERSION")
     @ApiParam(value = "乐观锁", example = "1")
-    public transient Integer lockVersion;
+    public  Integer lockVersion;
 
     public WmsMoveMaster(){};
 

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

@@ -186,7 +186,7 @@ public class WmsMoveSn extends BaseBean {
     @Version
     @Column(name = "LOCK_VERSION")
     @ApiParam(value = "乐观锁", example = "1")
-    public transient Integer lockVersion;
+    public  Integer lockVersion;
 
     public WmsMoveSn() {
     }