From 5423ea50d00ce05c87ba443413037d86d7669638 Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期五, 23 八月 2024 14:55:34 +0800
Subject: [PATCH] 解决冲突
---
Wms/WMS.BLL/SysServer/PackagServer.cs | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/Wms/WMS.BLL/SysServer/PackagServer.cs b/Wms/WMS.BLL/SysServer/PackagServer.cs
index d6ca134..4f7bca8 100644
--- a/Wms/WMS.BLL/SysServer/PackagServer.cs
+++ b/Wms/WMS.BLL/SysServer/PackagServer.cs
@@ -11,12 +11,15 @@
using Model.ModelVm.SysVm;
using System.Threading.Tasks;
using Utility;
+using WMS.Entity.Context;
namespace WMS.BLL.SysServer
{
public class PackagServer : IPackagServer
{
public IPackagRepository PackagRst { get; set; }
+ public IMaterialsServer materials { get; set; }
+ private static readonly SqlSugarScope Db = DataContext.Db;
public PackagServer(IPackagRepository packagRst)
{
@@ -301,6 +304,11 @@
{
throw Oops.Bah("鍖呰淇℃伅涓嶅瓨鍦紒");
}
+ var modMaterial = await Db.Queryable<SysMaterials>().FirstAsync(a => a.IsDel == "0" && a.PackagNo == packagItems.PackagNo);
+ if (modMaterial != null)
+ {
+ throw Oops.Bah("瀛樺湪姝ｅ湪浣跨敤姝ゅ寘瑁呯殑鐗╂枡锛�");
+ }
packagItems.IsDel = "1";
packagItems.UpdateTime = DateTime.Now;
--
Gitblit v1.8.0