diff --git a/后端接口/ipd-server/.vs/iBkLinker-IPD/v17/.suo b/后端接口/ipd-server/.vs/iBkLinker-IPD/v17/.suo index e916173..b4daec5 100644 Binary files a/后端接口/ipd-server/.vs/iBkLinker-IPD/v17/.suo and b/后端接口/ipd-server/.vs/iBkLinker-IPD/v17/.suo differ diff --git a/后端接口/ipd-server/.vs/iBkLinker-IPD/v17/HierarchyCache.v1.txt b/后端接口/ipd-server/.vs/iBkLinker-IPD/v17/HierarchyCache.v1.txt index cfd2e7c..c25a6bb 100644 Binary files a/后端接口/ipd-server/.vs/iBkLinker-IPD/v17/HierarchyCache.v1.txt and b/后端接口/ipd-server/.vs/iBkLinker-IPD/v17/HierarchyCache.v1.txt differ diff --git a/后端接口/ipd-server/Debug/iBKLinker.IPD.Service.dll b/后端接口/ipd-server/Debug/iBKLinker.IPD.Service.dll index 0033878..2f6925e 100644 Binary files a/后端接口/ipd-server/Debug/iBKLinker.IPD.Service.dll and b/后端接口/ipd-server/Debug/iBKLinker.IPD.Service.dll differ diff --git a/后端接口/ipd-server/Debug/iBKLinker.IPD.Service.pdb b/后端接口/ipd-server/Debug/iBKLinker.IPD.Service.pdb index e90906c..a59f72b 100644 Binary files a/后端接口/ipd-server/Debug/iBKLinker.IPD.Service.pdb and b/后端接口/ipd-server/Debug/iBKLinker.IPD.Service.pdb differ diff --git a/后端接口/ipd-server/Service/Controller/IPD-PS/SurplusMaterialSubstitutionController.cs b/后端接口/ipd-server/Service/Controller/IPD-PS/SurplusMaterialSubstitutionController.cs index 6afc904..b5ac800 100644 --- a/后端接口/ipd-server/Service/Controller/IPD-PS/SurplusMaterialSubstitutionController.cs +++ b/后端接口/ipd-server/Service/Controller/IPD-PS/SurplusMaterialSubstitutionController.cs @@ -29,6 +29,8 @@ using Confluent.Kafka; using NPOI.Util; using System.Security.Cryptography; using System.Windows.Forms; +using NPOI.XWPF.UserModel; +using System.Collections.Concurrent; namespace ibk.IPD.Controller.IPD_PS { @@ -1008,7 +1010,7 @@ namespace ibk.IPD.Controller.IPD_PS if (fullDataTable.Columns.Contains(columnName)) { object cellValue = fullDataTable.Rows[row][columnName]; - ICell dataCell = dataRow.CreateCell(colIndex); + NPOI.SS.UserModel.ICell dataCell = dataRow.CreateCell(colIndex); dataCell.SetCellValue(cellValue.ToString()); colIndex++; } @@ -1855,7 +1857,57 @@ namespace ibk.IPD.Controller.IPD_PS strSql.AppendLine(" FROM YCTD_WH_NO WHERE RATE IS NOT NULL "); strSql.AppendLine(" ) WHERE rn = 1 "); strSql.AppendLine(" UNION ALL "); - strSql.AppendLine(" SELECT * FROM YCTD_WH_NO_COPY WHERE RATE IS NOT NULL ) "); + + strSql.AppendLine(" SELECT STANDARD_NO "); + strSql.AppendLine(", TD_STANDARD_NO "); + strSql.AppendLine(", INS_DATE "); + strSql.AppendLine(", UPD_DATE "); + strSql.AppendLine(", TD_FL "); + strSql.AppendLine(", THK_TOL_MIN "); + strSql.AppendLine(", THK_TOL_MAX "); + strSql.AppendLine(", REMARK "); + strSql.AppendLine(", STEEL_GRD_DETAIL "); + strSql.AppendLine(", STDSPEC_STLGRD "); + strSql.AppendLine(", STD_FLG, RATE "); + strSql.AppendLine(", ORD_NO "); + strSql.AppendLine(", ORD_ITEM "); + strSql.AppendLine(", PLATE_NO "); + strSql.AppendLine(", STLGRD "); + strSql.AppendLine(", YP_RST "); + strSql.AppendLine(", YP_MIN "); + strSql.AppendLine(", YP_MAX "); + strSql.AppendLine(", TS_RST "); + strSql.AppendLine(", TS_MIN "); + strSql.AppendLine(", TS_MAX FROM( "); + strSql.AppendLine("SELECT "); + strSql.AppendLine(" "); + strSql.AppendLine(" STANDARD_NO "); + strSql.AppendLine(" , TD_STANDARD_NO, TD_FL, "); + strSql.AppendLine(" THK_TOL_MIN, THK_TOL_MAX "); + strSql.AppendLine(" , REMARK, STEEL_GRD_DETAIL "); + strSql.AppendLine(" , STDSPEC_STLGRD, STD_FLG "); + strSql.AppendLine(" , RATE, ORD_NO, ORD_ITEM "); + strSql.AppendLine(" , PLATE_NO, STLGRD, YP_MIN "); + strSql.AppendLine(" , YP_MAX, YP_RST, TS_MIN "); + strSql.AppendLine(" , TS_MAX, TS_RST, INS_DATE, UPD_DATE, "); + strSql.AppendLine(" ROW_NUMBER() OVER(PARTITION BY STANDARD_NO "); + strSql.AppendLine(" , TD_STANDARD_NO, TD_FL, "); + strSql.AppendLine(" THK_TOL_MIN, THK_TOL_MAX "); + strSql.AppendLine(" , REMARK, STEEL_GRD_DETAIL "); + strSql.AppendLine(" , STDSPEC_STLGRD, STD_FLG "); + strSql.AppendLine(" , RATE, ORD_NO, ORD_ITEM "); + strSql.AppendLine(" , PLATE_NO, STLGRD, YP_MIN "); + strSql.AppendLine(" , YP_MAX, YP_RST, TS_MIN "); + strSql.AppendLine(" , TS_MAX, TS_RST "); + strSql.AppendLine(" "); + strSql.AppendLine("ORDER BY INS_DATE, UPD_DATE DESC) AS rn "); + strSql.AppendLine(" "); + strSql.AppendLine(" FROM "); + strSql.AppendLine(" "); + strSql.AppendLine(" YCTD_WH_NO_COPY WHERE RATE IS NOT NULL "); + strSql.AppendLine(" ) WHERE rn = 1) "); + + //strSql.AppendLine(" SELECT * FROM YCTD_WH_NO_COPY WHERE RATE IS NOT NULL ) "); strSql.AppendLine(" WHERE 1 = 1 "); //只取当前日期的数据 //strSql.AppendLine("AND TO_CHAR(TO_DATE(INS_DATE,'YYYYMMDDHH24MISS'), 'YYYYMMDD') = TO_CHAR(SYSDATE, 'YYYYMMDD') "); diff --git a/后端接口/ipd-server/Service/Service/IPD-PS/SurMatSubService.cs b/后端接口/ipd-server/Service/Service/IPD-PS/SurMatSubService.cs index 552c810..eb5dd95 100644 --- a/后端接口/ipd-server/Service/Service/IPD-PS/SurMatSubService.cs +++ b/后端接口/ipd-server/Service/Service/IPD-PS/SurMatSubService.cs @@ -2872,6 +2872,37 @@ namespace ibk.IPD.Service.IPD_PS strsql.AppendLine(", INSPECT_COSTS='" + prTBSubRules.INSPECT_COSTS + "'"); } + if (!string.IsNullOrEmpty(prTBSubRules.NI_CUTTING_COSTS)) + { + strsql.AppendLine(", NI_CUTTING_COSTS='" + prTBSubRules.NI_CUTTING_COSTS + "'"); + } + + if (!string.IsNullOrEmpty(prTBSubRules.HOISTING_WAREHOUSE)) + { + strsql.AppendLine(", HOISTING_WAREHOUSE='" + prTBSubRules.HOISTING_WAREHOUSE + "'"); + } + + if (!string.IsNullOrEmpty(prTBSubRules.HOISTING_COSTS)) + { + strsql.AppendLine(", HOISTING_COSTS='" + prTBSubRules.HOISTING_COSTS + "'"); + } + + if (!string.IsNullOrEmpty(prTBSubRules.NI_STEEL_SCRAP_COSTS_5)) + { + strsql.AppendLine(", NI_STEEL_SCRAP_COSTS_5='" + prTBSubRules.NI_STEEL_SCRAP_COSTS_5 + "'"); + } + + if (!string.IsNullOrEmpty(prTBSubRules.NI_STEEL_SCRAP_COSTS_9)) + { + strsql.AppendLine(", NI_STEEL_SCRAP_COSTS_9='" + prTBSubRules.NI_STEEL_SCRAP_COSTS_9 + "'"); + } + + if (!string.IsNullOrEmpty(prTBSubRules.MINIMUM_PROFIT)) + { + strsql.AppendLine(", MINIMUM_PROFIT='" + prTBSubRules.MINIMUM_PROFIT + "'"); + } + + strsql.AppendLine("WHERE ID='" + prTBSubRules.ID + "'"); } db.Execute(strsql.ToString()); diff --git a/后端接口/ipd-server/Service/obj/Debug/iBKLinker.IPD.Service.dll b/后端接口/ipd-server/Service/obj/Debug/iBKLinker.IPD.Service.dll index 1b30169..2f6925e 100644 Binary files a/后端接口/ipd-server/Service/obj/Debug/iBKLinker.IPD.Service.dll and b/后端接口/ipd-server/Service/obj/Debug/iBKLinker.IPD.Service.dll differ diff --git a/后端接口/ipd-server/Service/obj/Debug/iBKLinker.IPD.Service.pdb b/后端接口/ipd-server/Service/obj/Debug/iBKLinker.IPD.Service.pdb index 5908de4..a59f72b 100644 Binary files a/后端接口/ipd-server/Service/obj/Debug/iBKLinker.IPD.Service.pdb and b/后端接口/ipd-server/Service/obj/Debug/iBKLinker.IPD.Service.pdb differ