From 49eda5931240f1a8894ee3edbfd2dc2538328b55 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期五, 29 五月 2026 15:19:19 +0800
Subject: [PATCH] feat: 添加一键发货，自动审批通过出库，取消车牌必填项，发货完成后产品状态自己变为不足->变为已发货
---
src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 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..31b555d 100644
--- a/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
+++ b/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
@@ -74,7 +74,7 @@
@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);
@@ -141,4 +141,29 @@
public AjaxResult getByCustomerName(String customerName) {
return AjaxResult.success(shippingInfoService.getShippingInfoByCustomerName(customerName));
}
+
+ /**
+ * 涓�閿彂璐� - 鑷姩瀹℃壒閫氳繃骞跺嚭搴�
+ */
+ @PostMapping("/oneClickShipping")
+ @ApiOperation("涓�閿彂璐�")
+ @Transactional(rollbackFor = Exception.class)
+ @Log(title = "鍙戣揣淇℃伅绠＄悊", businessType = BusinessType.INSERT)
+ public AjaxResult oneClickShipping(@RequestBody ShippingInfoDto req) throws IOException {
+ return shippingInfoService.oneClickShipping(req) ? AjaxResult.success("鍙戣揣鎴愬姛") : AjaxResult.error("鍙戣揣澶辫触");
+ }
+
+ /**
+ * 鎵归噺涓�閿彂璐� - 灏嗛攢鍞彴璐︿笅鎵�鏈夋湭鍙戣揣鐨勪骇鍝佸叏閮ㄥ彂璐�
+ */
+ @PostMapping("/batchOneClickShipping")
+ @ApiOperation("鎵归噺涓�閿彂璐�")
+ @Transactional(rollbackFor = Exception.class)
+ @Log(title = "鍙戣揣淇℃伅绠＄悊", businessType = BusinessType.INSERT)
+ public AjaxResult batchOneClickShipping(@RequestBody ShippingInfoDto req) throws IOException {
+ if (req.getSalesLedgerId() == null) {
+ return AjaxResult.error("閿�鍞彴璐D涓嶈兘涓虹┖");
+ }
+ return shippingInfoService.batchOneClickShipping(req.getSalesLedgerId(), req) ? AjaxResult.success("鎵归噺鍙戣揣鎴愬姛") : AjaxResult.error("鎵归噺鍙戣揣澶辫触");
+ }
}
--
Gitblit v1.9.3