blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
hudong
2025-06-30 1e20867615150dce50f2a834cfe277bfa4749dbb 
 api/WmsSpaHelper.cs


@@ -1750,10 +1750,10 @@


            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.cntr_code).First();


                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).First();


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


                    if (endloc?.N_LOCK_STATE != 0)


                    {


                        result.resultCode = 3;


@@ -1929,7 +1929,7 @@




                            if (khsta != null)


                            {


                                LogHelper.Info($"starts{khsta}");


                                LogHelper.Info($"starts{khsta?.S_CNTR_CODE}");


                                var starts12 = db.Queryable<LocCntrRel>().Where(lcr => lcr.S_CNTR_CODE == khsta.S_CNTR_CODE).First();


                                if (starts12==null)


                                {


@@ -1941,9 +1941,9 @@


                                else


                                {




                                    LogHelper.Info($"starts1{starts12}");


                                    LogHelper.Info($"starts1{starts12.S_LOC_CODE}");


                                    start = db.Queryable<Location>().Where(loc => loc.S_AREA_CODE == "HJQ" && loc.S_CODE == starts12.S_LOC_CODE).ToList().FirstOrDefault();


                                    LogHelper.Info($"starts2{start}");


                                    LogHelper.Info($"starts2{start?.S_CODE}");




                                    model.cntr_code = starts12?.S_CNTR_CODE;


                                }


@@ -2025,10 +2025,10 @@


                        if (!string.IsNullOrEmpty(model.cntr_code))


                        {




                            var hwbd = db.Queryable<TN_Container_Code>().Where(a => a.S_CNTR_CODE == model.cntr_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).First();


                                end = db.Queryable<Location>().Where(s => s.S_CODE == hwbd.S_LOC_CODE.Trim()).First();


                            }


                            else


                            {


@@ -2127,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 = $"{model.cntr_code}容器未找到货位信息";


                        result.resultCode = 1;


                        return result;


                    }


                        result.resultMsg = "成功";


                    result.resultCode = 0;


                    if (string.IsNullOrEmpty(model.arrival_no))


                    {


@@ -2159,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 升降量


@@ -2316,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)


@@ -2388,10 +2398,12 @@


                            return result;


                        }


                        Location endloc = new Location();


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




                        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).First();


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


                            if (endloc?.N_LOCK_STATE != 0)


                            {


                                result.resultCode = 3;


@@ -2461,7 +2473,85 @@


        }




        //}


        public static async Task<SimpleResult>  HkGets(HuiK model) {




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




            SimpleResult result = new SimpleResult();


                var locs = db.Queryable<WCSTask>().Where(a => a.S_TYPE.Contains("出库") && a.S_CNTR_CODE == model.cntr_code && a.N_B_STATE == 3).OrderByDescending(s => s.T_END_TIME).First();


                if (locs != null)


                {


                    var cntr = db.Queryable<TN_Distribution_CNTR>().Where(a => a.S_DC_NO == locs.S_BS_NO).First();


                    if (cntr != null)


                    {


                        cntr.S_SORT_TYPE = "已分拣";


                        db.Updateable(cntr).UpdateColumns(it => new { it.S_SORT_TYPE }).ExecuteCommand();


                    }


                    else


                    {


                        result.resultCode = 1;


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


                        return result;


                    }


                    Location endloc = new Location();




                    LogHelper.Info($"获取托盘信息{model.cntr_code}容器");


                    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 startloc = db.Queryable<Location>().Where(a => a.S_CODE == model.start).First();


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


                var wmsTask = new WMSTask


                    {


                        S_CNTR_CODE = model.cntr_code,


                        S_CODE = WMSHelper.GenerateTaskNo(),


                        S_START_LOC = model.start,


                        S_START_AREA = startloc.S_AREA_CODE,


                        S_START_WH = startloc.S_WH_CODE,




                        //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),


                        S_TYPE = "回库",


                        S_OP_DEF_CODE = "",


                        S_OP_DEF_NAME = "pda入库"


                    };


                    if (WMSHelper.CreateWmsTask(wmsTask))


                    {


                        LocationHelper.LockLoc(model.start, 1);


                        result.resultMsg = $"创建作业成功，作业号{wmsTask.S_CODE}";


                    }


                }


                else


                {


                    result.resultCode = 1;


                    result.resultMsg += $"找不到容器对应任务信息{model.cntr_code}";


                    return result;


                }


                return result;


         


        }






        /// <summary>


@@ -2520,7 +2610,7 @@


                    ckbitem.CBZX = po.S_CBZX;


                    ckbitem.WLBH = item.item_code;


                    ckbitem.SL = item.qty;


                    ckbitem.KCDD = podetail?.S_KCDD;


                    ckbitem.KCDD = podetail?.S_ERP_WH_CODE;


                    ckbitem.LRZX = po.S_LRZX;


                    ckbitem.ZZKM = po.S_ZZKM;


                    ckbitem.GC = po.S_FACTORY;


@@ -2560,17 +2650,7 @@


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




                LogHelper.Info($"成本中心出库xml数据{xml}");


                //// 创建 StringContent 并指定媒体类型为 "text/xml"


                //HttpContent content = new StringContent(xml, Encoding.UTF8, "application/xml");


                //string url = Settings.WCSSeverUrl + "/api/WmsSap/cesReceiveXmlData";


                //string responseXml = "";


                //using (HttpClient client = new HttpClient())


                //{


                //    // 发送 POST 请求并接收响应


                //    HttpResponseMessage responsess = await client.PostAsync(url, content);


                //    responseXml = await responsess.Content.ReadAsStringAsync();




                //}


            




                #region sap回调


                // 创建Web Service代理类实例


@@ -2594,12 +2674,13 @@


                XmlDocument xmlDoc = new XmlDocument();


                xmlDoc.LoadXml(responses.Output.ToString());


                JObject jsonObject = JsonConvert.DeserializeObject<JObject>(JsonConvert.SerializeXmlNode(xmlDoc));


                var data = JsonConvert.DeserializeObject<ReturnWcBcak.Root>(jsonObject.ToString());


                EnsureArrayFormat(jsonObject, "ITEM", "");


                var data = JsonConvert.DeserializeObject<CbbReturnWcBcak.Root>(jsonObject.ToString());




                //添加凭证记录表


                result.resultMsg = data.ROOT.ITEM.MSGDESP;


                result.resultCode = data.ROOT.ITEM.MSGCODE;


                if (data.ROOT.ITEM.MSGCODE == 0)


                result.resultMsg = data.ROOT.ITEM[0].MSGDESP;


                result.resultCode = data.ROOT.ITEM[0].MSGCODE;


                if (data.ROOT.ITEM[0].MSGCODE == 0)


                {




                    foreach (var item in MaterList)


@@ -2609,8 +2690,8 @@


                        materialVoucher.S_TYPE = po.S_OUT_TYPE;


                        materialVoucher.S_WLBM = item.item_code;


                        materialVoucher.S_WLH = item.N_ROW_NO;


                        materialVoucher.S_WLPZBH = data.ROOT.ITEM?.WLPZH;


                        materialVoucher.S_WLPZND = data.ROOT.ITEM?.WLPZND;


                        materialVoucher.S_WLPZBH = data.ROOT.ITEM?[0].WLPZBH;


                        //materialVoucher.S_WLPZND = data.ROOT.ITEM?.WLPZND;


                        materialVoucher.S_WH_CODE = po.S_WH_CODE;


                        materialVoucher.S_AREA_CODE = po.S_AREA_CODE;


                        materialVoucher.F_QTY = item.qty;


@@ -2619,13 +2700,6 @@


                        materialVoucher.UNAME = po.UNAME;


                        db.Insertable<MaterialVoucher>(materialVoucher).ExecuteCommand();


                    }


                    //MaterialVoucher materialVoucher = new MaterialVoucher();


                    //materialVoucher.S_NO = po.S_NO;


                    //materialVoucher.S_TYPE = po.S_OUT_TYPE;


                    //materialVoucher.S_WLPZBH = data.ROOT.ITEM.WLPZBH;


                    //materialVoucher.S_WLPZND = data.ROOT.ITEM.WLPZND;


                    //materialVoucher.STATUS = 0;


                    //db.Insertable<MaterialVoucher>(materialVoucher).ExecuteCommand();


                }


                #endregion




