From ac6db1c4fddcb89c9668e34a35f023817a59f838 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 01 四月 2026 17:54:44 +0800
Subject: [PATCH] yys 1.产品导入新增excel错误提示 2.bom导入新增excel错误提示 3.仓储物流增加库位字段 4.修改发货出库-新增库位 5.修改采购入库审核-新增库位 6.生产入库-新增库位，审核
---
src/main/java/com/ruoyi/sales/controller/ShipmentApprovalController.java | 80 +--------------------------------------
1 files changed, 3 insertions(+), 77 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/ShipmentApprovalController.java b/src/main/java/com/ruoyi/sales/controller/ShipmentApprovalController.java
index 63f417b..050318d 100644
--- a/src/main/java/com/ruoyi/sales/controller/ShipmentApprovalController.java
+++ b/src/main/java/com/ruoyi/sales/controller/ShipmentApprovalController.java
@@ -1,27 +1,18 @@
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.google.common.math.LongMath;
+import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.procurementrecord.dto.ProcurementAddDto;
-import com.ruoyi.procurementrecord.dto.ProcurementRecordOutAdd;
-import com.ruoyi.procurementrecord.pojo.ProcurementRecordOut;
-import com.ruoyi.procurementrecord.pojo.ProcurementRecordStorage;
-import com.ruoyi.procurementrecord.service.ProcurementRecordOutService;
-import com.ruoyi.procurementrecord.service.ProcurementRecordService;
+import com.ruoyi.procurementrecord.utils.StockUtils;
import com.ruoyi.sales.mapper.ShipmentApprovalMapper;
-import com.ruoyi.sales.mapper.ShippingInfoMapper;
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.ShipmentApprovalService;
-import com.ruoyi.sales.service.ShippingInfoService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -29,9 +20,6 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
-import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
import java.util.List;
@RestController
@@ -47,9 +35,7 @@
@Autowired
private ISalesLedgerProductService salesLedgerProductService;
@Autowired
- private ProcurementRecordOutService procurementRecordOutService;
- @Autowired
- private ProcurementRecordService procurementRecordStorageService;
+ private StockUtils stockUtils;
@GetMapping("/listPage")
@ApiOperation("鍙戣揣瀹℃壒鍒楄〃")
@@ -57,66 +43,6 @@
IPage<ShipmentApproval> listPage = shipmentApprovalService.listPage(page,req);
return AjaxResult.success(listPage);
}
-
- @PostMapping("/update")
- @ApiOperation("鍙戣揣瀹℃壒,鏇存柊鍙戣揣瀹℃壒鐘舵��")
- @Transactional(rollbackFor = Exception.class)
- public AjaxResult update(@RequestBody ShipmentApproval req) {
-
- // 鏌ヨ鍙戣揣瀹℃壒
- ShipmentApproval shipmentApproval = shipmentApprovalMapper.selectById(req.getId());
- if (shipmentApproval == null) {
- return AjaxResult.error("鍙戣揣瀹℃壒涓嶅瓨鍦�");
- }
-
- // 鏇存柊鍙戣揣瀹℃壒鐘舵��
- shipmentApproval.setApproveStatus(req.getApproveStatus());
- boolean update = shipmentApprovalService.updateById(shipmentApproval);
- if (!update) {
- // 浜嬪姟鍥炴粴
- throw new ServiceException("鍙戣揣瀹℃壒鏇存柊澶辫触");
- }
- // 鏌ヨ鍏宠仈鐨勯攢鍞彴璐︿骇鍝�
- SalesLedgerProduct salesLedgerProduct = salesLedgerProductService.getById(shipmentApproval.getSalesLedgerProductId());
- if (salesLedgerProduct == null) {
- // 鎶涘紓甯镐簨鍔″洖婊�
- throw new ServiceException("閿�鍞彴璐︿笉瀛樺湪锛屽鎵瑰洖婊�");
- }
-
- // 鍚屾鏇存柊閿�鍞彴璐︿骇鍝佺殑瀹℃壒鐘舵��
- salesLedgerProduct.setApproveStatus(req.getApproveStatus());
- salesLedgerProductService.updateById(salesLedgerProduct);
-
- // 瀹℃壒閫氳繃
- if (req.getApproveStatus() == 3) {
-// // 鏌ヨ閲囪喘鍏ュ簱璁板綍
-// LambdaQueryWrapper<ProcurementRecordStorage> lambdaQueryWrapper = new LambdaQueryWrapper<ProcurementRecordStorage>()
-// .eq(ProcurementRecordStorage::getSalesLedgerProductId, req.getSalesLedgerProductId());
-// ProcurementRecordStorage procurementRecordStorage = procurementRecordStorageService.getOne(lambdaQueryWrapper);
-//
-// if (procurementRecordStorage == null) {
-// // 淇濊瘉鍓嶉潰鐨勪慨鏀瑰叏閮ㄥ洖婊�
-// throw new ServiceException("閲囪喘璁板綍涓嶅瓨鍦紝瀹℃壒鍥炴粴");
-// }
-
- // 鐢熸垚鍑哄簱璁板綍
- ProcurementRecordOutAdd procurementRecordOutAdd = new ProcurementRecordOutAdd();
-// procurementRecordOutAdd.setId(procurementRecordStorage.getId());
- procurementRecordOutAdd.setId(0);
- procurementRecordOutAdd.setProductModelId(salesLedgerProduct.getProductModelId());
- procurementRecordOutAdd.setSalesLedgerProductId((long) Math.toIntExact(salesLedgerProduct.getId()));
- procurementRecordOutAdd.setType(2);
- procurementRecordOutAdd.setUserId(Math.toIntExact(getUserId()));
- procurementRecordOutAdd.setQuantity(salesLedgerProduct.getQuantity().toPlainString());
- procurementRecordOutAdd.setTime(LocalDate.now().toString());
-
- procurementRecordOutService.stockout(procurementRecordOutAdd);
- }
-
- return AjaxResult.success();
- }
-
-
/**
* 瀵煎嚭鍙戣揣淇℃伅绠＄悊
--
Gitblit v1.9.3