From f171534eb89eca16ef1834ef1daa73d95b1bf7cf Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 22 五月 2026 17:58:36 +0800
Subject: [PATCH] feat(approval): 添加发货审批产品信息展示功能
---
src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java | 52 ++++++++++---------------
src/main/java/com/ruoyi/sales/dto/ShippingInfoDto.java | 2 -
src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java | 20 +++-------
3 files changed, 27 insertions(+), 47 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
index aed72ef..a403e60 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
@@ -1,32 +1,22 @@
package com.ruoyi.sales.controller;
-import javax.servlet.http.HttpServletResponse;
-
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.domain.R;
-import com.ruoyi.procurementrecord.dto.ProcurementPageDto;
-import com.ruoyi.procurementrecord.dto.ProcurementPageDtoCopy;
import com.ruoyi.procurementrecord.service.ProcurementRecordService;
import com.ruoyi.procurementrecord.utils.StockUtils;
import com.ruoyi.sales.dto.SalesLedgerProductDto;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.sales.service.ISalesLedgerProductService;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.framework.web.page.TableDataInfo;
+import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.util.List;
@@ -38,8 +28,7 @@
*/
@RestController
@RequestMapping("/sales/product")
-public class SalesLedgerProductController extends BaseController
-{
+public class SalesLedgerProductController extends BaseController {
@Autowired
private ISalesLedgerProductService salesLedgerProductService;
@Autowired
@@ -53,7 +42,7 @@
*/
@GetMapping("/listPageSalesLedger")
public AjaxResult listPage(Page page, SalesLedgerProductDto salesLedgerProduct) {
- IPage<SalesLedgerProductDto> list = salesLedgerProductService.listPage(page,salesLedgerProduct);
+ IPage<SalesLedgerProductDto> list = salesLedgerProductService.listPage(page, salesLedgerProduct);
return AjaxResult.success(list);
}
@@ -63,7 +52,7 @@
*/
@GetMapping("/listPagePurchaseLedger")
public AjaxResult listPagePurchaseLedger(Page page, SalesLedgerProductDto salesLedgerProduct) {
- IPage<SalesLedgerProductDto> list = salesLedgerProductService.listPagePurchaseLedger(page,salesLedgerProduct);
+ IPage<SalesLedgerProductDto> list = salesLedgerProductService.listPagePurchaseLedger(page, salesLedgerProduct);
return AjaxResult.success(list);
}
@@ -104,8 +93,7 @@
*/
@Log(title = "浜у搧淇℃伅", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, SalesLedgerProduct salesLedgerProduct)
- {
+ public void export(HttpServletResponse response, SalesLedgerProduct salesLedgerProduct) {
List<SalesLedgerProduct> list = salesLedgerProductService.selectSalesLedgerProductList(salesLedgerProduct);
ExcelUtil<SalesLedgerProduct> util = new ExcelUtil<SalesLedgerProduct>(SalesLedgerProduct.class);
util.exportExcel(response, list, "浜у搧淇℃伅鏁版嵁");
@@ -115,8 +103,7 @@
* 鑾峰彇浜у搧淇℃伅璇︾粏淇℃伅
*/
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(salesLedgerProductService.selectSalesLedgerProductById(id));
}
@@ -124,9 +111,8 @@
* 鏂板淇敼浜у搧淇℃伅
*/
@Log(title = "浜у搧淇℃伅", businessType = BusinessType.INSERT)
- @PostMapping ("/addOrUpdateSalesLedgerProduct")
- public AjaxResult add(@RequestBody SalesLedgerProduct salesLedgerProduct)
- {
+ @PostMapping("/addOrUpdateSalesLedgerProduct")
+ public AjaxResult add(@RequestBody SalesLedgerProduct salesLedgerProduct) {
return toAjax(salesLedgerProductService.addOrUpdateSalesLedgerProduct(salesLedgerProduct));
}
@@ -134,9 +120,8 @@
* 鍒犻櫎浜у搧淇℃伅
*/
@Log(title = "浜у搧淇℃伅", businessType = BusinessType.DELETE)
- @DeleteMapping("/delProduct")
- public AjaxResult remove(@RequestBody Long[] ids)
- {
+ @DeleteMapping("/delProduct")
+ public AjaxResult remove(@RequestBody Long[] ids) {
if (ids == null || ids.length == 0) {
return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
}
@@ -146,6 +131,11 @@
//鏍规嵁浜у搧id鑾峰彇bom鍒ゆ柇搴撳瓨鏄惁鍏呰冻
@GetMapping("/judgmentInventory")
public R judgmentInventory(SalesLedgerProduct salesLedgerProduct) {
- return salesLedgerProductService.judgmentInventory(salesLedgerProduct);
+ return salesLedgerProductService.judgmentInventory(salesLedgerProduct);
+ }
+
+ @GetMapping("/getById")
+ public R getById(SalesLedgerProduct salesLedgerProduct) {
+ return R.ok(salesLedgerProductService.getById(salesLedgerProduct));
}
}
diff --git a/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java b/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
index 0cf0797..e669c15 100644
--- a/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
+++ b/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
@@ -1,12 +1,9 @@
package com.ruoyi.sales.controller;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.approve.mapper.ApproveProcessMapper;
import com.ruoyi.approve.service.impl.ApproveProcessServiceImpl;
import com.ruoyi.approve.vo.ApproveProcessVO;
-import com.ruoyi.common.enums.FileNameType;
import com.ruoyi.common.utils.OrderUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -15,22 +12,14 @@
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.other.service.impl.TempFileServiceImpl;
import com.ruoyi.procurementrecord.utils.StockUtils;
import com.ruoyi.sales.dto.ShippingInfoDto;
-import com.ruoyi.sales.mapper.ShipmentApprovalMapper;
import com.ruoyi.sales.mapper.ShippingInfoMapper;
-import com.ruoyi.sales.pojo.SalesLedger;
-import com.ruoyi.sales.pojo.SalesLedgerProduct;
-import com.ruoyi.sales.pojo.ShipmentApproval;
import com.ruoyi.sales.pojo.ShippingInfo;
-import com.ruoyi.sales.service.ISalesLedgerProductService;
-import com.ruoyi.sales.service.ISalesLedgerService;
import com.ruoyi.sales.service.ShippingInfoService;
import com.ruoyi.sales.service.impl.CommonFileServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -64,7 +53,7 @@
@GetMapping("/listPage")
@ApiOperation("鍙戣揣淇℃伅鍒楄〃")
public AjaxResult listPage(Page page, ShippingInfo req) {
- IPage<ShippingInfoDto> listPage = shippingInfoService.listPage(page,req);
+ IPage<ShippingInfoDto> listPage = shippingInfoService.listPage(page, req);
return AjaxResult.success(listPage);
}
@@ -79,10 +68,13 @@
ApproveProcessVO approveProcessVO = new ApproveProcessVO();
approveProcessVO.setApproveType(7);
approveProcessVO.setApproveDeptId(loginUser.getCurrentDeptId());
- approveProcessVO.setApproveReason(req.getType() + ":" +sh);
+ approveProcessVO.setApproveReason(req.getType() + ":" + sh);
approveProcessVO.setApproveUserIds(req.getApproveUserIds());
approveProcessVO.setApproveUser(loginUser.getUserId());
approveProcessVO.setApproveTime(LocalDate.now().toString());
+ if (req.getSalesLedgerProductId() != null) {
+ approveProcessVO.setRecordId(req.getSalesLedgerProductId());
+ }
approveProcessService.addApprove(approveProcessVO);
// 娣诲姞鍙戣揣娑堟伅
req.setShippingNo(sh);
@@ -96,7 +88,7 @@
@Transactional(rollbackFor = Exception.class)
@Log(title = "鍙戣揣淇℃伅绠＄悊", businessType = BusinessType.UPDATE)
public AjaxResult deductStock(@RequestBody ShippingInfoDto req) throws IOException {
- return shippingInfoService.deductStock( req) ? AjaxResult.success() : AjaxResult.error();
+ return shippingInfoService.deductStock(req) ? AjaxResult.success() : AjaxResult.error();
}
@PostMapping("/update")
diff --git a/src/main/java/com/ruoyi/sales/dto/ShippingInfoDto.java b/src/main/java/com/ruoyi/sales/dto/ShippingInfoDto.java
index 3561c18..021daef 100644
--- a/src/main/java/com/ruoyi/sales/dto/ShippingInfoDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/ShippingInfoDto.java
@@ -1,10 +1,8 @@
package com.ruoyi.sales.dto;
import com.baomidou.mybatisplus.annotation.TableField;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.sales.pojo.CommonFile;
import com.ruoyi.sales.pojo.ShippingInfo;
-import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
--
Gitblit v1.9.3