From 810818b52ac65bd701c9582571be23ded5aea776 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期四, 23 十月 2025 14:30:06 +0800
Subject: [PATCH] 不合格后重送检逻辑_2
---
Services/MesOrderStaManager.cs | 495 +++++++++++++++++++++++++++++++++++-------------------
1 files changed, 320 insertions(+), 175 deletions(-)
diff --git a/Services/MesOrderStaManager.cs b/Services/MesOrderStaManager.cs
index e42f4cd..2bd8b65 100644
--- a/Services/MesOrderStaManager.cs
+++ b/Services/MesOrderStaManager.cs
@@ -43,9 +43,7 @@
{
// 鏌ヨMesOrderSta琛ㄨ幏鍙栧伐鍗曠姸鎬佽褰�
var mesOrderSta = Db.Queryable<MesOrderSta>()
- // 鏍规嵁宸ュ崟ID鍖归厤璁板綍
.Where(s => s.OrderId == query.OrderId)
- // 鑾峰彇绗竴鏉¤褰�
.First();
// 濡傛灉鏈壘鍒拌褰�,杩斿洖绌哄璞�
@@ -54,8 +52,9 @@
// 鏌ヨWomdaa琛ㄨ幏鍙栧伐鍗曚富琛ㄤ俊鎭�
var womdaa = Db.Queryable<Womdaa>()
.Where(a => a.Id == query.OrderId).First();
- // 璁剧疆宸ュ崟鐘舵��
- mesOrderSta.OrderStatus = womdaa.Daa018;
+
+ // 鍒ょ┖澶勭悊锛岄伩鍏嶇┖寮曠敤寮傚父
+ mesOrderSta.OrderStatus = womdaa != null ? womdaa.Daa018 : null;
return mesOrderSta;
}
@@ -92,80 +91,192 @@
}
/// <summary>
- /// 鏇存柊鏈哄櫒鏃堕棿骞跺鐞嗛妫�
+ /// 鏇存柊鏈哄櫒鏃堕棿骞跺鐞嗛妫�/閲嶉�佹
/// </summary>
- /// <param name="entity">宸ュ崟鐘舵�佸疄浣�,鍖呭惈鏈哄櫒鏃堕棿淇℃伅</param>
+ /// <param name="entity">
+ /// 宸ュ崟鐘舵�佸疄浣�,鍖呭惈鏈哄櫒鏃堕棿淇℃伅
+ /// Flag锛�1 = 棣栨閫佹鍛煎彨锛�2 = 棣栨涓嶅悎鏍煎悗閲嶆柊閫佹锛涘叾瀹冨�间粎鏇存柊鏃堕棿涓嶈Е鍙戦妫�鍗曞垱寤�
+ /// </param>
/// <returns>鏇存柊鏄惁鎴愬姛</returns>
public bool ChangeMachineTime(MesOrderSta entity)
{
- // 鏌ヨ宸ュ崟涓昏〃淇℃伅
var womdaa = Db.Queryable<Womdaa>()
.Where(s => s.Id == entity.OrderId).First();
+ if (womdaa == null) throw new Exception("宸ュ崟涓嶅瓨鍦�");
- // 濡傛灉鏍囪涓�1,闇�瑕佸鐞嗛妫�鐩稿叧閫昏緫
+ // ================== 棣栨閫佹澶勭悊锛團lag == 1锛�==================
if (entity.Flag == 1)
{
- // 璋冪敤瀛樺偍杩囩▼鎵ц鑷姩棣栨
- // Db.Ado.ExecuteCommand(
- // "BEGIN AUTOMATIC_IPQC_FIRST_CHECK(:BILL_NO); END;",
- // new SugarParameter("BILL_NO", womdaa.Daa001,
- // DbType.String));
- var automaticIpqcFirstCheck =
- mesQaItemsDetect02Manager
- .AutomaticIpqcFirstCheck(womdaa.Daa001);
- if (!automaticIpqcFirstCheck) throw new Exception("棣栨鐢熸垚澶辫触");
+ // 骞傜瓑锛氬厛鏌ユ槸鍚﹀凡鏈夋湭浣滃簾鐨勯妫�鍗曪紙閬垮厤閲嶅鐢熸垚锛�
+ var existsFirst = Db.Queryable<MesQaItemsDetect02>()
+ .Where(s => s.Aufnr == womdaa.Daa001 && s.Ftype == "棣栨" && (s.Fcancel == null || s.Fcancel != "Y"))
+ .Any();
- // 鑾峰彇褰撳墠鏃堕棿
- var s1 = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
- // 鐢熸垚棣栨澶囨敞淇℃伅
- var remeke = "宸ユ帶鏈轰簬" + s1 + "鑷姩鍒涘缓鐨勯妫�鍗�";
+ if (!existsFirst)
+ {
+ // 琛岀骇閿侀槻骞跺彂锛圤racle FOR UPDATE锛�
+ Db.Ado.ExecuteCommand("SELECT ID FROM WOMDAA WHERE DAA001 = :BILL_NO FOR UPDATE",
+ new SugarParameter("BILL_NO", womdaa.Daa001));
- // 鏇存柊棣栨鍗曞娉ㄤ俊鎭�
- Db.Updateable<MesQaItemsDetect02>()
- .SetColumns(s => s.Remeke == remeke)
- .Where(s => s.Ftype == "棣栨" && s.Aufnr == womdaa.Daa001)
- .ExecuteCommand();
+ // 浜屾纭
+ existsFirst = Db.Queryable<MesQaItemsDetect02>()
+ .Where(s => s.Aufnr == womdaa.Daa001 && s.Ftype == "棣栨" && (s.Fcancel == null || s.Fcancel != "Y"))
+ .Any();
+
+ if (!existsFirst)
+ {
+ // 璋冪敤瀛樺偍杩囩▼鐢熸垚棣栨鍗�
+ Db.Ado.ExecuteCommand(
+ "BEGIN AUTOMATIC_IPQC_FIRST_CHECK(:BILL_NO); END;",
+ new SugarParameter("BILL_NO", womdaa.Daa001, System.Data.DbType.String));
+ }
+ }
+
+ // 缁熶竴鏇存柊鏈�鏂伴妫�澶囨敞
+ var latestFirst = Db.Queryable<MesQaItemsDetect02>()
+ .Where(s => s.Aufnr == womdaa.Daa001 && s.Ftype == "棣栨" && (s.Fcancel == null || s.Fcancel != "Y"))
+ .OrderBy(s => s.CreateDate, OrderByType.Desc)
+ .First();
+ if (latestFirst != null)
+ {
+ var ts = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+ var remark = $"宸ユ帶鏈轰簬{ts}鑷姩鍒涘缓鐨勯妫�鍗�";
+ Db.Updateable<MesQaItemsDetect02>()
+ .SetColumns(s => s.Remeke == remark)
+ .Where(s => s.Id == latestFirst.Id)
+ .ExecuteCommand();
+ }
+ }
+ // ================== 涓嶅悎鏍煎悗閲嶆柊閫佹锛團lag == 2锛�==================
+ else if (entity.Flag == 2)
+ {
+ // 棣栨涓嶅悎鏍煎悗鐩存帴鐢熸垚鏂扮殑棣栨鍗曪細
+ // 1. 鍔犻攣闃插苟鍙�
+ // 2. 鑻ヤ笉瀛樺湪棣栨 -> 鐩存帴鐢熸垚
+ // 3. 鑻ュ瓨鍦ㄤ笖涓衡�滀笉鍚堟牸鈥� -> 鍏堜綔搴熸棫鍗�(Fcancel='Y')鍐嶇敓鎴愭柊鍗曪紙缁曡繃瀛樺偍杩囩▼鍐呴儴鍙厑璁镐竴鍗曠殑闄愬埗锛�
+ // 4. 鑻ュ凡鍚堟牸 -> 涓嶇敓鎴�
+ Db.Ado.ExecuteCommand("SELECT ID FROM WOMDAA WHERE DAA001 = :BILL_NO FOR UPDATE",
+ new SugarParameter("BILL_NO", womdaa.Daa001));
+
+ // 鏈�鏂版湭浣滃簾棣栨鍗�
+ var latestFirst = Db.Queryable<MesQaItemsDetect02>()
+ .Where(s => s.Aufnr == womdaa.Daa001
+ && s.Ftype == "棣栨"
+ && (s.Fcancel == null || s.Fcancel != "Y"))
+ .OrderBy(s => s.CreateDate, OrderByType.Desc)
+ .First();
+
+ var needCreate = false;
+
+ if (latestFirst == null)
+ {
+ // 娌℃湁浠讳綍鏈夋晥棣栨鍗曪紝闇�瑕佸垱寤�
+ needCreate = true;
+ }
+ else if (latestFirst.FcheckResu == "涓嶅悎鏍�")
+ {
+ // 鏃у崟涓嶅悎鏍硷紝鍏堜綔搴熷啀鍒涘缓鏂板崟
+ Db.Updateable<MesQaItemsDetect02>()
+ .SetColumns(s => s.Fcancel == "Y")
+ .Where(s => s.Id == latestFirst.Id && (s.Fcancel == null || s.Fcancel != "Y"))
+ .ExecuteCommand();
+ needCreate = true;
+ }
+
+ if (needCreate)
+ {
+ Db.Ado.ExecuteCommand(
+ "BEGIN AUTOMATIC_IPQC_FIRST_CHECK(:BILL_NO); END;",
+ new SugarParameter("BILL_NO", womdaa.Daa001, System.Data.DbType.String));
+
+ // 鑾峰彇鏂扮敓鎴愮殑棣栨鍗曞苟鍐欏娉�
+ var newLatest = Db.Queryable<MesQaItemsDetect02>()
+ .Where(s => s.Aufnr == womdaa.Daa001
+ && s.Ftype == "棣栨"
+ && (s.Fcancel == null || s.Fcancel != "Y"))
+ .OrderBy(s => s.CreateDate, OrderByType.Desc)
+ .First();
+ if (newLatest != null)
+ {
+ var ts = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+ var remark = $"宸ユ帶鏈轰簬{ts}涓嶅悎鏍奸噸鏂伴�佹鐢熸垚鐨勯妫�鍗�";
+ Db.Updateable<MesQaItemsDetect02>()
+ .SetColumns(s => s.Remeke == remark)
+ .Where(s => s.Id == newLatest.Id)
+ .ExecuteCommand();
+ }
+ }
+ // 宸叉湁涓斿悎鏍� -> 涓嶆墽琛屽垱寤�
+ // 鑻ユ渶鏂板凡鍚堟牸鍒欎笉鐢熸垚鏂板崟锛岀洿鎺ョ户缁悗缁祦绋嬶紙涓嶈鐩栧叾澶囨敞锛�
+ }
+
+ // ========= 棣栨涓嶅悎鏍兼竻绌洪�佹鏃堕棿澶勭悊锛團lag != 2 鏃舵墠娓呯┖锛涘苟鐢熸垚缁熶竴 remark锛� =========
+ string remarkToSet = null; // 鏈�缁堣鍐欏叆 MES_ORDER_STA.remark 鐨勫唴瀹�
+ var clearMaShoutTime = false; // 鏄惁闇�瑕佺湡姝ｅ啓 null 娓呯┖閫佹鏃堕棿
+
+ if (entity.Flag == 1)
+ {
+ // 棣栨閫佹鎻愪氦
+ if (!string.IsNullOrEmpty(entity.MaShoutTime))
+ remarkToSet = $"浜巤entity.MaShoutTime}鏃堕棿鏈変竴娆￠�佹";
+ }
+ else if (entity.Flag == 2)
+ {
+ // 涓嶅悎鏍奸噸鏂伴�佹锛堜笉娓呯┖閫佹鏃堕棿锛岀敱鍓嶇鍙兘瑕嗙洊涓烘柊鏃堕棿锛�
+ if (!string.IsNullOrEmpty(entity.MaShoutTime))
+ remarkToSet = $"浜巤entity.MaShoutTime}鏃堕棿涓嶅悎鏍奸噸鏂伴�佹";
}
+ // 闈為噸鏂伴�佹鍦烘櫙锛團lag!=2锛夋墠妫�鏌ユ槸鍚﹂渶瑕佸洜鈥滀笉鍚堟牸鈥濇竻绌洪�佹鏃堕棿
+ if (entity.Flag != 2)
+ {
+ var latestFirstCheck = Db.Queryable<MesQaItemsDetect02>()
+ .Where(s => s.Aufnr == womdaa.Daa001
+ && s.Ftype == "棣栨"
+ && (s.Fcancel == null || s.Fcancel != "Y"))
+ .OrderBy(s => s.CreateDate, OrderByType.Desc)
+ .First();
+
+ if (latestFirstCheck != null && latestFirstCheck.FcheckResu == "涓嶅悎鏍�")
+ {
+ entity.MaShoutTime = null; // 缃┖瀹炰綋锛堝悗闈㈡洿鏂版椂浣跨敤锛�
+ clearMaShoutTime = true;
+ remarkToSet = "棣栨涓嶅悎鏍硷紝閫佹鏃堕棿宸叉竻绌猴紝璇烽噸鏂伴�佹鍛煎彨鐢熸垚鏂扮殑棣栨鍗�";
+ }
+ }
+ // ========= 棣栨涓嶅悎鏍兼竻绌洪�佹鏃堕棿澶勭悊缁撴潫 =========
+
+ // ================== 閲囬泦鏁�/閿氱偣 Anchors 澶勭悊 ==================
var mesReporting = Db.Queryable<MesReporting>()
.Where(s => s.BillNo == womdaa.Daa001)
.OrderByDescending(s => s.Id)
.First();
-
var editDate = DateTime.Now.ToString("yyyy-MM-dd");
- // 鍙戦�丠TTP璇锋眰鍒版暟鎹埛鏂版帴鍙�
- MesNumerical mesNumerical = null;
+ // 鍙戦�丠TTP璇锋眰鍒锋柊璁惧閲囬泦鏁版嵁锛堝け璐ヤ笉闃绘柇鍚庣画锛�
+ MesNumericalBycl mesNumerical = null;
try
{
using (var httpClient = new HttpClient())
{
httpClient.Timeout = TimeSpan.FromSeconds(30);
-
var content = new StringContent(
- JsonConvert.SerializeObject(new
- { machineNo = entity.MachineNo }),
+ JsonConvert.SerializeObject(new { machineNo = entity.MachineNo }),
Encoding.UTF8,
"application/json");
-
var response = httpClient
- .PostAsync("http://192.168.0.94:9095/Numerical/RefreshDev",
- content).GetAwaiter().GetResult();
+ .PostAsync("http://192.168.0.94:9095/Numerical/RefreshDevBycl", content)
+ .GetAwaiter().GetResult();
if (response.IsSuccessStatusCode)
{
- var responseString = response.Content.ReadAsStringAsync()
- .GetAwaiter().GetResult();
- var responseObj =
- JsonConvert.DeserializeObject<dynamic>(responseString);
-
+ var responseString = response.Content.ReadAsStringAsync().GetAwaiter().GetResult();
+ var responseObj = JsonConvert.DeserializeObject<dynamic>(responseString);
if (responseObj != null && responseObj.code == 200)
{
- // 璇锋眰鎴愬姛锛岃幏鍙朚esNumerical鏁版嵁
- mesNumerical = Db.Queryable<MesNumerical>()
- .Where(s => s.EditDate == editDate
- && s.MachineNo == entity.MachineNo)
+ mesNumerical = Db.Queryable<MesNumericalBycl>()
+ .Where(s => s.EditDate == editDate && s.MachineNo == entity.MachineNo)
.OrderByDescending(s => s.Id)
.First();
}
@@ -174,15 +285,12 @@
}
catch (Exception ex)
{
- // 璁板綍寮傚父浣嗕笉闃绘娴佺▼
Console.WriteLine($"鍙戦�佹暟鎹埛鏂拌姹傛椂鍑洪敊: {ex.Message}");
}
- // 濡傛灉璇锋眰澶辫触鎴栬幏鍙栨暟鎹け璐ワ紝mesNumerical灏嗕繚鎸佷负null
-
+ // 鍒犻櫎骞堕噸寤哄綋鏃ラ敋鐐硅褰�
Db.Deleteable<MesAnchors>()
- .Where(a => a.EditDate == editDate
- && a.OrderId == womdaa.Id)
+ .Where(a => a.EditDate == editDate && a.OrderId == womdaa.Id)
.ExecuteCommand();
MesAnchors eAnchors = new MesAnchors
@@ -190,24 +298,61 @@
OrderId = womdaa.Id,
OrderNo = womdaa.Daa001,
EditDate = editDate,
- Qty = mesReporting == null ? 0 : Int64.Parse(mesReporting.DyQty),
+ Qty = mesReporting == null ? 0 : (long?)(mesReporting.DyQty ?? 0),
InitialValue = mesNumerical == null ? 0 : mesNumerical.CjNum
};
- Db.Insertable<MesAnchors>(eAnchors)
- .ExecuteCommand();
+ Db.Insertable<MesAnchors>(eAnchors).ExecuteCommand();
+ // ================== 棣栨鍚堟牸 -> 鑷姩璋冩満瀹屾垚 + 鍐欏叆寮�宸ユ椂闂� ==================
+ if (!clearMaShoutTime && !string.IsNullOrEmpty(entity.MaShoutTime)) // 鏈娓呯┖鐨勫墠鎻愪笅鎵嶅垽鏂悎鏍奸�昏緫
+ {
+ if (DateTime.TryParse(entity.MaShoutTime, out var sjTime) &&
+ DateTime.TryParse(entity.MaStartTime, out var startTime))
+ {
+ if (sjTime >= startTime)
+ {
+ var sjRecord = Db.Queryable<MesQaItemsDetect02>()
+ .Where(x => x.Aufnr == womdaa.Daa001 && x.Ftype == "棣栨" && (x.Fcancel == null || x.Fcancel != "Y"))
+ .OrderBy(x => x.CreateDate, OrderByType.Desc)
+ .First();
- // 鏇存柊宸ュ崟鐘舵�佽〃
+ if (sjRecord != null && sjRecord.FcheckResu == "鍚堟牸")
+ {
+ QualifiedInspection(new OrderMachineDto
+ {
+ OrderId = entity.OrderId,
+ orderNo = entity.OrderNo,
+ machineNo = entity.MachineNo
+ });
+ // 灏嗛�佹鏃堕棿鍐欏叆寮�宸ユ椂闂�
+ entity.StartTime = entity.MaShoutTime;
+ entity.MaEndTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+ // 鑻ヤ箣鍓� remark 鏄�滈�佹鈥濆彲缁х画娌跨敤锛涗笉寮哄埗瑕嗙洊
+ }
+ }
+ }
+ }
+
+ // ================== 鏈�缁堟洿鏂� MES_ORDER_STA ==================
return Db.Updateable<MesOrderSta>()
- // 濡傛灉鏈夐�佹鏃堕棿鍒欐洿鏂�
- .SetColumnsIF(entity.MaShoutTime != null,
+ // 閫佹鏃堕棿鏇存柊锛氳嫢闇�瑕佹竻绌哄垯鏄庣‘璧� null锛涘惁鍒欏綋鏈夊�兼椂鏇存柊
+ .SetColumnsIF(clearMaShoutTime, s => s.MaShoutTime == null)
+ .SetColumnsIF(!clearMaShoutTime && entity.MaShoutTime != null,
s => s.MaShoutTime == entity.MaShoutTime)
- // 濡傛灉鏍囪涓�1鍒欐洿鏂板娉ㄤ俊鎭�
- .SetColumnsIF(entity.Flag == 1,
- s => s.remark == "浜�" + entity.MaShoutTime + "鏃堕棿鏈変竴娆￠�佹")
- // 鏍规嵁ID鍖归厤璁板綍
+ // 璋冩満寮�濮嬫椂闂�
+ .SetColumnsIF(entity.MaStartTime != null,
+ s => s.MaStartTime == entity.MaStartTime)
+ // 璋冩満瀹屾垚鏃堕棿
+ .SetColumnsIF(entity.MaEndTime != null,
+ s => s.MaEndTime == entity.MaEndTime)
+ // 寮�宸ユ椂闂�
+ .SetColumnsIF(entity.StartTime != null,
+ s => s.StartTime == entity.StartTime)
+ // 缁熶竴澶囨敞锛堢敱鍓嶉潰閫昏緫纭畾锛�
+ .SetColumnsIF(!string.IsNullOrEmpty(remarkToSet),
+ s => s.remark == remarkToSet)
+ // 杩囨护褰撳墠璁板綍
.Where(s => s.Id == entity.Id)
- // 鎵ц鏇存柊骞跺垽鏂奖鍝嶈鏁版槸鍚﹀ぇ浜�0
.ExecuteCommand() > 0;
}
@@ -361,125 +506,125 @@
break;
case "瀹屽伐":
- {
- // 鏇存柊宸ュ崟閫夋嫨琛ㄦ樉绀虹姸鎬�
- // Db.Updateable<MesOrderSelect>()
- // .SetColumns(a => a.IsShow == 1)
- // .Where(a => orderIds.Contains(a.OrderId))
- // .ExecuteCommand();
-
- // 鏇存柊宸ュ崟鐘舵�佽〃
- // Db.Updateable<MesOrderSta>()
- // .SetColumns(a => a.IsShow == 0)
- // .SetColumns(a => a.EndTime == endDate)
- // .Where(a => orderIds.Contains(a.OrderId))
- // .ExecuteCommand();
-
- // 澶勭悊姣忎釜宸ュ崟鐨勬姤宸ユ暟鎹�
- foreach (var orderId in orderIds)
{
- // 鏌ヨ宸ュ崟涓昏〃淇℃伅
- var womdaa = Db.Queryable<Womdaa>()
- .Where(s => s.Id == orderId).First();
+ // 鏇存柊宸ュ崟閫夋嫨琛ㄦ樉绀虹姸鎬�
+ // Db.Updateable<MesOrderSelect>()
+ // .SetColumns(a => a.IsShow == 1)
+ // .Where(a => orderIds.Contains(a.OrderId))
+ // .ExecuteCommand();
- //褰撳凡鐢熸垚鏁颁笉绛変簬瀹屽伐鏁版槸灏辫烦杩�
- if (womdaa.Daa008 > womdaa.Daa011)
+ // 鏇存柊宸ュ崟鐘舵�佽〃
+ // Db.Updateable<MesOrderSta>()
+ // .SetColumns(a => a.IsShow == 0)
+ // .SetColumns(a => a.EndTime == endDate)
+ // .Where(a => orderIds.Contains(a.OrderId))
+ // .ExecuteCommand();
+
+ // 澶勭悊姣忎釜宸ュ崟鐨勬姤宸ユ暟鎹�
+ foreach (var orderId in orderIds)
{
- updateable += 1;
- continue;
+ // 鏌ヨ宸ュ崟涓昏〃淇℃伅
+ var womdaa = Db.Queryable<Womdaa>()
+ .Where(s => s.Id == orderId).First();
+
+ //褰撳凡鐢熸垚鏁颁笉绛変簬瀹屽伐鏁版槸灏辫烦杩�
+ if (womdaa.Daa008 > womdaa.Daa011)
+ {
+ updateable += 1;
+ continue;
+ }
+
+ var btnLog = new MesWorkorderBtnLog
+ {
+ WorkNo = womdaa.Daa001,
+ BtnType = "宸ユ帶鑷姩瀹屽伐",
+ BtnDate = DateTime.Now
+ };
+ db.Insertable<MesWorkorderBtnLog>(btnLog)
+ .ExecuteCommand();
+
+ // 鏇存柊宸ュ崟涓昏〃鐘舵�� - 杩欓噷灏哤omdaa琛ㄧ殑daa018鏇存柊涓哄畬宸ョ姸鎬�
+ updateable = db.Updateable<Womdaa>()
+ .SetColumns(s => s.Daa018 == daa018)
+ .SetColumnsIF("瀹屽伐".Equals(daa018),
+ s => s.Daa017 == DateTime.Now)
+ .SetColumnsIF("鏆傚仠".Equals(daa018),
+ s => s.Daa034 == DateTime.Now)
+ .Where(s => s.Id == orderId).ExecuteCommand();
+
+ // Db.Deleteable<MesOrderSelect>()
+ // .Where(a => a.OrderId == orderId)
+ // .ExecuteCommand();
+ //
+ // Db.Deleteable<MesOrderSta>()
+ // .Where(a => a.OrderId == orderId)
+ // .ExecuteCommand();
+ //鏇存柊宸ュ崟閫夋嫨琛ㄦ樉绀虹姸鎬�
+ db.Updateable<MesOrderSelect>()
+ .SetColumns(a => a.IsShow == 1)
+ .Where(a => a.OrderId == orderId)
+ .ExecuteCommand();
+
+ //鏇存柊宸ュ崟鐘舵�佽〃
+ db.Updateable<MesOrderSta>()
+ .SetColumns(a => a.IsShow == 0)
+ .SetColumns(a => a.EndTime == endDate)
+ .Where(a => a.OrderId == orderId)
+ .ExecuteCommand();
+
+ // 鏌ヨ宸叉姤宸ユ暟閲�
+ var reporting = db.Queryable<MesReporting>()
+ .Where(s => s.BillNo == womdaa.Daa001)
+ .Select(s => new MesReporting
+ {
+ OkQty = SqlFunc.AggregateSum(s.OkQty),
+ BfQty = SqlFunc.AggregateSum(s.BfQty)
+ }).First();
+
+ reporting.OkQty ??= 0;
+ reporting.BfQty ??= 0;
+
+ // 鏌ヨ宸ュ崟瑙嗗浘淇℃伅
+ // var vOrder = db.Queryable<VOrder>()
+ // .Where(s => s.ID == orderId).First();
+
+ // 璁＄畻寰呮姤宸ユ暟閲�
+ // var reportingOkQty =
+ // Convert.ToDecimal(vOrder.todayOutput) -
+ // reporting.OkQty;
+ var CjQty = Db.Queryable<MesNumericalBycl>()
+ .Where(s => s.MachineNo == entity.MachineNo && s.EditDate == date)
+ .OrderByDescending(s => s.CjTiem)
+ .Select<long?>(s => s.CjNum).First();
+
+ // 璁＄畻寰呮姤宸ユ暟閲�
+ var reportingOkQty = CjQty - reporting.OkQty;
+
+ // 濡傛灉鏈夊緟鎶ュ伐鏁伴噺鍒欏垱寤烘姤宸ヨ褰�
+ if (!(reportingOkQty > 0)) continue;
+ var mesReporting = new MesReporting
+ {
+ CheckType = 1,
+ BgDate = DateTime.Now,
+ AddressCode = womdaa.AddressCode,
+ MachineNo = womdaa.MachineNo,
+ // BfQty = reportingOkQty,
+ BfQty = 0,
+ BlQty = reportingOkQty,
+ OkQty = 0,
+ ItemNo = womdaa.Daa002,
+ BillNo = womdaa.Daa001,
+ CjQty = CjQty,
+ DyQty = reporting.OkQty
+ };
+
+ // 鎻掑叆鎶ュ伐璁板綍
+ db.Insertable(mesReporting)
+ .IgnoreColumns(true).ExecuteCommand();
}
- var btnLog = new MesWorkorderBtnLog
- {
- WorkNo = womdaa.Daa001,
- BtnType = "宸ユ帶鑷姩瀹屽伐",
- BtnDate = DateTime.Now
- };
- db.Insertable<MesWorkorderBtnLog>(btnLog)
- .ExecuteCommand();
-
- // 鏇存柊宸ュ崟涓昏〃鐘舵�� - 杩欓噷灏哤omdaa琛ㄧ殑daa018鏇存柊涓哄畬宸ョ姸鎬�
- updateable = db.Updateable<Womdaa>()
- .SetColumns(s => s.Daa018 == daa018)
- .SetColumnsIF("瀹屽伐".Equals(daa018),
- s => s.Daa017 == DateTime.Now)
- .SetColumnsIF("鏆傚仠".Equals(daa018),
- s => s.Daa034 == DateTime.Now)
- .Where(s => s.Id == orderId).ExecuteCommand();
-
- // Db.Deleteable<MesOrderSelect>()
- // .Where(a => a.OrderId == orderId)
- // .ExecuteCommand();
- //
- // Db.Deleteable<MesOrderSta>()
- // .Where(a => a.OrderId == orderId)
- // .ExecuteCommand();
- //鏇存柊宸ュ崟閫夋嫨琛ㄦ樉绀虹姸鎬�
- db.Updateable<MesOrderSelect>()
- .SetColumns(a => a.IsShow == 1)
- .Where(a => a.OrderId == orderId)
- .ExecuteCommand();
-
- //鏇存柊宸ュ崟鐘舵�佽〃
- db.Updateable<MesOrderSta>()
- .SetColumns(a => a.IsShow == 0)
- .SetColumns(a => a.EndTime == endDate)
- .Where(a => a.OrderId == orderId)
- .ExecuteCommand();
-
- // 鏌ヨ宸叉姤宸ユ暟閲�
- var reporting = db.Queryable<MesReporting>()
- .Where(s => s.BillNo == womdaa.Daa001)
- .Select(s => new MesReporting
- {
- OkQty = SqlFunc.AggregateSum(s.OkQty),
- BfQty = SqlFunc.AggregateSum(s.BfQty)
- }).First();
-
- reporting.OkQty ??= 0;
- reporting.BfQty ??= 0;
-
- // 鏌ヨ宸ュ崟瑙嗗浘淇℃伅
- // var vOrder = db.Queryable<VOrder>()
- // .Where(s => s.ID == orderId).First();
-
- // 璁＄畻寰呮姤宸ユ暟閲�
- // var reportingOkQty =
- // Convert.ToDecimal(vOrder.todayOutput) -
- // reporting.OkQty;
- var CjQty = Db.Queryable<MesNumerical>()
- .Where(s => s.MachineNo == entity.MachineNo && s.EditDate == date)
- .OrderByDescending(s=>s.CjTiem)
- .Select<long?>(s=>s.CjNum).First();
-
- // 璁＄畻寰呮姤宸ユ暟閲�
- var reportingOkQty = CjQty - reporting.OkQty;
-
- // 濡傛灉鏈夊緟鎶ュ伐鏁伴噺鍒欏垱寤烘姤宸ヨ褰�
- if (!(reportingOkQty > 0)) continue;
- var mesReporting = new MesReporting
- {
- CheckType = 1,
- BgDate = DateTime.Now,
- AddressCode = womdaa.AddressCode,
- MachineNo = womdaa.MachineNo,
- // BfQty = reportingOkQty,
- BfQty = 0,
- BlQty = reportingOkQty.ToString(),
- OkQty = 0,
- ItemNo = womdaa.Daa002,
- BillNo = womdaa.Daa001,
- CjQty = CjQty.ToString(),
- DyQty = reporting.OkQty.ToString()
- };
-
- // 鎻掑叆鎶ュ伐璁板綍
- db.Insertable(mesReporting)
- .IgnoreColumns(true).ExecuteCommand();
+ break;
}
-
- break;
- }
}
@@ -500,7 +645,7 @@
public bool StateCheck(OrderMachineDto query)
{
// 鏌ヨ宸ュ崟瑙嗗浘淇℃伅
- var vOrder = Db.Queryable<VOrder>()
+ var vOrder = Db.Queryable<VOrderBycl>()
.Where(s => s.ID == query.OrderId).First();
// 鏍规嵁涓嶅悓鎿嶄綔鏍囪瘑杩涜妫�鏌�
@@ -579,7 +724,7 @@
if (binding)
return Db.Updateable<MesOrderSta>()
- .SetColumns(s => s.MaEndTime == endDate)
+ .SetColumns(s => s.MaEndTime == endDate) // 鑷姩鍐欏叆璋冩満瀹屾垚鏃堕棿
.SetColumns(s => s.StartTime == entity.MaShoutTime)
.Where(s => s.OrderId == query.OrderId).ExecuteCommand() > 0;
--
Gitblit v1.9.3