From 34c78336cae81c8592405b2644da35e9ac91fdca Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 29 十一月 2022 11:25:18 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/OtherOutBillController.cs | 37 ++++++++++++++++++++++++++++++++++++-
1 files changed, 36 insertions(+), 1 deletions(-)
diff --git a/WebAPI/Controllers/OtherOutBillController.cs b/WebAPI/Controllers/OtherOutBillController.cs
index 28a23ae..09c64c7 100644
--- a/WebAPI/Controllers/OtherOutBillController.cs
+++ b/WebAPI/Controllers/OtherOutBillController.cs
@@ -88,12 +88,17 @@
// objJsonResult.data = oBar;
// return objJsonResult;
//}
+
+
WebS.WebService1 oWebs = new WebS.WebService1();
WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS();
string sExpressNumber = "";
+
+ var sJXCode = POStockInBillController.JX_Json(sCode, sInterID, HBillType, HOWNERID, sBillNo,sMaker);
+ SourceFlag = true;
//WebSoBar = oWebs.get_CheckTypeByBarCode_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo);
//WebSoBar = oWebs.get_CheckTypeByBarCode_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo);
- WebSoBar = oWebs.get_CheckTypeByBarCode_New(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, HScanStyle, ref DBUtility.ClsPub.sErrInfo);
+ WebSoBar = oWebs.get_CheckTypeByBarCode_New(sJXCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, HScanStyle, ref DBUtility.ClsPub.sErrInfo);
if (WebSoBar == null)
{
objJsonResult.code = "0";
@@ -378,6 +383,36 @@
}
}
+ [Route("OtherOutBill/set_SavePonderationBillMain_Temp_Source_Fast_Json1")]
+ [HttpGet]
+ public object set_SavePonderationBillMain_Temp_Source_Fast_Json1(Int64 sInterID, string SBillNo, string HBillType, string sSourceBillNo, string sSourceType,bool sRedBlue, string sMaker, Int64 sHOWNERID)
+ {
+
+ WebS.WebService1 oWebs = new WebS.WebService1();
+ WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS();
+ string sExpressNumber = "";
+ //WebSoBar = oWebs.get_CheckTypeByBarCode_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo);
+ WebSoBar = oWebs.get_CheckTypeBySource_New(sInterID, SBillNo, HBillType, sSourceBillNo, sSourceType,sRedBlue, sMaker, sHOWNERID, ref DBUtility.ClsPub.sErrInfo);
+ if (WebSoBar == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
+ objJsonResult.data = WebSoBar;
+ return objJsonResult;
+ }
+ }
+
+
+
/// <summary>
/// 鐢熸垚鍏朵粬鍏ュ簱鍗�
/// </summary>
--
Gitblit v1.9.1