diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsProductPutTrayCode.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsProductPutTrayCode.java index 88e9ed32..9f4dc49e 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsProductPutTrayCode.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsProductPutTrayCode.java @@ -68,6 +68,34 @@ public class WmsProductPutTrayCode extends BaseEntity { this.siteCode = siteCode; } + /** + * 产品名称 + */ + @Excel(name = "产品名称") + private String productName; + + /** + * 产品编码 + */ + @Excel(name = "产品编码") + private String productCode; + + public String getProductName() { + return productName; + } + + public void setProductName(String productName) { + this.productName = productName; + } + + public String getProductCode() { + return productCode; + } + + public void setProductCode(String productCode) { + this.productCode = productCode; + } + /** * 预留字段1 */ diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java index 7599edef..4454ebcd 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java @@ -745,6 +745,8 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { for (WmsProductPutTrayCode wmsProductPutTrayCode1: wmsProductPutTrayCodeList) { wmsProductPutTrayCode1.setWlCode(wmsFpStorageNewsSn1.getWlCode()); + wmsProductPutTrayCode1.setProductCode(wmsFpStorageNewsSn1.getProductCode()); + wmsProductPutTrayCode1.setProductName(wmsFpStorageNewsSn1.getProductName()); } } @@ -769,6 +771,8 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { if(wmsFpStorageNewsSns.size()>0){ WmsFpStorageNewsSn wmsFpStorageNewsSn1= wmsFpStorageNewsSns.get(0); wmsProductPutTrayCode.setWlCode( wmsFpStorageNewsSn1.getWlCode());//库位 + wmsProductPutTrayCode.setProductCode(wmsFpStorageNewsSn1.getProductCode()); + wmsProductPutTrayCode.setProductName(wmsFpStorageNewsSn1.getProductName()); return wmsProductPutTrayCode; } } @@ -783,5 +787,4 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { List wmsSellOutEmbryoList= wmsSellOutEmbryoMapper.selectWmsSellOutEmbryoList(wmsSellOutEmbryo); return wmsSellOutEmbryoList; } - }