From 3c0b7580543df45b621ea7e9007861420e650482 Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期三, 18 五月 2022 16:03:06 +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