Jenkins自动合并

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java

@@ -47,7 +47,7 @@ public class MesRawPartSn extends BaseBean {
 
     @Column(name = "RAW_QTY")
     @ApiParam("数量")
-    private Long rawQty;
+    private Double rawQty;
 
     @Column(name = "LOT_NO")
     @ApiParam("生产批次")
@@ -65,7 +65,7 @@ public class MesRawPartSn extends BaseBean {
     @ApiParam("供应商代码")
     private String supplierCode;
 
-    public long getRawQtyVal() {
+    public double getRawQtyVal() {
         return this.rawQty == null ? 0l : this.rawQty;
     }
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfRawPartDataModel.java

@@ -39,7 +39,7 @@ public class IfRawPartDataModel extends BaseBean {
     private String serialNumber;
 
     @ApiParam("数量")
-    private BigDecimal qty;
+    private Double qty;
 
     @ApiParam("单位")
     private String unit;

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

@@ -6,18 +6,14 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.base.tool.HqlPack;
-import cn.estsh.i3plus.pojo.base.util.StringUtil;
 import cn.estsh.i3plus.pojo.wms.bean.*;
 import cn.estsh.i3plus.pojo.wms.dbinterface.WmsInterfaceDataMapper;
 import cn.estsh.i3plus.pojo.wms.engine.rule.EngineRulePersistence;
 import cn.estsh.i3plus.pojo.wms.engine.script.EngineScriptPersistence;
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.base.Strings;
-import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang3.StringUtils;
 
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -1203,6 +1199,8 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsQCMaster.getRefType(), "refType", result);
         //关联单据号
         DdlPreparedPack.getStringLikerPack(wmsQCMaster.getRefSrc(), "refSrc", result);
+        //单据状态
+        DdlPreparedPack.getNumEqualPack(wmsQCMaster.getOrderStatus(), "orderStatus", result);
 
         getStringBuilderPack(wmsQCMaster, result);