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

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

@@ -114,6 +114,7 @@ public class BlockSoftSwitchEnumUtil {
         SERVER_WEB_SERVICE_SEND_EMAIL(SUIT_MODE.SERVER,CASE_TYPE.WEB_SERVICE,240001,"Server IMPP 服务邮件服务"),
         SERVER_WEB_SERVICE_HELLO(SUIT_MODE.SERVER,CASE_TYPE.WEB_SERVICE,240003,"Server Hello测试服务"),
         CLIENT_WEB_SERVICE_HELLO(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140002,"Client IMPP邮件测试"),
+        CLIENT_WEB_SERVICE_DEFAULT(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140003,"Client 默认设置"),
 
         /* 数据源 */
         CLIENT_DATA_SOURCE_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.DATASOURCE,130001,"Client 数据库适配服务"),

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

@@ -1888,7 +1888,8 @@ public class WmsEnumUtil {
         ZONE(20, "ZONE", "存储区对象"),
         LOCATE(30, "LOCATE", "库位对象"),
         MATERIAL(40, "MATERIAL", "物料对象"),
-        TRANS_TYPE(50, "TRANS_TYPE", "交易代码对象");
+        TRANS_TYPE(50, "TRANS_TYPE", "交易代码对象"),
+        BUSI_TYPE(60, "BUSI_TYPE", "业务类型对象");
 
         private String code;
         private String description;

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java

@@ -25,7 +25,7 @@ public class HqlPack {
 		return data.toString().replaceAll(";","")
 					.replaceAll("'","")
 					.replaceAll("\"","")
-					.replaceAll("/","")
+//					.replaceAll("/","")
 					.replaceAll("\\\\","")
 					.replaceAll("delete","")
 					.replaceAll("update","")

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

@@ -1,11 +1,14 @@
 package cn.estsh.i3plus.pojo.model.wms;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import cn.estsh.i3plus.pojo.wms.bean.WmsASNMaster;
 import cn.estsh.i3plus.pojo.wms.bean.WmsDocMovementMaster;
 import cn.estsh.i3plus.pojo.wms.bean.WmsPOMaster;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import javax.persistence.Transient;
 import java.io.Serializable;
 
 /**
@@ -37,6 +40,35 @@ public class PrintOrderDataModel implements Serializable {
     @ApiParam(value = "移库单主表")
     public WmsDocMovementMaster movementMaster;
 
+    @ApiParam(value = "状态")
+    @Transient
+    @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description")
+    public Integer orderStatus;
+
+    @ApiParam(value = "供应商名称")
+    @Transient
+    public String vendorName;
+
+    @ApiParam(value = "供应商编码")
+    @Transient
+    public String vendorNo;
+
+    @ApiParam(value = "客户编码")
+    @Transient
+    public String custNo;
+
+    @ApiParam(value = "ERP编号")
+    @Transient
+    public String erpSrcNo;
+
+    @ApiParam(value = "联系人")
+    @Transient
+    public String vendorOwner;
+
+    @ApiParam(value = "供应商邮箱")
+    @Transient
+    public String vendorEmail;
+
     public int getBusiDataType() {
         if (busiDataType != null) {
             return busiDataType.intValue();

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

@@ -319,6 +319,7 @@ public class SoftSwitchHqlPack {
     public static DdlPackBean packHqlBsSuitRecord(BsSuitRecord bsSuitRecord){
         DdlPackBean ddlPackBean = new DdlPackBean();
 
+        DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitCaseId(),"suitCaseId",ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bsSuitRecord.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitTypeId(),"suitTypeId",ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bsSuitRecord.getSuitCaseCodeRdd(),"suitCaseCodeRdd",ddlPackBean);

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.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;
@@ -49,6 +51,7 @@ public class WmsPOMaster extends BaseBean {
      */
     @Column(name = "PO_STATUS")
     @ApiParam(value = "状态", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description")
     public Integer poStatus;
 
     @Column(name = "VENDOR_NO")

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

@@ -0,0 +1,45 @@
+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 javax.persistence.Transient;
+import java.util.List;
+
+/**
+ * @Description :存储区
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2018-11-06 11:50
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="WMS_PART_ROUTING")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value="物料线路关系表",description = "物料线路关系表")
+public class WmsPartRouting extends BaseBean {
+
+    private static final long serialVersionUID = 7759454799191378612L;
+    @Column(name = "PART_NO")
+    @ApiParam(value = "物料编号")
+    private String partNo;
+
+    @Column(name = "ROUTING_CODE")
+    @ApiParam(value = "线路编号")
+    private String areaNo;
+ 
+
+    public WmsPartRouting(){}
+
+}

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

@@ -0,0 +1,60 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+* @Description : 生产退料导入模板
+* @Reference :
+* @author: amy.liu
+* @date: 2019/9/17 17:10
+* @Modify:
+*/
+
+@Data
+@Api(value="生产退料导入模板",description = "生产退料导入模板")
+public class WmsProductReturnMovement implements Serializable{
+
+    @ApiParam(value = "单号")
+    @AnnoOutputColumn
+    private String orderNo;
+
+    @ApiParam(value = "物料编码")
+    @AnnoOutputColumn
+    private String partNo;
+
+    @ApiParam(value = "数量")
+    @AnnoOutputColumn
+    private Double qty;
+
+    @ApiParam(value = "源存储区")
+    @AnnoOutputColumn
+    private String srcZoneNo;
+
+    @ApiParam(value = "目标存储区")
+    @AnnoOutputColumn
+    private String destZoneNo;
+
+    @ApiParam(value = "业务类型")
+    @AnnoOutputColumn
+    private String busiType;
+
+    @ApiParam(value = "工厂")
+    @AnnoOutputColumn
+    private String factory;
+
+    @ApiParam(value = "计划日期")
+    @AnnoOutputColumn
+    private String planDate;
+
+    @ApiParam(value = "计划时间")
+    @AnnoOutputColumn
+    private String planTime;
+
+
+}

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

@@ -0,0 +1,62 @@
+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 javax.persistence.Transient;
+import java.util.List;
+
+/**
+ * @Description :存储区
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2018-11-06 11:50
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="WMS_ROUTING")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value="物流线路信息表",description = "物流线路信息表")
+public class WmsRouting extends BaseBean {
+
+    private static final long serialVersionUID = 7759454799191378612L;
+    @Column(name = "ROUTING_CODE")
+    @ApiParam(value = "线路代码")
+    private String routingCode;
+
+    @Column(name = "ROUTING_NAME")
+    @ApiParam(value = "线路名称")
+    private String routingName;
+
+    @Column(name = "ROUTING_DESC")
+    @ApiParam(value = "线路描述")
+    private String routingDesc;
+
+    @Column(name = "FOR_PROUCT_CLASS")
+    @ApiParam(value = "适用产品分类")
+    private Integer forProductClass;
+
+    @Column(name = "FOR_WAREHOUSE")
+    @ApiParam(value = "适用仓库", example ="1")
+    private Integer forWareHouse;
+
+    @Column(name = "FOR_PRODUCT")
+    @ApiParam(value = "适用产品")
+    private Integer forProduct;
+
+   
+
+    public WmsRouting(){}
+
+}

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

@@ -0,0 +1,85 @@
+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 javax.persistence.Transient;
+import java.util.List;
+
+/**
+ * @Description :存储区
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2018-11-06 11:50
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="WMS_ROUTING_RULE")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value="物流线路规则表",description = "物流线路规则表")
+public class WmsRoutingRule extends BaseBean {
+
+    private static final long serialVersionUID = 7759454799191378612L;
+    @Column(name = "RULE_CODE")
+    @ApiParam(value = "规则编号")
+    private String ruleCode;
+
+    @Column(name = "RULE_NAME")
+    @ApiParam(value = "规则名称")
+    private String ruleName;
+
+    @Column(name = "RULE_DESC")
+    @ApiParam(value = "规则描述")
+    private String ruleDesc;
+
+    @Column(name = "SEQ")
+    @ApiParam(value = "排序号")
+    private Integer seq;
+
+    @Column(name = "RULE_TYPE")
+    @ApiParam(value = "规则类型(10 推动规则，20 补货规则)", example ="10")
+    private Integer ruleType;
+
+    @Column(name = "ZONE_NO_SRC")
+    @ApiParam(value = "源存储区")
+    private String zoneNoSrc;
+
+    @Column(name = "ZONE_NO_TARGET")
+    @ApiParam(value = "目标存储区" , example = "2")
+    private String zoneNoTarget;
+
+    @Column(name = "OP_TYPE_CODE")
+    @ApiParam(value = "作业类型" , example = "2")
+    private String opTypeCode;
+
+    @Column(name = "TRANS_TYPE_CODE")
+    @ApiParam(value = "交易类型" , example = "1")
+    private String transTypeCode;
+
+    @Column(name = "MODE_CODE")
+    @ApiParam(value = "处理模式(10:生成任务,20:自动操作,30手工操作，40:自动操作 无交易)" , example = "1")
+    private Integer modeCode;
+
+    @Column(name = "DELAY_TIME")
+    @ApiParam(value = "延迟时间" , example = "1")
+    private Integer dalayTime;
+
+    @Column(name = "DELAY_UNIT")
+    @ApiParam(value = "延迟时间单位(M:分钟，D:天)")
+    private String delayUnit;
+
+   
+    public WmsRoutingRule(){}
+
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java

@@ -42,6 +42,9 @@ public class WmsDataAuthModel extends BaseBean {
     @ApiParam("交易代码列表")
     private List<String> transTypeList;
 
+    @ApiParam("业务类型列表")
+    private List<String> busiTypeList;
+
     @ApiParam(
             value = "新增操作",
             example = "0"

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

@@ -0,0 +1,18 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsPartRouting;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :对象持久层仓用方法控制(存储区信息)
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2018-11-06 13:40
+ * @Modify:
+ **/
+@Repository
+public interface WmsPartRoutingRepository extends BaseRepository<WmsPartRouting ,Long> {
+
+ 
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRoutingRepository.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.WmsRouting;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :对象持久层仓用方法控制(存储区信息)
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2018-11-06 13:40
+ * @Modify:
+ **/
+@Repository
+public interface WmsRoutingRepository extends BaseRepository<WmsRouting ,Long> {
+
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRoutingRoleRepository.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.WmsRoutingRule;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :对象持久层仓用方法控制(存储区信息)
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2018-11-06 13:40
+ * @Modify:
+ **/
+@Repository
+public interface WmsRoutingRoleRepository extends BaseRepository<WmsRoutingRule ,Long> {
+
+}