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

@@ -55,7 +55,7 @@ public class BlockFormEnumUtil {
         public static int codeOfValue(String code) {
             int tmp = 1;
             for (int i = 0; i < values().length; i++) {
-                if (values()[i].code.equals(code.toLowerCase())) {
+                if (values()[i].code.toLowerCase().equals(code.toLowerCase())) {
                     tmp = values()[i].value;
                 }
             }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/iface/IResultSetCall.java

@@ -0,0 +1,22 @@
+package cn.estsh.i3plus.pojo.base.iface;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+/**
+ * @Description : 实现此接口，对数据集进行自定义封装
+ * @Reference :
+ * @Author : alwaysfrin
+ * @CreateDate : 2019-06-11 16:12
+ * @Modify:
+ **/
+public interface IResultSetCall<T> {
+
+    /**
+     * 数据集默认方法
+     * @param rs 数据集
+     * @return 泛型对象
+     * @throws SQLException
+     */
+    T invoke(ResultSet rs) throws SQLException;
+}

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

@@ -0,0 +1,76 @@
+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 : yerik.shi
+ * @CreateDate : 2019-06-11
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="WMS_LINE_LOCATE_PART")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value="线边库物料信息",description = "线边库物料信息")
+public class WmsLineLocatePart extends BaseBean {
+
+    @Column(name="LOCATE_NO")
+    @ApiParam(value ="库位代码")
+    private String locateNo;
+
+    @Column(name="PART_NO")
+    @ApiParam(value = "物料编码")
+    private String partNo;
+
+    @Column(name="PART_NAME_RDD")
+    @ApiParam(value = "物料名称")
+    private String partNameRdd;
+
+    public Double getPullQty() {
+        return pullQty == null ? 0D : this.pullQty.doubleValue();
+    }
+
+    public Double getMax() {
+        return max== null ? 0D : this.max.doubleValue();
+    }
+
+    public Double getMin() {
+        return min== null ? 0D : this.min.doubleValue();
+    }
+
+    public Integer getIsGeneratePicklist() {
+        return isGeneratePicklist== null ? 0: this.isGeneratePicklist.intValue();
+    }
+
+    @Column(name = "PULL_QTY")
+    @ApiParam(value = "拉动数量")
+    private Double pullQty;
+
+    @Column(name = "Max")
+    @ApiParam(value = "最大值")
+    private Double max;
+
+    @Column(name = "Min")
+    @ApiParam(value = "最小值")
+    private Double min;
+
+    @Column(name = "IS_GENERATE_PICKLIST")
+    @ApiParam(value = "是否生成领料单")
+    private Integer isGeneratePicklist;
+
+}

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

@@ -115,4 +115,8 @@ public class WmsPoSn extends BaseBean {
     @Transient
     @ApiParam(value = "条码")
     public String sn;
+
+    @Transient
+    @ApiParam(value = "工厂名称")
+    public String organizeName;
 }

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

@@ -196,6 +196,10 @@ public class WmsStockSn extends BaseBean {
     @Transient
     public String labelNo;
 
+    @Transient
+    @ApiParam(value = "工厂名称")
+    public String organizeName;
+
     public WmsStockSn(){}
 
     public WmsStockSn(String partNo){

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

@@ -28,9 +28,9 @@ public class MappingItem {
      */
     public String destName;
     /**
-     * 当来源数据中无此字段时的默认值
+     * 目标字段的默认值，通过此默认值识别字段类型，一定要配置正确
      */
-    public String defaultValue;
+    public Object defaultValue;
 
     @Override
     public String toString() {

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsLineLocatePart;
+
+/**
+ * @Description : 线边库物料表
+ * @Reference :
+ * @Author : yerik.shi
+ * @CreateDate : 2019-06-12
+ * @Modify:
+ **/
+public interface WmsLineLocatePartRepository extends BaseRepository<WmsLineLocatePart, Long> {
+}

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

@@ -1222,13 +1222,13 @@ public class WmsHqlPack {
         DdlPackBean result = new DdlPackBean();
 
         // 查询参数封装
-        DdlPreparedPack.getStringLikerPack(wmsActionModule.getAmName(), "amName", result);
+        DdlPreparedPack.getStringLikerPack(wmsActionModule.getAmName(), "amDesc", result);
         DdlPreparedPack.getNumEqualPack(wmsActionModule.getId(), "id", result);
         DdlPreparedPack.getNumEqualPack(wmsActionModule.getAmType(), "amType", result);
         DdlPreparedPack.getStringEqualPack(wmsActionModule.getOpTypeCode(), "opTypeCode", result);
         DdlPreparedPack.getNumEqualPack(wmsActionModule.getIsShowInfo(), "isShowInfo", result);
-
-        getStringBuilderPack(wmsActionModule, result);
+        DdlPreparedPack.getNumEqualPack(wmsActionModule.getIsValid(), "isValid", result);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
 
         return result;
     }
@@ -1669,4 +1669,24 @@ public class WmsHqlPack {
 
         return result;
     }
+
+
+    /**
+     * 线边库物料信息 分页查询
+     *
+     * @param wmsLineLocatePart
+     * @return
+     */
+    public static DdlPackBean packHqlWmsLineLocatePart(WmsLineLocatePart wmsLineLocatePart) {
+        DdlPackBean result = new DdlPackBean();
+
+        //查询参数封装
+        DdlPreparedPack.getStringLikerPack(wmsLineLocatePart.getLocateNo(), "locateNo", result);
+        DdlPreparedPack.getStringLikerPack(wmsLineLocatePart.getPartNo(), "partNo", result);
+        DdlPreparedPack.getStringLikerPack(wmsLineLocatePart.getPartNameRdd(), "partNameRdd", result);
+        getStringBuilderPack(wmsLineLocatePart, result);
+        return result;
+    }
+
+
 }