From d9a61c72dd7d8277d85490f4e86fe3bcd3c7a832 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期四, 25 三月 2021 13:32:05 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-WEBAPI
---
WebAPI/Controllers/MoveStockBillController.cs | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/WebAPI/Controllers/MoveStockBillController.cs b/WebAPI/Controllers/MoveStockBillController.cs
index ad37b13..0283551 100644
--- a/WebAPI/Controllers/MoveStockBillController.cs
+++ b/WebAPI/Controllers/MoveStockBillController.cs
@@ -320,6 +320,7 @@
model.HBarCode = oView.HBarCode;
model.HBatchNo = oView.HBatchNo;
model.HMTONo = oView.HMTONo;
+ model.HMaker = oView.HMaker;
model.HWhID = DBUtility.ClsPub.isLong(HWHID);
model.HStockPlaceID = DBUtility.ClsPub.isLong(HSPID);
@@ -343,7 +344,17 @@
bool flag = oWebs.Get_CheckQtyByBarCode_GetWhAndSP(model.HInterID, model.HBillType, model.HBarCode, ref SCWhID, ref SCSPID, sRelQty, ref sRelQty);
if (flag)
{
- sQty = sRelQty;
+ //sQty = sRelQty;
+ model.HSCWHID = SCWhID;
+ model.HOutStockPlaceID = SCSPID;
+ if(SCWhID<=0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "1-浠撳簱鏃犲簱瀛橈紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
}
else if (sRelQty == 0)
{
@@ -355,7 +366,11 @@
}
else
{
- sQty = sRelQty;
+ 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))
--
Gitblit v1.9.1