展示设备名称

shangjian/XGL.Data/DBService/DBService.cs

@@ -671,6 +671,68 @@ where 1=1 and
             return null;
         }
 
+
+        public List<BaseEquipment> GeteqmentInfo()
+        {
+            List<BaseEquipment> baseeqlist = new List<BaseEquipment>();
+            string sql = $@"SELECT * FROM base_equipment WHERE 1=1";
+            DataSet dtset = Utils.netClientDBHelper.getDataSet(sql);
+            if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0)
+            {
+
+                var dt = dtset.Tables[0]; // 请注意，这只是一个示例，您可以循环遍历所有行
+                foreach (DataRow row in dt.Rows)
+                {
+                        BaseEquipment equipment = new BaseEquipment
+                        {
+                            EquipmentId = row[0] != DBNull.Value ? Convert.ToInt32(row[0]) : 0,
+                            EquipmentCode = row[1] != DBNull.Value ? row[1].ToString() : string.Empty,
+                            EquipmentName = row[2] != DBNull.Value ? row[2].ToString() : string.Empty,
+                            EquipmentBrand = row[3] != DBNull.Value ? row[3].ToString() : string.Empty,
+                            EquipmentSpec = row[4] != DBNull.Value ? row[4].ToString() : string.Empty,
+                            EquipmentTypeId = row[5] != DBNull.Value ? Convert.ToInt64(row[5]) : 0,
+                            EquipmentTypeCode = row[6] != DBNull.Value ? row[6].ToString() : string.Empty,
+                            EquipmentTypeName = row[7] != DBNull.Value ? row[7].ToString() : string.Empty,
+                            WorkshopId = row[8] != DBNull.Value ? Convert.ToInt64(row[8]) : 0,
+                            WorkshopCode = row[9] != DBNull.Value ? row[9].ToString() : string.Empty,
+                            WorkshopName = row[10] != DBNull.Value ? row[10].ToString() : string.Empty,
+                            Status = row[11] != DBNull.Value ? row[11].ToString() : string.Empty,
+                            Remark = row[12] != DBNull.Value ? row[12].ToString() : string.Empty,
+                            Attr1 = row[13] != DBNull.Value ? row[13].ToString() : string.Empty,
+                            Attr2 = row[14] != DBNull.Value ? row[14].ToString() : string.Empty,
+                            Attr3 = row[15] != DBNull.Value ? row[15].ToString() : string.Empty,
+                            Attr4 = row[16] != DBNull.Value ? row[16].ToString() : string.Empty,
+                          //  CreateTime = row[17] != DBNull.Value ? Convert.ToDateTime(row[17]) : DateTime.MinValue,
+                            CreateBy = row[18] != DBNull.Value ? row[18].ToString() : string.Empty,
+                          //  UpdateTime = row[19] != DBNull.Value ? Convert.ToDateTime(row[19]) : DateTime.MinValue,
+                            UpdateBy = row[20] != DBNull.Value ? row[20].ToString() : string.Empty,
+                            WorkshopSection = row[21] != DBNull.Value ? row[21].ToString() : string.Empty,
+                            EquipmentLocation = row[22] != DBNull.Value ? row[22].ToString() : string.Empty,
+                            //HourlyUnitPrice = row["hourly_unit_price"] != DBNull.Value ? Convert.ToDecimal(row["hourly_unit_price"]) : 0m,
+                            //EquipmentBarcode = row["equipment_barcode"] != DBNull.Value ? row["equipment_barcode"].ToString() : string.Empty,
+                            //EquipmentBarcodeImage = row["equipment_barcode_image"] != DBNull.Value ? row["equipment_barcode_image"].ToString() : string.Empty,
+                            //Manufacturer = row["manufacturer"] != DBNull.Value ? row["manufacturer"].ToString() : string.Empty,
+                            //Supplier = row["supplier"] != DBNull.Value ? row["supplier"].ToString() : string.Empty,
+                            //UseLife = row["use_life"] != DBNull.Value ? Convert.ToInt32(row["use_life"]) : 0,
+                            //BuyTime = row["buy_time"] != DBNull.Value ? Convert.ToDateTime(row["buy_time"]) : DateTime.MinValue,
+                            //AssetOriginalValue = row["asset_original_value"] != DBNull.Value ? Convert.ToDecimal(row["asset_original_value"]) : 0m,
+                            //NetAssetValue = row["net_asset_value"] != DBNull.Value ? Convert.ToDecimal(row["net_asset_value"]) : 0m,
+                            //AssetHead = row["asset_head"] != DBNull.Value ? row["asset_head"].ToString() : string.Empty,
+                            //FixedAssetCode = row["fixed_asset_code"] != DBNull.Value ? row["fixed_asset_code"].ToString() : string.Empty,
+                            //Department = row["department"] != DBNull.Value ? row["department"].ToString() : string.Empty,
+                            //UnitWorkingHours = row["unit_working_hours"] != DBNull.Value ? Convert.ToInt32(row["unit_working_hours"]) : 0,
+                            //PlcIp = row["plc_ip"] != DBNull.Value ? row["plc_ip"].ToString() : string.Empty,
+                            //PlcPort = row["plc_port"] != DBNull.Value ? Convert.ToInt32(row["plc_port"]) : 0,
+                            //DelFlag = row["del_flag"] != DBNull.Value ? row["del_flag"].ToString() == "1" : false,
+                            //SapAsset = row["sap_asset"] != DBNull.Value ? row["sap_asset"].ToString() : string.Empty,
+                            //EquipmentHead = row["equipment_head"] != DBNull.Value ? row["equipment_head"].ToString() : string.Empty
+                        };
+                        baseeqlist.Add(equipment);
+                }
+               
+            }
+            return baseeqlist;
+        }
         /// <summary>
         /// 查询工艺
         /// </summary>

