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 | 20 +++++++--
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockOrderDetail/WmsInOutStockOrderDetailDto.cs | 2
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/WorkPlanInput.cs | 72 ++++++++++++++++++------------------
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockOrderDetail/GetWmsInOutStockOrderDetailInput.cs | 2
4 files changed, 53 insertions(+), 43 deletions(-)
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockOrderDetail/GetWmsInOutStockOrderDetailInput.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockOrderDetail/GetWmsInOutStockOrderDetailInput.cs
index 8053222..d669326 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockOrderDetail/GetWmsInOutStockOrderDetailInput.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockOrderDetail/GetWmsInOutStockOrderDetailInput.cs
@@ -116,7 +116,7 @@
/// <summary>
/// 鐗╂枡鎵规
/// </summary>
- public int? MaterialBatch { get; set; }
+ public string? MaterialBatch { get; set; }
/// <summary>
/// 鐗╂枡鎵规-鏌ヨ鍏崇郴杩愮畻绗�
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockOrderDetail/WmsInOutStockOrderDetailDto.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockOrderDetail/WmsInOutStockOrderDetailDto.cs
index 0036c12..022d005 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockOrderDetail/WmsInOutStockOrderDetailDto.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockOrderDetail/WmsInOutStockOrderDetailDto.cs
@@ -60,7 +60,7 @@
/// <summary>
/// 鐗╂枡鎵规
/// </summary>
- public int? MaterialBatch { get; set; }
+ public string? MaterialBatch { get; set; }
/// <summary>
///
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/WorkPlanInput.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/WorkPlanInput.cs
index b8f501b..dfe7280 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/WorkPlanInput.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Dtos/WorkPlan/WorkPlanInput.cs
@@ -138,50 +138,50 @@
/// </summary>
public string CuttingFile { get; set; }
- /// <summary>
- /// 鏀寰�
- /// </summary>
- public string BranchOuterDiameter { get; set; }
+ ///// <summary>
+ ///// 鏀寰�
+ ///// </summary>
+ //public string BranchOuterDiameter { get; set; }
- /// <summary>
- /// 鏀澹佸帤
- /// </summary>
- public string BranchWallThickness { get; set; }
+ ///// <summary>
+ ///// 鏀澹佸帤
+ ///// </summary>
+ //public string BranchWallThickness { get; set; }
- /// <summary>
- /// 鏀鏉愯川
- /// </summary>
- public string BranchMaterial { get; set; }
+ ///// <summary>
+ ///// 鏀鏉愯川
+ ///// </summary>
+ //public string BranchMaterial { get; set; }
- /// <summary>
- /// 鏀绔彛鏇茬巼鍗婂緞
- /// </summary>
- public string BranchPortRadius { get; set; }
+ ///// <summary>
+ ///// 鏀绔彛鏇茬巼鍗婂緞
+ ///// </summary>
+ //public string BranchPortRadius { get; set; }
- /// <summary>
- /// 鏀绔彛瑙掑害
- /// </summary>
- public string BranchPortAngle { get; set; }
+ ///// <summary>
+ ///// 鏀绔彛瑙掑害
+ ///// </summary>
+ //public string BranchPortAngle { get; set; }
- /// <summary>
- /// 鏀绔彛瑕佹眰
- /// </summary>
- public string BranchPortRequirement { get; set; }
+ ///// <summary>
+ ///// 鏀绔彛瑕佹眰
+ ///// </summary>
+ //public string BranchPortRequirement { get; set; }
- /// <summary>
- /// 鐩歌疮绾跨被鍨�
- /// </summary>
- public string IntersectingLineType { get; set; }
+ ///// <summary>
+ ///// 鐩歌疮绾跨被鍨�
+ ///// </summary>
+ //public string IntersectingLineType { get; set; }
- /// <summary>
- /// 鐩歌疮绾跨被鍒�
- /// </summary>
- public string IntersectingLineCategory { get; set; }
+ ///// <summary>
+ ///// 鐩歌疮绾跨被鍒�
+ ///// </summary>
+ //public string IntersectingLineCategory { get; set; }
- /// <summary>
- /// 鎴愬搧鍥惧箙
- /// </summary>
- public string FinishedProductScale { get; set; }
+ ///// <summary>
+ ///// 鎴愬搧鍥惧箙
+ ///// </summary>
+ //public string FinishedProductScale { get; set; }
/// <summary>
/// 娉曞叞鍘氬害
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 58720e2..06bd5f4 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/SharedService.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/SharedService.cs
@@ -211,6 +211,13 @@
throw new UserFriendlyException("杈撳叆鍙傛暟Data涓嶈兘涓虹┖");
}
+ //鍐欐 鎵撶爜鍐呭
+ foreach (var item in input)
+ {
+ //鏍煎紡 绠℃缂栫爜,绠℃鍚嶇О,鑸瑰彿,椤圭洰鍙�
+ item.MarkingContent = item.PipeSpecCode + "," + item.PipeSectionName + "," + item.ShipNumber + "," + item.ProjectNumber;
+ }
+
//鏍￠獙鏁版嵁
//1銆佸師鏂欐爣璇嗙浉鍚岀殑涓嶈兘瀛樺湪浜庝袱涓� 绠℃缂栧彿涓�
//var validationResult = ValidateUniqueDataIdentifierPerPipeSection(input);
@@ -475,7 +482,7 @@
List<LMesCallMaterialInput> param = new List<LMesCallMaterialInput>() {
new LMesCallMaterialInput(){
DataIdentifier=callMaterialOrder.DataIdentifier,
- MaterialMode="Q235B-桅89脳4",
+ MaterialMode=callMaterialOrder.MaterialMode,
}
};
string baseUrl = @"http://127.0.0.1:18000/api/v1/HIAWms/";
@@ -487,8 +494,11 @@
{
var retData = res.Data;
callMaterialOrder.MaterialBatch = retData[0].MaterialBatch;
+ callMaterialOrder.WmsTaskNo = retData[0].TaskNo;
+ callMaterialOrder.WmsRetResult = res.Message;
}
- else {
+ else
+ {
throw new UserFriendlyException(res.Message);
}
}
@@ -500,9 +510,9 @@
// 鏇存柊鏁版嵁
- callMaterialOrder.MaterialBatch = GenerateRandomBatch();//wms杩斿洖鐨勫師鏂欐壒娆�
- callMaterialOrder.WmsRetResult = "鎴愬姛";
- callMaterialOrder.WmsTaskNo = GenerateRandomTaskNo();
+ //callMaterialOrder.MaterialBatch = GenerateRandomBatch();//wms杩斿洖鐨勫師鏂欐壒娆�
+ //callMaterialOrder.WmsRetResult = "鎴愬姛";
+ //callMaterialOrder.WmsTaskNo = GenerateRandomTaskNo();
callMaterialOrder.CallMaterialStatus = Domain.Shared.Enums.CallMaterialStatusEnum.鍙枡瀹屾垚;
callMaterialOrder.LastModifierName = "SuperAdmin";
--
Gitblit v1.9.3