From 004a418bd6674d62d06587030e29897ce430f0f2 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期三, 30 四月 2025 15:57:04 +0800
Subject: [PATCH] 1.异常处置单推送OA 2.现场管理新增现场收料的条码查询功能
---
service/Wom/WomdaaManager.cs | 75 +++++++++++++++++++++++++
Controllers/Wom/WomdaaController.cs | 25 ++++++++
service/QC/OaApi.cs | 78 +++++++++++++++++---------
3 files changed, 151 insertions(+), 27 deletions(-)
diff --git a/Controllers/Wom/WomdaaController.cs b/Controllers/Wom/WomdaaController.cs
index c3fb79b..37724e4 100644
--- a/Controllers/Wom/WomdaaController.cs
+++ b/Controllers/Wom/WomdaaController.cs
@@ -425,5 +425,30 @@
}
}
+ //GetItemsXcsl
+ /// <summary>
+ /// 鏍规嵁宸ュ崟鍙疯幏鍙栦唬棰嗙墿鏂欐槑缁�
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("GetItemsXcsl")]
+ public ResponseResult GetItemsXcsl(WarehouseQuery query)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.GetItemsXcsl(query);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
#endregion
}
\ No newline at end of file
diff --git a/service/QC/OaApi.cs b/service/QC/OaApi.cs
index 00964f7..a126489 100644
--- a/service/QC/OaApi.cs
+++ b/service/QC/OaApi.cs
@@ -83,14 +83,14 @@
{"requestName", $"IQC寮傚父澶勭疆鍗曟祦绋�-{DateTime.Now:yyyyMMddHHmmss}"},
{"workflowId", "379"},
//{"otherParams", BuildOtherParams()},
- //{"detailData", BuildDetailData(queryObj)}
+ {"detailData", BuildDetailData(queryObj)}
};
}
-
+
private JArray createbhgpqxmszp(dynamic files)
{
var attachments = new JArray();
-
+
foreach (var file in files ?? Enumerable.Empty<dynamic>())
{
attachments.Add(new JObject
@@ -100,7 +100,7 @@
["fileName"] = file.FileName?.ToString() ?? "鏈懡鍚嶆枃浠�"
});
}
-
+
return attachments;
}
private JArray BuildMainData(dynamic queryObj)
@@ -112,7 +112,7 @@
C.item_name AS jzmcwlmc,
D.supp_name AS khgys,
B.bill_no AS dhdhmes,
- B.remark AS bhgpqxms
+ A.remark AS bhgpqxms
FROM Mes_QC_Exceptional A
LEFT JOIN MES_INV_ITEM_ARN B ON A.aboutGuid = b.guid
LEFT JOIN MES_ITEMS C ON A.itemId = c.item_id
@@ -288,30 +288,54 @@
return array;
}
- private JArray BuildDetailData(JObject query)
+ private JArray BuildDetailData(dynamic queryObj)
{
- // 绀轰緥鏄庣粏鏁版嵁锛屾牴鎹疄闄呬笟鍔¤皟鏁�
+ // 浣跨敤鍙傛暟鍖栨煡璇㈣幏鍙栨槑缁嗘暟鎹�
+ const string mainSql = @"select ROW_NUMBER() over (ORDER BY Jy_Date) AS xh,releaseNo AS jydh, Jy_Date AS jydrq, batchQty as sjsl,
+ chouQty AS cys, badQty AS bls, badProb AS bll
+ from [Mes_QC_Exceptional_Detail]
+ WHERE pGuid = @guid";
+
+ var details = Db.Ado.SqlQuery<dynamic>(mainSql, new { guid = queryObj.qcczdGuid });
+
+ var tableRecords = new JArray();
+
+ // 閬嶅巻姣忔潯鏄庣粏鏁版嵁
+ foreach (var record in details ?? Enumerable.Empty<dynamic>())
+ {
+ // 淇瀛楁绫诲瀷杞崲锛堟暟鍊肩被鍨嬪幓闄ゅ瓧绗︿覆鍖呰９锛�
+ var fields = new JArray
+ {
+ //new JObject { ["fieldName"] = "xh", ["fieldValue"] = record.xh?.ToString() ?? "" },
+ new JObject { ["fieldName"] = "jydh", ["fieldValue"] = record.jydh?.ToString() ?? "" },
+ new JObject {
+ ["fieldName"] = "jydrq",
+ // 鏍煎紡鍖栦负"yyyy-MM-dd"瀛楃涓�
+ ["fieldValue"] = (record.jydrq != null
+ ? Convert.ToDateTime(record.jydrq).ToString("yyyy-MM-dd ")
+ : DateTime.Now.ToString("yyyy-MM-dd"))
+ },
+ // 鏁板�煎瓧娈典繚鎸佹暟瀛楃被鍨嬭�岄潪瀛楃涓�
+ // 淇鏁板�肩被鍨嬭浆鎹㈡柟寮�
+ new JObject { ["fieldName"] = "sjsl", ["fieldValue"] = (float)(record.sjsl ?? 0m) },
+ new JObject { ["fieldName"] = "cys", ["fieldValue"] = (float)(record.cys ?? 0) },
+ new JObject { ["fieldName"] = "bls", ["fieldValue"] = (float)(record.bls ?? 0) },
+ new JObject { ["fieldName"] = "bll", ["fieldValue"] = 1 }
+ };
+
+ tableRecords.Add(new JObject
+ {
+ ["recordOrder"] = 0, // 瀹為檯涓氬姟涓彲鑳介渶瑕佹牴鎹鍙疯缃�
+ ["workflowRequestTableFields"] = fields
+ });
+ }
+
return new JArray
{
new JObject
{
["tableDBName"] = "formtable_main_33_dt1",
- ["workflowRequestTableRecords"] = new JArray
- {
- new JObject
- {
- ["recordOrder"] = "0",
- ["workflowRequestTableFields"] = new JArray
- {
- new JObject { ["fieldName"] = "jydh", ["fieldValue"] = query[""] ?? "妫�楠屽崟鍙�" },
- new JObject { ["fieldName"] = "jydrq", ["fieldValue"] = query[""] ?? "妫�楠屽崟鏃ユ湡" },
- new JObject { ["fieldName"] = "sjsl", ["fieldValue"] = query[""] ?? "娑夊強鏁伴噺" },
- new JObject { ["fieldName"] = "cys", ["fieldValue"] = query[""] ?? "鎶芥牱鏁�" },
- new JObject { ["fieldName"] = "bls", ["fieldValue"] = query[""] ?? "涓嶈壇鏁�" },
- new JObject { ["fieldName"] = "bll", ["fieldValue"] = query[""] ?? "涓嶈壇鐜�" }
- }
- }
- }
+ ["workflowRequestTableRecords"] = tableRecords
}
};
}
@@ -378,13 +402,13 @@
{
formData.Add(new KeyValuePair<string, string>(item.Key, item.Value.ToString()));
}
-
+
var content = new FormUrlEncodedContent(formData);
content.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue("application/x-www-form-urlencoded");
var response = await _httpClient.PostAsync(url, content);
var responseString = await response.Content.ReadAsStringAsync();
-
+
// 娣诲姞鍝嶅簲鍏冩暟鎹�
var responseInfo = new JObject
{
@@ -393,10 +417,10 @@
["Headers"] = JToken.FromObject(response.Headers),
["Content"] = responseString
};
-
+
// 璋冭瘯杈撳嚭瀹屾暣鍝嶅簲淇℃伅
Console.WriteLine($"瀹屾暣鍝嶅簲锛歕n{responseInfo.ToString(Formatting.Indented)}");
-
+
return responseInfo.ToString();
}
diff --git a/service/Wom/WomdaaManager.cs b/service/Wom/WomdaaManager.cs
index 3351413..066314a 100644
--- a/service/Wom/WomdaaManager.cs
+++ b/service/Wom/WomdaaManager.cs
@@ -589,4 +589,79 @@
}
}
}
+
+
+
+ //鏍规嵁宸ュ崟鍙疯繑鍥炰骇鍝佸瀷鍙峰拰寰呴鐗╂枡
+ public ProductionPickDto GetItemsXcsl(WarehouseQuery query)
+ {
+ if (string.IsNullOrEmpty(query.daa001)) throw new Exception("宸ュ崟鍙蜂负绌�");
+
+ var womdaa = Db.Queryable<Womdaa, MesItems>((a, i) =>
+ new JoinQueryInfos(JoinType.Left,
+ a.Daa002 == i.ItemId.ToString()))
+ .Where((a, i) => a.Daa001 == query.daa001
+ && a.Fstatus == 1)
+ .Select((a, i) => new
+ {
+ a.Daa001,
+ a.CaaGuid
+ }).First();
+
+ if (womdaa?.Daa001 == null) throw new Exception("宸ュ崟鍙蜂笉瀛樺湪");
+
+ var sql = string.Format(@"SELECT c.item_no ItemNo,c.item_name ItemName,c.item_model ItemModel,b.dab006 FQty,b.dab007 SQty,b.dab006 - b.dab007 DSQty ,
+ dbo.F_QX_GETRECODEPOTSE(B.dab003) as RecoKw
+ FROM WOMDAB B
+ LEFT JOIN WOMDAA A ON A.guid = B.daaGuid
+ LEFT JOIN MES_ITEMS C ON B.dab003 = C.item_id
+ LEFT JOIN WOMCAB D ON B.erpid = D.ERPID
+ WHERE daa001 = '{0}' AND ISSUE_TYPE = 1 ORDER BY DAB002", query.daa001);
+
+ var womdabs = Db.Ado.SqlQuery<ItemDetailModel>(sql);
+
+
+ var DS_list = womdabs.Where(s => s.DSQty > 0).ToList();
+
+ var YS_list = womdabs.Where(s => s.SQty > 0).ToList();
+
+ var mesInvItemOutCDetailsList = Db
+ .Queryable<MesInvItemOutCDetails, MesItems, MesDepots>
+ ((a, b, c) =>
+ new JoinQueryInfos(
+ JoinType.Inner, a.ItemId == b.Id,
+ JoinType.Inner, c.DepotId == a.DepotId
+ ))
+ .Where((a, b, c) => a.WorkNo == query.daa001)
+ .Select((a, b, c) => new MesInvItemOutCDetails
+ {
+ ItemName = b.ItemName,
+ ItemNo = b.ItemNo,
+ ItemId = a.ItemId,
+ DepotId = a.DepotId,
+ WorkNo = a.WorkNo,
+ DepotName = c.DepotName,
+ Quantity = a.Quantity
+ })
+ .ToList();
+
+ var womcaa = Db.Queryable<Womcaa>().Where(s => s.Guid == womdaa.CaaGuid)
+ .First();
+
+ if (womcaa == null)
+ {
+ throw new Exception("鐢熶骇浠诲姟鍗曚笉瀛樺湪");
+ }
+
+ var dto = new ProductionPickDto
+ {
+ daa001 = womdaa.Daa001,
+ PlanNo = womcaa.Caa020,
+ items = DS_list,
+ Ysitems = YS_list
+ // yisao = mesInvItemOutCDetailsList
+ };
+
+ return dto;
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3