出库审核逻辑修改

hudong

2025-07-04 67c7f0449f57933c26d785c277ddcd539c899b25

 core/WMSCore.cs

@@ -1,4 +1,6 @@
using HH.WCS.Mobox3.pinggao.util;
using HH.WCS.Mobox3.pinggao.api;
using HH.WCS.Mobox3.pinggao.models;
using HH.WCS.Mobox3.pinggao.util;
using HH.WCS.Mobox3.pinggao.wms;
using System;
using System.Collections.Generic;
@@ -6,6 +8,7 @@
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
using static HH.WCS.Mobox3.pinggao.api.ApiModel;

namespace HH.WCS.Mobox3.pinggao.core
{
@@ -33,7 +36,52 @@
            //WMSHelper.GetWaitingSortingOrderList();

        }
        internal static void CheckDistributionCNTROrder() {

        //internal static async Task<SimpleResult> SendSap()
        //{
        //    var result = new SimpleResult();
        //    LogHelper.Info($"下发sap ");
        //    var db = new SqlHelper<object>().GetInstance();
        //    //获取配盘单
        //    var list = db.Queryable<TN_Outbound_Order>().Where(a => a.S_CNTR_CODE == model.cntr_code).First(); ;
        //    try
        //    {
        //        foreach (var po in list) {

        //            if (po.S_OUT_TYPE == "冲销出库")
        //            {
        //                result = await WmsSpaHelper.CXAddOutboundOrder(db, model.MaterList, model.arrival_no, model.cntr_code, start);
        //            }
        //            else
        //             if (po.S_OUT_TYPE == "出库")//普通出库
        //            {
        //                LogHelper.Info($"S_OUT_TYPE{po.S_OUT_TYPE}");
        //                result = await AddOutboundOrder(db, model.MaterList, model.arrival_no, model.cntr_code, start);
        //            }
        //            else if (po.S_OUT_TYPE == "计划外发料出库")
        //            {
        //                result = await jhwtlAddOutboundOrder(db, model.MaterList, model.arrival_no, model.cntr_code, start);
        //            }
        //            else if (po.S_OUT_TYPE == "成本中心出库")
        //            {
        //                result = await CBAddOutboundOrder(db, model.MaterList, model.arrival_no, model.cntr_code, start);
        //            }

        //        }
               

        //    }
        //    catch (Exception ex)
        //    {
        //        LogHelper.Info($"配盘生成作业错误 {ex.Message}");
        //        throw;
        //    }
        //    LogHelper.Info($"获取配盘数量 {list.Count}");
        //}


        internal static void CheckDistributionCNTROrder()
        {
            LogHelper.Info($"配盘生成作业 ");
            var db = new SqlHelper<object>().GetInstance();
            //获取配盘单
@@ -43,23 +91,26 @@
                foreach (var item in list)
                {
                    var lcr = db.Queryable<LocCntrRel>().Where(c => c.S_CNTR_CODE == item.S_CNTR_CODE).First();
                    if (lcr!=null)
                    if (lcr != null)
                    {
                        var yxj = db.Queryable<TN_Outbound_Order>().Where(it => it.S_NO == item.S_BS_NO).First();

                        //起始库位
                        var startloc = db.Queryable<Location>().Where(it => it.S_CODE == lcr.S_LOC_CODE).First();
                        if (startloc != null )//&&  
                        if (startloc != null)//&&  
                        {
                            //终点货位
                            var endloc = db.Queryable<Location>().Where(it => it.S_AREA_CODE == "AGVXHQ" && it.N_LOCK_STATE == 0 && it.N_CURRENT_NUM == 0).First();

                           // var endloc = db.Queryable<Location>().Where(it => it.S_CODE == item.S_END_LOC).First();
                            if (endloc != null )
                            // var endloc = db.Queryable<Location>().Where(it => it.S_CODE == item.S_END_LOC).First();
                            if (endloc != null)
                            {
                                var optask = new WMSTask
                                {
                                    S_CODE = WMSHelper.GenerateTaskNo(),
                                    S_START_LOC = item.S_LOC_CODE,
                                    S_START_AREA = startloc.S_AREA_CODE,
                                    N_PRIORITY = yxj.N_PRIORITY,
                                    S_START_WH = startloc.S_WH_CODE,
                                    S_END_LOC = endloc.S_CODE,
                                    S_END_AREA = endloc.S_AREA_CODE,
@@ -80,28 +131,33 @@
                                    LocationHelper.LockLoc(endloc.S_CODE, 1);
                                    item.N_B_STATE = 2;
                                    item.S_B_STATE = "作业启动";
                                    db.Updateable(item).UpdateColumns(it => new { it.S_B_STATE, it.N_B_STATE }).ExecuteCommand();
                                    item.S_SORT_TYPE = "待分拣";
                                    db.Updateable(item).UpdateColumns(it => new { it.S_B_STATE, it.N_B_STATE, it.S_SORT_TYPE }).ExecuteCommand();


                                }
                            }
                            else
                            {
                                LogHelper.Info($"{item.S_BS_NO}配盘 库区{item.S_AREA_CODE}货位找不到");
                                LogHelper.Info($"{item.S_BS_NO}配盘 库区AGVXHQ无空货位");

                            }
                        }
                        else
                        {
                             LogHelper.Info($"{item.S_BS_NO}配盘 库区{item.S_AREA_CODE}货位找不到");
                            LogHelper.Info($"{item.S_BS_NO}配盘 库区{item.S_AREA_CODE}无货位");
                        }
                        
                   }



                    }
                    else
                    {
                        LogHelper.Info($"配盘生成作业容器未绑定货位");
                    }
                   

                }
                   


            }
            catch (Exception ex)
