From 7aec1fdb6a4330bf7638a4ce38ba64314e32527f Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Sat, 31 Aug 2019 15:25:49 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B7=A5=E6=AD=A5?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: crish <570360737@qq.com> --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 38 ++++++++++++++++++++++ 1 file changed, 38 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 1be5a75..cc709a5 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 @@ -12,6 +12,44 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class MesEnumUtil { /** + * mes工步类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_STEP_TYPE { + + COMMON_STEP("10", "公用工步"), + JIT_STEP("20", "JIT工步"), + WORK_ORDER_STEP("30", "工单工步"), + BACK_STEP("40", "后台工步"); + + private String value; + private String description; + + MES_STEP_TYPE(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.equals(val) ) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** * mes工作单元参数类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) From 65b336f7081be98a0cbbaa5c610b18eb64d93832 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Sat, 31 Aug 2019 16:09:37 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BB=BB=E5=8A=A1993+=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E4=BA=A7=E7=94=9F=E7=9A=84=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E5=8D=95=E4=BD=8D=E9=94=99=E8=AF=AFBUG?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D+PDA=E9=A2=9C=E8=89=B2=E5=9B=9E=E6=98=BE?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=9A=84=E6=98=8E=E7=BB=86=E9=A2=9C=E8=89=B2?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E4=B8=8E=E5=A4=84=E7=90=86=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E5=8C=BA=E5=88=86=E5=BC=80BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java index 15714c1..4847751 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java @@ -46,9 +46,9 @@ public class WmsMessageStyleModel implements Serializable { this.message = message; if (actQty == 0) {//未处理 this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.CREATE.getValue(); - } else if (actQty > 0) { + } else if (transQty > actQty) {//处理中 this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT.getValue(); - } else if (actQty == transQty) { + } else if (actQty == transQty) {//处理完成 this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT_FINISH.getValue(); } } From d484efb69ef4274684e0c58d1210af0bc46d8eb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Sat, 31 Aug 2019 16:38:45 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=9E=84=E9=80=A0?= =?UTF-8?q?=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 30 ++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index d80e4b2..1e37264 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -149,6 +149,21 @@ public class WmsMoveDetails extends BaseBean { @ApiParam("业务类型编码") private Integer busiTypeCode; + @Transient + private String workCenterCode; + + @Transient + private String fPartNo; + + @Transient + private String fPartName; + + @Transient + private Double qty; + + @Transient + private String createDateTime; + public WmsMoveDetails(){} public WmsMoveDetails(String partNo, Long waitingCounts ,Long finishedCounts){ @@ -174,6 +189,21 @@ public class WmsMoveDetails extends BaseBean { return finishedCounts == null ? 0L : this.finishedCounts; } + public WmsMoveDetails (String organizeCode,String partNo,String partNameRdd,String workCenterCode,String fPartNo,String fPartName,String unit,Double qty, + String createDateTime,String sn){ + this.organizeCode = organizeCode; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.workCenterCode = workCenterCode; + this.fPartNo = fPartNo; + this.fPartName = fPartName; + this.unit = unit; + this.qty = qty; + this.createDateTime = createDateTime; + this.sn = sn; + + } + public WmsMoveDetails(String organizeCode,String orderNo,Integer item,String partNo,String partNameRdd,String transTypeCode ,String transTypeName,Integer itemStatus,String unit,String srcWhNo,String destWhNo, String srcZoneNo,String destZoneNo,String srcLocateNo, String destLocateNo,