I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
yun-zuoyi
puxiao.liao 5 years ago
parent b64327831a 3f0646403f
commit 347197f305
16 changed files with 194 additions and 55 deletions
Show Stats Download Patch File Download Diff File

3
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java
Unescape Escape View File

@ -121,14 +121,17 @@ public class Material extends BaseAPS {
@Column(name="MIN_STOCK_COUNT", columnDefinition = "decimal(18,8)")
@ApiParam(value ="最小库存数量")
@FieldAnnotation(property = false)
private Double minStockCount;
@Column(name="SAFE_STOCK_COUNT", columnDefinition = "decimal(18,8)")
@ApiParam(value ="安全库存数量")
@FieldAnnotation(property = false)
private Double safeStockCount;
@Column(name="MAX_STOCK_COUNT", columnDefinition = "decimal(18,8)")
@ApiParam(value ="最大库存数量")
@FieldAnnotation(property = false)
private Double maxStockCount;
@Column(name="ORDER_BATCH_PERIOD")

2
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
Unescape Escape View File

@ -3379,7 +3379,7 @@ public class MesEnumUtil {
TASK_COMPLETE("taskComplete", "整个扫描完成"),
STEP_RAN_STATUS("stepRanStatus", "工步列表执行前"),
RUNNING_INFO("runningInfo", "执行信息"),
RENEW_REQUEST_PARAMS("renewRequestParams", "回传刷新StationResultBean");
STOP_PCS_CTL("stopPcsCtl", "停止监控");
private String value;

8
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
Unescape Escape View File

@ -1533,10 +1533,10 @@ public class MesPcnEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum DATA_SOURCE_TYPE {
SOURCE_MARIA_DB(10, "MariaDB", "MariaDB 10.1", "com.mysql.jdbc.Driver", 3306, null),
SOURCE_SQL_SERVER(20, "SQL Server", "SQL Server 2017", "com.microsoft.sqlserver.jdbc.SQLServerDriver", 1433, "dbo"),
SOURCE_ORACLE(30, "Oracle", "Oralce 12C", "oracle.jdbc.driver.OracleDriver", 1521, null),
SOURCE_POSTGRE_SQL(40, "PostgreSql", "PostgreSql 10.5", "org.postgresql.Driver", 5432, "public");
SOURCE_MARIA_DB(100, "MariaDB", "MariaDB 10.1", "com.mysql.jdbc.Driver", 3306, null),
SOURCE_SQL_SERVER(200, "SQL Server", "SQL Server 2017", "com.microsoft.sqlserver.jdbc.SQLServerDriver", 1433, "dbo"),
SOURCE_ORACLE(300, "Oracle", "Oralce 12C", "oracle.jdbc.driver.OracleDriver", 1521, null),
SOURCE_POSTGRE_SQL(400, "PostgreSql", "PostgreSql 10.5", "org.postgresql.Driver", 5432, "public");
private int value;
private String code;

45
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
Unescape Escape View File

@ -4875,4 +4875,49 @@ public class WmsEnumUtil {
}
}
/**
* 流程提交类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum GROUP_COMMIT_MODE {
JUST_CURRENT(10, 10, "只提交当前移动单"), REF_SRC(20, 20, "关联单据提交"),REF_GROUP(30, 30, "关联分组号提交");
private int value;
private int code;
private String description;
GROUP_COMMIT_MODE(int value, int code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public int getCode() {
return code;
}
public String getDescription() {
return description;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
}
}

12
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java
Unescape Escape View File

@ -266,6 +266,18 @@ public class DdlPreparedPack {
}
/**
* 封装String对象成equal语句
*
* @param columnName 列名
* @param packBean
*/
public static void getStringLikePack(String val, String columnName, DdlPackBean packBean) {
if (val != null && val.trim().length() > 0) {
packBean.addColumnQuery(columnName, " and model." + columnName + " like :m_" + columnName, val);
}
}
/**
* 封装String对象成不等于语句
*
* @param columnName 列名

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepResult.java
Unescape Escape View File

@ -19,11 +19,11 @@ public class StepResult<T> {
private String msg;
public static StepResult getSuccessComplete() {
return new StepResult(true);
return new StepResult(true,"");
}
public static StepResult getNonComplete() {
return new StepResult(false);
return new StepResult(false,"");
}
public static StepResult getSuccessComplete(String msg) {

4
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java
Unescape Escape View File

@ -29,7 +29,9 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PROD_BIND_RECORD", indexes = {
@Index(columnList = "SERIAL_NUMBER"),
@Index(columnList = "KP_SN")
@Index(columnList = "KP_SN"),
@Index(columnList = "CREATE_DATE_TIME"),
@Index(columnList = "ITEM_PART_NO")
})
@Api("产品绑定记录表")
public class MesProdBindRecord extends BaseBean {

3
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java
Unescape Escape View File

@ -26,7 +26,8 @@ import java.math.BigDecimal;
@Table(name = "MES_PRODUCE_SN", indexes = {
@Index(columnList = "SERIAL_NUMBER"),
@Index(columnList = "PRODUCT_SN"),
@Index(columnList = "CREATE_DATE_TIME")
@Index(columnList = "CREATE_DATE_TIME"),
@Index(columnList = "PART_NO")
})
@Api("产品条码表")
public class MesProduceSn extends BaseBean {

1
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java
Unescape Escape View File

@ -26,6 +26,7 @@ import javax.persistence.*;
@Index(columnList = "SERIAL_NUMBER"),
@Index(columnList = "PRODUCT_SN"),
@Index(columnList = "CREATE_DATE_TIME"),
@Index(columnList = "PART_NO"),
@Index(columnList = "MODIFY_DATE_TIME")
})
@Api("产品条码履历表")

23
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckData.java
Unescape Escape View File

@ -25,7 +25,8 @@ import java.util.List;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_QC_CHECK_DATA", indexes = {
@Index(columnList = "CREATE_DATE_TIME"),
@Index(columnList = "SN")
@Index(columnList = "SN"),
@Index(columnList = "partNo")
})
@Api("质量过程检测数据")
public class MesQcCheckData extends BaseBean {
@ -93,4 +94,24 @@ public class MesQcCheckData extends BaseBean {
@Column(name = "CUST_CODE")
@ApiParam("客户代码")
private String custCode;
@Transient
@ApiParam("物料名称")
private String partName;
@Transient
@ApiParam("班次")
private String shiftCode;
@Transient
@ApiParam("班组")
private String shiftGroupName;
@Transient
@ApiParam("班长")
private String squadLeader;
@Transient
@ApiParam("工作单元名称")
private String workCellName;
}

3
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java
Unescape Escape View File

@ -27,7 +27,8 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_REPAIR_RECORD", indexes = {
@Index(columnList = "SERIAL_NUMBER"),
@Index(columnList = "CREATE_DATE_TIME")
@Index(columnList = "CREATE_DATE_TIME"),
@Index(columnList = "PART_NO")
})
@Api("维修信息记录表")
public class MesRepairRecord extends BaseBean {

80
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
Unescape Escape View File

@ -1822,13 +1822,13 @@ public class MesHqlPack {
DdlPreparedPack.getStringLikerPack(mesProduceSn.getWorkOrderNo(), "workOrderNo", packBean);
}
if (!StringUtils.isEmpty(mesProduceSn.getPartNo())) {
DdlPreparedPack.getStringLikerPack(mesProduceSn.getPartNo(), "partNo", packBean);
DdlPreparedPack.getStringRightLikerPack(mesProduceSn.getPartNo(), "partNo", packBean);
}
if (!StringUtils.isEmpty(mesProduceSn.getSerialNumber())) {
DdlPreparedPack.getStringLikerPack(mesProduceSn.getSerialNumber(), "serialNumber", packBean);
DdlPreparedPack.getStringEqualPack(mesProduceSn.getSerialNumber(), "serialNumber", packBean);
}
if (!StringUtils.isEmpty(mesProduceSn.getProductSn())) {
DdlPreparedPack.getStringLikerPack(mesProduceSn.getProductSn(), "productSn", packBean);
DdlPreparedPack.getStringEqualPack(mesProduceSn.getProductSn(), "productSn", packBean);
}
if (!StringUtils.isEmpty(mesProduceSn.getWorkCenterCode())) {
DdlPreparedPack.getStringLikerPack(mesProduceSn.getWorkCenterCode(), "workCenterCode", packBean);
@ -1849,10 +1849,12 @@ public class MesHqlPack {
// mesProduceSn.getOutWorkCenterEndTime(),
// "outWorkCenterTime", packBean, true);
}
DdlPreparedPack.timeBuilder(
mesProduceSn.getCreateDateTimeStart(),
mesProduceSn.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
if (!StringUtils.isEmpty(mesProduceSn.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesProduceSn.getCreateDateTimeEnd())) {
DdlPreparedPack.timeBuilder(
mesProduceSn.getCreateDateTimeStart(),
mesProduceSn.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
}
return packBean;
}
@ -1865,11 +1867,11 @@ public class MesHqlPack {
*/
public static DdlPackBean getMesProdBindRecord(MesProdBindRecord mesProdBindRecord, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesProdBindRecord, organizeCode);
if (!StringUtils.isEmpty(mesProdBindRecord.getPartNo())) {
DdlPreparedPack.getStringLikerPack(mesProdBindRecord.getPartNo(), "partNo", packBean);
if (!StringUtils.isEmpty(mesProdBindRecord.getItemPartNo())) {
DdlPreparedPack.getStringRightLikerPack(mesProdBindRecord.getItemPartNo(), "itemPartNo", packBean);
}
if (!StringUtils.isEmpty(mesProdBindRecord.getSerialNumber())) {
DdlPreparedPack.getStringLikerPack(mesProdBindRecord.getSerialNumber(), "serialNumber", packBean);
DdlPreparedPack.getStringEqualPack(mesProdBindRecord.getSerialNumber(), "serialNumber", packBean);
}
if (!StringUtils.isEmpty(mesProdBindRecord.getKpSn())) {
DdlPreparedPack.getStringLikerPack(mesProdBindRecord.getKpSn(), "kpSn", packBean);
@ -1892,15 +1894,17 @@ public class MesHqlPack {
if (!StringUtils.isEmpty(mesProdBindRecord.getSupplierCode())) {
DdlPreparedPack.getStringLikerPack(mesProdBindRecord.getSupplierCode(), "supplierCode", packBean);
}
DdlPreparedPack.timeBuilder(
mesProdBindRecord.getCreateDateTimeStart(),
mesProdBindRecord.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
if(!StringUtils.isEmpty(mesProdBindRecord.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesProdBindRecord.getCreateDateTimeEnd())) {
DdlPreparedPack.timeBuilder(
mesProdBindRecord.getCreateDateTimeStart(),
mesProdBindRecord.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
}
return packBean;
}
/**
* 物料追溯
* 包装明细
*
* @param ifPackageDetail
* @param organizeCode
@ -1931,10 +1935,10 @@ public class MesHqlPack {
public static DdlPackBean getMesRepairRecord(MesRepairRecord mesRepairRecord, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesRepairRecord, organizeCode);
if (!StringUtils.isEmpty(mesRepairRecord.getPartNo())) {
DdlPreparedPack.getStringLikerPack(mesRepairRecord.getPartNo(), "partNo", packBean);
DdlPreparedPack.getStringRightLikerPack(mesRepairRecord.getPartNo(), "partNo", packBean);
}
if (!StringUtils.isEmpty(mesRepairRecord.getSerialNumber())) {
DdlPreparedPack.getStringLikerPack(mesRepairRecord.getSerialNumber(), "serialNumber", packBean);
DdlPreparedPack.getStringEqualPack(mesRepairRecord.getSerialNumber(), "serialNumber", packBean);
}
if (!StringUtils.isEmpty(mesRepairRecord.getWorkCenterCode())) {
DdlPreparedPack.getStringLikerPack(mesRepairRecord.getWorkCenterCode(), "workCenterCode", packBean);
@ -1951,10 +1955,12 @@ public class MesHqlPack {
if (!StringUtils.isEmpty(mesRepairRecord.getDcCode())) {
DdlPreparedPack.getStringLikerPack(mesRepairRecord.getDcCode(), "dcCode", packBean);
}
DdlPreparedPack.timeBuilder(
mesRepairRecord.getCreateDateTimeStart(),
mesRepairRecord.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
if (!StringUtils.isEmpty(mesRepairRecord.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesRepairRecord.getCreateDateTimeEnd())) {
DdlPreparedPack.timeBuilder(
mesRepairRecord.getCreateDateTimeStart(),
mesRepairRecord.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
}
return packBean;
}
@ -1968,15 +1974,15 @@ public class MesHqlPack {
public static DdlPackBean getMesQcCheckData(MesQcCheckData mesQcCheckData, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesQcCheckData, organizeCode);
if (!StringUtils.isEmpty(mesQcCheckData.getPartNo())) {
DdlPreparedPack.getStringLikerPack(mesQcCheckData.getPartNo(), "partNo", packBean);
DdlPreparedPack.getStringRightLikerPack(mesQcCheckData.getPartNo(), "partNo", packBean);
}
if (!StringUtils.isEmpty(mesQcCheckData.getOrderNo())) {
DdlPreparedPack.getStringLikerPack(mesQcCheckData.getOrderNo(), "orderNo", packBean);
}
if (!StringUtils.isEmpty(mesQcCheckData.getSn())) {
DdlPreparedPack.getStringLikerPack(mesQcCheckData.getSn(), "sn", packBean);
DdlPreparedPack.getStringEqualPack(mesQcCheckData.getSn(), "sn", packBean);
}
if (!StringUtils.isEmpty(mesQcCheckData.getCheckType())) {
if (mesQcCheckData.getCheckType() != null) {
DdlPreparedPack.getNumEqualPack(mesQcCheckData.getCheckType(), "checkType", packBean);
}
if (!StringUtils.isEmpty(mesQcCheckData.getWorkCenterCode())) {
@ -1985,10 +1991,12 @@ public class MesHqlPack {
if (!StringUtils.isEmpty(mesQcCheckData.getWorkCellCode())) {
DdlPreparedPack.getStringLikerPack(mesQcCheckData.getWorkCellCode(), "workCellCode", packBean);
}
DdlPreparedPack.timeBuilder(
mesQcCheckData.getCreateDateTimeStart(),
mesQcCheckData.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
if (!StringUtils.isEmpty(mesQcCheckData.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesQcCheckData.getCreateDateTimeEnd())) {
DdlPreparedPack.timeBuilder(
mesQcCheckData.getCreateDateTimeStart(),
mesQcCheckData.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
}
return packBean;
}
@ -2005,13 +2013,13 @@ public class MesHqlPack {
DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getWorkOrderNo(), "workOrderNo", packBean);
}
if (!StringUtils.isEmpty(mesProduceSnTravel.getPartNo())) {
DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getPartNo(), "partNo", packBean);
DdlPreparedPack.getStringRightLikerPack(mesProduceSnTravel.getPartNo(), "partNo", packBean);
}
if (!StringUtils.isEmpty(mesProduceSnTravel.getSerialNumber())) {
DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getSerialNumber(), "serialNumber", packBean);
DdlPreparedPack.getStringEqualPack(mesProduceSnTravel.getSerialNumber(), "serialNumber", packBean);
}
if (!StringUtils.isEmpty(mesProduceSnTravel.getProductSn())) {
DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getProductSn(), "productSn", packBean);
DdlPreparedPack.getStringEqualPack(mesProduceSnTravel.getProductSn(), "productSn", packBean);
}
if (!StringUtils.isEmpty(mesProduceSnTravel.getWorkCellCode())) {
DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getWorkCellCode(), "workCellCode", packBean);
@ -2028,10 +2036,12 @@ public class MesHqlPack {
if (!StringUtil.isEmpty(mesProduceSnTravel.getOutWorkCenterTimeEnd())) {
DdlPreparedPack.getStringSmallerPack(mesProduceSnTravel.getOutWorkCenterTimeEnd(), "outWorkCenterTime", packBean);
}
DdlPreparedPack.timeBuilder(
mesProduceSnTravel.getCreateDateTimeStart(),
mesProduceSnTravel.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
if (!StringUtils.isEmpty(mesProduceSnTravel.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesProduceSnTravel.getCreateDateTimeEnd())) {
DdlPreparedPack.timeBuilder(
mesProduceSnTravel.getCreateDateTimeStart(),
mesProduceSnTravel.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
}
return packBean;
}

16
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java
Unescape Escape View File

@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
@ -69,15 +70,14 @@ public class WmsActionGroup extends BaseBean {
@AnnoOutputColumn
private Integer autoInit;
// 1=true, 2 = false
@Column(name = "IS_COMMIT_REF_MOVE", nullable = false)
@ApiParam(value = "是否连带提交创建状态移动单", example = "2")
@AnnoOutputColumn
private Integer isCommitRefMove;
@Column(name = "COMMIT_MODE", nullable = false)
@ApiParam(value = "提交移动单模式")
@AnnoOutputColumn(refClass = WmsEnumUtil.GROUP_COMMIT_MODE.class)
private Integer commitMode;
// 1=true, 2 = false
@Column(name = "IS_AUTO_COMMIT", nullable = false)
@ApiParam(value = "是否自动提交", example = "1")
@ApiParam(value = "是否自动提交")
@AnnoOutputColumn
private Integer isAutoCommit;
@ -102,8 +102,8 @@ public class WmsActionGroup extends BaseBean {
return this.endAmId == null ? 0 : this.endAmId.longValue();
}
public int getIsCommitRefMoveVal() {
return this.isCommitRefMove == null ? 0 : this.isCommitRefMove.intValue();
public int getCommitModeVal() {
return this.commitMode == null ? 0 : this.commitMode.intValue();
}
public int getIsAutoCommitVal() {

20
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackage.java
Unescape Escape View File

@ -44,4 +44,24 @@ public class WmsPackage extends BaseBean {
@Column(name="PACKAGE_QTY")
@ApiParam(value = "包装件数", example = "1")
public Integer packageQty;
@Column(name="PACK_SPEC")
@ApiParam(value = "包装规格")
public String packSpec;
@Column(name="POCKET_NO")
@ApiParam(value = "容器编号")
public String pocketNo;
@Column(name="PRINT_STATUS")
@ApiParam(value = "打印状态", example = "1")
public Integer printStatus;
@Column(name="PACK_LEVEL")
@ApiParam(value = "包装层级", example = "1")
public Integer packLevel;
@Column(name="MEMO")
@ApiParam(value = "备注")
public String memo;
}

1
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java
Unescape Escape View File

@ -224,6 +224,7 @@ public class WmsPart extends BaseBean {
@Column(name="verb_num")
@ApiParam(value = "单次拆包数")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Double verbNum;
@Column(name = "IS_PROD_LOT")

24
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
Unescape Escape View File

@ -171,11 +171,33 @@ public class WmsHqlPack {
DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorCode(), "vendorCode", packBean);
DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorName(), "vendorName", packBean);
DdlPreparedPack.getStringRightLikerPack(swebProcurementPlanOrder.getOrderNo(), "orderNo", packBean);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", packBean);
getStringBuilderPack(swebProcurementPlanOrder, packBean);
return packBean;
}
/**
* 物理包装封装
*
* @param wmsPackage
* @return
*/
public static DdlPackBean packWmsPackage(WmsPackage wmsPackage) {
DdlPackBean packBean = new DdlPackBean();
//查询参数封装
DdlPreparedPack.getNumEqualPack(wmsPackage.getOrganizeCode(), "organizeCode", packBean);
DdlPreparedPack.getStringLikePack(wmsPackage.getPackageNo(), "packageNo", packBean);
DdlPreparedPack.getStringEqualPack(wmsPackage.getPackSpec(), "packSpec", packBean);
DdlPreparedPack.getStringLikePack(wmsPackage.getPocketNo(), "pocketNo", packBean);
DdlPreparedPack.getNumEqualPack(wmsPackage.getPackLevel(), "packLevel", packBean);
DdlPreparedPack.getNumEqualPack(wmsPackage.getIsValid()==null?CommonEnumUtil.IS_VAILD.VAILD.getValue():wmsPackage.getIsValid(), "isValid", packBean);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", packBean);
getStringBuilderPack(wmsPackage, packBean);
return packBean;
}
/**
* 库存移动单查询封装
*
* @param wmsDocMovementMaster
@ -1065,7 +1087,7 @@ public class WmsHqlPack {
//查询参数封装
DdlPreparedPack.getStringLikerPack(wmsPackage.getPackageNo(), "packageNo", result);
DdlPreparedPack.getStringLikerPack(wmsPackage.getParentPackageNo(), "parentPackageNo", result);
DdlPreparedPack.getNumEqualPack(wmsPackage.getPackTypeId(), "packTypeId", result);
// DdlPreparedPack.getNumEqualPack(wmsPackage.getPackTypeId(), "packTypeId", result);
getStringBuilderPack(wmsPackage, result);

Write Preview
Loading…
Cancel
Save