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

7 years ago · b93609e655
parent 5dbf1bb2e8 205b4701aa
commit b93609e655
13 changed files with 518 additions and 1 deletions
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java
@ -0,0 +1,50 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+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 : dragon.xu
+* @CreateDate : 2018-11-22 16:53
+* @Modify:
+**/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_ACTION_MODULE")
+@Api("作业步骤处理组")
+public class WmsActionModule extends BaseBean {
+
+    @Column(name="AM_NAME")
+    @ApiParam("组件名称")
+    public String amName;
+
+    @Column(name="AM_DESC")
+    @ApiParam("组件描述")
+    public String amDesc;
+
+    @Column(name="CALL_CLASS")
+    @ApiParam("实现类")
+    public String callClass;
+
+    @Column(name="CALL_FUN")
+    @ApiParam("调用方法")
+    public String callFun;
+
+    @Column(name="AM_TYPE")
+    @ApiParam(value = "组件类型", example = "0")
+    public Integer amType;
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java
@ -0,0 +1,50 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+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 : dragon.xu
+* @CreateDate : 2018-11-22 16:53
+* @Modify:
+**/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_ACTION_MODULE_PARAM")
+@Api("作业步骤处理组参数")
+public class WmsActionModuleParam extends BaseBean {
+
+    @Column(name="AM_ID")
+    @ApiParam("组件ID")
+    public Long amID;
+
+    @Column(name="PARAM_CODE")
+    @ApiParam("参数编码")
+    public String paramCode;
+
+    @Column(name="PARAM_NAME")
+    @ApiParam("参数名称")
+    public String paramName;
+
+    @Column(name="PARAM_VALUE_LIST")
+    @ApiParam("参数可选值列表")
+    public String paramValueList;
+
+    @Column(name="PARAM_TYPE")
+    @ApiParam(value = "参数类型", example = "0")
+    public Integer paramType;
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java
@ -0,0 +1,44 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import javax.persistence.Entity;
+import java.util.List;
+
+/**
+ * @Description : PDA传输到后台的实体bean对象
+ * @Reference :
+ * @Author : silliter.yuan
+ * @CreateDate : 2018-11-22 15:58
+ * @Modify:
+ **/
+@Data
+@Api("返回前端数据实体")
+public class WmsActionResponseBean extends BaseBean {
+
+    @ApiParam("进度")
+    public Double percent;
+
+    @ApiParam("当前步骤")
+    public Integer currentStep;
+
+    @ApiParam("总步数")
+    public int totalStep;
+
+    @ApiParam("提示信息")
+    public String message;
+
+    @ApiParam("列表信息")
+    public List<String> informations;
+
+    @ApiParam("可选项")
+    public List<String> options;
+
+    @ApiParam("选中的明细数据")
+    public String details;
+
+
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java
@ -0,0 +1,63 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+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 : silliter.yuan
+ * @CreateDate : 2018-11-22 9:33
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="WMS_ACTION_STEP")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value="作业步骤信息",description = "作业步骤信息")
+public class WmsActionStep extends BaseBean {
+
+    @Column(name = "AS_NAME_E")
+    @ApiParam(value = "英文类型名称")
+    private String asNameE;
+
+    @Column(name = "AS_DESC_E")
+    @ApiParam(value = "英文类型描述")
+    private String asDescE;
+
+    @Column(name = "AS_NAME_C")
+    @ApiParam(value = "中文类型名称")
+    private String asNameC;
+
+    @Column(name = "AS_DESC_C")
+    @ApiParam(value = "中文类型描述")
+    private String asDescC;
+
+    @Column(name = "AT_NAME_C_RDD")
+    @ApiParam(value = "步骤类型名称")
+    private String atNameCRdd;
+
+    @Column(name = "AT_ID")
+    @ApiParam(value = "步骤类型编号", example = "0")
+    private Long atId;
+
+    //get单独处理
+    public Long getAtId() {
+        if(atId != null) {
+            return atId.longValue();
+        }else{
+            return atId;
+        }
+    }
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java
@ -0,0 +1,53 @@
+package cn.estsh.i3plus.pojo.wms.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.ApiOperation;
+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 : jimmy.zeng
+ * @CreateDate : 2018-11-22 14:18
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_ACTION_STEP_CALL")
+@Api("作业步骤调用信息")
+public class WmsActionStepCall extends BaseBean {
+
+    @Column(name="AS_ID")
+    @ApiParam(value = "作业步骤ID",example = "0")
+    @JsonSerialize(using = ToStringSerializer.class)
+    public Long asId;
+
+    @Column(name="SEQ")
+    @ApiParam(value = "序号",example = "0")
+    public Integer seq;
+
+    @Column(name="AM_ID")
+    @ApiParam(value = "处理组件ID",example = "0")
+    @JsonSerialize(using = ToStringSerializer.class)
+    public Long amId;
+
+    @ApiParam(value = "组件名称")
+    public transient String amName;
+
+    @ApiParam(value = "组件描述")
+    public transient String amDesc;
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepType.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepType.java
@ -0,0 +1,50 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+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 : silliter.yuan
+ * @CreateDate : 2018-11-22 9:33
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="WMS_ACTION_TYPE")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value="作业步骤类型信息",description = "作业步骤类型信息")
+public class WmsActionStepType extends BaseBean {
+
+    @Column(name = "AT_NAME_E")
+    @ApiParam(value = "英文类型名称")
+    private String atNameE;
+
+    @Column(name = "AT_DESC_E")
+    @ApiParam(value = "英文类型描述")
+    private String atDescE;
+
+    @Column(name = "AT_NAME_C")
+    @ApiParam(value = "中文类型名称")
+    private String atNameC;
+
+    @Column(name = "AT_DESC_C")
+    @ApiParam(value = "中文类型描述")
+    private String atDescC;
+
+    @Column(name = "FUN_CALL_NAME")
+    @ApiParam(value = "方法调用名称")
+    private String funCallName;
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java
@ -0,0 +1,43 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+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;
+import java.util.List;
+
+/**
+ * @Description : PDA传输到后台的实体bean对象
+ * @Reference :
+ * @Author : silliter.yuan
+ * @CreateDate : 2018-11-22 15:58
+ * @Modify:
+ **/
+@Data
+@Api("接受前端数据实体")
+public class WmsOperationBean extends BaseBean {
+
+    @ApiParam("扫描内容")
+    public String barCode;
+
+    @ApiParam("可选项的值")
+    public List<String> options;
+
+    /**
+     * 触发源:10=扫描枪,
+     * 20=提交按钮,30=重置按钮,40=查看明细， 50=明细(删除)
+     * 60=明细（清空）
+     */
+    @ApiParam("触发源")
+    public int sourceOwner;
+
+    @ApiParam("选中的明细数据")
+    public String details;
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionModuleParamRepository.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionModuleParamRepository.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.WmsActionModuleParam;
+import org.springframework.stereotype.Repository;
+
+/**
+* @Description : 作业步骤处理组件参数
+* @Reference :
+* @Author : dragon.xu
+* @CreateDate : 2018-11-22 17:01
+* @Modify:
+**/
+@Repository
+public interface WmsActionModuleParamRepository extends BaseRepository<WmsActionModuleParam, Long> {
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionModuleRepository.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionModuleRepository.java
@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsActionModule;
+import org.springframework.stereotype.Repository;
+/**
+* @Description : 作业步骤处理组件
+* @Reference :
+* @Author : dragon.xu
+* @CreateDate : 2018-11-22 17:01
+* @Modify:
+**/
+@Repository
+public interface WmsActionModuleRepository extends BaseRepository<WmsActionModule, Long> {
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepCallRepository.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepCallRepository.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.WmsActionStepCall;
+
+import java.util.List;
+
+/**
+ * @Description : 作业步骤调用信息
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2018-11-22 14:41
+ * @Modify:
+ **/
+public interface WmsActionStepCallRepository extends BaseRepository<WmsActionStepCall, Long> {
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepRepository.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepRepository.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.WmsActionStep;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 作业步骤操作类
+ * @Reference :
+ * @Author : silliter.yuan
+ * @CreateDate : 2018-11-22 11:25
+ * @Modify:
+ **/
+@Repository
+public interface WmsActionStepRepository extends BaseRepository<WmsActionStep, Long> {
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepTypeRepository.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepTypeRepository.java
@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsActionStepType;
+import cn.estsh.i3plus.pojo.wms.bean.WmsQCDetails;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 作业步骤类型操作类
+ * @Reference :
+ * @Author : silliter.yuan
+ * @CreateDate : 2018-11-22 11:25
+ * @Modify:
+ **/
+@Repository
+public interface WmsActionStepTypeRepository extends BaseRepository<WmsActionStepType, Long> {
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
@ -470,7 +470,7 @@ public class WmsHqlPack {
        StringBuffer result = new StringBuffer();

        //发运单号
-        HqlPack.getStringEqualPack(wmsShopping.getOrderNo(), "orderNo", result);
+        HqlPack.getStringLikerPack(wmsShopping.getOrderNo(), "orderNo", result);
        //客户编码
        HqlPack.getStringEqualPack(wmsShopping.getCustNo(), "custNo", result);
        //物料编码
@ -987,4 +987,88 @@ public class WmsHqlPack {

        return result.toString();
    }
+
+    /**
+     * 作业步骤 查询
+     *
+     * @param wmsActionStepCall
+     * @return
+     */
+    public static String packHqlWmsActionStepCall(WmsActionStepCall wmsActionStepCall) {
+        StringBuffer result = new StringBuffer();
+
+        //查询参数封装
+        HqlPack.getNumEqualPack(wmsActionStepCall.getAsId(), "asId", result);
+        HqlPack.getNumEqualPack(wmsActionStepCall.getAmId(), "amId", result);
+
+        getStringBuilderPack(wmsActionStepCall, result);
+
+        return result.toString();
+    }
+
+    /**
+     * 作业步骤类型表信息查询
+     *
+     * @param wmsActionStepType
+     * @return
+     */
+    public static String packHqlWmsActionStepType(WmsActionStepType wmsActionStepType) {
+        StringBuffer result = new StringBuffer();
+
+        //查询参数封装
+        HqlPack.getStringEqualPack(wmsActionStepType.getAtNameC(), "atNameC", result);
+
+        getStringBuilderPack(wmsActionStepType, result);
+
+        return result.toString();
+    }
+
+    /**
+     * 作业步骤信息查询
+     *
+     * @param wmsActionStep
+     * @return
+     */
+    public static String packHqlWmsActionStep(WmsActionStep wmsActionStep) {
+        StringBuffer result = new StringBuffer();
+
+        //查询参数封装
+        HqlPack.getStringEqualPack(wmsActionStep.getAsNameC(), "asNameC", result);
+
+        getStringBuilderPack(wmsActionStep, result);
+
+        return result.toString();
+    }
+
+    /**
+     * 作业步骤处理组件查询条件封装
+     *
+     * @param wmsActionModuleParam
+     * @return
+     */
+    public static String packHqlWmsActionModuleParam(WmsActionModuleParam wmsActionModuleParam) {
+        StringBuffer result = new StringBuffer();
+
+        //查询参数封装
+        HqlPack.getNumEqualPack(wmsActionModuleParam.getAmID(), "amID", result);
+        getStringBuilderPack(wmsActionModuleParam, result);
+
+        return result.toString();
+    }
+
+    /**
+     * 作业步骤处理组件参数查询条件封装
+     *
+     * @param wmsActionModule
+     * @return
+     */
+    public static String packHqlWmsActionModule(WmsActionModule wmsActionModule) {
+        StringBuffer result = new StringBuffer();
+
+        //查询参数封装
+        HqlPack.getStringLikerPack(wmsActionModule.getAmName(), "amName", result);
+        getStringBuilderPack(wmsActionModule, result);
+
+        return result.toString();
+    }
 }