Merge branch 'master' into wxw

wxw

8 天以前 6a738089d6471d048c32ce7f3dcbd15c935ada79

 Admin.NET/WCS.Application/Util/HttpService.cs

@@ -17,7 +17,7 @@
    private static readonly ISqlSugarClient _db = SqlSugarSetup.ITenant.GetConnectionScope(SqlSugarConst.MainConfigId);
    public HttpService()
    {
        var _sysConfigService = App.GetService<SysConfigService>();//todo 这里需要测试下生命周期问题
        var _sysConfigService = App.GetService<SysConfigService>();// todo 这里需要测试下生命周期问题
        Urls = _sysConfigService.GetSystemInfo().Result;
    }

@@ -64,7 +64,12 @@
                    TaskNo = result.TaskList.TaskNo,
                    Levels = 999,
                    EndLocate = result.TaskList.EndLocate,
                    EndRoadway = result.TaskList.EndRoadway
                    EndRoadway = result.TaskList.EndRoadway,
                    OrderNo=result.TaskList.OrderNo,

                    SkuName= result.TaskList.SkuName,//物料名称
                    LotNo= result.TaskList.LotNo,//批次号
                    Qty= Convert.ToDecimal(result.TaskList.Qty),//入库数量
                };

                _db.Insertable(taskAdd).ExecuteCommand();