@@ -110,6 +166,117 @@
                throw;
            }
            LogHelper.Info($"获取配盘数量 {list.Count}");
        }


       
        internal static void podetailSend()
        {
            LogHelper.Info($"自动生成出库任务 ");
            var db = new SqlHelper<object>().GetInstance();
            //获取入库明细单

            var list = db.Queryable<TN_Center_Inbound_Detail>().ToList();
            try
            {
                foreach (var item in list)
                {
                    bool idadd = true;
                    var S_CNTR_CODE = "";
                    var lcr = db.Queryable<LocCntrRel>()
                        .InnerJoin<CGRels>((l, c) => l.S_CNTR_CODE == c.S_CNTR_CODE)
                        .Where((l, c) => c.S_ITEM_CODE == item.S_ITEM_CODE && c.S_CNTR_TYPE == "半托")
                        .OrderByDescending((l, c) => l.T_CREATE)
                        .Select((l, c) => l).ToList()
                        .FirstOrDefault();
                    S_CNTR_CODE = lcr.S_CNTR_CODE;
                    if (lcr != null)
                    {
                        //起始库位
                        var startloc = db.Queryable<Location>().Where(it => it.S_CODE == lcr.S_LOC_CODE).First();
                        var wsc = db.Queryable<WCSTask>().Where(it => it.S_CNTR_CODE == S_CNTR_CODE && it.S_TYPE.Contains("出库") && it.N_B_STATE < 3).First();
                        if (wsc != null)
                        {
                            item.N_B_STATE = 2;
                            db.Updateable(item).UpdateColumns(it => new { it.N_B_STATE }).ExecuteCommand();
                        }
                        else
                        {
                            if (startloc != null)//&&  
                            {
                                //终点货位
                                var endloc = db.Queryable<Location>().Where(it => it.S_AREA_CODE == "QYQXHQ" && it.N_LOCK_STATE == 0 && it.N_CURRENT_NUM == 0).First();
                                if (endloc != null)
                                {
                                    var optask = new WMSTask
                                    {
                                        S_CODE = WMSHelper.GenerateTaskNo(),
                                        S_START_LOC = startloc.S_CODE,
                                        S_START_AREA = startloc.S_AREA_CODE,
                                        S_START_WH = startloc.S_WH_CODE,
                                        S_END_LOC = endloc.S_CODE,
                                        S_END_AREA = endloc.S_AREA_CODE,
                                        S_END_WH = endloc.S_WH_CODE,
                                        N_PRIORITY = 1,
                                        S_TYPE = "半托出库",
                                        N_TYPE = 2,
                                        N_B_STATE = 0,
                                        S_BS_NO = "",
                                        S_CNTR_CODE = S_CNTR_CODE,
                                        S_OP_DEF_NAME = item.S_BS_TYPE
                                    };
                                    var res = db.Insertable(optask).ExecuteCommand() > 0;
                                    if (res)
                                    {
                                        startloc.N_LOCK_STATE = 2;
                                        startloc.S_LOCK_STATE = "出库锁";
                                        db.Updateable(startloc).UpdateColumns(it => new { it.S_LOCK_STATE, it.N_LOCK_STATE }).ExecuteCommand();
                                        var models = db.Queryable<Location>().Where(a => a.S_CODE == endloc.S_CODE).First();
                                        if (models != null && models.N_LOCK_STATE == 0)
                                        {
                                            models.N_LOCK_STATE = 1;
                                            models.S_LOCK_STATE = Location.GetLockStateStr(1);
                                            res = db.Updateable(models).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE }).ExecuteCommand() > 0;
                                        }
                                        item.N_B_STATE = 2;
                                        db.Updateable(item).UpdateColumns(it => new { it.N_B_STATE }).ExecuteCommand();


                                    }
                                    LocationHelper.LockLoc(endloc.S_CODE, 1);
                                }
                                else
                                {
                                    idadd = false;
                                    LogHelper.Info($" 库区AGVXHQ无空货位");
                                }
                            }
                            else
                            {
                                idadd = false;
                                LogHelper.Info($" 库区无货位");
                            }
                        }

                    }
                    else
                    {
                        idadd = false;
                        LogHelper.Info($"物料{item.S_ITEM_CODE}未找到容器对应的货位信息，请联系人工绑定关系");
                    }
                    if (idadd)
                    {
                        db.Deleteable(item).ExecuteCommand();

                    }
                }
            }
            catch (Exception ex)
            {
                LogHelper.Info($"自动生成出库任务 {ex.Message}");
                throw;
            }
            LogHelper.Info($"自动生成人物 {list.Count}");
        }
        /// <summary>
        /// 遍历分拣单明细创建出库作业
