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

退货单

This commit is contained in:
liux 2025-07-11 11:21:46 +08:00
parent 59be7d17fa
commit ba3489dc8c
2 changed files with 67 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/controller/RefundGoodsController.java
View File

@ -6,11 +6,13 @@ import javax.validation.Valid;
import com.bonus.canteen.core.ims.dto.*; import com.bonus.canteen.core.ims.dto.*;
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.log.enums.OperaType; import com.bonus.common.log.enums.OperaType;
//import com.bonus.canteen.core.ims.common.annotation.PreventRepeatSubmit; //import com.bonus.canteen.core.ims.common.annotation.PreventRepeatSubmit;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.PutMapping;
@ -56,6 +58,7 @@ public class RefundGoodsController extends BaseController {
@PostMapping({"/save"}) @PostMapping({"/save"})
@ApiOperation("新增退货单") @ApiOperation("新增退货单")
@Transactional
public AjaxResult addRefundGoods(@RequestBody RefundGoodsAddDTO content) { public AjaxResult addRefundGoods(@RequestBody RefundGoodsAddDTO content) {
RefundGoodsAddVO drpRefundGoodsAddVO = refundGoodsService.addRefundGoodsOrder(content); RefundGoodsAddVO drpRefundGoodsAddVO = refundGoodsService.addRefundGoodsOrder(content);
return success(drpRefundGoodsAddVO); return success(drpRefundGoodsAddVO);
@ -63,9 +66,14 @@ public class RefundGoodsController extends BaseController {
@PostMapping({"/commit"}) @PostMapping({"/commit"})
@ApiOperation("新增退货单") @ApiOperation("新增退货单")
@Transactional
public AjaxResult commitRefundGoods(@RequestBody RefundGoodsCommitDTO content) { public AjaxResult commitRefundGoods(@RequestBody RefundGoodsCommitDTO content) {
RefundGoodsAddVO drpRefundGoodsAddVO = refundGoodsService.commitRefundGoodsOrder(content); try{
return success(drpRefundGoodsAddVO); RefundGoodsAddVO drpRefundGoodsAddVO = refundGoodsService.commitRefundGoodsOrder(content);
return success(drpRefundGoodsAddVO);
}catch (Exception e) {
throw new ServiceException(e.getMessage());
}
} }

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

@ -85,6 +85,8 @@ public class RefundGoodsServiceImpl implements IRefundGoodsService {
@Override @Override
public RefundGoodsAddVO addRefundGoodsOrder(RefundGoodsAddDTO content) { public RefundGoodsAddVO addRefundGoodsOrder(RefundGoodsAddDTO content) {
try{
RefundGoods drpRefundGoods = new RefundGoods(); RefundGoods drpRefundGoods = new RefundGoods();
BeanUtil.copyProperties(content, drpRefundGoods, new String[0]); BeanUtil.copyProperties(content, drpRefundGoods, new String[0]);
Long refundGoodsId = content.getRefundGoodsId(); Long refundGoodsId = content.getRefundGoodsId();
@ -119,59 +121,67 @@ public class RefundGoodsServiceImpl implements IRefundGoodsService {
this.RefundGoodsDetailMapper.insertRefundGoodsDetail(drpRefundGoodsDetail); this.RefundGoodsDetailMapper.insertRefundGoodsDetail(drpRefundGoodsDetail);
} }
return (new RefundGoodsAddVO()).setRefundGoodsId(drpRefundGoods.getRefundGoodsId()); return (new RefundGoodsAddVO()).setRefundGoodsId(drpRefundGoods.getRefundGoodsId());
}catch (Exception e) {
throw new ServiceException(e.getMessage());
}
} }
@Override @Override
public RefundGoodsAddVO commitRefundGoodsOrder(RefundGoodsCommitDTO content) { public RefundGoodsAddVO commitRefundGoodsOrder(RefundGoodsCommitDTO content) {
RefundGoods drpRefundGoods = new RefundGoods(); try{
BeanUtil.copyProperties(content, drpRefundGoods, new String[0]); RefundGoods drpRefundGoods = new RefundGoods();
Long refundGoodsId = content.getRefundGoodsId(); BeanUtil.copyProperties(content, drpRefundGoods, new String[0]);
drpRefundGoods.setStatus(DrpCommitStatusEnum.SAVE.key()); Long refundGoodsId = content.getRefundGoodsId();
if(refundGoodsId == null){ drpRefundGoods.setStatus(DrpCommitStatusEnum.SAVE.key());
String fetchMaterialCode = NoGenerateUtils.generateRefundGoodsCode(); if(refundGoodsId == null){
drpRefundGoods.setRefundGoodsCode(fetchMaterialCode); String fetchMaterialCode = NoGenerateUtils.generateRefundGoodsCode();
drpRefundGoods.setRelateOrderGoodsId(content.getOrderGoodsId()); drpRefundGoods.setRefundGoodsCode(fetchMaterialCode);
drpRefundGoods.setRefundTime(content.getRefundTime()); drpRefundGoods.setRelateOrderGoodsId(content.getOrderGoodsId());
drpRefundGoods.setCreateTime(DateUtils.getNowDate()); drpRefundGoods.setRefundTime(content.getRefundTime());
drpRefundGoods.setCreateBy(SecurityUtils.getUsername()); drpRefundGoods.setCreateTime(DateUtils.getNowDate());
refundGoodsMapper.insertRefundGoods(drpRefundGoods); drpRefundGoods.setCreateBy(SecurityUtils.getUsername());
}else{ refundGoodsMapper.insertRefundGoods(drpRefundGoods);
drpRefundGoods.setUpdateBy(SecurityUtils.getUsername()); }else{
drpRefundGoods.setUpdateTime(DateUtils.getNowDate()); drpRefundGoods.setUpdateBy(SecurityUtils.getUsername());
refundGoodsMapper.updateRefundGoods(drpRefundGoods); drpRefundGoods.setUpdateTime(DateUtils.getNowDate());
RefundGoodsDetailMapper.deleteRefundGoodsDetailByRefundRefundGoodsId(refundGoodsId); refundGoodsMapper.updateRefundGoods(drpRefundGoods);
RefundGoodsDetailMapper.deleteRefundGoodsDetailByRefundRefundGoodsId(refundGoodsId);
}
Iterator<RefundGoodsDetailAddDTO> iterator1 = content.getDetailList().iterator();
while(iterator1.hasNext()) {
RefundGoodsDetailAddDTO drpRefundGoodsDetailAddDTO = iterator1.next();
RefundGoodsDetail drpRefundGoodsDetail = new RefundGoodsDetail();
BeanUtil.copyProperties(drpRefundGoodsDetailAddDTO, drpRefundGoodsDetail, new String[0]);
drpRefundGoodsDetail.setRefundGoodsId(drpRefundGoods.getRefundGoodsId());
drpRefundGoodsDetail.setCreateTime(DateUtils.getNowDate());
drpRefundGoodsDetail.setCreateBy(SecurityUtils.getUsername());
drpRefundGoodsDetail.setRefundGoodsCode(drpRefundGoods.getRefundGoodsCode());
this.RefundGoodsDetailMapper.insertRefundGoodsDetail(drpRefundGoodsDetail);
}
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());
}catch (Exception e) {
throw new ServiceException(e.getMessage());
} }
Iterator<RefundGoodsDetailAddDTO> iterator1 = content.getDetailList().iterator();
while(iterator1.hasNext()) {
RefundGoodsDetailAddDTO drpRefundGoodsDetailAddDTO = iterator1.next();
RefundGoodsDetail drpRefundGoodsDetail = new RefundGoodsDetail();
BeanUtil.copyProperties(drpRefundGoodsDetailAddDTO, drpRefundGoodsDetail, new String[0]);
drpRefundGoodsDetail.setRefundGoodsId(drpRefundGoods.getRefundGoodsId());
drpRefundGoodsDetail.setCreateTime(DateUtils.getNowDate());
drpRefundGoodsDetail.setCreateBy(SecurityUtils.getUsername());
drpRefundGoodsDetail.setRefundGoodsCode(drpRefundGoods.getRefundGoodsCode());
this.RefundGoodsDetailMapper.insertRefundGoodsDetail(drpRefundGoodsDetail);
}
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());
} }
@Override @Override