api/WmsSpaHelper.cs
@@ -821,17 +821,28 @@
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        internal static SimpleResult Mater_In(MaterDto.Root model)
        internal static WLReturnRoot.Root Mater_In(MaterDto.Root model)
        {
            var db = new SqlHelper<object>().GetInstance();
            var result = new SimpleResult();
            result.resultMsg = "成功";
            try
            var response = new WLReturnRoot.Root
            {
                db.BeginTran();
                List<TN_Material> list = new List<TN_Material>();
                foreach (var item in model.ROOT.ITEM)
                ROOT = new WLReturnRoot.ROOT
                {
                    ITEM = new List<WLReturnRoot.ITEM>
                    {
                    }
                }
            };
            db.BeginTran();
            List<WLReturnRoot.ITEM> list = new List<WLReturnRoot.ITEM>();
            foreach (var item in model.ROOT.ITEM)
            {
                try
                {
                    var result = new WLReturnRoot.ITEM();
                    var materlist = db.Queryable<TN_Material>().Where(it => it.S_ITEM_CODE == item.WLBM).First();
                    if (materlist == null)
                    {
@@ -849,20 +860,54 @@
                        tN_Material.S_CPZ = item.CPZ;
                        tN_Material.S_CPZMS = item.CPZMS;
                        tN_Material.S_ITEM_NAME = item.VTEXT;
                        list.Add(tN_Material);
                        db.Insertable<TN_Material>(tN_Material).ExecuteCommand();
                        result.MSGDESP = "成功";
                        result.MSGCODE = 0;
                        result.GCBM = item.GCBM;
                        result.WLBM = item.WLBM;
                        list.Add(result);
                    }
                    else
                    {
                        materlist.S_ITEM_CODE = item.WLBM;
                        materlist.S_GCBM = item.GCBM;
                        materlist.S_WLZBM = item.WLZBM;
                        materlist.S_WLZMS = item.WLZMS;
                        materlist.S_WLLX = item.WLLX;
                        materlist.S_WLMS = item.WLMS;
                        materlist.S_WLCMS = item.WLCMS;
                        materlist.S_DWBM = item.DWBM;
                        materlist.S_DWMS = item.DWMS;
                        materlist.S_JBM = item.JBM;
                        materlist.S_CPZ = item.CPZ;
                        materlist.S_CPZMS = item.CPZMS;
                        materlist.S_ITEM_NAME = item.VTEXT;
                        db.Updateable<TN_Material>(materlist).ExecuteCommand();
                        result.MSGDESP = "成功";
                        result.MSGCODE = 0;
                        result.GCBM = item.GCBM;
                        result.WLBM = item.WLBM;
                        list.Add(result);
                    }
                }
                db.Insertable<TN_Material>(list).ExecuteCommand();
                db.CommitTran();
                catch (Exception e)
                {
                    var result = new WLReturnRoot.ITEM();
                    result.MSGDESP = e.Message;
                    result.MSGCODE = 1;
                    result.GCBM = item.GCBM;
                    result.WLBM = item.WLBM;
                    list.Add(result);
                    db.RollbackTran();
                    throw;
                }
            }
            response.ROOT.ITEM = list;
            //db.Insertable<TN_Material>(list).ExecuteCommand();
            db.CommitTran();
            }
            catch (Exception e)
            {
                db.RollbackTran();
                throw;
            }
            return result;
            return response;
        }
