From cfc40ec33d286b9bf6106d32f20ee3e9533ed026 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周五, 16 5月 2025 16:30:57 +0800
Subject: [PATCH] 22
---
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/SharedService.cs | 71 ++++++++++++++++++++++++++++++++---
1 files changed, 64 insertions(+), 7 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 8183c36..06bd5f4 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/SharedService.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/SharedService.cs
@@ -25,6 +25,12 @@
using CMS.Plugin.TraceManagement.Abstractions;
using CMS.Plugin.ProductManagement.Abstractions.Models;
using CMS.Plugin.MaterialManagement.Abstractions;
+using CMS.Plugin.HIAWms.Application.Contracts.Services;
+using CMS.Plugin.HIAWms.Application.Contracts.Dtos.CommonDto;
+using System.Collections.Generic;
+using CMS.Plugin.HIAWms.Abstractions;
+using Newtonsoft.Json;
+using CmsQueryExtensions;
namespace CMS.Plugin.PipeLineLems.Application.Implements;
@@ -203,6 +209,13 @@
if (input.Count == 0)
{
throw new UserFriendlyException("杈撳叆鍙傛暟Data涓嶈兘涓虹┖");
+ }
+
+ //鍐欐 鎵撶爜鍐呭
+ foreach (var item in input)
+ {
+ //鏍煎紡 绠℃缂栫爜,绠℃鍚嶇О,鑸瑰彿,椤圭洰鍙�
+ item.MarkingContent = item.PipeSpecCode + "," + item.PipeSectionName + "," + item.ShipNumber + "," + item.ProjectNumber;
}
//鏍￠獙鏁版嵁
@@ -437,9 +450,9 @@
/// <param name="_serviceProvider">鏈嶅姟鎻愪緵鑰�</param>
/// <returns>鎿嶄綔缁撴灉</returns>
/// <exception cref="UserFriendlyException">褰撴暟鎹笉瀛樺湪鎴栫姸鎬佷笉鍏佽鍙枡鏃舵姏鍑�</exception>
- public async Task<MesOrderResponse> CallMaterialByDataIdentifier(Guid id, IServiceProvider _serviceProvider)
+ public async Task<MesOrderResponse> CallMaterial(CallMaterialByDataIdentifierInput input, IServiceProvider _serviceProvider, MyCurrentUser myCurrentUser)
{
- if (string.IsNullOrEmpty(id.ToString()))
+ if (string.IsNullOrEmpty(input.Id.ToString()))
{
throw new UserFriendlyException("鍘熸枡鏍囪瘑涓嶈兘涓虹┖");
}
@@ -451,7 +464,7 @@
// 鏌ユ壘鏁版嵁
- var callMaterialOrder = await callMaterialOrderRepository.GetAsync(id);
+ var callMaterialOrder = await callMaterialOrderRepository.GetAsync(input.Id);
if (callMaterialOrder == null)
{
throw new UserFriendlyException($"鎵句笉鍒板彨鏂欒褰�");
@@ -460,19 +473,53 @@
// 楠岃瘉鐘舵��
if (callMaterialOrder.CallMaterialStatus != Domain.Shared.Enums.CallMaterialStatusEnum.鏈墽琛�)
{
- throw new UserFriendlyException($"鍘熸枡鏍囪瘑涓� '{callMaterialOrder.DataIdentifier}' 鐨勫彨鏂欒褰曠姸鎬佷负 '{callMaterialOrder.CallMaterialStatus}'锛屼笉鍏佽鍙枡");
+ //throw new UserFriendlyException($"鍘熸枡鏍囪瘑涓� '{callMaterialOrder.DataIdentifier}' 鐨勫彨鏂欒褰曠姸鎬佷负 '{callMaterialOrder.CallMaterialStatus}'锛屼笉鍏佽鍙枡");
}
+ //TODO:杩欓噷璋冪敤wms鐨勫彨鏂欐帴鍙�
+ try
+ {
+ List<LMesCallMaterialInput> param = new List<LMesCallMaterialInput>() {
+ new LMesCallMaterialInput(){
+ DataIdentifier=callMaterialOrder.DataIdentifier,
+ MaterialMode=callMaterialOrder.MaterialMode,
+ }
+ };
+ string baseUrl = @"http://127.0.0.1:18000/api/v1/HIAWms/";
+ string url = baseUrl + "lMesOperate/LMesCallMaterial";
+ string json = JsonConvert.SerializeObject(param);
+ var result = HttpApiRequest.HttpPost(url, json);
+ var res = JsonConvert.DeserializeObject<CmsApiResponse<List<MyCallMaterialOutput>>>(result);
+ if (res.Code == 200)
+ {
+ var retData = res.Data;
+ callMaterialOrder.MaterialBatch = retData[0].MaterialBatch;
+ callMaterialOrder.WmsTaskNo = retData[0].TaskNo;
+ callMaterialOrder.WmsRetResult = res.Message;
+ }
+ else
+ {
+ throw new UserFriendlyException(res.Message);
+ }
+ }
+ catch (Exception)
+ {
+
+ throw;
+ }
+
+
// 鏇存柊鏁版嵁
- callMaterialOrder.WmsRetResult = "鎴愬姛";
- callMaterialOrder.WmsTaskNo = GenerateRandomTaskNo();
+ //callMaterialOrder.MaterialBatch = GenerateRandomBatch();//wms杩斿洖鐨勫師鏂欐壒娆�
+ //callMaterialOrder.WmsRetResult = "鎴愬姛";
+ //callMaterialOrder.WmsTaskNo = GenerateRandomTaskNo();
callMaterialOrder.CallMaterialStatus = Domain.Shared.Enums.CallMaterialStatusEnum.鍙枡瀹屾垚;
callMaterialOrder.LastModifierName = "SuperAdmin";
await callMaterialOrderRepository.UpdateAsync(callMaterialOrder);
//鏇存柊浣滀笟璁″垝琛�
- var workPlanList = await workPlanRepository.FindByDataIdentifierAsync(callMaterialOrder.DataIdentifier);
+ var workPlanList = await workPlanRepository.GetListByFilterAsync(x => x.DataIdentifier == callMaterialOrder.DataIdentifier);
foreach (var item in workPlanList)
{
item.CallMaterialStatus = Domain.Shared.Enums.CallMaterialStatusEnum.鍙枡瀹屾垚;
@@ -484,6 +531,7 @@
var callMaterialOrderRecord = new CallMaterialOrderRecord()
{
CallMaterialStatus = Domain.Shared.Enums.CallMaterialStatusEnum.鍙枡瀹屾垚,
+ MaterialBatch = callMaterialOrder.MaterialBatch,
MaterialMode = callMaterialOrder.MaterialMode,
DataIdentifier = callMaterialOrder.DataIdentifier,
Quantity = 1,
@@ -529,4 +577,13 @@
// 鐢熸垚鍓嶇紑
return $"WMS{timestamp}";
}
+
+ private string GenerateRandomBatch()
+ {
+ // 鑾峰彇褰撳墠鏃堕棿鎴筹紙浠�1970-01-01 00:00:00 UTC鍒扮幇鍦ㄧ殑绉掓暟锛�
+ long timestamp = new DateTimeOffset(DateTime.UtcNow).ToUnixTimeSeconds();
+
+ // 鐢熸垚鍓嶇紑
+ return $"Batch{timestamp}";
+ }
}
--
Gitblit v1.9.3