From aa3d1a0d6e0211ebd4c85a5ebd3847f64c59b4ac Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 27 一月 2026 10:05:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java | 94 +++++++++++++++++++++++++---------------------
1 files changed, 51 insertions(+), 43 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java b/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
index c498b93..a30adb9 100644
--- a/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
+++ b/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
@@ -3,11 +3,21 @@
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;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+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;
@@ -17,6 +27,7 @@
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;
@@ -25,6 +36,8 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.time.LocalDate;
import java.util.List;
/**
@@ -38,10 +51,14 @@
@Autowired
private ShippingInfoService shippingInfoService;
+
@Autowired
- private ShipmentApprovalMapper shipmentApprovalMapper;
+ private CommonFileServiceImpl commonFileService;
+
@Autowired
- private ISalesLedgerProductService salesLedgerProductService;
+ private ApproveProcessServiceImpl approveProcessService;
+ @Autowired
+ private StockUtils stockUtils;
@GetMapping("/listPage")
@@ -54,45 +71,44 @@
@PostMapping("/add")
@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("鍙戣揣淇℃伅宸插瓨鍦�");
- }
+ @Log(title = "鍙戣揣淇℃伅绠＄悊", businessType = BusinessType.INSERT)
+ public AjaxResult add(@RequestBody ShippingInfoDto req) throws Exception {
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ String sh = OrderUtils.countTodayByCreateTime(shippingInfoMapper, "SH");
+ // 鍙戣揣瀹℃壒
+ ApproveProcessVO approveProcessVO = new ApproveProcessVO();
+ approveProcessVO.setApproveType(7);
+ approveProcessVO.setApproveDeptId(loginUser.getCurrentDeptId());
+ approveProcessVO.setApproveReason(req.getType() + ":" +sh);
+ approveProcessVO.setApproveUserIds(req.getApproveUserIds());
+ approveProcessVO.setApproveUser(loginUser.getUserId());
+ approveProcessVO.setApproveTime(LocalDate.now().toString());
+ approveProcessService.addApprove(approveProcessVO);
+ // 娣诲姞鍙戣揣娑堟伅
+ req.setShippingNo(sh);
+ req.setStatus("寰呭鏍�");
boolean save = shippingInfoService.save(req);
- if(save){
- ShippingInfo shippingInfo = shippingInfoService.getOne(wrapper);
- ShipmentApproval shipmentApproval = new ShipmentApproval();
- shipmentApproval.setSalesLedgerId(req.getSalesLedgerId());
- shipmentApproval.setSalesLedgerProductId(req.getSalesLedgerProductId());
- shipmentApproval.setApproveUserId(req.getApproverId());
- shipmentApproval.setApproveStatus(2);
- shipmentApproval.setShippingInfoId(shippingInfo.getId());
- shipmentApprovalMapper.insert(shipmentApproval);
-
- SalesLedgerProduct salesLedgerProduct = salesLedgerProductService.getById(req.getSalesLedgerProductId());
- if(salesLedgerProduct != null){
- salesLedgerProduct.setApproveStatus(2);
- salesLedgerProductService.updateById(salesLedgerProduct);
- }
-
- }
return save ? AjaxResult.success() : AjaxResult.error();
+ }
+
+ @ApiOperation("鍙戣揣鎵ｅ簱瀛�")
+ @PostMapping("/deductStock")
+ @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();
}
@PostMapping("/update")
@ApiOperation("淇敼鍙戣揣淇℃伅")
+ @Transactional(rollbackFor = Exception.class)
+ @Log(title = "鍙戣揣淇℃伅绠＄悊", businessType = BusinessType.UPDATE)
public AjaxResult update(@RequestBody ShippingInfo req) {
ShippingInfo byId = shippingInfoService.getById(req.getId());
if (byId == null) {
return AjaxResult.error("鍙戣揣淇℃伅涓嶅瓨鍦�");
- }
- Long userId = getLoginUser().getUserId();
- if(!userId.equals(Long.parseLong(byId.getCreateUser().toString()))){
- return AjaxResult.error("鎮ㄦ病鏈夋潈闄愪慨鏀规鍙戣揣淇℃伅");
}
boolean update = shippingInfoService.updateById(req);
return update ? AjaxResult.success() : AjaxResult.error();
@@ -100,19 +116,11 @@
@DeleteMapping("/delete")
@ApiOperation("鍒犻櫎鍙戣揣淇℃伅")
+ @Transactional(rollbackFor = Exception.class)
+ @Log(title = "鍙戣揣淇℃伅绠＄悊", businessType = BusinessType.DELETE)
public AjaxResult delete(@RequestBody List<Long> ids) {
- Long userId = getLoginUser().getUserId();
- ids.forEach(id -> {
- ShippingInfo byId = shippingInfoService.getById(id);
- if (byId == null) {
- throw new RuntimeException("鍙戣揣淇℃伅涓嶅瓨鍦�");
- }
- if(!userId.equals(Long.parseLong(byId.getCreateUser().toString()))){
- throw new RuntimeException("鎮ㄦ病鏈夋潈闄愬垹闄ゆ鍙戣揣淇℃伅");
- }
- });
- boolean delete = shippingInfoService.removeBatchByIds(ids);
- return delete ? AjaxResult.success("鍒犻櫎鎴愬姛") : AjaxResult.error("鍒犻櫎澶辫触");
+
+ return shippingInfoService.delete(ids) ? AjaxResult.success("鍒犻櫎鎴愬姛") : AjaxResult.error("鍒犻櫎澶辫触");
}
@Autowired
--
Gitblit v1.9.3