111

cjs

2025-06-23 8accda250de2a637336a40e04085e1a0cb556c5c

111

 HH.WCS.Mobox3.NongFuLinZhi/HH.WCS.Mobox3.NFLZ.csproj

@@ -159,6 +159,7 @@
    <Compile Include="dispatch\HanAo.cs" />
    <Compile Include="core\Monitor.cs" />
    <Compile Include="dispatch\NDCApi.cs" />
    <Compile Include="models\LocationExt.cs" />
    <Compile Include="models\SegmentTable.cs" />
    <Compile Include="models\RowComparsionTable.cs" />
    <Compile Include="models\RowLock.cs" />

 HH.WCS.Mobox3.NongFuLinZhi/config/config.json

@@ -66,5 +66,11 @@
            "Extend": [ "", "" ],
            "enable": 1
        }
    ],
    "DXSite": [
        {
            "loc": "1",
            "site": 1
        }
    ]
}

 HH.WCS.Mobox3.NongFuLinZhi/core/WMSCore.cs

@@ -65,7 +65,17 @@
                                var endinfo = db.Queryable<Location>().Where(it => it.S_CODE == end.S_CODE).First();
                                int startLayer = startinfo.N_CURRENT_NUM;
                                int endlayer = endinfo.N_CURRENT_NUM + 1;
                                if (a.S_OP_DEF_NAME == "接驳位入库" || a.S_OP_DEF_NAME == "瓶盖空托入库" || a.S_OP_DEF_NAME == "瓶坯非急产补满框" || a.S_OP_DEF_NAME == "瓶盖非急产补满框")
                                if(a.S_OP_DEF_NAME == "瓶坯非急产补满框" || a.S_OP_DEF_NAME == "瓶盖非急产补满框" || a.S_OP_DEF_NAME == "瓶坯非急产补空框" || a.S_OP_DEF_NAME == "瓶盖非急产补空框")
                                {
                                    startLayer = 1;
                                    endlayer = Settings.dXSites.Where(it => it.loc == a.S_END_LOC).First().site;
                                }
                                if(a.S_OP_DEF_NAME == "注塑即产满托下线（瓶坯）")
                                {
                                    endlayer = Settings.dXSites.Where(it => it.loc == a.S_END_LOC).First().site;
                                }

                                if (a.S_OP_DEF_NAME == "接驳位入库" || a.S_OP_DEF_NAME == "瓶盖空托入库")
                                {
                                    startLayer = 1;
                                    endlayer = 1;

 HH.WCS.Mobox3.NongFuLinZhi/models/LocationExt.cs

New file
@@ -0,0 +1,27 @@
using HH.WCS.Mobox3.NFLZ.models;
using SqlSugar;
using System;

namespace HH.WCS.Mobox3.NFLZ {

    [SugarTable("LocationExt")]
    public class LocationExt : BaseModel 
    {
        /// <summary>
        /// 货位
        /// </summary>
        public string S_LOC_CODE { get; set; }
        /// <summary>
        /// 层数
        /// </summary>
        public int N_LAYER { get; set; }
        /// <summary>
        /// agv站点
        /// </summary>
        public string S_AGV_SITE { get; set; }
        /// <summary>
        /// 标识
        /// </summary>
        public string S_PICKUP_POINT { get; set; }
    }
}

 HH.WCS.Mobox3.NongFuLinZhi/process/DeviceProcess.cs

@@ -708,6 +708,7 @@
            {
                foreach(var a in locList)
                {
                    LogHelper.Info($"getFDSXArea:查询到当前货位锁状态：{a.S_LOCK_STATE},货位编码：{a.S_CODE}");
                    if(a.S_LOCK_STATE == "无")
                    {
                        var cntrInfo = db.Queryable<LocCntrRel>().Where(b => b.S_LOC_CODE == a.S_CODE).First();
@@ -716,20 +717,28 @@
                            var itemInfo = db.Queryable<CntrItemRel>().Where(b => b.S_CNTR_CODE == cntrInfo.S_CNTR_CODE).First();
                            if(itemInfo != null)
                            {
                                if(itemInfo.S_ITEM_CODE == workInfo.S_ItemCode)
                                LogHelper.Info($"getFDSXArea:查询到物料编码：{itemInfo.S_ITEM_CODE}");
                                if (itemInfo.S_ITEM_CODE == workInfo.S_ItemCode)
                                {
                                    result = a;
                                    break;
                                }
                            }

                            else
                            {
                                LogHelper.Info($"getFDSXArea:当前托盘未绑定物料，托盘编码：{cntrInfo.S_CNTR_CODE}");
                            }
                        }
                        else
                        {
                            LogHelper.Info($"getFDSXArea:当前货位未绑定托盘");
                        }
                    }
                }
            }
            else
            {
                LogHelper.Info($"为查询到可能满托，库区编码：{startArea}");
                LogHelper.Info($"getFDSXArea:未查询到可用满托，库区编码：{startArea}");
            }
            return result;
        }

 HH.WCS.Mobox3.NongFuLinZhi/process/TaskProcess.cs

