From af78744eacb1e41ef2ba7a2e36cde3f915100ba2 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 09 四月 2026 13:14:15 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/QC_ManagementController.cs | 117 ++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 88 insertions(+), 29 deletions(-)
diff --git a/WebAPI/Controllers/QC_ManagementController.cs b/WebAPI/Controllers/QC_ManagementController.cs
index e716bed..84426ee 100644
--- a/WebAPI/Controllers/QC_ManagementController.cs
+++ b/WebAPI/Controllers/QC_ManagementController.cs
@@ -34,31 +34,20 @@
{
try
{
- List<object> a = new List<object>();
+ List<object> columnNameList = new List<object>();
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
{
Type dataType = col.DataType;
string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
- a.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
- }
- //if (ds.Tables[0].Rows.Count != 0 || ds != null)
- //{
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
- objJsonResult.list = a;
- return objJsonResult;
- //}
- //else
- //{
- //objJsonResult.code = "0";
- //objJsonResult.count = 0;
- //objJsonResult.Message = "鏃犳暟鎹�";
- //objJsonResult.data = null;
- //return objJsonResult;
- //}
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
}
catch (Exception e)
{
@@ -119,6 +108,51 @@
/// <returns></returns>
[Route("QC_Management/MES_QC_CheckProjectList_Json_Main")]
[HttpGet]
+ public object MES_QC_CheckProjectList_Json_Main2(string sWhere, string user, int page = -1, int size = -1)
+ {
+ if(page == -1 || size == -1)
+ {
+ return MES_QC_CheckProjectList_Json_Main(sWhere, user);
+ }
+ DataSet ds;
+ try
+ {
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_QCCheckProject_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡璇㈡潈闄�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn($@"select * from h_v_Gy_QCCheckProjectList_Main order by 鏃ユ湡 desc,鍗曟嵁鍙� DESC
+ offset {(page-1)*size} rows fetch {size} rows only
+ ", "h_v_Gy_QCCheckProjectList_Main");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Gy_QCCheckProjectList_Main where 1=1";
+ string sql = sql1 + sWhere + $" order by 鏃ユ湡 desc,鍗曟嵁鍙� DESC offset {(page-1)*size} rows fetch {size} rows only ";
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_QCCheckProjectList_Main");
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ return GetObjectJson(ds);
+ }
+
+
public object MES_QC_CheckProjectList_Json_Main(string sWhere, string user)
{
DataSet ds;
@@ -137,12 +171,12 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_Gy_QCCheckProjectList_Main order by 鏃ユ湡 desc ", "h_v_Gy_QCCheckProjectList_Main");
+ ds = oCN.RunProcReturn("select * from h_v_Gy_QCCheckProjectList_Main order by 鏃ユ湡 desc,鍗曟嵁鍙� DESC ", "h_v_Gy_QCCheckProjectList_Main");
}
else
{
string sql1 = "select * from h_v_Gy_QCCheckProjectList_Main where 1=1";
- string sql = sql1 + sWhere + " order by 鏃ユ湡 desc ";
+ string sql = sql1 + sWhere + " order by 鏃ユ湡 desc,鍗曟嵁鍙� DESC ";
ds = oCN.RunProcReturn(sql, "h_v_Gy_QCCheckProjectList_Main");
}
}
@@ -308,13 +342,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)
@@ -1094,6 +1128,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 = "";
@@ -1118,6 +1153,7 @@
return objJsonResult;
}
oBill.omodel = oItem;
+ ts = oItem.HCheckBillType;
}
//琛ㄤ綋鏁版嵁
//鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
@@ -1164,6 +1200,17 @@
}
else
{
+ DataSet Ds;
+ Ds = oCN.RunProcReturn("Select * from Gy_QCCheckProjectMain Where HInterID=" + oBill.omodel.HInterID, "Gy_QCCheckProjectMain");
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (Ds.Tables[0].Rows[0]["HChecker"].ToString() != "" && Ds.Tables[0].Rows[0]["HChecker"].ToString() != null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹凡缁忚瀹℃牳锛屼笉鍏佽淇敼锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
}
if (bResult)
@@ -1171,7 +1218,6 @@
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
- //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
objJsonResult.data = 1;
return objJsonResult;
}
@@ -1249,7 +1295,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)
{
@@ -1271,7 +1317,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;
@@ -1352,8 +1398,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";
@@ -1387,7 +1446,7 @@
//==================================================================================
//瀹℃牳鎻愪氦
- if (!oBill.CheckBill(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Gy_QCCheckProject_AfterCheckCtrl", user, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ if (!oBill.CheckBill(int.Parse(HInterID), oBill.omodel.HBillNo, "h_p_Gy_QCCheckProject_AfterCheckCtrl", user, ref DBUtility.ClsPub.sExeReturnInfo) == true)
{
objJsonResult.code = "0";
objJsonResult.count = 1;
@@ -1444,7 +1503,7 @@
//===========================================================
//鍙嶅鏍告彁浜bandonCheck
- if (!oBill.AbandonCheck(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Gy_QCCheckProject_AfterUnCheckCtrl", user, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ if (!oBill.AbandonCheck(int.Parse(HInterID), oBill.omodel.HBillNo, "h_p_Gy_QCCheckProject_AfterUnCheckCtrl", user, ref DBUtility.ClsPub.sExeReturnInfo) == true)
{
objJsonResult.code = "0";
objJsonResult.count = 1;
@@ -1750,7 +1809,7 @@
oItemSub.HRelationMoney = 0;
oItemSub.HCloseMan = "";
oItemSub.HRemark = "";
- oItemSub.HProcCheckEmp = oBill.omodel.HFirstCheckEmp;//妫�娴嬪憳
+ // oItemSub.HProcCheckEmp = oBill.omodel.HFirstCheckEmp;//妫�娴嬪憳
oBill.DetailColl.Add(oItemSub);
}
@@ -2118,7 +2177,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