From c99834caa934a5c43824dfe459601e8470d82fc9 Mon Sep 17 00:00:00 2001
From: hao <1836460075@qq.com>
Date: 星期四, 18 九月 2025 10:31:11 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~yhj/HM_JK
---
StandardInterface/MESApplication/Controllers/QC/SJController.cs | 4 +
StandardInterface/MES.Service/service/PLM/WarehouseDownloadDoc.cs | 2
StandardInterface/MES.Service/service/QC/SJService.cs | 158 ++++++++++++++++++++++++++++++++++++++++++++++------
3 files changed, 143 insertions(+), 21 deletions(-)
diff --git a/StandardInterface/MES.Service/service/PLM/WarehouseDownloadDoc.cs b/StandardInterface/MES.Service/service/PLM/WarehouseDownloadDoc.cs
index 0b7b061..20562eb 100644
--- a/StandardInterface/MES.Service/service/PLM/WarehouseDownloadDoc.cs
+++ b/StandardInterface/MES.Service/service/PLM/WarehouseDownloadDoc.cs
@@ -16,7 +16,7 @@
get
{
//string json = "{\"ap1\":{ \"AcctID\":\"" + "68044981e73323" + "\",\"Username\":\"骞挎繁\",\"Password\":\"gs@123456\",\"Lcid\":2052,\"AuthenticateType\":1,\"PasswordIsEncrypted\":\"false\",\"ClientInfo\":{\"ClientType\":8}}";
- string json = "{\"ap1\":{ \"AcctID\":\"" + "6533e4ab79156b" + "\",\"Username\":\"骞挎繁\",\"Password\":\"gs@123456\",\"Lcid\":2052,\"AuthenticateType\":1,\"PasswordIsEncrypted\":\"false\",\"ClientInfo\":{\"ClientType\":8}}";
+ string json = "{\"ap1\":{ \"AcctID\":\"" + "6533e4ab79156b" + "\",\"Username\":\"骞挎繁\",\"Password\":\"gskj@321\",\"Lcid\":2052,\"AuthenticateType\":1,\"PasswordIsEncrypted\":\"false\",\"ClientInfo\":{\"ClientType\":8}}";
var resp = GetResponse("http://47.96.178.105/k3cloud/Kingdee.BOS.ServiceFacade.ServicesStub.User.UserService.ValidateLoginInfo.common.kdsvc", json, new Dictionary<string, string>());
string ret = (new StreamReader(resp.GetResponseStream(), Encoding.UTF8)).ReadToEnd();
var result = JObject.Parse(ret)["Context"];
diff --git a/StandardInterface/MES.Service/service/QC/SJService.cs b/StandardInterface/MES.Service/service/QC/SJService.cs
index e53d43e..99645a7 100644
--- a/StandardInterface/MES.Service/service/QC/SJService.cs
+++ b/StandardInterface/MES.Service/service/QC/SJService.cs
@@ -213,7 +213,7 @@
var array = qsItemIpiItems.Select(s => s.Id).ToArray();
var qsItemIpiItemDetails = db.Queryable<QsItemIpiItemDetail>()
- .Where(s => array.Contains(s.Pid))
+ .Where(s => array.Contains(s.Pid) && s.FcheckResu != "/")
.GroupBy(s => s.Pid)
.Select(s => new
{
@@ -232,12 +232,59 @@
else
{
s.isCheck = find.count;
- if (find.count == s.LevelNum && s.IsPass == 1)
- s.result = "鍚堟牸";
- else if (find.count == s.LevelNum && s.IsPass == 0)
- s.result = "涓嶅悎鏍�";
+
+ // 璁＄畻瀹為檯闇�瑕佹楠岀殑鏁伴噺锛堟帓闄ゅ牭绌达級
+ int actualRequiredCount = (int)(s.LevelNum ?? 0);
+ if (s.HoleNumbers != null && s.HoleNumbers.Count > 0)
+ {
+ // 濡傛灉鏈夌┐鍙蜂俊鎭紝璁＄畻闈炲牭绌寸殑鏁伴噺
+ actualRequiredCount = s.HoleNumbers.Count(h => !h.IsBlocked);
+ }
+
+ // 璋冭瘯淇℃伅锛氱粨鏋滃垽瀹�
+ Console.WriteLine($"getQSItems: Pid={s.Id}, find.count={find.count}, actualRequiredCount={actualRequiredCount}, IsPass={s.IsPass}");
+
+ // 濡傛灉鏈夋楠岃褰曪紝鏍规嵁鍚堟牸鎯呭喌鍒ゆ柇鐘舵��
+ if (find.count > 0)
+ {
+ // 鑾峰彇鍚堟牸鏁伴噺
+ var passCount = db.Queryable<QsItemIpiItemDetail>()
+ .Where(a => a.Pid == s.Id && a.Fstand == "鈭�" && a.FcheckResu != "/").Count();
+
+ // 鑾峰彇涓嶅悎鏍兼暟閲�
+ var failCount = db.Queryable<QsItemIpiItemDetail>()
+ .Where(a => a.Pid == s.Id && a.Fstand == "脳" && a.FcheckResu != "/").Count();
+
+ // 濡傛灉鏈変笉鍚堟牸璁板綍锛岀洿鎺ユ樉绀轰笉鍚堟牸
+ if (failCount > 0)
+ {
+ s.result = "涓嶅悎鏍�";
+ }
+ // 濡傛灉鍏ㄩ儴鍚堟牸涓旀暟閲忓尮閰嶏紝鏄剧ず鍚堟牸
+ else if (passCount == actualRequiredCount && find.count == actualRequiredCount)
+ {
+ s.result = "鍚堟牸";
+ }
+ // 濡傛灉閮ㄥ垎瀹屾垚锛屾樉绀鸿繘琛屼腑
+ else if (find.count < actualRequiredCount)
+ {
+ s.result = "杩涜涓�";
+ }
+ // 濡傛灉鍏ㄩ儴瀹屾垚浣嗗悎鏍兼暟閲忎笉瓒筹紝鏄剧ず涓嶅悎鏍�
+ else if (find.count == actualRequiredCount && passCount < actualRequiredCount)
+ {
+ s.result = "涓嶅悎鏍�";
+ }
+ // 鍏朵粬鎯呭喌鏄剧ず杩涜涓�
+ else
+ {
+ s.result = "杩涜涓�";
+ }
+ }
else
+ {
s.result = "鏈畬鎴�";
+ }
}
});
@@ -301,7 +348,24 @@
detail.Fstand = "鈭�";
detail.FcheckResu = "1";
detail.UpdateBy = item.From.StatusUser;
- detail.count = (int?)s.LevelNum;
+
+ // 璁＄畻榛樿鍚堟牸鐨勬暟閲忥細(妫�楠屾暟 * 寮�绌存暟) - (妫�楠屾暟 * 鍫电┐鏁�)
+ if (s.HoleNumbers != null && s.HoleNumbers.Count > 0)
+ {
+ // 濡傛灉鏈夌┐鍙蜂俊鎭紝璁＄畻寮�绌存暟鍜屽牭绌存暟
+ int openHoles = s.HoleNumbers.Count(h => !h.IsBlocked); // 寮�绌存暟
+ int blockedHoles = s.HoleNumbers.Count(h => h.IsBlocked); // 鍫电┐鏁�
+ int checkCount = (int)(s.LevelNum ?? 1); // 妫�楠屾暟
+
+ // 璁＄畻锛�(妫�楠屾暟 * 寮�绌存暟) - (妫�楠屾暟 * 鍫电┐鏁�)
+ detail.count = (checkCount * openHoles) - (checkCount * blockedHoles);
+ }
+ else
+ {
+ // 鍚﹀垯浣跨敤LevelNum
+ detail.count = (int?)s.LevelNum;
+ }
+
SetQSItemDetail(detail);
});
@@ -337,7 +401,24 @@
detail.Fstand = "鈭�";
detail.FcheckResu = "1";
detail.UpdateBy = item.StatusUser;
- detail.count = (int?)s.LevelNum;
+
+ // 璁＄畻榛樿鍚堟牸鐨勬暟閲忥細(妫�楠屾暟 * 寮�绌存暟) - (妫�楠屾暟 * 鍫电┐鏁�)
+ if (s.HoleNumbers != null && s.HoleNumbers.Count > 0)
+ {
+ // 濡傛灉鏈夌┐鍙蜂俊鎭紝璁＄畻寮�绌存暟鍜屽牭绌存暟
+ int openHoles = s.HoleNumbers.Count(h => !h.IsBlocked); // 寮�绌存暟
+ int blockedHoles = s.HoleNumbers.Count(h => h.IsBlocked); // 鍫电┐鏁�
+ int checkCount = (int)(s.LevelNum ?? 1); // 妫�楠屾暟
+
+ // 璁＄畻锛�(妫�楠屾暟 * 寮�绌存暟) - (妫�楠屾暟 * 鍫电┐鏁�)
+ detail.count = (checkCount * openHoles) - (checkCount * blockedHoles);
+ }
+ else
+ {
+ // 鍚﹀垯浣跨敤LevelNum
+ detail.count = (int?)s.LevelNum;
+ }
+
SetQSItemDetail(detail);
});
@@ -402,17 +483,38 @@
if (qsItemIpiItem == null) return 0;
var count = db.Queryable<QsItemIpiItemDetail>()
- .Where(s => s.Pid == detail.Pid).Count();
+ .Where(s => s.Pid == detail.Pid && s.FcheckResu != "/").Count();
+ // 璁＄畻瀹為檯闇�瑕佹楠岀殑鏁伴噺锛堟帓闄ゅ牭绌达級
+ var actualRequiredCount = qsItemIpiItem.LevelNum;
+ if (qsItemIpiItem.HoleNumbers != null && qsItemIpiItem.HoleNumbers.Count > 0)
+ {
+ // 濡傛灉鏈夌┐鍙蜂俊鎭紝璁＄畻闈炲牭绌寸殑鏁伴噺
+ actualRequiredCount = qsItemIpiItem.HoleNumbers.Count(h => !h.IsBlocked);
+ }
var result = 0;
- if (qsItemIpiItem.LevelNum != count) return 0;
+ // 姣旇緝瀹為檯闇�瑕佹楠岀殑鏁伴噺鍜屽疄闄呮楠岃褰曟暟閲�
+ if (actualRequiredCount != count)
+ {
+ // 璋冭瘯淇℃伅锛氳褰曟暟閲忎笉鍖归厤
+ Console.WriteLine($"autoResult: actualRequiredCount={actualRequiredCount}, count={count}, Pid={detail.Pid}");
+ // 鍗充娇鏁伴噺涓嶅尮閰嶏紝涔熻缁х画鎵ц鍚庣画閫昏緫鏉ユ洿鏂癐S_PASS瀛楁
+ // return 0; // 娉ㄩ噴鎺夎繖琛岋紝璁╂柟娉曠户缁墽琛�
+ }
var passCount = db.Queryable<QsItemIpiItemDetail>()
- .Where(s => s.Pid == detail.Pid && s.Fstand == "鈭�").Count();
+ .Where(s => s.Pid == detail.Pid && s.Fstand == "鈭�" && s.FcheckResu != "/").Count();
- if (count == passCount) result = 1;
+ // 璋冭瘯淇℃伅锛氱粺璁′俊鎭�
+ Console.WriteLine($"autoResult: count={count}, passCount={passCount}, Pid={detail.Pid}");
+
+ // 鍙湁鍦ㄦ暟閲忓尮閰嶆椂鎵嶈繘琛屽悎鏍兼�у垽鏂�
+ if (actualRequiredCount == count && count == passCount)
+ {
+ result = 1;
+ }
var useTransactionWithOracle = SqlSugarHelper.UseTransactionWithOracle(
db =>
@@ -427,14 +529,30 @@
//鑷姩鍒ゅ畾鏄惁鍚堟牸
- //鑾峰彇妫�楠屽崟鐨勬楠岄」鐩悊璁轰釜鏁�
- var sum = db.Queryable<QsItemIpiItem>()
- .Where(s => s.Pid == detail.Gid).Sum(it => it.LevelNum);
- if (sum == null || sum == 0) return 1;
+ //鑾峰彇妫�楠屽崟鐨勬楠岄」鐩疄闄呴渶瑕佹楠屼釜鏁帮紙鎺掗櫎鍫电┐锛�
+ var sum = 0;
+ var qsItems = db.Queryable<QsItemIpiItem>()
+ .Where(s => s.Pid == detail.Gid).ToList();
+
+ foreach (var item in qsItems)
+ {
+ if (item.HoleNumbers != null && item.HoleNumbers.Count > 0)
+ {
+ // 濡傛灉鏈夌┐鍙蜂俊鎭紝璁＄畻闈炲牭绌寸殑鏁伴噺
+ sum += item.HoleNumbers.Count(h => !h.IsBlocked);
+ }
+ else
+ {
+ // 鍚﹀垯浣跨敤LevelNum
+ sum += (int)(item.LevelNum ?? 0);
+ }
+ }
+
+ if (sum == 0) return 1;
- //鑾峰彇妫�楠屽崟涓嬬殑妫�楠岄」鐩疄闄呬釜鏁�
+ //鑾峰彇妫�楠屽崟涓嬬殑妫�楠岄」鐩疄闄呬釜鏁帮紙鎺掗櫎鍫电┐锛�
var icount = db.Queryable<QsItemIpiItemDetail>()
- .Where(s => s.Gid == detail.Gid).Count();
+ .Where(s => s.Gid == detail.Gid && s.FcheckResu != "/").Count();
if (icount == 0) return 1;
@@ -548,7 +666,7 @@
return withOracle;
}
//鍒锋柊妫�楠岄」鐩�
- public (int result, string message) GenUpdate(decimal? id, string? no, string? user)
+ public (int result, string message) GenUpdate(decimal? id, string? no, string? user, decimal? mnum = null, string? dnum = null)
{
var outputResult = new SugarParameter("PO_RESULT", null, System.Data.DbType.Int32, ParameterDirection.Output, 4000);
var outputMessage = new SugarParameter("PO_TEXT", null, System.Data.DbType.String, ParameterDirection.Output, 4000);
@@ -558,13 +676,15 @@
new("P_ID", id, System.Data.DbType.Decimal, ParameterDirection.Input),
new("P_NO", no, System.Data.DbType.String, ParameterDirection.Input),
new("P_USER", user, System.Data.DbType.String, ParameterDirection.Input),
+ new("P_MNUM", mnum ?? 1, System.Data.DbType.Decimal, ParameterDirection.Input),
+ new("P_DNUM", dnum ?? "", System.Data.DbType.String, ParameterDirection.Input),
outputResult,
outputMessage
};
var db = SqlSugarHelper.GetInstance();
db.Ado.ExecuteCommand(
- "BEGIN PRC_GEN_UPDATE(:P_ID, :P_NO, :P_USER, :PO_RESULT, :PO_TEXT); END;",
+ "BEGIN PRC_GEN_UPDATE(:P_ID,:P_NO,:P_MNUM,:P_DNUM,:P_USER, :PO_RESULT, :PO_TEXT); END;",
parameters.ToArray());
int result = outputResult.Value == null ? -1 : Convert.ToInt32(outputResult.Value);
diff --git a/StandardInterface/MESApplication/Controllers/QC/SJController.cs b/StandardInterface/MESApplication/Controllers/QC/SJController.cs
index 87a2a52..918e0d5 100644
--- a/StandardInterface/MESApplication/Controllers/QC/SJController.cs
+++ b/StandardInterface/MESApplication/Controllers/QC/SJController.cs
@@ -329,8 +329,10 @@
decimal? id = data["id"]?.ToObject<decimal>();
string? no = data["no"]?.ToString();
string? user = data["user"]?.ToString();
+ decimal? mnum = data["mnum"]?.ToObject<decimal?>();
+ string? dnum = data["dnum"]?.ToString();
- var (result, message) = new SJService().GenUpdate(id, no, user);
+ var (result, message) = new SJService().GenUpdate(id, no, user, mnum, dnum);
dynamic resultInfos = new ExpandoObject();
resultInfos.result = result;
--
Gitblit v1.9.3