Merge branch 'master' of https://codeup.aliyun.com/62ce7bca487c500c27f70a79/OPS/WMS-Api

src/WMS.Web.Api/Controllers/SysConfigController.cs

@@ -229,6 +229,7 @@ namespace WMS.Web.Api.Controllers
                 return Result<List<UcStockResponse>>.ReSuccess(list);
 
             var subs = await _erpService.BillQueryForSubStock();
+            if (!subs.IsSuccess) return Result<List<UcStockResponse>>.ReFailure(ResultCodes.ErpSubStockError);
             var res = subs.Data.Where(w => w.OrgCode.Equals(orgCode) && w.StockCode.Equals(number));
             if (!string.IsNullOrEmpty(name))
                 res = res.Where(w => w.Name.Contains(name));

src/WMS.Web.Core/Dto/ChangeBoxRecord/ChangeBoxRecordQueryResponse.cs

@@ -39,7 +39,7 @@ namespace WMS.Web.Core.Dto.ChangeBoxRecord
         /// <summary>
         /// 原箱子
         /// </summary>
-        [Column("原箱号")]
+        [Column("原有箱号")]
         public string SrcBox { get; set; }
         /// <summary>
         /// 原仓位

src/WMS.Web.Core/Dto/OutStock/OutStockQueryInfoResponse.cs

@@ -21,26 +21,6 @@ namespace WMS.Web.Core.Dto.OutStock
         [Column("出库单号")]
         public string BillNo { get; set; }
         /// <summary>
-        /// 单据类型
-        /// </summary>
-        [Column("出库类型")]
-        public string Type { get; set; }
-        /// <summary>
-        /// 创建人
-        /// </summary>
-        [Column("创建人")]
-        public string Creator { get; set; }
-        /// <summary>
-        /// 创建时间（出库时间）
-        /// </summary>
-        [Column("出库时间")]
-        public string CreateTime { get; set; }
-        /// <summary>
-        /// 同步成功或者失败 null 就是未同步
-        /// </summary>
-        [Column("金蝶同步状态")]
-        public string SuccessSync { get; set; }
-        /// <summary>
         /// 来源单号
         ///</summary> 
         [Column("来源单号")]
@@ -51,16 +31,6 @@ namespace WMS.Web.Core.Dto.OutStock
         [Column("销售订单号")]
         public string SaleBillNo { get; set; }
         /// <summary>
-        /// 来源单号(集合)
-        ///</summary> 
-        [Ignore]
-        public List<string> SourceBillNoList { get; set; } = new List<string>();
-        /// <summary>
-        /// 销售订单号(集合)
-        ///</summary> 
-        [Ignore]
-        public List<string> SaleBillNoList { get; set; } = new List<string>();
-        /// <summary>
         /// 发货组织
         ///</summary> 
         [Column("发货组织")]
@@ -71,20 +41,26 @@ namespace WMS.Web.Core.Dto.OutStock
         [Column("收货客户")]
         public string ReceiptCustomer { get; set; }
         /// <summary>
-        /// 物料名称
+        /// 单据类型
         /// </summary>
-        [Column("物料名称")]
+        [Column("出库类型")]
-        public string MaterialName { get; set; }
+        public string Type { get; set; }
+        /// <summary>
+        /// 物料规格型号
+        /// </summary>
+        [Column("规格型号")]
+        public string Specifications { get; set; }
         /// <summary>
         /// 物料编码
         /// </summary>
         [Column("物料编码")]
         public string MaterialNumber { get; set; }
         /// <summary>
-        /// 物料规格型号
+        /// 物料名称
         /// </summary>
-        [Column("规格型号")]
+        [Column("物料名称")]
-        public string Specifications { get; set; }
+        public string MaterialName { get; set; }
+        
         /// <summary>
         /// 单位
         /// </summary>
@@ -101,9 +77,35 @@ namespace WMS.Web.Core.Dto.OutStock
         [Column("出库数量")]
         public decimal Qty { get; set; }
         /// <summary>
