From 497807c8f2bf240703c8e899327d78a66fcc1f4d Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期日, 02 一月 2022 19:16:43 +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