From 0e82c6a0abbfcf4e5fea3ec1b4d27cf2268f2521 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期二, 31 十二月 2024 23:18:09 +0800
Subject: [PATCH] 修复计划日期逻辑和更新条件判断
---
Tiger.Business.MES/BIZ/BizBasRule.cs | 56 +++++++++++++++++++++++++++++++-------------------------
1 files changed, 31 insertions(+), 25 deletions(-)
diff --git a/Tiger.Business.MES/BIZ/BizBasRule.cs b/Tiger.Business.MES/BIZ/BizBasRule.cs
index a093123..d3bf9f8 100644
--- a/Tiger.Business.MES/BIZ/BizBasRule.cs
+++ b/Tiger.Business.MES/BIZ/BizBasRule.cs
@@ -14,6 +14,7 @@
using Tiger.Model.Entitys.MES.BizMesWoBatch;
using Tiger.Model.Entitys.MES.BizMesWo;
using Tiger.Model.Entitys.MES.BizBasPkgRule;
+using Tiger.Model.Entitys.MES.Position;
namespace Tiger.Business.MES
{
@@ -29,15 +30,10 @@
var result = new ApiAction();
try
{
- 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();
+ List<BAS_ITEM_CUST> list = ItemCustIds.Count>0? await Biz.Db.Queryable<BAS_ITEM_CUST>()
+ .Where(q => !SqlFunc.ContainsArray(ItemCustIds, q.ID) && input.ItemCusts[0].ITEM_ID == q.ITEM_ID)
+ .ToListAsync() : new();
var db = Biz.Db;
var dbTran = db.UseTran(() =>
{
@@ -76,27 +72,17 @@
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) && q.PKG_RULE_ID == input.PkgProd[0].PKG_RULE_ID).ToListAsync();
+ List<BAS_PKG_PROD> listPrd = pkgProds.Count > 0 ? 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() : new();
+ var pkgDtl = input.PkgDtl.Select(q => q.ID).ToList();
+ List<BAS_PKG_DTL> listDtl = pkgDtl.Count > 0 ? await Biz.Db.Queryable<BAS_PKG_DTL>()
+ .Where(q => !SqlFunc.ContainsArray(pkgDtl, q.ID) && q.PKG_RULE_ID == input.PkgDtl[0].PKG_RULE_ID)
+ .ToListAsync() : new();
var db = Biz.Db;
var dbTran = db.UseTran(() =>
{
- //if (input.PkgRule!=null)
- //{
- // var y = db.Storageable(input.PkgRule)
- // .WhereColumns(t => new { t.ID, t.GHOST_ROW })
- // .ToStorage();
- // y.AsInsertable.ExecuteCommand();
- // y.AsUpdateable.ExecuteCommand();
- //}
-
var z = db.Storageable(input.PkgDtl)
.WhereColumns(t => new { t.ID, t.GHOST_ROW })
.ToStorage();
@@ -110,6 +96,7 @@
o.AsUpdateable.ExecuteCommand();
db.Deleteable(listPrd).ExecuteCommand();
+ db.Deleteable(listDtl).ExecuteCommand();
});
if (!dbTran.IsSuccess)
{
@@ -123,5 +110,24 @@
}
return result;
}
+
+ /// <summary>
+ /// 鑾峰彇绠卞彿
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ public async Task<ApiAction> GetCardOrBoxCode(GetCodeInput input)
+ {
+ var result = new ApiAction();
+ try
+ {
+ result.Data = input.IsTry == "Y" ? Cache.CodeRule[input.Code]?.TryGenerate(input.Prefix, $"{input.BatchNo}-{input.Qty}-").Data.ToString() ?? "" : Cache.CodeRule[input.Code]?.Generate(input.Prefix, $"{input.BatchNo}-{input.Qty}-").Data.ToString() ?? "";
+ }
+ catch (Exception ex)
+ {
+ result.CatchExceptionWithLog(ex, "鑾峰彇绠卞彿寮傚父");
+ }
+ return result;
+ }
}
}
--
Gitblit v1.9.3