blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
hudong
2025-06-23 df0736e720152dcefdb13d8ead30311709cf0123 
 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,21 @@


            // 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 == model.start).First();


                if (hwbd!=null)


                {


                    endloc = db.Queryable<Location>().Where(a => a.S_CODE == hwbd.S_LOC_CODE).First();


                }


                else


                {


                    result.resultCode = 3;


                    result.resultMsg = $"托盘找不到货位";


                    return result;


                }


                   






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




                if (locinfo?.N_LOCK_STATE != 0)


@@ -1819,7 +1836,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),


@@ -2346,6 +2365,19 @@


                            result.resultMsg += $"任务{locs.S_CODE}来源号{locs.S_BS_NO}找不到配盘信息";


                            return result;


                        }


                        Location endloc = new Location();


                        var hwbd = db.Queryable<TN_Container_Code>().Where(a => a.S_CNTR_CODE == cntr_code).First();


                        if (hwbd != null)


                        {


                            endloc = db.Queryable<Location>().Where(a => a.S_CODE == hwbd.S_LOC_CODE).First();


                        }


                        else


                        {


                            result.resultCode = 3;


                            result.resultMsg = $"托盘找不到货位";


                            return result;


                        }




                        //var location = db.Queryable<Location>().Where(a => a.S_CODE == locs.S_LOC_CODE).First();


                        var wmsTask = new WMSTask


                        {


@@ -2354,9 +2386,13 @@


                            S_START_LOC = start,


                            S_START_AREA = startinfo.S_AREA_CODE,


                            S_START_WH = startinfo.S_WH_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 = locs?.S_START_LOC,


                            //S_END_AREA = locs?.S_START_AREA,


                            //S_END_WH = locs?.S_START_WH,




                            N_TYPE = 1,


                            // S_TYPE = WMSTask.GetTypeStr(1),


@@ -4320,7 +4356,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 == "内采入库")


                    {


@@ -4360,6 +4396,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


@@ -4369,9 +4412,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


                                    },


@@ -4386,8 +4429,7 @@


                        var json = JsonConvert.SerializeObject(roots.ROOT);


                        string xml = JsonConvert.DeserializeXmlNode(json, "ROOT").OuterXml;




                        // 现在 root 对象包含了您定义的假数据


                        // 发送POST请求


                       


                        LogHelper.Info($"内采收货xml数据{xml}");




                        #region MyRegion


@@ -4445,15 +4487,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)


                            {


@@ -4474,6 +4510,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();




                        }






                    }


@@ -4492,13 +4538,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).First();


                        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,


@@ -4513,6 +4566,7 @@




                            }


                        };


                    


                        //回参物料信息


                        List<JHWBackDto.ITEM> iTEMs = new List<JHWBackDto.ITEM>();


                        foreach (var item in po.Details)


@@ -4623,6 +4677,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




                    }


@@ -4664,6 +4729,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


@@ -4672,7 +4744,7 @@


                                {


                                    HEAD = new WcRkBc.HEAD


                                    {


                                        KEY = po.S_NO,


                                        KEY = KEY,


                                        GZRQ = DateTime.Now.ToString("yyyyMMdd"),


                                        GZRY = model.GZRY,


                                        GC = po.S_FACTORY


@@ -4769,6 +4841,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();




                        }




                    }