shangjian/XGL.Model/Model/BaseEquipment.cs

@@ -0,0 +1,51 @@
+using System;
+namespace CentralControl.BaseData
+{
+
+    public class BaseEquipment
+    {
+        public int EquipmentId { get; set; }
+        public string EquipmentCode { get; set; }
+        public string EquipmentName { get; set; }
+        public string EquipmentBrand { get; set; }
+        public string EquipmentSpec { get; set; }
+        public long EquipmentTypeId { get; set; }
+        public string EquipmentTypeCode { get; set; }
+        public string EquipmentTypeName { get; set; }
+        public long WorkshopId { get; set; }
+        public string WorkshopCode { get; set; }
+        public string WorkshopName { get; set; }
+        public string Status { get; set; }
+        public string Remark { get; set; }
+        public string Attr1 { get; set; }
+        public string Attr2 { get; set; }
+        public string Attr3 { get; set; }
+        public string Attr4 { get; set; }
+        public DateTime CreateTime { get; set; }
+        public string CreateBy { get; set; }
+        public DateTime UpdateTime { get; set; }
+        public string UpdateBy { get; set; }
+        public string WorkshopSection { get; set; }
+        public string EquipmentLocation { get; set; }
+        public decimal HourlyUnitPrice { get; set; }
+        public string EquipmentBarcode { get; set; }
+        public string EquipmentBarcodeImage { get; set; }
+        public string Manufacturer { get; set; }
+        public string Supplier { get; set; }
+        public int UseLife { get; set; }
+        public DateTime BuyTime { get; set; }
+        public decimal AssetOriginalValue { get; set; }
+        public decimal NetAssetValue { get; set; }
+        public string AssetHead { get; set; }
+        public string FixedAssetCode { get; set; }
+        public string Department { get; set; }
+        public int UnitWorkingHours { get; set; }
+        public string PlcIp { get; set; }
+        public int PlcPort { get; set; }
+        public bool DelFlag { get; set; }
+        public string SapAsset { get; set; }
+        public string EquipmentHead { get; set; }
+    }
+
+}
+

shangjian/XGL.Model/XGL.Models.csproj

@@ -94,6 +94,7 @@
     <Compile Include="data_carmaterialModel.cs" />
     <Compile Include="data_carproductModel.cs" />
     <Compile Include="filedatasModel.cs" />
+    <Compile Include="Model\BaseEquipment.cs" />
     <Compile Include="Model\CarRealInfo.cs" />
     <Compile Include="Model\CarMaterial.cs" />
     <Compile Include="Model\CarProduct.cs" />

shangjian/XGL.Model/obj/Debug/XGL.Models.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-e875e48168eeec01a6513a832f5824108995a472
+844c0ef1f2f89696d27a3bdb6fa05c91340e7be4

shangjian/XGL/Views/LanJu_Prepare.xaml

@@ -341,8 +341,25 @@
                                 Width="*"
                                 Binding="{Binding BatchCode}"
                                 Header="生产批次" />-->
-                           
+                        <DataGridTextColumn
-                            <DataGridTextColumn Visibility="Hidden"
+                                Width="80"
+                                Binding="{Binding status,Converter={StaticResource MyConverter}}"
+                                Header="工单状态" />
+                        <DataGridTextColumn
+                                Width="80"
+                                Binding="{Binding sync_flag,Converter={StaticResource SyncFlagConverter}}"
+                                Header="同步状态" >
+                            <DataGridTextColumn.ElementStyle>
+                                <Style TargetType="TextBlock">
+                                    <Setter Property="Foreground" Value="{Binding sync_flag, Converter={StaticResource SyncFlagColorConvert}}" />
+                                </Style>
+                            </DataGridTextColumn.ElementStyle>
+                        </DataGridTextColumn>
+                        <DataGridTextColumn 
+                                Width="50"
+                                Binding="{Binding shift_desc}"
+                                Header="班次" />
+                        <DataGridTextColumn Visibility="Hidden"
                                 Width="150"
                                 Binding="{Binding workorder_id}"
                                 Header="订单编码" />
