From cbfbbc6ab15b0eac96b47e7a6214bc436e58dce2 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 21 五月 2025 20:35:01 +0800
Subject: [PATCH] no message
---
rsf-server/src/main/java/com/vincent/rsf/server/common/utils/FieldsUtils.java | 4 +++-
/dev/null | 45 ---------------------------------------------
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java | 7 +++++--
3 files changed, 8 insertions(+), 48 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/FieldsUtils.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/FieldsUtils.java
index 039e485..c65ac30 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/FieldsUtils.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/FieldsUtils.java
@@ -13,6 +13,7 @@
import com.vincent.rsf.server.system.entity.FieldsItem;
import com.vincent.rsf.server.system.service.FieldsItemService;
import com.vincent.rsf.server.system.service.FieldsService;
+import lombok.Synchronized;
import org.apache.commons.lang3.StringUtils;
import org.springframework.transaction.annotation.Transactional;
@@ -145,8 +146,9 @@
* @return
* @time 2025/4/7 15:28
*/
+ @Synchronized
@Transactional(rollbackFor = Exception.class)
- public static synchronized void updateFieldsValue(Map<String, Object> params) throws Exception {
+ public static void updateFieldsValue(Map<String, Object> params) throws Exception {
List<Fields> fields = getFieldsSta();
if (fields.isEmpty()) { return; }
Object fieldsIndex = params.get("fieldsIndex");
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java
index b10811a..9584e8a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java
@@ -17,6 +17,7 @@
import com.vincent.rsf.server.manager.utils.OptimalAlgorithmUtil;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
+import lombok.Synchronized;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
@@ -101,8 +102,9 @@
* @description 鐢熸垚鍑哄簱浠诲姟
* @time 2025/4/28 14:01
*/
+ @Synchronized
@Transactional(rollbackFor = Exception.class)
- private synchronized void generateOutTask(List<WaveItem> itemParams, Long loginUserId, Wave wave) throws Exception {
+ public void generateOutTask(List<WaveItem> itemParams, Long loginUserId, Wave wave) throws Exception {
List<LocItem> locItemList = new ArrayList<>();
for (WaveItem param : itemParams) {
String locs = param.getStockLocs();
@@ -246,7 +248,8 @@
* @description 鏍规嵁鐗╂枡缂栫爜锛屾壒娆★紝鍔ㄦ�佸瓧娈� 鏌ヨ绗﹀悎鐨勫簱浣嶏紝鍐嶆牴鎹簱浣嶄腑鐗╂枡鐨勬暟閲忛�夋嫨鏈�閫傚悎鐨勫簱浣�
* @time 2025/4/27 09:26
*/
- private synchronized List<WaveItem> getLocs(List<WaveItem> waveItems) throws Exception {
+ @Synchronized
+ private List<WaveItem> getLocs(List<WaveItem> waveItems) throws Exception {
//TODO 鏍规嵁鐗╂枡缂栫爜锛屾壒娆★紝鍔ㄦ�佸瓧娈� 鏌ヨ绗﹀悎鐨勫簱浣嶏紝鍐嶆牴鎹簱浣嶄腑鐗╂枡鐨勬暟閲忛�夋嫨鏈�閫傚悎鐨勫簱浣�
waveItems.forEach(waveItem -> {
List<LocItem> locItems = locItemService.list(new QueryWrapper<LocItem>()
diff --git a/rsf-server/src/main/java/locItemWorking.sql b/rsf-server/src/main/java/locItemWorking.sql
deleted file mode 100644
index 07fe9c4..0000000
--- a/rsf-server/src/main/java/locItemWorking.sql
+++ /dev/null
@@ -1,45 +0,0 @@
--- save locItemWorking record
--- mysql
-insert into `sys_menu` ( `name`, `parent_id`, `route`, `component`, `type`, `sort`, `tenant_id`, `status`) values ( 'menu.locItemWorking', '0', '/manager/locItemWorking', 'locItemWorking', '0' , '0', '1' , '1');
-
-insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Query 瀹瑰櫒绠＄悊', '', '1', 'manager:locItemWorking:list', '0', '1', '1');
-insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Create 瀹瑰櫒绠＄悊', '', '1', 'manager:locItemWorking:save', '1', '1', '1');
-insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Update 瀹瑰櫒绠＄悊', '', '1', 'manager:locItemWorking:update', '2', '1', '1');
-insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Delete 瀹瑰櫒绠＄悊', '', '1', 'manager:locItemWorking:remove', '3', '1', '1');
-
--- locale menu name
-locItemWorking: 'LocItemWorking',
-
--- locale field
-locItemWorking: {
- locId: "locId",
- locCode: "locCode",
- orderId: "orderId",
- type: "type",
- orderItemId: "orderItemId",
- wkType: "wkType",
- matnrId: "matnrId",
- maktx: "maktx",
- platItemId: "platItemId",
- platOrderCode: "platOrderCode",
- platWorkCode: "platWorkCode",
- projectCode: "projectCode",
- matnrCode: "matnrCode",
- trackCode: "trackCode",
- unit: "unit",
- anfme: "anfme",
- qty: "qty",
- workQty: "workQty",
- batch: "batch",
- splrBatch: "splrBatch",
- splrId: "splrId",
- spec: "spec",
- model: "model",
- fieldsIndex: "fieldsIndex",
-},
-
--- ResourceContent
-import locItemWorking from './locItemWorking';
-
-case 'locItemWorking':
- return locItemWorking;
--
Gitblit v1.9.1