From b0c4d110000059b4c00289990a6960aca4e36eae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 20 Nov 2019 17:15:29 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=EF=BC=9A=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=A0=B9=E6=8D=AE=E4=BD=9C=E4=B8=9A=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E5=90=8D=E7=A7=B0=E5=88=86=E7=BB=84=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E7=BB=99=E5=89=8D=E7=AB=AF+=E6=AF=8F=E4=B8=AA=E6=AD=A5?= =?UTF-8?q?=E9=AA=A4=E5=BC=80=E5=A7=8B=E5=89=8D=E9=83=BD=E9=87=8D=E6=96=B0?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=BD=93=E5=89=8D=E6=B5=81=E7=A8=8B=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E7=9A=84=E6=AD=A5=E9=AA=A4=E5=8F=82=E6=95=B0=E5=B9=B6?= =?UTF-8?q?=E6=94=BE=E5=85=A5=E7=BC=93=E5=AD=98=EF=BC=88BUG#6304=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java index 4e7b56e..a41ef59 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java @@ -52,4 +52,22 @@ public class WmsActionModule extends BaseBean { @Column(name = "IS_SHOW_INFO") @ApiParam(value = "是否实现回显", example = "0") public Integer isShowInfo; + + @ApiParam(value = "作业类型名称", example = "0") + public String opTypeName; + + public WmsActionModule() { + } + + public WmsActionModule(Long id, String amName, String amDesc, String callClass, + Integer amType, String opTypeCode, Integer isShowInfo, String opTypeName) { + this.id = id; + this.amName = amName; + this.amDesc = amDesc; + this.callClass = callClass; + this.amType = amType; + this.opTypeCode = opTypeCode; + this.isShowInfo = isShowInfo; + this.opTypeName = opTypeName; + } } From b181cf2ac3658ad42c716ac7e0261e9e521734d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 20 Nov 2019 17:42:20 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E5=AE=89=E5=85=A8=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E6=8B=89=E5=8A=A8=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 47 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 4 ++ .../wms/modelbean/WmsMoveUnfinishedOrderModel.java | 3 ++ 3 files changed, 54 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index a4862cb..bfdf7d7 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -4229,4 +4229,51 @@ public class WmsEnumUtil { } } + /** + * 拉动方式维护 + * 默认为 10 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PULL_WAY_STATUS { + SAFETY_STOCK_PULL(10, "安全库存拉动"), + ELECTRONIC_KANBAN_PULL(20, "电子看板拉动"), + LINE_PULL(30, "巡线拉动"), + PLANNED_PULL(40, "计划拉动"); + + private int value; + private String description; + + PULL_WAY_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static PULL_WAY_STATUS codeOf(int value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + } \ No newline at end of file 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 a4d969b..3f08e96 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 @@ -187,6 +187,10 @@ public class WmsPart extends BaseBean { @ApiParam(value = "是否录入生产批次", example = "1") private Integer isProdLot = 2; + @Column(name = "PULL_WAY") + @ApiParam(value = "拉动方式", example = "0") + private Integer pullWay = 0; + public int getIqcValue(){ return this.iqc == null ? 0 : this.iqc.intValue(); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveUnfinishedOrderModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveUnfinishedOrderModel.java index 66eda83..f87e945 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveUnfinishedOrderModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveUnfinishedOrderModel.java @@ -36,6 +36,9 @@ public class WmsMoveUnfinishedOrderModel extends BaseBean{ @ApiParam("关联单号") private String refSrc; + public WmsMoveUnfinishedOrderModel(){ + } + public WmsMoveUnfinishedOrderModel(String organizeCode, String partNo, String partNameRdd, Double destQty, String transTypeCode, String transTypeName, String refSrc) { this.organizeCode = organizeCode; this.partNo = partNo;