修改问题

IPC-610

2025-01-02 286db121ac6b7e56b1b579ebcdd191526890f4af

 Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs

@@ -22,6 +22,7 @@
using System.Security.Policy;
using WMS.Entity.DataEntity;
using WMS.Entity.BllQualityEntity;
using Microsoft.VisualBasic;

namespace WMS.BLL.BllAsnServer
{
@@ -344,6 +345,16 @@
                            continue;
                        }
                    }
                    if (!string.IsNullOrEmpty(detailModel.IsBale))
                    {
                        detailModel.IsBale = detailModel.IsBale == "是" ? "1" : "0";
                        if (detailModel.IsBale != "1" && detailModel.IsBale != "0")
                        {
                            //判断是否裹包
                            strMessage = "-1:裹包字段只能录入“是”或“否”;";
                            continue;
                        }
                    }
                    if (model.Type != "7")
                    {
                        if (!TypeLot.Contains(model.Type))
@@ -439,7 +450,7 @@
                        {
                            var time1 = DateTime.Now;//发送时间 .ToString("yyyy-MM-dd HH:mm:ss")
                            //给WCS下发入库单信息
                            response = HttpHelper.DoPost(url, jsonData, "下发给WCS出库命令", "WCS");
                            response = HttpHelper.DoPost(url, jsonData, "下发给WCS入库命令", "WCS");

                            //解析返回数据 
                            var wcsModel = JsonConvert.DeserializeObject<WcsModel>(response);
@@ -498,6 +509,7 @@
                    return strMessage;
                }


                sqlString += $"select * from BllArrivalNotice where ASNNo = '{model.ASNNo}' and isDel = '0';";
                var asnInfo = Db.Ado.SqlQuery<BllArrivalNotice>(sqlString).FirstOrDefault();
                if (asnInfo.Status != "0")
@@ -550,6 +562,16 @@
                    {
                        strMessage = "-1:批次号不可为空;";
                        continue;
                    }
                    if (!string.IsNullOrEmpty(detailModel.IsBale))
                    {
                        detailModel.IsBale = detailModel.IsBale == "是" ? "1" : "0";
                        if (detailModel.IsBale != "1" && detailModel.IsBale != "0")
                        {
                            //判断是否裹包
                            strMessage = "-1:裹包字段只能录入“是”或“否”;";
                            continue;
                        }
                    }

                    if (model.Type == "2")   // 2：中间品入库
@@ -997,11 +1019,11 @@
                    resultModel.Message = "单据类型不可为空!";
                    return resultModel;
                }
                if (string.IsNullOrEmpty(model.Customer))
                {
                    resultModel.Message = "客户不可为空!";
                    return resultModel;
                }
                //if (string.IsNullOrEmpty(model.Customer))
                //{
                //    resultModel.Message = "客户不可为空!";
                //    return resultModel;
                //}
                if (string.IsNullOrEmpty(model.OrderCode))
                {
                    resultModel.Message = "上游系统单号不可为空!";
@@ -1014,11 +1036,14 @@
                }

                // 根据客户编号获取客户名称
                var custname = "";
                var CustomerModel = Db.Queryable<SysCustomer>().First(it => it.CustomerNo == model.Customer && it.IsDel == "0");
                if (CustomerModel == null)
                if (CustomerModel != null)
                {
                    resultModel.Message = "客户编号不存在!";
                    return resultModel;
                    custname = CustomerModel.CustomerName;
                    //CustomerModel.CustomerName = "";
                    //resultModel.Message = "客户编号不存在!";
                    //return resultModel;
                }

                // 入库总表信息
@@ -1029,7 +1054,7 @@
                    Type = model.AsnType,
                    Origin = string.IsNullOrEmpty(model.Origin) ? "ERP" : model.Origin,
                    CustomerNo = model.Customer,
                    CustomerName = CustomerModel.CustomerName,
                    CustomerName = custname,
                    OrderCode = model.OrderCode,
                };

@@ -1177,7 +1202,8 @@
                if (mesList.Contains(notice.Type)) // mes 
                {
                    //获取令牌
                    var token = new Token().GetMesToken(mesTokenUrl);
                    //var token = new Token().GetMesToken(mesTokenUrl); //测试不使用TOKEN，正式运行时放开
                    var token = "";
                    Dictionary<string, string> mesDic = new Dictionary<string, string>()
                    {
                        {"Authorization",token }
@@ -1192,7 +1218,7 @@
                    var response = HttpHelper.DoPost(mesUrl, jsonData, "入库单完成上传", "MES", mesDic);

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