测试流程，修改问题

chengsc

2024-08-19 5e2454c2a75cb70afc0d1933e5c29e02e21231e6

 Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs

@@ -18,6 +18,10 @@
using Dm;
using Model.InterFaceModel;
using WMS.Entity.BllQualityEntity;
using Newtonsoft.Json;
using Utility.Tools;
using System.Reflection;
using System.IO;

namespace WMS.BLL.BllPdaServer
{
@@ -1685,6 +1689,82 @@
        }

        #region 产品组托

        public void GetBoxInfoByFuMa(string boxNo,string url)
        {
            try
            {
                var list = new List<BllBoxInfo>();

                var data = new { BoxNo = boxNo };
                var jsonData = JsonConvert.SerializeObject(data);

                ////程序正式发布后放开
                //var time1 = DateTime.Now;//发送时间 .ToString("yyyy-MM-dd HH:mm:ss")
                //var response = HttpHelper.DoPost(url, jsonData,"获取箱码信息", "赋码");
                //var time2 = DateTime.Now;//返回时间 .ToString("yyyy-MM-dd HH:mm:ss")

                ////解析返回数据 
                //var fuMaModel = JsonConvert.DeserializeObject<FuMaModel>(response);
                //if (fuMaModel.Success == 0)
                //{

                    var datas = Assembly.GetExecutingAssembly();
                var s = "0";
                    //string filePath = "Assembly.GetExecutingAssembly()";
                    //string json = File.ReadAllText(filePath);
                    //var person = JsonConvert.DeserializeObject<BllBoxInfo>(json);

                    //var comTime = DateTime.Now;
                    ////添加箱码信息表中  //暂时这些写--添加数据，后续需要和赋码系统对接后 根据明确返回的数据格式更改
                    //var boxInfo = new BllBoxInfo()
                    //{
                    //    ASNNo = "",
                    //    //ASNDetailNo = 0,
                    //    OrderCode = "",
                    //    //BindNo = 0,
                    //    BoxNo = person.BoxNo,
                    //    BoxNo2 = "",
                    //    BoxNo3 = "",
                    //    PalletNo = "",
                    //    Qty = 0,
                    //    FullQty = 0,
                    //    Status = "0",
                    //    SkuNo = "",
                    //    SkuName = "",
                    //    LotNo = "",
                    //    LotText = "",
                    //    SupplierLot = "",
                    //    ProductionTime = DateTime.Now,
                    //    ExpirationTime = DateTime.Now,
                    //    //CompleteTime = comTime,
                    //    InspectMark = "0",
                    //    BitBoxMark = "0",
                    //    InspectStatus = "0",
                    //    Origin = "赋码",
                    //    Standard = "box.Standard",
                    //    PackageStandard = "box.PackageStandard",
                    //    StoreTime = DateTime.Now,
                    //    CreateUser = 0,
                    //    CreateTime = comTime,
                    //};
                    //Db.Insertable(boxInfo).ExecuteCommand();

                //}
                //if (fuMaModel.Success == -1)
                //{
                //    throw new Exception($"赋码系统返回状态异常：{fuMaModel.Message}");
                //}
                 

                 
            }
            catch (Exception e)
            {
                throw new Exception(e.Message);
            }
        }

        /// <summary>
        /// 根据箱码获取标签箱码信息
        /// </summary>
@@ -1698,6 +1778,12 @@
                {
                    throw new Exception("请扫描外箱条码!");
                }
                var count = Db.Queryable<BllBoxInfo>().Count(m => m.IsDel == "0" && m.Status == "0" && m.BoxNo == model.BoxNo);
                if (count == 0)
                {
                    GetBoxInfoByFuMa("",""); //从赋码系统获取箱码信息
                }

                string sqlString = $@"SELECT 
                                        ASNNo,
                                        BoxNo, 
@@ -2466,7 +2552,7 @@
                        SendDate = serverTime,  //发送时间
                        BackDate = serverTime,  //返回时间
                        StartLocat = "",//起始位置
                        EndLocat = "力诺平库",//目标位置
                        EndLocat = model.LocatNo,//目标位置
                        PalletNo = bindInfo.PalletNo,//托盘码
                        IsSend = 0,//是否可再次下发
                        IsCancel = 0,//是否可取消
@@ -2584,7 +2670,7 @@
                        SendDate = DateTime.Now,  //发送时间
                        BackDate = DateTime.Now,  //返回时间
                        StartLocat = "",//起始位置
                        EndLocat = "力诺平库",//目标位置
                        EndLocat = model.LocatNo,//目标位置
                        PalletNo = model.PalletNo,//托盘码
                        IsSend = 0,//是否可再次下发
                        IsCancel = 0,//是否可取消