diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs index d898745..b8c3935 100644 --- a/Properties/Resources.Designer.cs +++ b/Properties/Resources.Designer.cs @@ -357,6 +357,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties { } } + /// + /// 查找类似 ColorName 的本地化字符串。 + /// + public static string ColorName { + get { + return ResourceManager.GetString("ColorName", resourceCulture); + } + } + /// /// 查找类似 ColorNumber 的本地化字符串。 /// diff --git a/Properties/Resources.en-US.resx b/Properties/Resources.en-US.resx index 91e66ad..46eb0c6 100644 --- a/Properties/Resources.en-US.resx +++ b/Properties/Resources.en-US.resx @@ -993,4 +993,7 @@ Total + + ColorName + \ No newline at end of file diff --git a/Properties/Resources.resx b/Properties/Resources.resx index 9109a30..278c778 100644 --- a/Properties/Resources.resx +++ b/Properties/Resources.resx @@ -993,4 +993,7 @@ Total + + ColorName + \ No newline at end of file diff --git a/Properties/Resources.zh-CN.resx b/Properties/Resources.zh-CN.resx index 4353c17..1443731 100644 --- a/Properties/Resources.zh-CN.resx +++ b/Properties/Resources.zh-CN.resx @@ -993,4 +993,7 @@ 总浴量 + + 色名 + \ No newline at end of file diff --git a/Properties/Resources.zh-TW.resx b/Properties/Resources.zh-TW.resx index 7b4928b..7368945 100644 --- a/Properties/Resources.zh-TW.resx +++ b/Properties/Resources.zh-TW.resx @@ -969,6 +969,9 @@ 無效 + + 方案 + @@ -990,7 +993,7 @@ 總浴量 - - 方案 + + \ No newline at end of file diff --git a/View/ProductionPlanningView.xaml.cs b/View/ProductionPlanningView.xaml.cs index 36dff80..106cb8e 100644 --- a/View/ProductionPlanningView.xaml.cs +++ b/View/ProductionPlanningView.xaml.cs @@ -127,12 +127,13 @@ namespace SunlightCentralizedControlManagement_SCCM_.View Dyelot = Properties.Resources.Dyelot + ";" + dataRows[j].Field("Dyelot"), Remark = Properties.Resources.Remark + ";" + dataRows[j].Field("Remark"), ColorNumber = Properties.Resources.ColorNumber + ";" + dataRows[j].Field("ColorNumber"), + ColorName = Properties.Resources.ColorName + ";" + dataRows[j].Field("ColorName"), Client = Properties.Resources.Client + ";" + dataRows[j].Field("Client"), ClothSpecies = Properties.Resources.ClothSpecies + ";" + dataRows[j].Field("ClothSpecies"), - // ClothWeight = Properties.Resources.ClothWeight + ";" + dataRows[j].Field("ClothWeight"), - // BathRatio = Properties.Resources.BathRatio + ";" + dataRows[j].Field("BathRatio"), - // Total = Properties.Resources.Total + ";" + dataRows[j].Field("Total"), - // USER = Properties.Resources.USER + ";" + dataRows[j].Field("user"), + ClothWeight = Properties.Resources.ClothWeight + ";" + dataRows[j].Field("ClothWeight"), + BathRatio = Properties.Resources.BathRatio + ";" + dataRows[j].Field("BathRatio"), + Total = Properties.Resources.Total + ";" + dataRows[j].Field("Total"), + USER = Properties.Resources.USER + ";" + dataRows[j].Field("user"), TaskProgressVisibility = System.Windows.Visibility.Hidden }); }