1

pulg

8 天以前 8f0f149d607a7246fa25e81340602ce5e47398fe

1

 HH.WCS.QingXiNongfu/Program.cs

@@ -760,7 +760,7 @@
                    GetTask(Monitor.AutoRunABD),
                    GetTask(Monitor.AutoRun13TSJ),
                    GetTask(Monitor.ZdzyABArea),
                     // GetTask(Monitor.Qchc),

                    

                    //GetTask(Monitor.AutoTK_PE),//提扣 - PE膜出入库

 HH.WCS.QingXiNongfu/TableSetting.json

@@ -20,5 +20,6 @@
  "库库转运": "TN_0068",
  "领料单子表": "TN_0053",
  "原物料工单表": "TN_0066",
  "AGV设备信息": "TN_0042"
  "AGV设备信息": "TN_0042",
  "半成品区域表": "TN_0076"
}

 HH.WCS.QingXiNongfu/api/ApiHelper.cs

@@ -3,21 +3,12 @@
using HH.WCS.QingXigongchang.util;
using HH.WCS.QingXigongchang.wms;
using Newtonsoft.Json;
using NLog.Fluent;
using System;
using System.Collections.Generic;
using System.Data.SqlClient;
using System.Linq;
using System.Reflection;
using System.Reflection.Emit;
using System.Runtime.ConstrainedExecution;
using System.Security.Cryptography;
using System.Threading;
using System.Threading.Tasks;
using System.Web.Http;
using System.Web.Security;
using static HH.WCS.QingXigongchang.api.ApiModel;
using static HH.WCS.QingXigongchang.dispatch.NDC;

namespace HH.WCS.QingXigongchang.api
{
@@ -789,20 +780,20 @@
                        }
                    }
                }
                if (!string.IsNullOrEmpty(item.Trim()))
                    if (!"J,F".Contains(SQL_UsingNow) || String.IsNullOrEmpty(SQL_UsingNow))
                    {
                        if (locd.S_AREA_CODE.StartsWith("PP"))
                        {
                            SQL_UsingNow = "F";
                        }
                        else if (locd.S_AREA_CODE.Contains("JCJY"))
                        {
                            SQL_UsingNow = "J";
                        }
                        else
                            return SimpleResult.Error("指明 即产和非即产的参数 JF 没有明确" + SQL_UsingNow);
                    }
                //if (!string.IsNullOrEmpty(item.Trim()))
                //    if (!"J,F".Contains(SQL_UsingNow) || String.IsNullOrEmpty(SQL_UsingNow))
                //    {
                //        if (locd.S_AREA_CODE.StartsWith("PP"))
                //        {
                //            SQL_UsingNow = "F";
                //        }
                //        else if (locd.S_AREA_CODE.Contains("JCJY"))
                //        {
                //            SQL_UsingNow = "J";
                //        }
                //        else
                //            return SimpleResult.Error("指明 即产和非即产的参数 JF 没有明确" + SQL_UsingNow);
                //    }

                result.resultCode = 0;
                //LocationHelper.BindingLoc(loc.Trim(), "1".Split(',').ToList());
@@ -820,8 +811,6 @@
                {
                    return SimpleResult.Error(loc + " 货位 arco  a,r,c,o 指定不明");
                }

                {
                    var row = _locs.FindAll(x => x.S_AREA_CODE == locd.S_AREA_CODE && x.N_ROW == locd.N_ROW && x.S_LOCK_STATE != "无" && x.S_LOCK_STATE != "报废");
                    //var rowloc = row.Find(x => x.S_LOCK_STATE != "无");
                    if (row.Any())
@@ -890,7 +879,7 @@
                            return true;
                        });
                    }
                }

            }
        lable_end:
            return result;

 HH.WCS.QingXiNongfu/bin/Debug/TableSetting.json

@@ -20,5 +20,6 @@
  "库库转运": "TN_0068",
  "领料单子表": "TN_0053",
  "原物料工单表": "TN_0066",
  "AGV设备信息": "TN_0042"
  "AGV设备信息": "TN_0042",
  "半成品区域表": "TN_0076"
}

 HH.WCS.QingXiNongfu/bin/Debug/settings.xml

@@ -61,9 +61,10 @@
        <![CDATA[
    [
    {"address":"10.140.3.164","deviceName":"550","FuLeLineNo":"青溪成品仓QX1输送线","deviceNo":[],"location":["CX-2","CX-1"],"areaPriy":["QX-01","QX-02","QX-03","QX-04","QX-05","QX-06","QX-07","QX-08","QX-09","QX-10","QX-11","QX-12","QX-13","QX-14","QX-15","QX-16","QX-19",],"deviceType":9,"enable":1},
    {"address":"10.140.3.163","deviceName":"注塑机","deviceNo":["","666"],"location":["ZSJ1-1","ZSJ1-2"],"deviceType":8,"enable":1},
    
    {"address":"10.140.3.175","deviceName":"注塑机3","deviceNo":["","664"],"location":["ZSJ3-1","ZSJ3-2"],"deviceType":8,"enable":1},
{"address":"10.140.9.168","deviceName":"注塑机","deviceNo":["","666"],"location":["ZSJ1-1","ZSJ1-2"],"deviceType":8,"enable":1},
	
    {"address":"10.140.9.169","deviceName":"注塑机3","deviceNo":["","664"],"location":["ZSJ3-1","ZSJ3-2"],"deviceType":8,"enable":1},
    
    {"address":"10.140.3.176","deviceName":"注塑机4","deviceNo":["","666"],"location":["ZSJ4-1","ZSJ4-2"],"deviceType":8,"enable":1},
    
@@ -87,7 +88,7 @@
    {"address":"10.140.3.178","deviceName":"CX4","FuLeLineNo":"青溪成品仓QX4输送线","deviceNo":[],"location":["CX4-2","CX4-1"],"areaPriy":["QX-01","QX-02","QX-03","QX-04","QX-05","QX-06","QX-07","QX-08","QX-09","QX-10","QX-11","QX-12","QX-13","QX-14","QX-15","QX-16","QX-19",],"deviceType":9,"enable":1},
    
    
    {"address":"10.140.3.165","deviceName":"5L注塑机","deviceNo":["","665"],"location":["5LZSJ1-1","5LZSJ1-2"],"deviceType":8,"enable":1},
    {"address":"10.140.9.167","deviceName":"5L注塑机","deviceNo":["","665"],"location":["5LZSJ1-1","5LZSJ1-2"],"deviceType":8,"enable":1},
    {"address":"10.140.3.167","deviceName":"5L翻斗机","deviceNo":["","998"],"location":["5LFDJ"],"deviceType":5,"enable":1},
    
    {"address":"10.140.3.155","deviceName":"门plc2","deviceNo":["2"],"location":[],"deviceType":1,"enable":1},
@@ -127,7 +128,7 @@

    {"address":"10.140.3.187","deviceName":"瓶盖5L翻斗机","deviceNo":["","187"],"location":["SXFDJ-1"],"deviceType":10,"areaPriy":["PGMKCK"],"enable":1},
    
    {"address":"10.140.9.167","deviceName":"T2提升机","deviceNo":[""],"taskPri":50,"location":["YWLT2TSJ"],"areaPriy":["YWLT2TSJCD"],"deviceType":13,"enable":1},
    {"address":"10.140.9.163","deviceName":"T2提升机","deviceNo":[""],"taskPri":50,"location":["YWLT2TSJ"],"areaPriy":["YWLT2TSJCD"],"deviceType":13,"enable":1},
    {"address":"10.140.9.168","deviceName":"T1提升机","deviceNo":[""],"taskPri":50,"location":["YWLT1TSJ"],"areaPriy":["YWLT1TSJCD"],"deviceType":13,"enable":1},
    
    ]]]>

 HH.WCS.QingXiNongfu/core/Monitor.cs

