Merge branch 'dev' into test

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java

@@ -2691,7 +2691,8 @@ public class WmsEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum SRC_STATUS {
         ZMMES("ZMMES", "知明MES"),
-        TBMES("TBMES", "MES接口");
+        TBMES("TBMES", "MES接口"),
+        AMP("AMP","AMP系统");
 
         private String value;
         private String description;

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

@@ -62,8 +62,8 @@ public class AmpJisRec extends BaseBean{
     public Integer orderStatus;
 
     @Column(name="VENDOR_NO")
-    @ApiParam(value = "g供应商编码", example = "10")
+    @ApiParam(value = "供应商编码", example = "10")
-    public Integer vendorNo;
+    public String vendorNo;
 
     @Column(name="REMARK")
     @ApiParam("备注")
@@ -109,4 +109,12 @@ public class AmpJisRec extends BaseBean{
     @ApiParam("ERP同步标识 ERP同步标识：10=待同步，20=同步成功，30=同步失败" )
     public Integer erpSyncFlag;
 
+    public AmpJisRec(Long id,String partNo, String partNameRdd,String vendorNo,Double qty,String unit){
+        this.id= id;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.vendorNo = vendorNo;
+        this.qty = qty;
+        this.unit = unit;
+    }
 }

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

@@ -329,7 +329,7 @@ public class WmsHqlPack {
     public static DdlPackBean packHqlWmsOpType(WmsOpType wmsOpType) {
         DdlPackBean result = new DdlPackBean();
 
-        DdlPreparedPack.getStringEqualPack(wmsOpType.getOpTypeCode(), "opTypeCode", result);
+        DdlPreparedPack.getStringLikerPack(wmsOpType.getOpTypeCode(), "opTypeCode", result);
         DdlPreparedPack.getStringLikerPack(wmsOpType.getOpTypeName(), "opTypeName", result);
         DdlPreparedPack.getNumEqualPack(wmsOpType.getSeq(), "seq", result);
 
@@ -1115,7 +1115,7 @@ public class WmsHqlPack {
     public static DdlPackBean packHqlWmsStockSnReportByPager(WmsStockSn wmsStockSn) {
         DdlPackBean result = new DdlPackBean();
 
-        DdlPreparedPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result);
+        DdlPreparedPack.getStringLikerPack(wmsStockSn.getRefSrc(), "refSrc", result);
 
         // 物料编码支持多选
         DdlPreparedPack.getInPackList(wmsStockSn.getPartNoList(), "partNo", result);
@@ -1434,7 +1434,7 @@ public class WmsHqlPack {
      */
     public static DdlPackBean packHqlWmsSnPrintRcd(WmsSnPrintRcd wmsSnPrintRcd) {
         DdlPackBean result = new DdlPackBean();
-        DdlPreparedPack.getStringEqualPack(wmsSnPrintRcd.getSn(), "sn", result);
+        DdlPreparedPack.getStringLikerPack(wmsSnPrintRcd.getSn(), "sn", result);
         DdlPreparedPack.getStringEqualPack(wmsSnPrintRcd.getZoneNo(), "zoneNo", result);
         DdlPreparedPack.getStringEqualPack(wmsSnPrintRcd.getWhNo(), "whNo", result);
         DdlPreparedPack.getStringEqualPack(wmsSnPrintRcd.getPartNo(), "partNo", result);