From 38323f2c29e019fa0394456c24fc4356fa71f7f8 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 31 三月 2025 18:34:42 +0800
Subject: [PATCH] no message
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java | 5 +++--
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java | 2 --
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java | 14 +++++++++-----
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderService.java | 4 ++--
4 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java
index 37fef45..d95ee36 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java
@@ -160,7 +160,8 @@
if (Objects.isNull(params)) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- return asnOrderService.saveOrderAndItems(params);
+
+ return asnOrderService.saveOrderAndItems(params, getLoginUserId());
}
@ApiOperation("鍗曟嵁淇℃伅淇敼")
@@ -170,6 +171,6 @@
if (Objects.isNull(params)) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- return asnOrderService.updateOrderItem(params);
+ return asnOrderService.updateOrderItem(params, getLoginUserId());
}
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java
index db6a786..bf03f2b 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java
@@ -103,9 +103,7 @@
@PostMapping("/qlyInspect/save")
public R save(@RequestBody QlyInspect qlyInspect) {
qlyInspect.setCreateBy(getLoginUserId());
- qlyInspect.setCreateTime(new Date());
qlyInspect.setUpdateBy(getLoginUserId());
- qlyInspect.setUpdateTime(new Date());
if (!qlyInspectService.save(qlyInspect)) {
return R.error("Save Fail");
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderService.java
index 48a58aa..d476e5f 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderService.java
@@ -14,7 +14,7 @@
List<AsnOrder> getListByMatnr(Map<String, String> params);
- R saveOrderAndItems(AsnOrderAndItemsParams params);
+ R saveOrderAndItems(AsnOrderAndItemsParams params, Long loginUserId);
- R updateOrderItem(AsnOrderAndItemsParams params);
+ R updateOrderItem(AsnOrderAndItemsParams params, Long loginUserId);
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
index 1e7709d..b93e1ba 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
@@ -9,7 +9,6 @@
import com.vincent.rsf.server.api.service.ReportMsgService;
import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams;
import com.vincent.rsf.server.manager.entity.AsnOrderItem;
-import com.vincent.rsf.server.manager.mapper.AsnOrderItemMapper;
import com.vincent.rsf.server.manager.mapper.AsnOrderMapper;
import com.vincent.rsf.server.manager.entity.AsnOrder;
import com.vincent.rsf.server.manager.mapper.PurchaseMapper;
@@ -17,7 +16,6 @@
import com.vincent.rsf.server.manager.service.AsnOrderService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
-import com.vincent.rsf.server.system.entity.SerialRule;
import com.vincent.rsf.server.system.mapper.SerialRuleMapper;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -84,7 +82,7 @@
}
@Override
- public R saveOrderAndItems(AsnOrderAndItemsParams params) {
+ public R saveOrderAndItems(AsnOrderAndItemsParams params, Long loginUserId) {
if (Objects.isNull(params.getOrders())) {
throw new CoolException("涓诲崟淇℃伅涓嶈兘涓虹┖");
}
@@ -96,7 +94,9 @@
if (Objects.isNull(ruleCode)) {
throw new CoolException("鏀惰揣閫氱煡鍗曠紪鐮佺敓鎴愬け璐ワ紒锛�");
}
- orders.setCode(ruleCode);
+ orders.setCode(ruleCode)
+ .setUpdateBy(loginUserId)
+ .setCreateBy(loginUserId);
if (!this.save(orders)) {
throw new CoolException("涓诲崟淇濆瓨澶辫触锛侊紒");
}
@@ -107,6 +107,8 @@
item.put("asnId", orders.getId());
item.put("asnCode", orders.getCode());
item.put("poCode", orders.getPoCode());
+ item.put("createBy", loginUserId);
+ item.put("updateBy", loginUserId);
if (!asnOrderItemService.fieldsSave(item)) {
throw new CoolException("鏄庣粏淇濆瓨澶辫触锛侊紒");
}
@@ -116,12 +118,14 @@
/**
* 琛ㄥ崟鏄庣粏淇敼
+ *
* @param params
+ * @param loginUserId
* @return
*/
@Override
@Transactional
- public R updateOrderItem(AsnOrderAndItemsParams params) {
+ public R updateOrderItem(AsnOrderAndItemsParams params, Long loginUserId) {
if (Objects.isNull(params.getOrders())) {
throw new CoolException("涓诲崟淇℃伅涓嶈兘涓虹┖锛侊紒");
}
--
Gitblit v1.9.1