diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 53f325f..80956f8 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -755,7 +755,8 @@ public class WmsEnumUtil { QC("QC", "质检"), CS("CS", "盘点"), DR("DR", "直送收货"), - AMPR("AMPR", "AMP拉动收货"); + AMPR("AMPR", "AMP拉动收货"), + OPENING("OPENING", "开口合同"); private String value; private String description; @@ -1697,7 +1698,8 @@ public class WmsEnumUtil { CHECK_DETAILS(40, "查看明细"), DELETE_DETAILS(50, "明细(删除)"), CLEAR_DETAILS(60, "明细(清空)"), - CUSTOM_BUTTON(70, "自定义按钮"); + CUSTOM_BUTTON(70, "自定义按钮"), + MAGNIFIER(80, "放大镜"); private int value; private String description; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 4e34946..99bac14 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -49,8 +49,8 @@ public class CoreHqlPack { */ public static String packHqlIds(String columnName, String[] params){ StringBuffer result = new StringBuffer(); - - // 参数数组 [1,2,3] -> "1,2,3" + HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); HqlPack.getInPack(String.join(",", params), columnName, result); return result.toString(); } @@ -63,6 +63,8 @@ public class CoreHqlPack { */ public static String packHqlIds(String columnName, Long[] params){ StringBuffer result = new StringBuffer(); + HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); // 参数数组 [1,2,3] -> "1,2,3" HqlPack.getInPack(StringUtils.join(params,","),columnName,result); @@ -524,13 +526,13 @@ public class CoreHqlPack { DdlPackBean result = DdlPackBean.getDdlPackBean(user); DdlPreparedPack.getNumEqualPack(user.getUserStatus(),"userStatus",result); - DdlPreparedPack.getNumEqualPack(user.getDepartmentId(),"departmentId",result); +// DdlPreparedPack.getNumEqualPack(user.getDepartmentId(),"departmentId",result); DdlPreparedPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",result); DdlPreparedPack.getStringLikerPack(user.getUserName(),"userName",result); DdlPreparedPack.getStringLikerPack(user.getUserEmail(),"userEmail",result); DdlPreparedPack.getStringLikerPack(user.getUserPhone(),"userPhone",result); - DdlPreparedPack.getStringEqualPack(user.getOrganizeCode(),"organizeCode",result); +// DdlPreparedPack.getStringEqualPack(user.getOrganizeCode(),"organizeCode",result); DdlPreparedPack.getInPackList(idList,"id",result); result.setOrderByStr(user.orderBy()); diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java index d546d76..22fe9f5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java @@ -74,6 +74,10 @@ public class WmsDocMovementSn extends BaseBean { @ApiParam("条码") public String sn; + @Column(name = "VENDOR_NO") + @ApiParam(value = "供应商编码") + public String vendorNo; + @Transient @ApiParam("前端表格编辑使用") private Boolean isSet = false;