From 415c17f207966603c4c60c408f0e0bfdc3763ca7 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期日, 04 二月 2024 16:07:23 +0800
Subject: [PATCH] Merge branch 'master' into wxw
---
Wms/WMS.BLL/BllAsnServer/AuditLogServer.cs | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/Wms/WMS.BLL/BllAsnServer/AuditLogServer.cs b/Wms/WMS.BLL/BllAsnServer/AuditLogServer.cs
index 2a91b48..26cde9e 100644
--- a/Wms/WMS.BLL/BllAsnServer/AuditLogServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/AuditLogServer.cs
@@ -195,8 +195,11 @@
var boxInfo = Db.Queryable<BllBoxInfo>().Where(m => m.BindNo == demo.Id).ToList();
foreach (var demo2 in boxInfo)
{
- demo2.ASNNo = null;
- demo2.ASNDetailNo = null;
+ if (demo2.Origin != "WMS")
+ {
+ demo2.ASNNo = null;
+ demo2.ASNDetailNo = null;
+ }
demo2.BindNo = null;
demo2.PalletNo = null;
demo2.Status = "0";
--
Gitblit v1.8.0