From 8ca2d296feab2534837b166908d16983d79a0696 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 17 三月 2023 09:15:56 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/MoveStockBillController.cs | 54 +++++++++++++++++++++++++++---------------------------
1 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/WebAPI/Controllers/MoveStockBillController.cs b/WebAPI/Controllers/MoveStockBillController.cs
index fa54883..e2e8af1 100644
--- a/WebAPI/Controllers/MoveStockBillController.cs
+++ b/WebAPI/Controllers/MoveStockBillController.cs
@@ -614,7 +614,7 @@
websLsmain.HBillerID = 0;
websLsmain.HExplanation = "";
websLsmain.HInnerBillNo = "";
- websLsmain.HRedBlueFlag = true;
+ websLsmain.HRedBlueFlag = false;
websLsmain.HMainSourceBillType = "-1";
websLsmain.HStockStyle = "";
websLsmain.HBillType = "1207";
@@ -622,34 +622,34 @@
websLsmain.HSupID = 0;
//websLsmain.HGroupID = lsmain[0].HGroupID;
string sErrMsg = "";
- //涓婁紶鍓嶅垽鏂�
- SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
- DataSet Ds = oCn.RunProcReturn("exec h_p_WMS_BeforeUpload_MoveStockBill_AR " + websLsmain.HInterID.ToString() + ",'" + websLsmain.HBillNo + "','" + websLsmain.HBillType + "'", "h_p_WMS_BeforeUpload_MoveStockBill_AR");
- if (Ds == null || Ds.Tables[0].Rows.Count == 0)
- {
- sErrMsg = "鏍￠獙涓婁紶鍓嶅垽鏂紝鍙戠敓閿欒锛�";
- //return false;
+ ////涓婁紶鍓嶅垽鏂�
+ //SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ //DataSet Ds = oCn.RunProcReturn("exec h_p_WMS_BeforeUpload_MoveStockBill_AR " + websLsmain.HInterID.ToString() + ",'" + websLsmain.HBillNo + "','" + websLsmain.HBillType + "'", "h_p_WMS_BeforeUpload_MoveStockBill_AR");
+ //if (Ds == null || Ds.Tables[0].Rows.Count == 0)
+ //{
+ // sErrMsg = "鏍￠獙涓婁紶鍓嶅垽鏂紝鍙戠敓閿欒锛�";
+ // //return false;
- objJsonResult.code = "99";
- objJsonResult.count = 0;
- objJsonResult.Message = "涓婁紶澶辫触锛�" + sErrMsg;
- objJsonResult.data = null;
- return objJsonResult;
- }
- else
- {
- if (DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0][0]) == 1)
- {
- sErrMsg = "鍗曟嵁鍙凤細" + websLsmain.HBillNo + "锛屽崟鎹甀D锛�" + websLsmain.HInterID + "锛�" + DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark"]);
- //return false;
- objJsonResult.code = "99";
- objJsonResult.count = 0;
- objJsonResult.Message = "涓婁紶澶辫触锛�" + sErrMsg;
- objJsonResult.data = null;
- return objJsonResult;
+ // objJsonResult.code = "99";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "涓婁紶澶辫触锛�" + sErrMsg;
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ //else
+ //{
+ // if (DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0][0]) == 1)
+ // {
+ // sErrMsg = "鍗曟嵁鍙凤細" + websLsmain.HBillNo + "锛屽崟鎹甀D锛�" + websLsmain.HInterID + "锛�" + DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark"]);
+ // //return false;
+ // objJsonResult.code = "99";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "涓婁紶澶辫触锛�" + sErrMsg;
+ // objJsonResult.data = null;
+ // return objJsonResult;
- }
- }
+ // }
+ //}
--
Gitblit v1.9.1