From 175b53e6f0adb40a0d861981f56f120615d55897 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期三, 13 十一月 2024 14:52:31 +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, 8 insertions(+), 5 deletions(-)
diff --git a/WebAPI/Controllers/MoveStockBillController.cs b/WebAPI/Controllers/MoveStockBillController.cs
index 5da4438..8b45d3b 100644
--- a/WebAPI/Controllers/MoveStockBillController.cs
+++ b/WebAPI/Controllers/MoveStockBillController.cs
@@ -612,7 +612,7 @@
websLsmain.HKeeperID = lsmain[0].HKeeperID;
websLsmain.HSecManagerID = lsmain[0].HSecManagerID;
websLsmain.HManagerID = 0;
- websLsmain.HBillerID = 0;
+ websLsmain.HBillerID = lsmain[0].HBillerID;
websLsmain.HExplanation = "";
websLsmain.HInnerBillNo = "";
websLsmain.HRedBlueFlag = false;
@@ -658,7 +658,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 1;
- objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //鎴愬姛锛�
objJsonResult.data = null;
return objJsonResult;
}
@@ -666,7 +666,8 @@
{
objJsonResult.code = "99";
objJsonResult.count = 0;
- objJsonResult.Message = "涓婁紶澶辫触锛�" + DBUtility.ClsPub.sErrInfo;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //澶辫触锛�
+ //objJsonResult.Message = "涓婁紶澶辫触锛�" + DBUtility.ClsPub.sErrInfo;
objJsonResult.data = null;
return objJsonResult;
}
@@ -857,7 +858,8 @@
{
objJsonResult.code = "0";
objJsonResult.count = 1;
- objJsonResult.Message = "鐢熸垚璋冩嫧鍗曟垚鍔燂紒鍗曟嵁鍙蜂负锛�";
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //鎴愬姛锛�
+ //objJsonResult.Message = "鐢熸垚璋冩嫧鍗曟垚鍔燂紒鍗曟嵁鍙蜂负锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -865,7 +867,8 @@
{
objJsonResult.code = "99";
objJsonResult.count = 0;
- objJsonResult.Message = "涓婁紶澶辫触锛�" + DBUtility.ClsPub.sErrInfo;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //澶辫触锛�
+ //objJsonResult.Message = "涓婁紶澶辫触锛�" + DBUtility.ClsPub.sErrInfo;
objJsonResult.data = null;
return objJsonResult;
}
--
Gitblit v1.9.1