From 72cb3a0cd5e16d92678dfdc1c0f9fe9988ded924 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Sat, 9 Jan 2021 15:32:53 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E3=80=90Bi=20=E7=95=8C=E9=9D=A2bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model/LogisticsBiModel.java | 30 ++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/LogisticsBiModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/LogisticsBiModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/LogisticsBiModel.java new file mode 100644 index 0000000..b267f7f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/LogisticsBiModel.java @@ -0,0 +1,30 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; +import java.util.Map; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/7/28 2:37 下午 + * @Modify: + */ +@Data +public class LogisticsBiModel implements Serializable { + + @ApiParam(value = "去年每月发运数量") + private double lastQty = 0; + + @ApiParam(value = "今年每月发运数量") + private double thisQty = 0; + + @ApiParam(value = "比例值") + private double annualRatio = 0; + + @ApiParam(value = "月份") + private Integer month; +} From 90bfcd6d461edd52c042874ffa2e8731eb1aaaec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Sat, 9 Jan 2021 15:35:22 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E3=80=90Bi=20=E7=95=8C=E9=9D=A2bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/IfDeliverOrderData.java | 66 ++++++++++++++++++++++ .../repository/IfDeliverOrderDataRepository.java | 9 +++ 2 files changed, 75 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDeliverOrderData.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfDeliverOrderDataRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDeliverOrderData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDeliverOrderData.java new file mode 100644 index 0000000..5b8ad38 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDeliverOrderData.java @@ -0,0 +1,66 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +/** + * @Description :IF_订单交付数据 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2020-11-06 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "IF_DELIVER_ORDER_DATA") +@Api("IF_订单交付数据") +public class IfDeliverOrderData extends BaseBean implements Serializable { + private static final long serialVersionUID = 855289009053695347L; + + @Column(name = "RGANIZTION_CODE") + @ApiParam("工厂代码") + private String rganiztionCode; + + @Column(name = "YEAR") + @ApiParam("年") + private Integer year; + + @Column(name = "MONTH") + @ApiParam("月") + private Integer month; + + @Column(name = "QTY") + @ApiParam("发运数量") + private Integer qty = 0; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus; + + @Column(name = "ERROR_MESSAGE") + @ApiParam("异常消息") + private String errorMessage; + + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "IF_CODE") + @ApiParam("接口代码") + private String ifCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfDeliverOrderDataRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfDeliverOrderDataRepository.java new file mode 100644 index 0000000..69bc18f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfDeliverOrderDataRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.IfDeliverOrderData; +import org.springframework.stereotype.Repository; + +@Repository +public interface IfDeliverOrderDataRepository extends BaseRepository { +} From d486da1120121234fe26206403f3dcd3d4d45bb4 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sat, 9 Jan 2021 18:25:45 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=8C=E7=BB=B4?= =?UTF-8?q?=E7=A0=81=E7=94=9F=E6=88=90=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/model/wms/WmsBjmgnBbacReductModel.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsBjmgnBbacReductModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsBjmgnBbacReductModel.java index 51867fc..b4b90d9 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsBjmgnBbacReductModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsBjmgnBbacReductModel.java @@ -5,7 +5,6 @@ import io.swagger.annotations.ApiParam; import lombok.Data; import java.io.Serializable; -import java.util.List; /** * @Description 北京麦格纳BBAC库存扣减MODEL @@ -35,6 +34,9 @@ public class WmsBjmgnBbacReductModel implements Serializable { public Double qty; @ApiParam("单位") public String unit; + @ApiParam("包含0") + public Integer includeZero; + public WmsBjmgnBbacReductModel() { } From e72c2dd09a604860e42188dee6fb52c9d80180e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Mon, 11 Jan 2021 14:14:01 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E4=BB=BB=E5=8A=A1#2586?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgCacheModel.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgCacheModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgCacheModel.java index 4a59bba..47731d5 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgCacheModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgCacheModel.java @@ -26,4 +26,6 @@ public class WmsAgCacheModel implements Serializable { public List options; @ApiParam("作业流程明细Model集合") public Map wmsAgdCacheModelMap; + @ApiParam("流程级别组件参数集合") + public Map> wmsAgAmParamsMap; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java index f4f5bd8..2ccb28b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java @@ -15,6 +15,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.util.List; /** * @Description : 作业流程 @@ -98,6 +99,9 @@ public class WmsActionGroup extends BaseBean { @Transient @ApiParam(value = "提交步骤序号") private Integer submitStepSeq; + @Transient + @ApiParam(value = "流程级别组件参数") + private List agAmParamsList; public long getInitAmIdVal() { return this.initAmId == null ? 0 : this.initAmId.longValue(); From 1ed47f152641695bae3af9c12d9690b89a091504 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Mon, 11 Jan 2021 14:40:20 +0800 Subject: [PATCH 05/14] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E8=A1=A5=E6=89=93=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java index b07ece5..0dce57a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java @@ -244,18 +244,13 @@ public class MesProduceSn extends BaseBean implements Serializable { this.qcStatus = qcStatus; this.qty = qty; } -//sn.serialNumber, sn.productSn, " + -// " sn.partNo, sn.partNameRdd, sn.qty, sn.qcStatus, sn.snStatus, sn.printCount, sn.printStatus" + -// " sn.workCenterCode, sn.workCellCode, sn.routeCode, sn.processCode, sn.nextProcessCode, sn.inWorkCenterTime, " + -// " sn.outWorkCenterTime, sn.shippingTime, sn.workOrderNo, sn.custSn, sn.custPartNo, sn.custCode," + -// " sn.snType, sn.trayNo, sn.operateType, sn.processLabelTemplate, sn.prodLabelTemplate, sn.custLabelTemplate, " + -// " sn.lotNo, sn.defectActionType, sn.vinCode, p.versionNo + public MesProduceSn(Long id, String serialNumber, String productSn, String partNo, String partNameRdd, Double qty, Integer qcStatus, Integer snStatus, Integer printCount, Integer printStatus, String workCenterCode, String workCellCode, String routeCode, String processCode, String nextProcessCode, String inWorkCenterTime, String outWorkCenterTime, String shippingTime, String workOrderNo, String custSn, String custPartNo, String custCode, Integer snType, String trayNo, Integer operateType, String processLabelTemplate, String prodLabelTemplate, String custLabelTemplate, String lotNo, - String defectActionType, String vinCode, String versionNo) { + String defectActionType, String vinCode, String versionNo, String createUser, String createDatetime) { this.id = id; this.serialNumber = serialNumber; this.productSn = productSn; @@ -288,6 +283,8 @@ public class MesProduceSn extends BaseBean implements Serializable { this.defectActionType = defectActionType; this.vinCode = vinCode; this.versionNo = versionNo; + this.createUser = createUser; + this.createDatetime = createDatetime; } public double getQtyVal() { From 193c4a254cfc952863eacb9a87a1bf4b649be466 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 11 Jan 2021 16:22:27 +0800 Subject: [PATCH 06/14] =?UTF-8?q?=E3=80=9013608=2020027-BI-=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E7=82=B9=E5=87=BB=E4=BA=A7=E7=BA=BF-=E7=89=A9?= =?UTF-8?q?=E6=B5=81=E8=BF=90=E8=A1=8C=E6=83=85=E5=86=B5-=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=AE=9E=E9=99=85=E5=87=BA=E5=BA=93=E4=B8=8EBP?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E8=A1=A8=E5=AF=B9=E6=AF=94-2021-01-15?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 45 ++++++++++++++++++++++ .../i3plus/pojo/mes/bean/IfDeliverOrderData.java | 4 ++ .../i3plus/pojo/mes/model/LogisticsBiModel.java | 6 +++ 3 files changed, 55 insertions(+) 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 12e6d71..ea8bfa9 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 @@ -8243,4 +8243,49 @@ public class MesEnumUtil { return tmp; } } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DELIVER_ORDER_MOVE_TYPE { + SHIPING(10, "发运"), + ALLOCATION(20, "发运&调拨"); + + private int value; + private String description; + + DELIVER_ORDER_MOVE_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public static MesEnumUtil.DELIVER_ORDER_MOVE_TYPE getByValue(Integer value) { + for (MesEnumUtil.DELIVER_ORDER_MOVE_TYPE showSupplierCode : values()) { + if (showSupplierCode.getValue() == value) { + return showSupplierCode; + } + } + return null; + } + + 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 int getValue() { + return value; + } + + public String getValueStr() { + return value + ""; + } + + public String getDescription() { + return description; + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDeliverOrderData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDeliverOrderData.java index 5b8ad38..7b8c9ff 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDeliverOrderData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDeliverOrderData.java @@ -48,6 +48,10 @@ public class IfDeliverOrderData extends BaseBean implements Serializable { @ApiParam("发运数量") private Integer qty = 0; + @Column(name = "MOVE_TYPE") + @ApiParam("移动类型") + private Integer moveType; + @Column(name = "SYNC_STATUS") @ApiParam("同步状态") private Integer syncStatus; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/LogisticsBiModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/LogisticsBiModel.java index b267f7f..b3105ce 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/LogisticsBiModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/LogisticsBiModel.java @@ -27,4 +27,10 @@ public class LogisticsBiModel implements Serializable { @ApiParam(value = "月份") private Integer month; + + @ApiParam(value = "实际出库数量") + private double outQty = 0; + + @ApiParam(value = "BP总数") + private double bpQty= 0; } From c475abc39d3f5f1c536470c8c58dea2a3de98f26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 11 Jan 2021 16:24:06 +0800 Subject: [PATCH 07/14] =?UTF-8?q?=E3=80=9013608=2020027-BI-=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E7=82=B9=E5=87=BB=E4=BA=A7=E7=BA=BF-=E7=89=A9?= =?UTF-8?q?=E6=B5=81=E8=BF=90=E8=A1=8C=E6=83=85=E5=86=B5-=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=AE=9E=E9=99=85=E5=87=BA=E5=BA=93=E4=B8=8EBP?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E8=A1=A8=E5=AF=B9=E6=AF=94-2021-01-15?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/bean/MesBpBusiness.java | 43 ++++++++++++++++++++++ .../mes/repository/MesBpBusinessRepository.java | 9 +++++ 2 files changed, 52 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBpBusiness.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBpBusinessRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBpBusiness.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBpBusiness.java new file mode 100644 index 0000000..5a1bed1 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBpBusiness.java @@ -0,0 +1,43 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; +import java.io.Serializable; + +/** + * @Description :BP业务对比表 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2020-11-06 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_BP_BUSINESS") +@Api("BP业务对比表") +public class MesBpBusiness extends BaseBean implements Serializable { + private static final long serialVersionUID = 855289009053666347L; + + @Column(name = "YEAR") + @ApiParam("年") + private Integer year; + + @Column(name = "MONTH") + @ApiParam("月") + private Integer month; + + @Column(name = "QTY") + @ApiParam("预测数量") + private Double qty = 0d; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBpBusinessRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBpBusinessRepository.java new file mode 100644 index 0000000..743c8fb --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBpBusinessRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesBpBusiness; +import org.springframework.stereotype.Repository; + +@Repository +public interface MesBpBusinessRepository extends BaseRepository { +} From abca1558da01fd43638d9e67d76e86aea61120f4 Mon Sep 17 00:00:00 2001 From: "xiangming.liao@estsh.com" Date: Mon, 11 Jan 2021 16:48:56 +0800 Subject: [PATCH 08/14] =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E5=8F=B7=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E6=8D=A2=E6=88=90=E5=AE=A2=E6=88=B7=E9=9B=B6=E4=BB=B6?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 12 +++++++++++- .../estsh/i3plus/pojo/mes/model/MesPackageQueryModel.java | 15 +++++++++++---- ...ssPlatoModel.java => ProduceDefectRatePlatoModel.java} | 14 +++++++------- ...ryModel.java => ProduceDefectRatePlatoQueryModel.java} | 11 +++++++---- 4 files changed, 36 insertions(+), 16 deletions(-) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/{ProduceDispPassPlatoModel.java => ProduceDefectRatePlatoModel.java} (71%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/{ProduceDispPassPlatoQueryModel.java => ProduceDefectRatePlatoQueryModel.java} (77%) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index af06a6a..89307ed 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java @@ -239,7 +239,17 @@ public class MesPackage extends BaseBean implements Serializable { this.createDatetime = createDatetime; } - public MesPackage(String partNo, String partNameRdd,String workCenterCode, String workOrderNo, + public MesPackage(String packageNo, String partNo, String partNameRdd, Double qty, Double packSpecQty, Integer isSealed, String ctNo) { + this.packageNo = packageNo; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.qty = qty; + this.packSpecQty = packSpecQty; + this.isSealed = isSealed; + this.ctNo = ctNo; + } + + public MesPackage(String partNo, String partNameRdd, String workCenterCode, String workOrderNo, String packageNo, String lotNo, String custCode, String shiftGroup) { this.partNo = partNo; this.partNameRdd = partNameRdd; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPackageQueryModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPackageQueryModel.java index e0a2aa2..4e4b077 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPackageQueryModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPackageQueryModel.java @@ -20,12 +20,12 @@ public class MesPackageQueryModel extends MesPackage { @ApiParam("工序名称") private String processName; + @ApiParam("工位") + private String workCellName; + @ApiParam("产线") private String workCenterName; - @ApiParam("工作单元名称") - private String workCellName; - @ApiParam("是否封箱Name") private String isSealedName; @@ -34,7 +34,14 @@ public class MesPackageQueryModel extends MesPackage { this.workCellName = workCellName; } - public MesPackageQueryModel(String packageNo, String partNo, String partNameRdd, Double qty, Double packSpecQty, String unit, String lotNo, String fixLotNo, String packSpec, Integer printStatus, Integer isSealed, Integer packLevel, String workOrderNo, String memo, String workCenterCode, String workCellCode, String custCode, String inLocationTime, String ctNo, String sampleType, String packageLabelTemplate, String qrCode, String locationCode, String erpWorkCenterCode, String fnLocationNo,String processName, String workCenterName, String workCellName) { + public MesPackageQueryModel(String packageNo, String partNo, String partNameRdd, Double qty, Double packSpecQty, Integer isSealed, String ctNo, String processName, String workCellName, String workCenterName) { + super(packageNo, partNo, partNameRdd, qty, packSpecQty, isSealed, ctNo); + this.processName = processName; + this.workCellName = workCellName; + this.workCenterName = workCenterName; + } + + public MesPackageQueryModel(String packageNo, String partNo, String partNameRdd, Double qty, Double packSpecQty, String unit, String lotNo, String fixLotNo, String packSpec, Integer printStatus, Integer isSealed, Integer packLevel, String workOrderNo, String memo, String workCenterCode, String workCellCode, String custCode, String inLocationTime, String ctNo, String sampleType, String packageLabelTemplate, String qrCode, String locationCode, String erpWorkCenterCode, String fnLocationNo, String processName, String workCenterName, String workCellName) { super(packageNo, partNo, partNameRdd, qty, packSpecQty, unit, lotNo, fixLotNo, packSpec, printStatus, isSealed, packLevel, workOrderNo, memo, workCenterCode, workCellCode, custCode, inLocationTime, ctNo, sampleType, packageLabelTemplate, qrCode, locationCode, erpWorkCenterCode, fnLocationNo); this.processName=processName; this.workCenterName = workCenterName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassPlatoModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDefectRatePlatoModel.java similarity index 71% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassPlatoModel.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDefectRatePlatoModel.java index cbc5250..1125a41 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassPlatoModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDefectRatePlatoModel.java @@ -18,13 +18,13 @@ import java.util.List; @Data @AllArgsConstructor @NoArgsConstructor -public class ProduceDispPassPlatoModel { +public class ProduceDefectRatePlatoModel { @ApiParam("项目号") private String prodCfgTypeCode; - @ApiParam("零件号") - private String partNo; + @ApiParam("客户零件号") + private String customerPartNo; @ApiParam("缺陷代码") private String defectCode; @@ -41,17 +41,17 @@ public class ProduceDispPassPlatoModel { @ApiParam("数量") private Long qty; - public ProduceDispPassPlatoModel(String prodCfgTypeCode, String partNo, String defectCode, String defectName, Long qty) { + public ProduceDefectRatePlatoModel(String prodCfgTypeCode, String customerPartNo, String defectCode, String defectName, Long qty) { this.prodCfgTypeCode = prodCfgTypeCode; - this.partNo = partNo; + this.customerPartNo = customerPartNo; this.defectCode = defectCode; this.defectName = defectName; this.qty = qty; } - public ProduceDispPassPlatoModel(String prodCfgTypeCode, String partNo, Long qty) { + public ProduceDefectRatePlatoModel(String prodCfgTypeCode, String customerPartNo, Long qty) { this.prodCfgTypeCode = prodCfgTypeCode; - this.partNo = partNo; + this.customerPartNo = customerPartNo; this.qty = qty; } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassPlatoQueryModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDefectRatePlatoQueryModel.java similarity index 77% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassPlatoQueryModel.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDefectRatePlatoQueryModel.java index 631c6cb..508f38c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassPlatoQueryModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDefectRatePlatoQueryModel.java @@ -12,19 +12,22 @@ import java.util.List; /** * @Author: xiangming.liao * @CreateDate: 2020/12/28 14:18 下午 - * @Description: 一次性通过率占比柏拉图报表查询参数model + * @Description: 缺陷率占比柏拉图报表查询参数model **/ -@Api("一次性通过率占比柏拉图报表查询参数model") +@Api("缺陷率占比柏拉图报表查询参数model") @Data @AllArgsConstructor @NoArgsConstructor -public class ProduceDispPassPlatoQueryModel extends BaseBean { +public class ProduceDefectRatePlatoQueryModel extends BaseBean { /** * 必选 */ @ApiParam("工序") - private List processCodeList; + private String processCode; + + @ApiParam("柱子展示条数") + private Integer displaySize; //质量状态（20冻结，30报废） @ApiParam("质量状态") From 1f3f891264ae716e2f177f58090e86a06f336a15 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 11 Jan 2021 18:23:58 +0800 Subject: [PATCH 09/14] =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java index 34dbb05..61f52e9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java @@ -13,7 +13,9 @@ public class WmsInterfaceEnumUtil { SWEB2WMS(50, "SWEB2WMS", "SWEB --> WMS"), SWEB2SAP(50, "SWEB2SAP", "SWEB --> SAP"), WMS2SWEB(50, "WMS2SWEB", "WMS --> SWEB"), - SAP2SWEB(50, "SAP2SWEB", "SAP --> SWEB"); + SAP2SWEB(50, "SAP2SWEB", "SAP --> SWEB"), + SAP2MES(60, "SAP2MES", "SAP --> WMS"), + ; private int value; private String name; From d721b2845f52171a968c2b6b63f6db657ab2a59e Mon Sep 17 00:00:00 2001 From: "xiangming.liao@estsh.com" Date: Mon, 11 Jan 2021 19:38:18 +0800 Subject: [PATCH 10/14] =?UTF-8?q?=E9=99=90=E5=88=B6=E6=9C=80=E5=A4=A7?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E6=95=B0=EF=BC=8C=E9=9B=B6=E4=BB=B6?= =?UTF-8?q?=E5=8F=B7=E6=94=B9=E6=88=90=E5=AE=A2=E6=88=B7=E9=9B=B6=E4=BB=B6?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model/report/ProduceDefectRatePlatoModel.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDefectRatePlatoModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDefectRatePlatoModel.java index 1125a41..0fef7e2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDefectRatePlatoModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDefectRatePlatoModel.java @@ -12,9 +12,9 @@ import java.util.List; /** * @Author: xiangming.liao * @CreateDate: 2020/12/28 14:24 下午 - * @Description: 一次性通过率占比柏拉图报表model + * @Description: 缺陷率占比柏拉图报表model **/ -@Api("一次性通过率占比柏拉图报表model") +@Api("缺陷率占比柏拉图报表model") @Data @AllArgsConstructor @NoArgsConstructor From af3eeec75ba6313739de90bce9d5401b92c4ba47 Mon Sep 17 00:00:00 2001 From: "xiangming.liao@estsh.com" Date: Mon, 11 Jan 2021 19:53:55 +0800 Subject: [PATCH 11/14] =?UTF-8?q?=E9=99=90=E5=88=B6=E6=9C=80=E5=A4=A7?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E6=95=B0=EF=BC=8C=E9=9B=B6=E4=BB=B6?= =?UTF-8?q?=E5=8F=B7=E6=94=B9=E6=88=90=E5=AE=A2=E6=88=B7=E9=9B=B6=E4=BB=B6?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model/report/ProduceDefectRatePlatoQueryModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDefectRatePlatoQueryModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDefectRatePlatoQueryModel.java index 508f38c..4c582b1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDefectRatePlatoQueryModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDefectRatePlatoQueryModel.java @@ -41,7 +41,7 @@ public class ProduceDefectRatePlatoQueryModel extends BaseBean { @ApiParam("零件号") private List partNoList; - //统计方式（0按月，1按天） + //统计方式（0按月，1按天。） @ApiParam("统计方式") private Integer statisticalMethod; From ad2c7719964cbd599e1507668fa27fb344989971 Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Tue, 12 Jan 2021 09:36:38 +0800 Subject: [PATCH 12/14] =?UTF-8?q?ERP=E5=BF=AB=E7=85=A7=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E7=9A=84=E8=A1=A8=E5=88=87=E6=8D=A2=E4=B8=BA=E4=BB=8EBaseBean?= =?UTF-8?q?=E7=BB=A7=E6=89=BF=EF=BC=8C=E8=A7=A3=E5=86=B3SnapID=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/snapshot/erp/WmsErpCOGISnapshot.java | 11 +++-------- .../pojo/wms/bean/snapshot/erp/WmsErpInterfaceSnapshot.java | 11 +++-------- .../pojo/wms/bean/snapshot/erp/WmsErpStockQuanSnapshot.java | 11 +++-------- .../pojo/wms/bean/snapshot/erp/WmsErpTransSnapshot.java | 11 +++-------- 4 files changed, 12 insertions(+), 32 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpCOGISnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpCOGISnapshot.java index f300adf..804945c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpCOGISnapshot.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpCOGISnapshot.java @@ -1,18 +1,13 @@ package cn.estsh.i3plus.pojo.wms.bean.snapshot.erp; -import cn.estsh.i3plus.pojo.wms.bean.snapshot.SnapshotBean; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; +import javax.persistence.*; /** * @Description : ERP COGI快照 @@ -34,7 +29,7 @@ import javax.persistence.Table; @Index(columnList = "SNAPSHOT_TIME"), @Index(columnList = "MOVE_TYPE") }) -public class WmsErpCOGISnapshot extends SnapshotBean { +public class WmsErpCOGISnapshot extends BaseBean { private static final long serialVersionUID = -4095222692227226944L; @Column(name="SNAPSHOT_TIME") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpInterfaceSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpInterfaceSnapshot.java index 8cc10d4..b2b8294 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpInterfaceSnapshot.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpInterfaceSnapshot.java @@ -1,18 +1,13 @@ package cn.estsh.i3plus.pojo.wms.bean.snapshot.erp; -import cn.estsh.i3plus.pojo.wms.bean.snapshot.SnapshotBean; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; +import javax.persistence.*; /** * @Description : ERP 报文接口快照 @@ -34,7 +29,7 @@ import javax.persistence.Table; @Index(columnList = "RECEIVER"), @Index(columnList = "SNAPSHOT_TIME") }) -public class WmsErpInterfaceSnapshot extends SnapshotBean { +public class WmsErpInterfaceSnapshot extends BaseBean { private static final long serialVersionUID = -4095333692227226944L; @Column(name="SNAPSHOT_TIME") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpStockQuanSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpStockQuanSnapshot.java index 4806f04..793b418 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpStockQuanSnapshot.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpStockQuanSnapshot.java @@ -1,18 +1,13 @@ package cn.estsh.i3plus.pojo.wms.bean.snapshot.erp; -import cn.estsh.i3plus.pojo.wms.bean.snapshot.SnapshotBean; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; +import javax.persistence.*; /** * @Description : ERP 库存结余快照 @@ -33,7 +28,7 @@ import javax.persistence.Table; @Index(columnList = "ORGANIZE_CODE"), @Index(columnList = "SNAPSHOT_TIME") }) -public class WmsErpStockQuanSnapshot extends SnapshotBean { +public class WmsErpStockQuanSnapshot extends BaseBean { private static final long serialVersionUID = -4095444692227226944L; @Column(name="SNAPSHOT_TIME") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpTransSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpTransSnapshot.java index 5ac2e62..157206d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpTransSnapshot.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpTransSnapshot.java @@ -1,18 +1,13 @@ package cn.estsh.i3plus.pojo.wms.bean.snapshot.erp; -import cn.estsh.i3plus.pojo.wms.bean.snapshot.SnapshotBean; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; +import javax.persistence.*; /** * @Description : ERP 交易快照 @@ -35,7 +30,7 @@ import javax.persistence.Table; @Index(columnList = "SNAPSHOT_TIME"), @Index(columnList = "MOVE_TYPE") }) -public class WmsErpTransSnapshot extends SnapshotBean { +public class WmsErpTransSnapshot extends BaseBean { private static final long serialVersionUID = -4095555692227226944L; @Column(name="SNAPSHOT_TIME") From ca5cc4937eb6d675272560e3f1d724b45ad4ca16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 12 Jan 2021 10:58:43 +0800 Subject: [PATCH 13/14] =?UTF-8?q?=E9=9C=80=E6=B1=82#1391?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsLogisticsCosts.java | 36 +++++++++++++--------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsCosts.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsCosts.java index 5b94590..4459456 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsCosts.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsCosts.java @@ -34,25 +34,21 @@ import javax.persistence.Table; @Inheritance(strategy = InheritanceType.JOINED) @Api(value = "物流费用管理") public class WmsLogisticsCosts extends BaseBean { - private static final long serialVersionUID = -5307311210847854654L; - @Column(name = "ORGANIZE_NAME") - @ApiParam(value = "工厂名称") - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) - private String organizeName; + + @Column(name = "TRANSPORT_TYPE") + @ApiParam(value = "运输类型") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRANSPORT_TYPE") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRANSPORT_TYPE.class) + private Integer transportType; @Column(name = "PLACE_OF_ORIGIN") - @ApiParam(value = "发出地") + @ApiParam(value = "发出地存储区") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String placeOfOrigin; - @Column(name = "DESTINATION_WAREHOUSE") - @ApiParam(value = "目的仓库") - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) - private String destinationWarehouse; - @Column(name = "SHIPPING_FLAG") - @ApiParam(value = "发往地") + @ApiParam(value = "发往地存储区") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String shippingFlag; @@ -61,16 +57,26 @@ public class WmsLogisticsCosts extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String logisticsVendorNo; + @Column(name = "part_no") + @ApiParam(value = "物料编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String partNo; + + @Column(name = "part_name") + @ApiParam(value = "物料名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String partName; + @Column(name = "SALES_UNIT") @ApiParam(value = "计价单位") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String salesUnit; - @Column(name = "TRANSPORT_TYPE") + @Column(name = "TRANSPORT_MODE") @ApiParam(value = "运输方式") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "NORMAL_ABNORMAL") @AnnoOutputColumn(refClass = WmsEnumUtil.NORMAL_ABNORMAL.class) - private Integer transportType; + private Integer transportMode; @Column(name = "price") @ApiParam(value = "单价") @@ -83,7 +89,7 @@ public class WmsLogisticsCosts extends BaseBean { private String startDate; @Column(name = "END_DATE") - @ApiParam(value = "结束日期") + @ApiParam(value = "失效日期") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String endDate; From d93c9fe6a6d73f3c86217a63055db2413dfc93d7 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Tue, 12 Jan 2021 11:32:50 +0800 Subject: [PATCH 14/14] =?UTF-8?q?=E7=89=A9=E6=96=99=E8=A1=A8=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=86=97=E4=BD=99=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java index 34ddf5f..b689250 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java @@ -177,4 +177,8 @@ public class MesPart extends BaseBean implements Serializable { @Transient @ApiParam("客户零件号") private String custPartNo; + + @Transient + @ApiParam("是否绑定关键件") + private Integer isBingKey; }