From d7425a93ff6aec7d2c739fdb093ac049e84586ed Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期五, 04 六月 2021 17:43:44 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-API
---
WebAPI/Controllers/MoveStockBillController.cs | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/WebAPI/Controllers/MoveStockBillController.cs b/WebAPI/Controllers/MoveStockBillController.cs
index ad37b13..eea5b23 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)
{
@@ -353,10 +364,14 @@
objJsonResult.data = null;
return objJsonResult;
}
- else
- {
- sQty = sRelQty;
- }
+ //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))
{
--
Gitblit v1.9.1