From e808092ad818e33c47566ae62b4da188aff9bd1c Mon Sep 17 00:00:00 2001
From: "yang.lee" <whitebig@126.com>
Date: Wed, 8 Nov 2023 16:36:42 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7=EF=BC=8C?=
 =?UTF-8?q?=E9=94=80=E5=94=AE=E5=8F=91=E8=B4=A7=E6=96=B0=E5=A2=9E=E5=AF=B9?=
 =?UTF-8?q?=E5=A4=96=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Constraints/InOutCheckStatusUpdateEntity.cs |  4 ++++
 .../IWmsPurchaseService.cs                      | 17 +++++++++++++++++
 .../IWmsSaleService.cs                          | 17 +++++++++++++++++
 .../WmsPurchaseAndSaleCommonService.cs          |  5 ++++-
 WarehouseMgr/Tnb.WarehouseMgr/WmsSaleService.cs |  2 +-
 5 files changed, 43 insertions(+), 2 deletions(-)
 create mode 100644 WarehouseMgr/Tnb.WarehouseMgr.Interfaces/IWmsPurchaseService.cs
 create mode 100644 WarehouseMgr/Tnb.WarehouseMgr.Interfaces/IWmsSaleService.cs

diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/Constraints/InOutCheckStatusUpdateEntity.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/Constraints/InOutCheckStatusUpdateEntity.cs
index c69f364c..a6e7ca67 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/Constraints/InOutCheckStatusUpdateEntity.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/Constraints/InOutCheckStatusUpdateEntity.cs
@@ -15,5 +15,9 @@ namespace Tnb.WarehouseMgr.Entities.Entity.Constraints
         /// 检验状态
         /// </summary>
         public int? check_conclusion { get; set; }
+        /// <summary>
+        /// 是否检验
+        /// </summary>
+        public int? is_check { get;}
     }
 }
diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Interfaces/IWmsPurchaseService.cs b/WarehouseMgr/Tnb.WarehouseMgr.Interfaces/IWmsPurchaseService.cs
new file mode 100644
index 00000000..b28063ac
--- /dev/null
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Interfaces/IWmsPurchaseService.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tnb.WarehouseMgr.Entities.Dto.Inputs;
+
+namespace Tnb.WarehouseMgr.Interfaces
+{
+    /// <summary>
+    /// 采购收货
+    /// </summary>
+    public interface IWmsPurchaseService
+    {
+        Task<dynamic> MesCheckdPurchaseCallback(MesCheckdCallbackUpinput input);
+    }
+}
diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Interfaces/IWmsSaleService.cs b/WarehouseMgr/Tnb.WarehouseMgr.Interfaces/IWmsSaleService.cs
new file mode 100644
index 00000000..ad4a89fc
--- /dev/null
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Interfaces/IWmsSaleService.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tnb.WarehouseMgr.Entities.Dto.Inputs;
+
+namespace Tnb.WarehouseMgr.Interfaces
+{
+    /// <summary>
+    /// 销售发货
+    /// </summary>
+    public interface IWmsSaleService
+    {
+        Task<dynamic> MesCheckdSaleCallback(MesCheckdCallbackUpinput input);
+    }
+}
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseAndSaleCommonService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseAndSaleCommonService.cs
index ab4e11cd..af848234 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseAndSaleCommonService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseAndSaleCommonService.cs
@@ -6,6 +6,7 @@ using System.Threading.Tasks;
 using JNPF.Common.Contracts;
 using JNPF.Common.Core.Manager;
 using JNPF.Common.Dtos.VisualDev;
+using JNPF.Common.Extension;
 using JNPF.FriendlyException;
 using SqlSugar;
 using Tnb.BasicData.Entities;
@@ -15,6 +16,7 @@ using Tnb.WarehouseMgr.Entities.Consts;
 using Tnb.WarehouseMgr.Entities.Dto;
 using Tnb.WarehouseMgr.Entities.Dto.Inputs;
 using Tnb.WarehouseMgr.Entities.Entity.Constraints;
+using Tnb.WarehouseMgr.Entities.Enums;
 using Tnb.WarehouseMgr.Interfaces;
 
 namespace Tnb.WarehouseMgr
@@ -120,7 +122,8 @@ namespace Tnb.WarehouseMgr
 
         protected async Task<bool> UpdateChackStatus<TEntity>(MesCheckdCallbackUpinput input) where TEntity : BaseEntity<string>, InOutCheckStatusUpdateEntity, new()
         {
-            return await _db.Updateable<TEntity>().SetColumns(it => it.check_conclusion == input.check_conclusion).Where(it => it.id == input.maintableid).ExecuteCommandHasChangeAsync();
+            var isOk = await _db.Updateable<TEntity>().SetColumns(it => it.check_conclusion == input.check_conclusion).Where(it => it.id == input.maintableid).ExecuteCommandHasChangeAsync();
+            return isOk;
         }
 
     }
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsSaleService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsSaleService.cs
index 1605a513..bfd0f88a 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsSaleService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsSaleService.cs
@@ -19,7 +19,7 @@ namespace Tnb.WarehouseMgr
     /// <summary>
     /// 销售发货
     /// </summary>
-    public class WmsSaleService : WmsPurchaseAndSaleCommonService<WmsSaleD>
+    public class WmsSaleService : WmsPurchaseAndSaleCommonService<WmsSaleD>, IWmsSaleService
     {
         private readonly IWmsOutStockService _wmsOutStockService;