|
@@ -56,6 +56,7 @@ public class WorkerOldRefundManageLogic {
|
|
|
private final WebsitPartsRefundRecordService websitPartsRefundRecordService;
|
|
|
private final WorkerStockAccService workerStockAccService;
|
|
|
private final MaterialGoodsStockLogic materialGoodsStockLogic;
|
|
|
+ private final StorageService storageService;
|
|
|
|
|
|
public IPage<OldRefundManageVO> pageList(ZfireParamBean zfireParamBean) {
|
|
|
AdminUserCom adminUser = commonLogic.getAdminUser();
|
|
@@ -529,6 +530,11 @@ public class WorkerOldRefundManageLogic {
|
|
|
}
|
|
|
|
|
|
private List<WebsitStockDTO> createWebsitStockDTO(WebsitPartsOldRefundManage partsOldRefundManage, List<WebsitPartsOldRefundManageItem> partsOldRefundManageItems) {
|
|
|
+ final Storage storage = storageService.lambdaQuery()
|
|
|
+ .eq(Storage::getCompanyWechatId, partsOldRefundManage.getCompanyWechatId())
|
|
|
+ .eq(Storage::getWebsitId, partsOldRefundManage.getReceiveWebsitId())
|
|
|
+ .eq(Storage::getIsDefault, true)
|
|
|
+ .one();
|
|
|
List<WebsitStockDTO> shopStockDTOList = new ArrayList<>();
|
|
|
for (WebsitPartsOldRefundManageItem partsOldRefundManageItem : partsOldRefundManageItems) {
|
|
|
WebsitStockDTO sendShopStockDTO = new WebsitStockDTO();
|
|
@@ -553,6 +559,7 @@ public class WorkerOldRefundManageLogic {
|
|
|
sendShopStockDTO.setRemark(partsOldRefundManageItem.getRemark());
|
|
|
sendShopStockDTO.setOperateBy(partsOldRefundManage.getRefundedBy());
|
|
|
sendShopStockDTO.setOperateTime(partsOldRefundManage.getRefundedTime());
|
|
|
+ sendShopStockDTO.setStorageId(storage.getStorageId());
|
|
|
shopStockDTOList.add(sendShopStockDTO);
|
|
|
}
|
|
|
return shopStockDTOList;
|