@@ -715,7 +715,7 @@
                string startArea = "";
                LinZhiBCPWorkOrder bcpW = null;
                bcpW = db.Queryable<LinZhiBCPWorkOrder>().Where(a => a.S_WorkNo == mst.S_WORK_NO && a.S_WorkState == "执行中").First();

                LogHelper.Info($"满托任务生成处理,工单：{JsonConvert.SerializeObject(bcpW)}");
                if (mst.S_TYPE.Contains("瓶盖"))
                {
                    //瓶盖无即产即用和非即产即用
@@ -1101,8 +1101,16 @@
                        TsNo = 1;
                        // 坯盖任务下发参数获取
                        // 获取起终点的AGV站点
                        Extend1 = db.Queryable<Location>().Where(a => a.S_CODE == mst.S_START_LOC && a.N_LAYER == mst.N_START_LAYER).First().S_AGV_SITE;
                        Extend2 = db.Queryable<Location>().Where(a => a.S_CODE == mst.S_END_LOC && a.N_LAYER == mst.N_END_LAYER).First().S_AGV_SITE;
                        Extend1 = db.Queryable<Location>().Where(a => a.S_CODE == mst.S_START_LOC).First().S_AGV_SITE;
                        Extend2 = db.Queryable<Location>().Where(a => a.S_CODE == mst.S_END_LOC).First().S_AGV_SITE;
                        if (mst.N_START_LAYER > 1)
                        {
                            Extend1 = db.Queryable<LocationExt>().Where(a => a.S_LOC_CODE == mst.S_START_LOC && a.N_LAYER == mst.N_START_LAYER).First().S_AGV_SITE;
                        }
                        if (mst.N_END_LAYER > 1)
                        {
                            Extend2 = db.Queryable<LocationExt>().Where(a => a.S_LOC_CODE == mst.S_START_LOC && a.N_LAYER == mst.N_END_LAYER).First().S_AGV_SITE;
                        }
                        Extend3 = "0";
                        // 获取 任务参数4 DATA 数据
                        string startLayerValue = Convert.ToString(startLayer, 16).ToUpper();

 HH.WCS.Mobox3.NongFuLinZhi/util/Settings.cs

@@ -24,6 +24,7 @@
        public static List<pPZSJSite> pPZSJSites { get; set; } = new List<pPZSJSite>();
        public static List<thirdPartyUrl> thirdPartyUrls { get; set; } = new List<thirdPartyUrl>();
        public static List<httpApiVerify> httpApiVerifys { get; set; } = new List<httpApiVerify>();
        public static List<dXSite> dXSites { get; set; } = new List<dXSite>();

        public static int port { get; set; }
        public static string WHCode { get; set; }
@@ -108,6 +109,10 @@
                            {
                                httpApiVerifys = JsonConvert.DeserializeObject<List<httpApiVerify>>(keyValue.Value.ToString());
                            }
                            if (keyValue.Name == "DXSite")
                            {
                                dXSites = JsonConvert.DeserializeObject<List<dXSite>>(keyValue.Value.ToString());
                            }
                        }
                    }
                }
@@ -126,6 +131,12 @@
            public string Project { get; set; }
            public string[] Extend { get; set; }
            public int enable { get; set; }
        }   

        public class dXSite
        {
            public string loc { get; set; }
            public int site { get; set; }
        }           
        public class thirdPartyUrl
        {