@@ -1051,7 +1051,7 @@
                {

                    var lolist = LocationHelper.GetAreaNormalLocList(area);// LocationHelper.GetList<Location>(x => x.S_AREA_CODE == area && x.S_LOCK_STATE != "报废");
                    var lgrow = lolist.GroupBy(x => x.N_ROW).OrderBy(x => x.Key);
                    var lgrow = lolist.GroupBy(x => x.N_ROW).OrderBy(x => x.Key).ToList();
                    Dictionary<string, List<Location>> dsll = new Dictionary<string, List<Location>>();
                    foreach (var rows in lgrow)
                    {
@@ -1120,12 +1120,12 @@
                                            //查询任务数 
                                            List<string> AreaLi = new List<string>() { "YWLBQWJ", "YWLWJJB" };
                                            var db = new SqlHelper<object>().GetInstance();
                                            var list = db.Queryable<Location>().Where(a => AreaLi.Contains(a.S_AREA_CODE) && a.S_LOCK_STATE == "入库锁").ToList();
                                            if (list.Count() >= 2)
                                            {
                                                LogHelper.Info($"CreateTransport-  CreateTask Error" + $"终点库区为YWLRGDD或者YWLWJJB 则最多只能生成两个任务");
                                                continue;
                                            }
                                            //var list = db.Queryable<Location>().Where(a => AreaLi.Contains(a.S_AREA_CODE) && a.S_LOCK_STATE == "入库锁").ToList();
                                            //if (list.Count() >= 3)
                                            //{
                                            //    LogHelper.Info($"CreateTransport-  CreateTask Error" + $"终点库区为YWLRGDD或者YWLWJJB 则最多只能生成两个任务");
                                            //    continue;
                                            //}
                                        }
                                        string Last = string.Join(",", ccr.Skip(1));

@@ -1211,14 +1211,14 @@
                                                    var lstCanOutLSta = dbll.Queryable<Location>().InnerJoin<LocCntrRel>((o, p) => o.S_LOC_CODE == p.S_LOC_CODE).InnerJoin<CntrItemRel>((o, p, t) => p.S_CNTR_CODE == t.S_CNTR_CODE).Where(ca1.ToExpression()).ToList();
                                                    if (lstCanOutL.Count() > 0)
                                                    {
                                                        var ProRow = lstCanOutLSta.GroupBy(e => e.N_ROW).Select(f => f.First()).ToList();
                                                        var ProRow = lstCanOutL.GroupBy(e => e.N_ROW).Select(f => f.First()).ToList();
                                                        //这些排能入的货位数
                                                        var EndMum = dbll.Queryable<Location>().Where(l => l.S_AREA_CODE == EdnRarea && l.N_CURRENT_NUM == 0 && l.S_LOCK_STATE == "无" && lstCanOutL.Select(e => e.N_ROW).ToList().Contains(l.N_ROW)).ToList();

                                                        //查询每一排最大的列 小于这些列的 不允许入
                                                        foreach (var item in ProRow)
                                                        {
                                                            var MaxCol = lstCanOutLSta.FindAll(d => d.N_ROW == item.N_ROW).OrderByDescending(f => f.N_COL).First();
                                                            var MaxCol = lstCanOutL.FindAll(d => d.N_ROW == item.N_ROW).OrderByDescending(f => f.N_COL).First();
                                                            EndMum.RemoveAll(f => f.N_ROW == item.N_ROW && f.N_COL < MaxCol.N_COL);
                                                        }
                                                        if (EndMum.Count() > 0)
@@ -1452,7 +1452,7 @@
                    }
                }
                var locsFirst = locsFirstA.FindAll(x => x.S_NOTE.Contains("标签-") && x.S_TYPE == WJ_BQ.RK_BBHJQ);
                var SblocsFirst = locsFirstA.FindAll(x => x.S_NOTE.Contains("标签-") && x.S_NOTE.Contains("水") && x.S_TYPE == WJ_BQ.RK_BBHJQ);
                var SblocsFirst = locsFirstA.FindAll(x => x.S_NOTE.Contains("标签-") && x.S_NOTE.Contains("水") && !x.S_NOTE.Contains("饮料") && x.S_TYPE == SX_BQ.RK_BBHJQ);
                var SlocsFirst = locsFirstA.FindAll(x => x.S_NOTE.Contains("标签-") && x.S_TYPE == SX_BQ.RK_BBHJQ);
                var TKlocsFirst = locsFirstA.FindAll(x => x.S_NOTE.Contains("提扣-"));
                var PElocsFirst = locsFirstA.FindAll(x => x.S_NOTE.Contains("收缩膜-"));
@@ -1464,8 +1464,8 @@
                //}

                var TASKs = new List<Task>();
                var task1 = Task.Run(() =>
                {
                //var task1 = Task.Run(() =>
                //{
                    try
                    {
                        // var yuworders = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == "无菌标签出库" && x.WorkType == 6 && x.SQL_State == "执行中").FindAll(x => x.OutNum > 0 && DateTime.Now.Subtract(x.SQL_Modify_TIme ?? DateTime.Now).TotalSeconds > 10).OrderBy(x => x.TagOverTime).ToList();
@@ -1488,7 +1488,7 @@
                    {
                        LogHelper.Error(ex.Message, ex);
                    }
                });
                //});

                var task11 = Task.Run(() =>
                {
@@ -1527,11 +1527,11 @@

                        var tklist = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == pline && x.WorkType == 1 && x.SQL_State == "执行中");

                        if (LocLock(SX_BQ.RK_BBHJQ))
                        {
                            //水线标签入库
                            YwlBQ_CreInwork(SblocsFirst, SX_BQ.RK_BQDDQ, SX_BQ.RK_BBHJQ);
                        }
                        //if (LocLock(SX_BQ.RK_BBHJQ))
                        //{
                        //    //水线标签入库
                        //    YwlBQ_CreInwork(SblocsFirst, SX_BQ.RK_BQDDQ, SX_BQ.RK_BBHJQ);
                        //}
                        if (tklist.Count() > 0)
                        {
                            var tk = tklist.FirstOrDefault();
@@ -1569,28 +1569,35 @@
                        LogHelper.Error(ex.Message, ex);
                    }
                });
                var task3 = Task.Run(() =>
                {
                //var task3 = Task.Run(() =>
                //{
                    try
                    {
                        //return;
                    if (LocLock("YWLTKMKQ"))
                    {
                        YwlPETKtkOrder("YWLZSXBKQ", "YWLTKMKQ", "提扣叉运");//提扣 中水 退库。
                    }
                        YwlPETKOutOrder("YWLTKMKQ", "YWLZSXBKQ", "提扣叉运", 1);//提扣中水出库

                        YwlPEZsOutOrder("YWLTKMKQ", "YWLZSXBKQ", "中水膜叉运", 1);//中水出库
                    }
                    catch (Exception ex)
                    {
                        LogHelper.Error(ex.Message, ex);
                    }
                });
                var task4 = Task.Run(() =>
                {
                //});
                //var task4 = Task.Run(() =>
                //{
                    try
                    {
                        //return;
                        ///起点数据。  终点库区 堆叠层数。
                    if (LocLock("YWLTKMKQ"))
                    {
                        YwlPETK_CreInwork(PElocsFirst, "YWLTKMKQ", "收缩膜叉运", 2);//PE膜
                        YwlPETK_CreInwork(TKlocsFirst, "YWLTKMKQ", "提扣叉运", 1); //提扣
                    }
                                                                               //YwlPETKtkOrder("YWLZSXBKQ", "YWLTKMKQ", "收缩膜叉运");
                                                                               //YwlPETKOutOrder("YWLTKMKQ", "YWLZSXBKQ", "收缩膜叉运");// PE中出库

@@ -1797,15 +1804,15 @@
                                        {
                                            var re = TaskProcess.CreateTransport("", tagLoc.S_LOC_CODE.Trim(), loc.S_LOC_CODE, "收缩膜叉运-货架出提升机", new List<string> { tagLoc.S_CNTR_CODE }, StartBit.N_CURRENT_NUM, 1, 1, 62);
                                            LogHelper.CSucessLog($"from {tagLoc.S_LOC_CODE} to {loc.S_LOC_CODE} 收缩膜叉运-货架出提升机 ，创建{re} ");
                                            //if (re)
                                            //{
                                            //    oto.Add(oic);
                                        if (re)
                                        {
                                            oto.Add(oic);
                                            //    if (outlock == null)
                                            //    {
                                            //        var r = new RowLock { S_LOCK_SRC = (StartBit.S_NOTE /*+ StartBit.HalfOrFull*/), T_LOCK_TIME = DateTime.Now, S_LOCK_STATE = "出库锁", S_AREA_CODE = StartBit.S_AREA_CODE, N_ROW = StartBit.N_ROW };
                                            //        db.Insertable(r).ExecuteCommand();
                                            //    }
                                            //}
                                        }
                                        }
                                    }
                                }
@@ -1833,7 +1840,7 @@
                    {
                        LogHelper.Error(ex.Message, ex);
                    }
                });
                // });
                // Task.WaitAll(task1, task2, task3, task4);
                LogHelper.CoCo(DateTime.Now + "标签-提扣-PE膜- Over=============== ", ConsoleColor.Cyan);
            }
