From ef5bf910f7c42000fee6eeca78d1c0281165d113 Mon Sep 17 00:00:00 2001
From: wbc <2597324127@qq.com>
Date: 星期三, 25 六月 2025 14:40:17 +0800
Subject: [PATCH] 11111

---
 MES.Service/service/Warehouse/MesReturnwareManager.cs |   22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/MES.Service/service/Warehouse/MesReturnwareManager.cs b/MES.Service/service/Warehouse/MesReturnwareManager.cs
index f74a81d..c83afa9 100644
--- a/MES.Service/service/Warehouse/MesReturnwareManager.cs
+++ b/MES.Service/service/Warehouse/MesReturnwareManager.cs
@@ -137,7 +137,8 @@
                 Remarks = dto.Remarks,
                 CreateBy = dto.CreateBy,
                 CreateDate = dto.CreateDate,
-                Type       = dto.Type
+                Type       = dto.Type,
+                Over=dto.Over ?? 0
             };
 
 
@@ -166,7 +167,12 @@
                     ReturnOrder = dto.ReturnOrder,
                     OrderType = dto.OrderType,
                     OrderNumber = dto.OrderNumber,
-                    OrderNo = dto.OrderNo
+                    OrderNo = dto.OrderNo,
+                    ActualQuantity = dto.ActQuantity,
+                    CustItemNo = dto.CustItemNo,
+                    CustItemName = dto.CustItemName,
+                    CustItemModel = dto.CustItemModel,
+                    Remarks=dto.Remarks
 
                 };
 
@@ -185,14 +191,14 @@
 
             return UseTransaction(db =>
             {
-                var update = db.Deleteable<Womcaa>()
-                       .Where(it => it.Caa001 == data.FBillNo &&
-                                    it.SrcBillType == data.FBillTypeID)
+                var update = db.Deleteable<MesReturnware>()
+                       .Where(it => it.ReturnNo == data.FBillNo &&
+                                    it.ReturnType == data.FBillTypeID)
                        .ExecuteCommand() > 0;
 
-                var insertOrUpdate = db.Deleteable<Womcab>()
-                      .Where(it => it.Cab001 == data.FBillNo &&
-                                   it.Cab002 == data.FBillTypeID)
+                var insertOrUpdate = db.Deleteable<MesReturnwareDetails>()
+                      .Where(it => it.ReturnNo == data.FBillNo &&
+                                   it.ReturnType == data.FBillTypeID)
                       .ExecuteCommand() > 0;
 
 

--
Gitblit v1.9.3