From 8a426c83006afd3f91fd763f9fb215ffa930c66d Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 23 四月 2026 14:24:49 +0800
Subject: [PATCH] 合并分支
---
src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java b/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
index 077e80a..3ba446f 100644
--- a/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
+++ b/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
@@ -17,8 +17,10 @@
import com.ruoyi.sales.service.ISalesLedgerProductService;
import com.ruoyi.sales.service.ISalesLedgerService;
import com.ruoyi.sales.service.ShippingInfoService;
+import com.ruoyi.sales.vo.ShippingInfoVo;
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.*;
@@ -46,7 +48,7 @@
@GetMapping("/listPage")
@ApiOperation("鍙戣揣淇℃伅鍒楄〃")
public AjaxResult listPage(Page page, ShippingInfo req) {
- IPage<ShippingInfo> listPage = shippingInfoService.listPage(page,req);
+ IPage<ShippingInfoVo> listPage = shippingInfoService.listPage(page,req);
return AjaxResult.success(listPage);
}
@@ -54,15 +56,16 @@
@ApiOperation("娣诲姞鍙戣揣淇℃伅")
@Transactional(rollbackFor = Exception.class)
public AjaxResult add(@RequestBody ShippingInfo req) {
+ LambdaQueryWrapper<ShippingInfo> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(ShippingInfo::getSalesLedgerId, req.getSalesLedgerId());
+ wrapper.eq(ShippingInfo::getSalesLedgerProductId, req.getSalesLedgerProductId());
+ List<ShippingInfo> list = shippingInfoService.list(wrapper);
+ if(!CollectionUtils.isEmpty(list)){
+ return AjaxResult.error("鍙戣揣淇℃伅宸插瓨鍦�");
+ }
boolean save = shippingInfoService.save(req);
if(save){
- LambdaQueryWrapper<ShippingInfo> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(ShippingInfo::getSalesLedgerId, req.getSalesLedgerId());
- wrapper.eq(ShippingInfo::getSalesLedgerProductId, req.getSalesLedgerProductId());
ShippingInfo shippingInfo = shippingInfoService.getOne(wrapper);
- if(shippingInfo == null){
- return AjaxResult.error("鍙戣揣淇℃伅涓嶅瓨鍦�");
- }
ShipmentApproval shipmentApproval = new ShipmentApproval();
shipmentApproval.setSalesLedgerId(req.getSalesLedgerId());
shipmentApproval.setSalesLedgerProductId(req.getSalesLedgerProductId());
--
Gitblit v1.9.3