@@ -1875,16 +1882,24 @@
                            {
                                continue;
                            }

                            var ca = Expressionable.Create<Location, LocCntrRel, CntrItemRel>();
                            ca.And((o, p, t) => o.N_CURRENT_NUM > 0 && o.S_LOCK_STATE == "无" && t.S_ITEM_CODE == cir.S_ITEM_CODE && t.S_ITEM_NAME == cir.S_ITEM_NAME && t.S_CJ_NAME == cir.S_CJ_NAME && o.S_AREA_CODE == v2);
                            var lstCanOutL = db.Queryable<Location>().InnerJoin<LocCntrRel>((o, p) => o.S_LOC_CODE == p.S_LOC_CODE).InnerJoin<CntrItemRel>((o, p, t) => p.S_CNTR_CODE == t.S_CNTR_CODE).Where(ca.ToExpression()).ToList();

                            Location EndBit = null;
                            var NormalList = LocationHelper.GetAreaNormalLocList(v2);
                            NormalList = NormalList.FindAll(e => lstCanOutL.Select(c => c.N_ROW).ToList().Contains(e.N_ROW));
                            if (lstCanOutL.Any())
                            {
                                var NormalListt = NormalList.FindAll(e => lstCanOutL.Select(c => c.N_ROW).ToList().Contains(e.N_ROW));
                                var lastfull = NormalListt.FindAll(x => x.N_CURRENT_NUM > 0).ToList();
                                if (lastfull.Count() > 0)
                                {
                                    NormalList = NormalListt;
                                }
                            }

                            //有入库锁排。 能入就入。不能就等。
                            if (NormalList.Count() > 0)
                            if (NormalList.Count() > 0 && lstCanOutL.Any())
                            {
                                var loclist1 = NormalList.ToList();
                                foreach (var rs in loclist1.GroupBy(x => x.N_ROW).OrderBy(x => x.Key * -1))
@@ -1911,11 +1926,9 @@
                                LogHelper.CSucessLog($"from {lastfull1.S_LOC_CODE} to {EndBit.S_LOC_CODE} {v3}-退库 ，创建{res} ");

                            }

                        }
                    }
                }

                //执行退库。。。 
                Console.WriteLine($"{v.FirstOrDefault()?.S_LOC_CODE} 需要退库-- 自动退库-未实现");
            }
@@ -2122,39 +2135,61 @@
                        {
                            NormalList2 = NormalList2.FindAll(e => e.N_ROW == 2).ToList();
                        }
                        if (EndBit == null && NormalList2.Count() > 0)
                        {
                            var NormalList3 = NormalList2.FindAll(e => e.N_CURRENT_NUM == 0).ToList();

                            var ManLoc = NormalList2.FindAll(e => e.N_CURRENT_NUM > 0).ToList();
                            if (ManLoc.Count() > 0)
                            {
                                var MaxCol = ManLoc.OrderByDescending(e => e.N_COL).ToList().FirstOrDefault();
                                LogHelper.Info($"提扣出库 获取最大列 {MaxCol.N_COL} ");
                                NormalList3 = NormalList3.FindAll(e => e.N_COL > MaxCol.N_COL).ToList();
                                var srloclist = NormalList3.OrderBy(x => x.N_COL).FirstOrDefault();
                                EndBit = srloclist;
                            }
                            else
                            {
                                var srloclist = NormalList2.OrderBy(x => x.N_COL).FirstOrDefault();
                                EndBit = srloclist;
                            }
                        }
                        //if (inlock != null)
                        //{
                        //    var loclist1 = NormalList.FindAll(x => inlock.N_ROW == (x.N_ROW));
                        foreach (var rs in NormalList2.GroupBy(x => x.N_ROW).OrderBy(x => x.Key))
                        {
                            var srloclist = rs.OrderBy(x => x.N_COL).ToList();
                            var lastfull = srloclist.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
                            if (lastfull != null)
                            {
                                var CNTR = LocationHelper.GetList<LocCntrRel>(x => x.S_LOC_CODE == lastfull.S_LOC_CODE);
                                if (!CNTR.Any()) continue;
                                if (CNTR.Find(x => x.S_TYPE == BQ_PRA.B) != null) continue;
                                var cirs = ContainerHelper.GetCntrItemRel(CNTR.FirstOrDefault().S_CNTR_CODE);
                                if (!cirs.Any()) continue;
                                var cir2 = cirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
                                if (cir2.S_ITEM_CODE != od.SQL_ItemCode || cir2.S_ITEM_NAME != od.SQL_ItemName || StartBit.HalfOrFull != (cir.N_BQ_TRAY_TYPE == .5 ? 1 : (cir.N_BQ_TRAY_TYPE == .75 ? 2 : 3)))
                                    continue;
                                EndBit = srloclist.Find(x => x.S_LOCK_STATE == "无" && x.N_CURRENT_NUM < Math.Min(x.N_CAPACITY, v3) && x.S_LOCK_STATE != "报废" && x.N_COL >= (lastfull?.N_COL ?? 0));
                            }
                            if (EndBit != null)
                                break;
                        }

                        //foreach (var rs in NormalList2.GroupBy(x => x.N_ROW).OrderBy(x => x.Key))
                        //{
                        //    var srloclist = rs.OrderBy(x => x.N_COL).ToList();
                        //    var lastfull = srloclist.FindAll(x => x.N_CURRENT_NUM == 0).LastOrDefault();
                        //    if (lastfull != null)
                        //    {
                        //        var CNTR = LocationHelper.GetList<LocCntrRel>(x => x.S_LOC_CODE == lastfull.S_LOC_CODE);
                        //        if (!CNTR.Any()) continue;
                        //        if (CNTR.Find(x => x.S_TYPE == BQ_PRA.B) != null) continue;
                        //        var cirs = ContainerHelper.GetCntrItemRel(CNTR.FirstOrDefault().S_CNTR_CODE);
                        //        if (!cirs.Any()) continue;
                        //        var cir2 = cirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
                        //        //  if (cir2.S_ITEM_CODE != od.SQL_ItemCode || cir2.S_ITEM_NAME != od.SQL_ItemName || StartBit.HalfOrFull != (cir.N_BQ_TRAY_TYPE == .5 ? 1 : (cir.N_BQ_TRAY_TYPE == .75 ? 2 : 3)))
                        //        //if (cir2.S_ITEM_CODE != od.SQL_ItemCode || cir2.S_ITEM_NAME != od.SQL_ItemName)
                        //        //    continue;
                        //        EndBit = srloclist.Find(x => x.S_LOCK_STATE == "无" && x.N_CURRENT_NUM < Math.Min(x.N_CAPACITY, v3) && x.S_LOCK_STATE != "报废" && x.N_COL >= (lastfull?.N_COL ?? 0));
                        //}
                        //else
                        if (EndBit == null)
                        {
                            var hasNum = NormalList2.FindAll(x => x.N_CURRENT_NUM > 0).Select(x => x.N_ROW).Distinct();
                            var EptRowlist = NormalList2.FindAll(x => !hasNum.Contains(x.N_ROW));
                            if (EptRowlist.Any())
                            {
                                EndBit = EptRowlist.GroupBy(x => x.N_ROW).OrderBy(x => x.Key).FirstOrDefault().ToList().OrderBy(x => x.N_COL).FirstOrDefault();
                            }
                        }
                        //    if (EndBit != null)
                        //        break;
                        //}

                        ////}
                        ////else
                        //if (EndBit == null)
                        //{
                        //    var hasNum = NormalList2.FindAll(x => x.N_CURRENT_NUM > 0).Select(x => x.N_ROW).Distinct();
                        //    var EptRowlist = NormalList2.FindAll(x => !hasNum.Contains(x.N_ROW));
                        //    if (EptRowlist.Any())
                        //    {
                        //        EndBit = EptRowlist.GroupBy(x => x.N_ROW).OrderBy(x => x.Key).FirstOrDefault().ToList().OrderBy(x => x.N_COL).FirstOrDefault();
                        //    }
                        //}

                        //foreach (var item in sLocs.GroupBy(X => X.N_ROW).OrderBy(x => x.Key * ord))
                        //{
