修改客户需求

zhaowc

2025-02-28 157abc191c34e57c1b958ae74fc3de6518ca8a30

 Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs

@@ -156,6 +156,7 @@
                            data.ProductionTime = boxInfo.ProductionTime!= null ? ((DateTime)boxInfo.ProductionTime).ToString("yyyy-MM-dd"):"";
                            data.ExpirationTime = boxInfo.ExpirationTime != null ? ((DateTime)boxInfo.ExpirationTime).ToString("yyyy-MM-dd") : "";
                            data.StoreTime = boxInfo.StoreTime != null ? ((DateTime)boxInfo.StoreTime).ToString("yyyy-MM-dd") : "";
                            
                        }
                    }
                }
@@ -163,6 +164,7 @@
                var labelQty = Db.Queryable<BllBoxInfo>().Where(m => m.IsDel == "0" && m.ASNDetailNo == id).Sum(m => m.Qty);
                var qty = detail.Qty - labelQty;
                data.Qty = qty.ToString();
                data.SupplierLot = detail.SupplierLot;
                return data;
            }
            catch (Exception e)
@@ -213,7 +215,7 @@
                        break;
                    case "6"://代储入库
                        skuType = "(0,1,2,3,4)";
                        IsPack = 2; //不贴
                        //IsPack = 2; //不贴
                        break;
                    case "7"://寄存入库
                        //skuType = "(3)";
@@ -1269,45 +1271,45 @@
                };

                #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