From 26f504367ee53c97fdb84f5cb70b354dbeb45a1b Mon Sep 17 00:00:00 2001
From: 86156 <823267011@qq.com>
Date: Thu, 30 Oct 2025 17:07:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E6=AF=8F=E4=B8=80=E6=AD=A5=E7=9A=84?=
 =?UTF-8?q?=E9=92=A2=E5=8D=B7=E4=BA=8C=E7=BB=B4=E7=A0=81=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=EF=BC=8C=E6=96=B0=E6=AD=A5=E9=AA=A4=E9=87=87?=
 =?UTF-8?q?=E7=94=A8=E6=96=B0=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/WmsMaterialCoilServiceImpl.java      | 23 ++++---------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
index 193d7801..b0fb3b65 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
@@ -75,22 +75,6 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
             return null;
         }
 
-        // 如果查询到的是历史数据，尝试查找对应的当前数据
-        if (vo.getDataType() != null && vo.getDataType() == 0) {
-            // 根据入场钢卷号查找当前数据
-            LambdaQueryWrapper<WmsMaterialCoil> lqw = Wrappers.lambdaQuery();
-            lqw.eq(WmsMaterialCoil::getEnterCoilNo, vo.getEnterCoilNo())
-                .eq(WmsMaterialCoil::getDataType, 1) // 查找当前数据
-                .orderByDesc(WmsMaterialCoil::getCreateTime); // 按创建时间倒序，获取最新的
-
-            List<WmsMaterialCoilVo> currentDataList = baseMapper.selectVoList(lqw);
-            if (!currentDataList.isEmpty()) {
-                // 如果找到当前数据，返回最新的当前数据
-                vo = currentDataList.get(0);
-            }
-            // 如果没有找到当前数据，仍然返回历史数据供查看
-        }
-
         // 查询关联对象
         fillRelatedObjects(vo);
 
@@ -540,12 +524,15 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
                 WmsMaterialCoil newCoil = BeanUtil.toBean(newCoilBo, WmsMaterialCoil.class);
                 newCoil.setCoilId(null);
                 newCoil.setDataType(1);
-                // 继承原钢卷的基本信息
+                // 继承原钢卷的基本信息（强制继承，不能修改的字段）
                 newCoil.setEnterCoilNo(oldCoil.getEnterCoilNo());
                 newCoil.setSupplierCoilNo(oldCoil.getSupplierCoilNo()); // 保留厂家原料卷号
                 newCoil.setItemType(oldCoil.getItemType());
                 newCoil.setItemId(oldCoil.getItemId());
-                newCoil.setTeam(oldCoil.getTeam());
+                // 如果前端没传team，使用原钢卷的team
+                if (newCoil.getTeam() == null) {
+                    newCoil.setTeam(oldCoil.getTeam());
+                }
                 // 如果没有指定库区，使用原库区
                 if (newCoil.getWarehouseId() == null) {
                     newCoil.setWarehouseId(oldCoil.getWarehouseId());