From cb359b4ef9e467eefcd0e05eca0dfac090076997 Mon Sep 17 00:00:00 2001
From: "yang.lee" <whitebig@126.com>
Date: Wed, 8 Nov 2023 17:07:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=87=BA=E5=BA=93=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E4=BB=A3=E7=A0=81=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Tnb.WarehouseMgr/WmsOutStockService.cs    |  6 +++--
 .../Tnb.WarehouseMgr/WmsSaleService.cs        | 24 +++++++++++++------
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs
index 3b3fa05a..e88b7040 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs
@@ -74,6 +74,7 @@ namespace Tnb.WarehouseMgr
 
         public async Task<dynamic> OutStockApplyFor(VisualDevModelDataCrInput input)
         {
+            List<WmsOutstockD> outStockDList = new();
             try
             {
                 await _db.Ado.BeginTranAsync();
@@ -132,10 +133,11 @@ namespace Tnb.WarehouseMgr
 
                 List<string> carryIds = new();
                 var mapKeys = new List<string> { "tablefield120", "details" };
+                
                 //tablefield120  出库物料明细
                 if (input.data.Keys.Any(k => mapKeys.Contains(k))) //input.data.ContainsKey("tablefield120") && input.data["tablefield120"].IsNotEmptyOrNull()
                 {
-                    List<WmsOutstockD> outStockDList = new();
+                    
                     if (input.data.ContainsKey("tablefield120") && input.data["tablefield120"].IsNotEmptyOrNull())
                     {
                         outStockDList = input.data["tablefield120"].ToObject<List<WmsOutstockD>>();
@@ -387,7 +389,7 @@ namespace Tnb.WarehouseMgr
             {
                 await InvokeGenPretaskExcute();
             }
-            return Task.FromResult(true);
+            return Task.FromResult((input.data["ReturnIdentity"].ToString(), outStockDList));
         }
 
 
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsSaleService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsSaleService.cs
index bfd0f88a..6b8ecd98 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsSaleService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsSaleService.cs
@@ -9,10 +9,13 @@ using Mapster;
 using Microsoft.AspNetCore.Mvc;
 using SqlSugar;
 using Tnb.Common.Utils;
+using Tnb.QcMgr.Entities.Enums;
+using Tnb.QcMgr.Entities;
 using Tnb.WarehouseMgr.Entities;
 using Tnb.WarehouseMgr.Entities.Dto;
 using Tnb.WarehouseMgr.Entities.Dto.Inputs;
 using Tnb.WarehouseMgr.Interfaces;
+using Tnb.QcMgr.Interfaces;
 
 namespace Tnb.WarehouseMgr
 {
@@ -22,11 +25,13 @@ namespace Tnb.WarehouseMgr
     public class WmsSaleService : WmsPurchaseAndSaleCommonService<WmsSaleD>, IWmsSaleService
     {
         private readonly IWmsOutStockService _wmsOutStockService;
+        private readonly IQcCheckPlanService _qcCheckPlanService;
 
-        public WmsSaleService(ISqlSugarRepository<WmsPurchaseH> repo, IUserManager userManager, IWmsOutStockService wmsOutStockService)
+        public WmsSaleService(ISqlSugarRepository<WmsPurchaseH> repo, IUserManager userManager, IWmsOutStockService wmsOutStockService, IQcCheckPlanService qcCheckPlanService)
             : base(repo, userManager)
         {
             _wmsOutStockService = wmsOutStockService;
+            _qcCheckPlanService = qcCheckPlanService;
         }
         /// <summary>
         /// 销售发货
@@ -43,10 +48,15 @@ namespace Tnb.WarehouseMgr
             visualDevModelDataInput.data = PocoToDictionary.ToDictionary(input) as Dictionary<string, object>;
             visualDevModelDataInput.data["location_id"] = "26412597341221";
             visualDevModelDataInput.data["location_code"] = "YCL01-01-01";
-            if (_wmsOutStockService != null)
-            {
-                await _wmsOutStockService.OutStockApplyFor(visualDevModelDataInput);
-            }
+
+             (string pkId, List <WmsOutstockD> outStockDList) multi = await _wmsOutStockService.OutStockApplyFor(visualDevModelDataInput);
+
+            CreateTaskEntity ctEntity = new();
+            ctEntity.maintableid = multi.pkId;
+            ctEntity.materialids = multi.outStockDList?.Select(x => x.material_id).ToList() ?? Array.Empty<string>().ToList();
+            ctEntity.triggerevent = EnumTriggerEvent.出厂检按入厂频次;
+            _ = _qcCheckPlanService.CreateWmsTask(ctEntity);
+
             return await Task.FromResult(1);
         }
         /// <summary>
@@ -67,9 +77,9 @@ namespace Tnb.WarehouseMgr
         /// </param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<bool> Audit(PurchaseAndSaleAuditUpInput input) 
+        public async Task<bool> Audit(PurchaseAndSaleAuditUpInput input)
         {
-           return await Audit<WmsSaleH>(input);
+            return await Audit<WmsSaleH>(input);
         }
 
         /// <summary>