From fd991e354648eacbf449b4b3fceafedfbaa4201f Mon Sep 17 00:00:00 2001
From: dytyqx <1342948614@qq.com>
Date: 星期一, 09 三月 2026 11:03:55 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/QC_ManagementController.cs | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/WebAPI/Controllers/QC_ManagementController.cs b/WebAPI/Controllers/QC_ManagementController.cs
index 2d4fb46..98ddd9d 100644
--- a/WebAPI/Controllers/QC_ManagementController.cs
+++ b/WebAPI/Controllers/QC_ManagementController.cs
@@ -297,13 +297,13 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
if (sqlWhere == null || sqlWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select top 500 * from h_v_QC_PatrolProcCheckBillList where 鍏抽棴浜�='' order by hmainid desc ", "h_v_QC_PatrolProcCheckBillList");
+ ds = oCN.RunProcReturn("select top 500 * from h_v_QC_PatrolProcCheckBillMainList where 鍏抽棴浜�='' order by hmainid desc ", "h_v_QC_PatrolProcCheckBillMainList");
}
else
{
- string sql1 = "select * from h_v_QC_PatrolProcCheckBillList where 鍏抽棴浜�='' ";
+ string sql1 = "select * from h_v_QC_PatrolProcCheckBillMainList where 鍏抽棴浜�='' ";
string sql = sql1 + sqlWhere+ " order by 鍒跺崟鏃ユ湡 desc ";
- ds = oCN.RunProcReturn(sql, "h_v_QC_PatrolProcCheckBillList");
+ ds = oCN.RunProcReturn(sql, "h_v_QC_PatrolProcCheckBillMainList");
}
}
catch (Exception e)
@@ -1083,6 +1083,7 @@
msg2 = msg2.Replace("\\", "");
msg2 = msg2.Replace("\n", ""); //\n
lsmain = oListModels.getObjectByJson_Gy_QCCheckProjectMain(msg2);
+ string ts;
foreach (Model.ClsGy_QCCheckProjectMain oItem in lsmain)
{
//oItem.HMaker = "";
@@ -1107,6 +1108,7 @@
return objJsonResult;
}
oBill.omodel = oItem;
+ ts = oItem.HCheckBillType;
}
//琛ㄤ綋鏁版嵁
//鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
@@ -1248,7 +1250,7 @@
}
//鍒犻櫎鍓嶆帶鍒�=========================================
- string sql1 = "exec h_p_Gy_QCCheckProject_BeforeDelCtrl " + BillOld.omodel.HInterID + ",'" + BillOld.omodel.HBillNo + "','" + UserName + "'";
+ string sql1 = "exec h_p_Gy_QCCheckProject_BeforeDelCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + UserName + "'";
ds = oCN.RunProcReturn(sql1, "h_p_Gy_QCCheckProject_BeforeDelCtrl");
if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
{
@@ -1270,7 +1272,7 @@
//==================================================================================
//鍒犻櫎鍗曟嵁锛堝寘鍚垹闄ゅ悗鎺у埗銆佸啓鍏ユ棩蹇楋級
- if (!oBill.DeleteBill(BillOld.omodel.HInterID, BillOld.omodel.HBillNo, "h_p_Gy_QCCheckProject_AfterDelCtrl", UserName, ref ClsPub.sExeReturnInfo))
+ if (!oBill.DeleteBill(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Gy_QCCheckProject_AfterDelCtrl", UserName, ref ClsPub.sExeReturnInfo))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -1351,8 +1353,21 @@
{
//鍒ゆ柇鍗曟嵁鏄惁宸茬粡瀹℃牳
DataSet ds;
- string sql = "select * from Gy_QCCheckProjectMain where HInterID = " + HInterID;
+ string sql;
+ if(HInterID=="0")
+ {
+ sql = "select top 1 * from Gy_QCCheckProjectMain order by HInterID desc";
+
+ }
+ else
+ sql = "select * from Gy_QCCheckProjectMain where HInterID = " + HInterID;
ds = oCN.RunProcReturn(sql, oBill.MvarItemKey);
+ if(ds!=null)
+ {
+ oBill.omodel.HInterID = Convert.ToInt64(ds.Tables[0].Rows[0]["HInterID"]);
+ HInterID = Convert.ToInt64(ds.Tables[0].Rows[0]["HInterID"]).ToString();
+ }
+
if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
{
objJsonResult.code = "0";
@@ -1749,7 +1764,7 @@
oItemSub.HRelationMoney = 0;
oItemSub.HCloseMan = "";
oItemSub.HRemark = "";
- oItemSub.HProcCheckEmp = oBill.omodel.HFirstCheckEmp;//妫�娴嬪憳
+ // oItemSub.HProcCheckEmp = oBill.omodel.HFirstCheckEmp;//妫�娴嬪憳
oBill.DetailColl.Add(oItemSub);
}
@@ -2117,7 +2132,7 @@
UserName = oItem.HMaker;
oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
- oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
+ oItem.HDate=oItem.HDate.ToString()==""? DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd")) : oItem.HDate;
oItem.HBillType = "7506";
oItem.HBillSubType = "7506";
oItem.HBillStatus = 0;
--
Gitblit v1.9.1