From bf3ccf84ff0ed2576052cb0b34659aea363626b5 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期五, 12 十一月 2021 18:03:51 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/Pay_OtherBalBillController.cs | 173 +++++++++++++++++++++++++++++----------------------------
1 files changed, 89 insertions(+), 84 deletions(-)
diff --git a/WebAPI/Controllers/Pay_OtherBalBillController.cs b/WebAPI/Controllers/Pay_OtherBalBillController.cs
index 44e2217..048d664 100644
--- a/WebAPI/Controllers/Pay_OtherBalBillController.cs
+++ b/WebAPI/Controllers/Pay_OtherBalBillController.cs
@@ -92,10 +92,10 @@
try
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- string sql1 = "SELECT 鐗╂枡ID,鐗╂枡浠ｇ爜,鐗╂枡鍚嶇О,HDeptID,閮ㄩ棬浠ｇ爜,閮ㄩ棬" +
- ", HGroupID, 鐝粍浠ｇ爜, 鐝粍, 宸ヨ祫绫诲瀷, 鎽樿, 鍐呴儴鍗曟嵁鍙�, 琛ㄥご澶囨敞" +
- ", 宸ュ簭ID, 宸ュ簭浠ｇ爜, 宸ュ簭鍚嶇О" +
- ", 鑱屽憳ID, 鑱屽憳浠ｇ爜, 鑱屽憳, 宸ユ椂, 鏁伴噺, 宸ヤ环, 閲戦 FROM h_v_Pay_OtherBalBillList where 1 = 1 ";
+ string sql1 = "SELECT HMaterID,HMaterCode,HMaterName, HDeptID,閮ㄩ棬浠ｇ爜,閮ㄩ棬" +
+ ",HGroupID,鐝粍浠ｇ爜,鐝粍,宸ヨ祫绫诲瀷,鎽樿,鍐呴儴鍗曟嵁鍙�,琛ㄥご澶囨敞,鍒跺崟浜�,鍒跺崟鏃ユ湡" +
+ ",瀹℃牳浜�,瀹℃牳鏃ユ湡,淇敼浜�,淇敼鏃ユ湡,鍏抽棴浜�, 鍏抽棴鏃ユ湡,HProcID,HProcNumber,HProcName" +
+ ",HEmpID,HEmpNumber,HEmpName,宸ユ椂,鏁伴噺,宸ヤ环,閲戦 FROM h_v_Pay_OtherBalBillList where 1 = 1 ";
string sql = sql1 + sqlWhere;
ds = oCN.RunProcReturn(sql, "h_v_Pay_OtherBalBillList");
objJsonResult.code = "0";
@@ -140,7 +140,7 @@
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "鏂板鍗曟嵁鎴愬姛锛�";
- objJsonResult.data = ds.Tables[0];
+ objJsonResult.data = null;
return objJsonResult;
}
@@ -160,10 +160,10 @@
int HYear = 2021;
double HPeriod = 1;
string HRemark = mainList[0].HRemark;//澶囨敞
- string HBillSubType = mainList[0].HBillSubType;
+ string HBillSubType = "2206";
string HMaker = mainList[0].HMaker;
- string HExplanation = mainList[0].HExplanation;
- string HInnerBillNo = mainList[0].HInnerBillNo;
+ string HExplanation = "0";
+ string HInnerBillNo = "0";
long HMaterID = mainList[0].HMaterID;//浜у搧ID
long HGroupID = mainList[0].HGroupID;
long HDeptID = mainList[0].HDeptID;
@@ -174,16 +174,14 @@
int HPRDORGID = mainList[0].HPRDORGID; //缁勭粐
//涓昏〃
- oCN.RunProc("Insert Into Pay_OtherBalBillMain " +
- "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
- ",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
- ",HGroupID,HDeptID,HEmpID,HPayType,HExplanation,HInnerBillNo" +
- ") " +
- " values('" + HBillType + "'," + HBillSubType + ",'" + HInterID + "','" + HBillNo + "','" + HDate + "'" +
- "," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HMaker + "',getdate()," + HGroupID + "," + HDeptID + "," + HEmpID + ","+
- "," + HPayType + "," + HExplanation + ",'" + HInnerBillNo + "'," +
- ") ");
-
+ oCN.RunProc(" Insert Into Pay_OtherBalBillMain " +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
+ ",HYear,HPeriod,HRemark,HMaker" +
+ ",HGroupID,HDeptID,HEmpID,HPayType,HInnerBillNo,HExplanation" + ")" +
+ "values('" + HBillType + "','" + HBillSubType + "'," + HInterID + ",'" + HBillNo + "','" + HDate +
+ "','" + HYear + "'," + HPeriod + ",'" + HRemark + "','" + HMaker + "'," + HGroupID + ", " + HDeptID +
+ "," + HEmpID + ",'" + HPayType + "','" + HInnerBillNo + "'," + HExplanation +
+ ") ");
//淇濆瓨瀛愯〃
objJsonResult = AddBillSub(msg3, HInterID);
if (objJsonResult.code == "0")
@@ -193,17 +191,6 @@
objJsonResult.Message = objJsonResult.Message;
objJsonResult.data = null;
return objJsonResult;
- }
- else
- {
- if (ClsPub.isStrNull(ds.Tables[0].Rows[0][0]) == "2")
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = ClsPub.isStrNull(ds.Tables[0].Rows[0][1]);
- objJsonResult.data = null;
- return objJsonResult;
- }
}
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -226,67 +213,64 @@
List<Pay_OtherBalBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Pay_OtherBalBillSub>>(msg3);
for (int i = 0; i < subList.ToArray().Length; i++)
{
- //if (subList[i].HWorkQty <= 0)
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "绗�" + i + "琛岋紝鍔犲伐鏁伴噺涓嶈兘涓�0鎴栬�呭皬浜�0";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
-
- string HCloseMan = "";//鍏抽棴浜�
- bool HCloseType = false;//
- string HEntryCloseDate = "";//鏃堕棿鍗曚綅
- long HSourceInterID = 0;//婧愬崟涓诲唴鐮�
- long HSourceEntryID = 0;//婧愬崟瀛愬唴鐮�
- string HSourceBillNo = "";//婧愬崟鍗曞彿
- string HSourceBillType = "";//婧愬崟绫诲瀷
- double HRelationQty = 0;//鍏宠仈鏁伴噺
- double HRelationMoney = 0;//鍏宠仈閲戦
- decimal HTimes = 0;
- decimal HQty = 0;
- decimal HPrice = 0;
- decimal HMoney = 0;
- long HICMOInterID = 0;
- string HICMOBillNo = "";
- long HProcID_S = 0;//宸ユID
- long HMaterID_S = 0;
- long HEmpID_S = 0;
- long HSourceID_S = 0;
- long HProcReportInterID = 0;
- long HProcReportEntryID = 0;
- long HProcPlanInterID = 0;
- long HProcPlanEntryID = 0;
- string HProcReportBillNo = "";
- string HProcPlanBillNo = "";
- decimal HPriceRate = 0;
- decimal HSubsidyTotal = 0;
- decimal HDeuctTotal = 0;
- decimal HPackQty = 0;
- decimal HPackPrice = 0;
- decimal HPackMoney = 0;
- long HPackMaterID = 0;
- decimal HSubsidyQty = 0;
- decimal HSubsidyMoney = 0;
+ long HEntryID = subList[0].HEntryID;//宸ユID
+ string HCloseMan = subList[0].HCloseMan;
+ long HCloseType = subList[0].HCloseType;
+ string HRemark = subList[0].HRemark;
+ long HSourceInterID = subList[0].HSourceInterID;
+ long HSourceEntryID = subList[0].HSourceEntryID;
+ string HSourceBillNo = subList[0].HSourceBillNo;
+ string HSourceBillType = subList[0].HSourceBillType;
+ decimal HRelationQty = subList[0].HRelationQty;
+ decimal HRelationMoney = subList[0].HRelationMoney;
+ long HSourceID = subList[0].HSourceID;
+ long HSqty = subList[0].HSqty;
+ long HSubsidyID = subList[0].HSubsidyID;
+ long HDeuctID = subList[0].HDeuctID;
+ long HMaterID = subList[0].HMaterID;
+ long HProcID = subList[0].HProcID;
+ long HEmpID = subList[0].HEmpID;
+ decimal HTimes = subList[0].HTimes;
+ decimal HQty = subList[0].HQty;
+ decimal HPrice = subList[0].HPrice;
+ decimal HPackQty = subList[0].HPackQty;
+ decimal HPackPrice = subList[0].HPackPrice;
+ decimal HPackMoney = subList[0].HPackMoney;
+ long HPackMaterID = subList[0].HPackMaterID;
+ decimal HPriceRate = subList[0].HPriceRate;
+ decimal HSubsidyTotal = subList[0].HSubsidyTotal;
+ decimal HDeuctTotal = subList[0].HDeuctTotal;
+ decimal HSubsidyQty = subList[0].HSubsidyQty;
+ decimal HSubsidyMoney = subList[0].HSubsidyMoney;
+ decimal HMoney = subList[0].HMoney;
+ long HICMOInterID = subList[0].HICMOInterID;
+ string HICMOBillNo = subList[0].HICMOBillNo;
+ long HProcReportInterID = subList[0].HProcReportInterID;
+ long HProcReportEntryID = subList[0].HProcReportEntryID;
+ long HProcPlanInterID = subList[0].HProcPlanInterID;
+ long HProcPlanEntryID = subList[0].HProcPlanEntryID;
+ string HProcReportBillNo = subList[0].HProcReportBillNo;
+ string HProcPlanBillNo = subList[0].HProcPlanBillNo;
- oCN.RunProc("Insert into Pay_OtherBalBillSub " +
+ string sql = "Insert into Pay_OtherBalBillSub " +
" (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
- ",HMaterID_S,HProcID_S,HEmpID_S,HSourceID_S,HTimes,HQty,HPrice," +
+ ",HMaterID,HProcID,HEmpID,HSourceID,HTimes,HQty,HPrice,HSqty" +
",HMoney,HICMOInterID,HICMOBillNo,HProcReportInterID,HProcReportEntryID,HProcReportBillNo" +
",HProcPlanInterID,HProcPlanEntryID,HProcPlanBillNo" +
- ",HPriceRate,HSubsidyTotal,HDeuctTotal" +
+ ",HPriceRate,HSubsidyTotal,HDeuctTotal,HSubsidyID,HDeuctID" +
",HPackQty,HPackPrice,HPackMoney,HPackMaterID,HSubsidyQty,HSubsidyMoney" +
") values("
- + HInterID + "," + i + "," + subList[i].HEntryID + ",'" + HCloseMan + "'" +
- "," + HEntryCloseDate + "," + Convert.ToString(HCloseType ? 1 : 0) +
- ",'" + subList[i].HRemark + "'," + HSourceInterID + "," + HSourceEntryID + ",'" + HSourceBillNo + "','" + HSourceBillType + "'," + HRelationQty + "," + HRelationMoney + "," +
- "," + HProcID_S + "," + HMaterID_S + "," + HEmpID_S + ", " + HSourceID_S + ",'" + HTimes + "','" + HQty + "'" +
- ",'" + HPrice + "','" + HMoney + "','" + HICMOInterID + "'," + HICMOBillNo + "," + HProcReportInterID + "," + HProcReportEntryID + "," +
- "," + HProcReportBillNo + "," + HProcPlanInterID + ",'" + HProcPlanEntryID + "','" + HProcPlanBillNo + "'," + HPriceRate + "," + HSubsidyTotal + "," +
- "," + HDeuctTotal + ",'" + HPackQty + "'," + HPackPrice + "," + HPackMoney + "," + HPackMaterID + "," + HSubsidyQty + "," + HSubsidyMoney + "," +
- ") ");
+ + HInterID.ToString() + "," + HEntryID.ToString() + ",'" + HCloseMan + "',''," + HCloseType + ",'" + HRemark + "'" +
+ "," + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo + "','" + HSourceBillType + "'," + HRelationQty.ToString() + "," + HRelationMoney.ToString() +
+ "," + HMaterID.ToString() + "," + HProcID.ToString() + "," + HEmpID.ToString() + "," + HSourceID.ToString()
+ + "," + HTimes.ToString() + "," + HQty.ToString() + "," + HPrice.ToString() + "," + HSqty.ToString() +
+ "," + HMoney.ToString() + "," + HICMOInterID.ToString() + ",'" + HICMOBillNo + "'," + HProcReportInterID.ToString() + "," + HProcReportEntryID.ToString() + ",'" + HProcReportBillNo + "'" +
+ "," + HProcPlanInterID.ToString() + "," + HProcPlanEntryID.ToString() + ",'" + HProcPlanBillNo + "'" +
+ "," + HPriceRate.ToString() + "," + HSubsidyTotal.ToString() + "," + HDeuctTotal.ToString() + "," + HSubsidyID.ToString() + "," + HDeuctID.ToString() +
+ "," + HPackQty.ToString() + "," + HPackPrice.ToString() + "," + HPackMoney.ToString() + "," + HPackMaterID.ToString() + "," + HSubsidyQty.ToString() + "," + HSubsidyMoney.ToString() +
+ ") ";
+ oCN.RunProc(sql);
}
objJsonResult.code = "1";
@@ -326,7 +310,28 @@
return objJsonResult;
}
}
-
+ [Route("Pay_OtherBalBill/getOtherBalBillPrice")]
+ [HttpGet]
+ public object getOtherBalBillPrice(string HMaterID, string HProcID)
+ {
+ try
+ {
+ DataSet ds = oCN.RunProcReturn("select 鍗曚环 from h_v_Gy_ProcPriceList where HMaterID='" + HMaterID + "' and HProcID='" + HProcID + "'", "h_v_Gy_ProcPriceList");
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏌ヨ鎴愬姛锛�";
+ 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;
+ }
+ }
//
}
}
\ No newline at end of file
--
Gitblit v1.9.1