+        /// 创建人
+        /// </summary>
+        [Column("创建人")]
+        public string Creator { get; set; }
+        /// <summary>
+        /// 创建时间（出库时间）
+        /// </summary>
+        [Column("出库时间")]
+        public string CreateTime { get; set; }
+        /// <summary>
+        /// 同步成功或者失败 null 就是未同步
+        /// </summary>
+        [Column("金蝶同步状态")]
+        public string SuccessSync { get; set; }
+       
+        /// <summary>
+        /// 来源单号(集合)
+        ///</summary> 
+        [Ignore]
+        public List<string> SourceBillNoList { get; set; } = new List<string>();
+        /// <summary>
+        /// 销售订单号(集合)
+        ///</summary> 
+        [Ignore]
+        public List<string> SaleBillNoList { get; set; } = new List<string>();
+        /// <summary>
         /// 备注
         /// </summary>
-        [Column("备注")]
+        [Ignore]
         public string Remark { get; set; }
     }
 }

src/WMS.Web.Core/Dto/OutStockTask/OutStockTaskQueryInfoResponse.cs

@@ -31,31 +31,6 @@ namespace WMS.Web.Core.Dto.OutStockTask
         [Column("出库状态")]
         public string Status { get; set; }
         /// <summary>
-        /// 单据类型
-        /// </summary>
-        [Column("出库类型")]
-        public string Type { get; set; }
-        /// <summary>
-        /// 操作人（出库人）
-        /// </summary>
-        [Column("出库人")]
-        public string Operator { get; set; }
-        /// <summary>
-        /// 操作时间（出库时间）
-        /// </summary>
-        [Column("出库时间")]
-        public string OperateTime { get; set; }
-        /// <summary>
-        /// 出库人
-        /// </summary>
-        [Column("出库人")]
-        public string OutStock { get; set; }
-        /// <summary>
-        /// 出库时间
-        /// </summary>
-        [Column("出库时间")]
-        public string OutStockTime { get; set; }
-        /// <summary>
         /// 来源单号
         ///</summary> 
         [Column("来源单号")]
@@ -66,16 +41,6 @@ namespace WMS.Web.Core.Dto.OutStockTask
         [Column("销售订单号")]
         public string SaleBillNo { get; set; }
         /// <summary>
-        /// 来源单号(集合)
-        ///</summary> 
-        [Ignore]
-        public List<string> SourceBillNoList { get; set; } = new List<string>();
-        /// <summary>
-        /// 销售订单号(集合)
-        ///</summary> 
-        [Ignore]
-        public List<string> SaleBillNoList { get; set; } = new List<string>();
-        /// <summary>
         /// 发货组织
         ///</summary> 
         [Column("发货组织")]
@@ -86,20 +51,30 @@ namespace WMS.Web.Core.Dto.OutStockTask
         [Column("收货客户")]
         public string ReceiptCustomer { get; set; }
         /// <summary>
-        /// 物料名称
+        /// 单据类型
         /// </summary>
-        [Column("物料名称")]
+        [Column("出库类型")]
-        public string MaterialName { get; set; }
+        public string Type { get; set; }
+        /// <summary>
+        /// 物料规格型号
+        /// </summary>
+        [Column("规格型号")]
+        public string Specifications { get; set; }
         /// <summary>
         /// 物料编码
         /// </summary>
         [Column("物料编码")]
         public string MaterialNumber { get; set; }
         /// <summary>
-        /// 物料规格型号
+        /// 物料名称
         /// </summary>
-        [Column("规格型号")]
+        [Column("物料名称")]
-        public string Specifications { get; set; }
+        public string MaterialName { get; set; }
+        /// <summary>
+        /// 单位
+        /// </summary>
+        [Column("单位")]
+        public string Unit { get; set; }
         /// <summary>
         /// 仓库
         ///</summary> 
@@ -116,21 +91,6 @@ namespace WMS.Web.Core.Dto.OutStockTask
         [Column("已出库数量")]
         public decimal RealityQty { get; set; }
         /// <summary>
