From 77841dec99bfba72112a66a17dfc69f9aff35f6a Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期一, 27 十二月 2021 19:21:17 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/MoveStockBillController.cs | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/WebAPI/Controllers/MoveStockBillController.cs b/WebAPI/Controllers/MoveStockBillController.cs
index 700638a..dea99db 100644
--- a/WebAPI/Controllers/MoveStockBillController.cs
+++ b/WebAPI/Controllers/MoveStockBillController.cs
@@ -440,7 +440,7 @@
websLsmain.HSupID = 0;
//websLsmain.HGroupID = lsmain[0].HGroupID;
- if (webserver.set_SaveMoveStockBill(websLsmain, "-1", ref DBUtility.ClsPub.sErrInfo))
+ if (webserver.set_SaveMoveStockBill(websLsmain, sSourceBillType, ref DBUtility.ClsPub.sErrInfo))
{
objJsonResult.code = "0";
objJsonResult.count = 1;
@@ -522,7 +522,7 @@
websLsmain.HSupID = 0;
//websLsmain.HGroupID = lsmain[0].HGroupID;
- if (webserver.set_SaveMoveStockBill(websLsmain, "-1", ref DBUtility.ClsPub.sErrInfo))
+ if (webserver.set_MoveStockStepOutBill(websLsmain, "-1", ref DBUtility.ClsPub.sErrInfo))
{
objJsonResult.code = "0";
objJsonResult.count = 1;
@@ -605,7 +605,14 @@
// DataSet ds = new DataSet();
// WebServer webserver = new WebServer();
string sWhere = " Where 鍗曟嵁鍙� like '%" + HSourceBillNo.Trim() + "%'";
- ds = webserver.GetSc_PPBomBillList(sWhere);
+ if (HSourceBillType == "3720")
+ {
+ ds = webserver.GetSc_PPBomBillList(sWhere);
+ }
+ else if (HSourceBillType == "1243")
+ {
+ ds = webserver.GetKf_MoveStockRequestBillList(sWhere);
+ }
if (ds == null || ds.Tables[0].Rows.Count <= 0)
{
--
Gitblit v1.9.1