@@ -2292,35 +2327,53 @@
                        //if (inlock != null)
                        //{
                        //    var loclist1 = NormalList.FindAll(x => inlock.N_ROW == (x.N_ROW));

                        var srloclist = NormalList2.OrderBy(x => x.N_COL).ToList();
                        var lastfull = srloclist.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
                        if (lastfull != null)
                        if (EndBit == null && NormalList2.Count() > 0)
                        {
                            var CNTR = LocationHelper.GetList<LocCntrRel>(x => x.S_LOC_CODE == lastfull.S_LOC_CODE);
                            if (!CNTR.Any()) continue;
                            if (CNTR.Find(x => x.S_TYPE == BQ_PRA.B) != null) continue;
                            var cirs = ContainerHelper.GetCntrItemRel(CNTR.FirstOrDefault().S_CNTR_CODE);
                            if (!cirs.Any()) continue;
                            var cir2 = cirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
                            if (cir2.S_ITEM_CODE != od.SQL_ItemCode || cir2.S_ITEM_NAME != od.SQL_ItemName)
                                continue;
                            EndBit = srloclist.Find(x => x.S_LOCK_STATE == "无" && x.N_CURRENT_NUM < Math.Min(x.N_CAPACITY, v3) && x.S_LOCK_STATE != "报废" && x.N_COL >= (lastfull?.N_COL ?? 0));
                        }
                        if (EndBit != null)
                            break;
                            var NormalList3 = NormalList2.FindAll(e => e.N_CURRENT_NUM == 0).ToList();

                            var ManLoc = NormalList2.FindAll(e => e.N_CURRENT_NUM > 0).ToList();
                            if (ManLoc.Count() > 0)
                            {
                                var MaxCol = ManLoc.OrderByDescending(e => e.N_COL).ToList().FirstOrDefault();
                                LogHelper.Info($"中水出库 获取最大列 {MaxCol.N_COL} ");
                                NormalList3 = NormalList3.FindAll(e => e.N_COL > MaxCol.N_COL).ToList();
                                var srloclist = NormalList3.OrderBy(x => x.N_COL).FirstOrDefault();
                                EndBit = srloclist;
                            }
                            else
                            {
                                var srloclist = NormalList2.OrderBy(x => x.N_COL).FirstOrDefault();
                                EndBit = srloclist;
                            }
                        }
                        //var srloclist = NormalList2.OrderBy(x => x.N_COL).ToList();
                        //var lastfull = srloclist.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
                        //if (lastfull != null)
                        //{
                        //    var CNTR = LocationHelper.GetList<LocCntrRel>(x => x.S_LOC_CODE == lastfull.S_LOC_CODE);
                        //    if (!CNTR.Any()) continue;
                        //    if (CNTR.Find(x => x.S_TYPE == BQ_PRA.B) != null) continue;
                        //    var cirs = ContainerHelper.GetCntrItemRel(CNTR.FirstOrDefault().S_CNTR_CODE);
                        //    if (!cirs.Any()) continue;
                        //    var cir2 = cirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
                        //    if (cir2.S_ITEM_CODE != od.SQL_ItemCode || cir2.S_ITEM_NAME != od.SQL_ItemName)
                        //        continue;
                        //    EndBit = srloclist.Find(x => x.S_LOCK_STATE == "无" && x.N_CURRENT_NUM < Math.Min(x.N_CAPACITY, v3) && x.S_LOCK_STATE != "报废" && x.N_COL >= (lastfull?.N_COL ?? 0));
                        //}
                        //else
                        if (EndBit == null)
                        {
                            var hasNum = NormalList2.FindAll(x => x.N_CURRENT_NUM > 0).Select(x => x.N_ROW).Distinct();
                            var EptRowlist = NormalList2.FindAll(x => !hasNum.Contains(x.N_ROW));
                            if (EptRowlist.Any())
                            {
                                EndBit = EptRowlist.GroupBy(x => x.N_ROW).OrderBy(x => x.Key).FirstOrDefault().ToList().OrderBy(x => x.N_COL).FirstOrDefault();
                            }
                        }
                        //if (EndBit != null)
                        //    break;

                        ////}
                        ////else
                        //if (EndBit == null)
                        //{
                        //    var hasNum = NormalList2.FindAll(x => x.N_CURRENT_NUM > 0).Select(x => x.N_ROW).Distinct();
                        //    var EptRowlist = NormalList2.FindAll(x => !hasNum.Contains(x.N_ROW));
                        //    if (EptRowlist.Any())
                        //    {
                        //        EndBit = EptRowlist.GroupBy(x => x.N_ROW).OrderBy(x => x.Key).FirstOrDefault().ToList().OrderBy(x => x.N_COL).FirstOrDefault();
                        //    }
                        //}

                        //foreach (var item in sLocs.GroupBy(X => X.N_ROW).OrderBy(x => x.Key * ord))
                        //{
