Merge pull request '成都麦格纳，wmsCqMaster新增构造方法' (#304) from junsheng.li/i3plus-pojo-junsheng:test into test

Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/304

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java

@@ -4961,7 +4961,8 @@ public class WmsEnumUtil {
         PLANNED_PULL(40, "计划拉动"),
         ANDON_PULL(50, "安灯拉动"),
         EXTERNAL_PULL(60, "手工拉动"),
-        WORKORDER_PULL(70, "工单拉动");
+        WORKORDER_PULL(70, "工单拉动"),
+        OVER_PULL(80, "过点拉动");
 
         private int value;
         private String description;

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

@@ -216,6 +216,9 @@ public class WmsDocFgDetail extends BaseBean {
     @ApiParam(value = "产品条码")
     private String serialNumber;
 
+    @Column(name = "IS_GENERATE_PICKING", columnDefinition = "int default 2")
+    @ApiParam("是否已经生成领料单")
+    public Integer isGeneratePicking;
 
 
 

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

@@ -180,4 +180,18 @@ public class WmsQCMaster extends BaseBean {
         this.partNameRdd = partNameRdd;
         this.createDatetime = createDatetime;
     }
+
+    public WmsQCMaster(String orderNo,String refSrc,String remark,String vendorNo,String vendorDesc,String partNo,String partNameRdd,Double qty,Integer orderStatus,Integer qcStatus,String createDatetime) {
+        this.orderNo = orderNo;
+        this.refSrc = refSrc;
+        this.remark = remark;
+        this.vendorNo = vendorNo;
+        this.vendorDesc = vendorDesc;
+        this.partNo = partNo;
+        this.qty = qty;
+        this.orderStatus = orderStatus;
+        this.partNameRdd = partNameRdd;
+        this.qcStatus = qcStatus;
+        this.createDatetime = createDatetime;
+    }
 }