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

Merge remote-tracking branch 'remotes/origin/dev' into test

Browse Source
yun-zuoyi
汪云昊 5 years ago
parent a8ae48b132 30c0b2e46a
commit 2ab9045d17
14 changed files with 296 additions and 72 deletions
Show Stats Download Patch File Download Diff File

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

@ -985,6 +985,89 @@ public class BlockFormEnumUtil {
}
/**
* 元素组织隔离
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ELEMENT_ORGANIZE_ISOLATION_STATUS {
ON(1, "ON", "开启"),
OFF(2, "OFF", "关闭");
private int value;
private String code;
private String description;
private ELEMENT_ORGANIZE_ISOLATION_STATUS(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getCode() {
return code;
}
public String getDescription() {
return description;
}
public static String valueOfCode(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].code;
}
}
return tmp;
}
public static int codeOfValue(String code) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].code.equals(code)) {
tmp = values()[i].value;
}
}
return tmp;
}
public static String valueOfDescription(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 ELEMENT_ORGANIZE_ISOLATION_STATUS valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
return values()[i];
}
}
return null;
}
public static String codeOfDescription(String code) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].code.equals(code)) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* 属性字段排序规则
*/

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

@ -2013,8 +2013,8 @@ public class CommonEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ACTUATOR_ENV_PATH {
PID(1,"PID" ,"PID"),
JAVA_VERSION(2, "java.version","jdk版本");
PID(1,"/PID" ,"PID"),
JAVA_VERSION(2, "/java.version","jdk版本");
private int value;
private String path;

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

@ -1798,55 +1798,58 @@ public class MesEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_INSERT_EXCEL {
MES_PLAN_ORDER(10, "生产计划"),
MES_EQUIPMENT(20, "设备台账"),
MES_EQU_TASK_STANDARD(30, "设备作业要求"),
MES_CUST_ORDER(40, "客户订单"),
MES_PCN_SYNC_CFG(50, "PCN同步配置"),
MES_PART(60, "物料表"),
MES_PRODUCE_CATEGORY(70, "产品类型"),
MES_PACK_SPEC(80, "包装规格"),
MES_PROD_PACK(90, "产品包装关系"),
MES_PRODUCT_ENCODE_CFG(100, "产品编码配置"),
MES_BOM(110, "物料清单"),
MES_PROD_CFG_TYPE(120, "产品配置类型"),
MES_CUSTOMER(130, "客户表"),
MES_CUSTOMER_PART(140, "客户零件关系表"),
MES_WORK_CENTER(150, "生产线"),
MES_WORK_CELL(160, "工位"),
MES_WC_EQUIPMENT(170, "工位设备关系表"),
MES_SHIFT(180, "班次"),
MES_SHIFT_GROUP(190, "班组"),
MES_WORK_CELL_PARAM_CFG(200, "工作单元参数配置"),
MES_STATION_BOM(210, "工位BOM表"),
MES_DATA_OBJECT(220, "数据对象"),
MES_OBJECT_CFG(230, "对象结构"),
MES_WC_CHECK(240, "开线检查"),
MES_QC_CHECK_STANDARD(250, "质量检测标准"),
MES_FAULT_CAUSE(260, "设备故障原因"),
MES_FAULT_METHOD(270, "设备故障处理措施"),
MES_FAULT_PHENOMENON(280, "设备故障现象"),
MES_DEFECT(290, "缺陷"),
MES_DEFECT_CAUSE(300, "缺陷原因"),
MES_SCRAP(310, "报废原因"),
MES_REPAIR(320, "质量数据处理措施"),
MES_EQU_TASK_PLAN(330, "设备作业周期计划"),
MES_PART_OJBECT(340, "物料对象"),
MES_ROUTE_PROCESS_WORK_CELL(350, "工序工作单元"),
MES_DATASOURCE(360, "DB地址清单"),
MES_EQU_TASK_NOTIFY_CFG(370, "设备通知配置"),
MES_EQU_NOTIFY_OBJECT_CFG(380, "设备通知对象"),
MES_PLC(390, "PLC地址清单"),
MES_PROCESS(400, "工序信息"),
MES_KPSN_RULE(410, "关键件条码校验规则"),
MES_QUEUE_JIT_ACTUAL(420, "客户JIT生产队列"),
MES_PART_BOM_IMPORT(430, "散件BOM导入");
MES_PLAN_ORDER(10, "planOrderExcelImportService", "生产计划"),
MES_EQUIPMENT(20, "equipmentExcelImportService", "设备台账，支持编辑"),
MES_EQU_TASK_STANDARD(30, "equTaskStandardExcelImportService", "设备作业要求，支持编辑"),
MES_CUST_ORDER(40, "custOrderExcelImportService", "客户订单"),
MES_PCN_SYNC_CFG(50, "pcnSyncCfgExcelImportService", "PCN同步配置"),
MES_PART(60, "partExcelImportService", "物料表，支持编辑"),
MES_PRODUCE_CATEGORY(70, "produceCategoryExcelImportService", "产品类型"),
MES_PACK_SPEC(80, "packSpecExcelImportService", "包装规格，支持编辑"),
MES_PROD_PACK(90, "prodPackExcelImportService", "产品包装关系"),
MES_PRODUCT_ENCODE_CFG(100, "productEncodeCfgExcelImportService", "产品编码配置"),
MES_BOM(110, "bomExcelImportService", "物料清单，支持编辑"),
MES_PROD_CFG_TYPE(120, "prodCfgTypeExcelImportService", "产品配置类型"),
MES_CUSTOMER(130, "customerExcelImportService", "客户表，支持编辑"),
MES_CUSTOMER_PART(140, "customerPartExcelImportService", "客户零件关系表，支持编辑"),
MES_WORK_CENTER(150, "workCenterExcelImportService", "生产线，支持编辑"),
MES_WORK_CELL(160, "workCellExcelImportService", "工位，支持编辑"),
MES_WC_EQUIPMENT(170, "wcEquipmentExcelImportService", "工位设备关系表"),
MES_SHIFT(180, "shiftExcelImportService", "班次，支持编辑"),
MES_SHIFT_GROUP(190, "shiftGroupExcelImportService", "班组，支持编辑"),
MES_WORK_CELL_PARAM_CFG(200, "workCellParamCfgExcelImportService", "工作单元参数配置"),
MES_STATION_BOM(210, "stationBomExcelImportService", "工位BOM表"),
MES_DATA_OBJECT(220, "dataObjectExcelImportService", "数据对象"),
MES_OBJECT_CFG(230, "objectCfgExcelImportService", "对象结构"),
MES_WC_CHECK(240, "wcCheckExcelImportService", "开线检查，支持编辑"),
MES_QC_CHECK_STANDARD(250, "qcCheckStandardExcelImportService", "质量检测标准，支持编辑"),
MES_FAULT_CAUSE(260, "faultCauseExcelImportService", "设备故障原因，支持编辑"),
MES_FAULT_METHOD(270, "faultMethodExcelImportService", "设备故障处理措施，支持编辑"),
MES_FAULT_PHENOMENON(280, "faultPhenomenonExcelImportService", "设备故障现象，支持编辑"),
MES_DEFECT(290, "defectExcelImportService", "缺陷，支持编辑"),
MES_DEFECT_CAUSE(300, "defectCauseExcelImportService", "缺陷原因，支持编辑"),
MES_SCRAP(310, "scrapExcelImportService", "报废原因，支持编辑"),
MES_REPAIR(320, "repairExcelImportService", "质量数据处理措施，支持编辑"),
MES_EQU_TASK_PLAN(330, "equTaskPlanExcelImportService", "设备作业周期计划，支持编辑"),
MES_PART_OJBECT(340, "partObjectExcelImportService", "物料对象"),
MES_ROUTE_PROCESS_WORK_CELL(350, "routeProcessWorkCellExcelImportService", "工序工作单元"),
MES_DATASOURCE(360, "datasourceExcelImportService", "DB地址清单"),
MES_EQU_TASK_NOTIFY_CFG(370, "equTaskNotifyCfgExcelImportService", "设备通知配置"),
MES_EQU_NOTIFY_OBJECT_CFG(380, "equNotifyObjectCfgExcelImportService", "设备通知对象"),
MES_PLC(390, "plcExcelImportService", "PLC地址清单，支持编辑"),
MES_PROCESS(400, "processExcelImportService", "工序信息"),
MES_KPSN_RULE(410, "kpsnRuleExcelImportService", "关键件条码校验规则，支持编辑"),
MES_QUEUE_JIT_ACTUAL(420, "queueJitActualExcelImportService", "客户JIT生产队列"),
MES_PART_BOM_IMPORT(430, "partBomExcelImportService", "散件BOM导入"),
MES_PLAN_ORDER_BATCH_COMPILE(440, "planOrderBatchCompileExcelImportService", "生产计划批量编制");
private int value;
private String service;
private String description;
MES_INSERT_EXCEL(int value, String description) {
MES_INSERT_EXCEL(int value, String service, String description) {
this.value = value;
this.service = service;
this.description = description;
}
@ -1854,6 +1857,10 @@ public class MesEnumUtil {
return value;
}
public String getService() {
return service;
}
public String getDescription() {
return description;
}
@ -1867,7 +1874,6 @@ public class MesEnumUtil {
return null;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
@ -1878,6 +1884,16 @@ public class MesEnumUtil {
return tmp;
}
public static String valueOfService(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].service;
}
}
return tmp;
}
}
/**

11
modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java
Unescape Escape View File

@ -46,9 +46,14 @@ public class BfButton extends BaseBean {
}
}
@Column(name = "IS_REQUIRED_DATA")
@ApiParam(value = "是必填数据")
private Integer isRequiredData;
@Column(name = "IS_NEED_SELECT_DATA")
@ApiParam(value = "是否需要选中数据")
private Integer isNeedSelectData;
@Column(name = "IS_REFRESH")
@ApiParam(value = "是否刷新")
private Integer isRefresh;
// 关联表单功能表id
@Column(name = "METHOD_ID")

5
modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java
Unescape Escape View File

@ -1,6 +1,7 @@
package cn.estsh.i3plus.pojo.form.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
@ -66,6 +67,10 @@ public class BfDataObjectProperty extends BaseBean {
@ApiParam(value = "是否允许为空")
private Integer isNullable;
public Integer getIsNullableVal(){
return isNullable == null ? CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() : isNullable.intValue();
}
// 字段长度
@ApiParam(value = "字段长度")
@Column(name="OBJECT_COLUMN_PRECISION")

17
modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java
Unescape Escape View File

@ -1,6 +1,7 @@
package cn.estsh.i3plus.pojo.form.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.BlockFormEnumUtil;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
@ -82,6 +83,10 @@ public class BfElement extends BaseBean {
@ApiParam(value = "是否弱删除")
private Integer isObjectDelWeak;
public Integer getIsObjectDelWeakVal(){
return isObjectDelWeak == null ? BlockFormEnumUtil.ELEMENT_DELETE_WEAK_STATUS.OFF.getValue() : isObjectDelWeak.intValue();
}
@Column(name = "ELEMENT_DEL_WEAK_ATTR_ID")
@ApiParam(value = "元素弱删除属性id")
private Long elementDelWeakAttrId;
@ -90,10 +95,22 @@ public class BfElement extends BaseBean {
@ApiParam(value = "是否有效")
private Integer isObjectValid;
public Integer getIsObjectValidVal(){
return isObjectValid == null ? BlockFormEnumUtil.ELEMENT_VALID_STATUS.OFF.getValue() : isObjectValid.intValue();
}
@Column(name = "ELEMENT_VALID_ATTR_ID")
@ApiParam(value = "元素有效属性id")
private Long elementValidAttrId;
@Column(name = "IS_ORGANIZE_ISOLATION")
@ApiParam(value = "是否组织隔离")
private Integer isOrganizeIsolation;
public Integer getIsOrganizeIsolationVal(){
return isOrganizeIsolation == null ? BlockFormEnumUtil.ELEMENT_ORGANIZE_ISOLATION_STATUS.OFF.getValue() : isOrganizeIsolation.intValue();
}
@Column(name = "IS_OBJECT_EXPORT")
@ApiParam(value = "是否导出")
private Integer isObjectExport;

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

@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
/**
@ -50,4 +51,7 @@ public class MesShiftClassDetail extends BaseBean implements Serializable {
@ApiParam("工作中心代码")
private String workCenterCode;
@Transient
@ApiParam("开始-结束日期")
private String startEndTime;
}

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

@ -153,6 +153,26 @@ public class MesWorkOrder extends BaseBean implements Serializable {
@ApiParam("首检生成数量")
private Double fiGenerateQty;
@Column(name = "RESERVED1")
@ApiParam("预留字段1")
private String reserved1;
@Column(name = "RESERVED2")
@ApiParam("预留字段2")
private String reserved2;
@Column(name = "RESERVED3")
@ApiParam("预留字段13")
private String reserved3;
@Column(name = "RESERVED4")
@ApiParam("预留字段14")
private String reserved4;
@Column(name = "RESERVED5")
@ApiParam("预留字段5")
private String reserved5;
@Version
@Column(name = "LOCK_VERSION")
@ApiParam(value = "乐观锁", example = "1")
@ -248,6 +268,10 @@ public class MesWorkOrder extends BaseBean implements Serializable {
@ApiParam("工单状态描述")
private String workOrderStatusDesc;
@Transient
@ApiParam("计划类型")
private Integer planType;
public double getQtyVal() {
return this.qty == null ? 0.0d : this.qty;
}

1
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java
Unescape Escape View File

@ -339,6 +339,7 @@ public class CoreHqlPack {
}
DdlPreparedPack.getNumEqualPack(dictionary.getParentId(), "parentId", result);
DdlPreparedPack.getStringLikerPack(dictionary.getParentCodeRdd(), "parentCodeRdd", result);
DdlPreparedPack.getStringLikerPack(dictionary.getParentNameRdd(), "parentNameRdd", result);
DdlPreparedPack.getStringLikerPack(dictionary.getDictionaryValue(), "dictionaryValue", result);
DdlPreparedPack.getNumEqualPack(dictionary.getDictionarySoftType(), "dictionarySoftType", result);

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

@ -25,79 +25,79 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="WMS_DOC_FG_INSTOCK")
@Table(name = "WMS_DOC_FG_INSTOCK")
@Api("产品入库信息")
public class WmsFGInStock extends BaseBean {
private static final long serialVersionUID = 5337952801731230326L;
@Column(name="ORDER_NO")
@Column(name = "ORDER_NO")
@ApiParam("订单号")
public String orderNo;
@Column(name="WO_NO")
@Column(name = "WO_NO")
@ApiParam("ERP工单号")
public String woNo;
@Column(name="PART_NO")
@Column(name = "PART_NO")
@ApiParam("物料编码")
public String partNo;
@Column(name="PART_NAME_RDD")
@Column(name = "PART_NAME_RDD")
@ApiParam("物料名称")
public String partNameRdd;
@Column(name="QTY", columnDefinition = "decimal(18,8)")
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "需求数量", example = "0")
public Double qty;
@Column(name="UNIT")
@Column(name = "UNIT")
@ApiParam("单位")
public String unit;
@Column(name="SN")
@Column(name = "SN")
@ApiParam("条码")
public String sn;
/**
* 状态：1=新建,10=已处理,20=处理出错
*/
@Column(name="ORDER_STATUS")
@Column(name = "ORDER_STATUS")
@ApiParam(value = "状态", example = "1")
public Integer orderStatus;
@Column(name="REMARK")
@Column(name = "REMARK")
@ApiParam("备注")
public String remark;
/**
* 来源：MNU=手工,MES=MES接口
*/
@Column(name="SRC")
@Column(name = "SRC")
@ApiParam("单据来源")
public String src;
@Column(name="ERP_AREA_NO")
@Column(name = "ERP_AREA_NO")
@ApiParam("默认收货库存地")
public String erpAreaNo;
@Column(name="LINE_NO")
@Column(name = "LINE_NO")
@ApiParam("生产线")
public String lineNo;
@Column(name="WH_NO")
@Column(name = "WH_NO")
@ApiParam("默认仓库")
public String whNo;
@Column(name="CUST_NO")
@Column(name = "CUST_NO")
@ApiParam("客户编码")
public String custNo;
@Column(name="SHIPPING_FLAG")
@Column(name = "SHIPPING_FLAG")
@ApiParam("特殊发货标志")
public String shippingFlag;
@Column(name="MFG_LOG_NO")
@Column(name = "MFG_LOG_NO")
@ApiParam("生产批次")
public String mfgLogNo;
}

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

