Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

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/sqlpack/WmsHqlPack.java

@@ -1222,13 +1222,13 @@ public class WmsHqlPack {
         DdlPackBean result = new DdlPackBean();
 
         // 查询参数封装
-        DdlPreparedPack.getStringLikerPack(wmsActionModule.getAmName(), "amName", result);
+        DdlPreparedPack.getStringLikerPack(wmsActionModule.getAmName(), "amDesc", result);
         DdlPreparedPack.getNumEqualPack(wmsActionModule.getId(), "id", result);
         DdlPreparedPack.getNumEqualPack(wmsActionModule.getAmType(), "amType", result);
         DdlPreparedPack.getStringEqualPack(wmsActionModule.getOpTypeCode(), "opTypeCode", result);
         DdlPreparedPack.getNumEqualPack(wmsActionModule.getIsShowInfo(), "isShowInfo", result);
-
-        getStringBuilderPack(wmsActionModule, result);
+        DdlPreparedPack.getNumEqualPack(wmsActionModule.getIsValid(), "isValid", result);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
 
         return result;
     }