订单管理相关
This commit is contained in:
@@ -88,6 +88,9 @@ public class PurchaseOrderController implements BusinessControllerMarker {
|
|||||||
public CommonResult<PurchaseOrderRespVO> getPurchaseOrder(@RequestParam("id") Long id) {
|
public CommonResult<PurchaseOrderRespVO> getPurchaseOrder(@RequestParam("id") Long id) {
|
||||||
PurchaseOrderDO purchaseOrder = purchaseOrderService.getPurchaseOrder(id);
|
PurchaseOrderDO purchaseOrder = purchaseOrderService.getPurchaseOrder(id);
|
||||||
PurchaseOrderRespVO purchaseOrderRespVO = BeanUtils.toBean(purchaseOrder, PurchaseOrderRespVO.class);
|
PurchaseOrderRespVO purchaseOrderRespVO = BeanUtils.toBean(purchaseOrder, PurchaseOrderRespVO.class);
|
||||||
|
if (purchaseOrderRespVO == null){
|
||||||
|
return success(null);
|
||||||
|
}
|
||||||
purchaseOrderService.setOrderDetails(purchaseOrderRespVO);
|
purchaseOrderService.setOrderDetails(purchaseOrderRespVO);
|
||||||
return success(purchaseOrderRespVO);
|
return success(purchaseOrderRespVO);
|
||||||
}
|
}
|
||||||
@@ -127,8 +130,9 @@ public class PurchaseOrderController implements BusinessControllerMarker {
|
|||||||
@PostMapping("/submit-order-batch")
|
@PostMapping("/submit-order-batch")
|
||||||
@Operation(summary = "批量提交订单审核")
|
@Operation(summary = "批量提交订单审核")
|
||||||
@PreAuthorize("@ss.hasPermission('bse:purchase-order:update')")
|
@PreAuthorize("@ss.hasPermission('bse:purchase-order:update')")
|
||||||
public CommonResult<Boolean> submitOrder(@RequestParam("ids") @Validated @NotEmpty(message = "采购订单id不能为空") List<Long> ids) {
|
public CommonResult<Boolean> submitOrder(@RequestBody @Validated @NotEmpty(message = "采购订单id不能为空") List<String> ids) {
|
||||||
ids.forEach(id -> purchaseOrderService.submitOrder(id));
|
System.out.println("ids:"+ids);
|
||||||
|
ids.forEach(id -> purchaseOrderService.submitOrder(Long.valueOf(id)));
|
||||||
return success(true);
|
return success(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -67,7 +67,7 @@ public class PrchOrdDtlRespVO {
|
|||||||
|
|
||||||
@Schema(description = "税码(字典: PRCH_TAX);推送ERP", requiredMode = Schema.RequiredMode.REQUIRED)
|
@Schema(description = "税码(字典: PRCH_TAX);推送ERP", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
@ExcelProperty("税码(字典: PRCH_TAX);推送ERP")
|
@ExcelProperty("税码(字典: PRCH_TAX);推送ERP")
|
||||||
private BigDecimal taxNum;
|
private String taxNum;
|
||||||
|
|
||||||
@Schema(description = "是否基于GR的发票校验;推送ERP")
|
@Schema(description = "是否基于GR的发票校验;推送ERP")
|
||||||
@ExcelProperty("是否基于GR的发票校验;推送ERP")
|
@ExcelProperty("是否基于GR的发票校验;推送ERP")
|
||||||
|
|||||||
@@ -82,6 +82,7 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
|
|||||||
private ContractService contractService;
|
private ContractService contractService;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@Transactional
|
||||||
public PurchaseOrderRespVO createPurchaseOrder(PurchaseOrderSaveReqVO createReqVO) {
|
public PurchaseOrderRespVO createPurchaseOrder(PurchaseOrderSaveReqVO createReqVO) {
|
||||||
// 插入
|
// 插入
|
||||||
PurchaseOrderDO purchaseOrder = BeanUtils.toBean(createReqVO, PurchaseOrderDO.class);
|
PurchaseOrderDO purchaseOrder = BeanUtils.toBean(createReqVO, PurchaseOrderDO.class);
|
||||||
@@ -104,12 +105,21 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@Transactional
|
||||||
public void updatePurchaseOrder(PurchaseOrderSaveReqVO updateReqVO) {
|
public void updatePurchaseOrder(PurchaseOrderSaveReqVO updateReqVO) {
|
||||||
// 校验存在
|
// 校验存在
|
||||||
validatePurchaseOrderExists(updateReqVO.getId());
|
validatePurchaseOrderExists(updateReqVO.getId());
|
||||||
// 更新
|
// 更新
|
||||||
PurchaseOrderDO updateObj = BeanUtils.toBean(updateReqVO, PurchaseOrderDO.class);
|
PurchaseOrderDO updateObj = BeanUtils.toBean(updateReqVO, PurchaseOrderDO.class);
|
||||||
purchaseOrderMapper.updateById(updateObj);
|
purchaseOrderMapper.updateById(updateObj);
|
||||||
|
//删除订单明细
|
||||||
|
prchOrdDtlService.deletePrchOrdDtlListByOrdIds(Collections.singletonList(updateReqVO.getId()));
|
||||||
|
log.info("删除旧的订单明细成功");
|
||||||
|
// 返回
|
||||||
|
//批量插入订单明细
|
||||||
|
updateReqVO.getPrchOrdDtlSaveReqVOS().forEach(prchOrdDtlSaveReqVO -> prchOrdDtlSaveReqVO.setOrdId(updateReqVO.getId()));
|
||||||
|
prchOrdDtlService.batchCreatePrchOrdDtl(updateReqVO.getPrchOrdDtlSaveReqVOS());
|
||||||
|
log.info("更新订单明细成功");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Reference in New Issue
Block a user