diff --git a/余坯替代——中板/SlabHandle/.vs/SlabHandle/FileContentIndex/03a06cc7-2982-40b7-b625-b2f8c59f51b5.vsidx b/余坯替代——中板/SlabHandle/.vs/SlabHandle/FileContentIndex/03a06cc7-2982-40b7-b625-b2f8c59f51b5.vsidx deleted file mode 100644 index 78b8657..0000000 Binary files a/余坯替代——中板/SlabHandle/.vs/SlabHandle/FileContentIndex/03a06cc7-2982-40b7-b625-b2f8c59f51b5.vsidx and /dev/null differ diff --git a/余坯替代——中板/SlabHandle/.vs/SlabHandle/FileContentIndex/d7358e6b-dbe0-408f-b545-6f16b110b964.vsidx b/余坯替代——中板/SlabHandle/.vs/SlabHandle/FileContentIndex/d7358e6b-dbe0-408f-b545-6f16b110b964.vsidx deleted file mode 100644 index e85a1ea..0000000 Binary files a/余坯替代——中板/SlabHandle/.vs/SlabHandle/FileContentIndex/d7358e6b-dbe0-408f-b545-6f16b110b964.vsidx and /dev/null differ diff --git a/余坯替代——中板/SlabHandle/.vs/SlabHandle/v17/.suo b/余坯替代——中板/SlabHandle/.vs/SlabHandle/v17/.suo index f6953b4..9944c56 100644 Binary files a/余坯替代——中板/SlabHandle/.vs/SlabHandle/v17/.suo and b/余坯替代——中板/SlabHandle/.vs/SlabHandle/v17/.suo differ diff --git a/余坯替代——中板/SlabHandle/SlabHandle/SlabControler.cs b/余坯替代——中板/SlabHandle/SlabHandle/SlabControler.cs index c74f9b2..90741e4 100644 --- a/余坯替代——中板/SlabHandle/SlabHandle/SlabControler.cs +++ b/余坯替代——中板/SlabHandle/SlabHandle/SlabControler.cs @@ -1362,8 +1362,8 @@ namespace SlabHandle //次头尾坯 22,33 if ((tSlab.OVER_FL == "22" - || tSlab.OVER_FL == "23") - && ChkHeadTail22_23(iPlateFic.Order, tSlab)) + || tSlab.OVER_FL == "33") + && ChkHeadTail22_33(iPlateFic.Order, tSlab)) { continue; } @@ -1777,8 +1777,8 @@ namespace SlabHandle //次头尾坯 22,33 if ((tSlab.OVER_FL == "22" - || tSlab.OVER_FL == "23") - && ChkHeadTail22_23(iPlateFic.Order, tSlab)) + || tSlab.OVER_FL == "33") + && ChkHeadTail22_33(iPlateFic.Order, tSlab)) { continue; } @@ -15550,7 +15550,7 @@ namespace SlabHandle /// 订单信息 /// 板坯信息 /// - public static bool ChkHeadTail22_23(BP_ORDER_ITEM BOI, TB_SLAB TS) + public static bool ChkHeadTail22_33(BP_ORDER_ITEM BOI, TB_SLAB TS) { string strStdEng = gltQpStdHead.Where(p => p.STDSPEC == BOI.STDSPEC && p.STDSPEC_YY == BOI.STDSPEC_YY).FirstOrDefault().STDSPEC_NAME_ENG; @@ -15559,10 +15559,16 @@ namespace SlabHandle // 次尾坏产生的钢板不能出现在这两个标准号上。另外对于原来“工程机械用钢不能使用头尾还管控”,对此标准号仍适用。 if (BOI.STDSPEC == "G2-GB/T-Q345B-SANY" || BOI.STDSPEC == "G2-Q345B-SANY-YC") { - logger.InfoFormat(" ####头尾坯不能轧制 G2-Q345B-SANY-YC 和 G2-Q345B-SANY-YC :{0}-{1}", BOI.ORD_NO, BOI.ORD_ITEM); + logger.InfoFormat(" ####次头尾坯不能轧制 G2-Q345B-SANY-YC 和 G2-Q345B-SANY-YC :{0}-{1}", BOI.ORD_NO, BOI.ORD_ITEM); return true; } + //修改一下程序管控,轧制标准号后缀-SANY ,次头尾坯不能替代,现在头尾坯是管控的,因为有G1,次头尾坯也要管控住 2024-05-06 武振 + if (BOI.STDSPEC == "-SANY" ) + { + logger.InfoFormat(" ####次头尾坯不能轧制 -SANY :{0}-{1}", BOI.ORD_NO, BOI.ORD_ITEM); + return true; + } return false; @@ -18520,8 +18526,8 @@ namespace SlabHandle //次头尾坯 22,33 if ((prTS.OVER_FL == "22" - || prTS.OVER_FL == "23") - && ChkHeadTail22_23(prBOI, prTS)) + || prTS.OVER_FL == "33") + && ChkHeadTail22_33(prBOI, prTS)) { continue; } diff --git a/余坯替代——中板/SlabHandle/SlabHandle/bin/Debug/SlabHandle.exe b/余坯替代——中板/SlabHandle/SlabHandle/bin/Debug/SlabHandle.exe index 561a4bf..92749df 100644 Binary files a/余坯替代——中板/SlabHandle/SlabHandle/bin/Debug/SlabHandle.exe and b/余坯替代——中板/SlabHandle/SlabHandle/bin/Debug/SlabHandle.exe differ diff --git a/余坯替代——中板/SlabHandle/SlabHandle/bin/Debug/SlabHandle.pdb b/余坯替代——中板/SlabHandle/SlabHandle/bin/Debug/SlabHandle.pdb index 0b1868d..f51adbc 100644 Binary files a/余坯替代——中板/SlabHandle/SlabHandle/bin/Debug/SlabHandle.pdb and b/余坯替代——中板/SlabHandle/SlabHandle/bin/Debug/SlabHandle.pdb differ diff --git a/余坯替代——中板/SlabHandle/SlabHandle/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/余坯替代——中板/SlabHandle/SlabHandle/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index f68c230..e0fb446 100644 Binary files a/余坯替代——中板/SlabHandle/SlabHandle/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/余坯替代——中板/SlabHandle/SlabHandle/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/余坯替代——中板/SlabHandle/SlabHandle/obj/Debug/SlabHandle.csproj.AssemblyReference.cache b/余坯替代——中板/SlabHandle/SlabHandle/obj/Debug/SlabHandle.csproj.AssemblyReference.cache index 35aada4..2e6b106 100644 Binary files a/余坯替代——中板/SlabHandle/SlabHandle/obj/Debug/SlabHandle.csproj.AssemblyReference.cache and b/余坯替代——中板/SlabHandle/SlabHandle/obj/Debug/SlabHandle.csproj.AssemblyReference.cache differ diff --git a/余坯替代——中板/SlabHandle/SlabHandle/obj/Debug/SlabHandle.csproj.CoreCompileInputs.cache b/余坯替代——中板/SlabHandle/SlabHandle/obj/Debug/SlabHandle.csproj.CoreCompileInputs.cache index 6e5af0c..e3a7562 100644 --- a/余坯替代——中板/SlabHandle/SlabHandle/obj/Debug/SlabHandle.csproj.CoreCompileInputs.cache +++ b/余坯替代——中板/SlabHandle/SlabHandle/obj/Debug/SlabHandle.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -a3b9ba313bfecae39598870086a28c330b2f120e +36bb2706d352ed21b777a84cbdc99920a90b3635 diff --git a/余坯替代——中板/SlabHandle/SlabHandle/obj/Debug/SlabHandle.csproj.FileListAbsolute.txt b/余坯替代——中板/SlabHandle/SlabHandle/obj/Debug/SlabHandle.csproj.FileListAbsolute.txt index 2300723..38528bb 100644 --- a/余坯替代——中板/SlabHandle/SlabHandle/obj/Debug/SlabHandle.csproj.FileListAbsolute.txt +++ b/余坯替代——中板/SlabHandle/SlabHandle/obj/Debug/SlabHandle.csproj.FileListAbsolute.txt @@ -170,3 +170,23 @@ D:\安丰1780项目\ipd-file\SlabHandle\SlabHandle\obj\Debug\SlabHandle.csproj.C D:\安丰1780项目\ipd-file\SlabHandle\SlabHandle\obj\Debug\SlabHandle.csproj.CopyComplete D:\安丰1780项目\ipd-file\SlabHandle\SlabHandle\obj\Debug\SlabHandle.exe D:\安丰1780项目\ipd-file\SlabHandle\SlabHandle\obj\Debug\SlabHandle.pdb +D:\_NG_1\NG_Project\余坯替代——中板\SlabHandle\SlabHandle\bin\Debug\log4net.config +D:\_NG_1\NG_Project\余坯替代——中板\SlabHandle\SlabHandle\bin\Debug\SlabHandle.exe.config +D:\_NG_1\NG_Project\余坯替代——中板\SlabHandle\SlabHandle\bin\Debug\SlabHandle.exe +D:\_NG_1\NG_Project\余坯替代——中板\SlabHandle\SlabHandle\bin\Debug\SlabHandle.pdb +D:\_NG_1\NG_Project\余坯替代——中板\SlabHandle\SlabHandle\bin\Debug\Google.OrTools.x86.dll +D:\_NG_1\NG_Project\余坯替代——中板\SlabHandle\SlabHandle\bin\Debug\Google.OrTools.x86.pdb +D:\_NG_1\NG_Project\余坯替代——中板\SlabHandle\SlabHandle\bin\Debug\Google.Protobuf.dll +D:\_NG_1\NG_Project\余坯替代——中板\SlabHandle\SlabHandle\bin\Debug\Newtonsoft.Json.dll +D:\_NG_1\NG_Project\余坯替代——中板\SlabHandle\SlabHandle\bin\Debug\System.Buffers.dll +D:\_NG_1\NG_Project\余坯替代——中板\SlabHandle\SlabHandle\bin\Debug\System.Memory.dll +D:\_NG_1\NG_Project\余坯替代——中板\SlabHandle\SlabHandle\bin\Debug\System.Net.Http.Formatting.dll +D:\_NG_1\NG_Project\余坯替代——中板\SlabHandle\SlabHandle\bin\Debug\System.Numerics.Vectors.dll +D:\_NG_1\NG_Project\余坯替代——中板\SlabHandle\SlabHandle\bin\Debug\System.Runtime.CompilerServices.Unsafe.dll +D:\_NG_1\NG_Project\余坯替代——中板\SlabHandle\SlabHandle\obj\Debug\SlabHandle.csproj.AssemblyReference.cache +D:\_NG_1\NG_Project\余坯替代——中板\SlabHandle\SlabHandle\obj\Debug\SlabHandle.csproj.SuggestedBindingRedirects.cache +D:\_NG_1\NG_Project\余坯替代——中板\SlabHandle\SlabHandle\obj\Debug\SlabHandle.exe.config +D:\_NG_1\NG_Project\余坯替代——中板\SlabHandle\SlabHandle\obj\Debug\SlabHandle.csproj.CoreCompileInputs.cache +D:\_NG_1\NG_Project\余坯替代——中板\SlabHandle\SlabHandle\obj\Debug\SlabHandle.csproj.CopyComplete +D:\_NG_1\NG_Project\余坯替代——中板\SlabHandle\SlabHandle\obj\Debug\SlabHandle.exe +D:\_NG_1\NG_Project\余坯替代——中板\SlabHandle\SlabHandle\obj\Debug\SlabHandle.pdb diff --git a/余坯替代——中板/SlabHandle/SlabHandle/obj/Debug/SlabHandle.exe b/余坯替代——中板/SlabHandle/SlabHandle/obj/Debug/SlabHandle.exe index 561a4bf..92749df 100644 Binary files a/余坯替代——中板/SlabHandle/SlabHandle/obj/Debug/SlabHandle.exe and b/余坯替代——中板/SlabHandle/SlabHandle/obj/Debug/SlabHandle.exe differ diff --git a/余坯替代——中板/SlabHandle/SlabHandle/obj/Debug/SlabHandle.pdb b/余坯替代——中板/SlabHandle/SlabHandle/obj/Debug/SlabHandle.pdb index 0b1868d..f51adbc 100644 Binary files a/余坯替代——中板/SlabHandle/SlabHandle/obj/Debug/SlabHandle.pdb and b/余坯替代——中板/SlabHandle/SlabHandle/obj/Debug/SlabHandle.pdb differ diff --git a/余坯替代——宽板/SlabWidThkHandle/.vs/SlabHandle/v17/.suo b/余坯替代——宽板/SlabWidThkHandle/.vs/SlabHandle/v17/.suo index 6277661..c0e1e8d 100644 Binary files a/余坯替代——宽板/SlabWidThkHandle/.vs/SlabHandle/v17/.suo and b/余坯替代——宽板/SlabWidThkHandle/.vs/SlabHandle/v17/.suo differ diff --git a/余坯替代——宽板/SlabWidThkHandle/SlabHandle/SlabWidThkControler.cs b/余坯替代——宽板/SlabWidThkHandle/SlabHandle/SlabWidThkControler.cs index 935bbb9..8e3e6a3 100644 --- a/余坯替代——宽板/SlabWidThkHandle/SlabHandle/SlabWidThkControler.cs +++ b/余坯替代——宽板/SlabWidThkHandle/SlabHandle/SlabWidThkControler.cs @@ -6645,6 +6645,13 @@ namespace SlabHandle { return true; } + + // 修改一下程序管控,轧制标准号后缀-SANY ,次头尾坯不能替代,现在头尾坯是管控的,因为有G1,次头尾坯也要管控住 2024-05-06 武振提 + if (( TS.OVER_FL == "22" || TS.OVER_FL == "33") && (BOI.STDSPEC.Contains("-SANY"))) + { + return true; + } + //用订单厚度代替产品厚度 MltProcCd = gltQpQltyTech.Where(p => p.ORD_NO == BOI.ORD_NO && p.ORD_ITEM == BOI.ORD_ITEM).FirstOrDefault().MLT_PROC_CD; //如果上面(1)查出的探伤变量V_UST_FL不是X并且不是强制替代或者上面的(3)查出的变量V_FORCE_CNT等于0并且上面(1)查出的订单种类为A并且上面(2)查出的变量V_RH_COUNT等于0并且产品的厚度>=16 提示“产品厚度大于16MM的探伤板,不能与此坯料进行替代”不允许替代 diff --git a/余坯替代——宽板/SlabWidThkHandle/SlabHandle/SlabWidThkService - 复制.cs b/余坯替代——宽板/SlabWidThkHandle/SlabHandle/SlabWidThkService - 复制.cs index c27ea3c..18c2f26 100644 --- a/余坯替代——宽板/SlabWidThkHandle/SlabHandle/SlabWidThkService - 复制.cs +++ b/余坯替代——宽板/SlabWidThkHandle/SlabHandle/SlabWidThkService - 复制.cs @@ -30,8 +30,8 @@ namespace SlabHandle public class SlabWidThkService_test { private static readonly ILog logger = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - private static string slab = " AND SLAB_NO in ('2430346801') "; - private static string boi = " boi.ORD_NO || '-' || boi.ORD_ITEM in ('EMK24050004-002')"; + private static string slab = " AND SLAB_NO in ('2410198603') "; + private static string boi = " boi.ORD_NO || '-' || boi.ORD_ITEM in ('OMA24010014-041')"; private static string lack_num = ",'8'AS SUB_LACK_NUM,'8'AS LACK_NUM"; private static string wgt_max = ",'200' AS WGT_MAX "; private static string wgt_min = ",'150' AS WGT_MIN "; diff --git a/余坯替代——宽板/SlabWidThkHandle/SlabHandle/bin/Debug/SlabHandle.exe b/余坯替代——宽板/SlabWidThkHandle/SlabHandle/bin/Debug/SlabHandle.exe index 3c1b219..276ed6e 100644 Binary files a/余坯替代——宽板/SlabWidThkHandle/SlabHandle/bin/Debug/SlabHandle.exe and b/余坯替代——宽板/SlabWidThkHandle/SlabHandle/bin/Debug/SlabHandle.exe differ diff --git a/余坯替代——宽板/SlabWidThkHandle/SlabHandle/bin/Debug/SlabHandle.pdb b/余坯替代——宽板/SlabWidThkHandle/SlabHandle/bin/Debug/SlabHandle.pdb index a9a96de..417cd40 100644 Binary files a/余坯替代——宽板/SlabWidThkHandle/SlabHandle/bin/Debug/SlabHandle.pdb and b/余坯替代——宽板/SlabWidThkHandle/SlabHandle/bin/Debug/SlabHandle.pdb differ diff --git a/余坯替代——宽板/SlabWidThkHandle/SlabHandle/obj/Debug/SlabHandle.csproj.AssemblyReference.cache b/余坯替代——宽板/SlabWidThkHandle/SlabHandle/obj/Debug/SlabHandle.csproj.AssemblyReference.cache index 68deb5d..7f22ebb 100644 Binary files a/余坯替代——宽板/SlabWidThkHandle/SlabHandle/obj/Debug/SlabHandle.csproj.AssemblyReference.cache and b/余坯替代——宽板/SlabWidThkHandle/SlabHandle/obj/Debug/SlabHandle.csproj.AssemblyReference.cache differ diff --git a/余坯替代——宽板/SlabWidThkHandle/SlabHandle/obj/Debug/SlabHandle.exe b/余坯替代——宽板/SlabWidThkHandle/SlabHandle/obj/Debug/SlabHandle.exe index 3c1b219..276ed6e 100644 Binary files a/余坯替代——宽板/SlabWidThkHandle/SlabHandle/obj/Debug/SlabHandle.exe and b/余坯替代——宽板/SlabWidThkHandle/SlabHandle/obj/Debug/SlabHandle.exe differ diff --git a/余坯替代——宽板/SlabWidThkHandle/SlabHandle/obj/Debug/SlabHandle.pdb b/余坯替代——宽板/SlabWidThkHandle/SlabHandle/obj/Debug/SlabHandle.pdb index a9a96de..417cd40 100644 Binary files a/余坯替代——宽板/SlabWidThkHandle/SlabHandle/obj/Debug/SlabHandle.pdb and b/余坯替代——宽板/SlabWidThkHandle/SlabHandle/obj/Debug/SlabHandle.pdb differ diff --git a/余坯替代——板卷/SlabCoilHandle/.vs/SlabHandle/v17/.suo b/余坯替代——板卷/SlabCoilHandle/.vs/SlabHandle/v17/.suo index cf16aea..4f850d3 100644 Binary files a/余坯替代——板卷/SlabCoilHandle/.vs/SlabHandle/v17/.suo and b/余坯替代——板卷/SlabCoilHandle/.vs/SlabHandle/v17/.suo differ diff --git a/余坯替代——板卷/SlabCoilHandle/SlabHandle/SlabCoilControler.cs b/余坯替代——板卷/SlabCoilHandle/SlabHandle/SlabCoilControler.cs index 9e9472c..9adb9fe 100644 --- a/余坯替代——板卷/SlabCoilHandle/SlabHandle/SlabCoilControler.cs +++ b/余坯替代——板卷/SlabCoilHandle/SlabHandle/SlabCoilControler.cs @@ -954,6 +954,13 @@ namespace SlabHandle blnSave = false; break; } + // 修改一下程序管控,轧制标准号后缀-SANY ,次头尾坯不能替代,现在头尾坯是管控的,因为有G1,次头尾坯也要管控住 2024-05-06 武振提 + if ((prTS.OVER_FL == "22" || prTS.OVER_FL == "33") && (prBOI.STDSPEC.Contains("-SANY"))) + { + blnSave = false; + break; + } + //协议配协议 if (prBOI.XY_FLG != prTS.XY_FLG) { @@ -1073,6 +1080,14 @@ namespace SlabHandle blnSave = false; break; } + + // 修改一下程序管控,轧制标准号后缀-SANY ,次头尾坯不能替代,现在头尾坯是管控的,因为有G1,次头尾坯也要管控住 2024-05-06 武振提 + if ((prTS.OVER_FL == "22" || prTS.OVER_FL == "33") && (prBOI.STDSPEC.Contains("-SANY"))) + { + blnSave = false; + break; + } + //化学成分检测 if (!ChkChemCom(prTS, prBOI)) { @@ -1246,7 +1261,7 @@ namespace SlabHandle TB_PLATE_FIC tpf2 = new TB_PLATE_FIC(); if (tpf == null) { - + return; } tpf2 = CopyToModel(tpf); @@ -2111,6 +2126,13 @@ namespace SlabHandle continue; } + // 修改一下程序管控,轧制标准号后缀-SANY ,次头尾坯不能替代,现在头尾坯是管控的,因为有G1,次头尾坯也要管控住 2024-05-06 武振提 + if ((tSlab.OVER_FL == "22" || tSlab.OVER_FL == "33") && (iPlateFic.Order.STDSPEC.Contains("-SANY"))) + { + ltOrd.Add(iPlateFic.ORD_NO + "-" + iPlateFic.ORD_ITEM, true); + continue; + } + //头尾坯 2,3,5,6 if ((tSlab.OVER_FL == "2" || tSlab.OVER_FL == "3" @@ -2266,6 +2288,7 @@ namespace SlabHandle { continue; } + //异钢种检测 if (!ChkStldStand(tSlab, iPlateGrp.CRU_PIEs[0].Order)) { @@ -2379,6 +2402,13 @@ namespace SlabHandle ltOrd.Add(iPlateFic.ORD_NO + "-" + iPlateFic.ORD_ITEM, true); continue; } + + // 修改一下程序管控,轧制标准号后缀-SANY ,次头尾坯不能替代,现在头尾坯是管控的,因为有G1,次头尾坯也要管控住 2024-05-06 武振提 + if ((tSlab.OVER_FL == "22" || tSlab.OVER_FL == "33") && (iPlateFic.Order.STDSPEC.Contains("-SANY"))) + { + ltOrd.Add(iPlateFic.ORD_NO + "-" + iPlateFic.ORD_ITEM, true); + continue; + } //头尾坯 2,3,5,6 if ((tSlab.OVER_FL == "2" || tSlab.OVER_FL == "3" @@ -3248,8 +3278,8 @@ namespace SlabHandle && (p.STLGRD == "*" || p.STLGRD == tSlab.STLGRD) ).OrderBy(p => p.STLGRD).FirstOrDefault().SLAB_LEN_MAX : 20000; - decimal rem_Len = decSlabLen > SLAB_LEN_MAX? SLAB_LEN_MAX: decSlabLen; - if ((tSlab.ORG_WID - 31 > tB_PLATE_GRP_THKGRP.CAL_WID && tSlab.ORG_WID - tB_PLATE_GRP_THKGRP.THK_GRP.Max(p => p.CRU_PIEs.Max(q=>q.ORD_WID)) > 120) + decimal rem_Len = decSlabLen > SLAB_LEN_MAX ? SLAB_LEN_MAX : decSlabLen; + if ((tSlab.ORG_WID - 31 > tB_PLATE_GRP_THKGRP.CAL_WID && tSlab.ORG_WID - tB_PLATE_GRP_THKGRP.THK_GRP.Max(p => p.CRU_PIEs.Max(q => q.ORD_WID)) > 115) || (tSlab.TAIL_SLAB_WID != tSlab.HEAD_SLAB_WID && tSlab.SLAB_NO.Substring(tSlab.SLAB_NO.Length - 2).ToInt() < 30 && Math.Abs(tSlab.HEAD_SLAB_WID - tSlab.TAIL_SLAB_WID) > 40)) { decimal czLen = ((40 * (1 - (ScaleLoss / 100))) / (Convert.ToDecimal(7.85) * (tSlab.THK / 1000) * (tSlab.WID / 1000))) * 1000; @@ -5413,7 +5443,7 @@ namespace SlabHandle fsd.REM_WGT = iSlab.REM_WGT - TPG.MAX_WGT;//计算剩余重量 fsd.REM_LEN = iSlab.REM_LEN - TPG.SLAB_LEN;//计算剩余长度 fsd.SUB_KND = "3"; - if ((iSlab.ORG_WID - 31 > TPG.CAL_WID&&iSlab.ORG_WID - TPG.CRU_PIEs_TMP.Max(p=>p.ORD_WID)>120) + if ((iSlab.ORG_WID - 31 > TPG.CAL_WID && iSlab.ORG_WID - TPG.CRU_PIEs_TMP.Max(p => p.ORD_WID) > 115) || (iSlab.TAIL_SLAB_WID != iSlab.HEAD_SLAB_WID && iSlab.SLAB_NO.Substring(iSlab.SLAB_NO.Length - 2).ToInt() < 30 && Math.Abs(iSlab.HEAD_SLAB_WID - iSlab.TAIL_SLAB_WID) > 40)) { fsd.FL = "Y"; @@ -5972,7 +6002,7 @@ namespace SlabHandle } } - if ((iSlab.ORG_WID - 31 > TPG.CAL_WID && iSlab.ORG_WID - TPG.CRU_PIEs_TMP.Max(p => p.ORD_WID) > 120) + if ((iSlab.ORG_WID - 31 > TPG.CAL_WID && iSlab.ORG_WID - TPG.CRU_PIEs_TMP.Max(p => p.ORD_WID) > 115) || (iSlab.TAIL_SLAB_WID != iSlab.HEAD_SLAB_WID && iSlab.SLAB_NO.Substring(iSlab.SLAB_NO.Length - 2).ToInt() < 30 && Math.Abs(iSlab.HEAD_SLAB_WID - iSlab.TAIL_SLAB_WID) > 40)) { fsd = new FP_SLAB_DES(); @@ -6662,7 +6692,7 @@ namespace SlabHandle fsd.REM_WGT = iSlab.REM_WGT - TPG.MAX_WGT;//计算剩余重量 fsd.REM_LEN = iSlab.REM_LEN - TPG.SLAB_LEN;//计算剩余长度 fsd.SUB_KND = "3"; - if ((iSlab.ORG_WID - 31 > TPG.CAL_WID && iSlab.ORG_WID - TPG.TPF_TMP.Max(p=>p.ORD_WID) > 120) + if ((iSlab.ORG_WID - 31 > TPG.CAL_WID && iSlab.ORG_WID - TPG.TPF_TMP.Max(p => p.ORD_WID) > 115) || (iSlab.TAIL_SLAB_WID != iSlab.HEAD_SLAB_WID && iSlab.SLAB_NO.Substring(iSlab.SLAB_NO.Length - 2).ToInt() < 30 && Math.Abs(iSlab.HEAD_SLAB_WID - TPG.CAL_WID) > 30)) { fsd.FL = "Y"; @@ -6690,8 +6720,8 @@ namespace SlabHandle } addTail(TPG, iSlab, cut, ref intCut); - if ((iSlab.ORG_WID - 31 > TPG.CAL_WID && iSlab.ORG_WID - TPG.TPF_TMP.Max(p => p.ORD_WID) > 120) - ||(iSlab.TAIL_SLAB_WID != iSlab.HEAD_SLAB_WID && iSlab.SLAB_NO.Substring(iSlab.SLAB_NO.Length - 2).ToInt() < 30 && iSlab.HEAD_SLAB_WID - TPG.CAL_WID > 30)) + if ((iSlab.ORG_WID - 31 > TPG.CAL_WID && iSlab.ORG_WID - TPG.TPF_TMP.Max(p => p.ORD_WID) > 115) + || (iSlab.TAIL_SLAB_WID != iSlab.HEAD_SLAB_WID && iSlab.SLAB_NO.Substring(iSlab.SLAB_NO.Length - 2).ToInt() < 30 && iSlab.HEAD_SLAB_WID - TPG.CAL_WID > 30)) { fsd = new FP_SLAB_DES(); fsd.SLAB_NO = iSlab.SLAB_NO; diff --git a/余坯替代——板卷/SlabCoilHandle/SlabHandle/SlabHandle.csproj b/余坯替代——板卷/SlabCoilHandle/SlabHandle/SlabHandle.csproj index dd4c7e0..21e78f3 100644 --- a/余坯替代——板卷/SlabCoilHandle/SlabHandle/SlabHandle.csproj +++ b/余坯替代——板卷/SlabCoilHandle/SlabHandle/SlabHandle.csproj @@ -41,12 +41,6 @@ bin\Debug\GenuineChannels.dll - - ..\..\..\soa\SlabHandle\packages\Google.OrTools.x86.5.0.6170.24109\lib\net40\Google.OrTools.x86.dll - - - ..\..\..\..\DLL\Google.Protobuf.dll - bin\Debug\IBM.Data.DB2.dll diff --git a/余坯替代——板卷/SlabCoilHandle/SlabHandle/bin/Debug/SlabHandle.exe b/余坯替代——板卷/SlabCoilHandle/SlabHandle/bin/Debug/SlabHandle.exe index bae5d54..900d9f8 100644 Binary files a/余坯替代——板卷/SlabCoilHandle/SlabHandle/bin/Debug/SlabHandle.exe and b/余坯替代——板卷/SlabCoilHandle/SlabHandle/bin/Debug/SlabHandle.exe differ diff --git a/余坯替代——板卷/SlabCoilHandle/SlabHandle/bin/Debug/SlabHandle.pdb b/余坯替代——板卷/SlabCoilHandle/SlabHandle/bin/Debug/SlabHandle.pdb index 84fe670..bd431dc 100644 Binary files a/余坯替代——板卷/SlabCoilHandle/SlabHandle/bin/Debug/SlabHandle.pdb and b/余坯替代——板卷/SlabCoilHandle/SlabHandle/bin/Debug/SlabHandle.pdb differ diff --git a/余坯替代——板卷/SlabCoilHandle/SlabHandle/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/余坯替代——板卷/SlabCoilHandle/SlabHandle/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index bfa9f13..895711a 100644 Binary files a/余坯替代——板卷/SlabCoilHandle/SlabHandle/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/余坯替代——板卷/SlabCoilHandle/SlabHandle/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/余坯替代——板卷/SlabCoilHandle/SlabHandle/obj/Debug/SlabHandle.csproj.AssemblyReference.cache b/余坯替代——板卷/SlabCoilHandle/SlabHandle/obj/Debug/SlabHandle.csproj.AssemblyReference.cache index c0f572d..f0313ba 100644 Binary files a/余坯替代——板卷/SlabCoilHandle/SlabHandle/obj/Debug/SlabHandle.csproj.AssemblyReference.cache and b/余坯替代——板卷/SlabCoilHandle/SlabHandle/obj/Debug/SlabHandle.csproj.AssemblyReference.cache differ diff --git a/余坯替代——板卷/SlabCoilHandle/SlabHandle/obj/Debug/SlabHandle.csproj.CoreCompileInputs.cache b/余坯替代——板卷/SlabCoilHandle/SlabHandle/obj/Debug/SlabHandle.csproj.CoreCompileInputs.cache index 4d1cc44..dc8b7c4 100644 --- a/余坯替代——板卷/SlabCoilHandle/SlabHandle/obj/Debug/SlabHandle.csproj.CoreCompileInputs.cache +++ b/余坯替代——板卷/SlabCoilHandle/SlabHandle/obj/Debug/SlabHandle.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -486bcf92a33a5478205dd0e1958eb28e1b0657d1 +6b4629c4108929a77946b399eb0d40fcc2023167 diff --git a/余坯替代——板卷/SlabCoilHandle/SlabHandle/obj/Debug/SlabHandle.csproj.FileListAbsolute.txt b/余坯替代——板卷/SlabCoilHandle/SlabHandle/obj/Debug/SlabHandle.csproj.FileListAbsolute.txt index 29ab8cb..48ef4d9 100644 --- a/余坯替代——板卷/SlabCoilHandle/SlabHandle/obj/Debug/SlabHandle.csproj.FileListAbsolute.txt +++ b/余坯替代——板卷/SlabCoilHandle/SlabHandle/obj/Debug/SlabHandle.csproj.FileListAbsolute.txt @@ -151,3 +151,23 @@ D:\新建文件夹\ipd-file\SlabCoilHandle\SlabHandle\obj\Debug\SlabHandle.cspro D:\新建文件夹\ipd-file\SlabCoilHandle\SlabHandle\obj\Debug\SlabHandle.csproj.CopyComplete D:\新建文件夹\ipd-file\SlabCoilHandle\SlabHandle\obj\Debug\SlabHandle.exe D:\新建文件夹\ipd-file\SlabCoilHandle\SlabHandle\obj\Debug\SlabHandle.pdb +D:\_NG_1\NG_Project\余坯替代——板卷\SlabCoilHandle\SlabHandle\obj\Debug\SlabHandle.exe +D:\_NG_1\NG_Project\余坯替代——板卷\SlabCoilHandle\SlabHandle\obj\Debug\SlabHandle.pdb +D:\_NG_1\NG_Project\余坯替代——板卷\SlabCoilHandle\SlabHandle\bin\Debug\log4net.config +D:\_NG_1\NG_Project\余坯替代——板卷\SlabCoilHandle\SlabHandle\bin\Debug\SlabHandle.exe.config +D:\_NG_1\NG_Project\余坯替代——板卷\SlabCoilHandle\SlabHandle\bin\Debug\SlabHandle.exe +D:\_NG_1\NG_Project\余坯替代——板卷\SlabCoilHandle\SlabHandle\bin\Debug\SlabHandle.pdb +D:\_NG_1\NG_Project\余坯替代——板卷\SlabCoilHandle\SlabHandle\bin\Debug\Google.OrTools.x86.dll +D:\_NG_1\NG_Project\余坯替代——板卷\SlabCoilHandle\SlabHandle\bin\Debug\Google.OrTools.x86.pdb +D:\_NG_1\NG_Project\余坯替代——板卷\SlabCoilHandle\SlabHandle\bin\Debug\Google.Protobuf.dll +D:\_NG_1\NG_Project\余坯替代——板卷\SlabCoilHandle\SlabHandle\bin\Debug\Newtonsoft.Json.dll +D:\_NG_1\NG_Project\余坯替代——板卷\SlabCoilHandle\SlabHandle\bin\Debug\System.Buffers.dll +D:\_NG_1\NG_Project\余坯替代——板卷\SlabCoilHandle\SlabHandle\bin\Debug\System.Memory.dll +D:\_NG_1\NG_Project\余坯替代——板卷\SlabCoilHandle\SlabHandle\bin\Debug\System.Net.Http.Formatting.dll +D:\_NG_1\NG_Project\余坯替代——板卷\SlabCoilHandle\SlabHandle\bin\Debug\System.Numerics.Vectors.dll +D:\_NG_1\NG_Project\余坯替代——板卷\SlabCoilHandle\SlabHandle\bin\Debug\System.Runtime.CompilerServices.Unsafe.dll +D:\_NG_1\NG_Project\余坯替代——板卷\SlabCoilHandle\SlabHandle\obj\Debug\SlabHandle.csproj.AssemblyReference.cache +D:\_NG_1\NG_Project\余坯替代——板卷\SlabCoilHandle\SlabHandle\obj\Debug\SlabHandle.csproj.SuggestedBindingRedirects.cache +D:\_NG_1\NG_Project\余坯替代——板卷\SlabCoilHandle\SlabHandle\obj\Debug\SlabHandle.exe.config +D:\_NG_1\NG_Project\余坯替代——板卷\SlabCoilHandle\SlabHandle\obj\Debug\SlabHandle.csproj.CoreCompileInputs.cache +D:\_NG_1\NG_Project\余坯替代——板卷\SlabCoilHandle\SlabHandle\obj\Debug\SlabHandle.csproj.CopyComplete diff --git a/余坯替代——板卷/SlabCoilHandle/SlabHandle/obj/Debug/SlabHandle.exe b/余坯替代——板卷/SlabCoilHandle/SlabHandle/obj/Debug/SlabHandle.exe index bae5d54..900d9f8 100644 Binary files a/余坯替代——板卷/SlabCoilHandle/SlabHandle/obj/Debug/SlabHandle.exe and b/余坯替代——板卷/SlabCoilHandle/SlabHandle/obj/Debug/SlabHandle.exe differ diff --git a/余坯替代——板卷/SlabCoilHandle/SlabHandle/obj/Debug/SlabHandle.pdb b/余坯替代——板卷/SlabCoilHandle/SlabHandle/obj/Debug/SlabHandle.pdb index 84fe670..bd431dc 100644 Binary files a/余坯替代——板卷/SlabCoilHandle/SlabHandle/obj/Debug/SlabHandle.pdb and b/余坯替代——板卷/SlabCoilHandle/SlabHandle/obj/Debug/SlabHandle.pdb differ diff --git a/余坯替代——板卷/SlabCoilHandle/SlabHandle/obj/SlabHandle.csproj.nuget.dgspec.json b/余坯替代——板卷/SlabCoilHandle/SlabHandle/obj/SlabHandle.csproj.nuget.dgspec.json index 7174f5a..bd47c02 100644 --- a/余坯替代——板卷/SlabCoilHandle/SlabHandle/obj/SlabHandle.csproj.nuget.dgspec.json +++ b/余坯替代——板卷/SlabCoilHandle/SlabHandle/obj/SlabHandle.csproj.nuget.dgspec.json @@ -1,24 +1,24 @@ { "format": 1, "restore": { - "D:\\新建文件夹\\ipd-file\\SlabCoilHandle\\SlabHandle\\SlabHandle.csproj": {} + "D:\\_NG_1\\NG_Project\\余坯替代——板卷\\SlabCoilHandle\\SlabHandle\\SlabHandle.csproj": {} }, "projects": { - "D:\\新建文件夹\\ipd-file\\SlabCoilHandle\\SlabHandle\\SlabHandle.csproj": { + "D:\\_NG_1\\NG_Project\\余坯替代——板卷\\SlabCoilHandle\\SlabHandle\\SlabHandle.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\新建文件夹\\ipd-file\\SlabCoilHandle\\SlabHandle\\SlabHandle.csproj", + "projectUniqueName": "D:\\_NG_1\\NG_Project\\余坯替代——板卷\\SlabCoilHandle\\SlabHandle\\SlabHandle.csproj", "projectName": "SlabHandle", - "projectPath": "D:\\新建文件夹\\ipd-file\\SlabCoilHandle\\SlabHandle\\SlabHandle.csproj", - "packagesPath": "C:\\Users\\sukura\\.nuget\\packages\\", - "outputPath": "D:\\新建文件夹\\ipd-file\\SlabCoilHandle\\SlabHandle\\obj\\", + "projectPath": "D:\\_NG_1\\NG_Project\\余坯替代——板卷\\SlabCoilHandle\\SlabHandle\\SlabHandle.csproj", + "packagesPath": "C:\\Users\\vaibl\\.nuget\\packages\\", + "outputPath": "D:\\_NG_1\\NG_Project\\余坯替代——板卷\\SlabCoilHandle\\SlabHandle\\obj\\", "projectStyle": "PackageReference", "skipContentFileWrite": true, "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\sukura\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\vaibl\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -53,6 +53,9 @@ "win": { "#import": [] }, + "win-arm64": { + "#import": [] + }, "win-x64": { "#import": [] }, diff --git a/余坯替代——板卷/SlabCoilHandle/SlabHandle/obj/SlabHandle.csproj.nuget.g.props b/余坯替代——板卷/SlabCoilHandle/SlabHandle/obj/SlabHandle.csproj.nuget.g.props index d2c7f7a..4d49cab 100644 --- a/余坯替代——板卷/SlabCoilHandle/SlabHandle/obj/SlabHandle.csproj.nuget.g.props +++ b/余坯替代——板卷/SlabCoilHandle/SlabHandle/obj/SlabHandle.csproj.nuget.g.props @@ -5,12 +5,12 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\sukura\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages + C:\Users\vaibl\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages PackageReference - 6.3.0 + 6.7.0 - + \ No newline at end of file diff --git a/余坯替代——板卷/SlabCoilHandle/SlabHandle/obj/project.assets.json b/余坯替代——板卷/SlabCoilHandle/SlabHandle/obj/project.assets.json index 5cb186f..53d34b0 100644 --- a/余坯替代——板卷/SlabCoilHandle/SlabHandle/obj/project.assets.json +++ b/余坯替代——板卷/SlabCoilHandle/SlabHandle/obj/project.assets.json @@ -75,6 +75,40 @@ } } }, + ".NETFramework,Version=v4.7.2/win-arm64": { + "Google.OrTools.runtime.win-x64/9.5.2237": { + "type": "package" + }, + "Google.OrTools.x86/5.0.6170.24109": { + "type": "package", + "dependencies": { + "Google.Protobuf": "3.0.0" + }, + "compile": { + "lib/net40/Google.OrTools.x86.dll": { + "related": ".pdb" + } + }, + "runtime": { + "lib/net40/Google.OrTools.x86.dll": { + "related": ".pdb" + } + } + }, + "Google.Protobuf/3.0.0": { + "type": "package", + "compile": { + "lib/net45/Google.Protobuf.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/net45/Google.Protobuf.dll": { + "related": ".xml" + } + } + } + }, ".NETFramework,Version=v4.7.2/win-x64": { "Google.OrTools.runtime.win-x64/9.5.2237": { "type": "package", @@ -197,24 +231,24 @@ ] }, "packageFolders": { - "C:\\Users\\sukura\\.nuget\\packages\\": {}, + "C:\\Users\\vaibl\\.nuget\\packages\\": {}, "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {} }, "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\新建文件夹\\ipd-file\\SlabCoilHandle\\SlabHandle\\SlabHandle.csproj", + "projectUniqueName": "D:\\_NG_1\\NG_Project\\余坯替代——板卷\\SlabCoilHandle\\SlabHandle\\SlabHandle.csproj", "projectName": "SlabHandle", - "projectPath": "D:\\新建文件夹\\ipd-file\\SlabCoilHandle\\SlabHandle\\SlabHandle.csproj", - "packagesPath": "C:\\Users\\sukura\\.nuget\\packages\\", - "outputPath": "D:\\新建文件夹\\ipd-file\\SlabCoilHandle\\SlabHandle\\obj\\", + "projectPath": "D:\\_NG_1\\NG_Project\\余坯替代——板卷\\SlabCoilHandle\\SlabHandle\\SlabHandle.csproj", + "packagesPath": "C:\\Users\\vaibl\\.nuget\\packages\\", + "outputPath": "D:\\_NG_1\\NG_Project\\余坯替代——板卷\\SlabCoilHandle\\SlabHandle\\obj\\", "projectStyle": "PackageReference", "skipContentFileWrite": true, "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\sukura\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\vaibl\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -249,6 +283,9 @@ "win": { "#import": [] }, + "win-arm64": { + "#import": [] + }, "win-x64": { "#import": [] }, diff --git a/余坯替代——板卷/SlabCoilHandle/SlabHandle/obj/project.nuget.cache b/余坯替代——板卷/SlabCoilHandle/SlabHandle/obj/project.nuget.cache index 68bca95..4a06da6 100644 --- a/余坯替代——板卷/SlabCoilHandle/SlabHandle/obj/project.nuget.cache +++ b/余坯替代——板卷/SlabCoilHandle/SlabHandle/obj/project.nuget.cache @@ -1,12 +1,12 @@ { "version": 2, - "dgSpecHash": "EpGw4VLV/K5ePOCjZOsyzOFX4+y9VvAKXO9XbLH7naIdyV3QXhUL5fI7j7fGsZNsGKx2HN+ccKlpR3tjszPEJg==", + "dgSpecHash": "PfkwbEMfv0nZ81IflZTywz7VR4YwxFh0R5NTIweTCxyFmvzHCCf4mw2WdyAzk+Z15udJF/2Vr6usS09LCEd6Gg==", "success": true, - "projectFilePath": "D:\\新建文件夹\\ipd-file\\SlabCoilHandle\\SlabHandle\\SlabHandle.csproj", + "projectFilePath": "D:\\_NG_1\\NG_Project\\余坯替代——板卷\\SlabCoilHandle\\SlabHandle\\SlabHandle.csproj", "expectedPackageFiles": [ - "C:\\Users\\sukura\\.nuget\\packages\\google.ortools.runtime.win-x64\\9.5.2237\\google.ortools.runtime.win-x64.9.5.2237.nupkg.sha512", - "C:\\Users\\sukura\\.nuget\\packages\\google.ortools.x86\\5.0.6170.24109\\google.ortools.x86.5.0.6170.24109.nupkg.sha512", - "C:\\Users\\sukura\\.nuget\\packages\\google.protobuf\\3.0.0\\google.protobuf.3.0.0.nupkg.sha512" + "C:\\Users\\vaibl\\.nuget\\packages\\google.ortools.runtime.win-x64\\9.5.2237\\google.ortools.runtime.win-x64.9.5.2237.nupkg.sha512", + "C:\\Users\\vaibl\\.nuget\\packages\\google.ortools.x86\\5.0.6170.24109\\google.ortools.x86.5.0.6170.24109.nupkg.sha512", + "C:\\Users\\vaibl\\.nuget\\packages\\google.protobuf\\3.0.0\\google.protobuf.3.0.0.nupkg.sha512" ], "logs": [] } \ No newline at end of file diff --git a/余材替代程序/SinglePlateHandle/.vs/SinglePlateHandle/FileContentIndex/351ccfaf-ea61-4fb1-b3c2-c337f80e40b1.vsidx b/余材替代程序/SinglePlateHandle/.vs/SinglePlateHandle/FileContentIndex/351ccfaf-ea61-4fb1-b3c2-c337f80e40b1.vsidx deleted file mode 100644 index e7e285c..0000000 Binary files a/余材替代程序/SinglePlateHandle/.vs/SinglePlateHandle/FileContentIndex/351ccfaf-ea61-4fb1-b3c2-c337f80e40b1.vsidx and /dev/null differ diff --git a/余材替代程序/SinglePlateHandle/.vs/SinglePlateHandle/v17/.suo b/余材替代程序/SinglePlateHandle/.vs/SinglePlateHandle/v17/.suo index 2fb1753..6a8edfd 100644 Binary files a/余材替代程序/SinglePlateHandle/.vs/SinglePlateHandle/v17/.suo and b/余材替代程序/SinglePlateHandle/.vs/SinglePlateHandle/v17/.suo differ diff --git a/余材替代程序/SinglePlateHandle/SinglePlateHandle/bin/Debug/SinglePlateHandle.exe b/余材替代程序/SinglePlateHandle/SinglePlateHandle/bin/Debug/SinglePlateHandle.exe index 821cbca..9ad0194 100644 Binary files a/余材替代程序/SinglePlateHandle/SinglePlateHandle/bin/Debug/SinglePlateHandle.exe and b/余材替代程序/SinglePlateHandle/SinglePlateHandle/bin/Debug/SinglePlateHandle.exe differ diff --git a/余材替代程序/SinglePlateHandle/SinglePlateHandle/bin/Debug/SinglePlateHandle.pdb b/余材替代程序/SinglePlateHandle/SinglePlateHandle/bin/Debug/SinglePlateHandle.pdb index d550a54..ca655d3 100644 Binary files a/余材替代程序/SinglePlateHandle/SinglePlateHandle/bin/Debug/SinglePlateHandle.pdb and b/余材替代程序/SinglePlateHandle/SinglePlateHandle/bin/Debug/SinglePlateHandle.pdb differ diff --git a/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 52a5a19..508f9aa 100644 Binary files a/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.csproj.AssemblyReference.cache b/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.csproj.AssemblyReference.cache index cd3da74..47a01fc 100644 Binary files a/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.csproj.AssemblyReference.cache and b/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.csproj.AssemblyReference.cache differ diff --git a/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.csproj.CoreCompileInputs.cache b/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.csproj.CoreCompileInputs.cache index fd775a2..c7cd999 100644 --- a/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.csproj.CoreCompileInputs.cache +++ b/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -dfc8bf080053223beeffd04ebb637121e825b238 +f2b6a7505f23c440e1d165b68582c10757f1e477 diff --git a/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.csproj.FileListAbsolute.txt b/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.csproj.FileListAbsolute.txt index b29c798..b4d1749 100644 --- a/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.csproj.FileListAbsolute.txt +++ b/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.csproj.FileListAbsolute.txt @@ -388,3 +388,35 @@ D:\Code\Codes\Test\余材替代测试\测试\SinglePlateHandle\SinglePlateHandle D:\Code\Codes\Test\余材替代测试\测试\SinglePlateHandle\SinglePlateHandle\obj\Debug\SinglePlateHandle.csproj.CopyComplete D:\Code\Codes\Test\余材替代测试\测试\SinglePlateHandle\SinglePlateHandle\obj\Debug\SinglePlateHandle.exe D:\Code\Codes\Test\余材替代测试\测试\SinglePlateHandle\SinglePlateHandle\obj\Debug\SinglePlateHandle.pdb +D:\_NG_1\NG_Project\余材替代程序\SinglePlateHandle\SinglePlateHandle\bin\Debug\SinglePlateHandle.exe.config +D:\_NG_1\NG_Project\余材替代程序\SinglePlateHandle\SinglePlateHandle\bin\Debug\SinglePlateHandle.exe +D:\_NG_1\NG_Project\余材替代程序\SinglePlateHandle\SinglePlateHandle\bin\Debug\SinglePlateHandle.pdb +D:\_NG_1\NG_Project\余材替代程序\SinglePlateHandle\SinglePlateHandle\bin\Debug\Confluent.Kafka.dll +D:\_NG_1\NG_Project\余材替代程序\SinglePlateHandle\SinglePlateHandle\bin\Debug\IBM.Data.DB2.dll +D:\_NG_1\NG_Project\余材替代程序\SinglePlateHandle\SinglePlateHandle\bin\Debug\Newtonsoft.Json.dll +D:\_NG_1\NG_Project\余材替代程序\SinglePlateHandle\SinglePlateHandle\bin\Debug\System.Buffers.dll +D:\_NG_1\NG_Project\余材替代程序\SinglePlateHandle\SinglePlateHandle\bin\Debug\System.Data.SQLite.dll +D:\_NG_1\NG_Project\余材替代程序\SinglePlateHandle\SinglePlateHandle\bin\Debug\System.Memory.dll +D:\_NG_1\NG_Project\余材替代程序\SinglePlateHandle\SinglePlateHandle\bin\Debug\System.Net.Http.Formatting.dll +D:\_NG_1\NG_Project\余材替代程序\SinglePlateHandle\SinglePlateHandle\bin\Debug\System.Numerics.Vectors.dll +D:\_NG_1\NG_Project\余材替代程序\SinglePlateHandle\SinglePlateHandle\bin\Debug\System.Runtime.CompilerServices.Unsafe.dll +D:\_NG_1\NG_Project\余材替代程序\SinglePlateHandle\SinglePlateHandle\bin\Debug\System.Web.Http.dll +D:\_NG_1\NG_Project\余材替代程序\SinglePlateHandle\SinglePlateHandle\bin\Debug\System.Web.Http.SelfHost.dll +D:\_NG_1\NG_Project\余材替代程序\SinglePlateHandle\SinglePlateHandle\bin\Debug\System.Web.Http.WebHost.dll +D:\_NG_1\NG_Project\余材替代程序\SinglePlateHandle\SinglePlateHandle\bin\Debug\Confluent.Kafka.xml +D:\_NG_1\NG_Project\余材替代程序\SinglePlateHandle\SinglePlateHandle\bin\Debug\System.Buffers.xml +D:\_NG_1\NG_Project\余材替代程序\SinglePlateHandle\SinglePlateHandle\bin\Debug\System.Data.SQLite.xml +D:\_NG_1\NG_Project\余材替代程序\SinglePlateHandle\SinglePlateHandle\bin\Debug\System.Memory.xml +D:\_NG_1\NG_Project\余材替代程序\SinglePlateHandle\SinglePlateHandle\bin\Debug\System.Net.Http.Formatting.xml +D:\_NG_1\NG_Project\余材替代程序\SinglePlateHandle\SinglePlateHandle\bin\Debug\System.Numerics.Vectors.xml +D:\_NG_1\NG_Project\余材替代程序\SinglePlateHandle\SinglePlateHandle\bin\Debug\System.Runtime.CompilerServices.Unsafe.xml +D:\_NG_1\NG_Project\余材替代程序\SinglePlateHandle\SinglePlateHandle\bin\Debug\System.Web.Http.xml +D:\_NG_1\NG_Project\余材替代程序\SinglePlateHandle\SinglePlateHandle\bin\Debug\System.Web.Http.SelfHost.xml +D:\_NG_1\NG_Project\余材替代程序\SinglePlateHandle\SinglePlateHandle\bin\Debug\System.Web.Http.WebHost.xml +D:\_NG_1\NG_Project\余材替代程序\SinglePlateHandle\SinglePlateHandle\obj\Debug\SinglePlateHandle.csproj.AssemblyReference.cache +D:\_NG_1\NG_Project\余材替代程序\SinglePlateHandle\SinglePlateHandle\obj\Debug\SinglePlateHandle.csproj.SuggestedBindingRedirects.cache +D:\_NG_1\NG_Project\余材替代程序\SinglePlateHandle\SinglePlateHandle\obj\Debug\SinglePlateHandle.exe.config +D:\_NG_1\NG_Project\余材替代程序\SinglePlateHandle\SinglePlateHandle\obj\Debug\SinglePlateHandle.csproj.CoreCompileInputs.cache +D:\_NG_1\NG_Project\余材替代程序\SinglePlateHandle\SinglePlateHandle\obj\Debug\SinglePlateHandle.csproj.CopyComplete +D:\_NG_1\NG_Project\余材替代程序\SinglePlateHandle\SinglePlateHandle\obj\Debug\SinglePlateHandle.exe +D:\_NG_1\NG_Project\余材替代程序\SinglePlateHandle\SinglePlateHandle\obj\Debug\SinglePlateHandle.pdb diff --git a/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.exe b/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.exe index 821cbca..9ad0194 100644 Binary files a/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.exe and b/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.exe differ diff --git a/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.pdb b/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.pdb index d550a54..ca655d3 100644 Binary files a/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.pdb and b/余材替代程序/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.pdb differ diff --git a/取样并样程序/SubResult/.vs/SubResult/FileContentIndex/87063969-2f69-4b18-8aa7-7550022ce92c.vsidx b/取样并样程序/SubResult/.vs/SubResult/FileContentIndex/87063969-2f69-4b18-8aa7-7550022ce92c.vsidx deleted file mode 100644 index ec27790..0000000 Binary files a/取样并样程序/SubResult/.vs/SubResult/FileContentIndex/87063969-2f69-4b18-8aa7-7550022ce92c.vsidx and /dev/null differ diff --git a/取样并样程序/SubResult/.vs/SubResult/FileContentIndex/8f504604-9b61-46a0-9a13-de3acaa4230e.vsidx b/取样并样程序/SubResult/.vs/SubResult/FileContentIndex/8f504604-9b61-46a0-9a13-de3acaa4230e.vsidx deleted file mode 100644 index 6a5e7f7..0000000 Binary files a/取样并样程序/SubResult/.vs/SubResult/FileContentIndex/8f504604-9b61-46a0-9a13-de3acaa4230e.vsidx and /dev/null differ diff --git a/取样并样程序/SubResult/.vs/SubResult/v17/.suo b/取样并样程序/SubResult/.vs/SubResult/v17/.suo index 955a8e8..9316d02 100644 Binary files a/取样并样程序/SubResult/.vs/SubResult/v17/.suo and b/取样并样程序/SubResult/.vs/SubResult/v17/.suo differ diff --git a/取样并样程序/SubResult/SubResult/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/取样并样程序/SubResult/SubResult/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index e8853dc..d35cf45 100644 Binary files a/取样并样程序/SubResult/SubResult/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/取样并样程序/SubResult/SubResult/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/取样并样程序/SubResult/SubResult/obj/Debug/SubResult.csproj.AssemblyReference.cache b/取样并样程序/SubResult/SubResult/obj/Debug/SubResult.csproj.AssemblyReference.cache index 4e9d79c..a5cfbc8 100644 Binary files a/取样并样程序/SubResult/SubResult/obj/Debug/SubResult.csproj.AssemblyReference.cache and b/取样并样程序/SubResult/SubResult/obj/Debug/SubResult.csproj.AssemblyReference.cache differ diff --git a/后端接口/ipd-server/.vs/iBkLinker-IPD/v17/.suo b/后端接口/ipd-server/.vs/iBkLinker-IPD/v17/.suo index d173587..31eafe5 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/Service/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/后端接口/ipd-server/Service/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 7958ebf..eb59b96 100644 Binary files a/后端接口/ipd-server/Service/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/后端接口/ipd-server/Service/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/库存分析/SinglePlateHandle/.vs/SinglePlateHandle/FileContentIndex/f509c097-6dc3-4b06-ad20-351c34a4717d.vsidx b/库存分析/SinglePlateHandle/.vs/SinglePlateHandle/FileContentIndex/f509c097-6dc3-4b06-ad20-351c34a4717d.vsidx deleted file mode 100644 index d20fdf0..0000000 Binary files a/库存分析/SinglePlateHandle/.vs/SinglePlateHandle/FileContentIndex/f509c097-6dc3-4b06-ad20-351c34a4717d.vsidx and /dev/null differ diff --git a/库存分析/SinglePlateHandle/.vs/SinglePlateHandle/v17/.suo b/库存分析/SinglePlateHandle/.vs/SinglePlateHandle/v17/.suo index 4420996..78425e3 100644 Binary files a/库存分析/SinglePlateHandle/.vs/SinglePlateHandle/v17/.suo and b/库存分析/SinglePlateHandle/.vs/SinglePlateHandle/v17/.suo differ diff --git a/库存分析/SinglePlateHandle/SinglePlateHandle/SurMatSubController.cs b/库存分析/SinglePlateHandle/SinglePlateHandle/SurMatSubController.cs index 90a9007..9ef3587 100644 --- a/库存分析/SinglePlateHandle/SinglePlateHandle/SurMatSubController.cs +++ b/库存分析/SinglePlateHandle/SinglePlateHandle/SurMatSubController.cs @@ -760,7 +760,7 @@ namespace ibk.IPD.Controller.IPD_PS } } } - gP_PLATEs1 = GetSurplusMaterial1("", ""); + //gP_PLATEs1 = GetSurplusMaterial1("", ""); logger.Info("【余材信息】:" + gP_PLATEs.Count); if (gP_PLATEs.Count > 0) { @@ -1146,7 +1146,7 @@ namespace ibk.IPD.Controller.IPD_PS int intLackNum = Convert.ToInt32(order.SUB_LACK_NUM);//欠量 intLackNum = SetSubNum(order); intLackNum -= GetSubNum(order);//减掉待确认数据=实际欠量 - //intLackNum = 1; + intLackNum = 1; #region 完全匹配 @@ -2283,20 +2283,20 @@ namespace ibk.IPD.Controller.IPD_PS } } } - - if (intLackNum <= 0) - { - if (gTB_PLATE_MANUAL.Where(p => p.PLATE_NO == itemGP_PLATE.PLATE_NO && p.ORD_NO == order.ORD_NO && p.ORD_ITEM == order.ORD_ITEM).ToList().Count > 0) - { - TB_PLATE_MANUAL manual = new TB_PLATE_MANUAL(); - manual.PLATE_NO = itemGP_PLATE.PLATE_NO; - manual.ORD_NO = order.ORD_NO; - manual.ORD_ITEM = order.ORD_ITEM; - manual.RETURN_RESULTS = "欠量不足"; - guTB_PLATE_MANUAL.Add(manual); - } - continue; - } + //intLackNum = 1; + //if (intLackNum <= 0) + //{ + // if (gTB_PLATE_MANUAL.Where(p => p.PLATE_NO == itemGP_PLATE.PLATE_NO && p.ORD_NO == order.ORD_NO && p.ORD_ITEM == order.ORD_ITEM).ToList().Count > 0) + // { + // TB_PLATE_MANUAL manual = new TB_PLATE_MANUAL(); + // manual.PLATE_NO = itemGP_PLATE.PLATE_NO; + // manual.ORD_NO = order.ORD_NO; + // manual.ORD_ITEM = order.ORD_ITEM; + // manual.RETURN_RESULTS = "欠量不足"; + // guTB_PLATE_MANUAL.Add(manual); + // } + // continue; + //} //不可替代订单页面 if (gltTBOrdSpe.Where(p => p.ORD_NO == order.ORD_NO && p.ORD_ITEM == order.ORD_ITEM).ToList().Count > 0) { diff --git a/库存分析/SinglePlateHandle/SinglePlateHandle/SurMatSubService.cs b/库存分析/SinglePlateHandle/SinglePlateHandle/SurMatSubService.cs index 10506a0..f149f37 100644 --- a/库存分析/SinglePlateHandle/SinglePlateHandle/SurMatSubService.cs +++ b/库存分析/SinglePlateHandle/SinglePlateHandle/SurMatSubService.cs @@ -341,7 +341,8 @@ namespace ibk.IPD.Service.IPD_PS IList gpPlates = null; //查询可用订单以及常用字段 - //strSql.AppendLine(" SELECT * from("); + //测试Test + strSql.AppendLine(" SELECT * from("); strSql.AppendLine(" SELECT DISTINCT"); strSql.AppendLine(" ORD_REMARK.REMARK ,"); strSql.AppendLine(" BOI.ORD_NO, BOI.ORD_ITEM, QQD.THK_TOL_MIN ,QQD.THK_TOL_MAX ,BOI.REC_STS, BOI.PLN_ORD, BOI.PLN_ORD_ITEM, BOI.ORD_STS, BOI.HOLD_FL, BOI.HOLD_DATE, BOI.HOLD_TIME, BOI.HOLD_EMP_ID "); @@ -420,19 +421,20 @@ namespace ibk.IPD.Service.IPD_PS //TODO:TEST_DATA strSql.AppendLine("WHERE 1=1 "); - strSql.AppendLine(" AND ((SELECT COUNT( A.REQ_SEQ_NO) "); - strSql.AppendLine(" FROM NISCO.EP_REQ_SLAB_D A, NISCO.EP_REQ_SLAB B "); - strSql.AppendLine(" WHERE "); - strSql.AppendLine(" 1 = 1 AND A.ORD_NO = BOI.ORD_NO AND A.ORD_ITEM = BOI.ORD_ITEM "); - strSql.AppendLine(" AND A.BLOCK_SEQ >= '01' "); - strSql.AppendLine(" AND A.SEQ >= '01' "); - strSql.AppendLine(" And B.REQ_SEQ_NO = A.REQ_SEQ_NO "); - 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)/(((BOI.ORD_WID / 1000) * (BOI.ORD_LEN / 1000) * (BOI.ORD_THK / 1000)) * 7.85)>=0.95 "); - strSql.AppendLine("AND boi.PROD_CD = 'PP' "); - strSql.AppendLine("AND boi.REC_STS = '2' "); - strSql.AppendLine("and boi.ORD_STS IN('E', 'D') "); + //strSql.AppendLine(" AND ((SELECT COUNT( A.REQ_SEQ_NO) "); + //strSql.AppendLine(" FROM NISCO.EP_REQ_SLAB_D A, NISCO.EP_REQ_SLAB B "); + //strSql.AppendLine(" WHERE "); + //strSql.AppendLine(" 1 = 1 AND A.ORD_NO = BOI.ORD_NO AND A.ORD_ITEM = BOI.ORD_ITEM "); + //strSql.AppendLine(" AND A.BLOCK_SEQ >= '01' "); + //strSql.AppendLine(" AND A.SEQ >= '01' "); + //strSql.AppendLine(" And B.REQ_SEQ_NO = A.REQ_SEQ_NO "); + //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)/(((BOI.ORD_WID / 1000) * (BOI.ORD_LEN / 1000) * (BOI.ORD_THK / 1000)) * 7.85)>=0.95 "); + //strSql.AppendLine("AND boi.PROD_CD = 'PP' "); + //strSql.AppendLine("AND boi.REC_STS = '2' "); + //strSql.AppendLine("and boi.ORD_STS IN('E', 'D') "); strSql.AppendLine("AND boi.ord_knd IN('A') "); - + strSql.AppendLine(" AND TO_CHAR(TO_DATE(boi.DEL_TO_DATE, 'YYYYMMDD'), 'YYYY-MM-DD HH24:MI:SS') >= TO_CHAR(SYSDATE - 180, 'YYYY-MM-DD HH24:MI:SS') "); + strSql.AppendLine(" AND TO_CHAR(TO_DATE(boi.DEL_TO_DATE, 'YYYYMMDD'), 'YYYY-MM-DD HH24:MI:SS') <= TO_CHAR(SYSDATE + 180, 'YYYY-MM-DD HH24:MI:SS') "); //20231130注 库存分析只分析A订单 strSql.AppendLine(strWHereOrd); strSql.AppendLine(strSpecialOrd); @@ -467,7 +469,11 @@ namespace ibk.IPD.Service.IPD_PS strSql.AppendLine(", QQT.HTM_METH3 "); strSql.AppendLine(", MATR.ROUNDSTD "); strSql.AppendLine(", ORD_REMARK.REMARK "); + //测试Test //strSql.AppendLine(") where ORD_NO ='OM723070013' AND ORD_ITEM ='561' "); + + //strSql.AppendLine(") T where T.ORD_NO || '-' || T.ORD_ITEM IN ('OM724020021-011','OM724020022-139','OM724020072-352','OM724030118-149','OM724030118-164','OM824030111-058') "); + strSql.AppendLine(") T where T.ORD_NO || '-' || T.ORD_ITEM IN ('OM724020021-011') "); try { //开启数据库连接查询数据 @@ -599,7 +605,8 @@ namespace ibk.IPD.Service.IPD_PS IList gpPlates = new List(); //查询语句日期时间拼接起来格式化成yyyy-mm-dd hh24:mi:ss PROD_WGT - //strSql.AppendLine("SELECT * from("); + //测试Test + strSql.AppendLine("SELECT * from("); strSql.AppendLine("SELECT"); strSql.AppendLine(" DISTINCT GP.PLATE_NO "); strSql.AppendLine(",GI.INSP_B_DEP_FLAW2 "); @@ -749,7 +756,8 @@ namespace ibk.IPD.Service.IPD_PS //strSql.AppendLine(" OR GP.PLATE_NO = '23305886020202'"); strSql.AppendLine("ORDER BY GP.PLATE_NO"); - //strSql.AppendLine(") where PLATE_NO = '23305886020202'"); + //测试Test + strSql.AppendLine(") T where T.PLATE_NO = '24203388040204'"); try { //开启数据库连接查询数据 @@ -774,7 +782,7 @@ namespace ibk.IPD.Service.IPD_PS IList gpPlates = new List(); //查询语句日期时间拼接起来格式化成yyyy-mm-dd hh24:mi:ss PROD_WGT - //strSql.AppendLine("SELECT * from("); + strSql.AppendLine("SELECT * from("); strSql.AppendLine("SELECT"); strSql.AppendLine(" DISTINCT GP.PLATE_NO "); strSql.AppendLine(",GI.INSP_B_DEP_FLAW2 "); @@ -919,7 +927,7 @@ namespace ibk.IPD.Service.IPD_PS //strSql.AppendLine(" OR GP.PLATE_NO = '23305886020202'"); strSql.AppendLine("ORDER BY GP.PLATE_NO"); - //strSql.AppendLine(") where PLATE_NO = '23305886020202'"); + strSql.AppendLine(") T where T.PLATE_NO = '24203388040204'"); try { //开启数据库连接查询数据 @@ -1028,20 +1036,21 @@ namespace ibk.IPD.Service.IPD_PS //TODO:TEST_DATA strSql.AppendLine("WHERE 1=1 "); - strSql.AppendLine(" AND ((SELECT COUNT( A.REQ_SEQ_NO) "); - strSql.AppendLine(" FROM NISCO.EP_REQ_SLAB_D A, NISCO.EP_REQ_SLAB B "); - strSql.AppendLine(" WHERE "); - strSql.AppendLine(" 1 = 1 AND A.ORD_NO = BOI.ORD_NO AND A.ORD_ITEM = BOI.ORD_ITEM "); - strSql.AppendLine(" AND A.BLOCK_SEQ >= '01' "); - strSql.AppendLine(" AND A.SEQ >= '01' "); - strSql.AppendLine(" And B.REQ_SEQ_NO = A.REQ_SEQ_NO "); - 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)/(((BOI.ORD_WID / 1000) * (BOI.ORD_LEN / 1000) * (BOI.ORD_THK / 1000)) * 7.85)>=0.95 "); - strSql.AppendLine("AND boi.PROD_CD = 'PP' "); - strSql.AppendLine("AND boi.REC_STS = '2' "); - strSql.AppendLine("and boi.ORD_STS IN('E', 'D') "); + //strSql.AppendLine(" AND ((SELECT COUNT( A.REQ_SEQ_NO) "); + //strSql.AppendLine(" FROM NISCO.EP_REQ_SLAB_D A, NISCO.EP_REQ_SLAB B "); + //strSql.AppendLine(" WHERE "); + //strSql.AppendLine(" 1 = 1 AND A.ORD_NO = BOI.ORD_NO AND A.ORD_ITEM = BOI.ORD_ITEM "); + //strSql.AppendLine(" AND A.BLOCK_SEQ >= '01' "); + //strSql.AppendLine(" AND A.SEQ >= '01' "); + //strSql.AppendLine(" And B.REQ_SEQ_NO = A.REQ_SEQ_NO "); + //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)/(((BOI.ORD_WID / 1000) * (BOI.ORD_LEN / 1000) * (BOI.ORD_THK / 1000)) * 7.85)>=0.95 "); + //strSql.AppendLine("AND boi.PROD_CD = 'PP' "); + //strSql.AppendLine("AND boi.REC_STS = '2' "); + //strSql.AppendLine("and boi.ORD_STS IN('E', 'D') "); strSql.AppendLine("AND boi.ord_knd IN('A') "); //strSql.AppendLine("AND boi.ORD_NO NOT LIKE 'OMZ%'"); - + strSql.AppendLine(" AND TO_CHAR(TO_DATE(boi.DEL_TO_DATE, 'YYYYMMDD'), 'YYYY-MM-DD HH24:MI:SS') >= TO_CHAR(SYSDATE - 180, 'YYYY-MM-DD HH24:MI:SS') "); + strSql.AppendLine(" AND TO_CHAR(TO_DATE(boi.DEL_TO_DATE, 'YYYYMMDD'), 'YYYY-MM-DD HH24:MI:SS') <= TO_CHAR(SYSDATE + 180, 'YYYY-MM-DD HH24:MI:SS') "); strSql.AppendLine(strWHereOrd); //strSql.AppendLine(" or boi.ORD_NO ='OM723020004'"); //strSql.AppendLine(" AND boi.ORD_ITEM ='092'"); @@ -1333,19 +1342,20 @@ namespace ibk.IPD.Service.IPD_PS strSql.AppendLine("AND BOI.ORD_LEN <> 0 "); strSql.AppendLine("AND BOI.ORD_THK <> 0 "); strSql.AppendLine("WHERE 1 = 1 "); - strSql.AppendLine(" AND ((SELECT COUNT( A.REQ_SEQ_NO) "); - strSql.AppendLine(" FROM NISCO.EP_REQ_SLAB_D A, NISCO.EP_REQ_SLAB B "); - strSql.AppendLine(" WHERE "); - strSql.AppendLine(" 1 = 1 AND A.ORD_NO = BOI.ORD_NO AND A.ORD_ITEM = BOI.ORD_ITEM "); - strSql.AppendLine(" AND A.BLOCK_SEQ >= '01' "); - strSql.AppendLine(" AND A.SEQ >= '01' "); - strSql.AppendLine(" And B.REQ_SEQ_NO = A.REQ_SEQ_NO "); - 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)/(((BOI.ORD_WID / 1000) * (BOI.ORD_LEN / 1000) * (BOI.ORD_THK / 1000)) * 7.85)>=0.95 "); - strSql.AppendLine("AND boi.PROD_CD = 'PP'"); - strSql.AppendLine("AND boi.REC_STS = '2' "); - strSql.AppendLine("and boi.ORD_STS IN('E', 'D') "); + //strSql.AppendLine(" AND ((SELECT COUNT( A.REQ_SEQ_NO) "); + //strSql.AppendLine(" FROM NISCO.EP_REQ_SLAB_D A, NISCO.EP_REQ_SLAB B "); + //strSql.AppendLine(" WHERE "); + //strSql.AppendLine(" 1 = 1 AND A.ORD_NO = BOI.ORD_NO AND A.ORD_ITEM = BOI.ORD_ITEM "); + //strSql.AppendLine(" AND A.BLOCK_SEQ >= '01' "); + //strSql.AppendLine(" AND A.SEQ >= '01' "); + //strSql.AppendLine(" And B.REQ_SEQ_NO = A.REQ_SEQ_NO "); + //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)/(((BOI.ORD_WID / 1000) * (BOI.ORD_LEN / 1000) * (BOI.ORD_THK / 1000)) * 7.85)>=0.95 "); + //strSql.AppendLine("AND boi.PROD_CD = 'PP'"); + //strSql.AppendLine("AND boi.REC_STS = '2' "); + //strSql.AppendLine("and boi.ORD_STS IN('E', 'D') "); strSql.AppendLine("AND boi.ord_knd IN('A') "); - + strSql.AppendLine(" AND TO_CHAR(TO_DATE(boi.DEL_TO_DATE, 'YYYYMMDD'), 'YYYY-MM-DD HH24:MI:SS') >= TO_CHAR(SYSDATE - 180, 'YYYY-MM-DD HH24:MI:SS') "); + strSql.AppendLine(" AND TO_CHAR(TO_DATE(boi.DEL_TO_DATE, 'YYYYMMDD'), 'YYYY-MM-DD HH24:MI:SS') <= TO_CHAR(SYSDATE + 180, 'YYYY-MM-DD HH24:MI:SS') "); strSql.AppendLine(strWHereOrd); strSql.AppendLine(strSpecialOrd); @@ -1390,18 +1400,20 @@ namespace ibk.IPD.Service.IPD_PS strSql.AppendLine(" where BOI.ORD_WID > 0 "); strSql.AppendLine(" AND BOI.ORD_LEN > 0 "); strSql.AppendLine(" AND BOI.ORD_THK > 0 "); - strSql.AppendLine(" and boi.PROD_CD = 'PP' "); - strSql.AppendLine(" AND boi.REC_STS = '2' "); - strSql.AppendLine(" and boi.ORD_STS IN('E', 'D') "); + //strSql.AppendLine(" and boi.PROD_CD = 'PP' "); + //strSql.AppendLine(" AND boi.REC_STS = '2' "); + //strSql.AppendLine(" and boi.ORD_STS IN('E', 'D') "); strSql.AppendLine(" AND boi.ord_knd IN('A') "); - strSql.AppendLine(" AND ((SELECT COUNT( A.REQ_SEQ_NO) "); - strSql.AppendLine(" FROM NISCO.EP_REQ_SLAB_D A, NISCO.EP_REQ_SLAB B "); - strSql.AppendLine(" WHERE "); - strSql.AppendLine(" 1 = 1 AND A.ORD_NO = BOI.ORD_NO AND A.ORD_ITEM = BOI.ORD_ITEM "); - strSql.AppendLine(" AND A.BLOCK_SEQ >= '01' "); - strSql.AppendLine(" AND A.SEQ >= '01' "); - strSql.AppendLine(" And B.REQ_SEQ_NO = A.REQ_SEQ_NO "); - 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)/(((BOI.ORD_WID / 1000) * (BOI.ORD_LEN / 1000) * (BOI.ORD_THK / 1000)) * 7.85)>=0.95 "); + strSql.AppendLine(" AND TO_CHAR(TO_DATE(boi.DEL_TO_DATE, 'YYYYMMDD'), 'YYYY-MM-DD HH24:MI:SS') >= TO_CHAR(SYSDATE - 180, 'YYYY-MM-DD HH24:MI:SS') "); + strSql.AppendLine(" AND TO_CHAR(TO_DATE(boi.DEL_TO_DATE, 'YYYYMMDD'), 'YYYY-MM-DD HH24:MI:SS') <= TO_CHAR(SYSDATE + 180, 'YYYY-MM-DD HH24:MI:SS') "); + //strSql.AppendLine(" AND ((SELECT COUNT( A.REQ_SEQ_NO) "); + //strSql.AppendLine(" FROM NISCO.EP_REQ_SLAB_D A, NISCO.EP_REQ_SLAB B "); + //strSql.AppendLine(" WHERE "); + //strSql.AppendLine(" 1 = 1 AND A.ORD_NO = BOI.ORD_NO AND A.ORD_ITEM = BOI.ORD_ITEM "); + //strSql.AppendLine(" AND A.BLOCK_SEQ >= '01' "); + //strSql.AppendLine(" AND A.SEQ >= '01' "); + //strSql.AppendLine(" And B.REQ_SEQ_NO = A.REQ_SEQ_NO "); + //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)/(((BOI.ORD_WID / 1000) * (BOI.ORD_LEN / 1000) * (BOI.ORD_THK / 1000)) * 7.85)>=0.95 "); strSql.AppendLine(strWHereOrd); strSql.AppendLine(strSpecialOrd); @@ -3629,19 +3641,20 @@ namespace ibk.IPD.Service.IPD_PS strSql.AppendLine("AND BOI.ORD_LEN<> 0 "); strSql.AppendLine("AND BOI.ORD_THK<> 0 "); strSql.AppendLine("WHERE 1=1 ");// ROUND(CPP.ORD_REM_WGT / (((BOI.ORD_WID / 1000) * (BOI.ORD_LEN / 1000) * (BOI.ORD_THK / 1000)) * 7.85)) >= 1"); - strSql.AppendLine(" AND ((SELECT COUNT( A.REQ_SEQ_NO) "); - strSql.AppendLine(" FROM NISCO.EP_REQ_SLAB_D A, NISCO.EP_REQ_SLAB B "); - strSql.AppendLine(" WHERE "); - strSql.AppendLine(" 1 = 1 AND A.ORD_NO = BOI.ORD_NO AND A.ORD_ITEM = BOI.ORD_ITEM "); - strSql.AppendLine(" AND A.BLOCK_SEQ >= '01' "); - strSql.AppendLine(" AND A.SEQ >= '01' "); - strSql.AppendLine(" And B.REQ_SEQ_NO = A.REQ_SEQ_NO "); - 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)/(((BOI.ORD_WID / 1000) * (BOI.ORD_LEN / 1000) * (BOI.ORD_THK / 1000)) * 7.85)>=0.95 "); - strSql.AppendLine(" AND boi.PROD_CD = 'PP' "); - strSql.AppendLine(" AND boi.REC_STS = '2' "); - strSql.AppendLine(" and boi.ORD_STS IN('E', 'D') "); + //strSql.AppendLine(" AND ((SELECT COUNT( A.REQ_SEQ_NO) "); + //strSql.AppendLine(" FROM NISCO.EP_REQ_SLAB_D A, NISCO.EP_REQ_SLAB B "); + //strSql.AppendLine(" WHERE "); + //strSql.AppendLine(" 1 = 1 AND A.ORD_NO = BOI.ORD_NO AND A.ORD_ITEM = BOI.ORD_ITEM "); + //strSql.AppendLine(" AND A.BLOCK_SEQ >= '01' "); + //strSql.AppendLine(" AND A.SEQ >= '01' "); + //strSql.AppendLine(" And B.REQ_SEQ_NO = A.REQ_SEQ_NO "); + //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)/(((BOI.ORD_WID / 1000) * (BOI.ORD_LEN / 1000) * (BOI.ORD_THK / 1000)) * 7.85)>=0.95 "); + //strSql.AppendLine(" AND boi.PROD_CD = 'PP' "); + //strSql.AppendLine(" AND boi.REC_STS = '2' "); + //strSql.AppendLine(" and boi.ORD_STS IN('E', 'D') "); strSql.AppendLine(" AND boi.ord_knd IN('A') "); - +strSql.AppendLine(" AND TO_CHAR(TO_DATE(boi.DEL_TO_DATE, 'YYYYMMDD'), 'YYYY-MM-DD HH24:MI:SS') >= TO_CHAR(SYSDATE - 180, 'YYYY-MM-DD HH24:MI:SS') "); +strSql.AppendLine(" AND TO_CHAR(TO_DATE(boi.DEL_TO_DATE, 'YYYYMMDD'), 'YYYY-MM-DD HH24:MI:SS') <= TO_CHAR(SYSDATE + 180, 'YYYY-MM-DD HH24:MI:SS') "); strSql.AppendLine(strWHereOrd); strSql.AppendLine(strSpecialOrd); @@ -3689,19 +3702,20 @@ namespace ibk.IPD.Service.IPD_PS strSql.AppendLine("AND BOI.ORD_LEN<> 0 "); strSql.AppendLine("AND BOI.ORD_THK<> 0 "); strSql.AppendLine("WHERE 1=1 "); - strSql.AppendLine(" AND ((SELECT COUNT( A.REQ_SEQ_NO) "); - strSql.AppendLine(" FROM NISCO.EP_REQ_SLAB_D A, NISCO.EP_REQ_SLAB B "); - strSql.AppendLine(" WHERE "); - strSql.AppendLine(" 1 = 1 AND A.ORD_NO = BOI.ORD_NO AND A.ORD_ITEM = BOI.ORD_ITEM "); - strSql.AppendLine(" AND A.BLOCK_SEQ >= '01' "); - strSql.AppendLine(" AND A.SEQ >= '01' "); - strSql.AppendLine(" And B.REQ_SEQ_NO = A.REQ_SEQ_NO "); - 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)/(((BOI.ORD_WID / 1000) * (BOI.ORD_LEN / 1000) * (BOI.ORD_THK / 1000)) * 7.85)>=0.95 "); - strSql.AppendLine(" AND boi.PROD_CD = 'PP' "); - strSql.AppendLine(" AND boi.REC_STS = '2' "); - strSql.AppendLine(" and boi.ORD_STS IN('E', 'D') "); + //strSql.AppendLine(" AND ((SELECT COUNT( A.REQ_SEQ_NO) "); + //strSql.AppendLine(" FROM NISCO.EP_REQ_SLAB_D A, NISCO.EP_REQ_SLAB B "); + //strSql.AppendLine(" WHERE "); + //strSql.AppendLine(" 1 = 1 AND A.ORD_NO = BOI.ORD_NO AND A.ORD_ITEM = BOI.ORD_ITEM "); + //strSql.AppendLine(" AND A.BLOCK_SEQ >= '01' "); + //strSql.AppendLine(" AND A.SEQ >= '01' "); + //strSql.AppendLine(" And B.REQ_SEQ_NO = A.REQ_SEQ_NO "); + //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)/(((BOI.ORD_WID / 1000) * (BOI.ORD_LEN / 1000) * (BOI.ORD_THK / 1000)) * 7.85)>=0.95 "); + //strSql.AppendLine(" AND boi.PROD_CD = 'PP' "); + //strSql.AppendLine(" AND boi.REC_STS = '2' "); + //strSql.AppendLine(" and boi.ORD_STS IN('E', 'D') "); strSql.AppendLine(" AND boi.ord_knd IN('A') "); - + strSql.AppendLine(" AND TO_CHAR(TO_DATE(boi.DEL_TO_DATE, 'YYYYMMDD'), 'YYYY-MM-DD HH24:MI:SS') >= TO_CHAR(SYSDATE - 180, 'YYYY-MM-DD HH24:MI:SS') "); + strSql.AppendLine(" AND TO_CHAR(TO_DATE(boi.DEL_TO_DATE, 'YYYYMMDD'), 'YYYY-MM-DD HH24:MI:SS') <= TO_CHAR(SYSDATE + 180, 'YYYY-MM-DD HH24:MI:SS') "); strSql.AppendLine(strWHereOrd); strSql.AppendLine(strSpecialOrd); strSql.AppendLine(" )"); @@ -3749,19 +3763,20 @@ namespace ibk.IPD.Service.IPD_PS strSql.AppendLine("AND BOI.ORD_LEN<> 0 "); strSql.AppendLine("AND BOI.ORD_THK<> 0 "); strSql.AppendLine("WHERE 1=1 "); - strSql.AppendLine(" AND ((SELECT COUNT( A.REQ_SEQ_NO) "); - strSql.AppendLine(" FROM NISCO.EP_REQ_SLAB_D A, NISCO.EP_REQ_SLAB B "); - strSql.AppendLine(" WHERE "); - strSql.AppendLine(" 1 = 1 AND A.ORD_NO = BOI.ORD_NO AND A.ORD_ITEM = BOI.ORD_ITEM "); - strSql.AppendLine(" AND A.BLOCK_SEQ >= '01' "); - strSql.AppendLine(" AND A.SEQ >= '01' "); - strSql.AppendLine(" And B.REQ_SEQ_NO = A.REQ_SEQ_NO "); - 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)/(((BOI.ORD_WID / 1000) * (BOI.ORD_LEN / 1000) * (BOI.ORD_THK / 1000)) * 7.85)>=0.95 "); - strSql.AppendLine(" AND boi.PROD_CD = 'PP' "); - strSql.AppendLine(" AND boi.REC_STS = '2' "); - strSql.AppendLine(" and boi.ORD_STS IN('E', 'D') "); + //strSql.AppendLine(" AND ((SELECT COUNT( A.REQ_SEQ_NO) "); + //strSql.AppendLine(" FROM NISCO.EP_REQ_SLAB_D A, NISCO.EP_REQ_SLAB B "); + //strSql.AppendLine(" WHERE "); + //strSql.AppendLine(" 1 = 1 AND A.ORD_NO = BOI.ORD_NO AND A.ORD_ITEM = BOI.ORD_ITEM "); + //strSql.AppendLine(" AND A.BLOCK_SEQ >= '01' "); + //strSql.AppendLine(" AND A.SEQ >= '01' "); + //strSql.AppendLine(" And B.REQ_SEQ_NO = A.REQ_SEQ_NO "); + //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)/(((BOI.ORD_WID / 1000) * (BOI.ORD_LEN / 1000) * (BOI.ORD_THK / 1000)) * 7.85)>=0.95 "); + //strSql.AppendLine(" AND boi.PROD_CD = 'PP' "); + //strSql.AppendLine(" AND boi.REC_STS = '2' "); + //strSql.AppendLine(" and boi.ORD_STS IN('E', 'D') "); strSql.AppendLine(" AND boi.ord_knd IN('A') "); - + strSql.AppendLine(" AND TO_CHAR(TO_DATE(boi.DEL_TO_DATE, 'YYYYMMDD'), 'YYYY-MM-DD HH24:MI:SS') >= TO_CHAR(SYSDATE - 180, 'YYYY-MM-DD HH24:MI:SS') "); + strSql.AppendLine(" AND TO_CHAR(TO_DATE(boi.DEL_TO_DATE, 'YYYYMMDD'), 'YYYY-MM-DD HH24:MI:SS') <= TO_CHAR(SYSDATE + 180, 'YYYY-MM-DD HH24:MI:SS') "); strSql.AppendLine(strWHereOrd); strSql.AppendLine(strSpecialOrd); @@ -3810,19 +3825,20 @@ namespace ibk.IPD.Service.IPD_PS strSql.AppendLine("AND BOI.ORD_LEN<> 0 "); strSql.AppendLine("AND BOI.ORD_THK<> 0 "); strSql.AppendLine("WHERE 1=1 "); - strSql.AppendLine(" AND ((SELECT COUNT( A.REQ_SEQ_NO) "); - strSql.AppendLine(" FROM NISCO.EP_REQ_SLAB_D A, NISCO.EP_REQ_SLAB B "); - strSql.AppendLine(" WHERE "); - strSql.AppendLine(" 1 = 1 AND A.ORD_NO = BOI.ORD_NO AND A.ORD_ITEM = BOI.ORD_ITEM "); - strSql.AppendLine(" AND A.BLOCK_SEQ >= '01' "); - strSql.AppendLine(" AND A.SEQ >= '01' "); - strSql.AppendLine(" And B.REQ_SEQ_NO = A.REQ_SEQ_NO "); - 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)/(((BOI.ORD_WID / 1000) * (BOI.ORD_LEN / 1000) * (BOI.ORD_THK / 1000)) * 7.85)>=0.95 "); - strSql.AppendLine(" AND boi.PROD_CD = 'PP' "); - strSql.AppendLine(" AND boi.REC_STS = '2' "); - strSql.AppendLine(" and boi.ORD_STS IN('E', 'D') "); + //strSql.AppendLine(" AND ((SELECT COUNT( A.REQ_SEQ_NO) "); + //strSql.AppendLine(" FROM NISCO.EP_REQ_SLAB_D A, NISCO.EP_REQ_SLAB B "); + //strSql.AppendLine(" WHERE "); + //strSql.AppendLine(" 1 = 1 AND A.ORD_NO = BOI.ORD_NO AND A.ORD_ITEM = BOI.ORD_ITEM "); + //strSql.AppendLine(" AND A.BLOCK_SEQ >= '01' "); + //strSql.AppendLine(" AND A.SEQ >= '01' "); + //strSql.AppendLine(" And B.REQ_SEQ_NO = A.REQ_SEQ_NO "); + //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)/(((BOI.ORD_WID / 1000) * (BOI.ORD_LEN / 1000) * (BOI.ORD_THK / 1000)) * 7.85)>=0.95 "); + //strSql.AppendLine(" AND boi.PROD_CD = 'PP' "); + //strSql.AppendLine(" AND boi.REC_STS = '2' "); + //strSql.AppendLine(" and boi.ORD_STS IN('E', 'D') "); strSql.AppendLine(" AND boi.ord_knd IN('A') "); - + strSql.AppendLine(" AND TO_CHAR(TO_DATE(boi.DEL_TO_DATE, 'YYYYMMDD'), 'YYYY-MM-DD HH24:MI:SS') >= TO_CHAR(SYSDATE - 180, 'YYYY-MM-DD HH24:MI:SS') "); + strSql.AppendLine(" AND TO_CHAR(TO_DATE(boi.DEL_TO_DATE, 'YYYYMMDD'), 'YYYY-MM-DD HH24:MI:SS') <= TO_CHAR(SYSDATE + 180, 'YYYY-MM-DD HH24:MI:SS') "); strSql.AppendLine(strWHereOrd); strSql.AppendLine(strSpecialOrd); @@ -3870,19 +3886,20 @@ namespace ibk.IPD.Service.IPD_PS strSql.AppendLine("AND BOI.ORD_LEN<> 0 "); strSql.AppendLine("AND BOI.ORD_THK<> 0 "); strSql.AppendLine("WHERE 1=1 "); - strSql.AppendLine(" AND ((SELECT COUNT( A.REQ_SEQ_NO) "); - strSql.AppendLine(" FROM NISCO.EP_REQ_SLAB_D A, NISCO.EP_REQ_SLAB B "); - strSql.AppendLine(" WHERE "); - strSql.AppendLine(" 1 = 1 AND A.ORD_NO = BOI.ORD_NO AND A.ORD_ITEM = BOI.ORD_ITEM "); - strSql.AppendLine(" AND A.BLOCK_SEQ >= '01' "); - strSql.AppendLine(" AND A.SEQ >= '01' "); - strSql.AppendLine(" And B.REQ_SEQ_NO = A.REQ_SEQ_NO "); - 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)/(((BOI.ORD_WID / 1000) * (BOI.ORD_LEN / 1000) * (BOI.ORD_THK / 1000)) * 7.85)>=0.95 "); - strSql.AppendLine(" AND boi.PROD_CD = 'PP' "); - strSql.AppendLine(" AND boi.REC_STS = '2' "); - strSql.AppendLine(" and boi.ORD_STS IN('E', 'D') "); + //strSql.AppendLine(" AND ((SELECT COUNT( A.REQ_SEQ_NO) "); + //strSql.AppendLine(" FROM NISCO.EP_REQ_SLAB_D A, NISCO.EP_REQ_SLAB B "); + //strSql.AppendLine(" WHERE "); + //strSql.AppendLine(" 1 = 1 AND A.ORD_NO = BOI.ORD_NO AND A.ORD_ITEM = BOI.ORD_ITEM "); + //strSql.AppendLine(" AND A.BLOCK_SEQ >= '01' "); + //strSql.AppendLine(" AND A.SEQ >= '01' "); + //strSql.AppendLine(" And B.REQ_SEQ_NO = A.REQ_SEQ_NO "); + //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)/(((BOI.ORD_WID / 1000) * (BOI.ORD_LEN / 1000) * (BOI.ORD_THK / 1000)) * 7.85)>=0.95 "); + //strSql.AppendLine(" AND boi.PROD_CD = 'PP' "); + //strSql.AppendLine(" AND boi.REC_STS = '2' "); + //strSql.AppendLine(" and boi.ORD_STS IN('E', 'D') "); strSql.AppendLine(" AND boi.ord_knd IN('A') "); - + strSql.AppendLine(" AND TO_CHAR(TO_DATE(boi.DEL_TO_DATE, 'YYYYMMDD'), 'YYYY-MM-DD HH24:MI:SS') >= TO_CHAR(SYSDATE - 180, 'YYYY-MM-DD HH24:MI:SS') "); + strSql.AppendLine(" AND TO_CHAR(TO_DATE(boi.DEL_TO_DATE, 'YYYYMMDD'), 'YYYY-MM-DD HH24:MI:SS') <= TO_CHAR(SYSDATE + 180, 'YYYY-MM-DD HH24:MI:SS') "); strSql.AppendLine(strWHereOrd); strSql.AppendLine(strSpecialOrd); @@ -3930,19 +3947,20 @@ namespace ibk.IPD.Service.IPD_PS strSql.AppendLine("AND BOI.ORD_LEN<> 0 "); strSql.AppendLine("AND BOI.ORD_THK<> 0 "); strSql.AppendLine("WHERE 1=1 "); - strSql.AppendLine(" AND ((SELECT COUNT( A.REQ_SEQ_NO) "); - strSql.AppendLine(" FROM NISCO.EP_REQ_SLAB_D A, NISCO.EP_REQ_SLAB B "); - strSql.AppendLine(" WHERE "); - strSql.AppendLine(" 1 = 1 AND A.ORD_NO = BOI.ORD_NO AND A.ORD_ITEM = BOI.ORD_ITEM "); - strSql.AppendLine(" AND A.BLOCK_SEQ >= '01' "); - strSql.AppendLine(" AND A.SEQ >= '01' "); - strSql.AppendLine(" And B.REQ_SEQ_NO = A.REQ_SEQ_NO "); - 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)/(((BOI.ORD_WID / 1000) * (BOI.ORD_LEN / 1000) * (BOI.ORD_THK / 1000)) * 7.85)>=0.95 "); - strSql.AppendLine(" AND boi.PROD_CD = 'PP' "); - strSql.AppendLine(" AND boi.REC_STS = '2' "); - strSql.AppendLine(" and boi.ORD_STS IN('E', 'D') "); + //strSql.AppendLine(" AND ((SELECT COUNT( A.REQ_SEQ_NO) "); + //strSql.AppendLine(" FROM NISCO.EP_REQ_SLAB_D A, NISCO.EP_REQ_SLAB B "); + //strSql.AppendLine(" WHERE "); + //strSql.AppendLine(" 1 = 1 AND A.ORD_NO = BOI.ORD_NO AND A.ORD_ITEM = BOI.ORD_ITEM "); + //strSql.AppendLine(" AND A.BLOCK_SEQ >= '01' "); + //strSql.AppendLine(" AND A.SEQ >= '01' "); + //strSql.AppendLine(" And B.REQ_SEQ_NO = A.REQ_SEQ_NO "); + //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)/(((BOI.ORD_WID / 1000) * (BOI.ORD_LEN / 1000) * (BOI.ORD_THK / 1000)) * 7.85)>=0.95 "); + //strSql.AppendLine(" AND boi.PROD_CD = 'PP' "); + //strSql.AppendLine(" AND boi.REC_STS = '2' "); + //strSql.AppendLine(" and boi.ORD_STS IN('E', 'D') "); strSql.AppendLine(" AND boi.ord_knd IN('A') "); - + strSql.AppendLine(" AND TO_CHAR(TO_DATE(boi.DEL_TO_DATE, 'YYYYMMDD'), 'YYYY-MM-DD HH24:MI:SS') >= TO_CHAR(SYSDATE - 180, 'YYYY-MM-DD HH24:MI:SS') "); + strSql.AppendLine(" AND TO_CHAR(TO_DATE(boi.DEL_TO_DATE, 'YYYYMMDD'), 'YYYY-MM-DD HH24:MI:SS') <= TO_CHAR(SYSDATE + 180, 'YYYY-MM-DD HH24:MI:SS') "); strSql.AppendLine(strWHereOrd); strSql.AppendLine(strSpecialOrd); @@ -3990,19 +4008,20 @@ namespace ibk.IPD.Service.IPD_PS strSql.AppendLine("AND BOI.ORD_LEN<> 0 "); strSql.AppendLine("AND BOI.ORD_THK<> 0 "); strSql.AppendLine("WHERE 1=1 "); - strSql.AppendLine(" AND ((SELECT COUNT( A.REQ_SEQ_NO) "); - strSql.AppendLine(" FROM NISCO.EP_REQ_SLAB_D A, NISCO.EP_REQ_SLAB B "); - strSql.AppendLine(" WHERE "); - strSql.AppendLine(" 1 = 1 AND A.ORD_NO = BOI.ORD_NO AND A.ORD_ITEM = BOI.ORD_ITEM "); - strSql.AppendLine(" AND A.BLOCK_SEQ >= '01' "); - strSql.AppendLine(" AND A.SEQ >= '01' "); - strSql.AppendLine(" And B.REQ_SEQ_NO = A.REQ_SEQ_NO "); - 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)/(((BOI.ORD_WID / 1000) * (BOI.ORD_LEN / 1000) * (BOI.ORD_THK / 1000)) * 7.85)>=0.95 "); - strSql.AppendLine(" AND boi.PROD_CD = 'PP' "); - strSql.AppendLine(" AND boi.REC_STS = '2' "); - strSql.AppendLine(" and boi.ORD_STS IN('E', 'D') "); + //strSql.AppendLine(" AND ((SELECT COUNT( A.REQ_SEQ_NO) "); + //strSql.AppendLine(" FROM NISCO.EP_REQ_SLAB_D A, NISCO.EP_REQ_SLAB B "); + //strSql.AppendLine(" WHERE "); + //strSql.AppendLine(" 1 = 1 AND A.ORD_NO = BOI.ORD_NO AND A.ORD_ITEM = BOI.ORD_ITEM "); + //strSql.AppendLine(" AND A.BLOCK_SEQ >= '01' "); + //strSql.AppendLine(" AND A.SEQ >= '01' "); + //strSql.AppendLine(" And B.REQ_SEQ_NO = A.REQ_SEQ_NO "); + //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)/(((BOI.ORD_WID / 1000) * (BOI.ORD_LEN / 1000) * (BOI.ORD_THK / 1000)) * 7.85)>=0.95 "); + //strSql.AppendLine(" AND boi.PROD_CD = 'PP' "); + //strSql.AppendLine(" AND boi.REC_STS = '2' "); + //strSql.AppendLine(" and boi.ORD_STS IN('E', 'D') "); strSql.AppendLine(" AND boi.ord_knd IN('A') "); - + strSql.AppendLine(" AND TO_CHAR(TO_DATE(boi.DEL_TO_DATE, 'YYYYMMDD'), 'YYYY-MM-DD HH24:MI:SS') >= TO_CHAR(SYSDATE - 180, 'YYYY-MM-DD HH24:MI:SS') "); + strSql.AppendLine(" AND TO_CHAR(TO_DATE(boi.DEL_TO_DATE, 'YYYYMMDD'), 'YYYY-MM-DD HH24:MI:SS') <= TO_CHAR(SYSDATE + 180, 'YYYY-MM-DD HH24:MI:SS') "); strSql.AppendLine(strWHereOrd); strSql.AppendLine(strSpecialOrd); @@ -4050,19 +4069,20 @@ namespace ibk.IPD.Service.IPD_PS strSql.AppendLine("AND BOI.ORD_LEN<> 0 "); strSql.AppendLine("AND BOI.ORD_THK<> 0 "); strSql.AppendLine("WHERE 1=1 "); - strSql.AppendLine(" AND ((SELECT COUNT( A.REQ_SEQ_NO) "); - strSql.AppendLine(" FROM NISCO.EP_REQ_SLAB_D A, NISCO.EP_REQ_SLAB B "); - strSql.AppendLine(" WHERE "); - strSql.AppendLine(" 1 = 1 AND A.ORD_NO = BOI.ORD_NO AND A.ORD_ITEM = BOI.ORD_ITEM "); - strSql.AppendLine(" AND A.BLOCK_SEQ >= '01' "); - strSql.AppendLine(" AND A.SEQ >= '01' "); - strSql.AppendLine(" And B.REQ_SEQ_NO = A.REQ_SEQ_NO "); - 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)/(((BOI.ORD_WID / 1000) * (BOI.ORD_LEN / 1000) * (BOI.ORD_THK / 1000)) * 7.85)>=0.95 "); - strSql.AppendLine(" AND boi.PROD_CD = 'PP' "); - strSql.AppendLine(" AND boi.REC_STS = '2' "); - strSql.AppendLine(" and boi.ORD_STS IN('E', 'D') "); + //strSql.AppendLine(" AND ((SELECT COUNT( A.REQ_SEQ_NO) "); + //strSql.AppendLine(" FROM NISCO.EP_REQ_SLAB_D A, NISCO.EP_REQ_SLAB B "); + //strSql.AppendLine(" WHERE "); + //strSql.AppendLine(" 1 = 1 AND A.ORD_NO = BOI.ORD_NO AND A.ORD_ITEM = BOI.ORD_ITEM "); + //strSql.AppendLine(" AND A.BLOCK_SEQ >= '01' "); + //strSql.AppendLine(" AND A.SEQ >= '01' "); + //strSql.AppendLine(" And B.REQ_SEQ_NO = A.REQ_SEQ_NO "); + //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)/(((BOI.ORD_WID / 1000) * (BOI.ORD_LEN / 1000) * (BOI.ORD_THK / 1000)) * 7.85)>=0.95 "); + //strSql.AppendLine(" AND boi.PROD_CD = 'PP' "); + //strSql.AppendLine(" AND boi.REC_STS = '2' "); + //strSql.AppendLine(" and boi.ORD_STS IN('E', 'D') "); strSql.AppendLine(" AND boi.ord_knd IN('A') "); - + strSql.AppendLine(" AND TO_CHAR(TO_DATE(boi.DEL_TO_DATE, 'YYYYMMDD'), 'YYYY-MM-DD HH24:MI:SS') >= TO_CHAR(SYSDATE - 180, 'YYYY-MM-DD HH24:MI:SS') "); + strSql.AppendLine(" AND TO_CHAR(TO_DATE(boi.DEL_TO_DATE, 'YYYYMMDD'), 'YYYY-MM-DD HH24:MI:SS') <= TO_CHAR(SYSDATE + 180, 'YYYY-MM-DD HH24:MI:SS') "); strSql.AppendLine(strWHereOrd); strSql.AppendLine(strSpecialOrd); @@ -4111,19 +4131,20 @@ namespace ibk.IPD.Service.IPD_PS strSql.AppendLine("AND BOI.ORD_LEN<> 0 "); strSql.AppendLine("AND BOI.ORD_THK<> 0 "); strSql.AppendLine("WHERE 1=1 "); - strSql.AppendLine(" AND ((SELECT COUNT( A.REQ_SEQ_NO) "); - strSql.AppendLine(" FROM NISCO.EP_REQ_SLAB_D A, NISCO.EP_REQ_SLAB B "); - strSql.AppendLine(" WHERE "); - strSql.AppendLine(" 1 = 1 AND A.ORD_NO = BOI.ORD_NO AND A.ORD_ITEM = BOI.ORD_ITEM "); - strSql.AppendLine(" AND A.BLOCK_SEQ >= '01' "); - strSql.AppendLine(" AND A.SEQ >= '01' "); - strSql.AppendLine(" And B.REQ_SEQ_NO = A.REQ_SEQ_NO "); - 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)/(((BOI.ORD_WID / 1000) * (BOI.ORD_LEN / 1000) * (BOI.ORD_THK / 1000)) * 7.85)>=0.95 "); - strSql.AppendLine(" AND boi.PROD_CD = 'PP' "); - strSql.AppendLine(" AND boi.REC_STS = '2' "); - strSql.AppendLine(" and boi.ORD_STS IN('E', 'D') "); + //strSql.AppendLine(" AND ((SELECT COUNT( A.REQ_SEQ_NO) "); + //strSql.AppendLine(" FROM NISCO.EP_REQ_SLAB_D A, NISCO.EP_REQ_SLAB B "); + //strSql.AppendLine(" WHERE "); + //strSql.AppendLine(" 1 = 1 AND A.ORD_NO = BOI.ORD_NO AND A.ORD_ITEM = BOI.ORD_ITEM "); + //strSql.AppendLine(" AND A.BLOCK_SEQ >= '01' "); + //strSql.AppendLine(" AND A.SEQ >= '01' "); + //strSql.AppendLine(" And B.REQ_SEQ_NO = A.REQ_SEQ_NO "); + //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)/(((BOI.ORD_WID / 1000) * (BOI.ORD_LEN / 1000) * (BOI.ORD_THK / 1000)) * 7.85)>=0.95 "); + //strSql.AppendLine(" AND boi.PROD_CD = 'PP' "); + //strSql.AppendLine(" AND boi.REC_STS = '2' "); + //strSql.AppendLine(" and boi.ORD_STS IN('E', 'D') "); strSql.AppendLine(" AND boi.ord_knd IN('A') "); - + strSql.AppendLine(" AND TO_CHAR(TO_DATE(boi.DEL_TO_DATE, 'YYYYMMDD'), 'YYYY-MM-DD HH24:MI:SS') >= TO_CHAR(SYSDATE - 180, 'YYYY-MM-DD HH24:MI:SS') "); + strSql.AppendLine(" AND TO_CHAR(TO_DATE(boi.DEL_TO_DATE, 'YYYYMMDD'), 'YYYY-MM-DD HH24:MI:SS') <= TO_CHAR(SYSDATE + 180, 'YYYY-MM-DD HH24:MI:SS') "); strSql.AppendLine(strWHereOrd); strSql.AppendLine(strSpecialOrd); @@ -4171,19 +4192,20 @@ namespace ibk.IPD.Service.IPD_PS strSql.AppendLine("AND BOI.ORD_LEN<> 0 "); strSql.AppendLine("AND BOI.ORD_THK<> 0 "); strSql.AppendLine("WHERE 1=1 "); - strSql.AppendLine(" AND ((SELECT COUNT( A.REQ_SEQ_NO) "); - strSql.AppendLine(" FROM NISCO.EP_REQ_SLAB_D A, NISCO.EP_REQ_SLAB B "); - strSql.AppendLine(" WHERE "); - strSql.AppendLine(" 1 = 1 AND A.ORD_NO = BOI.ORD_NO AND A.ORD_ITEM = BOI.ORD_ITEM "); - strSql.AppendLine(" AND A.BLOCK_SEQ >= '01' "); - strSql.AppendLine(" AND A.SEQ >= '01' "); - strSql.AppendLine(" And B.REQ_SEQ_NO = A.REQ_SEQ_NO "); - 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)/(((BOI.ORD_WID / 1000) * (BOI.ORD_LEN / 1000) * (BOI.ORD_THK / 1000)) * 7.85)>=0.95 "); - strSql.AppendLine(" AND boi.PROD_CD = 'PP' "); - strSql.AppendLine(" AND boi.REC_STS = '2' "); - strSql.AppendLine(" and boi.ORD_STS IN('E', 'D') "); + //strSql.AppendLine(" AND ((SELECT COUNT( A.REQ_SEQ_NO) "); + //strSql.AppendLine(" FROM NISCO.EP_REQ_SLAB_D A, NISCO.EP_REQ_SLAB B "); + //strSql.AppendLine(" WHERE "); + //strSql.AppendLine(" 1 = 1 AND A.ORD_NO = BOI.ORD_NO AND A.ORD_ITEM = BOI.ORD_ITEM "); + //strSql.AppendLine(" AND A.BLOCK_SEQ >= '01' "); + //strSql.AppendLine(" AND A.SEQ >= '01' "); + //strSql.AppendLine(" And B.REQ_SEQ_NO = A.REQ_SEQ_NO "); + //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)/(((BOI.ORD_WID / 1000) * (BOI.ORD_LEN / 1000) * (BOI.ORD_THK / 1000)) * 7.85)>=0.95 "); + //strSql.AppendLine(" AND boi.PROD_CD = 'PP' "); + //strSql.AppendLine(" AND boi.REC_STS = '2' "); + //strSql.AppendLine(" and boi.ORD_STS IN('E', 'D') "); strSql.AppendLine(" AND boi.ord_knd IN('A') "); - + strSql.AppendLine(" AND TO_CHAR(TO_DATE(boi.DEL_TO_DATE, 'YYYYMMDD'), 'YYYY-MM-DD HH24:MI:SS') >= TO_CHAR(SYSDATE - 180, 'YYYY-MM-DD HH24:MI:SS') "); + strSql.AppendLine(" AND TO_CHAR(TO_DATE(boi.DEL_TO_DATE, 'YYYYMMDD'), 'YYYY-MM-DD HH24:MI:SS') <= TO_CHAR(SYSDATE + 180, 'YYYY-MM-DD HH24:MI:SS') "); strSql.AppendLine(strWHereOrd); strSql.AppendLine(strSpecialOrd); @@ -4232,19 +4254,20 @@ namespace ibk.IPD.Service.IPD_PS strSql.AppendLine("AND BOI.ORD_LEN<> 0 "); strSql.AppendLine("AND BOI.ORD_THK<> 0 "); strSql.AppendLine("WHERE 1=1 "); - strSql.AppendLine(" AND ((SELECT COUNT( A.REQ_SEQ_NO) "); - strSql.AppendLine(" FROM NISCO.EP_REQ_SLAB_D A, NISCO.EP_REQ_SLAB B "); - strSql.AppendLine(" WHERE "); - strSql.AppendLine(" 1 = 1 AND A.ORD_NO = BOI.ORD_NO AND A.ORD_ITEM = BOI.ORD_ITEM "); - strSql.AppendLine(" AND A.BLOCK_SEQ >= '01' "); - strSql.AppendLine(" AND A.SEQ >= '01' "); - strSql.AppendLine(" And B.REQ_SEQ_NO = A.REQ_SEQ_NO "); - 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)/(((BOI.ORD_WID / 1000) * (BOI.ORD_LEN / 1000) * (BOI.ORD_THK / 1000)) * 7.85)>=0.95 "); - strSql.AppendLine(" AND boi.PROD_CD = 'PP' "); - strSql.AppendLine(" AND boi.REC_STS = '2' "); - strSql.AppendLine(" and boi.ORD_STS IN('E', 'D') "); + //strSql.AppendLine(" AND ((SELECT COUNT( A.REQ_SEQ_NO) "); + //strSql.AppendLine(" FROM NISCO.EP_REQ_SLAB_D A, NISCO.EP_REQ_SLAB B "); + //strSql.AppendLine(" WHERE "); + //strSql.AppendLine(" 1 = 1 AND A.ORD_NO = BOI.ORD_NO AND A.ORD_ITEM = BOI.ORD_ITEM "); + //strSql.AppendLine(" AND A.BLOCK_SEQ >= '01' "); + //strSql.AppendLine(" AND A.SEQ >= '01' "); + //strSql.AppendLine(" And B.REQ_SEQ_NO = A.REQ_SEQ_NO "); + //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)/(((BOI.ORD_WID / 1000) * (BOI.ORD_LEN / 1000) * (BOI.ORD_THK / 1000)) * 7.85)>=0.95 "); + //strSql.AppendLine(" AND boi.PROD_CD = 'PP' "); + //strSql.AppendLine(" AND boi.REC_STS = '2' "); + //strSql.AppendLine(" and boi.ORD_STS IN('E', 'D') "); strSql.AppendLine(" AND boi.ord_knd IN('A') "); - + strSql.AppendLine(" AND TO_CHAR(TO_DATE(boi.DEL_TO_DATE, 'YYYYMMDD'), 'YYYY-MM-DD HH24:MI:SS') >= TO_CHAR(SYSDATE - 180, 'YYYY-MM-DD HH24:MI:SS') "); + strSql.AppendLine(" AND TO_CHAR(TO_DATE(boi.DEL_TO_DATE, 'YYYYMMDD'), 'YYYY-MM-DD HH24:MI:SS') <= TO_CHAR(SYSDATE + 180, 'YYYY-MM-DD HH24:MI:SS') "); strSql.AppendLine(strWHereOrd); strSql.AppendLine(strSpecialOrd); @@ -4292,19 +4315,20 @@ namespace ibk.IPD.Service.IPD_PS strSql.AppendLine("AND BOI.ORD_LEN<> 0 "); strSql.AppendLine("AND BOI.ORD_THK<> 0 "); strSql.AppendLine("WHERE 1=1 "); - strSql.AppendLine(" AND ((SELECT COUNT( A.REQ_SEQ_NO) "); - strSql.AppendLine(" FROM NISCO.EP_REQ_SLAB_D A, NISCO.EP_REQ_SLAB B "); - strSql.AppendLine(" WHERE "); - strSql.AppendLine(" 1 = 1 AND A.ORD_NO = BOI.ORD_NO AND A.ORD_ITEM = BOI.ORD_ITEM "); - strSql.AppendLine(" AND A.BLOCK_SEQ >= '01' "); - strSql.AppendLine(" AND A.SEQ >= '01' "); - strSql.AppendLine(" And B.REQ_SEQ_NO = A.REQ_SEQ_NO "); - 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)/(((BOI.ORD_WID / 1000) * (BOI.ORD_LEN / 1000) * (BOI.ORD_THK / 1000)) * 7.85)>=0.95 "); - strSql.AppendLine(" AND boi.PROD_CD = 'PP' "); - strSql.AppendLine(" AND boi.REC_STS = '2' "); - strSql.AppendLine(" and boi.ORD_STS IN('E', 'D') "); + //strSql.AppendLine(" AND ((SELECT COUNT( A.REQ_SEQ_NO) "); + //strSql.AppendLine(" FROM NISCO.EP_REQ_SLAB_D A, NISCO.EP_REQ_SLAB B "); + //strSql.AppendLine(" WHERE "); + //strSql.AppendLine(" 1 = 1 AND A.ORD_NO = BOI.ORD_NO AND A.ORD_ITEM = BOI.ORD_ITEM "); + //strSql.AppendLine(" AND A.BLOCK_SEQ >= '01' "); + //strSql.AppendLine(" AND A.SEQ >= '01' "); + //strSql.AppendLine(" And B.REQ_SEQ_NO = A.REQ_SEQ_NO "); + //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)/(((BOI.ORD_WID / 1000) * (BOI.ORD_LEN / 1000) * (BOI.ORD_THK / 1000)) * 7.85)>=0.95 "); + //strSql.AppendLine(" AND boi.PROD_CD = 'PP' "); + //strSql.AppendLine(" AND boi.REC_STS = '2' "); + //strSql.AppendLine(" and boi.ORD_STS IN('E', 'D') "); strSql.AppendLine(" AND boi.ord_knd IN('A') "); - + strSql.AppendLine(" AND TO_CHAR(TO_DATE(boi.DEL_TO_DATE, 'YYYYMMDD'), 'YYYY-MM-DD HH24:MI:SS') >= TO_CHAR(SYSDATE - 180, 'YYYY-MM-DD HH24:MI:SS') "); + strSql.AppendLine(" AND TO_CHAR(TO_DATE(boi.DEL_TO_DATE, 'YYYYMMDD'), 'YYYY-MM-DD HH24:MI:SS') <= TO_CHAR(SYSDATE + 180, 'YYYY-MM-DD HH24:MI:SS') "); strSql.AppendLine(strWHereOrd); strSql.AppendLine(strSpecialOrd); @@ -4353,19 +4377,20 @@ namespace ibk.IPD.Service.IPD_PS strSql.AppendLine("AND BOI.ORD_LEN<> 0 "); strSql.AppendLine("AND BOI.ORD_THK<> 0 "); strSql.AppendLine("WHERE 1=1 "); - strSql.AppendLine(" AND ((SELECT COUNT( A.REQ_SEQ_NO) "); - strSql.AppendLine(" FROM NISCO.EP_REQ_SLAB_D A, NISCO.EP_REQ_SLAB B "); - strSql.AppendLine(" WHERE "); - strSql.AppendLine(" 1 = 1 AND A.ORD_NO = BOI.ORD_NO AND A.ORD_ITEM = BOI.ORD_ITEM "); - strSql.AppendLine(" AND A.BLOCK_SEQ >= '01' "); - strSql.AppendLine(" AND A.SEQ >= '01' "); - strSql.AppendLine(" And B.REQ_SEQ_NO = A.REQ_SEQ_NO "); - 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)/(((BOI.ORD_WID / 1000) * (BOI.ORD_LEN / 1000) * (BOI.ORD_THK / 1000)) * 7.85)>=0.95 "); - strSql.AppendLine(" AND boi.PROD_CD = 'PP' "); - strSql.AppendLine(" AND boi.REC_STS = '2' "); - strSql.AppendLine(" and boi.ORD_STS IN('E', 'D') "); + //strSql.AppendLine(" AND ((SELECT COUNT( A.REQ_SEQ_NO) "); + //strSql.AppendLine(" FROM NISCO.EP_REQ_SLAB_D A, NISCO.EP_REQ_SLAB B "); + //strSql.AppendLine(" WHERE "); + //strSql.AppendLine(" 1 = 1 AND A.ORD_NO = BOI.ORD_NO AND A.ORD_ITEM = BOI.ORD_ITEM "); + //strSql.AppendLine(" AND A.BLOCK_SEQ >= '01' "); + //strSql.AppendLine(" AND A.SEQ >= '01' "); + //strSql.AppendLine(" And B.REQ_SEQ_NO = A.REQ_SEQ_NO "); + //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)/(((BOI.ORD_WID / 1000) * (BOI.ORD_LEN / 1000) * (BOI.ORD_THK / 1000)) * 7.85)>=0.95 "); + //strSql.AppendLine(" AND boi.PROD_CD = 'PP' "); + //strSql.AppendLine(" AND boi.REC_STS = '2' "); + //strSql.AppendLine(" and boi.ORD_STS IN('E', 'D') "); strSql.AppendLine(" AND boi.ord_knd IN('A') "); - + strSql.AppendLine(" AND TO_CHAR(TO_DATE(boi.DEL_TO_DATE, 'YYYYMMDD'), 'YYYY-MM-DD HH24:MI:SS') >= TO_CHAR(SYSDATE - 180, 'YYYY-MM-DD HH24:MI:SS') "); + strSql.AppendLine(" AND TO_CHAR(TO_DATE(boi.DEL_TO_DATE, 'YYYYMMDD'), 'YYYY-MM-DD HH24:MI:SS') <= TO_CHAR(SYSDATE + 180, 'YYYY-MM-DD HH24:MI:SS') "); strSql.AppendLine(strWHereOrd); strSql.AppendLine(strSpecialOrd); diff --git a/库存分析/SinglePlateHandle/SinglePlateHandle/bin/Debug/SinglePlateHandle.exe b/库存分析/SinglePlateHandle/SinglePlateHandle/bin/Debug/SinglePlateHandle.exe index b2c7fa5..8a94019 100644 Binary files a/库存分析/SinglePlateHandle/SinglePlateHandle/bin/Debug/SinglePlateHandle.exe and b/库存分析/SinglePlateHandle/SinglePlateHandle/bin/Debug/SinglePlateHandle.exe differ diff --git a/库存分析/SinglePlateHandle/SinglePlateHandle/bin/Debug/SinglePlateHandle.pdb b/库存分析/SinglePlateHandle/SinglePlateHandle/bin/Debug/SinglePlateHandle.pdb index d7bd3d0..9360858 100644 Binary files a/库存分析/SinglePlateHandle/SinglePlateHandle/bin/Debug/SinglePlateHandle.pdb and b/库存分析/SinglePlateHandle/SinglePlateHandle/bin/Debug/SinglePlateHandle.pdb differ diff --git a/库存分析/SinglePlateHandle/SinglePlateHandle/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/库存分析/SinglePlateHandle/SinglePlateHandle/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index a6deb3b..367fc72 100644 Binary files a/库存分析/SinglePlateHandle/SinglePlateHandle/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/库存分析/SinglePlateHandle/SinglePlateHandle/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/库存分析/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.csproj.AssemblyReference.cache b/库存分析/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.csproj.AssemblyReference.cache index 1b64e0d..a01d48d 100644 Binary files a/库存分析/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.csproj.AssemblyReference.cache and b/库存分析/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.csproj.AssemblyReference.cache differ diff --git a/库存分析/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.csproj.CoreCompileInputs.cache b/库存分析/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.csproj.CoreCompileInputs.cache index 463f39d..bc28bb7 100644 --- a/库存分析/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.csproj.CoreCompileInputs.cache +++ b/库存分析/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -a5c0623315ff4df27ec5a656b576f7c215bde2af +c9e49ee06d2e0fe7656272830821165a469f1f2b diff --git a/库存分析/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.csproj.FileListAbsolute.txt b/库存分析/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.csproj.FileListAbsolute.txt index fbbf379..ac3c4de 100644 --- a/库存分析/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.csproj.FileListAbsolute.txt +++ b/库存分析/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.csproj.FileListAbsolute.txt @@ -385,3 +385,19 @@ D:\Code\Codes\ipd-file\库存分析\库存分析\SinglePlateHandle\SinglePlateHa D:\Code\Codes\ipd-file\库存分析\库存分析\SinglePlateHandle\SinglePlateHandle\obj\Debug\SinglePlateHandle.csproj.CopyComplete D:\Code\Codes\ipd-file\库存分析\库存分析\SinglePlateHandle\SinglePlateHandle\obj\Debug\SinglePlateHandle.exe D:\Code\Codes\ipd-file\库存分析\库存分析\SinglePlateHandle\SinglePlateHandle\obj\Debug\SinglePlateHandle.pdb +D:\_NG_1\NG_Project\库存分析\SinglePlateHandle\SinglePlateHandle\bin\Debug\SinglePlateHandle.exe.config +D:\_NG_1\NG_Project\库存分析\SinglePlateHandle\SinglePlateHandle\bin\Debug\SinglePlateHandle.exe +D:\_NG_1\NG_Project\库存分析\SinglePlateHandle\SinglePlateHandle\bin\Debug\SinglePlateHandle.pdb +D:\_NG_1\NG_Project\库存分析\SinglePlateHandle\SinglePlateHandle\bin\Debug\Newtonsoft.Json.dll +D:\_NG_1\NG_Project\库存分析\SinglePlateHandle\SinglePlateHandle\bin\Debug\System.Buffers.dll +D:\_NG_1\NG_Project\库存分析\SinglePlateHandle\SinglePlateHandle\bin\Debug\System.Memory.dll +D:\_NG_1\NG_Project\库存分析\SinglePlateHandle\SinglePlateHandle\bin\Debug\System.Net.Http.Formatting.dll +D:\_NG_1\NG_Project\库存分析\SinglePlateHandle\SinglePlateHandle\bin\Debug\System.Numerics.Vectors.dll +D:\_NG_1\NG_Project\库存分析\SinglePlateHandle\SinglePlateHandle\bin\Debug\System.Runtime.CompilerServices.Unsafe.dll +D:\_NG_1\NG_Project\库存分析\SinglePlateHandle\SinglePlateHandle\obj\Debug\SinglePlateHandle.csproj.AssemblyReference.cache +D:\_NG_1\NG_Project\库存分析\SinglePlateHandle\SinglePlateHandle\obj\Debug\SinglePlateHandle.csproj.SuggestedBindingRedirects.cache +D:\_NG_1\NG_Project\库存分析\SinglePlateHandle\SinglePlateHandle\obj\Debug\SinglePlateHandle.exe.config +D:\_NG_1\NG_Project\库存分析\SinglePlateHandle\SinglePlateHandle\obj\Debug\SinglePlateHandle.csproj.CoreCompileInputs.cache +D:\_NG_1\NG_Project\库存分析\SinglePlateHandle\SinglePlateHandle\obj\Debug\SinglePlateHandle.csproj.CopyComplete +D:\_NG_1\NG_Project\库存分析\SinglePlateHandle\SinglePlateHandle\obj\Debug\SinglePlateHandle.exe +D:\_NG_1\NG_Project\库存分析\SinglePlateHandle\SinglePlateHandle\obj\Debug\SinglePlateHandle.pdb diff --git a/库存分析/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.exe b/库存分析/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.exe index b2c7fa5..8a94019 100644 Binary files a/库存分析/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.exe and b/库存分析/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.exe differ diff --git a/库存分析/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.pdb b/库存分析/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.pdb index d7bd3d0..9360858 100644 Binary files a/库存分析/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.pdb and b/库存分析/SinglePlateHandle/SinglePlateHandle/obj/Debug/SinglePlateHandle.pdb differ