|
@@ -291,11 +291,17 @@ public class WebsitSalesRetLogic {
|
|
|
workerStockDTO.setSdate(websitSalesRet.getCreateTime());
|
|
|
workerStockDTO.setWorkerWebsitId(websitSalesRet.getWorkerWebsitId());
|
|
|
workerStockDTO.setWorkerWebsitName(websitSalesRet.getWorkerWebsitName());
|
|
|
- workerStockDTO.setGoodsId(websitSalesRetItem.getGoodsId());
|
|
|
- workerStockDTO.setGoodsName(websitSalesRetItem.getGoodsName());
|
|
|
+ workerStockDTO.setWebsitGoodsId(websitSalesRetItem.getGoodsId());
|
|
|
+ workerStockDTO.setWebsitGoodsName(websitSalesRetItem.getGoodsName());
|
|
|
+ workerStockDTO.setWebsitGoodsPrice(websitSalesRetItem.getPrice());
|
|
|
+ workerStockDTO.setWebsitGoodsQty(websitSalesRetItem.getRetQty());
|
|
|
workerStockDTO.setGoodsType(websitSalesRetItem.getGoodsType());
|
|
|
- workerStockDTO.setPrice(websitSalesRetItem.getPrice());
|
|
|
+ workerStockDTO.setPrice(websitSalesRetItem.getConvertPrice());
|
|
|
workerStockDTO.setUnitName(websitSalesRetItem.getGoodsSalesUnit());
|
|
|
+ workerStockDTO.setGoodsSalesConvertQty(websitSalesRetItem.getGoodsSalesConvertQty());
|
|
|
+ workerStockDTO.setGoodsSpecification(websitSalesRetItem.getGoodsSpecification());
|
|
|
+ workerStockDTO.setGoodsId(websitSalesRetItem.getWorkerGoodsId());
|
|
|
+ workerStockDTO.setGoodsName(websitSalesRetItem.getWorkerGoodsName());
|
|
|
workerStockDTO.setRef(websitSalesRet.getSalesRetId());
|
|
|
workerStockDTO.setRefType("销售退货单");
|
|
|
workerStockDTO.setPartsAttr(PartsAttrEnum.NEW.getKey());
|
|
@@ -323,7 +329,7 @@ public class WebsitSalesRetLogic {
|
|
|
websitStockDTO.setPrice(websitSalesRetItem.getPrice());
|
|
|
websitStockDTO.setRef(websitSalesRet.getSalesRetId());
|
|
|
websitStockDTO.setRefType("销售退货单");
|
|
|
- websitStockDTO.setChangeQty(websitSalesRetItem.getConvertQty());
|
|
|
+ websitStockDTO.setChangeQty(websitSalesRetItem.getRetQty());
|
|
|
websitStockDTO.setDirectFlag(DirectFlagEnum.ADD.getKey());
|
|
|
websitStockDTO.setRemark(websitSalesRet.getRemark());
|
|
|
websitStockDTO.setOperateBy(adminUser.getNickName());
|