From 414e9ac9f6e44d5d427c7e00389a5e4f8be42208 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期三, 28 九月 2022 09:02:27 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/MoveStockBillController.cs | 43 ++++++++++++++++++++++++++++++-------------
1 files changed, 30 insertions(+), 13 deletions(-)
diff --git a/WebAPI/Controllers/MoveStockBillController.cs b/WebAPI/Controllers/MoveStockBillController.cs
index 0283551..f87c455 100644
--- a/WebAPI/Controllers/MoveStockBillController.cs
+++ b/WebAPI/Controllers/MoveStockBillController.cs
@@ -221,7 +221,7 @@
/// <returns></returns>
[Route("MoveStockBill/get_InfoByBarCode_Source_Json")]
[HttpGet]
- public object get_InfoByBarCode_Source_Json(string sCode, Int64 sInterID, string sBillNo, Double sQty, Int64 HWHID, Int64 HSPID, Int64 SCWhID, Int64 SCSPID)
+ public object get_InfoByBarCode_Source_Json(string HSourceBillNo, string sCode, Int64 sInterID, string sBillNo, Double sQty, Int64 HWHID, Int64 HSPID, Int64 SCWhID, Int64 SCSPID)
{
try
{
@@ -230,7 +230,7 @@
dal.GetInfoByNumber_View(sCode);
if (dal.omodel_View.HBarCodeType != "鎵樼洏鏉＄爜")
{
- return get_InfoByBarCode_Source_Json_s(sCode, sInterID, sBillNo, sQty, HWHID, HSPID, SCWhID, SCSPID);
+ return get_InfoByBarCode_Source_Json_s(HSourceBillNo, sCode, sInterID, sBillNo, sQty, HWHID, HSPID, SCWhID, SCSPID);
}
else
{
@@ -256,7 +256,7 @@
for (int i = 0; i < dsTBarCode.Tables[0].Rows.Count; i++)
{
sBarCode_MX = DBUtility.ClsPub.isStrNull(dsTBarCode.Tables[0].Rows[i]["HBarCodeMX"]);
- objJsonResult = (JsonResult)get_InfoByBarCode_Source_Json_s(sBarCode_MX, sInterID, sBillNo, sQty, HWHID, HSPID, SCWhID, SCSPID);
+ objJsonResult = (JsonResult)get_InfoByBarCode_Source_Json_s(HSourceBillNo, sBarCode_MX, sInterID, sBillNo, sQty, HWHID, HSPID, SCWhID, SCSPID);
if (objJsonResult.code == "0")
{
return objJsonResult;
@@ -277,7 +277,7 @@
}
}
- public object get_InfoByBarCode_Source_Json_s(string sCode, Int64 sInterID, string sBillNo, Double sQty, Int64 HWHID, Int64 HSPID, Int64 SCWhID, Int64 SCSPID)
+ public object get_InfoByBarCode_Source_Json_s(string HSourceBillNo, string sCode, Int64 sInterID, string sBillNo, Double sQty, Int64 HWHID, Int64 HSPID, Int64 SCWhID, Int64 SCSPID)
{
try
{
@@ -293,6 +293,18 @@
objJsonResult.Message = "1-鍗曟嵁鍙凤細" + sBillNo + "锛屽崟鎹甀D锛�" + sInterID + "锛�" + DBUtility.ClsPub.sErrInfo;
objJsonResult.data = null;
return objJsonResult;
+ }
+ //鏈夋簮鍗� 鍒ゆ柇鍒楄〃涓槸鍚﹀瓨鍦ㄦ墍鎵弿鐨勭墿鏂�
+ if (Pub_Class.ClsPub.isStrNull(HSourceBillNo) != "")
+ {
+ if (sBool == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍙凤細" + sBillNo + "锛屽崟鎹甀D锛�" + sInterID + "锛涜鐗╂枡骞朵笉瀛樺湪浜庢璋冩嫧鍗曚腑锛岃纭鐗╂枡鏃犺鍚庨噸鏂版壂鎻忥紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
}
if (oView.HBarCodeType == "鍞竴鏉＄爜" && sQty > 0 && oView.HQty < sQty)
{
@@ -342,6 +354,11 @@
WebS.WebService1 oWebs = new WebS.WebService1();
//if (webserver.set_SavePonderationBillMain_Temp_Qty(model, sQty, ref DBUtility.ClsPub.sErrInfo))
bool flag = oWebs.Get_CheckQtyByBarCode_GetWhAndSP(model.HInterID, model.HBillType, model.HBarCode, ref SCWhID, ref SCSPID, sRelQty, ref sRelQty);
+ //objJsonResult.code = "1";
+ //objJsonResult.count = 1;
+ //objJsonResult.Message = "test锛乻Qty=" + sQty.ToString() + ",sRelQty=" + sRelQty.ToString();
+ //objJsonResult.data = null;
+ //return objJsonResult;
if (flag)
{
//sQty = sRelQty;
@@ -364,16 +381,16 @@
objJsonResult.data = null;
return objJsonResult;
}
- else
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "2-搴撳瓨涓嶈冻锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
+ //else
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "2-搴撳瓨涓嶈冻锛�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
- if (oWebs.set_SavePonderationBillMain_Temp_Qty(model, sQty, ref DBUtility.ClsPub.sErrInfo))
+ if (oWebs.set_SavePonderationBillMain_Temp_Qty(model, sRelQty, ref DBUtility.ClsPub.sErrInfo))
{
objJsonResult.code = "1";
objJsonResult.count = 1;
--
Gitblit v1.9.1