From fc5b73f8d3f3a37d01057799b298cb90e5955eb2 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期三, 25 十二月 2024 15:25:49 +0800
Subject: [PATCH] Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/Server/TigerApi6_2024
---
Tiger.Business.MES/WorkAction/YadaAssembly.cs | 36 +++++++++++++++++++-----------------
1 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/Tiger.Business.MES/WorkAction/YadaAssembly.cs b/Tiger.Business.MES/WorkAction/YadaAssembly.cs
index 3168265..40b91d8 100644
--- a/Tiger.Business.MES/WorkAction/YadaAssembly.cs
+++ b/Tiger.Business.MES/WorkAction/YadaAssembly.cs
@@ -17,6 +17,7 @@
{
#region Propertys & Variables
#region 鍥哄畾鍐欐硶锛屽伐搴忎腑鐨勫繀瑕佷俊鎭�
+ public DbClient MainDB { get; set; }
public bool IsFinished { get; set; } = false;
public IWorkStep CurStep { get; set; }
public IPosition CurPosition { get; set; }
@@ -36,6 +37,7 @@
public void Init(IWorkStep curStep, IPosition position, MES_WO_NODE_ACT nodeAct, MES_WO_ACTION setting)
{
#region 鍥哄畾鍐欐硶锛岀粰榛樿鍙橀噺璧嬪��
+ MainDB = position.MainDB;
CurStep = curStep;
CurPosition = position;
NodeAct = nodeAct;
@@ -43,7 +45,7 @@
#endregion
//鑾峰彇浜у搧BOM
- Boms = Biz.Db.Queryable<BAS_PROD_BOM>().Where(q => q.PROD_CODE == CurPosition.WorkBatch.WO.ITEM_CODE).ToList();
+ Boms = MainDB.Queryable<BAS_PROD_BOM>().Where(q => q.PROD_CODE == CurPosition.WorkBatch.WO.ITEM_CODE).ToList();
//鑾峰彇涓婃枡鐗╂枡
var assyList = new List<AssemblySetting>();
try
@@ -59,7 +61,7 @@
}
}
var codes = assyList.Select(q => q.ITEM_CODE).ToList();
- var items = Biz.Db.Queryable<BAS_ITEM>().Where(q => codes.Contains(q.ITEM_CODE) && q.AUTH_ORG == CurPosition.WorkBatch.WO.AUTH_ORG).ToList();
+ var items = MainDB.Queryable<BAS_ITEM>().Where(q => codes.Contains(q.ITEM_CODE) && q.AUTH_ORG == CurPosition.WorkBatch.WO.AUTH_ORG).ToList();
//鑾峰彇涓婃枡鐗╂枡鐨勬浛浠ｆ枡
foreach (var assy in assyList)
{
@@ -76,7 +78,7 @@
if (!bom.IsNullOrEmpty())
{
var subs = bom.SUB_CODE.Split(new string[] { "," }, StringSplitOptions.RemoveEmptyEntries);
- var surItems = Biz.Db.Queryable<BAS_ITEM>().Where(q => subs.Contains(q.ITEM_CODE) && q.AUTH_ORG == CurPosition.WorkBatch.WO.AUTH_ORG).ToList();
+ var surItems = MainDB.Queryable<BAS_ITEM>().Where(q => subs.Contains(q.ITEM_CODE) && q.AUTH_ORG == CurPosition.WorkBatch.WO.AUTH_ORG).ToList();
foreach (var sub in surItems)
{
if (!item.SubItems.Any(q => q.ITEM_CODE == sub.ITEM_CODE))
@@ -160,9 +162,9 @@
//鏍规嵁鏉＄爜瑙勫垯楠岃瘉涓婃枡鏄惁姝ｇ‘
if (!item.RuleCode.IsNullOrEmpty())
{
- if (!Biz.CodeRule[item.RuleCode].IsNullOrEmpty())
+ if (!Cache.CodeRule[item.RuleCode].IsNullOrEmpty())
{
- var result = Biz.CodeRule[item.RuleCode].Verify(input.SN);
+ var result = Cache.CodeRule[item.RuleCode].Verify(input.SN);
if (!result.IsSuccessed)
{
isOK = false;
@@ -188,9 +190,9 @@
{
if (!subItem.RULE_CODE.IsNullOrEmpty())
{
- if (!Biz.CodeRule[subItem.RULE_CODE].IsNullOrEmpty())
+ if (!Cache.CodeRule[subItem.RULE_CODE].IsNullOrEmpty())
{
- var result = Biz.CodeRule[item.RuleCode].Verify(input.SN);
+ var result = Cache.CodeRule[item.RuleCode].Verify(input.SN);
//鍙鏈変竴涓浛浠ｆ枡閫氳繃楠岃瘉鍒欏彲浠ヤ笂鏂�
if (result.IsSuccessed)
{
@@ -203,16 +205,16 @@
}
}
//濡傛灉褰撳墠鐗╂枡瀛樺湪澶囨枡琛ㄤ腑瀛樺湪鎺ㄨ崘鎵规锛屽垯涓婃枡鐗╂枡蹇呴』灞炰簬鍏舵帹鑽愭壒娆＄殑鐗╂枡
- var suggest = MoPickList.Where(q => q.Code == item.ItemInfo.ITEM_CODE && !q.SuggestedBatch.IsNullOrEmpty()).Select(q => q.SuggestedBatch).ToList();
- if (isOK && suggest.Any())
- {
- isOK = false;
- //鍦ㄦ帹鑽愭壒娆℃墍灞炲伐鍗曠殑鏉＄爜涓瓨鍦�
- if (Biz.Db.Queryable<BIZ_MES_WO_SN>().Any(q => suggest.Contains(q.WORK_ORDER) && (q.SN == input.SN || q.FLOW_SN == input.SN || q.TRAY_SN == input.SN)))
- {
- isOK = true;
- }
- }
+ //var suggest = MoPickList.Where(q => q.Code == item.ItemInfo.ITEM_CODE && !q.SuggestedBatch.IsNullOrEmpty()).Select(q => q.SuggestedBatch).ToList();
+ //if (isOK && suggest.Any())
+ //{
+ // isOK = false;
+ // //鍦ㄦ帹鑽愭壒娆℃墍灞炲伐鍗曠殑鏉＄爜涓瓨鍦�
+ // if (MainDB.Queryable<BIZ_MES_WO_SN>().Any(q => suggest.Contains(q.WORK_ORDER) && (q.SN == input.SN || q.FLOW_SN == input.SN || q.TRAY_SN == input.SN)))
+ // {
+ // isOK = true;
+ // }
+ //}
//楠岃瘉閫氳繃鍒欎繚瀛樹笂鏂欎俊鎭�
if (isOK)
{
--
Gitblit v1.9.3