From 1f781859e8ea86a9716bba0a9ae4cd850bfdd39f Mon Sep 17 00:00:00 2001
From: "yang.lee" <whitebig@126.com>
Date: Wed, 22 Nov 2023 10:39:31 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E4=BB=BB=E5=8A=A1bug?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Tnb.WarehouseMgr/WmsCheckTaskService.cs        | 14 ++++++++------
 .../Tnb.Vengine/AppService/VmodelAppService.cs     |  4 ++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs
index 3744a0e3..d919a626 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs
@@ -97,6 +97,7 @@ namespace Tnb.WarehouseMgr
                         {
                             throw new AppFriendlyException("该仓库还有未完成的任务，不允许盘点!", 500);
                         }
+                        input.data["tablefield114"] = null;
                         VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSCHECKTASK_ID, true);
                         await _runService.Create(templateEntity, input);
                         List<WmsCheckstockD> details = new();
@@ -165,7 +166,7 @@ namespace Tnb.WarehouseMgr
                                 details.Add(checkstockD);
                             }
                         }
-                        _ = await _db.Insertable(details).ExecuteCommandAsync();
+                        var r  = await _db.Insertable(details).ExecuteCommandAsync();
                         //生成预任务信息
                         if (details.Count > 0 && carryCodes.Count > 0)
                         {
@@ -186,7 +187,7 @@ namespace Tnb.WarehouseMgr
                                 if (locArr != null)
                                 {
                                     endLocs = await _db.Queryable<BasLocation>().Where(it => it.wh_id == input.data[nameof(WmsCheckstockH.warehouse_id)].ToString() && locArr.Contains(it.id)).ToArrayAsync();
-                                    randomIndex = Random.Shared.Next(0, endLocs.GetUpperBound(0));
+                                    randomIndex = Random.Shared.Next(0, endLocs.Length);
                                 }
                                 else
                                 {
@@ -308,18 +309,19 @@ namespace Tnb.WarehouseMgr
 
         private Task<List<WmsDistaskH>> FetchDisTasks(Expression<Func<WmsDistaskH, BasLocation, bool>> joinExp, Expression<Func<WmsDistaskH, BasLocation, bool>> whereExp)
         {
-            return _db.CopyNew().Queryable<WmsDistaskH>().InnerJoin<BasLocation>(joinExp).Where(whereExp).Select<WmsDistaskH>().ToListAsync();
-
+            var details= _db.CopyNew().Queryable<WmsDistaskH>().InnerJoin<BasLocation>(joinExp).Where(whereExp).Select<WmsDistaskH>().ToListAsync();
+            return details;
         }
         /// <summary>
         /// 根据盘点任务ID获取盘点任务明细
         /// </summary>
         /// <param name="checkStockId">盘点任务主表ID</param>
         /// <returns>盘点任务明细列表</returns>
-        [HttpGet("checkStockId")]
+        [HttpGet("{checkStockId}")]
         public async Task<List<WmsCheckstockD>> GetCheckStockDList(string checkStockId)
         {
-            return await _db.Queryable<WmsCheckstockD>().Where(it => it.checkstock_id == checkStockId).ToListAsync();
+            var details = await _db.Queryable<WmsCheckstockD>().Where(it => it.checkstock_id == checkStockId).ToListAsync();
+            return details;
         }
 
 
diff --git a/visualdev/Tnb.Vengine/AppService/VmodelAppService.cs b/visualdev/Tnb.Vengine/AppService/VmodelAppService.cs
index 605dfa94..886507cf 100644
--- a/visualdev/Tnb.Vengine/AppService/VmodelAppService.cs
+++ b/visualdev/Tnb.Vengine/AppService/VmodelAppService.cs
@@ -74,8 +74,8 @@ public class VmodelAppService : VengineAppService<Vmodel, VmodelGetInput, Vmodel
                 new VmDbProp{field="modify_time",csType="DateTime",length=0,digit=0,ordinal=17,required=false,pkey=false,fuzzy=false,defValue=null,descrip=null,code="modifyTime",name="修改时间"},
                 new VmDbProp{field="modify_id",csType="string",length=50,digit=0,ordinal=18,required=false,pkey=false,fuzzy=false,defValue=null,descrip=null,code="modifyId",name="修改人"}
             },
-            navProps = [],
-            calProps = [],
+            navProps = new(),
+            calProps = new(),
             ordinal = 0,
             softDelete = 0,
             enabled = 1,