Jenkins自动合并

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

@@ -85,6 +85,10 @@ public class BasVendor extends BaseBean{
     @ApiParam("小数位符号")
     private String decimals;
 
+    //20-承运商
+    @Column(name = "VENDOR_TYPE")
+    private Integer vendorType;
+
     public BasVendor() {
     }
 

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

@@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean;
 
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.wms.dto.WmsTmsShipModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -13,6 +14,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.util.List;
 
 /**
  * @Description : 车辆信息
@@ -103,4 +105,11 @@ public class WmsTmsShippingExt extends BaseBean {
     @ApiParam("物料编码")
     private String partNo;
 
+    @Transient
+    @ApiParam("关联单号")
+    private String refOrderNo;
+
+    @Transient
+    @ApiParam("打印模板列表")
+    private List<WmsTmsShipModel> shipModels;
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java

@@ -19,10 +19,12 @@ public class WmsTmsShipDto extends BaseDto implements Serializable {
 
     @ApiParam("物料号")
     private String partNo;
+
     @ApiParam("运输状态")
-    private String carriageStatus;
+    private String orderStatus;
+
     @ApiParam("单据号")
-    private String orderNo;
+    private String moveNo;
 
     @ApiParam("是否删除，默认否")
     protected Integer isDeleted = 2;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipModel.java

@@ -0,0 +1,26 @@
+package cn.estsh.i3plus.pojo.wms.dto;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description : 装车单打印
+ * @Reference :
+ * @Author : gcj
+ * @CreateDate : 2019-12-06 15:50
+ * @Modify:
+ **/
+@Data
+public class WmsTmsShipModel {
+
+    @ApiParam("物料编码")
+    private String partNo;
+    @ApiParam("物料名称")
+    private String partName;
+    @ApiParam("需求数量")
+    private Double qty;
+    @ApiParam("实际数量")
+    private Double recQty;
+    @ApiParam("单位")
+    private String unit;
+}

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

@@ -416,6 +416,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringLikerPack(basVendor.getVendorAddr(), "vendorAddr", result);
         DdlPreparedPack.getStringLikerPack(basVendor.getVendorEmail(), "vendorEmail", result);
         DdlPreparedPack.getNumEqualPack(basVendor.getIsAsn(), "isAsn", result);
+        DdlPreparedPack.getNumEqualPack(basVendor.getVendorType(), "vendorType", result);
 
         getStringBuilderPack(basVendor, result);