diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/RefundGoodsServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/RefundGoodsServiceImpl.java index 86e502f..6ff84e1 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/RefundGoodsServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/RefundGoodsServiceImpl.java @@ -8,11 +8,14 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.util.ObjectUtil; import com.bonus.canteen.core.ims.domain.RefundGoodsDetail; +import com.bonus.canteen.core.ims.domain.param.ImsOutInventoryAdd; +import com.bonus.canteen.core.ims.domain.param.ImsOutInventoryDetailAdd; import com.bonus.canteen.core.ims.dto.*; import com.bonus.canteen.core.ims.enums.DrpCommitStatusEnum; import com.bonus.canteen.core.ims.enums.OutInventoryTypeEnum; import com.bonus.canteen.core.ims.enums.SupplierConfirmStatusEnum; import com.bonus.canteen.core.ims.mapper.RefundGoodsDetailMapper; +import com.bonus.canteen.core.ims.service.IImsOutInventoryService; import com.bonus.canteen.core.ims.utils.NoGenerateUtils; import com.bonus.canteen.core.ims.vo.*; import com.bonus.common.core.exception.ServiceException; @@ -44,6 +47,9 @@ public class RefundGoodsServiceImpl implements IRefundGoodsService { @Resource private RefundGoodsDetailMapper RefundGoodsDetailMapper; + @Resource + private IImsOutInventoryService drpOutInventoryService; + /** * 查询退货单 * @@ -133,6 +139,24 @@ public class RefundGoodsServiceImpl implements IRefundGoodsService { // } // this.drpOutInventoryService.addCommitOutWarehouse(drpOutInventoryAddDTO); // drpOutInventoryAddDTO.setDetailList(outDetailList); + ImsOutInventoryAdd imsOutInventoryAdd = new ImsOutInventoryAdd(); + imsOutInventoryAdd.setOutDate(content.getRefundTime()); + imsOutInventoryAdd.setFetchUser(content.getRefundContact()); + imsOutInventoryAdd.setWarehouseId(content.getRefundWarehouseId()); + imsOutInventoryAdd.setOutType(Long.valueOf(OutInventoryTypeEnum.BACK.key())); + imsOutInventoryAdd.setStatus(DrpCommitStatusEnum.COMMIT.key()); + Iterator iterator2 = content.getDetailList().iterator(); + List imsOutInventoryDetailAddList = new ArrayList<>(); + while(iterator2.hasNext()) { + RefundGoodsDetailAddDTO drpRefundGoodsDetailAddDTO = iterator2.next(); + ImsOutInventoryDetailAdd imsOutInventoryDetailAdd = new ImsOutInventoryDetailAdd(); + imsOutInventoryDetailAdd.setInventoryId(drpRefundGoodsDetailAddDTO.getInventoryId()); + imsOutInventoryDetailAdd.setFetchNum(drpRefundGoodsDetailAddDTO.getRefundNum()); + imsOutInventoryDetailAdd.setIntoDetailId(drpRefundGoodsDetailAddDTO.getIntoDetailId()); + imsOutInventoryDetailAddList.add(imsOutInventoryDetailAdd); + } + imsOutInventoryAdd.setImsOutInventoryDetailAddList(imsOutInventoryDetailAddList); + drpOutInventoryService.insertImsOutInventory( imsOutInventoryAdd); return (new RefundGoodsAddVO()).setRefundGoodsId(drpRefundGoods.getRefundGoodsId()); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenSetting.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenSetting.java index 52e4bac..3b16902 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenSetting.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenSetting.java @@ -2,14 +2,13 @@ package com.bonus.canteen.core.kitchen.domain; import com.bonus.common.core.annotation.Excel; import com.bonus.common.core.web.domain.BaseEntity; -import com.bonus.common.security.annotation.NoPercent; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.ToString; /** * 功能参数配置对象 kitchen_setting - * + * * @author xsheng * @date 2025-05-25 */