diff --git a/backend/BPA.MES.Base.Application/BPA.MES.Base.Application.xml b/backend/BPA.MES.Base.Application/BPA.MES.Base.Application.xml
index f572e16..447642f 100644
--- a/backend/BPA.MES.Base.Application/BPA.MES.Base.Application.xml
+++ b/backend/BPA.MES.Base.Application/BPA.MES.Base.Application.xml
@@ -719,6 +719,11 @@
更新时间
+
+
+ 误差
+
+
名 称 :设备产品
@@ -1010,6 +1015,11 @@
描述
+
+
+ 误差
+
+
名 称 :配方分组
@@ -2520,6 +2530,11 @@
计划重量
+
+
+ 第几锅
+
+
名 称 :桶服务
@@ -6712,6 +6727,11 @@
描述
+
+
+ 误差
+
+
增加
@@ -7711,6 +7731,11 @@
更新时间
+
+
+ 误差重量
+
+
增加
diff --git a/backend/BPA.MES.Base.Application/Entitys/App/WorkInfoMaterialsRecordEntity.cs b/backend/BPA.MES.Base.Application/Entitys/App/WorkInfoMaterialsRecordEntity.cs
index 4ea0a34..1fc2c2e 100644
--- a/backend/BPA.MES.Base.Application/Entitys/App/WorkInfoMaterialsRecordEntity.cs
+++ b/backend/BPA.MES.Base.Application/Entitys/App/WorkInfoMaterialsRecordEntity.cs
@@ -50,5 +50,9 @@
///
[SugarColumn(IsNullable = true)]
public DateTime? UpdateTime { get; set; }
+ ///
+ /// 误差
+ ///
+ public string ErrorWeight { get; set; }
}
}
diff --git a/backend/BPA.MES.Base.Application/Entitys/Base/RecipeMaterialEntity.cs b/backend/BPA.MES.Base.Application/Entitys/Base/RecipeMaterialEntity.cs
index c9b54f0..9f1512c 100644
--- a/backend/BPA.MES.Base.Application/Entitys/Base/RecipeMaterialEntity.cs
+++ b/backend/BPA.MES.Base.Application/Entitys/Base/RecipeMaterialEntity.cs
@@ -27,5 +27,10 @@
///
[SugarColumn(IsNullable = true)]
public string Describe { get; set; }
+ ///
+ /// 误差
+ ///
+ [SugarColumn(IsNullable = true)]
+ public string ErrorWeight { get; set; }
}
}
diff --git a/backend/BPA.MES.Base.Application/Services/RecipesService/Dtos/RecipeMaterialDto.cs b/backend/BPA.MES.Base.Application/Services/RecipesService/Dtos/RecipeMaterialDto.cs
index 3c5f03d..f9a0713 100644
--- a/backend/BPA.MES.Base.Application/Services/RecipesService/Dtos/RecipeMaterialDto.cs
+++ b/backend/BPA.MES.Base.Application/Services/RecipesService/Dtos/RecipeMaterialDto.cs
@@ -24,6 +24,10 @@
/// 描述
///
public string Describe { get; set; }
+ ///
+ /// 误差
+ ///
+ public string ErrorWeight { get; set; }
}
///
/// 增加
diff --git a/backend/BPA.MES.Base.Application/Services/WorkInfoService/Dtos/WorkInfoMaterialsRecordDto.cs b/backend/BPA.MES.Base.Application/Services/WorkInfoService/Dtos/WorkInfoMaterialsRecordDto.cs
index bb40e1a..6147858 100644
--- a/backend/BPA.MES.Base.Application/Services/WorkInfoService/Dtos/WorkInfoMaterialsRecordDto.cs
+++ b/backend/BPA.MES.Base.Application/Services/WorkInfoService/Dtos/WorkInfoMaterialsRecordDto.cs
@@ -44,6 +44,10 @@
/// 更新时间
///
public DateTime? UpdateTime { get; set; }
+ ///
+ /// 误差重量
+ ///
+ public string ErrorWeight { get; set; }
}
///
/// 增加
diff --git a/backend/BPA.MES.Base.Application/Services/WorkInfoService/Services/WorkInfoService.cs b/backend/BPA.MES.Base.Application/Services/WorkInfoService/Services/WorkInfoService.cs
index 1647e59..41ad962 100644
--- a/backend/BPA.MES.Base.Application/Services/WorkInfoService/Services/WorkInfoService.cs
+++ b/backend/BPA.MES.Base.Application/Services/WorkInfoService/Services/WorkInfoService.cs
@@ -254,7 +254,8 @@ namespace BPA.MES.Base.Application.Services.WorkInfoService.Services
WorkId = input.WorkId,
Weight = a.Weight,
RecipeId = a.RecipesId,
- RecipeName = c.Name
+ RecipeName = c.Name,
+ ErrorWeight = a.ErrorWeight,
})
.ToListAsync();
@@ -293,6 +294,7 @@ namespace BPA.MES.Base.Application.Services.WorkInfoService.Services
Weight = item.Weight,
RecipeId = item.RecipeId,
RecipeName = item.RecipeName,
+ ErrorWeight = item.ErrorWeight
};
newmateriallist.Add(itementity);
}