Merge branch 'dev' of puxiao.liao/i3plus-pojo-lpx into dev

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

@@ -170,6 +170,10 @@ public class WmsDocMovementMaster extends BaseBean {
     @AnnoOutputColumn(refClass = WmsEnumUtil.STEP.class, refForeignKey = "value", value = "description")
     private Integer isSingleStep;
 
+    @Column(name = "ERP_SRC_TYPE",columnDefinition = "varchar(50) default ''")
+    @ApiParam(value = "QAD发运单据类型")
+    private String erpSrcType;
+
     @Transient
     @ApiParam(value = "发运单号")
     private String shipOrderNo;

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

@@ -183,6 +183,11 @@ public class WmsMoveToERP extends BaseBean {
     @ApiParam("是否预收货")
     public Integer priorRC = 2;
 
+
+    @Column(name = "ERP_SRC_TYPE",columnDefinition = "varchar(50) default ''")
+    @ApiParam(value = "QAD发运单据类型")
+    private String erpSrcType;
+
     @ApiParam(value = "待出库数量", example = "0")
     @Transient
     private Long waitingCounts;

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

@@ -1908,6 +1908,9 @@ public class WmsHqlPack {
         if (!Strings.isNullOrEmpty(wmsTransModule.getTmDesc())) {
             DdlPreparedPack.getStringLikerPack(wmsTransModule.getTmDesc(), "tmDesc", packBean);
         }
+        if (wmsTransModule.getId() != null) {
+            DdlPreparedPack.getNumEqualPack(wmsTransModule.getId(), "id", packBean);
+        }
         if (StringUtils.isNotBlank(wmsTransModule.orderBy())) {
             packBean.setOrderByStr(wmsTransModule.orderBy());
         }