销售发货合并

WarehouseMgr/Tnb.WarehouseMgr/WmsCarryService.cs

@@ -81,7 +81,7 @@ namespace Tnb.WarehouseMgr
         public async Task<dynamic> GetCarryInfoByCode([FromRoute] string carrycode)
         {
             var carryOutPut = await _db.Queryable<WmsCarryH>().Where(it => it.carry_code == carrycode).FirstAsync();
-            
+
             return carryOutPut;
         }
         /// <summary>
@@ -303,7 +303,7 @@ namespace Tnb.WarehouseMgr
         {
             if (input.barCodes == null || input.barCodes.Count < 1) throw new ArgumentNullException(nameof(input.barCodes));
             input.barCodes = input.barCodes.OrderBy(o => o).ToList();
-            base.BarCodePrint(input.barCodes, input.copies,"");
+            base.BarCodePrint(input.barCodes, input.copies, "");
         }
 
 
@@ -350,7 +350,7 @@ namespace Tnb.WarehouseMgr
                 wmsCarrybindH.location_code = wmsCarryH.location_code;
 
                 List<WmsCarrybindCode> wmsCarrybindCodes = new List<WmsCarrybindCode>();
-            
+
                 var wmsCarrybindCode = input.Adapt<WmsCarrybindCode>();
                 wmsCarrybindCode.carrybind_id = wmsCarrybindH.id;
 
@@ -381,7 +381,7 @@ namespace Tnb.WarehouseMgr
         /// <exception cref="AppFriendlyException"></exception>
 
         [HttpPost, NonUnify, AllowAnonymous]
-        public async Task<dynamic> MaterialByCarry(MaterialByCarryInput input)
+        public async Task<Tnb.WarehouseMgr.Entities.Dto.Outputs.Result> MaterialByCarry(MaterialByCarryInput input)
         {
             try
             {
@@ -436,7 +436,7 @@ namespace Tnb.WarehouseMgr
                                     }
                                 }
                             }
-                           
+
                             break;
                         }
                     case WmsWareHouseConst.BIZTYPE_WmsRawmatOutstock_ID:
@@ -500,12 +500,12 @@ namespace Tnb.WarehouseMgr
                 }
 
 
-                return "成功";
+                return await ToApiResult(HttpStatusCode.OK, "成功", wmsCarryCodes);
             }
             catch (Exception ex)
             {
                 await _db.Ado.RollbackTranAsync();
-                throw new AppFriendlyException(ex.Message, 500);
+                return await ToApiResult(HttpStatusCode.InternalServerError, ex.Message);
             }
         }
     }