From 2e0d2643b891b97e3ab7f4b28ede23607d506e5b Mon Sep 17 00:00:00 2001
From: lilili <webadmin@tedu.com>
Date: Thu, 11 May 2023 15:52:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=8E=B7=E5=8F=96=E6=9D=A1?=
 =?UTF-8?q?=E7=A0=81=E7=9A=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ICSSoft.DataProject/ICSSubmitService.cs        | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs
index 839f41d..718d000 100644
--- a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs
+++ b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs
@@ -1316,6 +1316,8 @@ namespace ICSSoft.DataProject
                     string Losql = "";
                     string sqlNew = "";
                     string LotType = "";
+                    string LotDetail = "";
+                    string con = "";
                     #region SLQ
                     if (TransType == TransTypeEnum.LocationSeatch.GetDescription())
                     {
@@ -1440,7 +1442,7 @@ namespace ICSSoft.DataProject
                                     inv.LotEnable,
                                     {0}
                                     inv.AmountUnit,
-                                    inv.EATTRIBUTE1 AS Area,
+                                    {5}
                                     ext.ID AS ExtensionID,
                                     ext.ProjectCode,
                                     ext.Version,
@@ -1461,6 +1463,7 @@ namespace ICSSoft.DataProject
                                     LEFT JOIN ICSContainerLot conlot ON a.LotNo=conlot.LotNo AND a.WorkPoint=conlot.WorkPoint
                                     LEFT JOIN ICSContainer con ON conlot.ContainerID=con.ID AND conlot.WorkPoint=con.WorkPoint
                                     INNER JOIN ICSInventory inv ON a.InvCode=inv.InvCode AND a.WorkPoint=inv.WorkPoint
+                                    {4} 
                                     WHERE  a.LotNo='{2}' AND a.WorkPoint='{3}' ";
                         }
                         else
@@ -2048,6 +2051,8 @@ namespace ICSSoft.DataProject
                                     INNER JOIN ICSWarehouse wh ON a.WarehouseCode=wh.WarehouseCode AND a.WorkPoint=wh.WorkPoint
                                     INNER JOIN ICSLocation loc ON a.LocationCode=loc.LocationCode AND a.WorkPoint=loc.WorkPoint
                                     LEFT JOIN ICSInventoryBatchEnable invBat ON a.InvCode=invBat.InvCode AND a.WarehouseCode=invBat.WHCode AND a.WorkPoint=invBat.WorkPoint";
+                                LotDetail = $@"LEFT JOIN ICSInventoryDetail detail ON inv.InvCode= detail.INVCode AND a.WarehouseCode = detail.WHCode  AND a.WorkPoint = detail.WorkPoint ";
+                                con = "detail.LocationCode AS Area,";
                             }
                             else
                             {
@@ -2287,6 +2292,9 @@ namespace ICSSoft.DataProject
                                             INNER JOIN ICSExtension ext ON a.ExtensionID=ext.ID AND a.WorkPoint=ext.WorkPoint
                                             LEFT JOIN ICSInventoryLotDetail lotdd ON lotdd.LotNo=a.LotNo AND a.WorkPoint=lotdd.WorkPoint
                                             LEFT JOIN ICSInspection ins ON a.LotNo=ins.LotNo AND a.WorkPoint=ins.WorkPoint";
+                                LotDetail = $@" LEFT JOIN ICSInventoryDetail detail ON inv.InvCode= detail.INVCode AND  detail.WHCode ={columnsWHCODE.Replace("AS WHCode"," ")}
+	                                           AND a.WorkPoint= detail.WorkPoint ";
+                                con = " detail.LocationCode AS Area, ";
 
                                 columns = string.Format(columns, columnsWHCODE, columnsWHNAME);
 
@@ -2350,13 +2358,13 @@ namespace ICSSoft.DataProject
 
                     if (TransType == TransTypeEnum.LocationSeatch.GetDescription())
                     {
-                        Losql = string.Format(Losql, columns, tableName, JsonData.Code, JsonData.WorkPoint);
+                        Losql = string.Format(Losql, columns, tableName, JsonData.Code, JsonData.WorkPoint,LotDetail,con);
 
                         table = DBHelper.SQlReturnData(Losql, cmd);
                     }
                     else
                     {
-                        sql = string.Format(sql, columns, tableName, JsonData.Code, JsonData.WorkPoint);
+                        sql = string.Format(sql, columns, tableName, JsonData.Code, JsonData.WorkPoint,LotDetail,con);
                         log.Info("条码sql：" + sql);
                         table = DBHelper.SQlReturnData(sql, cmd);
                     }