From 83db499c850cd9bcdcce6b7abb1e3f3d57dd9f06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=80=A1=E8=93=89?= <377046077@qq.com>
Date: Mon, 2 Mar 2026 11:41:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93=E9=83=A8=E5=88=86=E5=92=8C?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ruoyi/api/domain/LocationDetail.java | 10 ++++++++++
 .../com/ruoyi/api/service/impl/ToErpServiceImpl.java   |  6 ++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/domain/LocationDetail.java b/ruoyi-admin/src/main/java/com/ruoyi/api/domain/LocationDetail.java
index db5c3bc..8b4fc4a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/domain/LocationDetail.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/domain/LocationDetail.java
@@ -8,6 +8,8 @@ public class LocationDetail {
 
     private String quantity;
 
+    private String lotNo;
+
     public String getLocationNo() {
         return locationNo;
     }
@@ -31,4 +33,12 @@ public class LocationDetail {
     public void setQuantity(String quantity) {
         this.quantity = quantity;
     }
+
+    public String getLotNo() {
+        return lotNo;
+    }
+
+    public void setLotNo(String lotNo) {
+        this.lotNo = lotNo;
+    }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java
index 6787e6e..181ef74 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java
@@ -371,7 +371,7 @@ public class ToErpServiceImpl implements IToErpService {
                 item.setSpecModel(detail.getSpec());
                 item.setUnit(detail.getUnit());
                 item.setQuantity(detail.getAssignNum());
-                item.setLotNo(detail.getLotNo());
+//                item.setLotNo(detail.getLotNo());
                 item.setLevelRelation(detail.getSpare1());
                 item.setUpperMaterial(detail.getSpare2());
                 item.setTopMaterial(detail.getSpare3());
@@ -385,6 +385,7 @@ public class ToErpServiceImpl implements IToErpService {
                     locationDetail.setLocationNo(splitLocation[i]);
                     locationDetail.setQuantity(splitQuantity[i]);
                     locationDetail.setAreaNo(splitArea[i]);
+                    locationDetail.setLotNo(detail.getLotNo());
                     locationDetails.add(locationDetail);
                 }
                 item.setLocations(locationDetails);
@@ -467,7 +468,7 @@ public class ToErpServiceImpl implements IToErpService {
                 item.setLevelRelation(detail.getSpare1());
                 item.setUpperMaterial(detail.getSpare2());
                 item.setTopMaterial(detail.getSpare3());
-                item.setLotNo(detail.getLotNo());
+//                item.setLotNo(detail.getLotNo());
                 item.setRemark(detail.getRemark());
 //                item.setArea(detail.getSpare9());
 //                item.setLocation(detail.getSpare8());
@@ -480,6 +481,7 @@ public class ToErpServiceImpl implements IToErpService {
                     locationDetail.setLocationNo(splitLocation[i]);
                     locationDetail.setQuantity(splitQuantity[i]);
                     locationDetail.setAreaNo(splitArea[i]);
+                    locationDetail.setLotNo(detail.getLotNo());
                     locationDetails.add(locationDetail);
                 }
                 item.setLocations(locationDetails);