diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java index 6b6f7c2..1575b05 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java @@ -84,6 +84,7 @@ public class AndonHqlPack { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCenterCode(), "workCenterCode", result); + DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCellCode(), "workCellCode", result); getStringBuilderPack(mesWorkCell, result); return result; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index 60eec44..6dc423e 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -247,7 +247,7 @@ public class AndonEnumUtil { EQUIP("EQUMENT_ALARM","设备"), PROCESS("ROUTING_ALARM","工艺"), CHECK("OTHER_ALARM","其他"), - FIX_ERROR("FIX_ERROR", "设备故障"); + FIX_ERROR("FIX_ERROR", "自动报警"); private String value; private String description; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 46454dd..1280e58 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -884,4 +884,9 @@ public class CommonEnumUtil { return tmp; } } + + // 数据有效的静态常量 + public static final int VALID = CommonEnumUtil.IS_VAILD.VAILD.getValue(); + // 数据未删除的静态常量 + public static final int FALSE = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); } 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 7449fe8..eb4a508 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 @@ -1761,6 +1761,15 @@ public class WmsEnumUtil { public String getDescription() { return description; } + + public static DATA_OBJ_TYPE codeOf(Integer val) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } } /** @@ -2582,4 +2591,60 @@ public class WmsEnumUtil { return tmp; } } -} + + /** + * PO ASN 收货状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PO_RECEIVE_STATUS { + WAITING_RECEIVE_TIME_EARLY("R0001", "待收货"), + RECEIVEING_TIME_EARLY("R0002", "提前收货中"), + RECEIVED_IIME_EARLY("R0003", "提前收货完成"), + WAITING_RECEIVE_TIME_IN("R0004", "待收货"), + RECEIVEING_TIME_IN("R0005", "正常收货中"), + RECEIVED_TIME_IN("R0006", "正常收货完成"), + WAITING_RECEIVE_TIME_LATE("R0007", "延迟未收货"), + RECEIVEING_TIME_LATE("R0008", "延迟收货中"), + RECEIVED_TIME_LATE("R0009", "延迟收货完成"), + STATUS_NEED_TO_CHECK("R0010", "待查询"); + + private String value; + private String description; + + PO_RECEIVE_STATUS(String value, String description) { + this.value = value; + this.description = description; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return value; + } + + public String getValue() { + return value; + } + + public static PO_RECEIVE_STATUS codeOf(String value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(value)) { + return values()[i]; + } + } + return null; + } + + public static String getDes(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } +} \ No newline at end of file diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java index 0e72b17..b20df0e 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.model.wms; import io.swagger.annotations.ApiParam; import lombok.Data; +import javax.persistence.Column; import java.io.Serializable; /** @@ -16,19 +17,55 @@ import java.io.Serializable; public class WmsTaskInfoModel implements Serializable { @ApiParam("任务单号") public String orderNo; - - @ApiParam("关联单号") - public String refSrc; - + @Column(name = "TRANS_TYPE_CODE") /** * 状态:1=创建,10=待处理,20=已处理 */ @ApiParam(value = "任务状态") - public String taskStatus; + public Integer taskStatus; @ApiParam("作业类型名称") public String opTypeName; + @ApiParam(value = "交易类型代码") + private String transTypeCode; + + @ApiParam("关联单号") + public String refSrc; + @ApiParam(value = "关联单据类型") private String refType; + + @Column(name = "ZDATE") + @ApiParam(value = "计划日期") + private String zdate; + + @Column(name = "ZTIME") + @ApiParam(value = "计划时间") + private String ztime; + + @Column(name = "CUST_NO") + @ApiParam(value = "客户编号") + private String custNo; + + @Column(name = "VENDOR_NO") + @ApiParam(value = "供应商编号") + private String vendorNo; + + public WmsTaskInfoModel() { + } + + public WmsTaskInfoModel(String orderNo, Integer taskStatus, String opTypeName, String transTypeCode, String refSrc, + String refType, String zdate, String ztime, String custNo, String vendorNo) { + this.orderNo = orderNo; + this.taskStatus = taskStatus; + this.opTypeName = opTypeName; + this.transTypeCode = transTypeCode; + this.refSrc = refSrc; + this.refType = refType; + this.zdate = zdate; + this.ztime = ztime; + this.custNo = custNo; + this.vendorNo = vendorNo; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java index 913e031..c734ff1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java @@ -122,7 +122,7 @@ public class WmsASNMasterDetails extends BaseBean { @Version @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1") - public transient int lockVersion; + public transient Integer lockVersion; @Transient @ApiParam("实收数量") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataAuth.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataAuth.java index 1198e5b..f6e5a8e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataAuth.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataAuth.java @@ -34,7 +34,11 @@ public class WmsDataAuth extends BaseBean { @Column(name = "DATA_OBJ") @ApiParam(value = "数据对象") - private String dataObj; + private Integer dataObj; + + public String getDataObjString() { + return String.valueOf(dataObj); + } @Column(name = "DATA_OBJ_VALUE") @ApiParam(value = "数据对象值") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 7c8267c..67377b4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -209,5 +209,5 @@ public class WmsDocMovementDetails extends BaseBean { @Version @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1") - public transient int lockVersion; + public transient Integer lockVersion; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java index e6e934f..314e492 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java @@ -146,7 +146,7 @@ public class WmsPOMasterDetails extends BaseBean { @Version @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1") - private transient int lockVersion; + private transient Integer lockVersion; @Transient @ApiParam("PO条码总箱数") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java index e90728d..e51bbaa 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java @@ -119,4 +119,20 @@ public class WmsPoSn extends BaseBean { @Transient @ApiParam(value = "工厂名称") public String organizeName; + + @Transient + @ApiParam(value = "最早收货时间") + public String earliestReceTime; + + @Transient + @ApiParam(value = "最晚收货时间") + public String latestReceTime; + + public WmsPoSn(){} + + public WmsPoSn(String orderNo,String earliestReceTime,String latestReceTime){ + this.orderNo = orderNo; + this.earliestReceTime = earliestReceTime; + this.latestReceTime = latestReceTime; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java index f7ed231..d7e8232 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java @@ -84,5 +84,5 @@ public class WmsQCDetails extends BaseBean { @Version @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1") - public transient int lockVersion; + public transient Integer lockVersion; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 23eb182..49df331 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -151,6 +151,10 @@ public class WmsStockSn extends BaseBean { @ApiParam(value = "客户条码") private String custSn; + @Column(name = "ERP_ZONE_NO") + @ApiParam(value = "ERP库存地") + public String erpZoneNo; + @ApiParam(value = "仓库名称") @Transient public String whNameRdd; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java index 8442671..20c7692 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java @@ -5,7 +5,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Column; import java.util.List; /** @@ -23,7 +22,7 @@ public class WmsDataAuthModel extends BaseBean { private String roleCode; @ApiParam("数据对象") - private String dataObj; + private Integer dataObj; @ApiParam("数据对象值") private String dataObjValue; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java new file mode 100644 index 0000000..e380985 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java @@ -0,0 +1,84 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.time.LocalTime; + +/** + * @Description : 供应商收货看板信息 + * @Reference : + * @Author : sky.meng + * @CreateDate : 2019-06-24 15:04 + * @Modify: + **/ +@Data +@Api("供应商收货看板") +public class WmsPoAsnRecvModel extends BaseBean implements Comparable{ + + @ApiParam("订单号") + private String orderNo; + @ApiParam("供应商名称") + private String vendorName; + @ApiParam("收货通道") + private String dock; + @ApiParam("项目代码") + private String prodCfgTypeCode; + @ApiParam("项目名称") + private String prodCfgTypeName; + @ApiParam("计划收货日期") + private String planDate; + @ApiParam("计划收货时间") + private String planTime; + @ApiParam("总数量") + private Double qty; + @ApiParam("已收货数量") + private Double recQty; + @ApiParam("最早收货时间") + private String earliestReceTime; + @ApiParam("最晚收货时间") + private String latestReceTime; + @ApiParam("供应商号码") + private String vendorNo; + @ApiParam("物料") + private String partNo; + @ApiParam("收货状态") + private String receiveStatus; + + public WmsPoAsnRecvModel(String orderNo,String dock,String vendorNo,String prodCfgTypeCode, String prodCfgTypeName,String planDate,String planTime,Double qty,Double recQty){ + this.orderNo = orderNo; + this.dock = dock; + this.planDate = planDate; + this.planTime = planTime; + this.qty = qty; + this.recQty = recQty; + this.prodCfgTypeCode = prodCfgTypeCode; + this.prodCfgTypeName = prodCfgTypeName; + this.vendorNo = vendorNo; + + } + public WmsPoAsnRecvModel(String orderNo,String dock,String planDate,String planTime){ + this.orderNo = orderNo; + this.dock = dock; + this.planDate = planDate; + this.planTime = planTime; + } + public WmsPoAsnRecvModel(){} + + @Override + public int compareTo(WmsPoAsnRecvModel o) { + return getLocalTime(this.getPlanTime()).isAfter(getLocalTime(o.getPlanTime()))? 1 : 0; + } + + public static LocalTime getLocalTime(String planTime){ + LocalTime time = null; + try { + time = LocalTime.parse(planTime); + }catch (Exception e){ + e.printStackTrace(); + } + return time; + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsBomTotalRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsBomTotalRepository.java new file mode 100644 index 0000000..f49f127 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsBomTotalRepository.java @@ -0,0 +1,12 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsBomTotal; +import org.springframework.stereotype.Repository; + +/** + * Created by Administrator on 2019/6/25. + */ +@Repository +public interface WmsBomTotalRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsWorkCenterRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsWorkCenterRepository.java index b662fb2..a6a06a4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsWorkCenterRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsWorkCenterRepository.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.wms.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.wms.bean.WmsWorkCenter; +import org.springframework.stereotype.Repository; /** * @Description : 产线信息管理(工作中心) @@ -10,6 +11,7 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsWorkCenter; * @CreateDate : 2019-06-19 16:20 * @Modify: **/ +@Repository public interface WmsWorkCenterRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsWorkCenterZoneRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsWorkCenterZoneRepository.java index 071dfd4..1d79a06 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsWorkCenterZoneRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsWorkCenterZoneRepository.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.wms.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.wms.bean.WmsWorkCenterZone; +import org.springframework.stereotype.Repository; /** * @Description : 产线(工作中心)-存储区信息管理 @@ -10,5 +11,6 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsWorkCenterZone; * @CreateDate : 2019-06-20 14:55 * @Modify: **/ +@Repository public interface WmsWorkCenterZoneRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsZonesRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsZonesRepository.java index 776cec3..eb99d06 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsZonesRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsZonesRepository.java @@ -1,7 +1,9 @@ package cn.estsh.i3plus.pojo.wms.repository; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.wms.bean.WmsZones; +import org.springframework.data.jpa.repository.Query; import org.springframework.stereotype.Repository; /** @@ -14,4 +16,11 @@ import org.springframework.stereotype.Repository; @Repository public interface WmsZonesRepository extends BaseRepository { + /** + * 根据工厂代码和存储编号查询存储区信息 + * @param organizeCode 工厂代码 + * @param zoneNo 存储区编号 + * @return 存储区信息 + */ + WmsZones getFirstByOrganizeCodeAndZoneNo(String organizeCode, String zoneNo); } 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 02967a4..fc513e2 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 @@ -21,7 +21,6 @@ import java.util.stream.Collectors; * @Reference : * @Author : silliter.yuan * @CreateDate : 2018-10-31 10:45 - * @CreateDate : 2019-06-25 * @Modify: **/ public class WmsHqlPack { @@ -1466,9 +1465,7 @@ public class WmsHqlPack { */ public static DdlPackBean packHqlWmsDataAuth(WmsDataAuth dataAuth, List roleIds) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringEqualPack(dataAuth.getDataObj(), "dataObj", result); - DdlPreparedPack.getStringEqualPack(dataAuth.getOrganizeCode(),"organizeCode",result); -// String data = String.join(",", roleIds); + DdlPreparedPack.getNumEqualPack(dataAuth.getDataObj(), "dataObj", result); DdlPreparedPack.getInPackList(roleIds, "roleCode", result); getStringBuilderPack(dataAuth, result); return result; @@ -1615,8 +1612,8 @@ public class WmsHqlPack { if (!Strings.isNullOrEmpty(wmsDataAuth.getRoleCode())) { DdlPreparedPack.getStringEqualPack(wmsDataAuth.getRoleCode(), "roleCode", result); } - if (!Strings.isNullOrEmpty(wmsDataAuth.getDataObj())) { - DdlPreparedPack.getStringEqualPack(wmsDataAuth.getDataObj(), "dataObj", result); + if (wmsDataAuth.getDataObj() != null && wmsDataAuth.getDataObj().intValue() != 0) { + DdlPreparedPack.getNumEqualPack(wmsDataAuth.getDataObj(), "dataObj", result); } if (!Strings.isNullOrEmpty(wmsDataAuth.getDataObjValue())) { DdlPreparedPack.getStringRightLikerPack(wmsDataAuth.getDataObjValue(), "dataObjValue", result);