bonus
/
Bonus-Cloud-JYY-Smart-Canteen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
gaowdong 2025-07-10 18:02:28 +08:00
parent bebe8d530d 3c930a106b
commit fbe4568fa4
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/RefundGoodsServiceImpl.java
View File

@ -8,11 +8,14 @@ import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.text.CharSequenceUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.bonus.canteen.core.ims.domain.RefundGoodsDetail; 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.dto.*;
import com.bonus.canteen.core.ims.enums.DrpCommitStatusEnum; import com.bonus.canteen.core.ims.enums.DrpCommitStatusEnum;
import com.bonus.canteen.core.ims.enums.OutInventoryTypeEnum; import com.bonus.canteen.core.ims.enums.OutInventoryTypeEnum;
import com.bonus.canteen.core.ims.enums.SupplierConfirmStatusEnum; import com.bonus.canteen.core.ims.enums.SupplierConfirmStatusEnum;
import com.bonus.canteen.core.ims.mapper.RefundGoodsDetailMapper; 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.utils.NoGenerateUtils;
import com.bonus.canteen.core.ims.vo.*; import com.bonus.canteen.core.ims.vo.*;
import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.exception.ServiceException;
@ -44,6 +47,9 @@ public class RefundGoodsServiceImpl implements IRefundGoodsService {
@Resource @Resource
private RefundGoodsDetailMapper RefundGoodsDetailMapper; private RefundGoodsDetailMapper RefundGoodsDetailMapper;
@Resource
private IImsOutInventoryService drpOutInventoryService;
/** /**
* 查询退货单 * 查询退货单
* *
@ -133,6 +139,24 @@ public class RefundGoodsServiceImpl implements IRefundGoodsService {
// } // }
// this.drpOutInventoryService.addCommitOutWarehouse(drpOutInventoryAddDTO); // this.drpOutInventoryService.addCommitOutWarehouse(drpOutInventoryAddDTO);
// drpOutInventoryAddDTO.setDetailList(outDetailList); // 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<RefundGoodsDetailAddDTO> iterator2 = content.getDetailList().iterator();
List<ImsOutInventoryDetailAdd> 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()); return (new RefundGoodsAddVO()).setRefundGoodsId(drpRefundGoods.getRefundGoodsId());
} }

1
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenSetting.java
View File

@ -2,7 +2,6 @@ package com.bonus.canteen.core.kitchen.domain;
import com.bonus.common.core.annotation.Excel; import com.bonus.common.core.annotation.Excel;
import com.bonus.common.core.web.domain.BaseEntity; import com.bonus.common.core.web.domain.BaseEntity;
import com.bonus.common.security.annotation.NoPercent;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.ToString; import lombok.ToString;