From c6a3428cbe4967350426a05480ad5386a4cd63c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 13 Nov 2020 17:52:10 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=9012420=2019048=20=E5=96=B7=E6=B6=82?= =?UTF-8?q?=E4=BA=8C=E6=A3=80=E5=A2=9E=E5=8A=A0UNPACK=E5=8A=9F=E8=83=BD=20?= =?UTF-8?q?20201112=E3=80=91=2012391=2019048-=E6=9D=A1=E7=A0=81=E8=A1=A5?= =?UTF-8?q?=E6=89=93(=E5=8C=85=E8=A3=85)=E5=A2=9E=E5=8A=A0=E5=85=B3?= =?UTF-8?q?=E8=81=94=E6=89=B9=E6=AC=A1=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?-20201112=20=E5=BC=80=E7=BA=BF=E7=AE=A1=E6=8E=A7=E9=97=AE?= =?UTF-8?q?=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/MesPcnHqlPack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java index a960c29..37bdaec 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java @@ -437,7 +437,7 @@ public class MesPcnHqlPack { DdlPreparedPack.getStringLikerPack(mesPackage.getWorkCenterCode(), "workCenterCode", packBean); } - DdlPreparedPack.getStringLikerPack(mesPackage.getLotNo(), "lotNo", packBean); + DdlPreparedPack.getStringLikerPack(mesPackage.getFixLotNo(), "fixLotNo", packBean); // 时间段查询 DdlPreparedPack.timeBuilder( From 058bd05b4ac8142ff76d3e055f2b4e1b3c91bd20 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 13 Nov 2020 22:28:39 +0800 Subject: [PATCH 2/3] =?UTF-8?q?mgn-bj=20esop=E5=B1=95=E7=A4=BA=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/andon/model/AndonBoardModel.java | 2 +- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 35 ++++++++++++++++++++++ .../i3plus/pojo/mes/model/QueueOrderModel.java | 3 +- .../pojo/mes/model/mgn/bj/MgnBjBoardModel.java | 4 +++ 4 files changed, 42 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java index bc61bd2..a8890ef 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java @@ -75,7 +75,7 @@ public class AndonBoardModel implements Serializable { private String color; @ApiParam("停线时间比率") - private Integer downtimeRate; + private String downtimeRate; public int getTotalTimeVal() { return totalTime == null ? 0 : totalTime; 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 28db666..fc5f9a9 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 @@ -6028,4 +6028,39 @@ public class MesPcnEnumUtil { return tmp; } } + + /** + * JIS_回冲标识：BACKFLUSH = 正常回冲扣减，REPAIR = 返修冲料 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum JIS_BACKFLUSH_STATUS { + BACKFLUSH("BACKFLUSH", "正常回冲扣减"), + REPAIR("REPAIR", "返修冲料"); + + private String value; + private String description; + + JIS_BACKFLUSH_STATUS(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String 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/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java index 9f15432..e79dec4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java @@ -356,9 +356,10 @@ public class QueueOrderModel implements Serializable { } // getQueueOrderBySerialNumber - public QueueOrderModel(Long id, String queueGroupNo, String jitLotNo, String vinCode, String organizeCode, String produceCategoryCode, String workType, + public QueueOrderModel(Long id, String orderNo, String queueGroupNo, String jitLotNo, String vinCode, String organizeCode, String produceCategoryCode, String workType, String partNo, String prodCfgTypeCode) { this.id = id; + this.orderNo = orderNo; this.queueGroupNo = queueGroupNo; this.jitLotNo = jitLotNo; this.vinCode = vinCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java index c1994c1..ebc4348 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java @@ -41,6 +41,10 @@ public class MgnBjBoardModel implements Serializable { private Integer onceQualityRate = 0; @ApiParam("待生产订单数量") private Integer waitProduceQty = 0; + @ApiParam("低于安全库存") + private Integer minStockQty; + @ApiParam("超出最大库存") + private Integer maxStockQty; @ApiParam(value = "显示颜色") private String color; From e3e4e1fc841e863b842367798442f3b69bbb6c5c Mon Sep 17 00:00:00 2001 From: Jason Date: Sat, 14 Nov 2020 18:39:38 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9D=A4=E6=B3=B0?= =?UTF-8?q?=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/wms/bean/WmsPart.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index 94e14e5..37d66bb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -362,4 +362,14 @@ public class WmsPart extends BaseBean { this.snp = snp; this.partSpec = partSpec; } + + public WmsPart(String partNo, String partName, String partSpec, Double snp, String buyUnit, Integer snControl, Double qty) { + this.partNo = partNo; + this.partName = partName; + this.partSpec = partSpec; + this.snp = snp; + this.buyUnit = buyUnit; + this.snControl = snControl; + this.qty = qty; + } }