@@ -366,27 +383,10 @@
                                 Header="料罐编码" />
                           
                             <DataGridTextColumn
-                                Width="750"
+                                Width="1350"
                                 Binding="{Binding prod_line_code}"
                                 Header="设备" />
-                            <DataGridTextColumn
+                            
-                                Width="80"
-                                Binding="{Binding status,Converter={StaticResource MyConverter}}"
-                                Header="工单状态" />
-                            <DataGridTextColumn
-                                Width="80"
-                                Binding="{Binding sync_flag,Converter={StaticResource SyncFlagConverter}}"
-                                Header="同步状态" >
-                                <DataGridTextColumn.ElementStyle>
-                                    <Style TargetType="TextBlock">
-                                        <Setter Property="Foreground" Value="{Binding sync_flag, Converter={StaticResource SyncFlagColorConvert}}" />
-                                    </Style>
-                                </DataGridTextColumn.ElementStyle>
-                            </DataGridTextColumn>
-                        <DataGridTextColumn 
-                                Width="50"
-                                Binding="{Binding shift_desc}"
-                                Header="班次" />
                         <DataGridTextColumn
                                 Width="200"
                                 Binding="{Binding plan_time, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"

shangjian/XGL/Views/LanJu_Prepare.xaml.cs

@@ -56,11 +56,12 @@ namespace XGL.Views
             try
             {
                 List<WetMaterialModel> wetList = new List<WetMaterialModel>();
+                
                 //modelWareHouse = new List<WorkOrder>();
                 //userDbWareHouse = new DBService();
                 string date = this.dateStart.SelectedDate.ToString() == "" ? DateTime.Now.ToString() : this.dateStart.SelectedDate.ToString();
-
                 dt = userDbWareHouse.GetWetPlanInfo(date);
+                var eqment = userDbWareHouse.GeteqmentInfo();
                 if (dt == null)
                 {
                     this.WorkOrder.ItemsSource = null;
@@ -82,7 +83,7 @@ namespace XGL.Views
                     var inneconde= ExtractAndSort(i["prod_line_code"].ToString());
                     foreach (var item in inneconde)
                     {
-                        wet.prod_line_code += "[" + item+"],";
+                        wet.prod_line_code += "[" + eqment.Find(c=>c.EquipmentCode== item).EquipmentName + "],";
                     }
                     wet.status = i["status"].ToString();
                     wet.sync_flag = i["sync_flag"].ToString(); 

shangjian/XGL/obj/x86/Debug/GeneratedInternalTypeHelper.g.cs

@@ -1,2 +1,62 @@
-
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码由工具生成。
+//     运行时版本:4.0.30319.42000
+//
+//     对此文件的更改可能会导致不正确的行为，并且如果
+//     重新生成代码，这些更改将会丢失。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace XamlGeneratedNamespace {
+    
+    
+    /// <summary>
+    /// GeneratedInternalTypeHelper
+    /// </summary>
+    [System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
+    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
+    public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper {
+        
+        /// <summary>
+        /// CreateInstance
+        /// </summary>
+        protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) {
+            return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic) 
+                            | (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture);
+        }
+        
+        /// <summary>
+        /// GetPropertyValue
+        /// </summary>
+        protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) {
+            return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture);
+        }
+        
+        /// <summary>
+        /// SetPropertyValue
+        /// </summary>
+        protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) {
+            propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture);
+        }
+        
+        /// <summary>
+        /// CreateDelegate
+        /// </summary>
+        protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) {
+            return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod 
+                            | (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] {
+                        delegateType,
+                        handler}, null)));
+        }
+        
+        /// <summary>
+        /// AddEventHandler
+        /// </summary>
+        protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) {
+            eventInfo.AddEventHandler(target, handler);
+        }
+    }
+}
 

shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.lref

@@ -1,4 +1,4 @@
-E:\workspace\LanJu\client\shangjian\XGL\obj\x86\Debug\GeneratedInternalTypeHelper.g.cs
+
 
 FE:\workspace\LanJu\client\shangjian\XGL\FormItem\FormBlankingBoard.xaml;;
 FE:\workspace\LanJu\client\shangjian\XGL\FormItem\FormBoard.xaml;;