出库 分拣逻辑修改

hudong

2025-06-26 076b32f9fa1dc8dc39ca345b2b94a58c8e50040e

 api/WmsSpaHelper.cs

@@ -1009,7 +1009,7 @@
                {
                    var result = new SimpleResult();
                    //判断冲销凭证编号 是否为空 如果为空 则为冲销(审核前才能冲销，非待执行状态提示执行中不可冲销) 不为空 则为外采入库
                    if ((itemwlpz.HEAD.YDLX == "351" || itemwlpz.HEAD.YDLX == "Z89") && itemwlpz.ITEM[0].FHGC == "3040")
                    if (itemwlpz.ITEM[0].JDBS=="H" && itemwlpz.ITEM[0].GC == "3040")
                    {
                        var po = db.Queryable<TN_Ll_Order>().Includes(a => a.Details).Where(s => s.S_NO == itemwlpz.HEAD.WLPZH).First();
                        //创建出库单主子表
@@ -1245,7 +1245,7 @@
                        }
                        #endregion
                    }
                    else if ((itemwlpz.HEAD.YDLX == "351" || itemwlpz.HEAD.YDLX == "Z89") && itemwlpz.ITEM[0].GC == "3040")
                    else if (itemwlpz.ITEM[0].JDBS == "S" && itemwlpz.ITEM[0].GC == "3040")
                    {
                        //创建入库单主子表
                        var po = WMSHelper.GetInboundOrder(itemwlpz.HEAD.WLPZH);
@@ -1733,6 +1733,8 @@
        /// <returns></returns>
        internal static SimpleResult InboundOrderSorting(MPSorting model)
        {
           

            var result = new SimpleResult();
            foreach (var a in model.MaterList)
            {
@@ -1747,6 +1749,27 @@
            // var db = new SqlHelper<object>().GetInstance();
            using (var db = new SqlHelper<object>().GetInstance())
            {
                Location endloc = new Location();
                var hwbd = db.Queryable<TN_Container_Code>().Where(a => a.S_CNTR_CODE.Trim() == model.cntr_code).First();
                if (hwbd!=null)
                {
                    endloc = db.Queryable<Location>().Where(a => a.S_CODE == hwbd.S_LOC_CODE.Trim()).First();
                    if (endloc?.N_LOCK_STATE != 0)
                    {
                        result.resultCode = 3;
                        result.resultMsg = $"终点库位已锁/不存在";
                        return result;
                    }
                }
                else
                {
                    result.resultCode = 3;
                    result.resultMsg = $"{model.cntr_code}托盘找不到货位";
                    return result;
                }
                   


                var locinfo = db.Queryable<Location>().Where(a => a.S_CODE == model.start).First();

                if (locinfo?.N_LOCK_STATE != 0)
@@ -1819,7 +1842,9 @@
                    S_START_LOC = model.start,
                    S_START_AREA = locinfo.S_AREA_CODE,
                    S_START_WH = locinfo.S_WH_CODE,
                    S_END_LOC = model.start,
                    S_END_LOC = endloc.S_CODE,
                    S_END_AREA = endloc.S_AREA_CODE,
                    S_END_WH = endloc.S_WH_CODE,
                    S_BS_NO = model.MaterList[0].arrival_no,
                    N_TYPE = 1,
                    S_TYPE = WMSTask.GetTypeStr(1),
@@ -2000,26 +2025,42 @@
                        if (!string.IsNullOrEmpty(model.cntr_code))
                        {

                            #region MyRegion
                            //var list = db.Queryable<CntrItemRel>().Select(s => s.S_CNTR_CODE).ToArray();
                            //var S_LOC_CODElist =   db.Queryable<LocCntrRel>().Where(s=>!list.Contains(s.S_CNTR_CODE)).Select(s=>s.S_LOC_CODE).ToArray();
                            //start = db.Queryable<Location>().Where(it => S_LOC_CODElist.Contains(it.S_CODE)).First();
                            var hwbd = db.Queryable<TN_Container_Code>().Where(a => a.S_CNTR_CODE.Trim() == model.cntr_code).First();
                            if (hwbd!=null)
                            {
                                end = db.Queryable<Location>().Where(s => s.S_CODE == hwbd.S_LOC_CODE.Trim()).First();
                            }
                            else
                            {

                            //// 获取所有被占用的容器编码
                            //var usedContainerCodes = db.Queryable<CntrItemRel>().Select(s => s.S_CNTR_CODE).ToList();
                                #region MyRegion
                                //var list = db.Queryable<CntrItemRel>().Select(s => s.S_CNTR_CODE).ToArray();
                                //var S_LOC_CODElist =   db.Queryable<LocCntrRel>().Where(s=>!list.Contains(s.S_CNTR_CODE)).Select(s=>s.S_LOC_CODE).ToArray();
                                //start = db.Queryable<Location>().Where(it => S_LOC_CODElist.Contains(it.S_CODE)).First();

                            // 获取未被占用的容器对应的货位编码
                            var availableLocationCodes = db.Queryable<LocCntrRel>()
                                .Select(s => s.S_LOC_CODE)
                                .ToList();
                                //// 获取所有被占用的容器编码
                                //var usedContainerCodes = db.Queryable<CntrItemRel>().Select(s => s.S_CNTR_CODE).ToList();
                                #endregion
                                // 获取未被占用的容器对应的货位编码
                                var availableLocationCodes = db.Queryable<LocCntrRel>()
                                    .Select(s => s.S_LOC_CODE)
                                    .ToList();

                            // 获取第一个可用货位（如果没有则返回null）
                            end = db.Queryable<Location>()
                               .Where(it => !availableLocationCodes.Contains(it.S_CODE) && it.S_AREA_CODE == "HJQ")
                               .ToList().FirstOrDefault();

                                if (end!=null)
                                {
                                    TN_Container_Code tN_Container_Code = new TN_Container_Code();
                                    tN_Container_Code.S_CNTR_CODE= model.cntr_code;
                                    tN_Container_Code.S_LOC_CODE = end.S_CODE;
                                    var sss = db.Insertable<TN_Container_Code>(tN_Container_Code).ExecuteCommand();
                                }

                            #endregion
                            }
                           
                        }
                        else
                        {
@@ -2086,16 +2127,25 @@
        {

            var result = new SimpleResult();

            // var db = new SqlHelper<object>().GetInstance();

            using (var db = new SqlHelper<object>().GetInstance())
            {
                try
                {


                    result.resultMsg = "成功";
                    var start = "";
                    var startloc = db.Queryable<LocCntrRel>().Where(a => a.S_CNTR_CODE == model.cntr_code).First();
                    if (startloc!=null)
                    {
                        start = startloc.S_LOC_CODE;
                    }
                    else
                    {
                        result.resultMsg = "出库单号不能为空";
                        result.resultCode = 1;
                        return result;
                    }
                        result.resultMsg = "成功";
                    result.resultCode = 0;
                    if (string.IsNullOrEmpty(model.arrival_no))
                    {
@@ -2118,27 +2168,27 @@
                    //根据不同出库类型 回调sap
                    if (po.S_OUT_TYPE == "冲销出库")
                    {
                        result = await CXAddOutboundOrder(db, model.MaterList, model.arrival_no, model.cntr_code, model.start);
                        result = await 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, model.start);
                        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, model.start);
                        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, model.start);
                        result = await CBAddOutboundOrder(db, model.MaterList, model.arrival_no, model.cntr_code, start);
                    }

                    //通用接口 对容器货品的删减 和生成回库单 都要用的接口
                    result = await TYAddOutboundOrder(db, model.MaterList, model.arrival_no, model.cntr_code, model.IsHK, model.start, po.S_OUT_TYPE, model.cntr_type);
                    result = await TYAddOutboundOrder(db, model.MaterList, model.arrival_no, model.cntr_code, model.IsHK, start, po.S_OUT_TYPE, model.cntr_type);
                    if (result.resultCode == 1)
                    {
                    {   
                        return result;
                    }
                    #region 升降量
@@ -2275,9 +2325,10 @@

                //回参物料信息
                List<OutboundRecord> records = new List<OutboundRecord>();
                var pz = db.Queryable<MaterialVoucher>().Where(a => a.S_NO == arrival_no).First();
                var pzlist = db.Queryable<MaterialVoucher>().Where(a => a.S_NO == arrival_no).ToList();
                foreach (var item in MaterList)
                {
                    var pz=pzlist.Where(s=>s.S_WLBM== item.item_code).FirstOrDefault();
                    // 插入到托盘明细表
                    var cntr = db.Queryable<CntrItemRel>().Where(a => a.S_CNTR_CODE == cntr_code).ToList();
                    if (cntr.Count() > 0)
@@ -2298,7 +2349,7 @@
                            else
                            {
                                db.Updateable(cir).UpdateColumns(it => new { it.F_QTY, it.S_CNTR_TYPE, it.F_ALLOC_QTY, it.T_MODIFY }).ExecuteCommand();
                                //添加回库作业
                           
                            }
                        }
                        else
@@ -2346,6 +2397,28 @@
                            result.resultMsg += $"任务{locs.S_CODE}来源号{locs.S_BS_NO}找不到配盘信息";
                            return result;
                        }
                        Location endloc = new Location();

                        LogHelper.Info($"获取托盘信息{cntr_code}容器");
                        var hwbd = db.Queryable<TN_Container_Code>().Where(a => a.S_CNTR_CODE.Trim() == cntr_code).First();
                        if (hwbd != null)
                        {
                            endloc = db.Queryable<Location>().Where(a => a.S_CODE == hwbd.S_LOC_CODE.Trim()).First();
                            if (endloc?.N_LOCK_STATE != 0)
                            {
                                result.resultCode = 3;
                                result.resultMsg = $"终点库位已锁/不存在";
                                return result;
                            }

                        }
                        else
                        {
                            result.resultCode = 3;
                            result.resultMsg = $"{cntr_code}托盘找不到货位";
                            return result;
                        }

                        //var location = db.Queryable<Location>().Where(a => a.S_CODE == locs.S_LOC_CODE).First();
                        var wmsTask = new WMSTask
                        {
@@ -2355,12 +2428,12 @@
                            S_START_AREA = startinfo.S_AREA_CODE,
                            S_START_WH = startinfo.S_WH_CODE,

                            S_END_LOC = start,
                            S_END_AREA = startinfo.S_AREA_CODE,
                            S_END_WH = startinfo.S_AREA_CODE,
                            //S_END_LOC = locs?.S_START_LOC,
                            //S_END_AREA = locs?.S_START_AREA,
                            //S_END_WH = locs?.S_START_WH,
                            //S_END_LOC = start,
                            //S_END_AREA = startinfo.S_AREA_CODE,
                            //S_END_WH = startinfo.S_AREA_CODE,
                            S_END_LOC = endloc?.S_CODE,
                            S_END_AREA = endloc?.S_AREA_CODE,
                            S_END_WH = endloc?.S_WH_CODE,

                            N_TYPE = 1,
                            // S_TYPE = WMSTask.GetTypeStr(1),
@@ -4324,7 +4397,7 @@
                    List<TN_Inbound_Detail> tN_Inbound_Details = new List<TN_Inbound_Detail>();
                    po.Details = po.Details.Where(d => model.Wlist.Any(w =>
                                w.S_ITEM_CODE == d.S_ITEM_CODE &&
                                w.N_ROW_NO == d.N_ROW_NO))
                                w.N_ROW_NO == d.N_ROW_NO)).OrderBy(s => s.N_ROW_NO)
                            .ToList();
                    if (po.S_IN_TYPE == "内采入库")
                    {
@@ -4364,6 +4437,13 @@
                            tN_Inbound_Details.Add(item);

                        }
                        string combinedIds= string.Join(",", po.Details.Select(x => x.N_ROW_NO));
                        var KEY = WCSHelper.Generate13DigitIds();
                        var s_key=   db.Queryable<TN_InBounder_Sh>().Where(a => a.S_NO == model.S_NO&&a.N_ROW_NO == combinedIds).First();
                        if (s_key!=null)
                        {
                            KEY = s_key.S_KEY;
                        }
                        NcRkDto.Root roots = new NcRkDto.Root
                        {
                            ROOT = new NcRkDto.ROOT
@@ -4373,9 +4453,9 @@
                                    HEAD = new NcRkDto.HEAD
                                    {

                                        KEY = po.S_NO,
                                        KEY = KEY,
                                        GZRQ = DateTime.Now.ToString("yyyyMMdd"),
                                        GZRY = model.GZRY,
                                        GZRY = model.GZRY,//GenerateTaskNo
                                        WLPZBH = po.S_NO,
                                        WLPZND = po.S_WLPZND
                                    },
@@ -4390,8 +4470,7 @@
                        var json = JsonConvert.SerializeObject(roots.ROOT);
                        string xml = JsonConvert.DeserializeXmlNode(json, "ROOT").OuterXml;

                        // 现在 root 对象包含了您定义的假数据
                        // 发送POST请求
                       
                        LogHelper.Info($"内采收货xml数据{xml}");

                        #region MyRegion
@@ -4449,15 +4528,9 @@
                        //添加凭证记录表
                        result.resultMsg = data.ROOT.ITEM.MSGDESP;
                        result.resultCode = data.ROOT.ITEM.MSGCODE;
                        //MaterialVoucher materialVoucher = new MaterialVoucher();
                        if (data.ROOT.ITEM.MSGCODE == 0)
                        {
                            //materialVoucher.S_NO = model.S_NO;
                            //materialVoucher.S_TYPE = po.S_IN_TYPE;
                            //materialVoucher.S_WLPZBH = data.ROOT.ITEM.WLPZH;
                            //materialVoucher.S_WLPZND = data.ROOT.ITEM.WLPZND;
                            //materialVoucher.STATUS = 0;
                            //db.Insertable<MaterialVoucher>(materialVoucher).ExecuteCommand();

                            List<MaterialVoucher> materials = new List<MaterialVoucher>();
                            foreach (var item in model.Wlist)
                            {
@@ -4478,6 +4551,16 @@
                                db.Insertable<MaterialVoucher>(materials).ExecuteCommand();
                            }
                        }
                        else
                        {

                            TN_InBounder_Sh tN_InBounder_Sh = new TN_InBounder_Sh();
                            tN_InBounder_Sh.S_KEY = KEY;
                            tN_InBounder_Sh.N_ROW_NO = combinedIds;
                            tN_InBounder_Sh.S_NO = po.S_NO;
                            db.Insertable<TN_InBounder_Sh>(tN_InBounder_Sh).ExecuteCommand();

                        }


                    }
@@ -4496,13 +4579,20 @@
                            PZZDRQ = DateTime.Parse(po.BLDAT.ToString()).ToString("yyyyMMdd");

                        }
                        string combinedIds = string.Join(",", po.Details.Select(x => x.N_ROW_NO));
                        var KEY = WCSHelper.Generate13DigitIds();
                        var s_key = db.Queryable<TN_InBounder_Sh>().Where(a => a.S_NO == model.S_NO && a.N_ROW_NO == combinedIds).ToList().FirstOrDefault();
                        if (s_key != null)
                        {
                            KEY = s_key.S_KEY;
                        }
                        JHWBackDto.Root myRoot = new JHWBackDto.Root
                        {
                            ROOT = new JHWBackDto.ROOT
                            {
                                HEAD = new JHWBackDto.HEAD
                                {
                                    KEY = po.S_NO,
                                    KEY = KEY,
                                    GZRQ = GZRQ,
                                    PZZDRQ = PZZDRQ,
                                    YHM = po.UNAME,
@@ -4517,6 +4607,7 @@

                            }
                        };
                    
                        //回参物料信息
                        List<JHWBackDto.ITEM> iTEMs = new List<JHWBackDto.ITEM>();
                        foreach (var item in po.Details)
@@ -4627,6 +4718,17 @@
                                db.Insertable<MaterialVoucher>(materials).ExecuteCommand();
                            }
                        }
                        else
                        {

                            TN_InBounder_Sh tN_InBounder_Sh = new TN_InBounder_Sh();
                            tN_InBounder_Sh.S_KEY = KEY;
                            tN_InBounder_Sh.N_ROW_NO = combinedIds;
                            tN_InBounder_Sh.S_NO = po.S_NO;
                            db.Insertable<TN_InBounder_Sh>(tN_InBounder_Sh).ExecuteCommand();

                        }

                        #endregion

                    }
@@ -4668,6 +4770,13 @@
                            tN_Inbound_Details.Add(item);

                        }
                        string combinedIds = string.Join(",", po.Details.Select(x => x.N_ROW_NO));
                        var KEY = WCSHelper.Generate13DigitIds();
                        var s_key = db.Queryable<TN_InBounder_Sh>().Where(a => a.S_NO == model.S_NO && a.N_ROW_NO == combinedIds).First();
                        if (s_key != null)
                        {
                            KEY = s_key.S_KEY;
                        }
                        WcRkBc.Root roots = new WcRkBc.Root
                        {
                            ROOT = new WcRkBc.ROOT
@@ -4676,7 +4785,7 @@
                                {
                                    HEAD = new WcRkBc.HEAD
                                    {
                                        KEY = po.S_NO,
                                        KEY = KEY,
                                        GZRQ = DateTime.Now.ToString("yyyyMMdd"),
                                        GZRY = model.GZRY,
                                        GC = po.S_FACTORY
@@ -4773,6 +4882,16 @@
                            }

                        }
                        else
                        {

                            TN_InBounder_Sh tN_InBounder_Sh = new TN_InBounder_Sh();
                            tN_InBounder_Sh.S_KEY = KEY;
                            tN_InBounder_Sh.N_ROW_NO = combinedIds;
                            tN_InBounder_Sh.S_NO = po.S_NO;
                            db.Insertable<TN_InBounder_Sh>(tN_InBounder_Sh).ExecuteCommand();

                        }

                    }