diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java index 4cf215f..1f57cde 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java @@ -199,10 +199,6 @@ public class WmsMoveToERP extends BaseBean { @ApiParam(value = "ERP单号") private String erpSrcNo; - @Column(name = "BOM_VERSION") - @ApiParam(value = "BOM版本号") - private String bomVersion; - @Column(name = "ERP_SRC_TYPE",columnDefinition = "varchar(50) default ''") @ApiParam(value = "QAD发运单据类型") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 2203cc7..3b790fb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -459,9 +459,13 @@ public class WmsStockSn extends BaseBean { public Integer pickResult; @Transient - @ApiParam("位置号") + @ApiParam("位置号-打印用") public String positionNo; + @Transient + @ApiParam("父位置号") + public String parentPositionNo; + @Transient @ApiParam(value = "材料类型") @@ -491,7 +495,9 @@ public class WmsStockSn extends BaseBean { @ApiParam(value = "ERP单号") private String erpSrcNo; - + @Transient + @ApiParam(value = "检测结果ID") + private Long summaryId; public WmsStockSn() { } @@ -713,7 +719,7 @@ public class WmsStockSn extends BaseBean { } public WmsStockSn(String organizeCode, String batchNo, Integer bhType, String locateNo, String partNo, - String partNameRdd, String workCenterCode, String createUser, String createDatetime, + String partNameRdd, Long summaryId, String workCenterCode, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { this.organizeCode = organizeCode; this.batchNo = batchNo; @@ -721,6 +727,7 @@ public class WmsStockSn extends BaseBean { this.locateNo = locateNo; this.partNo = partNo; this.partNameRdd = partNameRdd; + this.summaryId = summaryId; this.workCenterCode = workCenterCode; this.createUser = createUser; this.createDatetime = createDatetime; @@ -734,7 +741,7 @@ public class WmsStockSn extends BaseBean { String dateCode, String leftCode, String fixLotNo, String vendorNo, String vendorNameRdd, String qualityDate, String custNo, String custSn, String sn2d, String packageNo, String createDatetime, String createUser, String modifyDatetime, String modifyUser, - String positionNo, Date pdate, Integer printed, String refSrc, String refType, + String parentPositionNo, Date pdate, Integer printed, String refSrc, String refType, String shippingFlag, String workCenterCode, Integer snType, String packagePartNo, Integer useCount, Integer seqNo, String whNameRdd, String locateNameRdd, String zoneNameRdd, String partTypeDesc, @@ -766,7 +773,7 @@ public class WmsStockSn extends BaseBean { this.createUser = createUser; this.modifyDatetime = modifyDatetime; this.modifyUser = modifyUser; - this.positionNo = positionNo; + this.parentPositionNo = parentPositionNo; this.pdate = pdate; this.printed = printed; this.refSrc = refSrc;