@@ -2719,7 +2793,7 @@


                    ckbitem.DDH = podetail?.S_DDH;


                    //ckbitem.DDHXM = (podetail?.N_ROW_NO);


                    ckbitem.WBS = podetail?.S_WBS;


                    ckbitem.KCDD = podetail?.S_KCDD;


                    ckbitem.KCDD = podetail?.S_ERP_WH_CODE;


                    ckbitem.PC = podetail?.S_BATCH_NO;


                    JHWBackDto.ITEM1 listitem1 = new JHWBackDto.ITEM1();


                    //string[] xlhValues = item.S_SERIAL_NO.Split(',');


@@ -3079,7 +3153,7 @@


                    ckbitem.YLBH = podetail?.S_YLBH;


                    ckbitem.YLXMH = podetail?.S_YLXMH;


                    ckbitem.GC = po.S_FACTORY;


                    ckbitem.KCDD = podetail?.S_KCDD;


                    ckbitem.KCDD = podetail?.S_ERP_WH_CODE;




                    CkBcakDto.ITEM1 listitem1 = new CkBcakDto.ITEM1();


                    //var CntrItemRels = db.Queryable<CntrItemRel>().Where(a => a.S_ITEM_CODE == item.item_code&&a.N_ROW_NO==item.N_ROW_NO).ToList();


@@ -3515,6 +3589,7 @@


                                        S_YLXMH = a.YLHXM,


                                        S_BATCH_NO = "",


                                        S_ERP_WH_CODE = a.KCDD,




                                        S_ZJWLTH = a.ZJWLTH,


                                        S_ZJWLMS = a.ZJWLMS,


                                        S_ZHFHBS = a.ZHFHBS,


@@ -4569,7 +4644,7 @@


                        }


                        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();


                        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;