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

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

@@ -0,0 +1,59 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description : 委外材料发运
+ * @Reference :
+ * @Author : amy
+ * @CreateDate : 2019-06-22 10:03
+ * @Modify:
+ **/
+@Data
+@Api(value = "委外材料发运", description = "委外材料发运")
+public class SapCgio extends SapBase{
+
+    @ApiParam(value = "编号")
+    @AnnoOutputColumn
+    private String zinstno;
+
+    @ApiParam(value = "行号")
+    @AnnoOutputColumn
+    private String zeile;
+
+    @ApiParam(value = "工厂")
+    @AnnoOutputColumn
+    private String werks;
+
+    @ApiParam(value = "发（退）料库存地点")
+    @AnnoOutputColumn
+    private String lgort;
+
+    @ApiParam(value = "供应商代码")
+    @AnnoOutputColumn
+    private String zlifnr;
+
+    @ApiParam(value = "物料编码")
+    @AnnoOutputColumn
+    private String matnr;
+
+    @ApiParam(value = "发(退）料数量")
+    @AnnoOutputColumn
+    private String erfmg;
+
+    @ApiParam(value = "计量单位")
+    @AnnoOutputColumn
+    private String erfme;
+
+    @ApiParam(value = "状态")
+    @AnnoOutputColumn
+    private String zzlzt;
+
+    @ApiParam(value = "业务类型")
+    @AnnoOutputColumn
+    private String zaction;
+
+}

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

@@ -0,0 +1,74 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description :盘点
+ * @Reference :
+ * @Author : amy
+ * @CreateDate : 2019-06-22 10:16
+ * @Modify:
+ **/
+@Data
+@Api(value="盘点",description = "盘点")
+public class SapCyco extends SapBase{
+
+    @ApiParam(value = "盘点凭证号")
+    @AnnoOutputColumn
+    private String iblnr;
+
+    @ApiParam(value = "行号")
+    @AnnoOutputColumn
+    private Integer zeili;
+
+    @ApiParam(value = "物料编码")
+    @AnnoOutputColumn
+    private String matnr;
+
+    @ApiParam(value = "计量单位")
+    @AnnoOutputColumn
+    private String meins;
+
+    @ApiParam(value = "工厂")
+    @AnnoOutputColumn
+    private String werks;
+
+    @ApiParam(value = "库存地点")
+    @AnnoOutputColumn
+    private String lgort;
+
+    @ApiParam(value = "库存状态")
+    @AnnoOutputColumn
+    private String zstat;
+
+    @ApiParam(value = "特殊库存标识")
+    @AnnoOutputColumn
+    private String sobkz;
+
+    @ApiParam(value = "项目号")
+    @AnnoOutputColumn
+    private String zxm;
+
+    @ApiParam(value = "库存帐冻结标识")
+    @AnnoOutputColumn
+    private String zdjbs;
+
+    @ApiParam(value = "删除标识")
+    @AnnoOutputColumn
+    private String xloek;
+
+    @ApiParam(value = "年度")
+    @AnnoOutputColumn
+    private Integer gjahr;
+
+    public Integer getZeilVal() {
+        return zeili== null ? 0 : this.zeili.intValue();
+    }
+
+    public Integer getGjahrVal() {
+        return gjahr== null ? 0 : this.gjahr.intValue();
+    }
+}

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

@@ -0,0 +1,39 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description : 盘点调差
+ * @Reference :
+ * @Author : amy
+ * @CreateDate : 2019-06-22 10:27
+ * @Modify:
+ **/
+@Data
+@Api(value="盘点调差",description = "盘点调差")
+public class SapDifo extends SapBase{
+
+    @ApiParam(value = "工厂")
+    @AnnoOutputColumn
+    private String werks;
+
+    @ApiParam(value = "盘点凭证号")
+    @AnnoOutputColumn
+    private String iblnr;
+
+    @ApiParam(value = "行号")
+    @AnnoOutputColumn
+    private String zeili;
+
+    @ApiParam(value = "调整")
+    @AnnoOutputColumn
+    private String ztzbs;
+
+    @ApiParam(value = "年度")
+    @AnnoOutputColumn
+    private String gjahr;
+
+}

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

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description : 客户零件关系表
@@ -40,4 +41,11 @@ public class WmsCustomerPart extends BaseBean {
     @ApiParam(value = "客户零件号")
     private String customerPartNo;
 
+    @Transient
+    @ApiParam(value = "客户全称")
+    private String custDesc;
+
+    @Transient
+    @ApiParam(value ="物料名称")
+    private String partName;
 }

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

@@ -182,6 +182,14 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam(value ="余数",example = "1")
     private Double restQty;
 
+    @Transient
+    @ApiParam("任务状态")
+    private Integer isTask;
+
+    @Transient
+    @ApiParam("主表单据状态")
+    private Integer orderMasterStatus;
+
     public String getRecommondLot() {
         return recommondLot == null ? "无" : this.recommondLot;
     }
@@ -194,6 +202,10 @@ public class WmsDocMovementDetails extends BaseBean {
 
     public Double getActualQty() {return actualQty == null ? 0D : this.actualQty.doubleValue(); }
 
+    public Integer getIsTaskVal() {return isTask == null ? 0 : this.isTask.intValue();}
+
+    public Integer getOrderMasterStatus() { return orderMasterStatus== null ? 0 : this.orderMasterStatus.intValue(); }
+
     @Version
     @Column(name = "LOCK_VERSION")
     @ApiParam(value = "乐观锁", example = "1")

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java

@@ -96,4 +96,11 @@ public class WmsInterfaceDataMapper extends BaseBean {
      */
     @Column(name = "GROUP_NAME")
     public String groupName;
+
+    /**
+     * 业务的路由规则
+     * 一表对多表时需要配置路由规则
+     */
+    @Column(name = "BUSI_ROUTE")
+    public String busiRoute;
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java

@@ -0,0 +1,74 @@
+package cn.estsh.i3plus.pojo.wms.dbinterface;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+public class WmsInterfaceEnumUtil {
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum DIRECTION_TYPE {
+        SAP2WMS(10, "SAP2WMS", "SAP --> WMS"),
+        WMS2SAP(20, "WMS2SAP", "WMS --> SAP"),
+        MES2WMS(30, "MES2WMS", "MES --> WMS"),
+        WMS2MES(40, "WMS2MES", "WMS --> MES");
+
+        private int value;
+        private String name;
+        private String description;
+
+        DIRECTION_TYPE() {
+        }
+
+        DIRECTION_TYPE(int value, String name, String description) {
+            this.value = value;
+            this.name = name;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].getName();
+                }
+            }
+            return tmp;
+        }
+
+        public static int nameOf(String val) {
+            int tmp = -1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].name.equals(val)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        /**
+         * -1 不在范围内
+         * @param desc
+         * @return
+         */
+        public static int descOf(String desc) {
+            int tmp = -1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCustomerPartRepository.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.WmsCustomerPart;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 对象持久层仓用方法控制(客户零件号关系)
+ * @Reference :
+ * @Author : sky.meng
+ * @CreateDate : 2019-06-21 20:22
+ * @Modify:
+ **/
+@Repository
+public interface WmsCustomerPartRepository extends BaseRepository<WmsCustomerPart, Long> {
+
+}