From 74ff49e94dd827d4f3b2c2e44c8b6ef3c16c1965 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期四, 12 九月 2024 00:50:04 +0800
Subject: [PATCH] Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/Server/TigerApi6_2024
---
Tiger.Business.MES/BIZ/BizBasRule.cs | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/Tiger.Business.MES/BIZ/BizBasRule.cs b/Tiger.Business.MES/BIZ/BizBasRule.cs
index 6be57a4..3306307 100644
--- a/Tiger.Business.MES/BIZ/BizBasRule.cs
+++ b/Tiger.Business.MES/BIZ/BizBasRule.cs
@@ -29,8 +29,15 @@
var result = new ApiAction();
try
{
- var ItemCusts = input.ItemCusts.Select(q => q.ID).ToList();
- List<BAS_ITEM_CUST> list = await Biz.Db.Queryable<BAS_ITEM_CUST>().Where(q => !SqlFunc.ContainsArray(ItemCusts, q.ID)).ToListAsync();
+ if (input.ItemCusts == null || input.ItemCusts.Count == 0)
+ {
+
+ result.IsSuccessed = false;
+ result.LocaleMsg = new($"淇濆瓨鐗╂枡鏉＄爜瑙勫垯鍑洪敊锛屾病鏈夋暟鎹紶鍏�");
+ return result;
+ }
+ var ItemCustIds = input.ItemCusts.Select(q => q.ID).ToList();
+ List<BAS_ITEM_CUST> list = await Biz.Db.Queryable<BAS_ITEM_CUST>().Where(q => !SqlFunc.ContainsArray(ItemCustIds, q.ID) && input.ItemCusts[0].ITEM_ID == q.ITEM_ID).ToListAsync();
var db = Biz.Db;
var dbTran = db.UseTran(() =>
{
@@ -65,8 +72,15 @@
var result = new ApiAction();
try
{
+ if (input.PkgProd == null || input.PkgProd.Count == 0)
+ {
+
+ result.IsSuccessed = false;
+ result.LocaleMsg = new($"淇濆瓨鍖呰瑙勫垯鍑洪敊锛屾病鏈夋暟鎹紶鍏�");
+ return result;
+ }
var pkgProds = input.PkgProd.Select(q => q.ID).ToList();
- List<BAS_PKG_PROD> listPrd = await Biz.Db.Queryable<BAS_PKG_PROD>().Where(q => !SqlFunc.ContainsArray(pkgProds, q.ID)).ToListAsync();
+ List<BAS_PKG_PROD> listPrd = await Biz.Db.Queryable<BAS_PKG_PROD>().Where(q => !SqlFunc.ContainsArray(pkgProds, q.ID) && q.PKG_RULE_ID == input.PkgProd[0].PKG_RULE_ID).ToListAsync();
var db = Biz.Db;
var dbTran = db.UseTran(() =>
{
@@ -96,7 +110,7 @@
if (!dbTran.IsSuccess)
{
result.IsSuccessed = false;
- result.Message = $"淇濆瓨鍖呰瑙勫垯寮傚父";
+ result.LocaleMsg = new($"淇濆瓨鍖呰瑙勫垯寮傚父");
}
}
catch (Exception ex)
--
Gitblit v1.9.3