From 4a71279770509d6876265b64002779c035295e3c Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期四, 27 六月 2024 14:11:54 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/SellOutBackController.cs | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/WebAPI/Controllers/SellOutBackController.cs b/WebAPI/Controllers/SellOutBackController.cs
index c8a743f..4f0babc 100644
--- a/WebAPI/Controllers/SellOutBackController.cs
+++ b/WebAPI/Controllers/SellOutBackController.cs
@@ -246,6 +246,8 @@
{
try
{
+ if (String.IsNullOrEmpty(sWhere))
+ sWhere = "and 1 = 1 ";
ds = webserver.GetKf_PonderationBillMain_Temp(HBillID, HBillType, sWhere);
if (ds == null || ds.Tables[0].Rows.Count <= 0)
{
@@ -399,12 +401,13 @@
websLsmain.HEmpID = lsmain[0].HEmpID;
websLsmain.HRemark = lsmain[0].HRemark;
websLsmain.HMaker = lsmain[0].HMaker;
-
+ websLsmain.HBillType = "1247";//鍥哄畾鍊�
if (webserver.set_SaveSellOutBackBill_New(websLsmain, sSourceBillType, ref DBUtility.ClsPub.sErrInfo))
{
objJsonResult.code = "0";
objJsonResult.count = 1;
- objJsonResult.Message = "鐢熸垚閫�鏂欏崟鎴愬姛锛佸崟鎹彿涓猴細";
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //鎴愬姛锛�
+ //objJsonResult.Message = "鐢熸垚閫�鏂欏崟鎴愬姛锛佸崟鎹彿涓猴細";
objJsonResult.data = null;
return objJsonResult;
}
@@ -412,7 +415,8 @@
{
objJsonResult.code = "0";
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