From d447fe730ad8b7e6c3c31b3fdaab67e3bcf9fe5b Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期一, 02 二月 2026 10:13:50 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs | 133 ++++++++++++++++++++++++++++++++++++--------
1 files changed, 109 insertions(+), 24 deletions(-)
diff --git a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
index 9a3e451..313ea3f 100644
--- a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
+++ b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
@@ -800,40 +800,62 @@
}
[Route("Cg_POOrderBill/jindieCloud")]
[HttpPost]
- public bool jindieCloud(int HSupID,int MaterID)
+ public object jindieCloud(int HSupID,int MaterID)
{
- Int64 HInterID = 0;
- string HBillNo = "";
- string sErrMsg = "";
- HInterID = DBUtility.ClsPub.CreateBillID_Prod("1102", ref sErrMsg);
- HBillNo = DBUtility.ClsPub.CreateBillCode_Prod("1102", ref sErrMsg, true);
- WebS.ClsCg_POOrderBillMain websLsmain = new WebS.ClsCg_POOrderBillMain();
+ try
+ {
+ oCN.BeginTran();
+ Int64 HInterID = 0;
+ string HBillNo = "";
+ string sErrMsg = "";
+ HInterID = DBUtility.ClsPub.CreateBillID_Prod("1102", ref sErrMsg);
+ HBillNo = DBUtility.ClsPub.CreateBillCode_Prod("1102", ref sErrMsg, true);
+ WebS.ClsCg_POOrderBillMain websLsmain = new WebS.ClsCg_POOrderBillMain();
- websLsmain.HInterID = HInterID;
- websLsmain.HDate = DateTime.Now;
- websLsmain.HBillNo = HBillNo;
- websLsmain.HSupID = HSupID;
- websLsmain.HEmpID = MaterID;
- websLsmain.HSTOCKORGID = 100038;
- //websLsmain.HBillType = mainList[0].HBillType;
- if (!oWebs.set_Bill_New(websLsmain, "1100", ref DBUtility.ClsPub.sErrInfo))
- {
- objJsonResult.code = "0";
+ websLsmain.HInterID = HInterID;
+ websLsmain.HDate = DateTime.Now;
+ websLsmain.HBillNo = HBillNo;
+ websLsmain.HSupID = HSupID;
+ websLsmain.HEmpID = MaterID;
+ //websLsmain.HSTOCKORGID = 100038;
+ //websLsmain.HBillType = mainList[0].HBillType;
+
+ objJsonResult = AddBillMould(HBillNo, MaterID, HSupID);
+ if (objJsonResult.code == "0")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = objJsonResult.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (!oWebs.set_Bill_New(websLsmain, "1100", ref DBUtility.ClsPub.sErrInfo))
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "杩斿洖閲戣澏鍗曟嵁澶辫触"; //鎴愬姛锛�
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oCN.Commit();
+ objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "杩斿洖閲戣澏鍗曟嵁澶辫触"; //鎴愬姛锛�
+ objJsonResult.Message = "鎻愪氦鎴愬姛"; //鎴愬姛锛�
objJsonResult.data = null;
- return false;
+ return objJsonResult;
}
- objJsonResult = AddBillMould(HBillNo, MaterID, HSupID);
- if (objJsonResult.code == "0")
+ catch (Exception e)
{
+ oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = objJsonResult.Message;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
objJsonResult.data = null;
- return false;
+ return objJsonResult;
}
- return true;
+
}
public json AddBillMould(string HBillNo,int MaterID,int HSupID)
{
@@ -3574,7 +3596,70 @@
}
#endregion
+ #region 閲囪喘璁㈠崟缂栬緫鍥炴樉
+ [Route("Cg_POOrderBill/QueryListEdit")]
+ [HttpGet]
+ public object QueryListEdit(string sWhere, string user)
+ {
+ 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;
+ }
+ //if (!DBUtility.ClsPub.Security_Log("Sc_EmployeeSignInNoteBillMain_Query", 1, false, user))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Cg_POOrderBillEdit order by 鍗曟嵁鍙� desc", "锘縣_v_Cg_POOrderBillEdit");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Cg_POOrderBillEdit where 1 = 1 ";
+ string sql = sql1 + sWhere + " order by 鍗曟嵁鍙� desc";
+ ds = oCN.RunProcReturn(sql, "锘縣_v_Cg_POOrderBillEdit");
+ }
+
+
+ //娣诲姞鍒楀悕
+ 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.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
--
Gitblit v1.9.1