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 @@ 4 - - D:\连接orlcor\ChangKeTec.Utils.dll + + False + bin\Debug\ChangKeTec.Utils.dll ..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll 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 @@ 4 + + ..\Controller\bin\Debug\ChangKeTec.Utils.dll + ..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll @@ -768,12 +771,6 @@ - - - {4c6a951d-ad7f-47ce-b2ce-32c205d8d6ba} - CK.SCP.Utils - - TextTemplatingFileGenerator @@ -786,5 +783,11 @@ + + + {4C6A951D-AD7F-47CE-B2CE-32C205D8D6BA} + CK.SCP.Utils + + \ 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 @@ 4 - - D:\连接orlcor\ChangKeTec.Utils.dll + + False + ..\Controller\bin\Debug\ChangKeTec.Utils.dll False 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;