From 7e97f2a6bdce6997939db8882191665fd42ce2c5 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 30 五月 2025 09:37:58 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeliveryController.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 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..261413d 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
@@ -10,8 +10,13 @@
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.manager.entity.Delivery;
+import com.vincent.rsf.server.manager.service.CompanysService;
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.*;
@@ -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");
}
@@ -71,6 +81,13 @@
public R update(@RequestBody Delivery delivery) {
delivery.setUpdateBy(getLoginUserId());
delivery.setUpdateTime(new Date());
+ if (Objects.isNull(delivery.getCode()) || StringUtils.isBlank(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.updateById(delivery)) {
return R.error("Update Fail");
}
@@ -107,4 +124,4 @@
ExcelUtil.build(ExcelUtil.create(deliveryService.list(), Delivery.class), response);
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.1