1

czw

2025-06-20 a72fe8b0ad01c6586293340115655c080d005853

 HH.WCS.QingXiNongfu/process/DeviceProcess.cs

@@ -178,6 +178,7 @@
                    {
                        if (od.SQL_Total >= v[0])
                        {
                            LogHelper.Info(plc.deviceName + $"已累计信号量{od.SQL_Total} 待领料数{od.OutNum}--开始转换（信号量>{(od.SQL_Total - v[0])} 领料数>{od.OutNum + v[1]}");
                            od.SQL_Total -= v[0];
                            od.OutNum += v[1];
                            WCSHelper.Do(db =>
@@ -285,6 +286,7 @@
                        if (!string.IsNullOrEmpty(od.S_ROW))
                            list.Add(od.S_ROW);
                        ma = string.Join(",", list);

                        List<LocCntrRel> lcrl = new List<LocCntrRel>
                        {
                            new LocCntrRel
@@ -299,6 +301,10 @@
                        {
                            db.Insertable(lirl).ExecuteCommand();
                            db.Insertable(lcrl).ExecuteCommand();
                            db.Insertable(new Container
                            {
                                S_CNTR_CODE = lirl.FirstOrDefault().S_CNTR_CODE,
                            }).ExecuteCommand();
                            db.Updateable(_cl).UpdateColumns(x => new { x.N_CURRENT_NUM }).ExecuteCommand();
                        });
                        goto ballll;
@@ -321,7 +327,7 @@
                    si = "0";

                }
                else if (data.Contains("11") && (ods.Find(x => x.SQL_PLineNo.Contains("纸箱")) != null||plc.deviceName.Contains("T1")))
                else if (data.Contains("11"))// && (ods.Find(x => x.SQL_PLineNo.Contains("纸箱")) != null || plc.deviceName.Contains("T1"))
                {
                    //if (!ods.Any())
                    //    return;
@@ -340,6 +346,8 @@
                            return db.Updateable(_cl).UpdateColumns(x => new { x.N_CURRENT_NUM }).ExecuteCommand() > 0;
                        });
                    }
                    if (!plc.deviceName.Contains("T1"))
                        goto ballll;
                    else if (!plc.deviceName.Contains("水线标签"))
                    {
                        LogHelper.Info(_cl.S_LOC_CODE + $"货位 找起点");
@@ -1809,9 +1817,18 @@
            }
            if (add)
            {
                LogHelper.Info($@"{plc.deviceName}新到位信号。 执行YWL工单信号量增加1");
                var ods = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_State == "执行中" && x.WorkType == 6 && x.SQL_LinkLineNO == plc.deviceName);//.FirstOrDefault();
                if (ods.Any())
                {
                    LogHelper.Info($@"{plc.deviceName}新到位信号，找到工单{JsonConvert.SerializeObject(ods.Select(x => new
                    {
                        x.SQL_PLineNo,
                        x.SQL_LinkLineNO,
                        x.SQL_Total,
                        x.OutNum
                    }))}");

                    foreach (var od in ods)
                    {
                        od.SQL_Total += 1;