From 792f2462a2ce5141f72bee69fe9ec003856905a1 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 14 5月 2025 14:07:28 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/SharedService.cs | 85 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 74 insertions(+), 11 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 7211e3f..acd549a 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/SharedService.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/SharedService.cs
@@ -19,6 +19,12 @@
using CmsQueryExtensions.Entitys;
using CMS.Unit.RuntimeValue.Abstractions;
using CMS.Extensions.Variable;
+using CMS.Plugin.TraceManagement.Abstractions.Models.Traces;
+using CMS.Plugin.ProcessManagement.Abstractions;
+using KissUtil.Extensions;
+using CMS.Plugin.TraceManagement.Abstractions;
+using CMS.Plugin.ProductManagement.Abstractions.Models;
+using CMS.Plugin.MaterialManagement.Abstractions;
namespace CMS.Plugin.PipeLineLems.Application.Implements;
@@ -36,6 +42,11 @@
//3銆佸啓鍏� 鍒嗘嫞鍙橀噺
VariableService _variableService = _serviceProvider.GetRequiredService<VariableService>();
+ var _workSectionManager = _serviceProvider.GetRequiredService<IWorkSectionManager>();
+ var _workStationManager = _serviceProvider.GetRequiredService<IWorkStationManager>();
+ var traceProvider = _serviceProvider.GetRequiredService<ITraceProvider>();
+ var materialProvider = _serviceProvider.GetRequiredService<IMaterialProvider>();
+ var workPlanAppService = _serviceProvider.GetRequiredService<IWorkPlanAppService>();
Dictionary<string, object?> keyValuePairs = new Dictionary<string, object?>
{
@@ -44,13 +55,69 @@
{ "鍒嗘嫞浜�", myCurrentUser.UserAccount }
};
_variableService.WriteValueAsync(keyValuePairs);
+
+ //鏍规嵁宸ュ簭鍚嶈幏鍙栧伐搴忓璞�
+ var workSection = await _workSectionManager.GetByNameAsync("鍒嗘嫞宸ュ簭");
+ var workStation = await _workStationManager.GetByNameAsync("鍒嗘嫞宸ヤ綅");
+ //鍐欏叆杩芥函鎶ヨ〃
+ var finishTime = DateTime.Now;
+ TraceModel traceModel = new TraceModel()
+ {
+ SerialNumber = input.PipeSpecCode,
+ WorkSectionId = workSection.Id,
+ WorkSectionName = workSection.Name,
+ WorkStationName = workStation.Name,
+
+ FinishTime = finishTime,
+ IsQualified = true,
+ UnqualifiedReason = "",
+ ProductModel = "",
+ ProductName = "",
+
+ };
+ traceModel.Params = new List<TraceParamModel>();
+ foreach (var item in workSection.ProcessParameters)
+ {
+ var value = "ssss";
+ traceModel.Params.Add(new TraceParamModel()
+ {
+ Key = item.Key,
+ Value = value.SafeString()
+ });
+ }
+ //鐗╂枡鍙傛暟鍒楄〃
+ 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("鍒嗘嫞鍘熸枡绠″瀷鍙�");
+ List<TraceMaterialModel> _MaterialParams = new List<TraceMaterialModel>();
+ _MaterialParams.Add(new TraceMaterialModel()
+ {
+ Key = "鍒嗘嫞鍘熸枡绠℃爣璇�",
+ Quantity = 1,
+ MaterialId = rawPipe_DataIdentifier.MaterialId,
+ MaterialDetailId = rawPipe_DataIdentifier.MaterialDetails.First().Id,
+ Value = firstWorkPlan.DataIdentifier,
+
+ });
+ _MaterialParams.Add(new TraceMaterialModel()
+ {
+ Key = "鍒嗘嫞鍘熸枡绠″瀷鍙�",
+ Quantity = 1,
+ MaterialId = rawPipe_MaterialMode.MaterialId,
+ MaterialDetailId = rawPipe_MaterialMode.MaterialDetails.First().Id,
+ Value = firstWorkPlan.MaterialMode
+ });
+ traceModel.MaterialParams = _MaterialParams;
+
+ await traceProvider.CreateTraceAsync(traceModel);
+
var response = new MesOrderResponse
{
- Code = "000000",
+ Code = "200",
Data = "",
- Fail = false,
- Mesg = "澶勭悊鎴愬姛",
- Success = true,
+ Message = "澶勭悊鎴愬姛",
Time = DateTime.UtcNow
};
return response;
@@ -262,9 +329,7 @@
{
Code = "000000",
Data = orderModels,
- Fail = false,
- Mesg = "澶勭悊鎴愬姛",
- Success = true,
+ Message = "澶勭悊鎴愬姛",
Time = DateTime.UtcNow
};
return response;
@@ -387,10 +452,8 @@
// 杩斿洖缁撴灉
var response = new MesOrderResponse
{
- Code = "000000",
- Fail = false,
- Mesg = "鍙枡鎴愬姛",
- Success = true,
+ Code = "200",
+ Message = "鍙枡鎴愬姛",
Time = DateTime.UtcNow
};
return response;
--
Gitblit v1.9.3