From f656805650f0024d30ede19d8c32070f319ed507 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期日, 21 七月 2024 21:56:41 +0800
Subject: [PATCH] MES逻辑增加组织的判断和保存
---
Tiger.Business/MES/Biz.WorkBatch.cs | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 deletions(-)
diff --git a/Tiger.Business/MES/Biz.WorkBatch.cs b/Tiger.Business/MES/Biz.WorkBatch.cs
index 28e9b99..03c5d0d 100644
--- a/Tiger.Business/MES/Biz.WorkBatch.cs
+++ b/Tiger.Business/MES/Biz.WorkBatch.cs
@@ -31,6 +31,7 @@
#region Propertys & Variables
public string OrderNo { get; set; }
public BIZ_MES_WO WO { get; set; }
+ public BAS_ITEM Product { get; set; }
public BIZ_MES_WO_BATCH Batch { get; set; }
public BAS_CUSTOMER Customer { get; set; }
public List<BIZ_MES_WO_SN> WoSNs { get; set; }
@@ -56,6 +57,7 @@
public WorkBatch Init(string lineCode)
{
WO = Biz.Db.Queryable<BIZ_MES_WO>().Where(q => q.ORDER_NO == OrderNo).First();
+ Product = Biz.Db.Queryable<BAS_ITEM>().Where(q => q.ITEM_CODE == WO.ITEM_CODE && q.AUTH_ORG == WO.AUTH_ORG).First();
Batch = Biz.Db.Queryable<BIZ_MES_WO_BATCH>().Where(q => q.ORDER_NO == OrderNo && q.ACT_LINE == lineCode
&& (q.STATUS == BIZ_MES_WO_BATCH.STATUSs.Release.GetValue() || q.STATUS == BIZ_MES_WO_BATCH.STATUSs.Working.GetValue())).First();
Customer = Biz.Db.Queryable<BAS_CUSTOMER>().Where(q => q.CUST_CODE == WO.CUST_CODE).First();
@@ -78,7 +80,7 @@
/// <returns></returns>
public bool StartWorking(string user)
{
- if (Batch.STATUS == BIZ_MES_WO_BATCH.STATUSs.Working.GetValue() || Batch.STATUS == BIZ_MES_WO_BATCH.STATUSs.Paused.GetValue())
+ if (Batch.STATUS == BIZ_MES_WO_BATCH.STATUSs.Release.GetValue() || Batch.STATUS == BIZ_MES_WO_BATCH.STATUSs.Paused.GetValue())
{
WO.STATUS = BIZ_MES_WO.STATUSs.Working.GetValue();
WO.ACT_START_TIME = WO.ACT_START_TIME < new DateTime(2000, 1, 1) ? DateTime.Now : WO.ACT_START_TIME;
@@ -101,6 +103,33 @@
}
/// <summary>
+ /// 宸ュ崟鏆傚仠
+ /// </summary>
+ /// <param name="user"></param>
+ /// <returns></returns>
+ public bool PausedWorking(string user)
+ {
+ if (Batch.STATUS == BIZ_MES_WO_BATCH.STATUSs.Working.GetValue())
+ {
+ WO.STATUS = BIZ_MES_WO.STATUSs.Paused.GetValue();
+ Batch.STATUS = BIZ_MES_WO_BATCH.STATUSs.Paused.GetValue();
+ //淇濆瓨鏁版嵁搴�
+ var db = Biz.Db;
+ var dbTran = db.UseTran(() =>
+ {
+ db.Updateable(WO, user).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.STATUS }).ExecuteCommand();
+ db.Updateable(Batch, user).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.STATUS }).ExecuteCommand();
+ });
+ if (!dbTran.IsSuccess)
+ {
+ //throw dbTran.ErrorException;
+ return false;
+ }
+ }
+ return true;
+ }
+
+ /// <summary>
/// 鏍规嵁宀椾綅缂栫爜鍒ゆ柇鏄笉鏄绔�
/// </summary>
/// <param name="postCode"></param>
--
Gitblit v1.9.3