Merge branch 'dev' into test

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 + '\'' +
+                '}';
+    }
 }

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;
+    }
 }

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;
 }

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=已处理
      */

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;