From c7e5524a0a794637c56343703f62d84c85da0b9e Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sun, 11 Oct 2020 14:34:10 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A0=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E7=94=9F=E4=BA=A7=E6=89=A3=E5=87=8F=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=89=A3=E5=87=8F=E6=9D=A1=E7=A0=81=E7=8A=B6=E6=80=81=E5=8F=AA?= =?UTF-8?q?=E8=83=BD=E4=B8=BA=E5=85=A5=E5=BA=93=EF=BC=8C=E5=90=88=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 8 ++++++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index bb34224..d6123bd 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -117,6 +117,14 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam("司机") public String driverNo; + @Column(name = "TMS_CAR_NO") + @ApiParam(value = "TMS车牌号") + private String tmsCarNo; + + @Column(name = "TMS_DRIVER_NO") + @ApiParam("TMS司机") + public String tmsDriverNo; + @Column(name = "CUST_ORDER_NO") @ApiParam(value = "客户单号") private String custOrderNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java index 733c9d0..5c7fdeb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java @@ -77,6 +77,14 @@ public class WmsMoveToERP extends BaseBean { @ApiParam("司机") public String driverNo; + @Column(name = "TMS_CAR_NO") + @ApiParam(value = "TMS车牌号") + private String tmsCarNo; + + @Column(name = "TMS_DRIVER_NO") + @ApiParam("TMS司机") + public String tmsDriverNo; + @Column(name="ITEM") @ApiParam(value = "行号") public String item; From f52f07fe77775a9bfb4d6798bd39a2f1dc5fd4c8 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Sun, 11 Oct 2020 16:51:27 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=A4=87=E4=BB=B6=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 97 ++++++++++++++++++++-- .../i3plus/pojo/mes/bean/IfProductOffLine.java | 7 +- .../model/excel/mgnbj/SparePartsImportModel.java | 61 ++++++++++++++ .../mes/model/excel/mgnbj/SparePartsJspModel.java | 23 +++++ .../pojo/mes/model/mgnbj/MgnBjJitPlanModel.java | 6 +- .../cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java | 6 ++ 6 files changed, 188 insertions(+), 12 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsImportModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsJspModel.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 7b07732..520d956 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -16,16 +16,18 @@ public class MesEnumUtil { * MES_SPC关键数据 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum SPC_KEY_DATA_OBJECT_TYPE{ - POJO_OBJECT(10,"实体对象（单表）"), - DYNAMIC(20,"动态对象（生产数据表）"); + public enum SPC_KEY_DATA_OBJECT_TYPE { + POJO_OBJECT(10, "实体对象（单表）"), + DYNAMIC(20, "动态对象（生产数据表）"); private Integer value; private String description; - SPC_KEY_DATA_OBJECT_TYPE(Integer value,String description ){ + + SPC_KEY_DATA_OBJECT_TYPE(Integer value, String description) { this.value = value; this.description = description; } + public static String valueOfDesc(String val) { for (int i = 0; i < values().length; i++) { if (values()[i].value.equals(val)) { @@ -154,16 +156,17 @@ public class MesEnumUtil { * 启用还是禁用 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum IS_VALID{ - YES(1,"启用"), - NO(2,"禁用"); + public enum IS_VALID { + YES(1, "启用"), + NO(2, "禁用"); private Integer isValid; private String description; - IS_VALID(int isValid,String description){ + IS_VALID(int isValid, String description) { this.isValid = isValid; this.description = description; } + public int getIsValid() { return isValid; } @@ -180,6 +183,7 @@ public class MesEnumUtil { this.description = description; } } + /** * 排序方式 */ @@ -2055,7 +2059,8 @@ public class MesEnumUtil { MES_PROD_CFG_DETAIL(560, "prodCfgDetailExcelService", "产品配置明细导入"), MES_LOCATION(570, "locationExcelService", "库位信息导入"), MES_SUB_PART(580, "mesSubPartExcelService", "替代料导入"), - MES_WORK_CELL_DEFECT(590, "workCellDefectExcelService", "工位缺陷信息导入"); + MES_WORK_CELL_DEFECT(590, "workCellDefectExcelService", "工位缺陷信息导入"), + MES_SPARE_PARTS(600, "sparePartsExcelService", "备件计划导入"); private int value; private String service; @@ -7702,4 +7707,78 @@ public class MesEnumUtil { } } + /** + * edi解析方式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum EDI_PARSE_TYPE { + JOB(10, "定时任务解析文件"), + SPARE_PARTS(20, "备件excel上传"); + + private int value; + private String description; + + EDI_PARSE_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + 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; + } + } + + /** + * edi解析方式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum EDI_REPORT_TYPE { + JSP(1, "jsp解析"), + JSA(2, "jsa解析"); + + private int value; + private String description; + + EDI_REPORT_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getValueStr() { + return value + ""; + } + + public String getDescription() { + return description; + } + + 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; + } + } + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java index 001d4cd..ba85092 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -28,7 +29,7 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Table(name = "IF_PRODUCT_OFF_LINE") @Api("生产报工表") -public class IfProductOffLine extends BaseBean implements Serializable { +public class IfProductOffLine extends BaseBean implements Serializable { private static final long serialVersionUID = -4960147948435537306L; @Column(name = "PART_NO") @@ -148,4 +149,8 @@ public class IfProductOffLine extends BaseBean implements Serializable { @Column(name = "CUST_PROD_LINE_CODE") @ApiParam("客户产线代码") private String custProdLineCode; + + @Column(name = "BASE_MODULE") + @ApiParam("BaseModule零件号") + private String baseModule; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsImportModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsImportModel.java new file mode 100644 index 0000000..d649fd4 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsImportModel.java @@ -0,0 +1,61 @@ +package cn.estsh.i3plus.pojo.mes.model.excel.mgnbj; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.HashMap; +import java.util.Map; + +/** + * @author Wynne.Lu + * @date 2020/10/10 13:15 + * @desc + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +@Api("备件计划导入model") +public class SparePartsImportModel { + + @ApiParam("工厂代码") + private String organizeCode; + + @ApiParam("用户名") + private String userName; + + @ApiParam("vin") + private String vinCode; + + @ApiParam("项目代码") + private String prodCfgTypeCode; + + @ApiParam("客户工厂代码") + private String custPlantCode; + + @ApiParam("客户代码") + private String custCode; + + @ApiParam("客户产线代码") + private String custProdLineCode; + + @ApiParam("JIT顺序号") + private String jitSeq; + + @ApiParam("供应商代码") + private String supplierCode; + + @ApiParam("客户零件号") + private String custPartNo; + + @ApiParam("用量") + private Double qty; + + @ApiParam("单元格编号") + private Map cellNoMap = new HashMap<>(); + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsJspModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsJspModel.java new file mode 100644 index 0000000..71dc11c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsJspModel.java @@ -0,0 +1,23 @@ +package cn.estsh.i3plus.pojo.mes.model.excel.mgnbj; + +import cn.estsh.i3plus.pojo.mes.bean.MesQueueJitPlan; +import cn.estsh.i3plus.pojo.mes.bean.MesQueueJitPlanBom; +import cn.estsh.i3plus.pojo.mes.bean.MesQueueJitPlanDetail; +import lombok.Data; + +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2020/10/11 15:31 + * @desc + */ +@Data +public class SparePartsJspModel { + + private MesQueueJitPlan queueJitPlan; + + private List jitPlanBomList; + + private List jitPlanDetailList; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/MgnBjJitPlanModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/MgnBjJitPlanModel.java index a493487..d9dd5d5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/MgnBjJitPlanModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/MgnBjJitPlanModel.java @@ -1,11 +1,13 @@ package cn.estsh.i3plus.pojo.mes.model.mgnbj; -import cn.estsh.i3plus.pojo.mes.bean.MesScatterBomCfg; import lombok.Data; import lombok.NoArgsConstructor; import org.apache.commons.lang3.StringUtils; -import java.util.*; +import java.util.Comparator; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java index b091b3a..55efd0e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java @@ -5,6 +5,8 @@ import io.swagger.annotations.ApiParam; import lombok.Data; import java.io.Serializable; +import java.util.HashMap; +import java.util.Map; /** * @author Wynne.Lu @@ -55,4 +57,8 @@ public class Part implements Serializable { @ApiParam("Mes物料号") private String partNo; + @ApiParam("单元格编号") + private Map cellNoMap = new HashMap<>(); + + } From 6a42b517fc38ceba497a1483097389ae7f9c6be4 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 12 Oct 2020 01:14:43 +0800 Subject: [PATCH 3/5] =?UTF-8?q?Fix=20Task#2839=20=E6=AD=A6=E6=B1=89PRD-WMS?= =?UTF-8?q?&TMS=E8=A3=85=E8=BD=A6=E6=98=8E=E7=BB=86=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsDocSoDetails.java | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoDetails.java index aa4f0e2..afcb69b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoDetails.java @@ -76,4 +76,26 @@ public class WmsDocSoDetails extends BaseBean { @Column(name = "CUST_PART_NO") @ApiParam("客户物料编码") public String custPartNo; + + + @Column(name = "REMAIN_QTY", columnDefinition = "decimal(18,8)") + @ApiParam(value = "剩余数量", example = "0") + public Double remainQty; + + @Transient + @ApiParam(value = "存储区代码") + private String zoneNo; + + @Transient + @ApiParam(value = "单据编号") + private String docOrderNo; + + @Transient + @ApiParam(value = "数量") + private Double docQty; + + @Transient + @ApiParam("业务类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description") + public Integer busiType; } From ebf03920578ee850c211e24418f5345a0aa7e517 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Mon, 12 Oct 2020 14:44:25 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=A4=9A=E4=BD=99optionT?= =?UTF-8?q?ype=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 46 ---------------------- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 46 ---------------------- .../model/excel/mgnbj/SparePartsImportModel.java | 2 +- 3 files changed, 1 insertion(+), 93 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 32fd382..3af6f5c 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -6059,52 +6059,6 @@ public class MesEnumUtil { } /** - * MES_车型散件配置清单 选配类型 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_OPTION_TYPE { - - OPTION_PART(1, "选配件"), - BOM_DISASSEMBLY(2, "BOM拆解"); - - private int value; - private String description; - - MES_OPTION_TYPE(int value, String description) { - this.value = value; - this.description = description; - } - - public int getValue() { - return value; - } - - public String getDescription() { - return description; - } - - 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 Integer descriptionOfValue(String description) { - Integer tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].description.equals(description)) { - tmp = values()[i].value; - } - } - return tmp; - } - } - - /** * 数据格式 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 8e8a55f..99133a8 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -4358,52 +4358,6 @@ public class MesPcnEnumUtil { } /** - * MES_生产队列散件清单 选配类型 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_OPTION_TYPE { - - OPTION_PART(1, "选配件"), - BOM_DISASSEMBLY(2, "BOM拆解"); - - private int value; - private String description; - - MES_OPTION_TYPE(int value, String description) { - this.value = value; - this.description = description; - } - - public int getValue() { - return value; - } - - public String getDescription() { - return description; - } - - 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 Integer descriptionOfValue(String description) { - Integer tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].description.equals(description)) { - tmp = values()[i].value; - } - } - return tmp; - } - } - - /** * 绑定模式 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsImportModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsImportModel.java index d649fd4..91fb090 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsImportModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsImportModel.java @@ -53,7 +53,7 @@ public class SparePartsImportModel { private String custPartNo; @ApiParam("用量") - private Double qty; + private Integer qty; @ApiParam("单元格编号") private Map cellNoMap = new HashMap<>(); From 4b65842d6ff5b4301834125de1efe56fe607da54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Mon, 12 Oct 2020 17:46:41 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E9=BA=A6=E6=A0=BC=E7=BA=B3=E9=A1=B9=E7=9B=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index da89988..fcc4640 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -2246,6 +2246,9 @@ public class MesHqlPack { if (!StringUtil.isEmpty(mesProduceSnTravel.getOutWorkCenterTimeEnd())) { DdlPreparedPack.getStringSmallerPack(mesProduceSnTravel.getOutWorkCenterTimeEnd(), "outWorkCenterTime", packBean); } + if (!StringUtils.isEmpty(mesProduceSnTravel.getWorkCenterCode())) { + DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getWorkCenterCode(), "workCenterCode", packBean); + } if (!StringUtils.isEmpty(mesProduceSnTravel.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesProduceSnTravel.getCreateDateTimeEnd())) { DdlPreparedPack.timeBuilder( mesProduceSnTravel.getCreateDateTimeStart(),