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

1

Browse Source
main
sunhao 4 months ago
parent 6e3c2e164c
commit 4fc445812e
26 changed files with 148 additions and 27 deletions
Show Stats Download Patch File Download Diff File

BIN
余坯替代——中板/SlabHandle/.vs/SlabHandle/v17/.suo
View File

Binary file not shown.

BIN
余材异标准维护/PlateAnalysisStandard/.vs/PlateAnalysisStandard/v17/.suo
View File

Binary file not shown.

3
余材异标准维护/PlateAnalysisStandard/PlateAnalysisStandard/Enity/BP_ORDER_ITEM.cs
Unescape Escape View File

@ -953,6 +953,9 @@ namespace ibk.IPD.Entity.IpdPs
[Persistent("STDSPEC_STLGRD"), DisplayName("打印钢种")]
public string STDSPEC_STLGRD { get; set; }
[Persistent("STEEL_GRD_DETAIL"), DisplayName("钢种说明")]
public string STEEL_GRD_DETAIL { get; set; }
////替代钢材号
//[Persistent("SUB_SLAB_NO"), DisplayName("替代钢材号")]
//public string SUB_SLAB_NO { get; set; }

16
余材异标准维护/PlateAnalysisStandard/PlateAnalysisStandard/Enity/YCTD_WH_NO.cs
Unescape Escape View File

@ -41,8 +41,22 @@ namespace ibk.IPD.Entity.IpdPs
[Persistent("STDSPEC_STLGRD"), DisplayName("订单牌号")]
public string STDSPEC_STLGRD { get; set; }
[Persistent("STD_FLG"), DisplayName("是否异钢种")]
public string STD_FLG { get; set; }
[Persistent("RATE"), DisplayName("成材率")]
public string RATE { get; set; }
[Persistent("ORD_NO"), DisplayName("订单号")]
public string ORD_NO { get; set; }
[Persistent("ORD_ITEM"), DisplayName("订单项次号")]
public string ORD_ITEM { get; set; }
[Persistent("PLATE_NO"), DisplayName("钢板号")]
public string PLATE_NO { get; set; }
[Persistent("STLGRD"), DisplayName("订单钢种")]
public string STLGRD { get; set; }
}
}

15
余材异标准维护/PlateAnalysisStandard/PlateAnalysisStandard/Enity/YCTD_WH_NO_COPY.cs
Unescape Escape View File

@ -45,5 +45,20 @@ namespace ibk.IPD.Entity.IpdPs
[Persistent("STD_FLG"), DisplayName("是否异钢种")]
public string STD_FLG { get; set; }
[Persistent("RATE"), DisplayName("成材率")]
public string RATE { get; set; }
[Persistent("ORD_NO"), DisplayName("订单号")]
public string ORD_NO { get; set; }
[Persistent("ORD_ITEM"), DisplayName("订单项次号")]
public string ORD_ITEM { get; set; }
[Persistent("PLATE_NO"), DisplayName("钢板号")]
public string PLATE_NO { get; set; }
[Persistent("STLGRD"), DisplayName("订单钢种")]
public string STLGRD { get; set; }
}
}

17
余材异标准维护/PlateAnalysisStandard/PlateAnalysisStandard/Enity/YCTD_WH_NO_TIME.cs
Unescape Escape View File

@ -44,8 +44,23 @@ namespace ibk.IPD.Entity.IpdPs
[Persistent("STDSPEC_STLGRD"), DisplayName("订单牌号")]
public string STDSPEC_STLGRD { get; set; }
[Persistent("STD_FLG"), DisplayName("是否异钢种")]
public string STD_FLG { get; set; }
[Persistent("RATE"), DisplayName("成材率")]
public string RATE { get; set; }
[Persistent("ORD_NO"), DisplayName("订单号")]
public string ORD_NO { get; set; }
[Persistent("ORD_ITEM"), DisplayName("订单项次号")]
public string ORD_ITEM { get; set; }
[Persistent("PLATE_NO"), DisplayName("钢板号")]
public string PLATE_NO { get; set; }
[Persistent("STLGRD"), DisplayName("订单钢种")]
public string STLGRD { get; set; }
}
}

