From d0efffbf456b068abdac497b9bf86d295e6d21be Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期四, 05 十二月 2024 13:14:38 +0800
Subject: [PATCH] 新增PDA扫码模块获取入库类型、出库类型调用方法，传票验证调用方法等
---
WebAPI/Controllers/ProductInController.cs | 76 +++++++++++++++++++++++++++----------
1 files changed, 55 insertions(+), 21 deletions(-)
diff --git a/WebAPI/Controllers/ProductInController.cs b/WebAPI/Controllers/ProductInController.cs
index 81e5847..23d2708 100644
--- a/WebAPI/Controllers/ProductInController.cs
+++ b/WebAPI/Controllers/ProductInController.cs
@@ -264,8 +264,11 @@
//oBar = webserver.get_CheckTypeByBarCode(sCode, sInterID, sBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, ref DBUtility.ClsPub.sErrInfo);
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);
+
+ Kf_MateOutBillController obill = new Kf_MateOutBillController();
+ //閲嶆柊鍚屾鐢熶骇棰嗘枡鍗�
+ objJsonResult = obill.GetKf_MateOutBill_Sync_Json(HBillNo, HBillType);
+
WebSoBar = oWebs.get_BillBarCode_MateOutCheck(HBillNo, HBillType, HMaker, HOwnerID, ref DBUtility.ClsPub.sErrInfo);
if (WebSoBar == null)
{
@@ -301,8 +304,11 @@
//oBar = webserver.get_CheckTypeByBarCode(sCode, sInterID, sBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, ref DBUtility.ClsPub.sErrInfo);
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);
+
+ Kf_MoveStockBillController obill = new Kf_MoveStockBillController();
+ //閲嶆柊鍚屾鐩存帴璋冩嫧鍗�
+ objJsonResult = obill.GetKf_MoveStockBill_Sync_Json(HBillNo, HBillType);
+
WebSoBar = oWebs.get_BillBarCode_MoveStockCheck(HBillNo, HBillType, HMaker, HOwnerID, ref DBUtility.ClsPub.sErrInfo);
if (WebSoBar == null)
{
@@ -359,28 +365,56 @@
{
WebS.WebService1 oWebs = new WebS.WebService1();
WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS();
- string sBarCode = POStockInBillController.JX_Json(sCode, sInterID, HBillType, HOWNERID, sBillNo, sMaker);
- string sExpressNumber = "";
- WebSoBar = oWebs.get_CheckTypeByBarCode_BillCheck(sBarCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, (double)sQty, HOWNERID, ref ClsPub.sErrInfo);
- bool flag = WebSoBar == null;
- object result;
- if (flag)
+ //鑾峰彇绯荤粺鍙傛暟
+ string sErrMsg = "";
+ string sJXCode = "";
+ if (oSystemParameter.ShowBill(ref sErrMsg) == true)
{
- this.objJsonResult.code = "0";
- this.objJsonResult.count = 0;
- this.objJsonResult.Message = ClsPub.sErrInfo;
- this.objJsonResult.data = null;
- result = this.objJsonResult;
+ if (oSystemParameter.omodel.WMS_CampanyName == "瀹夌憺") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
+ {
+ sJXCode = POStockInBillController.JX_Json(sCode, sInterID, HBillType, HOWNERID, sBillNo, sMaker);
+ }
+ else
+ {
+ sJXCode = sCode;
+ }
+ try
+ {
+ WebSoBar = oWebs.get_CheckTypeByBarCode_BillCheck(sJXCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, (double)sQty, HOWNERID, ref 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;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵弿鏉＄爜澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
}
else
{
- this.objJsonResult.code = "0";
- this.objJsonResult.count = 1;
- this.objJsonResult.Message = ClsPub.sErrInfo;
- this.objJsonResult.data = WebSoBar;
- result = this.objJsonResult;
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg;
+ objJsonResult.data = null;
+ return objJsonResult;
}
- return result;
}
--
Gitblit v1.9.1