-        /// 订单明细备注
-        ///</summary> 
-        [Column("订单明细备注")]
-        public string Remark { get; set; }
-        /// <summary>
-        /// 创建时间（erp那边的创建时间）
-        ///</summary> 
-        [Column("创建时间")]
-        public string CreateTime { get; set; }
-        /// <summary>
-        /// 单位
-        /// </summary>
-        [Column("单位")]
-        public string Unit { get; set; }
-        /// <summary>
         /// 出库开始时间
         ///</summary> 
         [Column("出库开始时间")]
@@ -140,5 +100,49 @@ namespace WMS.Web.Core.Dto.OutStockTask
         ///</summary> 
         [Column("出库结束时间")]
         public string OutStockEndTime { get; set; }
+        /// <summary>
+        /// 操作人
+        /// </summary>
+        [Ignore]
+        public string Operator { get; set; }
+        /// <summary>
+        /// 操作时间
+        /// </summary>
+        [Ignore]
+        public string OperateTime { get; set; }
+        /// <summary>
+        /// 出库人
+        /// </summary>
+        [Column("出库人")]
+        public string OutStock { get; set; }
+        /// <summary>
+        /// 出库时间
+        /// </summary>
+        [Column("出库时间")]
+        public string OutStockTime { get; set; }
+       
+        /// <summary>
+        /// 来源单号(集合)
+        ///</summary> 
+        [Ignore]
+        public List<string> SourceBillNoList { get; set; } = new List<string>();
+        /// <summary>
+        /// 销售订单号(集合)
+        ///</summary> 
+        [Ignore]
+        public List<string> SaleBillNoList { get; set; } = new List<string>();
+        
+        /// <summary>
+        /// 订单明细备注
+        ///</summary> 
+        [Column("订单明细备注")]
+        public string Remark { get; set; }
+        /// <summary>
+        /// 创建时间（erp那边的创建时间）
+        ///</summary> 
+        [Column("创建时间")]
+        public string CreateTime { get; set; }
+        
+        
     }
 }

src/WMS.Web.Domain/Services/Public/ErpService.cs

@@ -1288,7 +1288,7 @@ namespace WMS.Web.Domain.Services.Public
             }
             catch (Exception)
             {
-                return ResultList<Erp_SubStockDto>.ReFailure("错误", 10002);
+                return ResultList<Erp_SubStockDto>.ReFailure(ResultCodes.ErpSubStockError);
             }
         }
 

src/WMS.Web.Domain/Services/SerialNumberService.cs

@@ -445,7 +445,7 @@ namespace WMS.Web.Domain.Services
         {
             var serialNumbers = takeStocks.SelectMany(s => s.Details).SelectMany(s => s.SerialNumbers).ToList();
             var entityList = await _serialNumbersRepositories.GetEntityList(serialNumbers);
-            var boxIds = entityList.Select(s => s.BoxId).ToList();
+            var boxIds = takeStocks.SelectMany(s=>s.Details).Select(s => s.BoxId).ToList();
             var boxList = await _boxRepositories.GetEntityList(boxIds);
 
             List<Box> box_New_List = new List<Box>();

src/WMS.Web.Domain/Values/ResultCodes.cs

@@ -56,6 +56,7 @@ namespace WMS.Web.Domain.Values
         public static ValueTuple<int, string> ErpOrgError = (80004, "获取Erp相关组织数据失败，请稍候再试！");
         public static ValueTuple<int, string> ErpSupplierError = (80005, "获取Erp相关供应商数据失败，请稍候再试！");
         public static ValueTuple<int, string> ErpStockError = (80006, "获取Erp相关仓库数据失败，请稍候再试！");
+        public static ValueTuple<int, string> ErpSubStockError = (80006, "获取Erp相关子仓库数据失败，请稍候再试！");
         public static ValueTuple<int, string> ErpMaterialError = (80007, "获取Erp相关物料数据失败，请稍候再试！");
         public static ValueTuple<int, string> BoxHaveError = (80008, "箱号已收货");
         public static ValueTuple<int, string> AdjustError = (80009, "与金蝶校准发生错误，请稍候再试！");