From edbb3dfdc024641c81829b3ddb4af13dbcf9d9ba Mon Sep 17 00:00:00 2001
From: lan <lan@DESKTOP-MG88OFJ>
Date: 星期四, 23 五月 2024 15:31:43 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/SCGL/Sc_ICMOReportBillController.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/WebAPI/Controllers/SCGL/Sc_ICMOReportBillController.cs b/WebAPI/Controllers/SCGL/Sc_ICMOReportBillController.cs
index 53cfdf3..398d627 100644
--- a/WebAPI/Controllers/SCGL/Sc_ICMOReportBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_ICMOReportBillController.cs
@@ -120,7 +120,7 @@
HUnitID, 璁￠噺鍗曚綅浠ｇ爜 HUnitCode, 璁￠噺鍗曚綅 HUnitName,HSourceID,鐢熶骇璧勬簮浠ｇ爜 HSourceCode,鐢熶骇璧勬簮 HSourceName,
HWorkerid,鎿嶄綔鍛樹唬鐮� HWorkerCode,鎿嶄綔鍛� HWorkerName,鐢熶骇鏁伴噺 HQty,琛ㄤ綋澶囨敞 HRemark,
HICMOInterID,HICMOEntryID,HICMOBillNo,HICMOInterID as HSourceInterID,HICMOEntryID as HSourceEntryID,
- HICMOBillNo as HSourceBillNo,3710 as HSourceBillType
+ HICMOBillNo as HSourceBillNo,3710 as HSourceBillType,涓嶈壇鏁伴噺 HBadQty
FROM h_v_IF_ICMOReportBillList_Edit"), "h_v_IF_ICMOReportBillList_Edit");
objJsonResult.code = "0";
@@ -137,7 +137,7 @@
HWorkerid,鎿嶄綔鍛樹唬鐮� HWorkerCode,鎿嶄綔鍛� HWorkerName,鐢熶骇鏁伴噺 HQty,琛ㄤ綋澶囨敞
HRemark,HICMOInterID,HICMOEntryID,HICMOBillNo,
HICMOInterID as HSourceInterID,HICMOEntryID as HSourceEntryID,
- HICMOBillNo as HSourceBillNo,3710 as HSourceBillType
+ HICMOBillNo as HSourceBillNo,3710 as HSourceBillType,涓嶈壇鏁伴噺 HBadQty
FROM h_v_IF_ICMOReportBillList_Edit where 1 = 1 ");
string sql = sql1 + sqlWhere;
ds = oCN.RunProcReturn(sql, "h_v_IF_ICMOReportBillList_Edit");
--
Gitblit v1.9.1