@@ -2388,6 +2441,7 @@
        private static void YwlPETK_CreInwork(List<locCntItem> klocsFirst, string v, string v2, int v1 = 3)
        {
            bool ord = v2.Contains("提扣");
            var db = new SqlHelper<object>().GetInstance();
            foreach (var ptR in klocsFirst.GroupBy(x => x.N_ROW).OrderBy(x => x.Key))
            {
                Location EndBit = null;
@@ -2399,18 +2453,67 @@
                    var rklist = LocationHelper.GetRowLock(v);
                    var inlock = rklist.Find(x => x.S_AREA_CODE == v && x.S_LOCK_SRC == (rsfull.S_NOTE + rsfull.HalfOrFull) && x.S_LOCK_STATE.Contains("入库锁"));
                    var NormalList = LocationHelper.GetAreaNormalLocList(v);
                    //有入库锁排。 能入就入。不能就等。
                    if (inlock != null)

                    //查询是否有已经入了的排
                    var ca = Expressionable.Create<Location, LocCntrRel, CntrItemRel>();
                    ca.And((o, p, t) => o.N_CURRENT_NUM > 0 && o.S_LOCK_STATE == "无" && t.S_ITEM_CODE == rsfull.S_ITEM_CODE && t.S_ITEM_NAME == rsfull.S_ITEM_NAME && t.S_CJ_NAME == rsfull.S_CJ_NAME && o.S_AREA_CODE == v);
                    var lstCanOutL = db.Queryable<Location>().InnerJoin<LocCntrRel>((o, p) => o.S_LOC_CODE == p.S_LOC_CODE).InnerJoin<CntrItemRel>((o, p, t) => p.S_CNTR_CODE == t.S_CNTR_CODE).Where(ca.ToExpression()).ToList();

                    if (lstCanOutL.Count() > 0)
                    {
                        var loclist1 = NormalList.FindAll(x => inlock.N_ROW == (x.N_ROW));
                        foreach (var rs in loclist1.GroupBy(x => x.N_ROW).OrderBy(x => x.Key * (ord ? 1 : -1)))
                        //var ProRow = lstCanOutL.GroupBy(e => e.N_ROW).Select(f => f.First()).ToList();
                        ////这些排能入的货位数
                        //var EndMum = db.Queryable<Location>().Where(l => l.S_AREA_CODE == v && l.N_CURRENT_NUM == 0 && l.S_LOCK_STATE == "无" && ProRow.Select(e => e.N_ROW).ToList().Contains(l.N_ROW)).ToList();

                        ////查询每一排最大的列 小于这些列的 不允许入
                        //foreach (var item in ProRow)
                        //{
                        //    var MaxCol = lstCanOutL.FindAll(d => d.N_ROW == item.N_ROW).OrderByDescending(f => f.N_COL).First();
                        //    EndMum.RemoveAll(f => f.N_ROW == item.N_ROW && f.N_COL < MaxCol.N_COL);
                        //}
                        //if (EndMum.Count() > 0)
                        //{
                        //if (lstCanOutL.Count() <= EndMum.Count())
                        //{
                        //    NormalList = NormalList.FindAll(x => lstCanOutL.Select(e => e.N_ROW).ToList().Contains(x.N_ROW)).ToList();
                        //}
                        //var loclist1 = NormalList.FindAll(x => inlock.N_ROW == (x.N_ROW));
                        foreach (var rs in lstCanOutL.GroupBy(x => x.N_ROW).OrderBy(x => x.Key * (ord ? 1 : -1)))
                        {
                            var srloclist = rs.OrderBy(x => x.N_COL).ToList();
                            var lastfull = srloclist.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
                            EndBit = srloclist.Find(x => x.S_LOCK_STATE == "无" && (x.N_CURRENT_NUM + cntrlist.Count()) <= Math.Min(x.N_CAPACITY, v1) && x.S_LOCK_STATE != "报废" && x.N_COL >= (lastfull?.N_COL ?? 0));

                            var zuidad = NormalList.FindAll(e => e.N_ROW == srloclist.FirstOrDefault().N_ROW).ToList();
                            if (zuidad.Any())
                            {
                                var lastfull = zuidad.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
                                var EndBitList = zuidad.FindAll(x => x.S_LOCK_STATE == "无" && (x.N_CURRENT_NUM + cntrlist.Count()) <= Math.Min(x.N_CAPACITY, v1) && x.S_LOCK_STATE != "报废" && x.N_COL >= (lastfull?.N_COL ?? 0)).ToList();
                                if (EndBitList.Count() > 0)
                                {
                                    EndBit = EndBitList.OrderBy(e => e.N_COL).FirstOrDefault();
                            if (EndBit != null)
                                break;
                        }
                            }
                        }
                        if (EndBit == null)
                        {
                            var hasNum = NormalList.FindAll(x => x.N_CURRENT_NUM > 0).Select(x => x.N_ROW).Distinct();
                            var EptRowlist = NormalList.FindAll(x => !hasNum.Contains(x.N_ROW));
                            if (EptRowlist.Any())
                            {
                                EndBit = EptRowlist.GroupBy(x => x.N_ROW).OrderBy(x => x.Key * (ord ? 1 : -1)).FirstOrDefault().ToList().OrderBy(x => x.N_COL).FirstOrDefault();
                            }
                        }
                        //}
                        //else
                        //{
                        //    var hasNum = NormalList.FindAll(x => x.N_CURRENT_NUM > 0).Select(x => x.N_ROW).Distinct();
                        //    var EptRowlist = NormalList.FindAll(x => !hasNum.Contains(x.N_ROW));
                        //    if (EptRowlist.Any())
                        //    {
                        //        EndBit = EptRowlist.GroupBy(x => x.N_ROW).OrderBy(x => x.Key * (ord ? 1 : -1)).FirstOrDefault().ToList().OrderBy(x => x.N_COL).FirstOrDefault();
                        //    }
                        //}
                    }
                    else
                    {
@@ -2421,19 +2524,64 @@
                            EndBit = EptRowlist.GroupBy(x => x.N_ROW).OrderBy(x => x.Key * (ord ? 1 : -1)).FirstOrDefault().ToList().OrderBy(x => x.N_COL).FirstOrDefault();
                        }
                    }

                    ////有入库锁排。 能入就入。不能就等。
                    //if (inlock != null)
                    //{
                    //    var loclist1 = NormalList.FindAll(x => inlock.N_ROW == (x.N_ROW));
                    //    var Khw = loclist1.FindAll(f => f.N_CURRENT_NUM == 0).ToList();
                    //    if (Khw.Count() == 0)
                    //    {
                    //        db.Deleteable(inlock).ExecuteCommand();
                    //    }

                    //    foreach (var rs in loclist1.GroupBy(x => x.N_ROW).OrderBy(x => x.Key * (ord ? 1 : -1)))
                    //    {
                    //        var srloclist = rs.OrderBy(x => x.N_COL).ToList();
                    //        var lastfull = srloclist.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
                    //        EndBit = srloclist.Find(x => x.S_LOCK_STATE == "无" && (x.N_CURRENT_NUM + cntrlist.Count()) <= Math.Min(x.N_CAPACITY, v1) && x.S_LOCK_STATE != "报废" && x.N_COL >= (lastfull?.N_COL ?? 0));
                    //        if (EndBit != null)
                    //            break;
                    //    }
                    //}
                    //else
                    //{
                    //    var hasNum = NormalList.FindAll(x => x.N_CURRENT_NUM > 0).Select(x => x.N_ROW).Distinct();
                    //    var EptRowlist = NormalList.FindAll(x => !hasNum.Contains(x.N_ROW));
                    //    if (EptRowlist.Any())
                    //    {
                    //        EndBit = EptRowlist.GroupBy(x => x.N_ROW).OrderBy(x => x.Key * (ord ? 1 : -1)).FirstOrDefault().ToList().OrderBy(x => x.N_COL).FirstOrDefault();
                    //    }
                    //}
                    if (EndBit != null)
                    {
                        var res = TaskProcess.CreateTransport("", rsfull.S_LOC_CODE.Trim(), EndBit.S_LOC_CODE, v2 + "-入库", cntrlist.ToList(), rsfull.N_CURRENT_NUM + 1 - cntrlist.Count(), EndBit.N_CURRENT_NUM + 1, 1, 62);
                        LogHelper.CSucessLog($"from {rsfull.S_LOC_CODE} to {EndBit.S_LOC_CODE} {(v2 + "-入库")} ，创建{res} ");

                        if (res && inlock == null)
                        {
                            var r = new RowLock { S_LOCK_SRC = rsfull.S_NOTE + rsfull.HalfOrFull, T_LOCK_TIME = DateTime.Now, S_LOCK_STATE = "入库锁", S_AREA_CODE = EndBit.S_AREA_CODE, N_ROW = EndBit.N_ROW };
                            var db = new SqlHelper<object>().GetInstance();
                            db.Insertable(r).ExecuteCommand();
                        // var r = new RowLock { S_LOCK_SRC = rsfull.S_NOTE + rsfull.HalfOrFull, T_LOCK_TIME = DateTime.Now, S_LOCK_STATE = "入库锁", S_AREA_CODE = EndBit.S_AREA_CODE, N_ROW = EndBit.N_ROW };
                        //if (res && inlock == null)
                        //{
                        //    db.Insertable(r).ExecuteCommand();
                        //    //else
                        //    //{
                        //    //if (inlock?.N_ROW != EndBit.N_ROW)
                        //    //{
                        //    //    db.Deleteable(inlock).ExecuteCommand();
                        //    //    var row = db.Queryable<RowLock>().Where(x => x.S_AREA_CODE == r.S_AREA_CODE && r.N_ROW == x.N_ROW).First();
                        //    //    if (row != null)
                        //    //    {
                        //    //        if (row.S_LOCK_SRC != r.S_LOCK_SRC)
                        //    //        {
                        //    //            db.Deleteable(row).ExecuteCommand();
                        //    //            db.Insertable(r).ExecuteCommand();
                        //    //        }
                        //    //    }
                        //    //    else db.Insertable(r).ExecuteCommand();
                        //    //}
                        //    //}
                        //}
                            //else
                            //{
                            //    if (inlock.N_ROW != EndBit.N_ROW)
                        //    if (inlock?.N_ROW != EndBit.N_ROW)
                            //    {
                            //        db.Deleteable(inlock).ExecuteCommand();
                            //        var row = db.Queryable<RowLock>().Where(x => x.S_AREA_CODE == r.S_AREA_CODE && r.N_ROW == x.N_ROW).First();
@@ -2449,11 +2597,11 @@
                            //    }
                            //}
                        }
                    }
                    Thread.Sleep(1000);
                }
            }
        }



        private static void YwlBQ_CreSXOutOrder(Settings.deviceInfo plc, List<YWLWorkOrder> yuworders)
@@ -4631,7 +4779,11 @@
                                        var db = new SqlHelper<object>().GetInstance();
                                        od.TagOverTime = DateTime.Now;
                                        od.TagOver = StartBit.S_AREA_CODE;
                                        var ggf = db.Updateable(od).UpdateColumns(it => new { it.TagOverTime, it.TagOver }).ExecuteCommand();
                                        if (od.OutNum >= StartBit.N_CURRENT_NUM)
                                        {
                                            od.OutNum = od.OutNum - StartBit.N_CURRENT_NUM;
                                        }
                                        var ggf = db.Updateable(od).UpdateColumns(it => new { it.TagOverTime, it.TagOver, it.OutNum }).ExecuteCommand();
                                        LogHelper.Info($"上提升机任务 更新工单的时间影响行数: {ggf}");

                                        var r = new RowLock { S_LOCK_SRC = od.SQL_ItemCode, T_LOCK_TIME = DateTime.Now, S_LOCK_STATE = "出库锁", S_AREA_CODE = StartBit.S_AREA_CODE, N_ROW = StartBit.N_ROW };
