From 7a8e4311fee9c78c0c6d917d9c93c964f32168b1 Mon Sep 17 00:00:00 2001
From: qian <feng.qian@ccwin-in.com>
Date: Fri, 20 Oct 2023 08:50:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=B2=E5=8E=8B=E4=BB=B6=20=E4=BB=8Eoracle?=
 =?UTF-8?q?=20=E8=AF=BB=E5=8F=96=20=E4=BD=9C=E5=BA=9F=E4=BF=A1=E6=81=AF=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Controller/CK.SCP.Controller.csproj            |  5 +++--
 Models/CK.SCP.Models.csproj                    | 15 +++++++++------
 Models/EntitiesFactory.cs                      |  4 +---
 UniApiGroup/CK.SCP.GrupUniApi.csproj           |  5 +++--
 UniApiGroup/Controller/OdbcApiQadController.cs |  7 ++++---
 5 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/Controller/CK.SCP.Controller.csproj b/Controller/CK.SCP.Controller.csproj
index 38d55c9..6da1dba 100644
--- a/Controller/CK.SCP.Controller.csproj
+++ b/Controller/CK.SCP.Controller.csproj
@@ -31,8 +31,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ChangKeTec.Utils">
-      <HintPath>D:\连接orlcor\ChangKeTec.Utils.dll</HintPath>
+    <Reference Include="ChangKeTec.Utils, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>bin\Debug\ChangKeTec.Utils.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath>
diff --git a/Models/CK.SCP.Models.csproj b/Models/CK.SCP.Models.csproj
index e6cfa8a..8cd035b 100644
--- a/Models/CK.SCP.Models.csproj
+++ b/Models/CK.SCP.Models.csproj
@@ -31,6 +31,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="ChangKeTec.Utils">
+      <HintPath>..\Controller\bin\Debug\ChangKeTec.Utils.dll</HintPath>
+    </Reference>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath>
     </Reference>
@@ -768,12 +771,6 @@
     <None Include="UniApiEntity\App.config" />
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Utils\CK.SCP.Utils.csproj">
-      <Project>{4c6a951d-ad7f-47ce-b2ce-32c205d8d6ba}</Project>
-      <Name>CK.SCP.Utils</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <Content Include="WmsEntity\TableSchema.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
@@ -786,5 +783,11 @@
   <ItemGroup>
     <Folder Include="WmsEntity\HyAntolin\" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Utils\CK.SCP.Utils.csproj">
+      <Project>{4C6A951D-AD7F-47CE-B2CE-32C205D8D6BA}</Project>
+      <Name>CK.SCP.Utils</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/Models/EntitiesFactory.cs b/Models/EntitiesFactory.cs
index 9d0f72f..98b835e 100644
--- a/Models/EntitiesFactory.cs
+++ b/Models/EntitiesFactory.cs
@@ -1,17 +1,15 @@
 using System;
 using System.Data.Entity;
 using System.Data.Entity.Core;
-using System.Data.Entity.Core.EntityClient;
 using System.Data.SqlClient;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 using CK.SCP.Models.AppBoxEntity;
 using CK.SCP.Models.Enums;
 using CK.SCP.Models.UniApiEntity;
-using CK.SCP.Utils;
 using ChangKeTec.Wms.Models.Wms;
 using System.ComponentModel;
+using CK.SCP.Utils;
 
 namespace CK.SCP.Models
 {
diff --git a/UniApiGroup/CK.SCP.GrupUniApi.csproj b/UniApiGroup/CK.SCP.GrupUniApi.csproj
index 47b3c46..e3a0b85 100644
--- a/UniApiGroup/CK.SCP.GrupUniApi.csproj
+++ b/UniApiGroup/CK.SCP.GrupUniApi.csproj
@@ -48,8 +48,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ChangKeTec.Utils">
-      <HintPath>D:\连接orlcor\ChangKeTec.Utils.dll</HintPath>
+    <Reference Include="ChangKeTec.Utils, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\Controller\bin\Debug\ChangKeTec.Utils.dll</HintPath>
     </Reference>
     <Reference Include="DevComponents.DotNetBar.Layout, Version=14.1.0.21, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/UniApiGroup/Controller/OdbcApiQadController.cs b/UniApiGroup/Controller/OdbcApiQadController.cs
index a3db87c..c22b057 100644
--- a/UniApiGroup/Controller/OdbcApiQadController.cs
+++ b/UniApiGroup/Controller/OdbcApiQadController.cs
@@ -802,10 +802,10 @@ namespace CK.SCP.GrupUniApi.Controller
                 {
                     var _liii = _lii.ToList();
                     var _entity = _liii.First();
-                    var _askdetail = wdb.TB_ASK_DETAIL.Count(p => p.PoBillNum == _entity.purDocNO && p.State > -1);
+                    var _askdetail = wdb.TB_ASK_DETAIL.Count(p => p.PoBillNum == _entity.purDocNO  && p.State > -1);
                     if(_askdetail== _liii.Count())
                     {
-                        var ask = wdb.TB_ASK.FirstOrDefault(p=>p.PoBillNum==_entity.purDocNO);
+                        var ask = wdb.TB_ASK.FirstOrDefault(p=>p.PoBillNum==_entity.purDocNO );
                         ask.State = -1;
                         ask.IsDeleted = true;
                         wmsAskList.Add(ask);
@@ -820,7 +820,8 @@ namespace CK.SCP.GrupUniApi.Controller
                         }
                     else
                     {
-                        var askdetaill = wdb.TB_ASK_DETAIL.Where(p => p.PoBillNum == _entity.purDocNO).ToList();
+                        // ¸ù¾Ý Áã¼þºÅ×÷·Ï
+                        var askdetaill = wdb.TB_ASK_DETAIL.Where(p => p.PoBillNum == _entity.purDocNO && p.PartCode == _entity.mtlNO ).ToList();
                         askdetaill.ForEach(p =>
                         {
                             p.State = -1;