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> /// 物料批次-查询关系运算符 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> /// 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> /// 法兰厚度 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";