@@ -407,10 +574,10 @@
        /// </summary>
        internal static void Start()
        {
            //LogHelper.Info($"作业启动 创建子任务");
            LogHelper.Info($"作业启动 创建子任务");
            var db = new SqlHelper<object>().GetInstance();
            List<WMSTask> list = WMSHelper.GetWaitingOperationList();
            //LogHelper.Info($"获取任务数据 数量{list.Count}");
            LogHelper.Info($"获取任务数据 数量{list.Count}");
            if (list.Count > 0)
            {
                //如果是出库的作业锁定托盘的时候已经明确起点了，如果发货单或分拣单指定了终点，
@@ -419,6 +586,13 @@
                {
                    try
                    {
                      LogHelper.Info($"获取任务状态 {a.N_B_STATE}");
                        var WCSTasks = db.Queryable<WCSTask>().Where(it => it.S_OP_CODE == a.S_CODE).First();
                        if (WCSTasks!=null)
                        {
                            continue;
                        }

                        if (a.N_TYPE == 1)
                        {
                            //查询托盘所在位置
@@ -446,6 +620,7 @@
                                    S_END_AREA = endinfo.S_AREA_CODE,
                                    S_END_WH = endinfo.S_WH_CODE,
                                    S_SCHEDULE_TYPE = "NDC",
                                    N_PRIORITY = a.N_PRIORITY,
                                    //N_CNTR_COUNT = 1,
                                    S_CNTR_CODE = a.S_CNTR_CODE,
                                };
@@ -471,7 +646,7 @@
                            {
                                WMSHelper.UpdateTaskEnd(a);
                                LocationHelper.LockLoc(end.S_CODE, 1);

                                


                                var startinfo = db.Queryable<Location>().Where(it => it.S_CODE == a.S_START_LOC).First();
@@ -504,6 +679,23 @@
                                    a.S_B_STATE = "执行";
                                    WMSHelper.UpdateTaskState(a);
                                }

                                var detail = db.Queryable<TN_Distribution_CNTR_Detail>().Where(s => s.S_DC_NO == a.S_BS_NO).ToList();
                                List<TN_DPRECORD> listdp=new List<TN_DPRECORD>(); 
                                foreach (var item in detail)
                                {
                                    TN_DPRECORD tN_DPRECORD = new TN_DPRECORD();
                                    tN_DPRECORD.S_WLBM=item.S_ITEM_CODE;
                                    tN_DPRECORD.S_WLMC = item.S_ITEM_NAME;
                                    tN_DPRECORD.S_NO= wcsTask.S_CODE;
                                    tN_DPRECORD.N_COUNT= item.F_QTY;
                                    tN_DPRECORD.S_LOCATION= end.S_CODE;
                                    listdp.Add(tN_DPRECORD);
                                }
                                if (listdp.Count()>0)
                                {
                                    db.Insertable<TN_DPRECORD>(listdp).ExecuteCommand();
                                }
                            }
                            else
                            {