sunhao
/
NG_Project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

Browse Source
main
sunhao 7 months ago
parent 55257b53b7
commit 591c3da867
15 changed files with 42 additions and 9 deletions
Show Stats Download Patch File Download Diff File

4
前端程序/ipd-frontend/src/pages/materialsSubstitution/PdiSmpNo.tsx
Unescape Escape View File

@ -173,7 +173,7 @@ const SubHistory = () => {
// 给每列设置固定宽度
worksheet.columns = worksheet.columns.map((col) => ({ ...col, width: DEFAULT_COLUMN_WIDTH }));
// 导出
saveWorkbook(workbook, print + '-' + '余材替代历史信息.xlsx');
saveWorkbook(workbook, print + '-' + '并样信息.xlsx');
}
function handleHeader(
@ -401,7 +401,7 @@ const SubHistory = () => {
width: 70,
},
{ title: '钢板号', dataIndex: 'PLATE_NO', key: 'PLATE_NO', ellipsis: true,width: 150 },
{ title: '录入时间', dataIndex: 'INS_DATE', key: 'INS_DATE', ellipsis: true,width: 150 },
{ title: '录入时间', dataIndex: 'SEND_DATE', key: 'SEND_DATE', ellipsis: true,width: 150 },
{ title: '轧批号', dataIndex: 'OUT_SHEET_NO', key: 'OUT_SHEET_NO', ellipsis: true,width: 150 },
{
title: '当前状态',

BIN
后端接口/ipd-server/.vs/iBkLinker-IPD/FileContentIndex/574bdb7b-5cd1-4131-a389-f735fd7e95f9.vsidx
View File

Binary file not shown.

BIN
后端接口/ipd-server/.vs/iBkLinker-IPD/FileContentIndex/f473f758-1ddd-469a-9a44-4e4ef2c1fdd4.vsidx
View File

Binary file not shown.

BIN
后端接口/ipd-server/.vs/iBkLinker-IPD/v17/.suo
View File

Binary file not shown.

BIN
后端接口/ipd-server/.vs/iBkLinker-IPD/v17/HierarchyCache.v1.txt
View File

Binary file not shown.

BIN
后端接口/ipd-server/Debug/iBKLinker.IPD.Service.dll
View File

Binary file not shown.

BIN
后端接口/ipd-server/Debug/iBKLinker.IPD.Service.pdb
View File

Binary file not shown.

16
后端接口/ipd-server/Service/Controller/IPD-PS/SurplusMaterialSubstitutionController.cs
Unescape Escape View File

@ -1038,7 +1038,7 @@ namespace ibk.IPD.Controller.IPD_PS
//strSql.AppendLine(" AND IS_STATE='1' ");
strSql.AppendLine(" select ");
strSql.AppendLine(" to_date(INS_DATE, 'yyyy-mm-dd hh24:mi:ss') send_date ");
strSql.AppendLine(" to_date(INS_DATE, 'yyyy-mm-dd hh24:mi:ss') SEND_DATE ");
strSql.AppendLine(" ,PLATE_NO,SMP_NO,NVL(COSTS, 0) COSTS ");
strSql.AppendLine(" ,case DISPOSE when '1' then '并号' when '2' then '不符标准' when '3' then '无试样' else '并样' end types ");
strSql.AppendLine(" , case SYNOPSIS when 2 then '不发送' else '发送' end IS_PDI ");
@ -1168,20 +1168,26 @@ namespace ibk.IPD.Controller.IPD_PS
if (QAGP.START_TIME != DateTime.MinValue)
{
//strSql.AppendLine(" AND TO_DATE('1970-01-01 08:00:00','yyyy-mm-dd hh24:mi:ss')+t.timestamp/86400000 >= TO_DATE('" + QAGP.START_TIME + "','yyyy-MM-dd HH24:mi:ss')");
strSql.AppendLine(" AND to_date(SUBSTR( INS_DATE,0,8) ,'yyyy-mm-dd') >= TO_DATE('" + QAGP.START_TIME.ToString().Substring(0,10) + "', 'yyyy-MM-dd') ");
//AND to_date(SUBSTR(INS_DATE,0,8) ,'YYYY-MM-DD HH24:MI:SS') >= TO_DATE('2024/4/25 0:00:00', 'YYYY-MM-DD HH24:MI:SS')
strSql.AppendLine(" AND to_date(SUBSTR( INS_DATE,0,8) ,'YYYY-MM-DD HH24:MI:SS') >= TO_DATE('" + QAGP.START_TIME.ToString() + "', 'YYYY-MM-DD HH24:MI:SS') ");
}
if (QAGP.END_TIME != DateTime.MinValue)
{
//strSql.AppendLine(" AND TO_DATE('1970-01-01 08:00:00','yyyy-mm-dd hh24:mi:ss')+t.timestamp/86400000 <= TO_DATE('" + QAGP.END_TIME + "','yyyy-MM-dd HH24:mi:ss')");
strSql.AppendLine(" AND to_date(SUBSTR( INS_DATE,0,8) ,'yyyy-mm-dd') <= TO_DATE('" + QAGP.END_TIME.ToString().Substring(0, 10) + "', 'yyyy-MM-dd') ");
////strSql.AppendLine(" AND TO_DATE('1970-01-01 08:00:00','yyyy-mm-dd hh24:mi:ss')+t.timestamp/86400000 <= TO_DATE('" + QAGP.END_TIME + "','yyyy-MM-dd HH24:mi:ss')");
//strSql.AppendLine(" AND to_date(SUBSTR( INS_DATE,0,8) ,'yyyy-mm-dd') <= TO_DATE('" + QAGP.END_TIME.ToString().Substring(0, 10) + "', 'yyyy-MM-dd') ");
strSql.AppendLine(" AND to_date(SUBSTR( INS_DATE,0,8) ,'YYYY-MM-DD HH24:MI:SS') <= TO_DATE('" + QAGP.END_TIME.ToString() + "', 'YYYY-MM-DD HH24:MI:SS') ");
}
strSql.AppendLine("ORDER BY INS_DATE");
#endregion
try
{
//开启数据库连接查询数据
using (IDbContext db = ObjectContainer.GetObject<IDbContext>("db"))
{
logger.InfoFormat("GetPDI_SMP_NO 报错SQL {0} ", QAGP.START_TIME.ToString());
logger.InfoFormat("GetPDI_SMP_NO 报错SQL {0} ", QAGP.END_TIME.ToString());
logger.InfoFormat("GetPDI_SMP_NO 报错SQL {0} ", strSql.ToString());
dtCheck = db.Query(strSql.ToString());
dtCheck.Columns.Add("PROC_CD_NOW");
dtCheck.Columns.Add("SMP_NO_NOW");

2
后端接口/ipd-server/Service/iBKLinker.IPD.Service.csproj.user
Unescape Escape View File

@ -2,7 +2,7 @@
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
<StartAction>Program</StartAction>
<StartProgram>D:\_NGProject\ipd-server\Debug\SOA.ServiceHost.exe</StartProgram>
<StartProgram>D:\_NG_1\NG_Project\后端接口\ipd-server\Debug\SOA.ServiceHost.exe</StartProgram>
<EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">

BIN
后端接口/ipd-server/Service/obj/Debug/DesignTimeResolveAssemblyReferences.cache
View File

Binary file not shown.

BIN
后端接口/ipd-server/Service/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
View File

Binary file not shown.

2
后端接口/ipd-server/Service/obj/Debug/iBKLinker.IPD.Service.csproj.CoreCompileInputs.cache
Unescape Escape View File

@ -1 +1 @@
1791ca5666a91a5ba7d3e8b2b14300e1c5bc6954
63d4f2758b594b1b68dfec34e6aa9ecd4842827c

27
后端接口/ipd-server/Service/obj/Debug/iBKLinker.IPD.Service.csproj.FileListAbsolute.txt
Unescape Escape View File

@ -407,3 +407,30 @@ D:\Code\Codes\Code_Git\ipd-server\Service\obj\Debug\iBKLinker.IPD.Service.csproj
D:\Code\Codes\Code_Git\ipd-server\Service\obj\Debug\iBKLinker.IPD.Service.csproj.CopyComplete
D:\Code\Codes\Code_Git\ipd-server\Service\obj\Debug\iBKLinker.IPD.Service.dll
D:\Code\Codes\Code_Git\ipd-server\Service\obj\Debug\iBKLinker.IPD.Service.pdb
D:\_NG_1\NG_Project\后端接口\ipd-server\Debug\librdkafka\x86\libcrypto-1_1.dll
D:\_NG_1\NG_Project\后端接口\ipd-server\Debug\librdkafka\x86\librdkafka.dll
D:\_NG_1\NG_Project\后端接口\ipd-server\Debug\librdkafka\x86\librdkafkacpp.dll
D:\_NG_1\NG_Project\后端接口\ipd-server\Debug\librdkafka\x86\libssl-1_1.dll
D:\_NG_1\NG_Project\后端接口\ipd-server\Debug\librdkafka\x86\msvcp140.dll
D:\_NG_1\NG_Project\后端接口\ipd-server\Debug\librdkafka\x86\vcruntime140.dll
D:\_NG_1\NG_Project\后端接口\ipd-server\Debug\librdkafka\x86\zlib1.dll
D:\_NG_1\NG_Project\后端接口\ipd-server\Debug\librdkafka\x86\zstd.dll
D:\_NG_1\NG_Project\后端接口\ipd-server\Debug\librdkafka\x64\libcrypto-1_1-x64.dll
D:\_NG_1\NG_Project\后端接口\ipd-server\Debug\librdkafka\x64\librdkafka.dll
D:\_NG_1\NG_Project\后端接口\ipd-server\Debug\librdkafka\x64\librdkafkacpp.dll
D:\_NG_1\NG_Project\后端接口\ipd-server\Debug\librdkafka\x64\libssl-1_1-x64.dll
D:\_NG_1\NG_Project\后端接口\ipd-server\Debug\librdkafka\x64\msvcp140.dll
D:\_NG_1\NG_Project\后端接口\ipd-server\Debug\librdkafka\x64\vcruntime140.dll
D:\_NG_1\NG_Project\后端接口\ipd-server\Debug\librdkafka\x64\zlib1.dll
D:\_NG_1\NG_Project\后端接口\ipd-server\Debug\librdkafka\x64\zstd.dll
D:\_NG_1\NG_Project\后端接口\ipd-server\Debug\iBKLinker.IPD.Service.dll.config
D:\_NG_1\NG_Project\后端接口\ipd-server\Debug\iBKLinker.IPD.Service.dll
D:\_NG_1\NG_Project\后端接口\ipd-server\Debug\iBKLinker.IPD.Service.pdb
D:\_NG_1\NG_Project\后端接口\ipd-server\Service\obj\Debug\iBKLinker.IPD.Service.csproj.AssemblyReference.cache
D:\_NG_1\NG_Project\后端接口\ipd-server\Service\obj\Debug\ibk.IPD.Common.TimerController.resources
D:\_NG_1\NG_Project\后端接口\ipd-server\Service\obj\Debug\ibk.IPD.Resource.resources
D:\_NG_1\NG_Project\后端接口\ipd-server\Service\obj\Debug\iBKLinker.IPD.Service.csproj.GenerateResource.cache
D:\_NG_1\NG_Project\后端接口\ipd-server\Service\obj\Debug\iBKLinker.IPD.Service.csproj.CoreCompileInputs.cache
D:\_NG_1\NG_Project\后端接口\ipd-server\Service\obj\Debug\iBKLinker.IPD.Service.csproj.CopyComplete
D:\_NG_1\NG_Project\后端接口\ipd-server\Service\obj\Debug\iBKLinker.IPD.Service.dll
D:\_NG_1\NG_Project\后端接口\ipd-server\Service\obj\Debug\iBKLinker.IPD.Service.pdb

BIN
后端接口/ipd-server/Service/obj/Debug/iBKLinker.IPD.Service.dll
View File

Binary file not shown.

BIN
后端接口/ipd-server/Service/obj/Debug/iBKLinker.IPD.Service.pdb
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save