@@ -1122,8 +1167,6 @@
                        var po = WMSHelper.GetInboundOrder(itemwlpz.HEAD.WLPZH);
                        if (po == null)
                        {
                            #region MyRegion
                            po = new TN_Inbound_Order { S_NO = itemwlpz.HEAD.WLPZH, S_WLPZND = itemwlpz.HEAD.ND, S_FACTORY = itemwlpz.ITEM[0].GC, S_IN_TYPE = "内采入库", S_BS_TYPE = itemwlpz.HEAD.YDLX };
                            po.Details = new List<TN_Inbound_Detail>();
@@ -1131,28 +1174,7 @@
                            {
                                itemwlpz.ITEM.ForEach(a =>
                                {
                                    //if (a.ITEM1.Select(s => s.XLH).Count() > 0)//判断序列号是否为多个
                                    //{
                                    //    foreach (var item in a.ITEM1.Select(s => s.XLH))
                                    //    {
                                    //        po.Details.Add(new TN_Inbound_Detail
                                    //        {
                                    //            S_IO_NO = model.ROOT.WLPZ.HEAD.WLPZBH,
                                    //            N_ROW_NO = po.Details.Count + 1,
                                    //            S_ITEM_CODE = a.WLH,
                                    //            F_QTY = a.SL,
                                    //            S_ITEM_STATE = "物料",
                                    //            S_ITEM_NAME = "物料",
                                    //            F_ACC_B_QTY = 0,
                                    //            S_KCDD = a.KCDD,
                                    //            S_UOM = a.JBJLDW,//计量单位
                                    //            S_SERIAL_NO = item,
                                    //            S_BATCH_NO = a.PC,
                                    //        });
                                    //    }
                                    //}
                                    //else
                                    //{
                                    po.Details.Add(new TN_Inbound_Detail
                                    {
                                        S_IO_NO = itemwlpz.HEAD.WLPZH,
@@ -1194,7 +1216,6 @@
                                    {
                                        var poq = po.Details.Where(s => s.S_ITEM_CODE == a.WLBM).FirstOrDefault();
                                        poq.F_QTY = a.SL;
                                        db.Updateable(poq).UpdateColumns(it => new { it.F_QTY }).ExecuteCommand();
                                    }
                                    else
@@ -1205,7 +1226,7 @@
                                            N_ROW_NO = a.WLPZHXM,
                                            S_ITEM_CODE = a.WLBM,
                                            F_QTY = a.SL,
                                            S_ITEM_STATE = "物料",
                                            S_ITEM_STATE = "正常",
                                            S_ITEM_NAME = "物料",
                                            S_CKPZKJND = a.CKPZND,
                                            F_ACC_B_QTY = 0,
@@ -1226,9 +1247,6 @@
                            }
                        }
                    }
                    result.resultMsg = "成功";
                    result.WLPZBH = itemwlpz.HEAD.WLPZH;
                    result.WLPZND = itemwlpz.HEAD.ND;
@@ -1241,7 +1259,6 @@
            catch (Exception e)
            {
                var result = new SimpleResult();
                result.resultMsg = "失败";
                result.WLPZBH = "";
                result.WLPZND = "0";
@@ -1777,7 +1794,7 @@
                    S_START_AREA = locinfo.S_AREA_CODE,
                    S_START_WH = locinfo.S_WH_CODE,
                    S_END_LOC = model.start,
                    //S_BS_NO = model.arrival_no,
                    S_BS_NO = model.MaterList[0].arrival_no,
                    N_TYPE = 1,
                    S_TYPE = WMSTask.GetTypeStr(1),
                    S_OP_DEF_CODE = "",
@@ -1826,6 +1843,7 @@
                    return result;
                }
                //根据不同出库类型 回调sap
                if (po.S_OUT_TYPE == "冲销出库")
                {
@@ -1865,7 +1883,8 @@
                    var startinfo = db.Queryable<Location>().Where(it => it.S_CODE == start).First();
                    //出库单详情
                    var po = db.Queryable<TN_Outbound_Order>().Includes(s => s.Details).Where(a => a.S_NO == arrival_no).First();
                    //分拣单
                    //var popp = db.Queryable<TN_Distribution_CNTR>().Where(a => a.S_BS_NO == arrival_no&&a.S_SORT_TYPE=="未分类" && a.N_B_STATE == 2).First();
                    //回参物料信息
                    List<OutboundRecord> records = new List<OutboundRecord>();
@@ -1877,8 +1896,8 @@
                        if (cntr.Count() > 0)
                        {
                            db.BeginTran();
                            //1.查看是否有相同物料批次的信息,如果有要累减少,不同批次的可以分开
                            var cir = db.Queryable<CntrItemRel>().Where(a => a.S_CNTR_CODE == cntr_code && a.S_ITEM_CODE == item.item_code && a.N_BS_ROW_NO == item.N_ROW_NO).First();//&& a.S_BATCH_NO == item.S_BATCH_NO
                            //1.查看是否有相同物料批次的信息,如果有要累减少,不同批次的可以分开&& a.N_BS_ROW_NO == item.N_ROW_NO
                            var cir = db.Queryable<CntrItemRel>().Where(a => a.S_CNTR_CODE == cntr_code && a.S_ITEM_CODE == item.item_code ).First();//&& a.S_BATCH_NO == item.S_BATCH_NO
                            if (cir != null)
                            {
                                cir.F_QTY -= item.qty;
@@ -2019,15 +2038,15 @@
                        var podetail = po.Details.Where(s => s.S_ITEM_CODE == item.item_code).FirstOrDefault();
                        CBcenterBackDto.HEADItem ckbitem = new CBcenterBackDto.HEADItem();
                        ckbitem.KEY = arrival_no;
                        ckbitem.WLBH = item.item_code;
                        ckbitem.CBZX = po.S_CBZX;
                        ckbitem.WLBH = item.item_code;
                        ckbitem.SL = item.qty;
                        ckbitem.KCDD = podetail?.S_KCDD;
                        ckbitem.LRZX = po.S_LRZX;
                        ckbitem.ZZKM = po.S_ZZKM;
                        ckbitem.GC = po.S_FACTORY;
                        ckbitem.GZRY = po.S_CREATOR_NAME;
                        ckbitem.GZRY = po.UNAME;
                        ckbitem.PC = podetail?.S_BATCH_NO;
                        ckbitem.PZRQ = PZZDRQ;
@@ -2243,7 +2262,7 @@
                    //json转xml
                    string xml = JsonConvert.DeserializeXmlNode(json, "ROOT").OuterXml;
                    LogHelper.Info($"出计划外发料出库xml数据{xml}");
                    LogHelper.Info($"计划外发料出库xml数据{xml}");
                    // 创建 StringContent 并指定媒体类型为 "text/xml"
                    //HttpContent content = new StringContent(xml, Encoding.UTF8, "application/xml");
                    //string url = Settings.WCSSeverUrl + "/api/WmsSap/cesReceiveXmlData";
@@ -2280,13 +2299,19 @@
                    //添加凭证记录表
                    result.resultMsg = data.ROOT.ITEM.MSGDESP;
                    result.resultCode = data.ROOT.ITEM.MSGCODE;
                    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();
                    foreach (var item in MaterList)
                    {
                        MaterialVoucher materialVoucher = new MaterialVoucher();
                        materialVoucher.S_NO = po.S_NO;
                        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?.WLPZBH;
                        materialVoucher.S_WLPZND = data.ROOT.ITEM?.WLPZND;
                        materialVoucher.STATUS = 0;
                        db.Insertable<MaterialVoucher>(materialVoucher).ExecuteCommand();
                    }
                    #endregion
                    db.CommitTran();
@@ -2325,6 +2350,13 @@
                    var startinfo = db.Queryable<Location>().Where(it => it.S_CODE == start).First();
                    //出库单详情
                    var po = db.Queryable<TN_Outbound_Order>().Includes(s => s.Details).Where(a => a.S_NO == arrival_no).First();
                    string GZRQ = "";
                    if (po.BUDAT != null)
                    {
                        GZRQ = DateTime.Parse(po.BUDAT.ToString()).ToString("yyyyMMdd");
                    }
                    //来源冲销凭证对应的物料凭证信息
                    //var poIn = db.Queryable<TN_Inbound_Order>().Includes(s => s.Details).Where(a => a.S_NO == po.S_BS_NO).First();
                    //根据入库查看凭证编号信息
@@ -2334,71 +2366,102 @@
                    {
                        ROOT = new CXCkBackDto.ROOT
                        {
                            HEAD = new CXCkBackDto.HEAD
                            HEAD = new List<CXCkBackDto.HEAD>
                            {
                                WLPZ = po.S_WLPZ,
                                WLPZNF = po.S_WLPZNF,
                                WLPZXM = MaterList[0].N_ROW_NO,
                                GZRQ = "2025-03-20",
                                SRRQ = "2025-03-19",
                                GZRY = "过账人员姓名"
                                //GZRQ = GZRQ,
                                //SRRQ = PZZDRQ,
                                //WLPZ = po.S_WLPZ,
                                //WLPZNF = po.S_WLPZNF,
                                //WLPZXM = MaterList[0].N_ROW_NO,
                                //GZRY = po.UNAME
                            }
                        }
                    };
                    //回参物料信息
                    //List<OutboundRecord> records = new List<OutboundRecord>();
                    //foreach (var item in MaterList)
                    //{
                    List<CXCkBackDto.HEAD> listhead = new List<CXCkBackDto.HEAD>();
                    foreach (var item in po.Details)
                    {
                        CXCkBackDto.HEAD hEAD = new CXCkBackDto.HEAD();
                        hEAD.GZRQ = GZRQ;
                        hEAD.SRRQ = DateTime.Now.ToString("yyyyMMdd");
                        hEAD.WLPZ = po.S_NO;
                        hEAD.WLPZNF = po.S_WLPZND;
                        hEAD.WLPZXM = item.N_ROW_NO;
                        hEAD.GZRY = po.UNAME;
                        listhead.Add(hEAD);
                    }
                    myRoot.ROOT.HEAD = listhead;
                    //    db.BeginTran();
                    //    //出库记录
                    //    var pz = db.Queryable<MaterialVoucher>().Where(a => a.S_NO == arrival_no).First();
                    //    OutboundRecord outboundRecord = new OutboundRecord();
                    //    outboundRecord.S_WLPZBH = pz.S_WLPZBH;
                    //    outboundRecord.S_WLPZND = pz.S_WLPZND;
                    //    outboundRecord.S_NO = arrival_no;
                    //    outboundRecord.S_WLBM = item.item_code;
                    //    outboundRecord.S_SL = item.qty;
                    //    outboundRecord.S_CNTR_CODE = cntr_code;
                    //    records.Add(outboundRecord);
                    //}
                    //db.Insertable<OutboundRecord>(records).ExecuteCommand();
                    #region wms-sap回调
                    //类转json
                    var json = JsonConvert.SerializeObject(myRoot.ROOT);
                    //json转xml
                    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();
                    }
                    ZSCM2_CXPZ service = new ZSCM2_CXPZ();
                    //  service.Credentials = new NetworkCredential("CONN_RFC", "Init.1234");
                    // 准备请求参数
                    ZfmScm2CxpzMm001 request = new ZfmScm2CxpzMm001();
                    request.Input = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>" + xml;
                    LogHelper.Info($"通用冲销SAP回调");
                    // 调用Web Service
                    ZfmScm2CxpzMm001Response responses = service.ZfmScm2CxpzMm001(request);
                    // 处理响应
                    LogHelper.Info("通用冲销SAP返回结果: " + responses.Output);
                    XmlDocument xmlDoc = new XmlDocument();
                    xmlDoc.LoadXml(responseXml.ToString());
                    xmlDoc.LoadXml(responses.Output.ToString());
                    JObject jsonObject = JsonConvert.DeserializeObject<JObject>(JsonConvert.SerializeXmlNode(xmlDoc));
                    var data = JsonConvert.DeserializeObject<ReturnWcBcak.Root>(jsonObject.ToString());
                    var data = JsonConvert.DeserializeObject<ReturnTYBcak.Root>(jsonObject.ToString());
                    var resmeg = "";
                    int rescode = 0;
                    //添加凭证记录表
                    result.resultMsg = data.ROOT.ITEM.MSGDESP;
                    result.resultCode = data.ROOT.ITEM.MSGCODE;
                    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();
                    if (data!=null)
                    {
                        List<MaterialVoucher> materiallist = new List<MaterialVoucher>();
                        foreach (var item in data.ROOT.ITEM)
                        {
                            if (item.MSGCODE == 0)
                            {
                                MaterialVoucher materialVoucher = new MaterialVoucher();
                                materialVoucher.S_NO = po.S_NO;
                                materialVoucher.S_TYPE = po.S_OUT_TYPE;
                                materialVoucher.S_WLPZBH = item?.WLPZBH;
                                materialVoucher.S_WLPZND = item?.WLPZND;
                                materialVoucher.S_WLPZHXM = item?.WLPZHXM;
                                materialVoucher.S_YWLPZBH = item?.YWLPZBH;
                                materialVoucher.S_YWLPZND = item?.YWLPZND;
                                materialVoucher.S_YWLPZHXM = item?.YWLPZHXM;
                                materialVoucher.STATUS = 0;
                                resmeg += item?.MSGDESP;
                                materiallist.Add(materialVoucher);
                            }
                            else {
                                rescode = 1;
                            }
                        }
                        if (materiallist.Count()>0)
                        {
                            db.Insertable<MaterialVoucher>(materiallist).ExecuteCommand();
                        }
                    }
                    result.resultMsg = resmeg;
                    result.resultCode = rescode;
                    #endregion
                    db.CommitTran();
@@ -2632,7 +2695,10 @@
                try
                {
                    if (MaterList.Count()<1)
                    {
                        throw new Exception("累计码盘数量物料数据为空");
                    }
                    foreach (var item in MaterList)
                    {
                        var allInfolist = db.Queryable<TN_Inbound_Detail>()
@@ -2670,7 +2736,7 @@
                                    else
                                    {
                                        //2.插入新的容器物料信息(容器号不变S_SERIAL_NO = item.S_SERIAL_NO,)
                                        cir = new CntrItemRel { S_CNTR_CODE = cntr.S_CODE.Trim(), S_BATCH_NO = item.S_BATCH_NO,  N_BS_ROW_NO = item.N_ROW_NO, F_QTY = item.qty, S_ITEM_CODE = item.item_code, S_BS_NO = item.arrival_no };
                                        cir = new CntrItemRel { S_CNTR_CODE = cntr.S_CODE.Trim(), S_UOM=info.S_UOM, S_BATCH_NO = item.S_BATCH_NO,  N_BS_ROW_NO = item.N_ROW_NO, F_QTY = item.qty, S_ITEM_CODE = item.item_code, S_BS_NO = item.arrival_no };
                                        db.Insertable<CntrItemRel>(cir).ExecuteCommand();
                                    }
                                    var count = db.Queryable<CntrItemRel>().Count(a => a.S_CNTR_CODE == cntr.S_CODE);
@@ -2999,7 +3065,7 @@
                    else
                    {
                        //var az = db.Queryable<AZInventory>().ToList();
                        var po1 = new TN_Outbound_Order { S_NO = WMSHelper.GenerateShippNo(), S_FACTORY = po.S_FACTORY, S_OUT_TYPE = po.S_OUT_TYPE, S_BS_TYPE = po.S_BS_TYPE, S_AREA_CODE = po.S_AREA_CODE, S_BS_NO = po.S_NO };
                        var po1 = new TN_Outbound_Order { S_NO = WMSHelper.GenerateShippNo(),UNAME=po.UNAME, S_FACTORY = po.S_FACTORY,S_CBZX=po.S_CBZX,S_ZZKM=po.S_ZZKM,S_LRZX=po.S_LRZX, BLDAT = po.BLDAT, BUDAT=po.BUDAT, S_OUT_TYPE = po.S_OUT_TYPE, S_BS_TYPE = po.S_BS_TYPE, S_AREA_CODE = po.S_AREA_CODE, S_BS_NO = po.S_NO };
                        po1.Details = new List<TN_Outbound_Detail>();
                        if (po.Details.Count() > 0)
@@ -3013,8 +3079,10 @@
                                        S_DO_NO = po1.S_NO,
                                        S_AREA_CODE = "HJQ",
                                        N_ROW_NO = a.N_ROW_NO,
                                        S_KCDD = a.S_KCDD,
                                        S_ITEM_CODE = a.S_ITEM_CODE,
                                        S_ITEM_NAME = a.S_ITEM_NAME,
                                        S_UOM = a.S_UOM,
                                        F_QTY = a.F_QTY - a.F_ACC_D_QTY,
                                        S_BATCH_NO = a.S_BATCH_NO,
                                        S_SERIAL_NO = a.S_SERIAL_NO,
@@ -3892,14 +3960,14 @@
                        {
                            ROOT = new CXCkBackDto.ROOT
                            {
                                HEAD = new CXCkBackDto.HEAD
                                HEAD = new List<CXCkBackDto.HEAD>
                                {
                                    WLPZ = materpz.S_WLPZ,
                                    WLPZNF = materpz.S_WLPZNF,
                                    WLPZXM = null,
                                    GZRQ = "2025-03-20",
                                    SRRQ = DateTime.Now.ToString(),
                                    GZRY = "过账人员姓名"
                                    //WLPZ = materpz.S_WLPZ,
                                    //WLPZNF = materpz.S_WLPZNF,
                                    //WLPZXM = null,
                                    //GZRQ = "2025-03-20",
                                    //SRRQ = DateTime.Now.ToString(),
                                    //GZRY = "过账人员姓名"
                                }
                            }
                        };
@@ -3948,7 +4016,7 @@
                }
                catch (Exception ex)
                {
                    LogHelper.Info($"入库回调报错{ex.Message}");
                    LogHelper.Info($"冲销回库回调报错{ex.Message}");
                    db.RollbackTran();
                    throw;
                }