Merge remote-tracking branch 'origin/dev' into test

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

@@ -15,7 +15,7 @@ import javax.persistence.Entity;
 import javax.persistence.Table;
 
 /**
- * @Description :作业步骤类型信息
+ * @Description :作业步骤信息
  * @Reference :
  * @Author : silliter.yuan
  * @CreateDate : 2018-11-22 9:33

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

@@ -120,27 +120,27 @@ public class WmsDocMovementMaster extends BaseBean {
 
     @Column(name = "SRC_WH_NO")
     @ApiParam("源仓库代码")
-    public String AssignSrcWhNo;
+    public String assignSrcWhNo;
 
     @Column(name = "SRC_ZONE_NO")
     @ApiParam("源存储区代码")
-    public String AssignSrcZoneNo;
+    public String assignSrcZoneNo;
 
     @Column(name = "DEST_WH_NO")
     @ApiParam("目标仓库代码")
-    public String AssignDestWhNo;
+    public String assignDestWhNo;
 
     @Column(name = "DEST_ZONE_NO")
     @ApiParam("目标存储区代码")
-    public String AssignDestZoneNo;
+    public String assignDestZoneNo;
 
     @Column(name = "PLAN_DATE")
     @ApiParam(value = "计划日期")
-    private String AssignPlanDate;
+    private String assignPlanDate;
 
     @Column(name = "PLAN_TIME")
     @ApiParam(value = "计划时间")
-    private String AssignPlanTime;
+    private String assignPlanTime;
 
     @Transient
     @ApiParam(value = "发运单号")

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

@@ -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;
+    }
+
+
 }