From 8ca32345fb7f2a74d3818e36d4996e83a15838f2 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 24 三月 2023 09:57:50 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/SellOutController.cs | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 insertions(+), 1 deletions(-)
diff --git a/WebAPI/Controllers/SellOutController.cs b/WebAPI/Controllers/SellOutController.cs
index edb20e3..0cbc00b 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 = "";
@@ -399,6 +399,33 @@
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>
--
Gitblit v1.9.1