From 27d7b50f43c85f12507ab1a61290fa9551d4d780 Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期二, 17 五月 2022 16:58:35 +0800
Subject: [PATCH] 不良评审单、工序进站单、工序出站单、委外接收单、委外发出单删除时增加制单人与删除人是否一致系统参数控制；不良明细良率报表修改优化，原报表取值数据代码里写死改为取存储过程里数据显示
---
WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
index f550ae7..f7f8008 100644
--- a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
+++ b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
@@ -280,7 +280,7 @@
/// <returns>object</returns>
[Route("Sc_ProcessExchangeBill/GetICMOBillList")]
[HttpGet]
- public object GetICMOBillList(int hmainid,int OrganizationID)
+ public object GetICMOBillList(int hmainid,int HEntryID, int OrganizationID)
{
try
{
@@ -292,7 +292,7 @@
objJsonResult.data = null;
return objJsonResult;
}
- ds = oCN.RunProcReturn("select * from h_v_Sc_ICMOBillListDetail where hmainid=" + hmainid, "h_v_Sc_ICMOBillListDetail");
+ ds = oCN.RunProcReturn("select * from h_v_Sc_ICMOBillListDetail where hmainid=" + hmainid + " and HEntryID=" + HEntryID, "h_v_S_Sc_ICMOBillList");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -327,7 +327,7 @@
/// <returns>object</returns>
[Route("Sc_ProcessExchangeBill/GetICMOBillDetail")]
[HttpGet]
- public object GetICMOBillDetail(int hmainid, int OrganizationID)
+ public object GetICMOBillDetail(int hmainid,int HEntryID, int OrganizationID)
{
try
{
@@ -339,7 +339,7 @@
objJsonResult.data = null;
return objJsonResult;
}
- ds = oCN.RunProcReturn("select * from h_v_S_Sc_ICMOBillList where hmainid=" + hmainid, "h_v_S_Sc_ICMOBillList");
+ ds = oCN.RunProcReturn("select * from h_v_S_Sc_ICMOBillList where hmainid=" + hmainid + " and HEntryID=" + HEntryID, "h_v_S_Sc_ICMOBillList");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
--
Gitblit v1.9.1