From f887a4ae5354071d115889c77d124552dce4f1ce Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期四, 04 一月 2024 11:09:39 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/SCGL/日计划管理/JIT_DayPlanPlatFormBillController.cs | 4 -
WebAPI/Controllers/BLL/Xt_UserController.cs | 44 +++++++++++++++++++++-
WebAPI/Controllers/WebAPIController.cs | 12 ++++++
WebAPI/DLL/ClsSc_ICMOReportBill.cs | 18 +++++---
WebAPI/Service/LuBaoSevice.cs | 23 ++++++++++-
WebAPI/Controllers/SCGL/Sc_ICMOReportBillController.cs | 8 ++--
6 files changed, 91 insertions(+), 18 deletions(-)
diff --git a/WebAPI/Controllers/BLL/Xt_UserController.cs b/WebAPI/Controllers/BLL/Xt_UserController.cs
index b75e203..679e688 100644
--- a/WebAPI/Controllers/BLL/Xt_UserController.cs
+++ b/WebAPI/Controllers/BLL/Xt_UserController.cs
@@ -2823,8 +2823,8 @@
string HProcID = item["HProcID"].ToString();//宸ュ簭ID
string HUserID = item["鐢ㄦ埛浠ｇ爜"].ToString();//鐢ㄦ埛浠ｇ爜
string czymc = item["鐢ㄦ埛鍚嶇О"].ToString();//鐢ㄦ埛鍚嶇О
- string HNumber = item["宸ュ簭浠ｇ爜"].ToString();//渚涘簲鍟嗕唬鐮�
- string HName = item["宸ュ簭鍚嶇О"].ToString();//渚涘簲鍟嗗悕绉�
+ string HNumber = item["宸ュ簭浠ｇ爜"].ToString();//宸ュ簭浠ｇ爜
+ string HName = item["宸ュ簭鍚嶇О"].ToString();//宸ュ簭鍚嶇О
var ds = oCN.RunProcReturn("select * from Gy_UserByProcess where HProcID='" + HProcID + "'and HUserID='" + HUserID + "'", "Gy_UserByProcess");
@@ -2865,5 +2865,45 @@
}
}
#endregion
+
+ #region 鐢ㄦ埛鍏宠仈宸ュ簭鍒楄〃鏌ヨ
+ [Route("Xt_User/UserProcesslist")]
+ [HttpGet]
+ public object UserProcesslist(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+
+ string sql1 = "select * from h_v_Gy_UserProcess where 1 = 1";
+ string sql = sql1 + sWhere + " order by 鐢ㄦ埛浠ｇ爜 ";
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_UserProcess");
+
+ //娣诲姞鍒楀悕
+ 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 e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/SCGL/Sc_ICMOReportBillController.cs b/WebAPI/Controllers/SCGL/Sc_ICMOReportBillController.cs
index 213f42b..80a4c67 100644
--- a/WebAPI/Controllers/SCGL/Sc_ICMOReportBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_ICMOReportBillController.cs
@@ -118,7 +118,7 @@
{
ds = oCN.RunProcReturn(string.Format(@"SELECT HMaterID,鐗╂枡浠ｇ爜 HMaterCode,鐗╂枡鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec,
HUnitID, 璁￠噺鍗曚綅浠ｇ爜 HUnitCode, 璁￠噺鍗曚綅 HUnitName,HSourceID,鐢熶骇璧勬簮浠ｇ爜 HSourceCode,鐢熶骇璧勬簮 HSourceName,
- HWorkerid,鎿嶄綔鍛樹唬鐮� HWorkerCode,鎿嶄綔鍛� HWorkerName,鐢熶骇鏁伴噺 HQty,琛ㄤ綋澶囨敞 HRemark
+ HWorkerid,鎿嶄綔鍛樹唬鐮� HWorkerCode,鎿嶄綔鍛� HWorkerName,鐢熶骇鏁伴噺 HQty,琛ㄤ綋澶囨敞 HRemark,HICMOInterID,HICMOEntryID,HICMOBillNo
FROM h_v_IF_ICMOReportBillList_Edit"), "h_v_IF_ICMOReportBillList_Edit");
objJsonResult.code = "0";
@@ -132,7 +132,7 @@
//string sql1 = "select HRepairCheckID,HRepairCheckContent,HManagerID,HRemark from Sc_MouldRepairCheckBillSub where 1 = 1 ";
string sql1 = string.Format(@"SELECT HMaterID,鐗╂枡浠ｇ爜 HMaterCode,鐗╂枡鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec,
HUnitID, 璁￠噺鍗曚綅浠ｇ爜 HUnitCode, 璁￠噺鍗曚綅 HUnitName,HSourceID,鐢熶骇璧勬簮浠ｇ爜 HSourceCode,鐢熶骇璧勬簮 HSourceName,
- HWorkerid,鎿嶄綔鍛樹唬鐮� HWorkerCode,鎿嶄綔鍛� HWorkerName,鐢熶骇鏁伴噺 HQty,琛ㄤ綋澶囨敞 HRemark
+ HWorkerid,鎿嶄綔鍛樹唬鐮� HWorkerCode,鎿嶄綔鍛� HWorkerName,鐢熶骇鏁伴噺 HQty,琛ㄤ綋澶囨敞 HRemark,HICMOInterID,HICMOEntryID,HICMOBillNo
FROM h_v_IF_ICMOReportBillList_Edit where 1 = 1 ");
string sql = sql1 + sqlWhere;
ds = oCN.RunProcReturn(sql, "h_v_IF_ICMOReportBillList_Edit");
@@ -298,8 +298,8 @@
oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
//oItemSub.HRemark = ""; //澶囨敞
- oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
- oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
+ //oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
+ //oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
//oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿
//oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
//oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs"
index c362c5f..325f71c 100644
--- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs"
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs"
@@ -204,7 +204,7 @@
return objJsonResult;
}
- ds = oCN.RunProcReturn($"select * from Sc_WorkBillSortBillMain where HMainSourceInterID={HMainSourceInterID}" +
+ ds = oCN.RunProcReturn($"select * from Sc_WorkBillSortBillMain a inner join Sc_WorkBillSortBillSub b on a.HInterID = b.HInterID where HMainSourceInterID={HMainSourceInterID}" +
$" and HMainSourceEntryID={HMainSourceEntryID} and HICMOBillNo='{HICMOBillNo}' and HICMOEntrySEQ={HICMOEntrySEQ} and HSourceID={HSourceID}", "Sc_WorkBillSortBillMain");
if (ds.Tables[0].Rows.Count > 0)
{
@@ -334,9 +334,7 @@
return objJsonResult;
}
}
-
-
//鍚屾鏃ヨ鍒掑伐鍗�
oCN.RunProc("exec REALESE_SC_ICMOBILLSTATUS_TMP");
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index a287c26..95138bf 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -4778,6 +4778,18 @@
#endregion
/// <summary>
+ /// 鐢ㄥ叧鑱斿伐搴忚幏鍙栦俊鎭�
+ /// </summary>
+ /// <returns></returns>
+ [Route("GetGy_UserProcessDetail")]
+ [HttpGet]
+ public ApiResult<DataSet> GetGy_UserProcessDetail(string HID)
+ {
+ var model = LuBaoSevice.GetGy_UserProcessBillDetail(HID);
+ return model;
+ }
+
+ /// <summary>
/// 鎶ュ簾鍘熷洜
/// </summary>
/// <returns></returns>
diff --git a/WebAPI/DLL/ClsSc_ICMOReportBill.cs b/WebAPI/DLL/ClsSc_ICMOReportBill.cs
index 80e3a4e..227fb56 100644
--- a/WebAPI/DLL/ClsSc_ICMOReportBill.cs
+++ b/WebAPI/DLL/ClsSc_ICMOReportBill.cs
@@ -83,7 +83,7 @@
"HCloseMan,HCloseType,HRemark," +
"HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
",HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo" +
- ",HICMOInterID,HICMOBillNo,HBarCode" +
+ ",HICMOInterID,HICMOBillNo,HBarCode,HICMOEntryID" +
") values("
+ omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + "," + oSub.HMaterID.ToString() + ",'" + oSub.HMaterNumber +"'"+
"," + oSub.HQty.ToString() + "," + oSub.HUnitID.ToString() + ",'" + oSub.HUnitNumber + "'," + oSub.HTimes.ToString() + "," + oSub.HSourceID.ToString() +
@@ -91,7 +91,7 @@
",'" + oSub.HCloseMan + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
"," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
"," + oSub.HSeOrderInterID.ToString() + "," + oSub.HSeOrderEntryID.ToString() + ",'" + oSub.HSeOrderBillNo + "'" +
- "," + oSub.HICMOInterID.ToString() + ",'" + oSub.HICMOBillNo + "','" + oSub.HBarCode + "'" +
+ "," + oSub.HICMOInterID.ToString() + ",'" + oSub.HICMOBillNo + "','" + oSub.HBarCode + "'," + oSub.HICMOEntryID +
") ");
}
if (omodel.HCheckType == "鍚堟牸")
@@ -528,6 +528,7 @@
}
catch (Exception e)
{
+ oCn.RollBack();
sReturn = e.Message;
throw (e);
}
@@ -563,15 +564,18 @@
{
oCn.BeginTran();
//鏌ヨ鐢熶骇姹囨姤鍗曡〃鏁伴噺
- DataSet ds = oCn.RunProcReturn("select a.HBillNo,b.HSourceInterID,b.HSourceEntryID from Sc_ICMOReportBillMain a inner join Sc_ICMOReportBillSub b on a.HInterID = b.HInterID where a.HInterID = '" + lngBillKey + "'", "Sc_ICMOReportBillMain");
+ DataSet ds = oCn.RunProcReturn("select a.HBillNo,b.HICMOInterID,b.HICMOEntryID from Sc_ICMOReportBillMain a inner join Sc_ICMOReportBillSub b on a.HInterID = b.HInterID where a.HInterID = '" + lngBillKey + "'", "Sc_ICMOReportBillMain");
string HBillNo = ds.Tables[0].Rows[0]["HBillNo"].ToString();
- string HSourceInterID = ds.Tables[0].Rows[0]["HSourceInterID"].ToString();
- string HSourceEntryID = ds.Tables[0].Rows[0]["HSourceEntryID"].ToString();
+ string HICMOInterID = ds.Tables[0].Rows[0]["HICMOInterID"].ToString();
+ string HICMOEntryID = ds.Tables[0].Rows[0]["HICMOEntryID"].ToString();
//
//鏇存柊浜ч噺姹囨姤涓存椂琛ㄦ槸鍚︽姤妫�鐢宠鐘舵��
- string sql1 = string.Format(@"update Sc_ICMOBillWorkQtyStatus_Tmp set HRelationInterID='0' where HICMOReportBillNo='"+ HBillNo + "' and HICMOInterID='"+ HSourceInterID + "' and HICMOEntryID='"+ HSourceEntryID + "'");
+ string sql1 = string.Format(@"update Sc_ICMOBillWorkQtyStatus_Tmp set HRelationInterID='0',HRelationEntryID='0',HICMOReportBillNo=null where HICMOReportBillNo='" + HBillNo + "' and HICMOInterID='"+ HICMOInterID + "' and HICMOEntryID='"+ HICMOEntryID + "'");
oCn.RunProc(sql1);
-
+ //鏇存柊璐ㄩ噺姹囨姤涓存椂琛ㄦ槸鍚︽姤妫�鐢宠鐘舵��
+ string sql2 = string.Format(@"update Sc_ICMOBillQualityStatus_Tmp set HRelationInterID='0',HRelationBillNo='' where HRelationBillNo='" + HBillNo + "' and HRelationInterID='" + lngBillKey + "'");
+ oCn.RunProc(sql2);
+
//鍒犻櫎鍏宠仈
DeleteRelation(ref sReturn, lngBillKey);
//鍒犻櫎鏄庣粏琛�
diff --git a/WebAPI/Service/LuBaoSevice.cs b/WebAPI/Service/LuBaoSevice.cs
index d5f7b02..bff0c8c 100644
--- a/WebAPI/Service/LuBaoSevice.cs
+++ b/WebAPI/Service/LuBaoSevice.cs
@@ -299,15 +299,34 @@
{
if (string.IsNullOrEmpty(HID))
return new ApiResult<DataSet> { code = -1, msg = "ID涓嶈兘涓虹┖" };
+ var dataSet = GetGy_UserProcessDb(HID);
+ 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 };
+ }
+ public static DataSet GetGy_UserProcessDb(string HID)
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Gy_UserProcess where HItemID= " + HID + " ", "h_v_Gy_UserProcess");
+ return dataSet;
+ }
+
+ /// <summary>
+ /// 鐢ㄦ埛鍏宠仈宸ュ簭鏍规嵁id鑾峰彇淇℃伅
+ /// </summary>
+ public static ApiResult<DataSet> GetGy_UserProcessBillDetail(string HID)
+ {
+ if (string.IsNullOrEmpty(HID))
+ return new ApiResult<DataSet> { code = -1, msg = "ID涓嶈兘涓虹┖" };
var dataSet = GetGy_InspectBasisDb(HID);
if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
- return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄦ楠屼緷鎹暟鎹�" };
+ return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄧ敤鎴峰叧鑱斿伐搴忔暟鎹�" };
return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
}
public static DataSet GetGy_InspectBasisDb(string HID)
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Gy_InspectBasis where HItemID= " + HID + " ", "h_v_Gy_InspectBasis");
+ var dataSet = oCN.RunProcReturn("select * from h_v_Gy_UserProcess where 鐢ㄦ埛浠ｇ爜= '" + HID + "' ", "h_v_Gy_UserProcess");
return dataSet;
}
--
Gitblit v1.9.1