From aaa742141d18b5f6d73942c975de55a14446ef22 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期五, 02 二月 2024 08:49:23 +0800
Subject: [PATCH] 网页版工资结算单（个人）、工资结算单（集体）、工资结算单（其他）、定额申请单、异常工时申请单列表模块，列表返回数据、审核反审核、关闭反关闭、作废反作废、删除等调用方法修改
---
WebAPI/Controllers/SellOutController.cs | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/WebAPI/Controllers/SellOutController.cs b/WebAPI/Controllers/SellOutController.cs
index edb20e3..a4c8e17 100644
--- a/WebAPI/Controllers/SellOutController.cs
+++ b/WebAPI/Controllers/SellOutController.cs
@@ -377,7 +377,7 @@
//閿�鍞嚭搴�/鎵潯鐮�/鐩存帴璋僿ebservice
[Route("SellOut/get_CheckTypeByBarCode_Json")]
[HttpGet]
- public Object get_CheckTypeByBarCode_Json(string sCode, Int64 sInterID,string HBillType, string sBillNo, string sMaker, Int64 WhID, Int64 SPID, Double sQty, bool sRedBlue, bool SourceFlag, string sSourceBillNo, string sSourceType, Int64 HOWNERID,string HScanStyle)
+ public Object get_CheckTypeByBarCode_Json(string sCode, Int64 sInterID, string HBillType, string sBillNo, string sMaker, Int64 WhID, Int64 SPID, Double sQty, bool sRedBlue, bool SourceFlag, string sSourceBillNo, string sSourceType, Int64 HOWNERID, string HScanStyle)
{
//oBar = webserver.get_CheckTypeByBarCode(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, ref DBUtility.ClsPub.sErrInfo);
string sExpressNumber = "";
@@ -395,10 +395,37 @@
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
- objJsonResult.data = oBar;
+ objJsonResult.data = WebSoBar;
return objJsonResult;
}
}
+
+ //public object get_CheckTypeByBarCode_Json(string sCode, long sInterID, string HBillType, string sBillNo, string sMaker, long WhID, long SPID, double sQty, bool sRedBlue, bool SourceFlag, string sSourceBillNo, string sSourceType, long HOWNERID)
+ //{
+ // string hexpressNumber = "";
+ // this.WebSoBar = this.oWebs.get_CheckTypeByBarCode_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, hexpressNumber, ref ClsPub.sErrInfo);
+ // bool flag = this.WebSoBar == null;
+ // object result;
+ // if (flag)
+ // {
+ // this.objJsonResult.code = "0";
+ // this.objJsonResult.count = 0;
+ // this.objJsonResult.Message = ClsPub.sErrInfo;
+ // this.objJsonResult.data = null;
+ // result = this.objJsonResult;
+ // }
+ // else
+ // {
+ // this.objJsonResult.code = "0";
+ // this.objJsonResult.count = 1;
+ // this.objJsonResult.Message = ClsPub.sErrInfo;
+ // this.objJsonResult.data = this.oBar;
+ // result = this.objJsonResult;
+ // }
+ // return result;
+ //}
+
+
/// <summary>
/// 杩斿洖鍑哄叆搴撴潯鐮佷复鏃惰〃
/// </summary>
@@ -578,7 +605,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 1;
- objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //鎴愬姛锛�
objJsonResult.data = null;
return objJsonResult;
}
@@ -586,7 +613,8 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "涓婁紶澶辫触锛�" + DBUtility.ClsPub.sErrInfo;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //澶辫触锛�
+ //objJsonResult.Message = "涓婁紶澶辫触锛�" + DBUtility.ClsPub.sErrInfo;
objJsonResult.data = null;
return objJsonResult;
}
--
Gitblit v1.9.1