From 9a83dbb67b223e94a946e1bf7db59336e7fb2f28 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周四, 15 5月 2025 14:51:29 +0800
Subject: [PATCH] 22
---
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/SharedService.cs | 53 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 41 insertions(+), 12 deletions(-)
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/SharedService.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/SharedService.cs
index c3dc2d5..8183c36 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/SharedService.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/SharedService.cs
@@ -34,12 +34,20 @@
public class SharedService : CMSPluginAppService
{
-
+ /// <summary>
+ /// 鍒嗘嫞鍔熻兘
+ /// </summary>
+ /// <param name="_serviceProvider"></param>
+ /// <param name="input"></param>
+ /// <param name="myCurrentUser"></param>
+ /// <returns></returns>
public async Task<MesOrderResponse> CommonPick(IServiceProvider _serviceProvider, PickInput input, MyCurrentUser myCurrentUser)
{
//1銆佽褰曞垎鎷ｈ褰曡〃
//2銆佹洿鏂颁綔涓氳鍒掕〃鐨勭姸鎬� =宸插垎鎷�
//3銆佸啓鍏� 鍒嗘嫞鍙橀噺
+ //4銆佸啓鍏ヨ拷婧姤琛�
+ //5銆佺墿鏂欑粍鐩�
VariableService _variableService = _serviceProvider.GetRequiredService<VariableService>();
var _workSectionManager = _serviceProvider.GetRequiredService<IWorkSectionManager>();
@@ -48,13 +56,13 @@
var materialProvider = _serviceProvider.GetRequiredService<IMaterialProvider>();
var workPlanAppService = _serviceProvider.GetRequiredService<IWorkPlanAppService>();
- Dictionary<string, object?> keyValuePairs = new Dictionary<string, object?>
- {
- { "鍒嗘嫞鎵樼洏鍙�","鎵樼洏1"},
- { "鍒嗘嫞鏂瑰悜", "鐭瑁呴厤"},
- { "鍒嗘嫞浜�", myCurrentUser.UserAccount }
- };
- _variableService.WriteValueAsync(keyValuePairs);
+ //Dictionary<string, object?> keyValuePairs = new Dictionary<string, object?>
+ // {
+ // { "鍒嗘嫞鎵樼洏鍙�","鎵樼洏1"},
+ // { "鍒嗘嫞鏂瑰悜", "鐭瑁呴厤"},
+ // { "鍒嗘嫞浜�", myCurrentUser.UserAccount }
+ // };
+ //_variableService.WriteValueAsync(keyValuePairs);
//鏍规嵁宸ュ簭鍚嶈幏鍙栧伐搴忓璞�
var workSection = await _workSectionManager.GetByNameAsync("鍒嗘嫞宸ュ簭");
@@ -89,12 +97,13 @@
var firstWorkPlans = await workPlanAppService.GetListByFilterAsync(x => x.PipeSpecCode == input.PipeSpecCode);
var firstWorkPlan = await workPlanAppService.GetSingleByFilterAsync(x => x.PipeSpecCode == input.PipeSpecCode);
- var rawPipe_DataIdentifier = await materialProvider.FindByNameAsync("鍒嗘嫞鍘熸枡绠℃爣璇�");
- var rawPipe_MaterialMode = await materialProvider.FindByNameAsync("鍒嗘嫞鍘熸枡绠″瀷鍙�");
+ var rawPipe_DataIdentifier = await materialProvider.FindByNameAsync("鍘熸枡绠℃爣璇�");
+ var rawPipe_MaterialMode = await materialProvider.FindByNameAsync("鍘熸枡绠″瀷鍙�");
+ var rawPipe_Batch = await materialProvider.FindByNameAsync("鍘熸枡绠℃壒娆�");
List<TraceMaterialModel> _MaterialParams = new List<TraceMaterialModel>();
foreach (var item in workSection.MaterialParameters)
{
- if (item.Name == "鍒嗘嫞鍘熸枡绠″瀷鍙�")
+ if (item.Name == "鍘熸枡绠″瀷鍙�")
{
_MaterialParams.Add(new TraceMaterialModel()
{
@@ -106,7 +115,7 @@
});
}
- if (item.Name == "鍒嗘嫞鍘熸枡绠℃爣璇�")
+ if (item.Name == "鍘熸枡绠℃爣璇�")
{
_MaterialParams.Add(new TraceMaterialModel()
{
@@ -115,6 +124,18 @@
MaterialId = rawPipe_DataIdentifier.MaterialId,
MaterialDetailId = rawPipe_DataIdentifier.MaterialDetails.First().Id,
Value = firstWorkPlan.DataIdentifier,
+
+ });
+ }
+ if (item.Name == "鍘熸枡绠℃壒娆�")
+ {
+ _MaterialParams.Add(new TraceMaterialModel()
+ {
+ Key = item.Key,
+ Quantity = 1,
+ MaterialId = rawPipe_Batch.MaterialId,
+ MaterialDetailId = rawPipe_Batch.MaterialDetails.First().Id,
+ Value = "111",//鎵规鏆傛椂鍐欐
});
}
@@ -129,6 +150,14 @@
{
_value = "鐭瑁呴厤";
}
+ if (item.Name == "鍒嗘嫞鎵樼洏鍙�")
+ {
+ _value = input.ContinerNo;
+ }
+ if (item.Name == "鍒嗘嫞浜�")
+ {
+ _value = myCurrentUser.UserAccount;
+ }
//item.Key
TraceParamModel traceParamModel = new TraceParamModel()
{
--
Gitblit v1.9.3