From 1ca5584d7e3200a9af65a099bd26d3593e2ba702 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 07 五月 2026 14:36:08 +0800
Subject: [PATCH] 迁移pro
---
src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java | 62 +++++++++++-------------------
1 files changed, 23 insertions(+), 39 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java b/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
index db3c5b9..458be2d 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.bean.vo.ApproveProcessVO;
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,27 +12,18 @@
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.framework.web.domain.R;
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 io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.time.LocalDate;
import java.util.List;
@@ -46,35 +34,29 @@
*/
@RestController
@RequestMapping("/shippingInfo")
-@Api(tags = "鍙戣揣淇℃伅绠＄悊")
+@Tag(name = "鍙戣揣淇℃伅绠＄悊")
+@AllArgsConstructor
public class ShippingInfoController extends BaseController {
- @Autowired
private ShippingInfoService shippingInfoService;
-
- @Autowired
- private CommonFileServiceImpl commonFileService;
-
- @Autowired
private ApproveProcessServiceImpl approveProcessService;
- @Autowired
- private StockUtils stockUtils;
+ private ShippingInfoMapper shippingInfoMapper;
@GetMapping("/listPage")
- @ApiOperation("鍙戣揣淇℃伅鍒楄〃")
+ @Operation(summary = "鍙戣揣淇℃伅鍒楄〃")
public AjaxResult listPage(Page page, ShippingInfo req) {
IPage<ShippingInfoDto> listPage = shippingInfoService.listPage(page,req);
return AjaxResult.success(listPage);
}
@PostMapping("/add")
- @ApiOperation("娣诲姞鍙戣揣淇℃伅")
+ @Operation(summary = "娣诲姞鍙戣揣淇℃伅")
@Transactional(rollbackFor = Exception.class)
@Log(title = "鍙戣揣淇℃伅绠＄悊", businessType = BusinessType.INSERT)
public AjaxResult add(@RequestBody ShippingInfoDto req) throws Exception {
LoginUser loginUser = SecurityUtils.getLoginUser();
- String sh = OrderUtils.countTodayByCreateTime(shippingInfoMapper, "SH");
+ String sh = OrderUtils.countTodayByCreateTime(shippingInfoMapper, "SH","shipping_no");
// 鍙戣揣瀹℃壒
ApproveProcessVO approveProcessVO = new ApproveProcessVO();
approveProcessVO.setApproveType(7);
@@ -87,11 +69,11 @@
// 娣诲姞鍙戣揣娑堟伅
req.setShippingNo(sh);
req.setStatus("寰呭鏍�");
- boolean save = shippingInfoService.save(req);
+ boolean save = shippingInfoService.add(req);
return save ? AjaxResult.success() : AjaxResult.error();
}
- @ApiOperation("鍙戣揣鎵ｅ簱瀛�")
+ @Operation(summary = "鍙戣揣鎵ｅ簱瀛�")
@PostMapping("/deductStock")
@Transactional(rollbackFor = Exception.class)
@Log(title = "鍙戣揣淇℃伅绠＄悊", businessType = BusinessType.UPDATE)
@@ -100,7 +82,7 @@
}
@PostMapping("/update")
- @ApiOperation("淇敼鍙戣揣淇℃伅")
+ @Operation(summary = "淇敼鍙戣揣淇℃伅")
@Transactional(rollbackFor = Exception.class)
@Log(title = "鍙戣揣淇℃伅绠＄悊", businessType = BusinessType.UPDATE)
public AjaxResult update(@RequestBody ShippingInfo req) {
@@ -113,7 +95,7 @@
}
@DeleteMapping("/delete")
- @ApiOperation("鍒犻櫎鍙戣揣淇℃伅")
+ @Operation(summary = "鍒犻櫎鍙戣揣淇℃伅")
@Transactional(rollbackFor = Exception.class)
@Log(title = "鍙戣揣淇℃伅绠＄悊", businessType = BusinessType.DELETE)
public AjaxResult delete(@RequestBody List<Long> ids) {
@@ -121,14 +103,11 @@
return shippingInfoService.delete(ids) ? AjaxResult.success("鍒犻櫎鎴愬姛") : AjaxResult.error("鍒犻櫎澶辫触");
}
- @Autowired
- private ShippingInfoMapper shippingInfoMapper;
-
/**
* 瀵煎嚭鍙戣揣淇℃伅绠＄悊
*/
@PostMapping("/export")
- @ApiOperation("瀵煎嚭鍙戣揣淇℃伅")
+ @Operation(summary = "瀵煎嚭鍙戣揣淇℃伅")
public void export(HttpServletResponse response) {
List<ShippingInfo> list = shippingInfoMapper.listAll();
ExcelUtil<ShippingInfo> util = new ExcelUtil<ShippingInfo>(ShippingInfo.class);
@@ -137,8 +116,13 @@
@GetMapping("/getByCustomerName")
- @ApiOperation("閫氳繃瀹㈡埛鍚嶇О鏌ヨ")
+ @Operation(summary = "閫氳繃瀹㈡埛鍚嶇О鏌ヨ")
public AjaxResult getByCustomerName(String customerName) {
return AjaxResult.success(shippingInfoService.getShippingInfoByCustomerName(customerName));
}
+
+ @GetMapping("/getDateil/{id}")
+ public R getDateil(@PathVariable("id") Long id) {
+ return R.ok(shippingInfoService.getDetail(id));
+ }
}
--
Gitblit v1.9.3