Merge remote-tracking branch 'remotes/origin/dev'

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

@@ -26,7 +26,7 @@ public class SapAsn extends SapBase {
 
     @ApiParam(value = "ASN item")
     @AnnoOutputColumn
-    private Double zrnum;
+    private Integer zrnum;
 
     @ApiParam(value = "物料编码")
     @AnnoOutputColumn

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

@@ -23,7 +23,7 @@ public class SapBase {
     private String actusr = "导入";
 
     @ApiParam(value = "SID", example = "-1")
-    private String sid = new Random().nextInt() + "";
+    private String sid = ( Math.abs(new Random().nextInt())+ "");
 
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @ApiParam(value = "接收数据日期", example = "-1")

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

@@ -64,8 +64,8 @@ public class SapMiscr extends SapBase{
     @AnnoOutputColumn(hidden = true)
     private String sgtxt;
 
-    public Double getZeileVal() {
+    public Integer getZeileVal() {
-        return zeile== null ? 0D : this.zeile.doubleValue();
+        return zeile== null ? 0 : this.zeile.intValue();
     }
 
     public Double getErfmgVal() {

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/WmsTransQuan.java

@@ -9,10 +9,7 @@ import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Index;
-import javax.persistence.Table;
 
 /**
  * @Description : 库存交易条码信息 （移库类的交易需要记录2笔交易数据，正负各一笔）
@@ -144,4 +141,16 @@ public class WmsTransQuan extends BaseBean {
     @ColumnDefault("0")
     @ApiParam(value = "报废数量", example = "0")
     private Double scrapQty;
+
+    @Transient
+    @ApiParam("交易类型")
+    private String transTypeName;
+
+    @Transient
+    @ApiParam("仓库名称")
+    private String warehouseName;
+
+    @Transient
+    @ApiParam("存储区名称")
+    private String zoneName;
 }

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> {
+
+}

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

@@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.wms.repository;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
 import cn.estsh.i3plus.pojo.wms.bean.WmsTransQuan;
+import org.springframework.stereotype.Repository;
 
 /**
 * @Description : 库存业务dao层
@@ -10,5 +11,6 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsTransQuan;
 * @CreateDate : 2018-11-17 15:57
 * @Modify:
 **/
+@Repository
 public interface WmsTransQuanRepository extends BaseRepository<WmsTransQuan, Long> {
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -1447,12 +1447,11 @@ public class WmsHqlPack {
      */
     public static DdlPackBean packHqlWmsTaskDetail(Map<String, List<WmsDataAuth>> groupDataAuth, String refSrc, String organizeCode) {
         DdlPackBean result = new DdlPackBean();
-        int i = 1;
         Set<Map.Entry<String, List<WmsDataAuth>>> entries = groupDataAuth.entrySet();
         //拼sql
         entries.stream().filter(o -> !Strings.isNullOrEmpty(o.getKey()));
 
-        for (Map.Entry<String, List<WmsDataAuth>> map : entries) {
+        /*for (Map.Entry<String, List<WmsDataAuth>> map : entries) {
 
             String key = map.getKey();
             List<WmsDataAuth> valueList = map.getValue();
@@ -1463,19 +1462,19 @@ public class WmsHqlPack {
                 List<Map> mapList = JSONObject.parseArray(data, Map.class);
                 if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.WAREHOUSE.getValue() + "", key)) {
                     DdlPreparedPack.getInPackList(cyclicTraversal(mapList,"WH_CODE"), "destWhNo", result);
-                    //packMutilConditionHql(mapList, "WH_CODE", "destWhNo", result);
+                    packMutilConditionHql(mapList, "WH_CODE", "destWhNo", result);
-                }/* else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.LOCATE.getValue() + "", key)) {
+                } else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.LOCATE.getValue() + "", key)) {
                     DdlPreparedPack.getInPackList(cyclicTraversal(mapList,"LOCATE_NO"), "destLocateNo", result);
-                    //packMutilConditionHql(mapList, "LOCATE_NO", "destLocateNo", result);
+                    packMutilConditionHql(mapList, "LOCATE_NO", "destLocateNo", result);
-                }*/ else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.ZONE.getValue() + "", key)) {
+                } else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.ZONE.getValue() + "", key)) {
                     DdlPreparedPack.getInPackList(cyclicTraversal(mapList,"ZONE_CODE"), "destZoneNo", result);
-                    //packMutilConditionHql(mapList, "ZONE_CODE", "destZoneNo", result);
+                    packMutilConditionHql(mapList, "ZONE_CODE", "destZoneNo", result);
-                } /*else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.MATERIAL.getValue() + "", key)) {
+                } else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.MATERIAL.getValue() + "", key)) {
                     DdlPreparedPack.getInPackList(cyclicTraversal(mapList,"PART_NO"), "partNo", result);
-                    //packMutilConditionHql(mapList, "PART_NO", "partNo", result);
+                    packMutilConditionHql(mapList, "PART_NO", "partNo", result);
-                }*/
+                }
             }
-        }
+        }*/
 
         //转换封装后的hql
         /*String packedHql = result.getPackedHql();
@@ -1957,4 +1956,47 @@ public class WmsHqlPack {
 
         return result;
     }
+
+    //库层交易报表packHqlWmsTransQuan
+
+
+    public static DdlPackBean packHqlWmsTransQuan(WmsTransQuan wmsTransQuan) {
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(wmsTransQuan.getTransNo(), "transNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsTransQuan.getWhNo(), "whNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsTransQuan.getZoneNo(), "zoneNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsTransQuan.getLocateNo(), "locateNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsTransQuan.getPartNo(), "partNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsTransQuan.getPartNameRdd(), "partNameRdd", result);
+        DdlPreparedPack.getStringEqualPack(wmsTransQuan.getUnit(), "unit", result);
+        DdlPreparedPack.getNumEqualPack(wmsTransQuan.getTransStatus(), "transStatus", result);
+        DdlPreparedPack.getStringEqualPack(wmsTransQuan.getRefSrc(), "refSrc", result);
+        DdlPreparedPack.getStringEqualPack(wmsTransQuan.getRefType(), "refType", result);
+        DdlPreparedPack.getNumEqualPack(wmsTransQuan.getBusiType(), "busiType", result);
+        DdlPreparedPack.getStringEqualPack(wmsTransQuan.getTransCode(), "transCode", result);
+        DdlPreparedPack.getStringEqualPack(wmsTransQuan.getMoveNo(), "moveNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsTransQuan.getVendorNo(), "vendorNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsTransQuan.getCustNo(), "custNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsTransQuan.getErrorMessage(), "errorMessage", result);
+//        DdlPreparedPack.getStringEqualPack(wmsTransQuan.getQty().toString(), "qty", result);
+//        DdlPreparedPack.getStringEqualPack(wmsTransQuan.getFailQty().toString(), "failQty", result);
+//        DdlPreparedPack.getStringEqualPack(wmsTransQuan.getHoldQty().toString(), "holdQty", result);
+//        DdlPreparedPack.getStringEqualPack(wmsTransQuan.getQcQty().toString(), "qcQty", result);
+//        DdlPreparedPack.getStringEqualPack(wmsTransQuan.getRinQty().toString(), "rinQty", result);
+//        DdlPreparedPack.getStringEqualPack(wmsTransQuan.getFreezeQty().toString(), "freezeQty", result);
+//        DdlPreparedPack.getStringEqualPack(wmsTransQuan.getConsignQty().toString(), "consignQty", result);
+//        DdlPreparedPack.getStringEqualPack(wmsTransQuan.getLockQty().toString(), "lockQty", result);
+//        DdlPreparedPack.getStringEqualPack(wmsTransQuan.getTransNo(), "scrapQty", result);
+//        DdlPreparedPack.getStringEqualPack(wmsTransQuan.getScrapQty().toString(), "transTypeName", result);
+//        DdlPreparedPack.getStringEqualPack(wmsTransQuan.getWarehouseName(), "warehouseName", result);
+//        DdlPreparedPack.getStringEqualPack(wmsTransQuan.getZoneName(), "zoneName", result);
+//
+
+        getStringBuilderPack(wmsTransQuan, result);
+
+        return result;
+    }
+
+
 }