BUG#2938

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java

@@ -1,6 +1,10 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -85,6 +89,38 @@ public class WmsQCDetails extends BaseBean {
     public transient Integer lockVersion;
 
     @Transient
+    @ApiParam(value = "单据状态")
+    public Integer orderStatus;
+
+    @Transient
     @ApiParam(value = "供应商编号")
     public String vendorNo;
+
+    @Transient
+    @ApiParam(value = "供应商名称")
+    public String vendorDesc;
+
+    public WmsQCDetails() {
+    }
+
+    public WmsQCDetails(String partNo, String partNameRdd, String item,
+                        Double qty, String unit, String orderNo,
+                        Integer itemStatus, String remark, Double factQty,
+                        Double passQty, Double rejectQty,
+                        Integer orderStatus, String vendorNo,String vendorDesc) {
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.item = item;
+        this.qty = qty;
+        this.unit = unit;
+        this.orderNo = orderNo;
+        this.itemStatus = itemStatus;
+        this.remark = remark;
+        this.factQty = factQty;
+        this.passQty = passQty;
+        this.rejectQty = rejectQty;
+        this.orderStatus = orderStatus;
+        this.vendorNo = vendorNo;
+        this.vendorDesc = vendorDesc;
+    }
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java

@@ -103,8 +103,8 @@ public class WmsQCMaster extends BaseBean {
     @ApiParam(value = "供应商全称")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
             dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor",
-            searchColumnName = "vendorNo,VendorDesc", listColumnName = "vendorNo,VendorDesc", explicitColumnName = "vendorNo")
-    private String VendorDesc;
+            searchColumnName = "vendorNo,vendorDesc", listColumnName = "vendorNo,vendorDesc", explicitColumnName = "vendorNo")
+    private String vendorDesc;
 
     @Column(name = "IS_TASK")
     @ApiParam(value = "是否生产任务", example = "1")
@@ -146,10 +146,10 @@ public class WmsQCMaster extends BaseBean {
         this.partNo = partNo;
     }
 
-    public WmsQCMaster(String orderNo, String vendorNo, String VendorDesc, String refType, String refSrc, String partNo, String partNameRdd, String createDatetime) {
+    public WmsQCMaster(String orderNo, String vendorNo, String vendorDesc, String refType, String refSrc, String partNo, String partNameRdd, String createDatetime) {
         this.orderNo = orderNo;
         this.vendorNo = vendorNo;
-        this.VendorDesc = VendorDesc;
+        this.vendorDesc = vendorDesc;
         this.refType = refType;
         this.refSrc = refSrc;
         this.partNo = partNo;
@@ -157,11 +157,11 @@ public class WmsQCMaster extends BaseBean {
         this.createDatetime = createDatetime;
     }
 
-    public WmsQCMaster(String orderNo, Double qty, String vendorNo, String VendorDesc, String refType, String refSrc, String partNo, String partNameRdd, String createDatetime) {
+    public WmsQCMaster(String orderNo, Double qty, String vendorNo, String vendorDesc, String refType, String refSrc, String partNo, String partNameRdd, String createDatetime) {
         this.orderNo = orderNo;
         this.qty = qty;
         this.vendorNo = vendorNo;
-        this.VendorDesc = VendorDesc;
+        this.vendorDesc = vendorDesc;
         this.refType = refType;
         this.refSrc = refSrc;
         this.partNo = partNo;