From ff030c6c84264359c938cffed97770904f64ba72 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期五, 27 十二月 2024 22:37:14 +0800
Subject: [PATCH] 增加4段的条码判断规则
---
Tiger.Business/MES/Biz.Route.cs | 35 ++++++++++++++++++++++++++++-------
1 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/Tiger.Business/MES/Biz.Route.cs b/Tiger.Business/MES/Biz.Route.cs
index f1f4a08..24cc730 100644
--- a/Tiger.Business/MES/Biz.Route.cs
+++ b/Tiger.Business/MES/Biz.Route.cs
@@ -442,6 +442,12 @@
try
{
//鏌ヨ鏄惁宸茬粡鏈夊伐鍗曞湪鐢ㄦ垨鑰呮湁缁戝畾浜у搧
+ if (Biz.Db.Queryable<MES_PROD_OPER>().Any(q=>q.ROT_ID == routeId))
+ {
+ result.IsSuccessed = false;
+ result.LocaleMsg = new($"宸ヨ壓璺嚎宸茬粡缁戝畾浜嗕骇鍝侊紝涓嶈兘鍒犻櫎宸ヨ壓璺嚎");
+ return result;
+ }
var db = Db;
var dbTran = db.UseTran(() =>
@@ -508,12 +514,12 @@
{
var expable = Expressionable.Create<MES_PROD_ACTION>();
var expableOper = Expressionable.Create<MES_PROD_OPER>();
- if (!string.IsNullOrEmpty(input.rotId))
+ if (!input.rotId.IsNullOrEmpty())
{
expable.And(x => x.ROT_ID == input.rotId);
expableOper.And(x => x.ROT_ID == input.rotId);
}
- else if (!string.IsNullOrEmpty(input.rotCode))
+ else if (!input.rotCode.IsNullOrEmpty())
{
var item = await Db.Queryable<MES_ROUTE>().Where(x => x.ROT_CODE == input.rotCode).FirstAsync();
if (item != null)
@@ -522,17 +528,32 @@
expableOper.And(x => x.ROT_ID == item.ID);
}
}
- string _custCode = input.custCode ?? "";
- expable.And(x => x.PROD_CODE == input.prodCode && (x.CUST_CODE == _custCode));
- expableOper.And(x => x.PROD_CODE == input.prodCode && x.CUST_CODE == _custCode);
+ if (!input.prodCode.IsNullOrEmpty())
+ {
+ expable.And(x => x.PROD_CODE == input.prodCode );
+ expableOper.And(x => x.PROD_CODE == input.prodCode);
+ }
+ if (!input.custCode.IsNullOrEmpty())
+ {
+ expable.And(x => x.CUST_CODE == input.custCode);
+ expableOper.And(x => x.CUST_CODE == input.custCode);
+ }
var exp = expable.ToExpression();
var expOper = expableOper.ToExpression();
var db = Db;
var dbTran = db.UseTran(() =>
{
- db.Deleteable<MES_PROD_ACTION>().Where(exp).ExecuteCommand();
- db.Deleteable<MES_PROD_OPER>().Where(expOper).ExecuteCommand();
+ if (!input.prodCode.IsNullOrEmpty())
+ {
+ db.Deleteable<MES_PROD_ACTION>().Where(exp).ExecuteCommand();
+ db.Deleteable<MES_PROD_OPER>().Where(expOper).ExecuteCommand();
+ }
+ if (input.prodCode.IsNullOrEmpty() && !input.custCode.IsNullOrEmpty())
+ {
+ db.Updateable<MES_PROD_ACTION>().SetColumns(x => x.CUST_CODE == "").Where(exp).ExecuteCommand();
+ db.Updateable<MES_PROD_OPER>().SetColumns(x => x.CUST_CODE == "").Where(expOper).ExecuteCommand();
+ }
});
if (!dbTran.IsSuccess)
{
--
Gitblit v1.9.3