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 1/2] =?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 2/2] =?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 { +}