@ -12,7 +12,11 @@ import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.springframework.format.annotation.DateTimeFormat;
import javax.persistence.*;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.Date;
import java.util.List;
@ -501,4 +505,28 @@ public class WmsStockSn extends BaseBean {
this.modifyUser = modifyUser;
}
public WmsStockSn(String organizeCode, String refSrc, String partNo, String partNameRdd, Integer snType,
String locateNo, String workCenterCode, String packageNo, String shippingFlag, String lotNo, String dateCode, String fixLotNo
, String leftCode, Double qty, String sn, String createUser, String createDatetime, String modifyDatetime, String modifyUser) {
this.organizeCode = organizeCode;
this.refSrc = refSrc;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.snType = snType;
this.locateNo = locateNo;
this.workCenterCode = workCenterCode;
this.packageNo = packageNo;
this.shippingFlag = shippingFlag;
this.lotNo = lotNo;
this.dateCode = dateCode;
this.fixLotNo = fixLotNo;
this.leftCode = leftCode;
this.qty = qty;
this.sn = sn;
this.createUser = createUser;
this.createDatetime = createDatetime;
this.modifyUser = modifyUser;
this.modifyDatetime = modifyDatetime;
}
}

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

@ -1,6 +1,8 @@
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 io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -47,6 +49,7 @@ public class WmsTestResultDetails extends BaseBean {
@Column(name = "CHECK_TYPE")
@ApiParam("大检测项类型")
@AnnoOutputColumn(refClass = WmsEnumUtil.BH_CHECK_TYPE.class, refForeignKey = "value", value = "description")
public Integer checkType;
@Column(name = "qr_code")
@ -55,6 +58,7 @@ public class WmsTestResultDetails extends BaseBean {
@Column(name = "is_qualified")
@ApiParam("是否合格")
@AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
public Integer isQualified;
@Column(name = "check_value")

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

@ -55,6 +55,7 @@ public class WmsTestResultSummary extends BaseBean {
@Column(name = "IS_QUALIFIED")
@ApiParam("是否合格")
@AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
public Integer isQualified;
@Column(name = "REWORK_STATUS")

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

@ -3127,12 +3127,48 @@ public class WmsHqlPack {
DdlPreparedPack.getStringEqualPack(wmsTestResultSummary.getFlagNo(), "flagNo", result);
DdlPreparedPack.getNumEqualPack(wmsTestResultSummary.getReworkResult(), "reworkStatus", result);
DdlPreparedPack.getNumEqualPack(wmsTestResultSummary.getPickStatus(), "pickStatus", result);
DdlPreparedPack.timeBuilder(wmsTestResultSummary.getCreateDateTimeStart(),
wmsTestResultSummary.getCreateDateTimeEnd(), "createDatetime", result, true);
DdlPreparedPack.timeBuilder(wmsTestResultSummary.getModifyDateTimeStart(),
wmsTestResultSummary.getModifyDateTimeEnd(), "modifyDateTime", result, true);
if (StringUtils.isNotBlank(wmsTestResultSummary.getCreateDateTimeStart())) {
DdlPreparedPack.timeBuilder(wmsTestResultSummary.getCreateDateTimeStart(),
wmsTestResultSummary.getCreateDateTimeEnd(), "createDatetime", result, true);
}
if (StringUtils.isNotBlank(wmsTestResultSummary.getModifyDateTimeStart())) {
DdlPreparedPack.timeBuilder(wmsTestResultSummary.getModifyDateTimeStart(),
wmsTestResultSummary.getModifyDateTimeEnd(), "modifyDateTime", result, true);
}
getStringBuilderPack(wmsTestResultSummary, result);
return result;
}
/**
* 检测结果明细表 分页查询
*
* @param wmsTestResultDetails
* @return
*/
public static DdlPackBean packHqWmsTestResultDetails(WmsTestResultDetails wmsTestResultDetails) {
DdlPackBean result = new DdlPackBean();
//查询参数封装
DdlPreparedPack.getStringLikerPack(wmsTestResultDetails.getBhCode(), "bhCode", result);
DdlPreparedPack.getStringEqualPack(wmsTestResultDetails.getWorkCenterCode(), "workCenterCode", result);
DdlPreparedPack.getNumEqualPack(wmsTestResultDetails.getCheckType(), "checkType", result);
DdlPreparedPack.getStringEqualPack(wmsTestResultDetails.getPartNo(), "partNo", result);
DdlPreparedPack.getStringEqualPack(wmsTestResultDetails.getQrCode(), "qrCode", result);
if (StringUtils.isNotBlank(wmsTestResultDetails.getCreateDateTimeStart())) {
DdlPreparedPack.timeBuilder(wmsTestResultDetails.getCreateDateTimeStart(),
wmsTestResultDetails.getCreateDateTimeEnd(), "createDatetime", result, true);
}
if (StringUtils.isNotBlank(wmsTestResultDetails.getModifyDateTimeStart())) {
DdlPreparedPack.timeBuilder(wmsTestResultDetails.getModifyDateTimeStart(),
wmsTestResultDetails.getModifyDateTimeEnd(), "modifyDateTime", result, true);
}
getStringBuilderPack(wmsTestResultDetails, result);
return result;
}
}

Write Preview
Loading…
Cancel
Save