From 8c8d5788ccd89f5c83b36f77495a54a0d8a92744 Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Wed, 6 Dec 2023 11:23:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AE=A2=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/WMS.Web.Domain/Entitys/SerialNumbers.cs        | 10 +++++++++-
 src/WMS.Web.Domain/Services/SerialNumberService.cs |  4 ++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/WMS.Web.Domain/Entitys/SerialNumbers.cs b/src/WMS.Web.Domain/Entitys/SerialNumbers.cs
index 810dddd6..06fcc8e2 100644
--- a/src/WMS.Web.Domain/Entitys/SerialNumbers.cs
+++ b/src/WMS.Web.Domain/Entitys/SerialNumbers.cs
@@ -69,6 +69,11 @@ namespace WMS.Web.Domain.Entitys
         ///</summary> 
         [Column("InStockBillNo")]
         public string InStockBillNo { get; set; }
+        /// <summary>
+        /// 收货客户
+        ///</summary> 
+        [Column("CustomerId")]
+        public int CustomerId { get; set; } = 0;
 
         /// <summary>
         /// 操作(绑定箱信息)
@@ -89,11 +94,14 @@ namespace WMS.Web.Domain.Entitys
         /// 出库
         /// </summary>
         /// <param name="outStockBillNo">出库单号</param>
-        public void OutStock(string outStockBillNo, OutStockType type)
+        public void OutStock(string outStockBillNo, OutStockType type,int customerId)
         {
             this.BoxId = 0;
             if (type == OutStockType.Sal)
+            {
                 this.OutStockBillNo = outStockBillNo;
+                this.CustomerId = customerId;
+            }
         }
         /// <summary>
         /// 入库
diff --git a/src/WMS.Web.Domain/Services/SerialNumberService.cs b/src/WMS.Web.Domain/Services/SerialNumberService.cs
index c4662eb2..6e3be00c 100644
--- a/src/WMS.Web.Domain/Services/SerialNumberService.cs
+++ b/src/WMS.Web.Domain/Services/SerialNumberService.cs
@@ -193,7 +193,7 @@ namespace WMS.Web.Domain.Services
                 var outstockDetail = outStock.Details.FirstOrDefault(f => f.MaterialId == entity.MaterialId);
                 if (outstockDetail == null) continue;
                 //修改序列号和箱绑定关系
-                entity.OutStock(outStock.BillNo, outStock.Type);
+                entity.OutStock(outStock.BillNo, outStock.Type, outStock.ReceiptCustomerId);
 
                 //记录序列号操作日志
                 SerialNumberOperate op = new SerialNumberOperate()
@@ -321,7 +321,7 @@ namespace WMS.Web.Domain.Services
                 var instockDetail = inStock.Details.FirstOrDefault(f => f.MaterialId == entity.MaterialId);
                 var subStock = _singleDataService.GetSingleData(SingleAction.SubStocks, loginInfo.UserInfo.CompanyId, instockDetail.SubStockId);
                 //修改序列号和箱绑定关系
-                entity.InStock(inStock.BillNo, inStock.Type);
+                entity.InStock(instockDetail.SourceBillNo, inStock.Type);
 
                 //记录序列号操作日志
                 SerialNumberOperate op = new SerialNumberOperate()