From 93fa0d1aaaa16e275cdb93c34952f45feb9d2ad8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Fri, 31 May 2019 18:41:18 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=B8=8Epdm=E6=AF=94=E5=AF=B9=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index 28ddb48..cf9215a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -56,6 +56,10 @@ public class WmsMoveSn extends BaseBean { @ApiParam("条码") public String sn; + @Column(name="CSN") + @ApiParam("客户条码") + public String csn; + /** * 状态:1=创建,10=待处理,20=已处理 */ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java index 0704421..55e0b3f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java @@ -44,6 +44,10 @@ public class WmsZones extends BaseBean { @ApiParam(value = "存储区名称") private String zoneName; + @Column(name = "PARENT_ZONE_NO") + @ApiParam(value = "上层存储区") + private String parentZoneNo; + @Column(name = "IS_PM") @ApiParam(value = "零件级管控" , example = "2") private Integer isPm; From c8008c80635b43310d1659e3026e1c2da710162b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Fri, 31 May 2019 19:00:44 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=B6=85=E5=A4=A7=E7=9A=84=E4=B8=80?= =?UTF-8?q?=E4=B8=AABUG=EF=BC=88=E5=A5=BD=E6=83=A8=E4=B8=80=E5=A5=B3?= =?UTF-8?q?=E7=9A=84=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/pcn/bean/MesProduceSn.java | 27 ++++++ .../pojo/mes/pcn/bean/MesProduceSnTravel.java | 105 ++++++++++++++++++++- 2 files changed, 131 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java index b8a308c..8a7fdfc 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java @@ -132,4 +132,31 @@ public class MesProduceSn extends BaseBean { public int getPrintStatusVal() { return this.printStatus == null ? 0 : this.printStatus; } + + @Override + public String toString() { + return "MesProduceSn{" + + "serialNumber='" + serialNumber + '\'' + + ", partNo='" + partNo + '\'' + + ", partNameRdd='" + partNameRdd + '\'' + + ", qty=" + qty + + ", qcStatus=" + qcStatus + + ", snStatus=" + snStatus + + ", printCount=" + printCount + + ", printStatus=" + printStatus + + ", workCenterCode='" + workCenterCode + '\'' + + ", workCellCode='" + workCellCode + '\'' + + ", routeCode='" + routeCode + '\'' + + ", processCode='" + processCode + '\'' + + ", nextProcessCode='" + nextProcessCode + '\'' + + ", inWorkCenterTime='" + inWorkCenterTime + '\'' + + ", outWorkCenterTime='" + outWorkCenterTime + '\'' + + ", shippingTime='" + shippingTime + '\'' + + ", workOrderNo='" + workOrderNo + '\'' + + ", custSn='" + custSn + '\'' + + ", custPartNo='" + custPartNo + '\'' + + ", packageSn='" + packageSn + '\'' + + ", resultMsg='" + resultMsg + '\'' + + '}'; + } } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java index 71e5b98..e5b4ee2 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java @@ -27,5 +27,108 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name="MES_PRODUCE_SN_TRAVEL") @Api("产品条码履历表") -public class MesProduceSnTravel extends MesProduceSn { +public class MesProduceSnTravel extends BaseBean { + @Column(name="SERIAL_NUMBER") + @ApiParam("产品条码") + private String serialNumber; + + @Column(name="PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name="PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; + + @Column(name="QTY") + @ApiParam("数量") + private Double qty; + + @Column(name="QC_STATUS") + @ApiParam("质量状态") + private Integer qcStatus; + + @Column(name="SN_STATUS") + @ApiParam("条码状态") + private Integer snStatus; + + @Column(name="PRINT_COUNT") + @ApiParam("打印次数") + private Integer printCount; + + @Column(name="PRINT_STATUS") + @ApiParam("打印状态") + private Integer printStatus; + + @Column(name="WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name="WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name="ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + @Column(name="PROCESS_CODE") + @ApiParam("工序代码") + private String processCode; + + @Column(name="NEXT_PROCESS_CODE") + @ApiParam("下一工序代码") + private String nextProcessCode; + + @Column(name="IN_WC_TIME") + @ApiParam("进产线时间") + private String inWorkCenterTime; + + @Column(name="OUT_WC_TIME") + @ApiParam("出产线时间") + private String outWorkCenterTime; + + @Column(name="SHIPPING_TIME") + @ApiParam("发运时间") + private String shippingTime; + + @Column(name="WORK_ORDER_NO") + @ApiParam("生产工单号") + private String workOrderNo; + + @Column(name="CUST_SN") + @ApiParam("客户条码") + private String custSn; + + @Column(name="CUST_PART_NO") + @ApiParam("客户零件号") + private String custPartNo; + + @Column(name="PACKAGE_SN") + @ApiParam("包装条码") + private String packageSn; + + @Transient + @ApiParam("返回信息") + private String resultMsg; + + public double getQtyVal() { + return this.qty == null ? 0.0d : this.qty; + } + + public int getQcStatusVal() { + return this.qcStatus == null ? 0 : this.qcStatus; + } + + public int getSnStatusVal() { + return this.snStatus == null ? 0 : this.snStatus; + } + + public int getPrintCountVal() { + return this.printCount == null ? 0 : this.printCount; + } + + public int getPrintStatusVal() { + return this.printStatus == null ? 0 : this.printStatus; + } } From 33ef135392dfc0c192c416460a596f365c912b33 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Mon, 3 Jun 2019 09:37:32 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=A1=A8-=E6=9D=A1=E7=A0=81=E6=98=8E=E7=BB=86=E8=A1=A8=20?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9=20=20=E7=82=89=E6=89=B9?= =?UTF-8?q?=E5=8F=B7=20=20=E6=94=B9=E4=B8=BA=20=20=E7=89=B9=E6=AE=8A?= =?UTF-8?q?=E6=89=B9=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java index 895d0e0..3e8eb11 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java @@ -92,7 +92,7 @@ public class SwebPurchaseOrderSn extends BaseBean { private String checkCode; @Column(name = "STOVE_NO") - @ApiParam(value = "炉批号") + @ApiParam(value = "特殊批号") private String stoveNo; @Column(name = "BATCH_NO") @@ -117,6 +117,10 @@ public class SwebPurchaseOrderSn extends BaseBean { private Double weight; @Transient + @ApiParam(value = "合同号") + private String refNo; + + @Transient @ApiParam(value = "是否可编辑（前端使用）") private boolean isSet = false; }