diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java index 59ed0dd..b86e93b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java @@ -40,7 +40,7 @@ public class WmsUnit extends BaseBean { @ApiParam(value = "单位精度") private Integer unitPrecision; - public int getUnitPrecisionValue(){ + public Integer getUnitPrecisionValue(){ return this.unitPrecision == null?0:this.unitPrecision.intValue(); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java index 889fa6a..ff1eadc 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java @@ -108,7 +108,7 @@ public class WmsInterfaceDataMapper extends BaseBean { * 同步频率 */ @Column(name = "SYNC_FREQUENCY") - public int syncFrequency; + public Integer syncFrequency; /** * 上次同步时间 diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index c7628d4..c9fe1f4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -60,8 +60,12 @@ public class WmsHqlPack { DdlPreparedPack.getStringRightLikerPack(wmsFix.getFixMac(), "fixMac", result); DdlPreparedPack.getStringRightLikerPack(wmsFix.getFixName(), "fixName", result); - getStringBuilderPack(wmsFix, result); + if (StringUtils.isNotBlank(wmsFix.getOrganizeCode())) { + DdlPreparedPack.getStringEqualPack(wmsFix.getOrganizeCode(), "organizeCode", result); + } + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + DdlPreparedPack.getNumEqualPack(wmsFix.getIsValid(), "isValid", result); return result; } @@ -1024,6 +1028,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringLikerPack(wmsMoveMaster.getOrderNo(), "orderNo", result); DdlPreparedPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(), "orderStatus", result); DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getTransTypeCode(), "transTypeCode", result); + DdlPreparedPack.getNumEqualPack(wmsMoveMaster.getBusiTypeCode(), "busiTypeCode", result); DdlPreparedPack.getStringLikerPack(wmsMoveMaster.getCreateUser(), "createUser", result); DdlPreparedPack.getStringLikerPack(wmsMoveMaster.getModifyUser(), "modifyUser", result);