11111111

IPC-610

2025-01-15 b4083a6b047fc9e0964133c87227213c5154e37a

 Admin.NET/WCS.Application/PLC/PLCService.cs

@@ -2,6 +2,7 @@
using Dm.filter;
using DocumentFormat.OpenXml.Bibliography;
using DocumentFormat.OpenXml.Drawing.Charts;
using Elastic.Clients.Elasticsearch.Snapshot;
using Elastic.Clients.Elasticsearch.Tasks;
using Flurl.Util;
using Furion.Logging;
@@ -1800,7 +1801,7 @@
    {
        var plcConn = modDevice.PLCUtil;

        if (modDevice.DbNumber == "DB101" && modDevice.DbNumber == "DB102")
        if (modDevice.DbNumber == "DB101")//&& modDevice.DbNumber == "DB102"&& (modDevice.DbNumber == "DB102"||modDevice.PlcIdIP == "10.18.51.110")
        {
            // 主扫交互流程
            switch (modDevice.Value.ToString())
@@ -2023,8 +2024,8 @@
                                //是否结批箱 
                                if (boxInfo[0].EndLotFlag == "1" && retVal.IsSucceed) 
                                {
                                    // 触发结批 解绑分道
                                    AutoEndLot(boxInfo[0].LotNo, plcConn, "0");
                                    // 触发结批 分道变为结批中
                                    AutoEndLot(boxInfo[0].LotNo, plcConn, "2");
                                }
                            }
                            else 
@@ -2167,6 +2168,7 @@
                                    string sqlStr2 = $"delete from WCSBoxInfoLog where  IsDelete=0 and PalletNo='{palletNo}'";
                                    _db.Ado.ExecuteCommand(sqlStr2);
                                }
                                
                                // 向WMS申请巷道
                                var http = new HttpService();
                                string TaskNo = "", EndLocate = "";
@@ -2179,6 +2181,29 @@
                                }
                                else
                                {
                                    //判断是否结批中
                                    var (res, jiepi) = plcConn.GetPlcDBValue(checkTaskMedel.PosType, modDevice.DbNumber, checkTaskMedel.PosLot);
                                    if (jiepi == 2)//结批中
                                    {
                                        // 分道解绑，抓箱品种写入0
                                        var ret1 = plcConn.SetPlcDBValue(checkTaskMedel.PosTypeLot, modDevice.DbNumber, checkTaskMedel.PlcPos, "0");
                                        if (ret1.IsSucceed)
                                        {
                                            //写入流程字成功后更新分拣任务    liudl 最后一托盘申请完入库才可清空
                                            checkTaskMedel.OrderNo = "";
                                            checkTaskMedel.TaskNo = "";
                                            checkTaskMedel.LotNo = "";
                                            checkTaskMedel.SkuNo = "";
                                            checkTaskMedel.SkuName = "";
                                            checkTaskMedel.BoxType = "";
                                            checkTaskMedel.Qty = 0;
                                            checkTaskMedel.PZNo = "";
                                            checkTaskMedel.Status = "0";      // 绑定分道 0：解绑  1：绑定 

                                            //更新分拣任务
                                            _db.Updateable(checkTaskMedel).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
                                        }
                                    }
                                    // 获取入库任务信息
                                    var taskModel = _db.Queryable<WcsTask>().First(m => m.TaskNo == TaskNo && m.IsDelete == false && m.Status == TaskStatusEnum.Wait);
                                    if (taskModel != null)
@@ -2376,7 +2401,7 @@
                // 写入结批信号
                var ret = plcConn.SetPlcDBValue(item.PosTypeLot, item.DbNumber, item.PosLot, "1");
                // 分道解绑，抓箱品种写入0
                var ret1 = plcConn.SetPlcDBValue(item.PosTypeLot, item.DbNumber, item.PlcPos, "0");
                //var ret1 = plcConn.SetPlcDBValue(item.PosTypeLot, item.DbNumber, item.PlcPos, "0");
                if (ret.IsSucceed)
                {
                    //写入流程字成功后更新分拣任务    liudl 最后一托盘申请完入库才可清空
@@ -2388,7 +2413,7 @@
                    //item.BoxType = "";
                    //item.Qty = 0;
                    item.PZNo = "";
                    item.Status = status;      // 绑定分道 0：解绑  1：绑定 
                    item.Status = status;      // 绑定分道 0：解绑  1：绑定  2:结批中

                    //更新分拣任务
                    _db.Updateable(item).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();