Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

WarehouseMgr/Tnb.WarehouseMgr/WmskittingOutService.cs

@@ -296,7 +296,7 @@ namespace Tnb.WarehouseMgr
                 //    isOk = row > 0;
                 //}
                 //判断当前载具是否为料架，如果是料架 清空所有料架/料箱数据，
-                if (carry.carrystd_id == WmsWareHouseConst.CARRY_LJSTD_ID)
+                if (carry.carrystd_id == WmsWareHouseConst.CARRY_LJSTD_ID && carryMIds?.Count > 0)
                 {
                     var carrys = await _db.Queryable<WmsCarryH>().Where(it => carryMIds.Contains(it.id)).ToListAsync();
                     carrys.Add(carry);
@@ -331,7 +331,7 @@ namespace Tnb.WarehouseMgr
         public async Task<dynamic> MESKittingOutStk(List<MESKittingOutStkInput> input)
         {
             var isSuccessFul = false;
-            if (input.IsNull()) throw new ArgumentNullException("input");
+            if (input.IsNull()) throw new ArgumentNullException(nameof(input));
             try
             {