读取箱体数量

shangjian/XGL.Data/DBService/FormingMachineService.cs

@@ -1705,6 +1705,17 @@ where machine_code = 'X1' and bind_status = '0' order by update_time DESC";
             }
             return "";
         }
+
+        public DataTable GetWcsPlcPointBoxCount(string pointNo)
+        {
+            string sql = $"SELECT * FROM wcs_plc_point WHERE plc_point_no ='{pointNo}' and equip='BoxCount'";
+            DataSet ds = Utils.netClientDBHelper.getDataSet(sql);
+            if (ds != null && ds.Tables.Count > 0 && ds.Tables[0].Rows.Count > 0)
+            {
+                return ds.Tables[0];
+            }
+            return null;
+        }
     }
     public class MesTableSelfDetialModel
     {

shangjian/XGL/App.config

@@ -10,7 +10,7 @@
 		<!--车间编码-->
 		<add key="SiteCode" value="999" />
 		<!--设备编码-->
-		<add key="DeviceCode" value="C4" />
+		<add key="DeviceCode" value="C3" />
 		<!--上位机类型 0:工单准备，1：成型机\shoupei，2：烘房,3:人员登录-->
 		<add key="ClientMode" value="1" />
 		<add key="SerialPort" value="COM5" />

shangjian/XGLFinishPro/App.config

@@ -10,7 +10,7 @@
 		<!--车间编码-->
 		<add key="SiteCode" value="1000" />
 		<!--设备编码-->
-		<add key="DeviceCode" value="XL02" />
+		<add key="DeviceCode" value="XL03" />
 		<!--上位机类型 0:工单准备，1：成型机\shoupei，2：烘房,3:人员登录,4:称重系统-->
 		<add key="ClientMode" value="1" />
 

shangjian/XGLFinishPro/Views/ExecReportWorkWin.xaml

@@ -369,8 +369,7 @@
                         Margin="20,0"
                         Click="ReadOrder_Click"
                         Content="获取"
-                        Style="{StaticResource btnKey}"
-                        Visibility="Collapsed" />
+                        Style="{StaticResource btnKey}" />
                 </StackPanel>
                 <StackPanel
                     Grid.Row="2"

shangjian/XGLFinishPro/Views/ExecReportWorkWin.xaml.cs

@@ -1035,29 +1035,49 @@ namespace XGLFinishPro.Views
         {
 
         }
-
+        private bool IsReading = false;
         private void ReadOrder_Click(object sender, RoutedEventArgs e)
         {
-            int count = 0;
-            bool isSuccess = false;
-            while (count++ < 3)
+            try
             {
-                try
+                if (IsReading)
                 {
-                    LanJu_Operator.plc.Connection(LanJu_Operator.PlcIp);
-                    int number = int.Parse(_deviceCode.Substring(2));
-                    isSuccess = true;
-                    break;
+                    return;
                 }
-                catch
+                IsReading = true;
+                LanJu_Operator.plc.Connection(LanJu_Operator.PlcIp);
+                int number = int.Parse(_deviceCode.Substring(2));
+                DataTable dataTable = formingMachineService.GetWcsPlcPointBoxCount("BoxCount" + number);
+                if (dataTable != null && dataTable.Rows.Count > 0)
                 {
-                    LanJu_Operator.plc = new PlcHelper();
+                    string address = dataTable.Rows[0]["plc_point_address"].ToString();
+                    var boxCount = LanJu_Operator.plc.Read(new CentralControl.BaseData.PlcSetting
+                    {
+                        PlcAddress = address,
+                        PlcDataType = 1,
+                        PlcValueLength = "2"
+                    });
+                    if (boxCount != null && int.TryParse(boxCount.ToString(), out int count))
+                    {
+                        txtQuantity.Text = boxCount.ToString();
+                    }
+                    else
+                    {
+                        CustomMessageBox.Show("读取失败！", CustomMessageBoxButton.OK, CustomMessageBoxIcon.Warning);
+                    }
+                }
+                else
+                {
+                    CustomMessageBox.Show("获取点位信息失败！", CustomMessageBoxButton.OK, CustomMessageBoxIcon.Warning);
                 }
             }
-            if (!isSuccess)
+            catch
             {
-                CustomMessageBox.Show("读取失败！", CustomMessageBoxButton.OK, CustomMessageBoxIcon.Warning);
-                return;
+                CustomMessageBox.Show("Plc连接失败！", CustomMessageBoxButton.OK, CustomMessageBoxIcon.Warning);
+            }
+            finally
+            {
+                IsReading = false;
             }
         }
     }

shangjian/XGLFinishPro/Views/LanJu_Operator.xaml.cs

@@ -2,11 +2,14 @@
 using CommonFunc;
 using CommonFunc.Tools;
 using HandyControl.Tools.Extension;
+using LiveCharts.Charts;
+using Microsoft.SqlServer.Server;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Net.Http;
+using System.Net.Sockets;
 using System.Text;
 using System.Threading.Tasks;
 using System.Timers;
@@ -30,7 +33,7 @@ namespace XGLFinishPro.Views
     /// </summary>
     public partial class LanJu_Operator : UserControl
     {
-        public static string PlcIp= "172.18.15.20";
+        public static string PlcIp = "172.18.15.20";
         public static bool isSuccess = false;
         public static bool IsWrite = false;
         public static PlcHelper plc = new PlcHelper();
@@ -789,7 +792,7 @@ namespace XGLFinishPro.Views
             }
             else if (type == 1)
             {
-                if (!formingMachineService.UpdateProWorkBatchInWorkBatchCode(lineCode, batchCode, status,productCode,productName))
+                if (!formingMachineService.UpdateProWorkBatchInWorkBatchCode(lineCode, batchCode, status, productCode, productName))
                 {
                     CustomMessageBox.Show("更新打印机表状态失败！", CustomMessageBoxButton.OK, CustomMessageBoxIcon.Warning);
                     return false;
@@ -1211,9 +1214,10 @@ namespace XGLFinishPro.Views
                                             {
                                                 if (row["plc_point_no"].ToString() == height)
                                                 {
-                                                    plc.Write(new PlcSetting() { 
-                                                       PlcAddress= row["plc_point_address"].ToString() ,
-                                                       PlcValueLength="2"
+                                                    plc.Write(new PlcSetting()
+                                                    {
+                                                        PlcAddress = row["plc_point_address"].ToString(),
+                                                        PlcValueLength = "2"
                                                     }, h);
                                                 }
                                                 else if (row["plc_point_no"].ToString() == width1)