From 70178d8f0c35eb8317f6337d1c14b69cc07b4cb7 Mon Sep 17 00:00:00 2001 From: CatMaoo <1205395967@qq.com> Date: Thu, 1 May 2025 17:25:49 +0800 Subject: [PATCH] 1 --- .../ICSSoft.DataProject/ICSManufactureService.cs | 2 +- .../ICSSoft.DataProject/ICSOutsourcingService.cs | 9 ++++----- .../ICSSoft.DataProject/ICSSubmitService.cs | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSManufactureService.cs b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSManufactureService.cs index c900de3..ade9a3c 100644 --- a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSManufactureService.cs +++ b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSManufactureService.cs @@ -840,7 +840,7 @@ IF EXISTS(SELECT b.ID FROM ICSWareHouseLotInfoLog a DataTable dt = DBHelper.SQlReturnData(sql, cmd); string Inputstr = JsonConvert.SerializeObject(dt); - string resultStr = HTTPHelper.HttpPost(TransType, ERPUrl.MOIssueURL, Inputstr); + string resultStr = HTTPHelper.HttpPost(TransType, ERPUrl.OOIssueURL, Inputstr); Result result = new Result(); result = JsonConvert.DeserializeObject(resultStr); if (result.Success) diff --git a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSOutsourcingService.cs b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSOutsourcingService.cs index bb7a878..b5ef7f2 100644 --- a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSOutsourcingService.cs +++ b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSOutsourcingService.cs @@ -978,7 +978,7 @@ LEFT JOIN ICSConfiguration conWhCode ON conWhCode.Code='ERPWHCode' AND a.WorkPoi try { #region ERP - string sql = @"SELECT a.VenCode+a.DepCode+y.OOCode+a.MUSER AS Costre,a.VenCode,a.DepCode,y.OOCode,a.MUSER,a.MTIME,conStock.Enable AS CompleteVerification, + string sql = @"SELECT a.VenCode+a.DepCode+y.OOCode+a.MUSER AS Costre,a.VenCode,a.DepCode,y.OOID,y.OOCode,a.MUSER,a.MTIME,conStock.Enable AS CompleteVerification, a.Sequence,a.InvCode,a.Quantity,CASE invBat.AmountEnable WHEN '1' THEN a.Amount ELSE '0' END AS Amount,ISNULL(a.UnitPrice,0) AS UnitPrice,a.Currency,a.OODetailID ,a.WorkPoint,ISNULL(ext.ProjectCode, '') AS ProjectCode,CASE WHEN ISNULL(invBat.BatchEnable, '0')='1' THEN ISNULL(ext.BatchCode, '') ELSE '' END AS BatchCode,ISNULL(ext.Version, '') AS Version,ISNULL(ext.Brand, '') AS Brand, ISNULL(ext.cFree1, '') AS cFree1,ISNULL(ext.cFree2, '') AS cFree2,ISNULL(ext.cFree3, '') AS cFree3,ISNULL(ext.cFree4, '') AS cFree4,ISNULL(ext.cFree5, '') AS cFree5,ISNULL(ext.cFree6, '') AS cFree6,ISNULL(ext.cFree7, '') AS cFree7,ISNULL(ext.cFree8, '') AS cFree8,ISNULL(ext.cFree9, '') AS cFree9,ISNULL(ext.cFree10, '') AS cFree10 @@ -990,7 +990,7 @@ LEFT JOIN ICSConfiguration conWhCode ON conWhCode.Code='ERPWHCode' AND a.WorkPoi INNER JOIN ICSConfiguration conStock ON a.WorkPoint=conStock.WorkPoint AND conStock.Code='CompleteVerification003' WHERE a.ODNCode='{0}' AND a.WorkPoint='{1}' - SELECT DISTINCT Costre,WorkPoint,VenCode,DepCode,OOCode,MUSER AS [User],SYSDATETIME() AS MTime,CompleteVerification FROM #TempERP + SELECT DISTINCT Costre,WorkPoint,VenCode,DepCode,OOID AS OOCode,MUSER AS [User],SYSDATETIME() AS MTime,CompleteVerification FROM #TempERP SELECT Costre,Sequence,InvCode,Quantity,Amount,UnitPrice,Currency,OODetailID,ProjectCode,BatchCode,Version,Brand,cFree1,cFree2,cFree3,cFree4,cFree5,cFree6,cFree7,cFree8,cFree9,cFree10 FROM #TempERP @@ -2202,12 +2202,11 @@ SELECT c.VenCode+a.ToWarehouseCode+c.ODNCode+a.MUSER AS Costre,c.VenCode,a.ToWar foreach (var item in res) { JObject jo = (JObject)item; - JArray resdetail = (JArray)JsonConvert.DeserializeObject(jo["details"].ToString()); + JArray resdetail = (JArray)JsonConvert.DeserializeObject(jo["ospurInRecordDetailRet"].ToString()); foreach (var detail in resdetail) { JObject det = (JObject)detail; - string allcol = jo["WHCode"].ToString() + det["ProjectCode"].ToString() + det["cBatch"].ToString() + det["version"].ToString() + det["brand"].ToString() + det["cFree1"].ToString() + det["cFree2"].ToString() + det["cFree3"].ToString() + det["cFree4"].ToString() + det["cFree5"].ToString() - + det["cFree6"].ToString() + det["cFree7"].ToString() + det["cFree8"].ToString() + det["cFree9"].ToString() + det["cFree10"].ToString(); + string allcol = "" + det["ProjectCode"].ToString() + det["cBatch"].ToString() + det["version"].ToString() + det["brand"].ToString() ; ICSWareHouseLotInfoService.WareHouseLotInfoLogUpdate(TransType, det["ODNDetailID"].ToString(), Identification, jo["ID"].ToString(), det["DetailID"].ToString(), jo["ORCVTCode"].ToString(), det["Sequence"].ToString(), allcol, cmd, language, BusinessCode); } diff --git a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs index ed56bb1..9aae534 100644 --- a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs +++ b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs @@ -24713,7 +24713,7 @@ BEGIN END SELECT - a.LotNo,inv.InvCode,inv.InvName,inv.InvStd,c.Amount,b.TransCode,b.TransSequence,b.TransQty AS Quantity,c.WHCode + a.LotNo,inv.InvCode,inv.InvName,inv.InvStd,c.Amount,b.TransCode,b.TransSequence,b.TransQty AS Quantity,c.WHCode,inv.EATTRIBUTE5 AS ZJNO FROM ICSInventoryLot a INNER JOIN ICSInventoryLotDetailKG b ON b.LotNo=a.LotNo AND b.WorkPoint=a.WorkPoint INNER JOIN ICSDeliveryNotice c ON c.DNCode=b.TransCode AND c.Sequence=b.TransSequence AND c.WorkPoint=b.WorkPoint