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 4631f64..1bac660 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 @@ -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; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java index 7095697..fc9ff48 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java +++ b/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; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java index 9003e5f..a2a82f8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java +++ b/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; + } }