From 55b825684cdead07465d231d3d215225086ec5b6 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 24 二月 2023 15:01:54 +0800
Subject: [PATCH] 税组合，保存功能未完善
---
DAL/DAL.csproj | 1
DAL/基础资料/公用基础资料/ClsGy_TaxMIX_Ctl.cs | 121 +++++++
WebAPI/Controllers/基础资料/基础资料/Gy_TaxMIXController.cs | 834 ++++++++++++++++++++++++++++++++-------------------
3 files changed, 645 insertions(+), 311 deletions(-)
diff --git a/DAL/DAL.csproj b/DAL/DAL.csproj
index a6f36bb..30c945a 100644
--- a/DAL/DAL.csproj
+++ b/DAL/DAL.csproj
@@ -91,6 +91,7 @@
<Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_Operator_Ctl.cs" />
<Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_RateType_Ctl.cs" />
<Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_Staff_Ctl.cs" />
+ <Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_TaxMIX_Ctl.cs" />
<Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_TaxRate_Ctl.cs" />
<Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_RecCondition_Ctl.cs" />
<Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_FactoryDayOff_Ctl.cs" />
diff --git "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_TaxMIX_Ctl.cs" "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_TaxMIX_Ctl.cs"
new file mode 100644
index 0000000..c6dc48e
--- /dev/null
+++ "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_TaxMIX_Ctl.cs"
@@ -0,0 +1,121 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using System.Data;
+
+namespace DAL
+{
+ public class ClsGy_TaxMIX_Ctl : DBUtility.ClsGy_Base_Ctl
+ {
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ //鍘熶唬鐮� 鐢ㄤ簬 鏇挎崲瀛愰」鐩�
+ public string HOldNumber;
+ public Model.ClsGy_TaxMIXMain_Model oModel = new Model.ClsGy_TaxMIXMain_Model();
+ public List<Model.ClsGy_TaxMIXSub_Model> DetailColl = new List<Model.ClsGy_TaxMIXSub_Model>();
+ //鏂板
+ public override bool AddNew()
+ {
+
+ try
+ {
+ oCn.BeginTran();
+ oCn.RunProc("Insert into Gy_TaxMIXMain" +
+ " (HNumber,HName,HShortNumber,HParentID" +
+ ",HLevel,HEndFlag,HStopflag,HRemark,HUseFlag,HUSEORGID,HCREATEORGID" +
+ ",HMakeEmp,HMakeTime,HCheckEmp,HModifyEmp,HStopEmp) " +
+ " Values('" + oModel.HNumber + "','" + oModel.HName + "','" + oModel.HShortNumber + "'," + oModel.HParentID.ToString() +
+ "," + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) + ",'" + oModel.HRemark +
+ "','" + oModel.HUseFlag + "'," + oModel.HUSEORGID + "," + oModel.HCREATEORGID + ",'" + oModel.HMakeEmp + "','" + System.DateTime.Now + "','" + oModel.HCheckEmp + "','" + oModel.HModifyEmp + "','" + oModel.HStopEmp + "'" + ")", ref DBUtility.ClsPub.sExeReturnInfo);
+
+ //鎻掑叆瀛愯〃
+ foreach (Model.ClsGy_TaxMIXSub_Model oSub in DetailColl)
+ {
+ oCn.RunProc("Insert into Gy_TaxMIXSub " +
+ " (HTAXBENCHMARK,FTAXRATEID,FTAXBENCHMARKCORRVALUE,HTaxMixID" +
+ ") values("
+ + "'" + oSub.HTAXBENCHMARK + "'," + oSub.FTAXRATEID + ",'" + oSub.FTAXBENCHMARKCORRVALUE + "'," + oModel.HItemID +
+ ") ");
+ }
+
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ oCn.RunProc("Update Gy_TaxMIXMain" + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+
+ //淇敼
+ public override bool ModifyByID(Int64 sItemID)
+ {
+ try
+ {
+ oCn.BeginTran();
+ oCn.RunProc("Update " + MvarItemKey + " set " +
+ " HNumber='" + oModel.HNumber + "'" +
+ ",HName='" + oModel.HName + "'" +
+ ",HShortNumber='" + oModel.HShortNumber + "'" +
+ ",HHelpCode='" + oModel.HHelpCode + "'" +
+ ",HLevel=" + oModel.HLevel.ToString() +
+ ",HParentID=" + oModel.HParentID.ToString() +
+ ",HEndflag=" + Convert.ToString(oModel.HEndFlag ? 1 : 0) +
+ ",HStopflag=" + Convert.ToString(oModel.HStopflag ? 1 : 0) +
+ ",HRemark= '" + oModel.HRemark + "' Where HItemID=" + sItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+
+ oCn.RunProc("delete from Gy_TaxMIXSub where HTaxMixID = " + oModel.HItemID);
+
+ //鎻掑叆瀛愯〃
+ foreach (Model.ClsGy_TaxMIXSub_Model oSub in DetailColl)
+ {
+ oCn.RunProc("Insert into Gy_TaxMIXSub " +
+ " (HTAXBENCHMARK,FTAXRATEID,FTAXBENCHMARKCORRVALUE,HTaxMixID" +
+ ") values("
+ + "'" + oSub.HTAXBENCHMARK + "'," + oSub.FTAXRATEID + ",'" + oSub.FTAXBENCHMARKCORRVALUE + "'," + oModel.HItemID +
+ ") ");
+ }
+
+ //灏嗕笂绾� 涓洪潪鏈骇
+ oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ //鏍规嵁浠ｇ爜鍒ゆ柇淇℃伅
+ public override bool HavParentCode(string sCode, Int64 sItemID)
+ {
+ DataSet DS;
+ try
+ {
+ DS = oCn.RunProcReturn("Select * from " + MvarItemKey + " Where HStopflag=0 and HNumber='" + sCode + "' and HItemID<>" + sItemID, MvarItemKey, ref Pub_Class.ClsPub.sExeReturnInfo);
+ if (DS.Tables[0].Rows.Count == 0)
+ return false;
+ else
+ {
+ oModel.HItemID = Convert.ToInt64(DS.Tables[0].Rows[0]["HItemID"]);
+ return true;
+ }
+ }
+ catch (Exception e)
+ {
+ throw (e);
+ }
+ }
+ //鏋勯�犲嚱鏁�
+ public ClsGy_TaxMIX_Ctl()
+ {
+ MvarItemKey = "Gy_TaxMIXMain";
+ MvarReportTitle = "绋庣粍鍚堣缃�";
+ oModel = new Model.ClsGy_TaxMIXMain_Model();
+ }
+ }
+}
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TaxMIXController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TaxMIXController.cs"
index 5873a83..de562b1 100644
--- "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TaxMIXController.cs"
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TaxMIXController.cs"
@@ -1,4 +1,5 @@
-锘縰sing Model;
+锘縰sing DBUtility;
+using Model;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
@@ -14,334 +15,338 @@
{
public class Gy_TaxMIXController : ApiController
{
+ //鑾峰彇绯荤粺鍙傛暟
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+
private json objJsonResult = new json();
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
DataSet ds;
- //#region 绋庣巼缁勫悎 鍒楄〃
- //[Route("Gy_TaxMIX/TaxMIXList")]
- //[HttpGet]
- //public object TaxMIXList(string sWhere, string user, string Organization)
- //{
- // try
- // {
- // List<object> columnNameList = new List<object>();
- // //缂栬緫鏉冮檺
- // //if (!DBUtility.ClsPub.Security_Log_second("Gy_TaxRate_Query", 1, false, user))
- // //{
- // // objJsonResult.code = "0";
- // // objJsonResult.count = 0;
- // // objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
- // // objJsonResult.data = null;
- // // return objJsonResult;
- // //}
- // string sql1 = string.Format(@"select * from h_v_Gy_TaxMIXList where 浣跨敤缁勭粐='" + Organization + "'");
+ #region 绋庣巼缁勫悎 鍒楄〃
+ [Route("Gy_TaxMIX/TaxMIXList")]
+ [HttpGet]
+ public object TaxMIXList(string sWhere, string user, string Organization)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //缂栬緫鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log_second("Gy_TaxRate_Query", 1, false, user))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ string sql1 = string.Format(@"select * from h_v_Gy_TaxMIXList where 浣跨敤缁勭粐='" + Organization + "'");
- // string sql = sql1 + sWhere;
- // ds = oCN.RunProcReturn(sql, "h_v_Gy_TaxMIXList");
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_TaxMIXList");
- // //娣诲姞鍒楀悕
- // 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鍒楀璞＄殑鍒楀悕
- // }
+ //娣诲姞鍒楀悕
+ 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 = "1";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "Sucess锛�";
- // objJsonResult.list = columnNameList;
- // objJsonResult.data = ds.Tables[0];
- // return objJsonResult;
- // }
- // catch (Exception e)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "Exception锛�" + e.ToString();
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- //}
- //#endregion
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
- //#region 绋庣巼缁勫悎 缂栬緫
- //[Route("Gy_TaxMIX/TaxMIXEdit")]
- //[HttpPost]
- //public object TaxMIXEdit([FromBody] JObject msg)
- //{
- // DataSet ds;
- // var _value = msg["msg"].ToString();
- // string msg3 = _value.ToString();
- // string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
- // string msg1 = sArray[0].ToString();
- // string msg2 = sArray[1].ToString();
- // //string msg_HUSEORGID = sArray[2].ToString();
- // Int64 HItemID = 0;
- // SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ #region 绋庣巼缁勫悎 缂栬緫
+ [Route("Gy_TaxMIX/TaxMIXEdit")]
+ [HttpPost]
+ public object TaxMIXEdit([FromBody] JObject msg)
+ {
+ DataSet ds;
+ var _value = msg["msg"].ToString();
+ string msg3 = _value.ToString();
+ string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg1 = sArray[0].ToString();
+ string msg2 = sArray[1].ToString();
+ //string msg_HUSEORGID = sArray[2].ToString();
+ Int64 HItemID = 0;
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- // //缂栬緫鏉冮檺
- // //if (!DBUtility.ClsPub.Security_Log_second("Gy_TaxRate_Edit", 1, false, msg2))
- // //{
- // // objJsonResult.code = "0";
- // // objJsonResult.count = 0;
- // // objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
- // // objJsonResult.data = null;
- // // return objJsonResult;
- // //}
+ //缂栬緫鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log_second("Gy_TaxRate_Edit", 1, false, msg2))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
- // //鑾峰彇鏈�澶D鍊艰祴鍊�
- // //DataSet Maxds = oCN.RunProcReturn("select MAX(HItemID) HItemID from Gy_TaxRate ", "Gy_TaxRate");
- // //if (Maxds != null || Maxds.Tables[0].Rows.Count > 0)
- // //{
- // // //HItemID= Maxds.Tables[0].Rows[0]["HItemID"]
- // // var maxid = Convert.ToInt32((Maxds.Tables[0].Rows[0]["HItemID"].ToString()==""?0: Maxds.Tables[0].Rows[0]["HItemID"]));
- // // maxid += 1;
- // // HItemID = maxid;
- // //}
- // ListModels oListModels = new ListModels();
+ //鑾峰彇鏈�澶D鍊艰祴鍊�
+ //DataSet Maxds = oCN.RunProcReturn("select MAX(HItemID) HItemID from Gy_TaxRate ", "Gy_TaxRate");
+ //if (Maxds != null || Maxds.Tables[0].Rows.Count > 0)
+ //{
+ // //HItemID= Maxds.Tables[0].Rows[0]["HItemID"]
+ // var maxid = Convert.ToInt32((Maxds.Tables[0].Rows[0]["HItemID"].ToString()==""?0: Maxds.Tables[0].Rows[0]["HItemID"]));
+ // maxid += 1;
+ // HItemID = maxid;
+ //}
+ ListModels oListModels = new ListModels();
- // try
- // {
- // DAL.ClsGy_TaxMIX_Ctl oBill = new DAL.ClsGy_TaxMIX_Ctl();
- // List<Model.ClsGy_TaxMIX_Model> lsmain = new List<Model.ClsGy_TaxMIX_Model>();
- // msg1 = msg1.Replace("\\", "");
- // msg1 = msg1.Replace("\n", ""); //\n
- // lsmain = oListModels.getObjectByJson_Gy_TaxMIX(msg1);
- // foreach (Model.ClsGy_TaxMIX_Model oItem in lsmain)
- // {
- // if (oItem.HNumber.Trim() == "")
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮佷笉鑳戒负绌猴紒";
- // objJsonResult.data = 1;
- // return objJsonResult;
- // }
- // if (oItem.HName.Trim() == "")
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "淇濆瓨澶辫触锛佸悕绉颁笉鑳戒负绌猴紒";
- // objJsonResult.data = 1;
- // return objJsonResult;
- // }
+ try
+ {
+ DAL.ClsGy_TaxMIX_Ctl oBill = new DAL.ClsGy_TaxMIX_Ctl();
+ List<Model.ClsGy_TaxMIXMain_Model> lsmain = new List<Model.ClsGy_TaxMIXMain_Model>();
+ msg1 = msg1.Replace("\\", "");
+ msg1 = msg1.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_Gy_TaxMIXMain(msg1);
+ foreach (Model.ClsGy_TaxMIXMain_Model oItem in lsmain)
+ {
+ if (oItem.HNumber.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮佷笉鑳戒负绌猴紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (oItem.HName.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佸悕绉颁笉鑳戒负绌猴紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
- // //鏌ヨ鏁版嵁涓槸鍚﹀瓨鍦ㄩ噸澶嶄唬鐮�
- // ds = oCN.RunProcReturn("select * from Gy_TaxMIX where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_TaxMIX");
- // if (oItem.HItemID == 0)
- // {
- // if (ds.Tables[0].Rows.Count > 0)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮侀噸澶嶏紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // }
- // else
- // {
- // if (ds.Tables[0].Rows.Count > 0)
- // {
- // if (ds.Tables[0].Rows[0]["HItemID"].ToString() != oItem.HItemID.ToString())
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮侀噸澶嶏紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // }
- // }
+ //鏌ヨ鏁版嵁涓槸鍚﹀瓨鍦ㄩ噸澶嶄唬鐮�
+ ds = oCN.RunProcReturn("select * from Gy_TaxMIXMain where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_TaxMIXMain");
+ if (oItem.HItemID == 0)
+ {
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮侀噸澶嶏紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["HItemID"].ToString() != oItem.HItemID.ToString())
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮侀噸澶嶏紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
- // //鏂板鏃跺垽鏂�
- // #region 鐖剁骇鏍￠獙鏂规硶锛坅pi璋冪敤鍏堟敞閲婃帀锛岋級
- // /*
- // if (oItem.HItemID == 0)
- // {
- // if (ds == null || ds.Tables[0].Rows.Count > 0)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮侀噸澶嶏紒";
- // objJsonResult.data = 1;
- // return objJsonResult;
- // }
- // //妫�鏌ョ埗绾ф槸鍚﹀瓨鍦�
- // string sParent;
- // sParent = DBUtility.ClsPub.GetParentCode(oItem.HNumber.Trim());
- // if (sParent.Trim() == "")
- // {
- // oBill.oModel.HParentID = 0;
- // }
- // else
- // {
- // if (oBill.HavParentCode(sParent.Trim(), HItemID))
- // {
- // oBill.oModel.HParentID = oBill.oModel.HItemID;
- // }
- // else
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "淇濆瓨澶辫触锛佷笂绾т唬鐮佷笉瀛樺湪鎴栬绂佺敤锛�";
- // objJsonResult.data = 1;
- // return objJsonResult;
- // }
- // }
- // }
- // else//缂栬緫鏃跺垽鏂�
- // {
- // //妫�鏌ョ埗绾ф槸鍚﹀瓨鍦�
- // string sParent;
- // sParent = DBUtility.ClsPub.GetParentCode(oItem.HNumber.Trim());
- // if (sParent.Trim() == "")
- // {
- // oBill.oModel.HParentID = 0;
- // }
- // else
- // {
- // if (oBill.HavParentCode(sParent.Trim(), oItem.HItemID))
- // {
- // oBill.oModel.HParentID = oBill.oModel.HItemID;
- // }
- // else
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "淇濆瓨澶辫触锛佷笂绾т唬鐮佷笉瀛樺湪鎴栬绂佺敤锛�";
- // objJsonResult.data = 1;
- // return objJsonResult;
- // }
- // }
- // }
- // */
- // #endregion
- // //寰楀埌鐭唬鐮�
- // string sShortNumber;
- // sShortNumber = DBUtility.ClsPub.GetShortNumber(oItem.HNumber.Trim());
- // if (sShortNumber.Trim() == "")
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "淇濆瓨澶辫触锛佺煭浠ｇ爜涓虹┖锛�";
- // objJsonResult.data = 1;
- // return objJsonResult;
- // }
- // //oItem.HUSEORGID = Convert.ToInt32(msg_HUSEORGID); //缁勭粐id
- // oItem.HShortNumber = sShortNumber;//鐭唬鐮�
- // oItem.HEndFlag = true;//鏈骇鏍囧織
- // oItem.HLevel = 1; //绛夌骇 DBUtility.ClsPub.GetLevel(oItem.HNumber.Trim())
- // oBill.oModel = oItem;
- // }
- // //淇濆瓨
- // //淇濆瓨瀹屾瘯鍚庡鐞�
- // bool bResult;
- // if (oBill.oModel.HItemID == 0)
- // {
- // bResult = oBill.AddNew();
- // }
- // else
- // {
- // bResult = oBill.ModifyByID(oBill.oModel.HItemID);
- // }
- // if (bResult)
- // {
- // objJsonResult.code = "1";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
- // //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
- // objJsonResult.data = 1;
- // return objJsonResult;
- // }
- // else
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
- // objJsonResult.data = 1;
- // return objJsonResult;
- // }
- // }
- // catch (Exception e)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
- // objJsonResult.data = 1;
- // return objJsonResult;
- // }
- //}
- //#endregion
+ //鏂板鏃跺垽鏂�
+ #region 鐖剁骇鏍￠獙鏂规硶锛坅pi璋冪敤鍏堟敞閲婃帀锛岋級
+ /*
+ if (oItem.HItemID == 0)
+ {
+ if (ds == null || ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮侀噸澶嶏紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //妫�鏌ョ埗绾ф槸鍚﹀瓨鍦�
+ string sParent;
+ sParent = DBUtility.ClsPub.GetParentCode(oItem.HNumber.Trim());
+ if (sParent.Trim() == "")
+ {
+ oBill.oModel.HParentID = 0;
+ }
+ else
+ {
+ if (oBill.HavParentCode(sParent.Trim(), HItemID))
+ {
+ oBill.oModel.HParentID = oBill.oModel.HItemID;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷笂绾т唬鐮佷笉瀛樺湪鎴栬绂佺敤锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ }
+ else//缂栬緫鏃跺垽鏂�
+ {
+ //妫�鏌ョ埗绾ф槸鍚﹀瓨鍦�
+ string sParent;
+ sParent = DBUtility.ClsPub.GetParentCode(oItem.HNumber.Trim());
+ if (sParent.Trim() == "")
+ {
+ oBill.oModel.HParentID = 0;
+ }
+ else
+ {
+ if (oBill.HavParentCode(sParent.Trim(), oItem.HItemID))
+ {
+ oBill.oModel.HParentID = oBill.oModel.HItemID;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷笂绾т唬鐮佷笉瀛樺湪鎴栬绂佺敤锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ }
+ */
+ #endregion
+ //寰楀埌鐭唬鐮�
+ string sShortNumber;
+ sShortNumber = DBUtility.ClsPub.GetShortNumber(oItem.HNumber.Trim());
+ if (sShortNumber.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佺煭浠ｇ爜涓虹┖锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //oItem.HUSEORGID = Convert.ToInt32(msg_HUSEORGID); //缁勭粐id
+ oItem.HShortNumber = sShortNumber;//鐭唬鐮�
+ oItem.HEndFlag = true;//鏈骇鏍囧織
+ oItem.HLevel = 1; //绛夌骇 DBUtility.ClsPub.GetLevel(oItem.HNumber.Trim())
+ oBill.oModel = oItem;
+ }
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (oBill.oModel.HItemID == 0)
+ {
+ bResult = oBill.AddNew();
+ }
+ else
+ {
+ bResult = oBill.ModifyByID(oBill.oModel.HItemID);
+ }
+ if (bResult)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
//#region 绋庣巼缁勫悎 鍒犻櫎
- //[Route("Gy_TaxMIX/Delete")]
- //[HttpGet]
- //public object Delete(string HItemID, string user)
- //{
- // DataSet ds;
- // try
- // {
- // SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- // //鍒犻櫎鏉冮檺
- // //if (!DBUtility.ClsPub.Security_Log("Gy_TaxRate_Drop", 1, false, user))
- // //{
- // // objJsonResult.code = "0";
- // // objJsonResult.count = 0;
- // // objJsonResult.Message = "鏃犲垹闄ゆ潈闄�";
- // // objJsonResult.data = null;
- // // return objJsonResult;
- // //}
- // if (string.IsNullOrWhiteSpace(HItemID))
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "HItemID涓虹┖锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // oCN.BeginTran();//寮�濮嬩簨鍔�
- // ds = oCN.RunProcReturn("select * from Gy_TaxMIX where HItemID=" + HItemID, "Gy_TaxMIX");
- // if (ds == null || ds.Tables[0].Rows.Count == 0)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁鏁版嵁锛屾棤娉曞垹闄わ紒";
- // objJsonResult.data = null;
- // return objJsonResult; ;
- // }
- // var HStopflag = Convert.ToBoolean(ds.Tables[0].Rows[0]["HStopflag"]);
- // if (HStopflag)
- // {
- // oCN.RollBack();//鍥炴粴浜嬪姟
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鏁版嵁宸茬鐢ㄦ棤娉曞垹闄わ紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
+ [Route("Gy_TaxMIX/Delete")]
+ [HttpGet]
+ public object Delete(string HItemID, string user)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ //鍒犻櫎鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log("Gy_TaxRate_Drop", 1, false, user))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犲垹闄ゆ潈闄�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ if (string.IsNullOrWhiteSpace(HItemID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HItemID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+ ds = oCN.RunProcReturn("select * from Gy_TaxMIXMain where HItemID=" + HItemID, "Gy_TaxMIXMain");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鏁版嵁锛屾棤娉曞垹闄わ紒";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ var HStopflag = Convert.ToBoolean(ds.Tables[0].Rows[0]["HStopflag"]);
+ if (HStopflag)
+ {
+ oCN.RollBack();//鍥炴粴浜嬪姟
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏁版嵁宸茬鐢ㄦ棤娉曞垹闄わ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
- // oCN.RunProc("delete from Gy_TaxMIX where HItemID=" + HItemID);
- // oCN.Commit();//鎻愪氦浜嬪姟
- // objJsonResult.code = "0";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "* 鏁版嵁鍒犻櫎鎴愬姛锛�";
- // objJsonResult.data = null;
- // return objJsonResult; ;
+ oCN.RunProc("delete from Gy_TaxMIXMain where HItemID=" + HItemID);
+ oCN.RunProc("delete from Gy_TaxMIXSub where HTaxMixID=" + HItemID);
+ oCN.Commit();//鎻愪氦浜嬪姟
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "* 鏁版嵁鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
- // }
- // catch (Exception e)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍒犻櫎澶辫触锛�" + e.ToString();
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- //}
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
//#endregion
#region 绋庣巼缁勫悎 閲戣澏鍚屾
@@ -412,5 +417,212 @@
}
}
#endregion
+
+ #region [鍚屾鍩虹璧勬枡]
+ [Route("Gy_TaxMIX/Gy_TaxMIXViewApi")]
+ [HttpGet]
+ public json Gy_TaxMIXViewApi(string Number, string Type)
+ {
+ string sql = string.Empty;
+ string sReturn = "";
+ if (oSystemParameter.ShowBill(ref sReturn) == true)
+ {
+ //绯荤粺鍙傛暟鏄惁涓虹鏈変簯妯″紡,N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡
+ if (oSystemParameter.omodel.WMS_CloudMode == "Y")
+ {
+ #region [绉佹湁浜戞ā寮忥紝鐩存帴璋冪敤鏁版嵁搴撳瓨鍌ㄨ繃绋嬫洿鏂癩
+ try
+ {
+ oCN.BeginTran();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ DataSet DS = oCn.RunProcReturn("exec h_p_WMS_ERPBasicInfoToLocal '" + Number + "','" + Type + "'", "h_p_WMS_ERPBasicInfoToLocal");
+ if (DS == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍩虹璧勬枡鍚屾澶辫触";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ if (DBUtility.ClsPub.isStrNull(DS.Tables[0].Rows[0]["HBack"]) == "2")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "ERP涓笉瀛樺湪璇ヤ唬鐮�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍩虹璧勬枡鍚屾鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ #endregion
+ }
+ else
+ {
+ #region [鍏湁浜戞ā寮忥紝璋冪敤WEBAPI鐨勬柟寮忚繘琛屾洿鏂癩
+ var json = new
+ {
+ CreateOrgId = 0,
+ Number = Number,
+ Id = ""
+ };
+ #region [閲戣澏閮ㄥ垎]
+ //鐧诲綍閲戣澏
+ var loginRet = InvokeHelper.Login();
+ var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
+ //鍒ゆ柇鏄惁鐧诲綍鎴愬姛
+ if (isSuccess < 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = loginRet;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鏌ョ湅 鑾峰彇鏁版嵁
+ var _result = InvokeHelper.View("BD_TAXMIX", JsonConvert.SerializeObject(json));
+ var _saveObj = JObject.Parse(_result);
+ //鍒ゆ柇鏁版嵁鏄惁鑾峰彇鎴愬姛
+ if (_saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "閲戣澏绋庣粍鍚堝悓姝ュけ璐sonRoot锛�" + _result;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ #endregion
+ //鑾峰彇鏁版嵁
+ DataSet Ds;
+ Ds = oCN.RunProcReturn("select * from Gy_TaxMIXMain where HNumber = '" + Number + "'", "Gy_TaxMIXMain");
+ if (Ds.Tables[0].Rows.Count != 0 && ClsPub.isLong(Ds.Tables[0].Rows[0]["HItemID"].ToString()) != 0)
+ {
+
+ }
+ #region [涓昏〃鏁版嵁璧嬪�糫
+ var jsonData = new
+ {
+ HItemID = _saveObj["Result"]["Result"]["Id"],
+ HNumber = _saveObj["Result"]["Result"]["Number"],
+ HName = _saveObj["Result"]["Result"]["Name"][0]["Value"],
+ HShortNumber = _saveObj["Result"]["Result"]["Number"],
+ HParentID = 0,
+ HLevel = 1,
+ HEndFlag = 1,
+ HStopflag = _saveObj["Result"]["Result"]["ForbidStatus"].ToString() == "A" ? 0 : 1,
+ HRemark = "CLD-ERP瀵煎叆",
+ HUseFlag = "宸蹭娇鐢�",
+ HUSEORGID = 0,
+ HCREATEORGID = 0,
+ HMakeEmp = _saveObj["Result"]["Result"]["CreatorId_Id"],
+ HMakeTime = _saveObj["Result"]["Result"]["CreateDate"],
+ HCheckEmp = _saveObj["Result"]["Result"]["AuditorID_Id"],
+ HCheckTime = _saveObj["Result"]["Result"]["AuditDate"],
+ HModifyEmp = _saveObj["Result"]["Result"]["ModifierId_Id"],
+ HModifyTime = _saveObj["Result"]["Result"]["FModifyDate"],
+ HStopEmp = _saveObj["Result"]["Result"]["ForbidderID_Id"],
+ HStopTime = _saveObj["Result"]["Result"]["ForbidDate"]
+ };
+ #endregion
+ // 鍒犻櫎涓昏〃瀵瑰簲鏁版嵁
+ sql = $"delete from Gy_TaxMIXMain where HItemID = " + jsonData.HItemID + " and HNumber = '" + Number + "'";
+ oCN.RunProc(sql);
+
+ sql = "set identity_insert Gy_TaxMIXMain on";
+ oCN.RunProc(sql);
+
+ //鎻掑叆琛�
+ sql = $@"
+ insert into Gy_TaxMIXMain
+ (HItemID,HNumber,HName,HShortNumber,HParentID,HLevel
+ ,HEndFlag,HStopflag,HRemark,HUseFlag,HUSEORGID,HCREATEORGID
+ ,HMakeEmp,HMakeTime,HCheckEmp,HCheckTime,HModifyEmp,HModifyTime,HStopEmp,HStopTime)
+ values
+ ({jsonData.HItemID},'{jsonData.HNumber}','{jsonData.HName}',
+ '{jsonData.HShortNumber}',{jsonData.HParentID},{jsonData.HLevel},{jsonData.HEndFlag},{jsonData.HStopflag},'{jsonData.HRemark}','{jsonData.HUseFlag}','{jsonData.HUSEORGID}',
+ '{jsonData.HCREATEORGID}','{jsonData.HMakeEmp}','{jsonData.HMakeTime}','{jsonData.HCheckEmp}',
+ '{jsonData.HCheckTime}','{jsonData.HModifyEmp}','{jsonData.HModifyTime}','{jsonData.HStopEmp}','{jsonData.HStopTime}')";
+
+ oCN.RunProc(sql);
+
+ sql = "set identity_insert Gy_TaxMIXMain off";
+ oCN.RunProc(sql);
+
+ #region [瀛愯〃鍙橀噺]
+ var dataArr = _saveObj["Result"]["Result"]["BD_TAXMIXENTRY"];
+ #endregion
+
+ // 鍒犻櫎瀛愯〃瀵瑰簲鏁版嵁
+ sql = $"delete from Gy_TaxMIXSub where HTaxMixID = " + jsonData.HItemID;
+ oCN.RunProc(sql);
+
+ foreach (var oSub in dataArr)
+ {
+ #region [瀛愯〃鏁版嵁璧嬪�糫
+ var subData = new
+ {
+ HItemID = oSub["Id"],
+ HTAXBENCHMARK = oSub["TaxBenchMark_Id"],
+ FTAXRATEID = oSub["TaxRateID_Id"],
+ FTAXBENCHMARKCORRVALUE = oSub["TaxBenchMarkCorrValue"],
+ HTaxMixID = jsonData.HItemID
+ };
+ #endregion
+
+ sql = "set identity_insert Gy_TaxMIXSub on";
+ oCN.RunProc(sql);
+
+ //鎻掑叆瀛愯〃
+ sql = $@"
+ insert into Gy_TaxMIXSub
+ (HItemID,HTAXBENCHMARK,FTAXRATEID,FTAXBENCHMARKCORRVALUE,HTaxMixID)
+ values
+ ({subData.HItemID},'{subData.HTAXBENCHMARK}',{subData.FTAXRATEID},'{subData.FTAXBENCHMARKCORRVALUE}',{subData.HTaxMixID})";
+
+ oCN.RunProc(sql);
+
+ sql = "set identity_insert Gy_TaxMIXSub off";
+ oCN.RunProc(sql);
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "绋庣粍鍚堝悓姝ユ垚鍔燂紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+
+ #endregion
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍩虹璧勬枡璇诲彇澶辫触锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
}
}
\ No newline at end of file
--
Gitblit v1.9.1