zccbbg/wms-ruoyi
1
1
Fork 0
mirror of https://github.com/zccbbg/wms-ruoyi.git synced 2024-09-20 11:05:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: 删除出库单的校验

Browse source
This commit is contained in:
DataCall 2024-08-05 10:14:27 +08:00
parent 46ca913171
commit 4bd61354d0
2 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ruoyi-admin-wms/src/main/java/com/ruoyi/wms/controller/ShipmentOrderController.java
View file

@ -110,14 +110,14 @@ public class ShipmentOrderController extends BaseController {
/**
* 删除出库单
*
* @param ids 主键串
* @param id 主键
*/
@SaCheckPermission("wms:shipmentOrder:remove")
@Log(title = "出库单", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
shipmentOrderService.deleteByIds(List.of(ids));
@DeleteMapping("/{id}")
public R<Void> remove(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
shipmentOrderService.deleteById(id);
return R.ok();
}
}

17
ruoyi-admin-wms/src/main/java/com/ruoyi/wms/service/ShipmentOrderService.java
View file

@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.constant.ServiceConstants;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.exception.base.BaseException;
import com.ruoyi.common.core.utils.MapstructUtils;
import com.ruoyi.common.core.utils.StringUtils;
@ -21,6 +22,7 @@ import com.ruoyi.wms.domain.vo.ShipmentOrderVo;
import com.ruoyi.wms.mapper.InventoryDetailMapper;
import com.ruoyi.wms.mapper.ShipmentOrderMapper;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -128,8 +130,19 @@ public class ShipmentOrderService {
/**
* 批量删除出库单
*/
public void deleteByIds(Collection<Long> ids) {
shipmentOrderMapper.deleteBatchIds(ids);
public void deleteById(Long id) {
validateIdBeforeDelete(id);
shipmentOrderMapper.deleteById(id);
}
public void validateIdBeforeDelete(Long id) {
ShipmentOrderVo shipmentOrderVo = queryById(id);
if (shipmentOrderVo == null) {
throw new BaseException("出库单不存在");
}
if (ServiceConstants.ShipmentOrderStatus.FINISH.equals(shipmentOrderVo.getShipmentOrderStatus())) {
throw new ServiceException("出库单【" + shipmentOrderVo.getShipmentOrderNo() + "】已出库，无法删除！", HttpStatus.CONFLICT.value());
}
}
/**