From 6c37fcdb0a97f69382420653d72ff2dcbc4d849e Mon Sep 17 00:00:00 2001
From: FanLian <fanlian2@163.com>
Date: Tue, 8 Aug 2023 15:12:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=81=94=E6=A0=B8=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3Taskcode?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Tnb.WarehouseMgr/DeviceProviderService.cs |  2 +-
 .../LocationDefinitionService.cs              | 22 +++++++++----------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/WarehouseMgr/Tnb.WarehouseMgr/DeviceProviderService.cs b/WarehouseMgr/Tnb.WarehouseMgr/DeviceProviderService.cs
index 61588ff9..9e23a680 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/DeviceProviderService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/DeviceProviderService.cs
@@ -83,7 +83,7 @@ namespace Tnb.WarehouseMgr
             {
                 var eles = await _db.Queryable<WmsElevatorH>().LeftJoin<WmsElevatorD>((a, b) => a.id == b.bill_id)
                     .LeftJoin<WmsDistaskH>((a, b, c) => b.location_id == c.endlocation_id)
-                    .Where((a, b, c) => c.endlocation_code == input.targetName && c.bill_code == $"{input.taskChainCode}-{input.taskCode}")
+                    .Where((a, b, c) => c.endlocation_code == input.targetName && c.bill_code == input.taskCode)
                     .ToListAsync();
             }
             catch (Exception)
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/LocationDefinitionService.cs b/WarehouseMgr/Tnb.WarehouseMgr/LocationDefinitionService.cs
index 28853ff5..ab6a1016 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/LocationDefinitionService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/LocationDefinitionService.cs
@@ -36,8 +36,6 @@ namespace Tnb.WarehouseMgr
             int row = 0;
             try
             {
-                //例1 获取所有表
-
                 List<Dictionary<string, object>> dics = await ImportExcelToMemory(file);
                 List<BasLocation> locs = new List<BasLocation>();
                 BasLocation loc = new BasLocation();
@@ -55,16 +53,16 @@ namespace Tnb.WarehouseMgr
                     }
                 }
                 locs.ForEach(x =>
-            {
-                x.id = SnowflakeIdHelper.NextId();
-                x.org_id = _userManager.User.OrganizeId;
-                x.is_lock = 0;
-                x.create_id = _userManager.UserId;
-                x.create_time = DateTime.Now;
-                x.modify_id = null;
-                x.modify_time = null;
-                x.is_mix = 1;
-            });
+                {
+                    x.id = SnowflakeIdHelper.NextId();
+                    x.org_id = _userManager.User.OrganizeId;
+                    x.is_lock = 0;
+                    x.create_id = _userManager.UserId;
+                    x.create_time = DateTime.Now;
+                    x.modify_id = null;
+                    x.modify_time = null;
+                    x.is_mix = 1;
+                });
 
                 await _db.Ado.BeginTranAsync();
                 row = await _db.Insertable(locs).ExecuteCommandAsync();