From 9671e1c0d88deeea2efc06b800f7eaedfcf82949 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期一, 08 十一月 2021 14:37:00 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/SCGL/QC_OutCompCheckBillController.cs | 227 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 223 insertions(+), 4 deletions(-)
diff --git a/WebAPI/Controllers/SCGL/QC_OutCompCheckBillController.cs b/WebAPI/Controllers/SCGL/QC_OutCompCheckBillController.cs
index 3ee1d4a..d3dd532 100644
--- a/WebAPI/Controllers/SCGL/QC_OutCompCheckBillController.cs
+++ b/WebAPI/Controllers/SCGL/QC_OutCompCheckBillController.cs
@@ -16,11 +16,9 @@
public DBUtility.ClsPub.Enum_BillStatus BillStatus;
private json objJsonResult = new json();
+ public DataSet ds = new DataSet();
+ public WebServer webserver = new WebServer();
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- DataSet ds;
- SQLHelper.ClsCN oCN1 = new SQLHelper.ClsCN();
- DataSet ds1;
-
@@ -71,7 +69,228 @@
return objJsonResult;
}
}
+ #region[缂栬緫鏃惰幏鍙栬〃澶存暟鎹甝
+ [Route("QC_OutCompCheckBill/QC_OutCompCheckBillListCheckDetail")]
+ [HttpGet]
+ public ApiResult<DataSet> QC_OutCompCheckBillListCheckDetail(string HID)
+ {
+ if (string.IsNullOrEmpty(HID))
+ return new ApiResult<DataSet> { code = -1, msg = "ID涓嶈兘涓虹┖" };
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ var dataSet = oCN.RunProcReturn("select top 1 * from h_v_QC_OutCompCheckBillList where hmainid= " + HID + " ", "h_v_QC_OutCompCheckBillList");
+ if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
+ return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄧ粨绠楀崟鍙�" };
+
+ return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
+ }
+ #endregion
+
+ #region[缂栬緫鏃惰幏鍙栬〃浣撴暟鎹甝
+ [Route("QC_OutCompCheckBill/QC_OutCompCheckBillListProjectDetai")]
+ [HttpGet]
+ public object QC_OutCompCheckBillListProjectDetai(string sqlWhere)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ string sql1 = "SELECT 鏃ユ湡,鍗曟嵁鍙�,琛ㄥご澶囨敞,瀹㈡埛鍚嶇О" +
+ ",瀹㈡埛浠ｇ爜,浜у搧鍐呯爜, 浜у搧鍚嶇О, 浜у搧鍨嬪彿, 妫�楠屽憳浠ｇ爜" +
+ ", 妫�楠屽憳鍚嶇О, 鍒跺崟浜�, 鍒跺崟鏃ユ湡, 瀹℃牳浜�, 瀹℃牳鏃ユ湡" +
+ ", 淇敼浜�, 淇敼鏃ユ湡, 鍏抽棴浜�, 鍏抽棴鏃ユ湡,鍗曟嵁绫诲瀷 FROM h_v_QC_OutCompCheckBillList where 1 = 1 ";
+ string sql = sql1 + sqlWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_QC_OutCompCheckBillList");
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ }
+ return objJsonResult;
+ }
+ #endregion
+
+ /// <summary>
+ /// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("QC_OutCompCheckBill/AddBill")]
+ [HttpPost]
+ public object AddBill([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ oCN.BeginTran();
+ //淇濆瓨涓昏〃
+ objJsonResult = AddBillMain(msg1);
+ if (objJsonResult.code == "0")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = objJsonResult.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏂板鍗曟嵁鎴愬姛锛�";
+ return objJsonResult;
+ }
+
+ public json AddBillMain(string msg1)
+ {
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string msg3 = sArray[1].ToString();
+ try
+ {
+ msg2 = "[" + msg2.ToString() + "]";
+ List<QC_OutCompCheckBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<QC_OutCompCheckBillMain>>(msg2);
+ int HYear = 2021;
+ double HPeriod = 1;
+ string HBillType = "7504";
+ string HBillSubType = "7504";
+ long HInterID = mainList[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
+ DateTime HDate = mainList[0].HDate;//鏃ユ湡
+ string HBillNo = mainList[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
+ long HBillStatus = mainList[0].HBillStatus;
+ string HRemark = mainList[0].HRemark;//澶囨敞
+ string HBacker = mainList[0].HBacker;
+ DateTime HBackDate = mainList[0].HBackDate;
+ string HBackRemark = mainList[0].HBackRemark;
+ string HChecker = mainList[0].HChecker;
+ DateTime HCheckDate = mainList[0].HCheckDate;
+ string HMaker = mainList[0].HMaker;
+ DateTime HMakeDate = mainList[0].HMakeDate;
+ long HCusID = mainList[0].HCusID;
+ long HMaterID = mainList[0].HMaterID;
+ long HFirstCheckEmp = mainList[0].HFirstCheckEmp;
+ string HCheckerResult = mainList[0].HCheckerResult;
+ double HInStockQty = mainList[0].HInStockQty;
+ double HCheckQty = mainList[0].HCheckQty;
+ double HRightQty = mainList[0].HRightQTy;
+ double HBadQty = mainList[0].HBadQty;
+
+ //涓昏〃
+ oCN.RunProc("Insert Into QC_OutCompCheckBillMain " +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" +
+ ",HYear,HPeriod,HRemark" +
+ ",HCusID,HMaterID,HInStockQty,HCheckQty,HRightQty" +
+ ",HBadQty,HFirstCheckEmp,HCheckerResult" +
+ ") " +
+ " values('" + HBillType + "','" + HBillSubType + "'," + HInterID.ToString() + ",'" + HBillNo + "'," + HBillStatus.ToString() + ",'" + HDate + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
+ "," + HYear.ToString() + "," + HPeriod.ToString() + ",'" + HRemark + "'" +
+ "," + HCusID.ToString() + "," + HMaterID.ToString() + "," + HInStockQty.ToString() + "," + HCheckQty.ToString() + "," + HRightQty.ToString() +
+ "," + HBadQty.ToString() + "," + HFirstCheckEmp.ToString() + ",'" + HCheckerResult + "'" +
+ ") ");
+
+
+ //淇濆瓨瀛愯〃
+ objJsonResult = AddBillSub(msg3, HInterID);
+ if (objJsonResult.code == "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = objJsonResult.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = null;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ public json AddBillSub(string msg3, long HInterID)
+ {
+ List<QC_OutCompCheckBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<QC_OutCompCheckBillSub>>(msg3);
+ for (int i = 0; i < subList.ToArray().Length; i++)
+ {
+ string HBillNo_bak = subList[0].HBillNo_bak;
+ 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;
+ double HRelationQty = subList[0].HRelationQty;
+ double HRelationMoney = subList[0].HRelationMoney;
+ long HQCCheckClassID = subList[0].HQCCheckClassID;
+ long HQCCheckItemID = subList[0].HQCCheckItemID;
+ string HQCStd = subList[0].HQCStd;
+ string HResult = subList[0].HResult;
+
+ oCN.RunProc("Insert into QC_OutCompCheckBillSub " +
+ " (HInterID,HBillNo_bak,HEntryID,HCloseMan" +
+ ",HEntryCloseDate,HCloseType,HRemark,HSourceInterID" +
+ ",HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HQCCheckClassID,HQCCheckItemID,HQCStd,HResult" +
+ ") values("
+ + HInterID.ToString() + ",'" + HBillNo_bak + "'," + HEntryID.ToString() + ",'" + HCloseMan + "'" +
+ ",getdate()," + HCloseType + ",'" + HRemark + "'," + HSourceInterID.ToString() +
+ "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo + "','" + HSourceBillType + "'," + HRelationQty.ToString() + "," + HRelationMoney.ToString() +
+ "," + HQCCheckClassID.ToString() + "," + HQCCheckItemID.ToString() + ",'" + HQCStd + "','" + HResult + "'" + ") ");
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = null;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ /// <summary>
+ ///鍒犻櫎鍔熻兘
+ /// </summary>
+ /// <returns></returns>
+ [Route("QC_OutCompCheckBill/DeltetOutCompCheckBill")]
+ [HttpGet]
+ public object DeltetOutCompCheckBill(string HInterID)
+ {
+ try
+ {
+ oCN.BeginTran();
+ oCN.RunProc("Delete From QC_OutCompCheckBillMain where HInterID = " + HInterID);
+ oCN.RunProc("Delete From QC_OutCompCheckBillSub where HInterID = " + HInterID);
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ 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