From 313f0515b65ab69e6e811c199f4b33eb630509f3 Mon Sep 17 00:00:00 2001
From: Ryan <creaycat@gmail.com>
Date: 星期四, 03 四月 2025 19:09:38 +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/schedules/ScheduleJobs.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java
index 3ea93c3..86d45c9 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java
@@ -68,7 +68,7 @@
      */
     @Scheduled(cron = "0 0/05 * * * ?  ")
     @Transactional(rollbackFor = Exception.class)
-    public void genAsnOrder() {
+    public synchronized void genAsnOrder() {
         //鍒ゆ柇鏄惁寮�鍚嚜鍔ㄧ敓鎴怉SN鍗曟嵁
         if (!flowProperties.getFlagAutoAsn()) {
             return;
@@ -129,7 +129,7 @@
                         .setPurUnit(item.getUnit())
                         .setMatnrCode(matnr.getCode())
                         .setMaktx(matnr.getName())
-                        .setMatnrId(matnr.getId() + "");
+                        .setMatnrId(matnr.getId());
                 orderItems.add(orderItem);
             });
             if (!asnOrderItemService.saveBatch(orderItems)) {

--
Gitblit v1.9.1