From 8eaee61fbbdea1eaa294b0f1a7d9f2a10da9ade9 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 10 三月 2025 17:06:37 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.97.1.152:5880/r/wms-master into dev

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java |    9 +++++----
 1 files changed, 5 insertions(+), 4 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 eea897f..c9bedbf 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
@@ -2,7 +2,7 @@
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.vincent.rsf.framework.exception.CoolException;
-import com.vincent.rsf.server.common.config.SysStockFlowProperties;
+import com.vincent.rsf.server.common.config.SysStockProperties;
 import com.vincent.rsf.server.common.utils.DateUtils;
 import com.vincent.rsf.server.manager.entity.*;
 import com.vincent.rsf.server.manager.service.*;
@@ -44,7 +44,7 @@
     private AsnOrderItemService asnOrderItemService;
 
     @Resource
-    private SysStockFlowProperties flowProperties;
+    private SysStockProperties flowProperties;
     /**
      * @author Ryan
      * @description  鏍规嵁PO鍗曟嵁鐢熸垚ASN鍗�,鑷姩鐢熸垚ASN鍗曚负鍏ㄩ噺鐢熸垚
@@ -94,12 +94,13 @@
                 AsnOrderItem orderItem = new AsnOrderItem();
                 Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getId, item.getMatnrCode()));
                 orderItem.setAnfme(item.getAnfme())
-                        .setAsnId(purchase.getId())
+                        .setAsnId(order.getId())
                         .setQty(item.getQty())
                         .setSplrName(item.getSplrName())
                         .setSplrCode(item.getSplrCode())
                         .setMatnk(item.getMatnrName())
-                        .setPoDetlId(item.getId() + "")
+                        .setPoDetlId(item.getId())
+                        .setPoCode(purchase.getCode())
                         .setPurQty(item.getAnfme())
                         .setPurUnit(item.getUnit())
                         .setMatnk(matnr.getName())

--
Gitblit v1.9.1