@@ -4699,6 +4851,7 @@
                }

            }
            //  list = new List<string>() { "YWLAQWJ", "YWLBQWJ", "YWLCQSX", "YWLDQWJ" };
            foreach (var area in list.Distinct())
            {
                var AreaRowlist = LocationHelper.GetList<Location>(x => x.S_AREA_CODE == area && x.N_CURRENT_NUM > 0);

 HH.WCS.QingXiNongfu/process/DeviceProcess.cs

@@ -1757,7 +1757,7 @@

                    }
                }
                else if (data == "1121")//B口工作信号
                else if (data == "1121")//AB口工作信号
                {
                    if (BottlePEMInfoFullTwo(plc, plc.location[0]))
                    {
@@ -1998,11 +1998,11 @@
            }
        }
        private static object locko = new object();
        private static object lockoIn = new object();
        private static object lockoOut = new object();

        static bool BottlePEMInfoFullTwo(Settings.deviceInfo plc, string location)
        {


            try
            {
                lock (locko)
@@ -2010,6 +2010,8 @@
                    var chi = new SqlHelper<object>().GetInstance();
                    var newDb = chi.CopyNew();
                    Location endBit = null;
                    Location staBit = null;
                    bool SentTask = false;
                    if (location == "")
                    {
                        throw new Exception("货位为空");
@@ -2019,25 +2021,162 @@
                    {
                        throw new Exception("没有【执行中】的工单");
                    }
                    if (workOrder.SQL_UsingNow == "Y")//即产即用
                    //先查询货位有没有货  满的下满 空的则上空
                    //  = newDb.Queryable<Location>().FindAll(x => x.S_LOCK_STATE == "无" && x.N_CURRENT_NUM == 0);
                    var hojs = newDb.Queryable<Location>().Where(e => e.S_LOC_CODE == location).First();
                    if (hojs != null && hojs.S_LOCK_STATE != "无")
                    {
                        //查询 半成品区域表 BcpQyOrder

                        return false;
                    }
                    else//非即产即用
                    var bcpList = WCSHelper.BcpQyOrderList(plc.deviceName);
                    if (bcpList.Count() == 0)
                    {
                        throw new Exception("未划分对应的区域 查看这个产线是否在半成品区域表进行配置 并启用");
                    }
                    if (hojs.N_CURRENT_NUM == 0)//上托盘 否则下托盘
                    {
                        //上托盘 空框  
                        var jcjykk = bcpList.FindAll(e => e.S_CNTR_TYPE == "空托").OrderByDescending(g => g.N_PRI).ToList();
                        var AreaList = jcjykk.Select(e => e.S_AREA_CODE).Distinct().ToList();
                        foreach (var Area in AreaList)
                        {
                            var Row = jcjykk.FindAll(f => f.S_AREA_CODE == Area).Select(e => e.N_ROW).Distinct().ToList();
                            //过算法 计算起点
                            var staList = GetOutWork(Area, Row);
                            if (staList.Any())
                            {
                                foreach (var item in jcjykk)
                                {
                                    Location sta = null;
                                    var staLisL = staList.FindAll(e => e.S_AREA_CODE == item.S_AREA_CODE && e.N_ROW == item.N_ROW).ToList();
                                    if (staLisL.Any())
                                    {
                                        sta = staLisL.OrderByDescending(e => e.N_COL).First();
                                    }
                                    if (sta != null)
                                    {
                                        staBit = sta;
                                        break;
                                    }
                                }
                            }
                        }
                        if (staBit != null)
                        {
                            var _ctrl = LocationHelper.GetLocCntrRel(staBit.S_LOC_CODE);
                            int StaLayer = staBit.N_CURRENT_NUM;
                            var carryCntrs = new List<string> { _ctrl.FirstOrDefault().S_CNTR_CODE };//DateTime.Now.ToString("yyMMddHHmmss") };
                            var bb = TaskProcess.CreateTransport(workOrder.SQL_WorkNo, staBit.S_LOC_CODE, location, "注塑空拖-出库", carryCntrs, StaLayer, 1, carryCntrs.Count, plc.taskPri);
                            if (bb)
                            {
                                SentTask = true;
                            }
                        }
                        if (SentTask)
                        {
                            return SentTask;
                        }
                    }
                    else
                    {
                        var time = LocationHelper.GetT_FULL_TIME(location);
                        LogHelper.Info(location + "：托盘放置时间:(" + time + ") 货位托盘数量(" + hojs.N_CURRENT_NUM + ")");
                        if (DateTime.Now.Subtract(time ?? DateTime.Now).TotalMinutes < 1)
                        {
                            for (var i = 0; i < plc.location.Length; i++)
                            {
                                if (location == plc.location[i])
                                {
                                    PlcHelper.SendHex(plc.address, "3F00" + (i + 1) + "0" + "0d0a");
                                    break;
                                }
                            }
                            return false;
                        }

                        LocCntrRel _clrel = LocationHelper.GetLocCntrRel(hojs.S_LOC_CODE).FirstOrDefault();
                        //上托盘 满框
                        var jcjykk = bcpList.FindAll(e => e.S_CNTR_TYPE == "满托").OrderByDescending(g => g.N_PRI).ToList();
                        var AreaList = jcjykk.Select(e => e.S_AREA_CODE).Distinct().ToList();

                        //过算法 计算起点
                        foreach (var Area in AreaList)
                        {
                            var Row = jcjykk.Select(e => e.N_ROW).Distinct().ToList();



                            var EndList = GetInWork(Area, Row, true, workOrder.SQL_ItemCode);
                            if (EndList.Any())
                            {
                                foreach (var item in jcjykk)
                                {
                                    Location End = null;
                                    var EndListT = EndList.FindAll(e => e.S_AREA_CODE == item.S_AREA_CODE && e.N_ROW == item.N_ROW).ToList();
                                    if (EndListT.Count() > 0)
                                    {
                                        End = EndListT.OrderBy(e => e.N_COL).First();
                                    }
                                    if (End != null)
                                    {
                                        endBit = End;
                                        break;
                                    }
                                }
                            }
                    }
                    if (endBit != null)
                    {
                        var _ctrl = LocationHelper.GetLocCntrRel(location);
                            List<CntrItemRel> RItem = new List<CntrItemRel>();
                            foreach (var item in _ctrl)
                            {

                                var r = new CntrItemRel
                                {
                                    S_CNTR_CODE = item.S_CNTR_CODE,
                                    S_ITEM_CODE = workOrder.SQL_ItemCode,
                                    S_ITEM_NAME = workOrder.SQL_ItemName,
                                    F_QTY = workOrder.SQL_UsingNowTotal,
                                    S_ORDER_NO = workOrder.SQL_WorkNo,
                                    S_BATCH_NO = workOrder.SQL_BatchNo
                                };
                                RItem.Add(r);
                                var cntrrel = ContainerHelper.GetCntrItemRel(item.S_CNTR_CODE).FirstOrDefault();
                                if (cntrrel != null)
                                {
                                    newDb.Deleteable<CntrItemRel>().Where(it => it.S_ID.Trim() == cntrrel.S_ID.Trim()).ExecuteCommand();
                                }
                            }
                            var ggf = newDb.Insertable(RItem).ExecuteCommand();
                            if (ggf > 0)
                            {
                        int endLayer = endBit.N_CURRENT_NUM + 1;
                        var carryCntrs = new List<string> { _ctrl.FirstOrDefault().S_CNTR_CODE };//DateTime.Now.ToString("yyMMddHHmmss") };
                        var bb = TaskProcess.CreateTransport(workOrder.SQL_WorkNo, location, endBit.S_LOC_CODE, "满瓶坯-入库", carryCntrs, 1, endLayer, carryCntrs.Count, plc.taskPri);
                                var bb = TaskProcess.CreateTransport(workOrder.SQL_WorkNo, location, endBit.S_LOC_CODE, "注塑满托-入库", carryCntrs, 1, endLayer, carryCntrs.Count, plc.taskPri);
                                if (bb)
                                {
                                    SentTask = true;
                                    //触发自动解绑
                                    //var zdjb = jcjykk.FindAll(e => e.SQL_UsingNow == "Y").OrderByDescending(g => g.N_PRI).ToList();
                                    //foreach (var item in zdjb)
                                    //{

                                    //}
                                    //var Jb = newDb.Queryable<Location>().Where(e => e.S_AREA_CODE == Area && Row.Contains(e.N_ROW)).ToList();
                                    ////查询第一排是否满 并且第二排入满三个后解绑第一排
                                    ////1.查询第一排是否有空货位 有 则跳过
                                }
                            }
                        }
                        if (SentTask)
                        {
                            return SentTask;
                        }

                    }
                    return true;
                }

            }
            catch (Exception ex)
            {
@@ -2046,6 +2185,189 @@
            }
        }

        /// <summary>
        /// 瓶坯算法--出库
        /// </summary>
        /// <param name="AreaCode"></param>
        /// <param name="Row"></param>
        /// <param name="ItemCode"></param>
        /// <returns></returns>
        public static List<Location> GetOutWork(string AreaCode, List<int> Row, bool InOutLock = true, string ItemCode = "")
        {
            var lstCanOutL = new List<Location>();
            try
            {
                var chi = new SqlHelper<object>().GetInstance();
                var newDb = chi.CopyNew();
                var ca = Expressionable.Create<Location, LocCntrRel, CntrItemRel>();
                if (string.IsNullOrEmpty(ItemCode))//算空托 
                {
                    ca.And((o, p, t) => o.N_CURRENT_NUM > 0 && o.S_LOCK_STATE == "无" && string.IsNullOrEmpty(t.S_ITEM_CODE) && o.S_AREA_CODE == AreaCode);
                    ca.AndIF(Row.Count() > 0, (o, p, t) => Row.Contains(o.N_ROW));
                    lstCanOutL = newDb.Queryable<Location>().InnerJoin<LocCntrRel>((o, p) => o.S_LOC_CODE == p.S_LOC_CODE).LeftJoin<CntrItemRel>((o, p, t) => p.S_CNTR_CODE == t.S_CNTR_CODE).Where(ca.ToExpression()).ToList();
                }
                else//算满托
                {
                    ca.And((o, p, t) => o.N_CURRENT_NUM > 0 && o.S_LOCK_STATE == "无" && t.S_ITEM_CODE == ItemCode && o.S_AREA_CODE == AreaCode);
                    ca.AndIF(Row.Count() > 0, (o, p, t) => Row.Contains(o.N_ROW));
                    lstCanOutL = newDb.Queryable<Location>().InnerJoin<LocCntrRel>((o, p) => o.S_LOC_CODE == p.S_LOC_CODE).InnerJoin<CntrItemRel>((o, p, t) => p.S_CNTR_CODE == t.S_CNTR_CODE).Where(ca.ToExpression()).ToList();
                }
                //地堆专门算法过滤
                if (lstCanOutL.Count() > 0)
                {
                    var Inloca = Expressionable.Create<Location>();
                    Inloca.And(it => it.S_AREA_CODE == AreaCode);
                    Inloca.AndIF(Row.Count() > 0, o => Row.Contains(o.N_ROW));
                    var locationInLock = newDb.Queryable<Location>().Where(Inloca.ToExpression()).ToList();
                    //空间锁 排除一整排
                    var KjLick = locationInLock.FindAll(e => e.S_LOCK_STATE == "空间锁").ToList();
                    if (KjLick.Count() > 0)
                    {
                        foreach (var item in KjLick)
                        {
                            lstCanOutL.RemoveAll(e => e.S_AREA_CODE == item.S_AREA_CODE && e.N_ROW == item.N_ROW);
                        }
                    }
                    if (InOutLock)
                    {
                        var CkLick = locationInLock.FindAll(e => e.S_LOCK_STATE == "出库锁").ToList();
                        if (CkLick.Count() > 0)
                        {
                            foreach (var item in CkLick)
                            {
                                lstCanOutL.RemoveAll(e => e.S_AREA_CODE == item.S_AREA_CODE && e.N_ROW == item.N_ROW);
                            }
                        }
                        var OutLick = locationInLock.FindAll(e => e.S_LOCK_STATE == "入库锁").ToList();
                        if (OutLick.Count() > 0)
                        {
                            foreach (var item in OutLick)
                            {
                                lstCanOutL.RemoveAll(e => e.S_AREA_CODE == item.S_AREA_CODE && e.N_ROW == item.N_ROW);
                            }
                        }
                    }


                }
                return lstCanOutL;
            }
            catch (Exception ex)
            {
                LogHelper.Info("瓶坯算法" + $" 报错: {ex.Message}");
                return lstCanOutL;
            }
        }

        /// <summary>
        /// 瓶坯算法--入库
        /// </summary>
        /// <param name="AreaCode"></param>
        /// <param name="Row"></param>
        /// <param name="ItemCode"></param>
        /// <returns></returns>
        public static List<Location> GetInWork(string AreaCode, List<int> Row, bool InOutLock = true, string ItemCode = "")
        {
            var lstCanOutL = new List<Location>();
            try
            {
                lock (lockoIn)
                {
                    var chi = new SqlHelper<object>().GetInstance();
                    var newDb = chi.CopyNew();
                    var ca = Expressionable.Create<Location, LocCntrRel, CntrItemRel>();
                    ca.And((o, p, t) => o.N_CURRENT_NUM == 0 && o.S_LOCK_STATE == "无" && string.IsNullOrEmpty(p.S_CNTR_CODE) && string.IsNullOrEmpty(t.S_ITEM_CODE) && o.S_AREA_CODE == AreaCode);
                    ca.AndIF(Row.Count() > 0, (o, p, t) => Row.Contains(o.N_ROW));
                    lstCanOutL = newDb.Queryable<Location>().LeftJoin<LocCntrRel>((o, p) => o.S_LOC_CODE == p.S_LOC_CODE).LeftJoin<CntrItemRel>((o, p, t) => p.S_CNTR_CODE == t.S_CNTR_CODE).Where(ca.ToExpression()).ToList();

                    var Inloca = Expressionable.Create<Location>();
                    Inloca.And(it => it.S_AREA_CODE == AreaCode);
                    Inloca.AndIF(Row.Count() > 0, o => Row.Contains(o.N_ROW));
                    var locationInLock = newDb.Queryable<Location>().Where(Inloca.ToExpression()).ToList();

                    //地堆专门算法过滤
                    if (lstCanOutL.Count() > 0)
                    {
                        //空间锁 排除一整排
                        var KjLick = locationInLock.FindAll(e => e.S_LOCK_STATE == "空间锁").ToList();
                        if (KjLick.Count() > 0)
                        {
                            foreach (var item in KjLick)
                            {
                                lstCanOutL.RemoveAll(e => e.S_AREA_CODE == item.S_AREA_CODE && e.N_ROW == item.N_ROW);
                            }
                        }

                        //获取指定库区 指定排 满的货位 然后排除 比最大列还小的空货位
                        var Mhw = locationInLock.FindAll(e => e.N_CURRENT_NUM > 0).ToList();
                        if (Mhw.Count() > 0)
                        {
                            var RowLis = Mhw.GroupBy(e => e.N_ROW).Select(f => f.First()).ToList();
                            foreach (var item in RowLis)
                            {
                                var MaxCol = Mhw.FindAll(e => e.N_ROW == item.N_ROW).OrderByDescending(c => c.N_COL).FirstOrDefault();
                                if (MaxCol != null)
                                {
                                    lstCanOutL.RemoveAll(e => e.S_AREA_CODE == item.S_AREA_CODE && e.N_ROW == item.N_ROW && e.N_COL < MaxCol.N_COL);
                                }
                            }

                            //排除别的物料所在的排
                            if (!string.IsNullOrEmpty(ItemCode))
                            {
                                var fzRow = Mhw.Select(e => e.N_ROW).Distinct().ToList();
                                foreach (var item in fzRow)
                                {
                                    var mtlo = Mhw.FindAll(e => e.N_ROW == item).FirstOrDefault();
                                    if (mtlo != null)
                                    {
                                        var _clrel = LocationHelper.GetLocCntrRel(mtlo.S_LOC_CODE).FirstOrDefault();
                                        if (_clrel != null)
                                        {
                                            var cntritems = ContainerHelper.GetCntrItemRel(_clrel.S_CNTR_CODE).FirstOrDefault();
                                            if (cntritems != null)
                                            {
                                                if (cntritems.S_ITEM_CODE != ItemCode)
                                                {
                                                    lstCanOutL.RemoveAll(e => e.S_AREA_CODE == mtlo.S_AREA_CODE && e.N_ROW == mtlo.N_ROW);
                                                }
                                            }
                                        }

                                    }
                                }
                            }
                        }
                        if (InOutLock)
                        {
                            var CkLick = locationInLock.FindAll(e => e.S_LOCK_STATE == "出库锁").ToList();
                            if (KjLick.Count() > 0)
                            {
                                foreach (var item in KjLick)
                                {
                                    lstCanOutL.RemoveAll(e => e.S_AREA_CODE == item.S_AREA_CODE && e.N_ROW == item.N_ROW);
                                }
                            }
                            var OutLick = locationInLock.FindAll(e => e.S_LOCK_STATE == "入库锁").ToList();
                            if (KjLick.Count() > 0)
                            {
                                foreach (var item in KjLick)
                                {
                                    lstCanOutL.RemoveAll(e => e.S_AREA_CODE == item.S_AREA_CODE && e.N_ROW == item.N_ROW);
                                }
                            }
                        }
                    }
                    return lstCanOutL;
                }
            }
            catch (Exception ex)
            {
                LogHelper.Info("瓶坯算法" + $" 报错: {ex.Message}");
                return lstCanOutL;
            }
        }


        //瓶坯满入库
        static bool BottlePEMInfoFull(Settings.deviceInfo plc, string location)

 HH.WCS.QingXiNongfu/process/TaskProcess.cs

