From e1920db0bbee8afd11543ac77d61807a9e7c4b84 Mon Sep 17 00:00:00 2001
From: hlb <894797954@qq.com>
Date: Thu, 16 Nov 2023 14:06:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E5=92=8C=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E5=90=8E=E7=94=9F=E6=88=90=E5=8D=95=E6=8D=AE?=
 =?UTF-8?q?=E6=97=B6=E5=A2=9E=E5=8A=A0=E5=AE=A1=E6=A0=B8=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E5=92=8C=E5=90=8C=E6=AD=A5=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Entity/WmsInstockH.cs                       |  4 ++++
 .../WmsPurchaseAndSaleCommonService.cs          |  1 +
 .../Tnb.WarehouseMgr/WmsPurchaseService.cs      |  9 +++++++++
 WarehouseMgr/Tnb.WarehouseMgr/WmsSaleService.cs | 17 +++++++++++++----
 4 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsInstockH.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsInstockH.cs
index 44e6c1c0..4538bd4e 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsInstockH.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsInstockH.cs
@@ -217,4 +217,8 @@ public partial class WmsInstockH : BaseEntity<string>, InOutCheckStatusUpdateEnt
     /// 检验结论
     /// </summary>
     public int? check_conclusion { get; set; }
+    /// <summary>
+    /// 审核状态
+    /// </summary>
+    public int? audit_status { get; set; }
 }
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseAndSaleCommonService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseAndSaleCommonService.cs
index 4359cf20..6f727973 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseAndSaleCommonService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseAndSaleCommonService.cs
@@ -84,6 +84,7 @@ namespace Tnb.WarehouseMgr
                 {
                     x.modify_id = _userManager.UserId;
                     x.modify_time = DateTime.Now;
+                    x.purchase_arriveqty = 0;
                 });
 
                 await _db.Updateable(purchaseDs).UpdateColumns(it => new { it.purchase_prqty, it.line_status }).ExecuteCommandAsync();
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseService.cs
index ec412960..1fe6279c 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseService.cs
@@ -75,6 +75,15 @@ namespace Tnb.WarehouseMgr
                     instock.create_id = _userManager.UserId;
                     instock.create_time = DateTime.Now;
                     instock.org_id = _userManager.User.OrganizeId;
+                    if (instock.source_code != null) {
+                        instock.sync_status = WmsWareHouseConst.SYNC_STATUS__NOTSYNC;
+                    }
+                    else {
+                        instock.sync_status = WmsWareHouseConst.SYNC_STATUS_NONEEDSYNC;
+                    }
+                    instock.audit_status = 0;
+                    instock.print_status = "0";
+                    instock.is_check = 0;
                     await _db.Insertable(instock).ExecuteCommandAsync();
 
                     instockDs = purchaseDs.Adapt<List<WmsInstockD>>();
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsSaleService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsSaleService.cs
index 1cc47e88..4823df98 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsSaleService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsSaleService.cs
@@ -16,6 +16,7 @@ using Tnb.WarehouseMgr.Entities.Dto;
 using Tnb.WarehouseMgr.Entities.Dto.Inputs;
 using Tnb.WarehouseMgr.Interfaces;
 using Tnb.QcMgr.Interfaces;
+using Tnb.WarehouseMgr.Entities.Consts;
 
 namespace Tnb.WarehouseMgr
 {
@@ -47,10 +48,18 @@ namespace Tnb.WarehouseMgr
             _ = await PurchaseAndSaleUpdate(input);
             VisualDevModelDataCrInput visualDevModelDataInput = new();
             visualDevModelDataInput.data = PocoToDictionary.ToDictionary(input) as Dictionary<string, object>;
-            visualDevModelDataInput.data["location_id"] = "26412597341221";
-            visualDevModelDataInput.data["location_code"] = "YCL01-01-01";
-
-             (string pkId, List <WmsOutstockD> outStockDList) multi = await _wmsOutStockService.OutStockApplyFor(visualDevModelDataInput);
+            visualDevModelDataInput.data["station_id"] = "30018443941397";
+            visualDevModelDataInput.data["station_code"] = "02DTGW";
+            if (visualDevModelDataInput.data.ContainsKey(nameof(WmsPurchaseH.source_code))) {
+                visualDevModelDataInput.data["sync_status"] = WmsWareHouseConst.SYNC_STATUS__NOTSYNC;
+            }
+            else
+            {
+                visualDevModelDataInput.data["sync_status"] = WmsWareHouseConst.SYNC_STATUS_NONEEDSYNC;
+            }
+            visualDevModelDataInput.data["audit_status"] = 0;
+            visualDevModelDataInput.data["is_check"] = 0;
+            (string pkId, List <WmsOutstockD> outStockDList) multi = await _wmsOutStockService.OutStockApplyFor(visualDevModelDataInput);
             _ = SyncMesData(multi.pkId, multi.outStockDList?.Select(x => x.material_id!).ToList() ?? Array.Empty<string>().ToList(), EnumTriggerEvent.出厂检按入厂频次);
 
             return await Task.FromResult(1);