From 7ffbf3f7c27b0dff2bd33c5b7284da71f47d734e Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期五, 16 八月 2024 17:20:07 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WebAPI/Controllers/SellOutBackController.cs |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/WebAPI/Controllers/SellOutBackController.cs b/WebAPI/Controllers/SellOutBackController.cs
index 3fc17c7..4f0babc 100644
--- a/WebAPI/Controllers/SellOutBackController.cs
+++ b/WebAPI/Controllers/SellOutBackController.cs
@@ -401,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;
                 }
@@ -414,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