diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java index 926b291..5ecb56c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java @@ -178,4 +178,8 @@ public class MesQueueJitActual extends BaseBean implements Serializable { @ApiParam(value = "qty") public Integer qty; + @Transient + @ApiParam("工单类型") + private String woTypeName; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java index 4cee1fd..64e9e70 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java @@ -36,6 +36,9 @@ public class QueueJitActualModel { public String workTypeName; @ApiParam("客户产线代码") + private String custPlantCode; + + @ApiParam("客户产线代码") private String custProdLineCode; @ApiParam("产品位置代码") @@ -73,13 +76,13 @@ public class QueueJitActualModel { } - public QueueJitActualModel(Long id, String vinCode, String jisActualNo, Integer workType, String custProdLineCode, String produceCtgyCode, + public QueueJitActualModel(Long id, String vinCode, String jisActualNo, Integer workType, String custPlantCode, String produceCtgyCode, String productSn, Integer detailStatus, String createUser, String createDatetime) { this.id = id; this.vinCode = vinCode; this.jisActualNo = jisActualNo; this.workType = workType; - this.custProdLineCode = custProdLineCode; + this.custPlantCode = custPlantCode; this.produceCtgyCode = produceCtgyCode; this.productSn = productSn; this.detailStatus = detailStatus; @@ -94,6 +97,7 @@ public class QueueJitActualModel { this.jisActualNo = jisActualNo; this.partNo = partNo; this.partName = partName; + this.produceCtgyCode = produceCtgyCode; this.qty = qty; this.createUser = createUser; this.createDatetime = createDatetime;