From f5432e77f687c1efb8c1f488c9032f73616efb23 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周四, 15 5月 2025 09:02:56 +0800
Subject: [PATCH] 2
---
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/SharedService.cs | 22 +++++++++++++++-------
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/PickInput.cs | 5 +++++
PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkPlanController.cs | 10 +++++-----
PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/CallMaterialOrderRecordController.cs | 10 +++++-----
PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkPlanPublicController.cs | 2 ++
PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/CallMaterialOrderController.cs | 10 +++++-----
6 files changed, 37 insertions(+), 22 deletions(-)
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/PickInput.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/PickInput.cs
index 49f8699..092fd0e 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/PickInput.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/PickInput.cs
@@ -18,6 +18,11 @@
/// </summary>
public string PipeSpecCode { get; set; }
+ /// <summary>
+ /// 鍒嗘嫞鎵樼洏鍙�
+ /// </summary>
+ public string ContinerNo { get; set; }
+
}
}
\ No newline at end of file
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..5b134ea 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/SharedService.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/SharedService.cs
@@ -48,13 +48,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("鍒嗘嫞宸ュ簭");
@@ -129,6 +129,14 @@
{
_value = "鐭瑁呴厤";
}
+ if (item.Name == "鍒嗘嫞鎵樼洏鍙�")
+ {
+ _value = input.ContinerNo;
+ }
+ if (item.Name == "鍒嗘嫞浜�")
+ {
+ _value = myCurrentUser.UserAccount;
+ }
//item.Key
TraceParamModel traceParamModel = new TraceParamModel()
{
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/CallMaterialOrderController.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/CallMaterialOrderController.cs
index afdd362..68c31db 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/CallMaterialOrderController.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/CallMaterialOrderController.cs
@@ -70,7 +70,7 @@
/// </summary>
/// <param name="input">杈撳叆.</param>
/// <returns></returns>
- //[Authorize]
+ [Authorize]
[HttpPost]
public virtual Task<CallMaterialOrderDto> CreateAsync(CallMaterialOrderCreateDto input)
{
@@ -83,7 +83,7 @@
/// <param name="id">鏍囪瘑绗�.</param>
/// <param name="input">杈撳叆.</param>
/// <returns></returns>
- //[Authorize]
+ [Authorize]
[HttpPut]
[Route("{id}")]
public virtual Task<CallMaterialOrderDto> UpdateAsync(Guid id, CallMaterialOrderUpdateDto input)
@@ -96,7 +96,7 @@
/// </summary>
/// <param name="ids">Id闆嗗悎.</param>
/// <returns></returns>
- //[Authorize]
+ [Authorize]
[HttpPost]
[Route("Clone")]
public virtual Task<List<CallMaterialOrderDto>> CloneAsync([FromBody] IEnumerable<Guid> ids)
@@ -109,7 +109,7 @@
/// </summary>
/// <param name="id">鏍囪瘑绗�.</param>
/// <returns></returns>
- //[Authorize]
+ [Authorize]
[HttpDelete]
[Route("{id}")]
public virtual Task DeleteAsync(Guid id)
@@ -122,7 +122,7 @@
/// </summary>
/// <param name="ids">The ids.</param>
/// <returns></returns>
- //[Authorize]
+ [Authorize]
[HttpDelete]
public virtual Task DeleteAsync([FromBody] IEnumerable<Guid> ids)
{
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/CallMaterialOrderRecordController.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/CallMaterialOrderRecordController.cs
index 84d8020..123e408 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/CallMaterialOrderRecordController.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/CallMaterialOrderRecordController.cs
@@ -63,7 +63,7 @@
/// </summary>
/// <param name="input">杈撳叆.</param>
/// <returns></returns>
- //[Authorize]
+ [Authorize]
[HttpPost]
public virtual Task<CallMaterialOrderRecordDto> CreateAsync(CallMaterialOrderRecordCreateDto input)
{
@@ -76,7 +76,7 @@
/// <param name="id">鏍囪瘑绗�.</param>
/// <param name="input">杈撳叆.</param>
/// <returns></returns>
- //[Authorize]
+ [Authorize]
[HttpPut]
[Route("{id}")]
public virtual Task<CallMaterialOrderRecordDto> UpdateAsync(Guid id, CallMaterialOrderRecordUpdateDto input)
@@ -89,7 +89,7 @@
/// </summary>
/// <param name="ids">Id闆嗗悎.</param>
/// <returns></returns>
- //[Authorize]
+ [Authorize]
[HttpPost]
[Route("Clone")]
public virtual Task<List<CallMaterialOrderRecordDto>> CloneAsync([FromBody] IEnumerable<Guid> ids)
@@ -102,7 +102,7 @@
/// </summary>
/// <param name="id">鏍囪瘑绗�.</param>
/// <returns></returns>
- //[Authorize]
+ [Authorize]
[HttpDelete]
[Route("{id}")]
public virtual Task DeleteAsync(Guid id)
@@ -115,7 +115,7 @@
/// </summary>
/// <param name="ids">The ids.</param>
/// <returns></returns>
- //[Authorize]
+ [Authorize]
[HttpDelete]
public virtual Task DeleteAsync([FromBody] IEnumerable<Guid> ids)
{
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkPlanController.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkPlanController.cs
index bc77738..1ebb01c 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkPlanController.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkPlanController.cs
@@ -67,7 +67,7 @@
/// </summary>
/// <param name="input">杈撳叆.</param>
/// <returns></returns>
- //[Authorize]
+ [Authorize]
[HttpPost]
public virtual Task<WorkPlanDto> CreateAsync(WorkPlanCreateDto input)
{
@@ -80,7 +80,7 @@
/// <param name="id">鏍囪瘑绗�.</param>
/// <param name="input">杈撳叆.</param>
/// <returns></returns>
- //[Authorize]
+ [Authorize]
[HttpPut]
[Route("{id}")]
public virtual Task<WorkPlanDto> UpdateAsync(Guid id, WorkPlanUpdateDto input)
@@ -93,7 +93,7 @@
/// </summary>
/// <param name="ids">Id闆嗗悎.</param>
/// <returns></returns>
- //[Authorize]
+ [Authorize]
[HttpPost]
[Route("Clone")]
public virtual Task<List<WorkPlanDto>> CloneAsync([FromBody] IEnumerable<Guid> ids)
@@ -106,7 +106,7 @@
/// </summary>
/// <param name="id">鏍囪瘑绗�.</param>
/// <returns></returns>
- //[Authorize]
+ [Authorize]
[HttpDelete]
[Route("{id}")]
public virtual Task DeleteAsync(Guid id)
@@ -119,7 +119,7 @@
/// </summary>
/// <param name="ids">The ids.</param>
/// <returns></returns>
- //[Authorize]
+ [Authorize]
[HttpDelete]
public virtual Task DeleteAsync([FromBody] IEnumerable<Guid> ids)
{
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkPlanPublicController.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkPlanPublicController.cs
index e8c4fd2..b027c3f 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkPlanPublicController.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkPlanPublicController.cs
@@ -3,6 +3,7 @@
using CMS.Plugin.PipeLineLems.Application.Contracts.Dtos.WorkPlan;
using CMS.Plugin.PipeLineLems.Application.Contracts.Services;
using CmsQueryExtensions.Entitys;
+using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using System.Reflection;
@@ -54,6 +55,7 @@
/// </summary>
/// <param name="input">鏍囪瘑绗�.</param>
/// <returns></returns>
+ [Authorize]
[HttpPost]
[Route("Pick")]
public virtual async Task<MesOrderResponse> Pick([FromBody] PickInput input)
--
Gitblit v1.9.3