From 74a20573de4e4a0e6b2de8a4f69c35ad614edd45 Mon Sep 17 00:00:00 2001
From: jingh <jingh@LAPTOP-I53VDLOO>
Date: 星期五, 31 十二月 2021 16:23:17 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WorkM/报表分析/DefectiveDetailedYieldReport.cs |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/DefectiveDetailedYieldReport.cs" "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/DefectiveDetailedYieldReport.cs"
index 2c7e933..673d207 100644
--- "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/DefectiveDetailedYieldReport.cs"
+++ "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/DefectiveDetailedYieldReport.cs"
@@ -175,7 +175,7 @@
                 "MAX(a.HMakeDate) 姹囨姤鏃ユ湡, a.HICMOBillNo 浠诲姟鍗曞彿, 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 / (co.HQty + co.HWasterQty) 鍑虹珯鑹巼, co.HName 涓嶈壇鏄庣粏, co.HBadQty 涓嶈壇鏁伴噺 " +
+                ", co.HWasterQty 涓嶅悎鏍兼暟閲�, co.HQty /  nullif((co.HQty+co.HWasterQty),0) 鍑虹珯鑹巼, co.HName 涓嶈壇鏄庣粏, co.HBadQty 涓嶈壇鏁伴噺 " +
                 " FROM Sc_StationOutBillMain a " +
                 "left join Gy_Material  b on a.HMaterID = b.HItemID " +
                 "left join( " +

--
Gitblit v1.9.1