@@ -417,16 +417,14 @@
                    goto vvv;
                }

                if (mst.S_TYPE.Trim() == "J空瓶坯-出库")
                {
                    mst.S_CNTRS = "J" + Settings.GetTimeStamp();
                }

                if (mst.S_TYPE.Trim() == "F空瓶坯-出库")
                {
                    mst.S_CNTRS = "F" + Settings.GetTimeStamp();
                }

                //if (mst.S_TYPE.Trim() == "J空瓶坯-出库")
                //{
                //    mst.S_CNTRS = "J" + Settings.GetTimeStamp();
                //}
                //if (mst.S_TYPE.Trim() == "F空瓶坯-出库")
                //{
                //    mst.S_CNTRS = "F" + Settings.GetTimeStamp();
                //}
                //成品空框 不需要绑筐
                if (!mst.S_TYPE.Trim().Contains("成品-空托上线")
                    && mst.S_TYPE.Trim() != "满瓶坯-入库"
@@ -846,7 +844,6 @@
                            return true;
                        });
                    }

                }
                else if (mst.S_TYPE.Trim() == "空瓶坯-出库" || mst.S_TYPE.Trim().Contains("瓶盖-空上机") || mst.S_TYPE.Trim().Contains("翻斗机叫满"))
                {
@@ -1309,7 +1306,7 @@
                                "start DD ",
                                start.ToString(),
                                "-",
                                TRow
                                FRow
                                }), "");
                        }
                        else

 HH.WCS.QingXiNongfu/settings.xml

