解决问题

zhaowc

2025-03-27 d07f25c163706ac46a83bd2c63db1e3c52715222

 Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs

@@ -1073,6 +1073,7 @@
                    CustomerNo = model.Customer,
                    CustomerName = custname,
                    OrderCode = model.OrderCode,
                    Status = "0",
                };

                // 入库明细表信息
@@ -1115,10 +1116,17 @@
                        LotNo = asnDetailModel.LotNo,
                        LotText = "",
                        Qty = (decimal)asnDetailModel.Qty,
                        PackagNo = asnDetailModel.PackagNo,
                        FactQty = 0,
                        CompleteQty = 0,
                        Price = 0,
                        Money = 0,
                        IsBale = "",
                        IsBelt = "",
                        PackagNo = skuModel.PackagNo,
                        SupplierLot = asnDetailModel.SupplierLot,
                        Status = "0",
                        CreateUser = 0

                    };

                    detailModels.Add(detailModel);
@@ -1238,6 +1246,10 @@
                {
                    throw new Exception("复核失败，复核人员和关闭订单人员不能相同！");
                }
                if (date.Id == notice.CreateUser)
                {
                    throw new Exception("复核失败，复核人员和创建订单人员不能相同！");
                }
                //单据类型是 成品入库或采购入库 判断入库物料是否合格
                if (notice.Type == "0" || notice.Type == "1")
                {
@@ -1272,46 +1284,46 @@

                #region 通过接口发送至erp 或 mes
                ////系统对接后放开
                //var jsonData = JsonConvert.SerializeObject(asnInfo);
                //var mesList = new List<string>() { "0", "4" };  //0 成品入库 4余料退回入库
                //var erpList = new List<string>() { "1", "2", "3" }; //1 采购入库  2中间品入库  3 退货入库
                var jsonData = JsonConvert.SerializeObject(asnInfo);
                var mesList = new List<string>() { "0", "4" };  //0 成品入库 4余料退回入库
                var erpList = new List<string>() { "1", "2", "3" }; //1 采购入库  2中间品入库  3 退货入库

                //if (mesList.Contains(notice.Type)) // mes 
                //{
                //    //获取令牌
                //    //var token = new Token().GetMesToken(mesTokenUrl); //测试不使用TOKEN，正式运行时放开
                //    var token = "";
                //    Dictionary<string, string> mesDic = new Dictionary<string, string>()
                //    {
                //        {"Authorization",token }
                //    };
                //    var mesData = new FinishAsnModel()
                //    {
                //        no = asnInfo.OrderCode,
                //        qty = asnInfo.AsnDetails.Sum(m=>m.Qty)
                //    };
                //    jsonData = JsonConvert.SerializeObject(mesData);
                //    //调用接口
                //    var response = HttpHelper.DoPost(mesUrl, jsonData, "入库单完成上传", "MES", mesDic);
                if (mesList.Contains(notice.Type)) // mes 
                {
                    //获取令牌
                    //var token = new Token().GetMesToken(mesTokenUrl); //测试不使用TOKEN，正式运行时放开
                    var token = "";
                    Dictionary<string, string> mesDic = new Dictionary<string, string>()
                    {
                        {"Authorization",token }
                    };
                    var mesData = new FinishAsnModel()
                    {
                        no = asnInfo.OrderCode,
                        qty = asnInfo.AsnDetails.Sum(m => m.Qty)
                    };
                    jsonData = JsonConvert.SerializeObject(mesData);
                    //调用接口
                    var response = HttpHelper.DoPost(mesUrl, jsonData, "入库单完成上传", "MES", mesDic);

                //    var obj = JsonConvert.DeserializeObject<MesModel>(response);//解析返回数据
                //    if (obj.status != "success")
                //    {
                //        throw new Exception("上传失败" + obj.message);
                //    }
                //}
                //else if (erpList.Contains(notice.Type)) //erp  
                //{
                //    var response = HttpHelper.DoPost(erpUrl, jsonData, "入库单完成上传", "ERP");
                    var obj = JsonConvert.DeserializeObject<MesModel>(response);//解析返回数据
                    if (obj.status != "success")
                    {
                        throw new Exception("上传失败" + obj.message);
                    }
                }
                else if (erpList.Contains(notice.Type)) //erp  
                {
                    var response = HttpHelper.DoPost(erpUrl, jsonData, "入库单完成上传", "ERP");

                //    var obj = JsonConvert.DeserializeObject<ErpModel>(response);//解析返回数据
                //    if (obj.Success != 0)
                //    {
                //        throw new Exception("上传失败" + obj.Message);
                //    }
                //}
                    var obj = JsonConvert.DeserializeObject<ErpModel>(response);//解析返回数据
                    if (obj.Success != 0)
                    {
                        throw new Exception("上传失败" + obj.Message);
                    }
                }

                

                #endregion

                notice.Status = "4";