76
余材异标准维护/PlateAnalysisStandard/PlateAnalysisStandard/SurMatSubController.cs
Unescape Escape View File

@ -3536,6 +3536,12 @@ namespace ibk.IPD.Controller.IPD_PS
//20240307 添加未维护标准
foreach (YCTD_WH_NO_TIME yCTD in gYCTD_WH_NO_TIME)
{
if ( ConverDataToDecimal( yCTD.RATE)>100)
{
logger.InfoFormat("##### 成材率有问题 ===> 订单：{2}-{3}，钢板：{4} ， 标准：{0},替代标准：{1}，", yCTD.STANDARD_NO, yCTD.TD_STANDARD_NO,yCTD.ORD_NO,yCTD.ORD_ITEM,yCTD.PLATE_NO);
continue;
}
using (IDbContext db = ObjectContainer.GetObject<IDbContext>("db"))
{
try
@ -3552,9 +3558,25 @@ namespace ibk.IPD.Controller.IPD_PS
yCTD_WH_NO.STANDARD_NO = yCTD.STANDARD_NO;//标准号
yCTD_WH_NO.TD_STANDARD_NO = yCTD.TD_STANDARD_NO;//替代标准
yCTD_WH_NO.STDSPEC_STLGRD = yCTD.STDSPEC_STLGRD;
yCTD_WH_NO.STEEL_GRD_DETAIL = yCTD.STEEL_GRD_DETAIL;
yCTD_WH_NO.STD_FLG = yCTD.STD_FLG;
//yCTD_WH_NO.STDSPEC_STLGRD = yCTD.STDSPEC_STLGRD;
//yCTD_WH_NO.STEEL_GRD_DETAIL = yCTD.STEEL_GRD_DETAIL;
//yCTD_WH_NO.STD_FLG = yCTD.STD_FLG;
//yCTD_WH_NO.RATE = yCTD.RATE;
//yCTD_WH_NO.ORD_NO = yCTD.ORD_NO;
//yCTD_WH_NO.ORD_ITEM = yCTD.ORD_ITEM;
//yCTD_WH_NO.PLATE_NO = yCTD.PLATE_NO;
//yCTD_WH_NO.STLGRD = yCTD.STLGRD;
yCTD_WH_NO.STEEL_GRD_DETAIL = yCTD.STEEL_GRD_DETAIL;//板坯钢种说明
yCTD_WH_NO.STDSPEC_STLGRD = yCTD.STDSPEC_STLGRD;//订单牌号
yCTD_WH_NO.STD_FLG = yCTD.STD_FLG;//是否满足异钢种替代工艺 是 否
yCTD_WH_NO.RATE = yCTD.RATE.ToString();//成材率
yCTD_WH_NO.PLATE_NO = yCTD.PLATE_NO;//钢板号
yCTD_WH_NO.ORD_NO = yCTD.ORD_NO;//订单号
yCTD_WH_NO.ORD_ITEM = yCTD.ORD_ITEM;//订单项次号
yCTD_WH_NO.STLGRD = yCTD.STLGRD;//订单钢种说明
yCTD_WH_NO.TD_FL = "不维护";
yCTD_WH_NO.THK_TOL_MIN = yCTD.THK_TOL_MIN;
@ -3576,9 +3598,20 @@ namespace ibk.IPD.Controller.IPD_PS
YCTD_WH_NO yCTD_WH_NO = new YCTD_WH_NO();
yCTD_WH_NO.STANDARD_NO = yCTD.STANDARD_NO;//标准号
yCTD_WH_NO.TD_STANDARD_NO = yCTD.TD_STANDARD_NO;//替代标准
yCTD_WH_NO.STDSPEC_STLGRD = yCTD.STDSPEC_STLGRD;
yCTD_WH_NO.STEEL_GRD_DETAIL = yCTD.STEEL_GRD_DETAIL;
yCTD_WH_NO.STD_FLG = yCTD.STD_FLG;
//yCTD_WH_NO.STDSPEC_STLGRD = yCTD.STDSPEC_STLGRD;
//yCTD_WH_NO.STEEL_GRD_DETAIL = yCTD.STEEL_GRD_DETAIL;
//yCTD_WH_NO.STD_FLG = yCTD.STD_FLG;
yCTD_WH_NO.STEEL_GRD_DETAIL = yCTD.STEEL_GRD_DETAIL;//板坯钢种说明
yCTD_WH_NO.STDSPEC_STLGRD = yCTD.STDSPEC_STLGRD;//订单牌号
yCTD_WH_NO.STD_FLG = yCTD.STD_FLG;//是否满足异钢种替代工艺 是 否
yCTD_WH_NO.RATE = yCTD.RATE.ToString();//成材率
yCTD_WH_NO.PLATE_NO = yCTD.PLATE_NO;//钢板号
yCTD_WH_NO.ORD_NO = yCTD.ORD_NO;//订单号
yCTD_WH_NO.ORD_ITEM = yCTD.ORD_ITEM;//订单项次号
yCTD_WH_NO.STLGRD = yCTD.STLGRD;//订单钢种说明
yCTD_WH_NO.TD_FL = "待维护";
yCTD_WH_NO.THK_TOL_MIN = yCTD.THK_TOL_MIN;
yCTD_WH_NO.THK_TOL_MAX = yCTD.THK_TOL_MAX;
@ -3594,9 +3627,20 @@ namespace ibk.IPD.Controller.IPD_PS
YCTD_WH_NO yCTD_WH_NO = new YCTD_WH_NO();
yCTD_WH_NO.STANDARD_NO = yCTD.STANDARD_NO;//标准号
yCTD_WH_NO.TD_STANDARD_NO = yCTD.TD_STANDARD_NO;//替代标准
yCTD_WH_NO.STDSPEC_STLGRD = yCTD.STDSPEC_STLGRD;
yCTD_WH_NO.STEEL_GRD_DETAIL = yCTD.STEEL_GRD_DETAIL;
yCTD_WH_NO.STD_FLG = yCTD.STD_FLG;
//yCTD_WH_NO.STDSPEC_STLGRD = yCTD.STDSPEC_STLGRD;
//yCTD_WH_NO.STEEL_GRD_DETAIL = yCTD.STEEL_GRD_DETAIL;
//yCTD_WH_NO.STD_FLG = yCTD.STD_FLG;
yCTD_WH_NO.STEEL_GRD_DETAIL = yCTD.STEEL_GRD_DETAIL;//板坯钢种说明
yCTD_WH_NO.STDSPEC_STLGRD = yCTD.STDSPEC_STLGRD;//订单牌号
yCTD_WH_NO.STD_FLG = yCTD.STD_FLG;//是否满足异钢种替代工艺 是 否
yCTD_WH_NO.RATE = yCTD.RATE.ToString();//成材率
yCTD_WH_NO.PLATE_NO = yCTD.PLATE_NO;//钢板号
yCTD_WH_NO.ORD_NO = yCTD.ORD_NO;//订单号
yCTD_WH_NO.ORD_ITEM = yCTD.ORD_ITEM;//订单项次号
yCTD_WH_NO.STLGRD = yCTD.STLGRD;//订单钢种说明
yCTD_WH_NO.TD_FL = "待维护";
yCTD_WH_NO.THK_TOL_MIN = yCTD.THK_TOL_MIN;
yCTD_WH_NO.THK_TOL_MAX = yCTD.THK_TOL_MAX;
@ -4142,7 +4186,6 @@ namespace ibk.IPD.Controller.IPD_PS
return result;
}
#region 获取数据
/// <summary>
@ -6753,9 +6796,16 @@ namespace ibk.IPD.Controller.IPD_PS
//logger.InfoFormat("余材:{0},订单：{1}-{2},标准:{3},标准未维护", prP_PLATE.PLATE_NO, prorde.ORD_NO, prorde.ORD_ITEM, prP_PLATE.APLY_STDSPEC);
YCTD_WH_NO_TIME yCTD_WH_NO = new YCTD_WH_NO_TIME();
yCTD_WH_NO.STEEL_GRD_DETAIL = prP_PLATE.STEEL_GRD_DETAIL;
yCTD_WH_NO.STDSPEC_STLGRD = prorde.STDSPEC_STLGRD;
yCTD_WH_NO.STD_FLG = strYesOrNo;
yCTD_WH_NO.STEEL_GRD_DETAIL = prP_PLATE.STEEL_GRD_DETAIL;//板坯钢种说明
yCTD_WH_NO.STDSPEC_STLGRD = prorde.STDSPEC_STLGRD;//订单牌号
yCTD_WH_NO.STD_FLG = strYesOrNo;//是否满足异钢种替代工艺 是 否
yCTD_WH_NO.RATE = decRate.ToString();//成材率
yCTD_WH_NO.PLATE_NO = prP_PLATE.PLATE_NO;//钢板号
yCTD_WH_NO.ORD_NO = prorde.ORD_NO;//订单号
yCTD_WH_NO.ORD_ITEM = prorde.ORD_ITEM;//订单项次号
yCTD_WH_NO.STLGRD = prorde.STEEL_GRD_DETAIL;//订单钢种说明
yCTD_WH_NO.STANDARD_NO = prP_PLATE.APLY_STDSPEC;//标准号
yCTD_WH_NO.TD_STANDARD_NO = prorde.STDSPEC;//替代标准
yCTD_WH_NO.THK_TOL_MIN = prP_PLATE.THK_TOL_MIN;//公差最小值

4
余材异标准维护/PlateAnalysisStandard/PlateAnalysisStandard/SurMatSubService.cs
Unescape Escape View File

@ -427,8 +427,9 @@ namespace ibk.IPD.Service.IPD_PS
strSql.AppendLine(" AND B.REC_STS = '1') + (NVL(CPP.ORD_REM_WGT, 0) - CPP.ORD_WGT * (CPP.DEL_TOL_MAX + ABS(CPP.DEL_TOL_MIN)) / 100) / TRUNC(((BOI.ORD_WID / 1000) * (BOI.ORD_LEN / 1000) * (BOI.ORD_THK / 1000)) * 7.85, 3)) AS LACK_NUM ");
strSql.AppendLine(",QSH.STDSPEC_STLGRD");
strSql.AppendLine(",QSH.STDSPEC_STLGRD");//牌号
strSql.AppendLine(",QNC.STEEL_GRD_DETAIL");//钢种说明
strSql.AppendLine("FROM NISCO.cp_prc CPP ");
strSql.AppendLine("INNER JOIN ");
@ -464,6 +465,7 @@ namespace ibk.IPD.Service.IPD_PS
strSql.AppendLine(" ON boi.STDSPEC = QSH.STDSPEC ");
strSql.AppendLine(" AND boi.STDSPEC_YY = QSH.STDSPEC_YY ");
strSql.AppendLine("LEFT JOIN NISCO.QP_NISCO_CHMC QNC ON QNC.STLGRD = boi.STLGRD");
strSql.AppendLine("LEFT JOIN NISCO.EP_REQ_SLAB_D EP_SLAB_D");
strSql.AppendLine("ON EP_SLAB_D.ORD_NO = QQD.ORD_NO ");

BIN
余材异标准维护/PlateAnalysisStandard/PlateAnalysisStandard/bin/Debug/PlateAnalysisStandard.exe
View File

Binary file not shown.

BIN
余材异标准维护/PlateAnalysisStandard/PlateAnalysisStandard/bin/Debug/PlateAnalysisStandard.pdb
View File

Binary file not shown.

BIN
余材异标准维护/PlateAnalysisStandard/PlateAnalysisStandard/obj/Debug/PlateAnalysisStandard.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
余材异标准维护/PlateAnalysisStandard/PlateAnalysisStandard/obj/Debug/PlateAnalysisStandard.exe
View File

Binary file not shown.

BIN
余材异标准维护/PlateAnalysisStandard/PlateAnalysisStandard/obj/Debug/PlateAnalysisStandard.pdb
View File

Binary file not shown.

BIN
余材替代程序/SinglePlateHandle/.vs/SinglePlateHandle/v17/.suo
View File

Binary file not shown.

BIN
取样并样程序/SubResult/.vs/SubResult/v17/.suo
View File

Binary file not shown.

BIN
取样并样程序/SubResult/SubResult/bin/Debug/SubResult.exe
View File

Binary file not shown.

BIN
取样并样程序/SubResult/SubResult/bin/Debug/SubResult.pdb
View File

Binary file not shown.

BIN
取样并样程序/SubResult/SubResult/obj/Debug/SubResult.exe
View File

Binary file not shown.

BIN
取样并样程序/SubResult/SubResult/obj/Debug/SubResult.pdb
View File

Binary file not shown.

BIN
后端接口/ipd-server/.vs/iBkLinker-IPD/v17/.suo
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.

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

@ -1667,19 +1667,19 @@ namespace ibk.IPD.Controller.IPD_PS
//strSql.AppendLine(" ) WHERE rn = 1 ");
strSql.AppendLine("SELECT * FROM( ");
strSql.AppendLine(" SELECT STANDARD_NO, TD_STANDARD_NO, INS_DATE, UPD_DATE, TD_FL,THK_TOL_MIN,THK_TOL_MAX,REMARK ,STEEL_GRD_DETAIL,STDSPEC_STLGRD,STD_FLG ");
strSql.AppendLine(" SELECT STANDARD_NO, TD_STANDARD_NO, INS_DATE, UPD_DATE, TD_FL,THK_TOL_MIN,THK_TOL_MAX,REMARK ,STEEL_GRD_DETAIL,STDSPEC_STLGRD,STD_FLG,RATE,ORD_NO,ORD_ITEM,PLATE_NO,STLGRD");
strSql.AppendLine("FROM ( ");
strSql.AppendLine(" SELECT ");
strSql.AppendLine(" STANDARD_NO, ");
strSql.AppendLine(" TD_STANDARD_NO, ");
strSql.AppendLine("INS_DATE, ");
strSql.AppendLine("UPD_DATE, ");
strSql.AppendLine("TD_FL, THK_TOL_MIN,THK_TOL_MAX ,REMARK, STEEL_GRD_DETAIL,STDSPEC_STLGRD,STD_FLG ");
strSql.AppendLine("TD_FL, THK_TOL_MIN,THK_TOL_MAX ,REMARK, STEEL_GRD_DETAIL,STDSPEC_STLGRD,STD_FLG,RATE,ORD_NO,ORD_ITEM,PLATE_NO,STLGRD");
strSql.AppendLine(" ,ROW_NUMBER() OVER(PARTITION BY STANDARD_NO, TD_STANDARD_NO ORDER BY INS_DATE DESC) AS rn ");
strSql.AppendLine(" FROM YCTD_WH_NO ");
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 ) ");
strSql.AppendLine(" SELECT * FROM YCTD_WH_NO_COPY WHERE RATE IS NOT NULL ) ");
strSql.AppendLine(" WHERE 1 = 1 ");
@ -1758,18 +1758,26 @@ namespace ibk.IPD.Controller.IPD_PS
//bool b = true;
foreach (var model in delModel)
{
strSql.AppendLine(" INSERT INTO YCTD_WH_NO_COPY (STANDARD_NO, TD_STANDARD_NO, INS_DATE, UPD_DATE, TD_FL,THK_TOL_MIN,THK_TOL_MAX,REMARK,STEEL_GRD_DETAIL,STDSPEC_STLGRD,STD_FLG) VALUES ( ");
strSql.AppendLine(" INSERT INTO YCTD_WH_NO_COPY (STANDARD_NO, TD_STANDARD_NO, INS_DATE, UPD_DATE, TD_FL,THK_TOL_MIN,THK_TOL_MAX,REMARK" +
",STEEL_GRD_DETAIL,STDSPEC_STLGRD,STD_FLG" +
",RATE,ORD_NO,ORD_ITEM,PLATE_NO,STLGRD" +
") VALUES ( ");
strSql.AppendLine(string.Format(" '{0}', ", model.STANDARD_NO));
strSql.AppendLine(string.Format(" '{0}', ", model.TD_STANDARD_NO));
strSql.AppendLine(string.Format(" '{0}', ", DateTime.Now.ToString("yyyyMMddHHmmss")));
strSql.AppendLine(string.Format(" '{0}', ", DateTime.Now.ToString("yyyyMMddHHmmss")));
strSql.AppendLine(string.Format(" '{0}', ", "不维护"));
strSql.AppendLine(string.Format(" '{0}', ", model.THK_TOL_MIN));
strSql.AppendLine(string.Format(" '{0}' ", model.THK_TOL_MAX));
strSql.AppendLine(string.Format(" '{0}' ", model.REMARK));
strSql.AppendLine(string.Format(" '{0}' ", model.STEEL_GRD_DETAIL));
strSql.AppendLine(string.Format(" '{0}' ", model.STDSPEC_STLGRD));
strSql.AppendLine(string.Format(" '{0}' ", model.STD_FLG));
strSql.AppendLine(string.Format(" '{0}', ", model.THK_TOL_MAX));
strSql.AppendLine(string.Format(" '{0}', ", model.REMARK));
strSql.AppendLine(string.Format(" '{0}', ", model.STEEL_GRD_DETAIL));
strSql.AppendLine(string.Format(" '{0}', ", model.STDSPEC_STLGRD));
strSql.AppendLine(string.Format(" '{0}', ", model.STD_FLG));
strSql.AppendLine(string.Format(" '{0}', ", model.RATE));
strSql.AppendLine(string.Format(" '{0}', ", model.ORD_NO));
strSql.AppendLine(string.Format(" '{0}', ", model.ORD_ITEM));
strSql.AppendLine(string.Format(" '{0}', ", model.PLATE_NO));
strSql.AppendLine(string.Format(" '{0}'", model.STLGRD));
strSql.AppendLine(string.Format(" ) "));
db.Execute(strSql.ToString());

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

@ -44,9 +44,23 @@ namespace ibk.IPD.Entity.IpdPs
[Persistent("STDSPEC_STLGRD"), DisplayName("订单牌号")]
public string STDSPEC_STLGRD { get; set; }
[Persistent("STD_FLG"), DisplayName("是否异钢种")]
public string STD_FLG { get; set; }
[Persistent("RATE"), DisplayName("成材率")]
public string RATE { get; set; }
[Persistent("ORD_NO"), DisplayName("订单号")]
public string ORD_NO { get; set; }
[Persistent("ORD_ITEM"), DisplayName("订单项次号")]
public string ORD_ITEM { get; set; }
[Persistent("PLATE_NO"), DisplayName("钢板号")]
public string PLATE_NO { get; set; }
[Persistent("STLGRD"), DisplayName("订单钢种")]
public string STLGRD { get; set; }
}
}

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