From 0b7c77568b6a47c4c824130d6f5288b0bab5cdef Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 11 五月 2026 16:01:06 +0800
Subject: [PATCH] feat: 扫码出库修改为发货
---
src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java b/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
index 4f00394..c276c69 100644
--- a/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
+++ b/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
@@ -28,7 +28,6 @@
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;
@@ -67,9 +66,6 @@
// private StockUtils stockUtils;
@Autowired
- private ISalesLedgerProductService salesLedgerProductService;
-
- @Autowired
private ISalesLedgerService salesLedgerService;
@Autowired
@@ -99,6 +95,15 @@
return AjaxResult.error("鍏宠仈璁㈠崟涓嶅瓨鍦�");
}
+ // 鍙戣揣鍓嶅繀椤讳繚璇佽璁㈠崟鎵�鏈変骇鍝佸凡鍏ュ簱
+ List<SalesLedgerProduct> notStocked = salesLedgerProductMapper.selectList(new LambdaQueryWrapper<SalesLedgerProduct>()
+ .eq(SalesLedgerProduct::getSalesLedgerId, salesLedger.getId())
+ .eq(SalesLedgerProduct::getType, 1)
+ .ne(SalesLedgerProduct::getProductStockStatus, 2));
+ if (CollectionUtils.isNotEmpty(notStocked)) {
+ return AjaxResult.error("鍙戣揣澶辫触,璇ラ攢鍞鍗曞瓨鍦ㄦ湭鍏ュ簱浜у搧,璇峰厛瀹屾垚鍏ㄩ儴鍏ュ簱鍚庡啀鍙戣揣");
+ }
+
// 妫�鏌ユ槸鍚﹀凡缁忓湪瀹℃壒涓垨宸插彂璐�
if (salesLedger.getDeliveryStatus() != null && salesLedger.getDeliveryStatus() >= 2 && !salesLedger.getDeliveryStatus().equals(3)) {
return AjaxResult.error("璇ヨ鍗曞凡鍦ㄥ鎵逛腑鎴栧凡鍙戣揣锛屾棤娉曢噸澶嶅彂璧�");
@@ -124,7 +129,7 @@
// 涓鸿鍗曚笅鐨勬瘡涓�涓骇鍝佺敓鎴愬彂璐у彴璐﹁褰� (鏄剧ず鍗曚釜浜у搧)
List<SalesLedgerProduct> products = salesLedgerProductMapper.selectList(new LambdaQueryWrapper<SalesLedgerProduct>()
.eq(SalesLedgerProduct::getSalesLedgerId, salesLedger.getId()));
-
+
if (CollectionUtils.isNotEmpty(products)) {
for (SalesLedgerProduct product : products) {
ShippingInfo si = new ShippingInfo();
@@ -132,7 +137,7 @@
si.setSalesLedgerProductId(product.getId());
si.setShippingNo(shNo);
si.setStatus("寰呭鏍�");
- si.setType(req.getType()); // 鏉ユ簮/绫诲瀷
+ si.setType(req.getType());
shippingInfoService.save(si);
}
}
--
Gitblit v1.9.3