@@ -61,9 +61,10 @@
        <![CDATA[
    [
    {"address":"10.140.3.164","deviceName":"550","FuLeLineNo":"青溪成品仓QX1输送线","deviceNo":[],"location":["CX-2","CX-1"],"areaPriy":["QX-01","QX-02","QX-03","QX-04","QX-05","QX-06","QX-07","QX-08","QX-09","QX-10","QX-11","QX-12","QX-13","QX-14","QX-15","QX-16","QX-19",],"deviceType":9,"enable":1},
    {"address":"10.140.3.163","deviceName":"注塑机","deviceNo":["","666"],"location":["ZSJ1-1","ZSJ1-2"],"deviceType":8,"enable":1},
    
    {"address":"10.140.3.175","deviceName":"注塑机3","deviceNo":["","664"],"location":["ZSJ3-1","ZSJ3-2"],"deviceType":8,"enable":1},
{"address":"10.140.9.168","deviceName":"注塑机","deviceNo":["","666"],"location":["ZSJ1-1","ZSJ1-2"],"deviceType":8,"enable":1},
	
    {"address":"10.140.9.169","deviceName":"注塑机3","deviceNo":["","664"],"location":["ZSJ3-1","ZSJ3-2"],"deviceType":8,"enable":1},
    
    {"address":"10.140.3.176","deviceName":"注塑机4","deviceNo":["","666"],"location":["ZSJ4-1","ZSJ4-2"],"deviceType":8,"enable":1},
    
@@ -87,7 +88,7 @@
    {"address":"10.140.3.178","deviceName":"CX4","FuLeLineNo":"青溪成品仓QX4输送线","deviceNo":[],"location":["CX4-2","CX4-1"],"areaPriy":["QX-01","QX-02","QX-03","QX-04","QX-05","QX-06","QX-07","QX-08","QX-09","QX-10","QX-11","QX-12","QX-13","QX-14","QX-15","QX-16","QX-19",],"deviceType":9,"enable":1},
    
    
    {"address":"10.140.3.165","deviceName":"5L注塑机","deviceNo":["","665"],"location":["5LZSJ1-1","5LZSJ1-2"],"deviceType":8,"enable":1},
    {"address":"10.140.9.167","deviceName":"5L注塑机","deviceNo":["","665"],"location":["5LZSJ1-1","5LZSJ1-2"],"deviceType":8,"enable":1},
    {"address":"10.140.3.167","deviceName":"5L翻斗机","deviceNo":["","998"],"location":["5LFDJ"],"deviceType":5,"enable":1},
    
    {"address":"10.140.3.155","deviceName":"门plc2","deviceNo":["2"],"location":[],"deviceType":1,"enable":1},
@@ -127,7 +128,7 @@

    {"address":"10.140.3.187","deviceName":"瓶盖5L翻斗机","deviceNo":["","187"],"location":["SXFDJ-1"],"deviceType":10,"areaPriy":["PGMKCK"],"enable":1},
    
    {"address":"10.140.9.167","deviceName":"T2提升机","deviceNo":[""],"taskPri":50,"location":["YWLT2TSJ"],"areaPriy":["YWLT2TSJCD"],"deviceType":13,"enable":1},
    {"address":"10.140.9.163","deviceName":"T2提升机","deviceNo":[""],"taskPri":50,"location":["YWLT2TSJ"],"areaPriy":["YWLT2TSJCD"],"deviceType":13,"enable":1},
    {"address":"10.140.9.168","deviceName":"T1提升机","deviceNo":[""],"taskPri":50,"location":["YWLT1TSJ"],"areaPriy":["YWLT1TSJCD"],"deviceType":13,"enable":1},
    
    ]]]>

 HH.WCS.QingXiNongfu/wms/WCSHelper.cs

@@ -2,6 +2,7 @@
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Linq.Expressions;

namespace HH.WCS.QingXigongchang.wms
@@ -27,7 +28,16 @@
            return order;
        }

        //public static 
        /// <summary>
        /// 半成品区域表
        /// </summary>
        /// <param name="lineNo"></param>
        /// <returns></returns>
        public static List<BcpQyOrder> BcpQyOrderList(string lineNo)
        {
            var order = new SqlHelper<BcpQyOrder>().GetList(a => a.SQL_PLineNo == lineNo && (a.C_ENABLE == "Y")).OrderByDescending(c => c.N_PRI).ToList();
            return order;
        }

        public static List<WorkOrder> GetWorkOrder(Expression<Func<WorkOrder, bool>> expression)
        {

 HH.WCS.QingXiNongfu/wms/WCSModel.cs

@@ -292,6 +292,36 @@
        /// 产线号
        /// </summary>
        public string SQL_PLineNo { get; set; }

        /// <summary>
        /// 库区
        /// </summary>
        public string S_AREA_CODE { get; set; }

        /// <summary>
        /// 排
        /// </summary>
        public int N_ROW { get; set; }

        /// <summary>
        /// 即产即用 N Y --现在变成是否是自动解绑
        /// </summary>
        public string SQL_UsingNow { get; set; }

        /// <summary>
        /// 是否启用  N Y
        /// </summary>
        public string C_ENABLE { get; set; }

        /// <summary>
        /// 优先级
        /// </summary>
        public int N_PRI { get; set; }

        /// <summary>
        /// 托盘类型 空框/满框
        /// </summary>
        public string S_CNTR_TYPE { get; set; }
    }

    [SuGG("厂家时间表")]

 HH.WCS.QingXiNongfu/wms/WMSModel.cs

@@ -137,6 +137,8 @@
        {
            get; set;
        }

        public string C_ENABLE { get; set; }
        //public string S_DEEP { get; set; }

        [SugarColumn(IsIgnore = true)]
@@ -178,6 +180,7 @@
        public string S_TYPE { get; set; }



        [SugarColumn(IsIgnore = true)]
        [Navigate(NavigateType.OneToOne, nameof(S_CNTR_CODE))]
        public CntrItemRel CntrItemRel { get; set; }