Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

ch

2022-05-24 22971886a0e1897aabf62b228215bbee3f2d5a6c

 WorkM/±¨±í·ÖÎö/DefectiveDetailedYieldReport.cs

@@ -155,9 +155,13 @@
            {
                sDlgWhere = sDlgWhere + "and d.HName like '%" + textHprocName.Text + "%'";
            }
            if (dtpHBDate.Value.ToShortDateString() != "")//日期
            if (dtpHBDate.Value.ToShortDateString() != "")//开始日期
            {
                sDlgWhere = sDlgWhere + "and a.HMakeDate <= '" + dtpHBDate.Value.ToShortDateString() + "'";
                sDlgWhere = sDlgWhere + "and a.HMakeDate >= '" + dtpHBDate.Value.ToShortDateString() + "'";
            }
            if (dtpHEDate.Value.ToShortDateString() != "")//结束日期
            {
                sDlgWhere = sDlgWhere + "and a.HMakeDate <= '" + dtpHEDate.Value.ToShortDateString() + "'";
            }
            //过滤条件
            //string sWhere = "";
@@ -172,11 +176,13 @@
            //}
            //
            DSet = SubCn.RunProcReturn("select " +
                "MAX(a.HMakeDate) æ±‡æŠ¥æ—¥æœŸ, a.HICMOBillNo ä»»åŠ¡å•å·, c.HProcExchBillNo æµè½¬å¡å·, c.HProcID, d.HName å·¥åºåç§°" +
                "MAX(a.HMakeDate) æ±‡æŠ¥æ—¥æœŸ, a.HICMOBillNo ä»»åŠ¡å•å·," +
                "case when isnull(ic.HBillSubType,0)='1055' then '返工' else '普通订单' end   ä»»åŠ¡å•ç±»åž‹  , c.HProcExchBillNo æµè½¬å¡å·, c.HProcID, d.HName å·¥åºåç§°" +
                ", sum(a.HWorkTimes) å·¥æ—¶, b.HName ç‰©æ–™åç§°, a.HICMOQty ç”Ÿäº§è®¢å•æ•°é‡, a.HPlanQty è®¡åˆ’数量, c.HQty è¿›ç«™æ•°é‡" +
                ", co.HQty å‡ºç«™åˆæ ¼æ•°é‡, c.HQty - co.HQty - co.HWasterQty æœªè¿›ç«™æ•°é‡" +
                ", co.HWasterQty ä¸åˆæ ¼æ•°é‡, co.HQty /  nullif((co.HQty+co.HWasterQty),0) å‡ºç«™è‰¯çŽ‡, co.HName ä¸è‰¯æ˜Žç»†, co.HBadQty ä¸è‰¯æ•°é‡ " +
                ", co.HWasterQty ä¸åˆæ ¼æ•°é‡, co.HQty /  nullif((co.HQty+co.HWasterQty),0) å‡ºç«™è‰¯çŽ‡,co.HBillSubType ä¸šåŠ¡ç±»åž‹, co.HName ä¸è‰¯æ˜Žç»†, co.HBadQty ä¸è‰¯æ•°é‡ " +
                " FROM Sc_StationOutBillMain a " +
                "left join sc_icmobillmain  ic on a.HICMOInterID =ic.HInterID " +
                "left join Gy_Material  b on a.HMaterID = b.HItemID " +
                "left join( " +
                "select sum(aa.HQty) HQty, aa.HProcExchBillNo, aa.HProcExchInterID, aa.HProcID " +
@@ -185,22 +191,43 @@
                ") c on a.HProcExchInterID = c.HProcExchInterID and a.HProcID = c.HProcID " +
                "left join( " +
                "select sum(aa.HQty) HQty, sum(aa.HWasterQty) HWasterQty, bad.HBadQty, bad.HName" +
                ", aa.HProcExchBillNo, aa.HProcExchInterID, aa.HProcID " +
                ", aa.HProcExchBillNo, aa.HProcExchInterID, aa.HProcID,bad.HBillSubType " +
                "from Sc_StationOutBillMain aa " +
                "left join ( " +
                "select qa.HProcExchInterID, qb.HBadQty, qbr.HName, qa.HProcID " +
                "select qa.HProcExchInterID, qb.HBadQty, qbr.HName, qa.HProcID,qa.HBillSubType " +
                "from QC_NoPassProdCheckBillMain qa " +
                "left join QC_NoPassProdCheckBillsub qb on qa.HInterID = qb.HInterID " +
                "left join Gy_BadReason qbr on qb.HBadReasonID = qbr.HItemID " +
                "group by qa.HProcExchInterID, qbr.HName, qa.HProcID, qb.HBadQty " +
                "group by qa.HProcExchInterID, qbr.HName, qa.HProcID, qb.HBadQty,qa.HBillSubType " +
                ") bad on aa.HProcExchInterID = bad.HProcExchInterID and aa.HProcID = bad.HProcID " +
                "group by aa.HProcExchBillNo, aa.HProcExchInterID, aa.HProcID, bad.HBadQty, bad.HName " +
                "group by aa.HProcExchBillNo, aa.HProcExchInterID, aa.HProcID, bad.HBadQty, bad.HName,bad.HBillSubType " +
                ") co on a.HProcExchInterID = co.HProcExchInterID and a.HProcID = co.HProcID " +
                "left join Gy_Process d on c.HProcID = d.HItemID " +
                "where 1 = 1 " + sDlgWhere +
                "group by a.HICMOBillNo,c.HProcExchBillNo,d.HName,b.HName,a.HICMOQty,c.HQty,a.HPlanQty" +
                ",co.HQty,c.HProcID,co.HWasterQty,co.HName,co.HBadQty,a.HWasterQty " +
                ",case when isnull(ic.HBillSubType,0)='1055' then '返工' else '普通订单' end  " +
                ",co.HQty,c.HProcID,co.HWasterQty,co.HName,co.HBadQty,a.HWasterQty,co.HBillSubType " +
                "order by c.HProcID", "Sc_StationOutBillMain", ref ClsPub.sExeReturnInfo);





            ////过滤条件Dlg
            //string sDlgWhere = "";
            //sDlgWhere = sDlgWhere + ",'" + txtHProcessExchangeBillNo.Text + "'";
            //sDlgWhere = sDlgWhere + ",'" + txtHICMOBillNo.Text + "'";
            //sDlgWhere = sDlgWhere + ",'" + textHmaterName.Text + "'";
            //sDlgWhere = sDlgWhere + ",'" + textHprocName.Text + "'";
            //sDlgWhere = sDlgWhere + ",'" + dtpHBDate.Value.ToShortDateString() + "'";
            //sDlgWhere = sDlgWhere + ",'" + dtpHEDate.Value.ToShortDateString() + "'";
            //if (sDlgWhere.Trim().Length > 0)
            //{
            //    sDlgWhere = sDlgWhere.Substring(1, sDlgWhere.Length - 1);
            //}

            //DSet = SubCn.RunProcReturn("exec h_p_DefectiveDetailedYieldReport_New " + sDlgWhere, "h_p_DefectiveDetailedYieldReport_New");

            //生成首行标题
            if (DSet == null)
            {