From 5fccb067ad7dc2dbcdacf8db642aa471488cd8f0 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 20 二月 2025 15:24:29 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs | 685 ++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 443 insertions(+), 242 deletions(-)
diff --git a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
index 8f5a5dc..0db6ff1 100644
--- a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
+++ b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
@@ -2,6 +2,7 @@
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Pub_Class;
+using SyntacticSugar.constant;
using System;
using System.Collections;
using System.Collections.Generic;
@@ -9,6 +10,7 @@
using System.Data.SqlClient;
using System.Web.Http;
using WebAPI.Models;
+
namespace WebAPI.Controllers
{
@@ -23,7 +25,70 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
DataSet ds;
- /// <summary>
+ #region 閲囪喘璁㈠崟鍒嗛〉鍒楄〃
+ [Route("Cg_POOrderBill/page")]
+ [HttpGet]
+ public object Cg_POOrderBillPage(string sWhere, string user, int page, int size)
+ {
+ DataSet ds;
+ json res = new json();
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Cg_POOrderBillList", 3, false, user))
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡鏉冮檺,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍒ゆ柇鏄惁鏈夐噰璐粡鐞嗘潈闄愶紙瀹夌憺锛�
+ bool isCgjl = Security_Log("Cg_POOrderBill_PurchasManager", 1, true, user);
+ if (!isCgjl)
+ {
+ sWhere += $" and HEmpID in (select HEmpID from Gy_Czygl where Czymc='{user}' and HEmpID >0 )";
+ }
+
+
+ sWhere = sWhere.Replace("'", "''");
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("exec h_p_IF_POOrderBillList " + page + "," + size + ",''", "h_p_IF_POOrderBillList");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn("exec h_p_IF_POOrderBillList " + page + "," + size + ",'" + sWhere + "'", "h_p_IF_POOrderBillList");
+ }
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ res.code = CodeConstant.SUCCEED;
+ res.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
+ res.Message = "Sucess锛�";
+ res.list = columnNameList;
+ res.data = ds.Tables[0];
+ return res;
+ }
+ catch (Exception e)
+ {
+ res.code = CodeConstant.FAIL;
+ res.count = CountConstant.FAIL;
+ res.Message = "Exception锛�" + e.ToString();
+ res.data = null;
+ return res;
+ }
+ }
+ #endregion
+
+ /// <summary>
/// 杩斿洖閲囪喘璁㈠崟鍒楄〃
///鍙傛暟锛歴tring sql銆�
///杩斿洖鍊硷細object銆�
@@ -200,7 +265,7 @@
{
try
{
- string sql = $"update銆�Cg_POOrderBillMain銆� set HBusinessStatus = 2 ,HEmpID ={HSupplierId} where HInterID in ({Hmainid})";
+ string sql = $"update銆�Cg_POOrderBillMain銆�set HBusinessStatus = 2 ,HEmpID ={HSupplierId} where HInterID in ({Hmainid})";
oCN.RunProc(sql);
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -228,7 +293,7 @@
{
try
{
- string sql = $"update銆�Cg_POOrderBillMain銆� set HBusinessStatus = 3 where HInterID in ({Hmainid})";
+ string sql = $"update銆�Cg_POOrderBillMain set HBusinessStatus = 3 where HInterID in ({Hmainid})";
oCN.RunProc(sql);
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -744,7 +809,8 @@
string HInnerBillNo = mainList[0].HInnerBillNo;//鍐呴儴鍗曟嵁鍙�
long HWHID = mainList[0].HWHID;//浠撳簱
long HProjectID = mainList[0].HProjectID;//浠撳簱
-
+ string HLinkMan = mainList[0].HLinkMan;//鑱旂郴浜�
+ string HLinkPhone = mainList[0].HLinkPhone;//鑱旂郴浜虹數璇�
List<ClsCg_POOrderBillMain> mainList2 = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsCg_POOrderBillMain>>(msg2);
DateTime dt = DateTime.Now;
long HPURCHASEORGID = mainList2[0].HOrgID;
@@ -825,20 +891,20 @@
,HMaker,HMakeDate
,HERPInterID,HERPBillType,HPURCHASEORGID
,HPURCHASERGROUPID,HPROVIDERID,HSETTLEID,HCHARGEID,HBUSINESSTYPE,HPROVIDERADDRESS,HCORRESPONDORGID,HPROVIDERCONTACTID
- ,HWHID,HProjectID)
+ ,HWHID,HProjectID,HLinkMan,HLinkPhone)
values(" + HInterID + "," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + 1102 + "','" +
1102 + "','" + HDate + "','" + HBillNo + "','" + HBillStatus + "','" + HAddress +
"'," + HSSID + ",'" + HSSDate + "'," + HPSStyleID + "," + HSupID + "," + HCurID +
"," + HExRate + "," + HEmpID + "," + HManagerID + "," + HDeptID + ",'" + HExplanation + "','" + HRemark + "','" + HInnerBillNo + "','" + HMaker + "',getdate()" + "," + HERPInterID + ",'" + HERPBillType + "'," + HPURCHASEORGID + "," + HPURCHASERGROUPID + ","
+ HPROVIDERID + "," + HSETTLEID + "," + HCHARGEID + ",'" + HBUSINESSTYPE + "','" + HPROVIDERADDRESS + "',"
+ HCORRESPONDORGID + "," + HPROVIDERCONTACTID + ","
- + HWHID+","+ HProjectID + ")");
+ + HWHID+","+ HProjectID +",'"+HLinkMan+"','"+HLinkPhone+"'"+")");
}
else if (OperationType == 3 || ds.Tables[0].Rows.Count != 0)
{ //淇敼
DataSet dss;
- dss = oCN.RunProcReturn("select * from h_v_IF_POOrderBillList where hmainid=" + HInterID + " and 鍗曟嵁鍙�='" + HBillNo + "'", "h_v_IF_POOrderBillList");
+ dss = oCN.RunProcReturn("select * from h_v_IF_POOrderBillList where hmainid=" + HInterID, "h_v_IF_POOrderBillList");
//鍒ゆ柇鏄惁鍙紪杈�
if (dss.Tables[0].Rows[0]["瀹℃牳浜�"].ToString() != "" && dss.Tables[0].Rows[0]["瀹℃牳浜�"] != null)
{
@@ -857,10 +923,10 @@
return objJsonResult;
}
oCN.RunProc("update Cg_POOrderBillMain set " +
- "HRemark='" + HRemark + "', HUpDater='" + HMaker + "', HUpDateDate=getdate()" +
+ "HRemark='" + HRemark + "', HUpDater='" + HMaker + "', HUpDateDate=getdate()" + ",HBillNo='" +HBillNo +"'"+
",HSSID=" + HSSID + ",HPSStyleID=" + HPSStyleID + ",HSupID=" + HSupID + ",HCurID=" + HCurID
+ ",HExRate=" + HExRate + ",HEmpID=" + HEmpID + ",HManagerID=" + HManagerID + ",HDeptID=" + HDeptID
- + ",HAddress='" + HAddress + "',HSSDate='" + HSSDate + "',HWHID="+ HWHID + ",HProjectID="+ HProjectID + " where HInterID=" + HInterID);
+ + ",HAddress='" + HAddress + "',HSSDate='" + HSSDate + "',HWHID="+ HWHID + ",HProjectID="+ HProjectID +",HLinkMan = '"+HLinkMan+"',HLinkPhone = '"+HLinkPhone+ "' where HInterID=" + HInterID);
//鍒犻櫎瀛愯〃
oCN.RunProc("delete from Cg_POOrderBillSub where HInterID='" + HInterID + "'");
@@ -976,14 +1042,14 @@
long HBUYERWITHHOLDING = DetailColl2[i].HBUYERWITHHOLDING;//涔版柟浠ｆ墸浠ｇ即
string HMATERIALDESC = DetailColl2[i].HMATERIALDESC == null ? "''" : DetailColl2[i].HMATERIALDESC; //鐗╂枡璇存槑
i++;
- if (oSub.HQty <= 0 || oSub.HQty == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "绗�" + i + "琛岋紝鏁伴噺涓嶈兘涓�0鎴栬�呭皬浜�0";
- objJsonResult.data = null;
- return objJsonResult;
- }
+ //if (oSub.HQty <= 0 || oSub.HQty == 0)
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "绗�" + i + "琛岋紝鏁伴噺涓嶈兘涓�0鎴栬�呭皬浜�0";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
if (oSub.HMaterID == 0)
{
@@ -1272,7 +1338,7 @@
try
{
- ds = oCN.RunProcReturn("select * from h_v_IF_POOrderBillList where hmainid =" + HInterID, "h_v_IF_POOrderBillList");
+ ds = oCN.RunProcReturn("select * from h_v_IF_POOrderBillEdit where hmainid =" + HInterID, "h_v_IF_POOrderBillList");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -1367,37 +1433,37 @@
{
if (oBill.omodel.HCloseMan.Trim() != "")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘鍐嶆瀹℃牳锛�";
objJsonResult.data = null;
return objJsonResult;
}
if (oBill.omodel.HDeleteMan.Trim() != "")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘鍐嶆瀹℃牳锛�";
objJsonResult.data = null;
return objJsonResult;
}
- if (IsAudit == 0) //瀹℃牳鍒ゆ柇
+ if (IsAudit == TypeConstant.AUDIT) //瀹℃牳鍒ゆ柇
{
if (oBill.omodel.HChecker.Trim() != "")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘鍐嶆瀹℃牳锛�";
objJsonResult.data = null;
return objJsonResult;
}
}
- if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ if (IsAudit == TypeConstant.REVERSE_AUDIT) //鍙嶅鏍稿垽鏂�
{
if (oBill.omodel.HChecker.Trim() == "")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶉渶瑕佸弽瀹℃牳!";
objJsonResult.data = null;
return objJsonResult;
@@ -1406,8 +1472,8 @@
}
else
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
objJsonResult.data = null;
return objJsonResult;
@@ -1415,7 +1481,7 @@
//杩涜闇�瑕佽繘琛岀殑瀹℃牳/鍙嶅鏍告搷浣�
- if (IsAudit == 0) //瀹℃牳鎻愪氦
+ if (IsAudit == TypeConstant.AUDIT) //瀹℃牳鎻愪氦
{
//瀹℃牳鍓嶆帶鍒�=========================================
@@ -1423,8 +1489,8 @@
ds = oCN.RunProcReturn(sql1, "h_p_Cg_POOrderBill_BeforeCheckCtrl");
if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
{
- objJsonResult.code = "0";
- objJsonResult.count = 1;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.SUCCEED;
objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:瀹℃牳鍓嶅垽鏂け璐ワ紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
objJsonResult.data = null;
return objJsonResult;
@@ -1432,8 +1498,8 @@
if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
{
- objJsonResult.code = "0";
- objJsonResult.count = 1;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.SUCCEED;
objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
objJsonResult.data = null;
return objJsonResult;
@@ -1454,37 +1520,37 @@
//瀹℃牳鎻愪氦
if (oBill.CheckBill(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Cg_POOrderBill_AfterCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
{
- objJsonResult.code = "1";
- objJsonResult.count = 1;
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
objJsonResult.Message = "瀹℃牳鎴愬姛";
objJsonResult.data = null;
return objJsonResult;
}
else
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
objJsonResult.data = null;
return objJsonResult;
}
}
- if (IsAudit == 1) //鍙嶅鏍告彁浜�
+ if (IsAudit == TypeConstant.REVERSE_AUDIT) //鍙嶅鏍告彁浜�
{
//鍙嶅鏍稿墠鎺у埗=========================================
DataSet ds = oCN.RunProcReturn("Exec h_p_Cg_POOrderBill_BeforeUnCheckCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'", "h_p_Cg_POOrderBill_BeforeUnCheckCtrl");
if (ds == null)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + "鍙嶅鏍稿墠鍒ゆ柇澶辫触锛�";
objJsonResult.data = null;
return objJsonResult;
}
if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
objJsonResult.data = null;
return objJsonResult;
@@ -1506,16 +1572,16 @@
//鍙嶅鏍告彁浜bandonCheck
if (oBill.AbandonCheck(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Cg_POOrderBill_AfterUnCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
{
- objJsonResult.code = "1";
- objJsonResult.count = 1;
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
objJsonResult.Message = "鍙嶅鏍告垚鍔�";
objJsonResult.data = null;
return objJsonResult;
}
else
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
objJsonResult.data = null;
return objJsonResult;
@@ -1525,8 +1591,8 @@
}
catch (Exception e)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "瀹℃牳澶辫触鎴栬�呭弽瀹℃牳澶辫触锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
@@ -1545,8 +1611,8 @@
//鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
if (!DBUtility.ClsPub.Security_Log("Cg_POOrderBill_Close", 1, false, user))
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鏃犳潈闄愬叧闂�!";
objJsonResult.data = null;
return objJsonResult;
@@ -1554,8 +1620,8 @@
if (string.IsNullOrWhiteSpace(HInterID))
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "HInterID涓虹┖锛�";
objJsonResult.data = null;
return objJsonResult;
@@ -1566,7 +1632,7 @@
oCN.BeginTran();//寮�濮嬩簨鍔�
//Type 1 鍏抽棴 2 鍙嶅叧闂�
- if (Type == 1)
+ if (Type == TypeConstant.CLOSED)
{
//鍒ゆ柇鍗曟嵁鏄惁宸茬粡鍏抽棴
DataSet ds;
@@ -1574,8 +1640,8 @@
ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦紒";
objJsonResult.data = null;
return objJsonResult;
@@ -1584,16 +1650,16 @@
{
if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘杩涜鍏抽棴!";
objJsonResult.data = null;
return objJsonResult;
}
if (ds.Tables[0].Rows[0]["HChecker"] == null || ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶈兘杩涜鍏抽棴!";
objJsonResult.data = null;
return objJsonResult;
@@ -1601,8 +1667,8 @@
if (ds.Tables[0].Rows[0]["HCloseMan"] != null && ds.Tables[0].Rows[0]["HCloseMan"].ToString() != "")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘鍐嶆鍏抽棴!";
objJsonResult.data = null;
return objJsonResult;
@@ -1610,8 +1676,8 @@
//鍏抽棴鍗曟嵁
if (!BillOld.CloseBill(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
{
- objJsonResult.code = "0";
- objJsonResult.count = 1;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.SUCCEED;
objJsonResult.Message = "鍏抽棴澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
objJsonResult.data = null;
return objJsonResult;
@@ -1628,24 +1694,24 @@
{
if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘杩涜鍏抽棴!";
objJsonResult.data = null;
return objJsonResult;
}
if (ds.Tables[0].Rows[0]["HChecker"] == null || ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶈兘杩涜鍏抽棴!";
objJsonResult.data = null;
return objJsonResult;
}
if (ds.Tables[0].Rows[0]["HCloseMan"] == null || ds.Tables[0].Rows[0]["HCloseMan"].ToString() == "")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍗曟嵁鏈叧闂�!涓嶉渶瑕佸啀鍙嶅叧闂�!";
objJsonResult.data = null;
return objJsonResult;
@@ -1653,8 +1719,8 @@
//鍙嶅叧闂崟鎹�
if (!BillOld.CancelClose(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
{
- objJsonResult.code = "0";
- objJsonResult.count = 1;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.SUCCEED;
objJsonResult.Message = "鍙嶅叧闂け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
objJsonResult.data = null;
return objJsonResult;
@@ -1664,8 +1730,8 @@
oCN.Commit();//鎻愪氦浜嬪姟
- objJsonResult.code = "0";
- objJsonResult.count = 1;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.SUCCEED;
objJsonResult.Message = "鎵ц鎴愬姛锛�";
objJsonResult.data = null;
return objJsonResult; ;
@@ -1673,8 +1739,8 @@
}
catch (Exception e)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
@@ -1702,8 +1768,8 @@
//妫�鏌ユ潈闄�
if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "琛屽叧闂け璐ワ紒鏃犳潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
@@ -1711,8 +1777,8 @@
//HInterID鏁版嵁鍒ゆ柇
if (HInterID <= 0)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "HInterID灏忎簬0锛�";
objJsonResult.data = null;
return objJsonResult;
@@ -1727,24 +1793,26 @@
{
if (oBill.omodel.HDeleteMan.Trim() != "")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘杩涜琛屽叧闂紒";
objJsonResult.data = null;
return objJsonResult;
}
+
if (oBill.omodel.HCloseMan.Trim() != "")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘杩涜琛屽叧闂紒";
objJsonResult.data = null;
return objJsonResult;
}
+
if (oBill.omodel.HChecker.Trim() == "")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶈兘杩涜琛屽叧闂紒";
objJsonResult.data = null;
return objJsonResult;
@@ -1754,29 +1822,29 @@
ds = oCN.RunProcReturn(sql, "Cg_POOrderBillSub");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "璇ヨ鏁版嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
objJsonResult.data = null;
return objJsonResult;
}
- if (IsAudit == 0) //琛屽叧闂垽鏂�
+ if (IsAudit == TypeConstant.LINE_CLOSED) //琛屽叧闂垽鏂�
{
if (ds.Tables[0].Rows[0]["HCloseMan"].ToString().Trim() != "")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "琛屽凡鍏抽棴!涓嶈兘鍐嶆琛屽叧闂紒";
objJsonResult.data = null;
return objJsonResult;
}
}
- if (IsAudit == 1) //琛屽弽鍏抽棴鍒ゆ柇
+ if (IsAudit == TypeConstant.REVERSE_LINE_CLOSED) //琛屽弽鍏抽棴鍒ゆ柇
{
if (ds.Tables[0].Rows[0]["HCloseMan"].ToString().Trim() == "")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "琛屾湭鍏抽棴!涓嶉渶瑕佸啀琛屽弽鍏抽棴锛�";
objJsonResult.data = null;
return objJsonResult;
@@ -1786,8 +1854,8 @@
string temp = ds.Tables[0].Rows[0]["HCloseType"].ToString();
if (ds.Tables[0].Rows[0]["HCloseType"].ToString() == "False")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "琛屽弽鍏抽棴澶辫触!琛屼负鑷姩鍏抽棴锛屼笉鑳借繘琛屾墜鍔ㄥ弽鍏抽棴锛�";
objJsonResult.data = null;
return objJsonResult;
@@ -1796,8 +1864,8 @@
}
else
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
objJsonResult.data = null;
return objJsonResult;
@@ -1805,41 +1873,41 @@
//杩涜闇�瑕佽繘琛岀殑琛屽叧闂�/琛屽弽鍏抽棴鎿嶄綔
- if (IsAudit == 0) //琛屽叧闂彁浜�
+ if (IsAudit == TypeConstant.LINE_CLOSED) //琛屽叧闂彁浜�
{
//琛屽叧闂彁浜�
if (oBill.CloseRow(lngBillKey, HEntryID, oBill.omodel.HBillNo, CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
{
- objJsonResult.code = "1";
- objJsonResult.count = 1;
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
objJsonResult.Message = "琛屽叧闂垚鍔�";
objJsonResult.data = null;
return objJsonResult;
}
else
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "琛屽叧闂け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
objJsonResult.data = null;
return objJsonResult;
}
}
- if (IsAudit == 1) //琛屽弽鍏抽棴鎻愪氦
+ if (IsAudit == TypeConstant.REVERSE_LINE_CLOSED) //琛屽弽鍏抽棴鎻愪氦
{
//琛屽弽鍏抽棴鎻愪氦
if (oBill.CancelRow(lngBillKey, HEntryID, oBill.omodel.HBillNo, CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
{
- objJsonResult.code = "1";
- objJsonResult.count = 1;
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
objJsonResult.Message = "鍙嶅叧闂垚鍔�";
objJsonResult.data = null;
return objJsonResult;
}
else
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍙嶅叧闂け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
objJsonResult.data = null;
return objJsonResult;
@@ -1849,8 +1917,8 @@
}
catch (Exception e)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍏抽棴澶辫触鎴栬�呭弽鍏抽棴澶辫触锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
@@ -1868,8 +1936,8 @@
//鍒ゆ柇鏄惁鏈変綔搴熸潈闄�
if (!DBUtility.ClsPub.Security_Log("Cg_POOrderBill_Drop", 1, false, user))
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鏃犳潈闄愪綔搴�!";
objJsonResult.data = null;
return objJsonResult;
@@ -1877,8 +1945,8 @@
if (string.IsNullOrWhiteSpace(HInterID))
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "HInterID涓虹┖锛�";
objJsonResult.data = null;
return objJsonResult;
@@ -1889,7 +1957,7 @@
oCN.BeginTran();//寮�濮嬩簨鍔�
//Type 1 浣滃簾 2 鍙嶄綔搴�
- if (Type == 1)
+ if (Type == TypeConstant.INVALID)
{
//鍒ゆ柇鍗曟嵁鏄惁宸茬粡浣滃簾
DataSet ds;
@@ -1897,8 +1965,8 @@
ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦紒";
objJsonResult.data = null;
return objJsonResult;
@@ -1907,24 +1975,24 @@
{
if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘杩涜浣滃簾!";
objJsonResult.data = null;
return objJsonResult;
}
if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶉渶瑕佸啀浣滃簾!";
objJsonResult.data = null;
return objJsonResult;
}
if (ds.Tables[0].Rows[0]["HBillStatus"].ToString() == "6" )
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍗曟嵁鍦ㄥ鏍镐腑!涓嶈兘杩涜浣滃簾!";
objJsonResult.data = null;
return objJsonResult;
@@ -1932,8 +2000,8 @@
//浣滃簾鍗曟嵁
if (!BillOld.Cancelltion(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
{
- objJsonResult.code = "0";
- objJsonResult.count = 1;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "浣滃簾澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
objJsonResult.data = null;
return objJsonResult;
@@ -1950,24 +2018,24 @@
{
if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘杩涜浣滃簾!";
objJsonResult.data = null;
return objJsonResult;
}
if (ds.Tables[0].Rows[0]["HDeleteMan"] == null || ds.Tables[0].Rows[0]["HDeleteMan"].ToString() == "")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍗曟嵁鏈綔搴�!涓嶉渶瑕佸啀鍙嶄綔搴�!";
objJsonResult.data = null;
return objJsonResult;
}
if (ds.Tables[0].Rows[0]["HBillStatus"].ToString() == "6")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍗曟嵁鍦ㄥ鏍镐腑!涓嶈兘杩涜浣滃簾!";
objJsonResult.data = null;
return objJsonResult;
@@ -1975,8 +2043,8 @@
//鍙嶄綔搴熷崟鎹�
if (!BillOld.AbandonCancelltion(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
{
- objJsonResult.code = "0";
- objJsonResult.count = 1;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.SUCCEED;
objJsonResult.Message = "鍙嶄綔搴熷け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
objJsonResult.data = null;
return objJsonResult;
@@ -1986,8 +2054,8 @@
oCN.Commit();//鎻愪氦浜嬪姟
- objJsonResult.code = "0";
- objJsonResult.count = 1;
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
objJsonResult.Message = "鎵ц鎴愬姛锛�";
objJsonResult.data = null;
return objJsonResult; ;
@@ -1995,8 +2063,8 @@
}
catch (Exception e)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
@@ -2024,8 +2092,8 @@
DataSet DS = oCn.RunProcReturn("exec h_p_WMS_ERPSourceBillToLocal '" + BillNo + "','" + BillType + "'", "h_p_WMS_ERPSourceBillToLocal");
if (DS == null)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍗曟嵁鍚屾澶辫触";
objJsonResult.data = null;
return objJsonResult;
@@ -2034,16 +2102,16 @@
{
if (DBUtility.ClsPub.isStrNull(DS.Tables[0].Rows[0]["HBack"]) == "2")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "ERP涓笉瀛樺湪璇ュ崟鎹彿";
objJsonResult.data = null;
return objJsonResult;
}
else
{
- objJsonResult.code = "1";
- objJsonResult.count = 1;
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
objJsonResult.Message = "鍗曟嵁鍚屾鎴愬姛";
objJsonResult.data = null;
return objJsonResult;
@@ -2053,8 +2121,8 @@
}
catch (Exception e)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "Exception锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
@@ -2077,8 +2145,8 @@
//鍒ゆ柇鏄惁鐧诲綍鎴愬姛
if (isSuccess < 0)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = loginRet;
objJsonResult.data = null;
return objJsonResult;
@@ -2089,8 +2157,8 @@
//鍒ゆ柇鏁版嵁鏄惁鑾峰彇鎴愬姛
if (_saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "閲戣澏閲囪喘璁㈠崟鍚屾澶辫触jsonRoot锛�" + _result;
objJsonResult.data = null;
return objJsonResult;
@@ -2298,8 +2366,8 @@
}
- objJsonResult.code = "1";
- objJsonResult.count = 1;
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
objJsonResult.Message = "鍗曟嵁鍚屾鎴愬姛锛�";
objJsonResult.data = null;
return objJsonResult;
@@ -2309,8 +2377,8 @@
}
else
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍗曟嵁璇诲彇澶辫触锛�";
objJsonResult.data = null;
return objJsonResult;
@@ -2329,16 +2397,16 @@
ds = oCN.RunProcReturn("select * from h_v_IF_POOrderBillList where hmainid =" + HInterID + " and hsubid = " + HSubID, "h_v_IF_POOrderBillList");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鏈煡璇㈠埌婧愬崟淇℃伅锛�";
objJsonResult.data = null;
return objJsonResult;
}
else
{
- objJsonResult.code = "1";
- objJsonResult.count = 1;
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
return objJsonResult;
@@ -2346,8 +2414,8 @@
}
catch (Exception e)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "Exception锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
@@ -2367,8 +2435,8 @@
if (!DBUtility.ClsPub.Security_Log("Cg_POOrderBillQuery", 1, false, user))
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鏃犳潈闄愭煡鐪�!";
objJsonResult.data = null;
return objJsonResult;
@@ -2388,8 +2456,8 @@
columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
}
- objJsonResult.code = "1";
- objJsonResult.count = 1;
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
objJsonResult.list = columnNameList;
@@ -2397,8 +2465,8 @@
}
catch (Exception e)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "Exception锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
@@ -2419,8 +2487,8 @@
if (!DBUtility.ClsPub.Security_Log("Cg_POOrderBillQuery", 1, false, user))
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鏃犳潈闄愭煡鐪�!";
objJsonResult.data = null;
return objJsonResult;
@@ -2438,8 +2506,8 @@
columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
}
- objJsonResult.code = "1";
- objJsonResult.count = 1;
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
objJsonResult.list = columnNameList;
@@ -2447,8 +2515,8 @@
}
catch (Exception e)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "Exception锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
@@ -2471,8 +2539,8 @@
{
if (oBill.omodel.HBillStatus != 6)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍗曟嵁鏈湪瀹℃牳涓笉鑳介┏鍥�";
objJsonResult.data = null;
return objJsonResult;
@@ -2480,16 +2548,16 @@
//鍙戣捣椹冲洖
if (oBill.RejectCheckFlowProgress(lngBillKey, oBill.omodel.HBillNo,CurUserID, ref DBUtility.ClsPub.sExeReturnInfo) == true)
{
- objJsonResult.code = "1";
- objJsonResult.count = 1;
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
objJsonResult.Message = "椹冲洖鎴愬姛";
objJsonResult.data = null;
return objJsonResult;
}
else
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "椹冲洖澶辫触澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
objJsonResult.data = null;
return objJsonResult;
@@ -2497,8 +2565,8 @@
}
else
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
objJsonResult.data = null;
return objJsonResult;
@@ -2508,8 +2576,8 @@
catch (Exception e)
{
oCN.RollBack();
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "Exception锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
@@ -2538,8 +2606,8 @@
//HInterID鏁版嵁鍒ゆ柇
if (HInterID <= 0)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "HInterID灏忎簬0锛�";
objJsonResult.data = null;
return objJsonResult;
@@ -2553,16 +2621,16 @@
//鍙戣捣瀹℃壒
if (oBill.startCheckFlow(lngBillKey,ref DBUtility.ClsPub.sExeReturnInfo) == true)
{
- objJsonResult.code = "1";
- objJsonResult.count = 1;
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
objJsonResult.Message = "鍙戣捣瀹℃壒鎴愬姛";
objJsonResult.data = null;
return objJsonResult;
}
else
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍙戣捣瀹℃壒澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
objJsonResult.data = null;
return objJsonResult;
@@ -2570,8 +2638,8 @@
}
catch (Exception e)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍙戣捣瀹℃壒澶辫触澶辫触锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
@@ -2608,8 +2676,8 @@
//HInterID鏁版嵁鍒ゆ柇
if (HInterID <= 0)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "HInterID灏忎簬0锛�";
objJsonResult.data = null;
return objJsonResult;
@@ -2625,30 +2693,30 @@
{
if (oBill.omodel.HCloseMan.Trim() != "")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘鍐嶆瀹℃牳锛�";
objJsonResult.data = null;
return objJsonResult;
}
if (oBill.omodel.HDeleteMan.Trim() != "")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘鍐嶆瀹℃牳锛�";
objJsonResult.data = null;
return objJsonResult;
}
- if (IsAudit == 0) //瀹℃牳鍒ゆ柇
+ if (IsAudit == TypeConstant.AUDIT) //瀹℃牳鍒ゆ柇
{
//鍒ゆ柇鏄惁宸茬粡鍙戣捣瀹℃壒
string sql0 = "select * from Xt_BillCheckFlowStatus where HBillInterID = " + lngBillKey + " and HBillTypeID = '" + oBill.BillType + "'";
DataSet ds0 = oCN.RunProcReturn(sql0, "Xt_BillCheckFlowStatus");
if (ds0 != null && ds0.Tables[0].Rows.Count == 0)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:鍗曟嵁鏈彂璧峰鎵癸紒";
objJsonResult.data = null;
return objJsonResult;
@@ -2657,22 +2725,22 @@
//鍒ゆ柇鍗曟嵁褰撳墠鐘舵��
if (oBill.omodel.HChecker.Trim() != "")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:鍗曟嵁宸插畬鎴愬鏍�!涓嶈兘缁х画瀹℃牳锛�";
objJsonResult.data = null;
return objJsonResult;
}
}
- if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ if (IsAudit == TypeConstant.REVERSE_AUDIT) //鍙嶅鏍稿垽鏂�
{
//鍒ゆ柇鏄惁瀛樺湪瀹℃牳杩囩殑椤圭洰
string sql0 = "select * from Xt_BillCheckFlowStatus where HBillInterID = " + lngBillKey + " and HBillTypeID = '" + oBill.BillType + "' and ISNULL(HChecker,'') <> ''";
DataSet ds0 = oCN.RunProcReturn(sql0, "Xt_BillCheckFlowStatus");
if (ds0 != null && ds0.Tables[0].Rows.Count == 0)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:鍗曟嵁涓嶅瓨鍦ㄥ凡缁忓鏍哥殑椤圭洰锛侊紒";
objJsonResult.data = null;
return objJsonResult;
@@ -2681,8 +2749,8 @@
}
else
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
objJsonResult.data = null;
return objJsonResult;
@@ -2691,7 +2759,7 @@
oCN.BeginTran();
//杩涜闇�瑕佽繘琛岀殑瀹℃牳/鍙嶅鏍告搷浣�
- if (IsAudit == 0) //瀹℃牳鎻愪氦
+ if (IsAudit == TypeConstant.AUDIT) //瀹℃牳鎻愪氦
{
#region 瀹℃牳鍓嶇殑鐩稿叧鍒ゆ柇
//瀹℃牳鍓嶆帶鍒�=========================================
@@ -2741,8 +2809,8 @@
DataSet ds01 = oCN.RunProcReturn(sql01, "Xt_CheckUserRight");
if (ds01.Tables[0].Rows.Count == 0)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:鐢ㄦ埛鏃犲綋鍓嶅鏍搁」鐩殑瀹℃牳鏉冮檺锛�";
objJsonResult.data = null;
return objJsonResult;
@@ -2786,8 +2854,8 @@
oCN.RunProc(sql04);
- objJsonResult.code = "1";
- objJsonResult.count = 1;
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
objJsonResult.Message = "瀹℃牳鎴愬姛";
objJsonResult.data = null;
}
@@ -2803,15 +2871,15 @@
//鏇存柊鍗曟嵁鐨勫崟鎹姸鎬�
if (oBill.CheckBill(oCN, oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Cg_POOrderBill_AfterCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
{
- objJsonResult.code = "1";
- objJsonResult.count = 1;
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
objJsonResult.Message = "瀹℃牳鎴愬姛";
objJsonResult.data = null;
}
else
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
objJsonResult.data = null;
@@ -2820,23 +2888,23 @@
}
}
}
- if (IsAudit == 1) //鍙嶅鏍告彁浜�
+ if (IsAudit == TypeConstant.REVERSE_AUDIT) //鍙嶅鏍告彁浜�
{
#region 鍙嶅鏍稿墠鐨勭浉鍏冲垽鏂�
//鍙嶅鏍稿墠鎺у埗=========================================
DataSet ds = oCN.RunProcReturn("Exec h_p_Cg_POOrderBill_BeforeUnCheckCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'", "h_p_Cg_POOrderBill_BeforeUnCheckCtrl");
if (ds == null)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + "鍙嶅鏍稿墠鍒ゆ柇澶辫触锛�";
objJsonResult.data = null;
return objJsonResult;
}
if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
objJsonResult.data = null;
return objJsonResult;
@@ -2864,8 +2932,8 @@
DataSet ds0 = oCN.RunProcReturn(sql0, "Xt_BillCheckFlowStatus");
if (ds0 == null || ds0.Tables[0].Rows.Count == 0)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:鏈彂璧峰鎵癸紒";
objJsonResult.data = null;
return objJsonResult;
@@ -2905,8 +2973,8 @@
DataSet ds01 = oCN.RunProcReturn(sql01, "Xt_CheckUserRight");
if (ds01.Tables[0].Rows.Count == 0)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:鐢ㄦ埛鏃犲綋鍓嶅鏍搁」鐩殑瀹℃牳鏉冮檺锛�";
objJsonResult.data = null;
return objJsonResult;
@@ -2925,8 +2993,8 @@
oCN.RunProc(sql04);
- objJsonResult.code = "1";
- objJsonResult.count = 1;
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
objJsonResult.Message = "瀹℃牳鎴愬姛";
objJsonResult.data = null;
}
@@ -2939,15 +3007,15 @@
//鏇存柊鍗曟嵁涓昏〃鐨勫鎵规祦鏁版嵁
string sql04 = "update " + oBill.MvarItemKey + " set HCheckItemNowID=" + HCheckItemNowID + ",HCheckItemNextID=" + HCheckItemNextID + ",HBillStatus=6 "+" where HInterID = " + lngBillKey;
oCN.RunProc(sql04);
- objJsonResult.code = "1";
- objJsonResult.count = 1;
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
objJsonResult.Message = "鍙嶅鏍告垚鍔�";
objJsonResult.data = null;
}
else
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
objJsonResult.data = null;
@@ -2962,8 +3030,8 @@
}
catch (Exception e)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "瀹℃牳澶辫触鎴栬�呭弽瀹℃牳澶辫触锛�" + e.ToString();
objJsonResult.data = null;
@@ -2985,8 +3053,8 @@
if (!DBUtility.ClsPub.Security_Log("Cg_POOrderBillQuery", 1, false, user))
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鏃犳潈闄愭煡鐪�!";
objJsonResult.data = null;
return objJsonResult;
@@ -3011,8 +3079,8 @@
columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
}
- objJsonResult.code = "1";
- objJsonResult.count = 1;
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
objJsonResult.list = columnNameList;
@@ -3020,8 +3088,8 @@
}
catch (Exception e)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "Exception锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
@@ -3041,15 +3109,15 @@
if (!DBUtility.ClsPub.Security_Log("Cg_POOrderBillQuery", 1, false, user))
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鏃犳潈闄愭煡鐪�!";
objJsonResult.data = null;
return objJsonResult;
}
string sql = "select * from h_v_Cg_POOrderBillQuerySub where hmainid = "+ hmainid;
- ds = oCN.RunProcReturn(sql + " order by hsubid desc", "h_v_Cg_POOrderBillQuerySub");
+ ds = oCN.RunProcReturn(sql + " order by hsubid ASC", "h_v_Cg_POOrderBillQuerySub");
foreach (DataColumn col in ds.Tables[0].Columns)
@@ -3059,11 +3127,106 @@
columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
}
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 閲囪喘璁㈠崟涓嬫帹鏌ヨ鍒楄〃
+ [Route("Cg_POOrderBill/PushList")]
+ [HttpGet]
+ public object PushList(string HBillNo, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+
+ if (!DBUtility.ClsPub.Security_Log("Cg_POOrderBillQuery", 1, false, user))
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "鏃犳潈闄愭煡鐪�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ string sql = "select * from h_v_IF_POOrderBillList where 鍗曟嵁鍙� = '" + HBillNo + "' and 鐘舵�� = '宸插鏍�' and 鏈叧鑱旀暟閲� > 0";
+
+
+ ds = oCN.RunProcReturn(sql, "h_v_IF_POOrderBillList");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "鎵句笉鍒扮鍚堟潯浠跺崟鎹�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鍑哄簱姹囨�� 鏌ヨ
+ [Route("Xs_SeOrderOutStockSumReport/Xs_SeOrderOutStockSumReportList")]
+ [HttpGet]
+ public object Xs_SeOrderOutStockSumReportList(string sWhere)
+ {
+ try
+ {
+ //鍙嶅簭鍒楀寲浼犻�掔殑鍊�
+
+ ds = oCN.RunProcReturn($"exec h_p_Xs_SeOrderOutStockSumReport " + sWhere + "", "h_p_Xs_SeOrderOutStockSumReport");
+
+ List<object> listCol = new List<object>();
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string str = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ listCol.Add(JsonConvert.DeserializeObject(str));
+ }
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
- objJsonResult.list = columnNameList;
+ objJsonResult.list = listCol;
return objJsonResult;
}
catch (Exception e)
@@ -3076,6 +3239,44 @@
}
}
#endregion
+
+ #region 鍏ュ簱姹囨�� 鏌ヨ
+ [Route("Cg_PoOrderInStockSumReport/Cg_PoOrderInStockSumReportList")]
+ [HttpGet]
+ public object Cg_PoOrderInStockSumReportList(string sWhere)
+ {
+ try
+ {
+ //鍙嶅簭鍒楀寲浼犻�掔殑鍊�
+
+ ds = oCN.RunProcReturn($"exec h_p_Cg_PoOrderInStockSumReport " + sWhere + "", "h_p_Cg_PoOrderInStockSumReport");
+
+ List<object> listCol = new List<object>();
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string str = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ listCol.Add(JsonConvert.DeserializeObject(str));
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = listCol;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
}
}
\ No newline at end of file
--
Gitblit v1.9.1