From 951eb40bc7bfed102eea3c2fa0a107e7c9062136 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 22 四月 2025 10:02:15 +0800
Subject: [PATCH] #优化 优化出库明细
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeliveryController.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeliveryController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeliveryController.java
index 0509ebf..0df7a00 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeliveryController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeliveryController.java
@@ -11,7 +11,11 @@
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.manager.entity.Delivery;
import com.vincent.rsf.server.manager.service.DeliveryService;
+import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.controller.BaseController;
+import com.vincent.rsf.server.system.service.SerialRuleService;
+import com.vincent.rsf.server.system.utils.SerialRuleUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -24,6 +28,7 @@
@Autowired
private DeliveryService deliveryService;
+
@PreAuthorize("hasAuthority('manager:delivery:list')")
@PostMapping("/delivery/page")
@@ -56,9 +61,14 @@
@PostMapping("/delivery/save")
public R save(@RequestBody Delivery delivery) {
delivery.setCreateBy(getLoginUserId());
- delivery.setCreateTime(new Date());
delivery.setUpdateBy(getLoginUserId());
- delivery.setUpdateTime(new Date());
+ if (Objects.isNull(delivery.getCode())) {
+ String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_DELIVERY_RULE_CODE, delivery);
+ if (Objects.isNull(ruleCode) || StringUtils.isBlank(ruleCode)) {
+ return R.error("缂栫爜瑙勫垯閿欒锛氱紪鐮併�孲YS_DELIVERY_RULE_CODE銆嶆槸鏈缃垚鍔燂紒锛�");
+ }
+ delivery.setCode(ruleCode);
+ }
if (!deliveryService.save(delivery)) {
return R.error("Save Fail");
}
--
Gitblit v1.9.1