From c14d65aa45f6fe0eedd558bc0de345a0ccd6e22a Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 25 五月 2023 16:43:41 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs | 173 +++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 141 insertions(+), 32 deletions(-)
diff --git a/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs b/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs
index b38fe11..a47006f 100644
--- a/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs
+++ b/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs
@@ -16,6 +16,7 @@
private json objJsonResult = new json();
public DataSet ds = new DataSet();
+ public SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
public WebServer webserver = new WebServer();
public DAL.ClsSc_MouldScrapInBill BillNew0 = new DAL.ClsSc_MouldScrapInBill(); //妯″叿鎶ュ簾鍏ュ簱瀵瑰簲鍗曟嵁绫�
@@ -1424,7 +1425,7 @@
//public object DeltetMouldRepairWorkBill(string HInterID)
//{
// //缂栬緫鏉冮檺
- // //if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
+ // //if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
// //{
// // objJsonResult.code = "0";
// // objJsonResult.count = 0;
@@ -1511,7 +1512,7 @@
// try
// {
// //瀹℃牳鏉冮檺
- // if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ // if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
// {
// objJsonResult.code = "0";
// objJsonResult.count = 0;
@@ -1843,7 +1844,7 @@
//public object DeltetMouldRepairCheckBill(string HInterID)
//{
// //缂栬緫鏉冮檺
- // //if (!DBUtility.ClsPub.Security_Log("Sc_MouldRepairCheckBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
+ // //if (!DBUtility.ClsPub.Security_Log("Sc_MouldRepairCheckBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
// //{
// // objJsonResult.code = "0";
// // objJsonResult.count = 0;
@@ -2124,7 +2125,7 @@
//public object DeltetMouldConkBookBill(string HInterID)
//{
// //缂栬緫鏉冮檺
- // //if (!DBUtility.ClsPub.Security_Log("Sc_MouldConkBookBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
+ // //if (!DBUtility.ClsPub.Security_Log("Sc_MouldConkBookBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
// //{
// // objJsonResult.code = "0";
// // objJsonResult.count = 0;
@@ -2395,7 +2396,7 @@
//public object DeltetMouldMaintainPlanBill(string HInterID)
//{
// //缂栬緫鏉冮檺
- // //if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
+ // //if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
// //{
// // objJsonResult.code = "0";
// // objJsonResult.count = 0;
@@ -2996,7 +2997,7 @@
//public object DeltetSc_MouldDotCheckBill(string HInterID)
//{
// //缂栬緫鏉冮檺
- // //if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
+ // //if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
// //{
// // objJsonResult.code = "0";
// // objJsonResult.count = 0;
@@ -3269,7 +3270,7 @@
//public object DeltetSc_MouldDotCheckPlanBillBill(string HInterID)
//{
// //缂栬緫鏉冮檺
- // //if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
+ // //if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
// //{
// // objJsonResult.code = "0";
// // objJsonResult.count = 0;
@@ -3996,7 +3997,7 @@
//public object DeltetMouldScrapOutHouseBill(string HInterID)
//{
// //缂栬緫鏉冮檺
- // //if (!DBUtility.ClsPub.Security_Log("Sc_MouldScrapOutBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
+ // //if (!DBUtility.ClsPub.Security_Log("Sc_MouldScrapOutBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
// //{
// // objJsonResult.code = "0";
// // objJsonResult.count = 0;
@@ -4083,7 +4084,7 @@
// try
// {
// //瀹℃牳鏉冮檺
- // if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ // if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
// {
// objJsonResult.code = "0";
// objJsonResult.count = 0;
@@ -4218,16 +4219,17 @@
try
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log("Sc_MouldRepairIn_SingleBillList", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldRepairIn_SingleBillList", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
}
ds = Sc_MouldRepairInBillList(sWhere,Organization);
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
@@ -4249,11 +4251,11 @@
string sql1 = string.Format(@"select * from h_v_Sc_MouldRepairInBillList where 搴撳瓨缁勭粐='" + Organization + "'");
if (sWhere == null || sWhere.Equals(""))
{
- return new SQLHelper.ClsCN().RunProcReturn(sql1 + "order by 鏃ユ湡 desc", "h_v_Sc_MouldRepairInBillList");
+ return new SQLHelper.ClsCN().RunProcReturn(sql1 + "order by 鍒跺崟鏃ユ湡 desc", "h_v_Sc_MouldRepairInBillList");
}
else
{
- string sql = sql1 + sWhere+ "order by 鏃ユ湡 desc";
+ string sql = sql1 + sWhere+ "order by 鍒跺崟鏃ユ湡 desc";
return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldRepairInBillList");
}
@@ -4267,6 +4269,8 @@
public object Sc_MouldRepairInBillListCheckDetai(string sqlWhere)
{
DataSet ds;
+ DataSet ds1;
+ List<object> list = new List<object>();
try
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
@@ -4274,13 +4278,10 @@
{
ds = oCN.RunProcReturn(string.Format(@"SELECT HMaterID,妯″叿浠ｇ爜 HMaterCode,妯″叿鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec,
鎵规 HBatchNo,璁捐瀵垮懡 HDesignLife, 鍓╀綑瀵垮懡 HLeaveLife, 浣跨敤瀵垮懡 HUseLife,搴旀敹鏁伴噺 HQtyMust,
- 瀹炴敹鏁伴噺 HQty, HWHID, 浠撳簱浠ｇ爜 HWHCode,浠撳簱 HWHName,瀛愬娉� HRemark
+ 瀹炴敹鏁伴噺 HQty, HWHID, 浠撳簱浠ｇ爜 HWHCode,浠撳簱 HWHName,瀛愬娉� HRemark,HStockOrgID,HUnitID,璁￠噺鍗曚綅浠ｇ爜 HUnitCode,璁￠噺鍗曚綅 HUnitName
FROM h_v_Sc_MouldRepairInBillList"), "h_v_Sc_MouldRepairInBillList");
- objJsonResult.code = "0";
- objJsonResult.count = 1;
- objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
- objJsonResult.data = ds.Tables[0];
+
}
else
{
@@ -4288,16 +4289,23 @@
//string sql1 = "select HRepairCheckID,HRepairCheckContent,HManagerID,HRemark from Sc_MouldRepairCheckBillSub where 1 = 1 ";
string sql1 = string.Format(@"SELECT HMaterID,妯″叿浠ｇ爜 HMaterCode,妯″叿鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec,
鎵规 HBatchNo,璁捐瀵垮懡 HDesignLife, 鍓╀綑瀵垮懡 HLeaveLife, 浣跨敤瀵垮懡 HUseLife,搴旀敹鏁伴噺 HQtyMust,
- 瀹炴敹鏁伴噺 HQty, HWHID, 浠撳簱浠ｇ爜 HWHCode,浠撳簱 HWHName,瀛愬娉� HRemark
- FROM h_v_Sc_MouldRepairInBillList where 1=1 ");
+ 瀹炴敹鏁伴噺 HQty, HWHID, 浠撳簱浠ｇ爜 HWHCode,浠撳簱 HWHName,瀛愬娉� HRemark,HStockOrgID,HUnitID,璁￠噺鍗曚綅浠ｇ爜 HUnitCode,璁￠噺鍗曚綅 HUnitName
+ FROM h_v_Sc_MouldRepairInBillList where 1=1 ");
string sql = sql1 + sqlWhere;
ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldRepairInBillList");
- objJsonResult.code = "0";
- objJsonResult.count = 1;
- objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
- objJsonResult.data = ds.Tables[0];
}
+ //鏌ユ眹鎬�
+ ds1 = oCN.RunProcReturn(string.Format(@"select 鐗╂枡浠ｇ爜,max(鐗╂枡鍚嶇О)鐗╂枡鍚嶇О,瑙勬牸鍨嬪彿,max(鍗曟嵁鍙�)鍗曟嵁鍙�,鎵规,sum(瀹炴敹鏁伴噺)瀹炴敹鏁伴噺,
+ hwhid,max(浠撳簱浠ｇ爜)浠撳簱浠ｇ爜,max(浠撳簱)浠撳簱,瀛愬娉� from h_v_Sc_MouldRepairInBillList
+ where 1=1 " + sqlWhere + " group by 鐗╂枡浠ｇ爜,瑙勬牸鍨嬪彿,hwhid,鎵规,瀛愬娉�"), "h_v_Sc_MouldRepairInBillList");
+
+ list.Add(ds.Tables[0]);
+ list.Add(ds1.Tables[0]);
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.list = list;
}
catch (Exception e)
{
@@ -4334,11 +4342,11 @@
try
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log("Sc_MouldRepairIn_SingleBill_Edit", 1, true, msg4))
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldRepairIn_SingleBill_Edit", 1, false, msg4))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -4471,10 +4479,17 @@
{
// bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇濆瓨鎴愬姛
+ string sql = string.Format($"exec h_p_Sc_MouldChangeFileStatus 'in','{oBill.omodel.HInterID.ToString()}' ");
+ oCn.RunProc(sql);
}
else
{
bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼鎴愬姛
+ //string sql = string.Format($"exec h_p_Sc_MouldChangeNowWHID 1,{oBill.omodel.HInterID.ToString()},' ' ");
+ string sql = string.Format($"exec h_p_Sc_MouldChangeNowWHID ");
+ oCn.RunProc(sql);
}
if (bResult)
{
@@ -4522,7 +4537,7 @@
try
{
//瀹℃牳鏉冮檺
- if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -4629,7 +4644,7 @@
try
{
//瀹℃牳鏉冮檺
- if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -4732,7 +4747,7 @@
public object DeltetMouldRepairInBill(string HInterID,string user)
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log("Sc_MouldRepairIn_SingleBill_Delete", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldRepairIn_SingleBill_Delete", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -4771,10 +4786,21 @@
objJsonResult.data = null;
return objJsonResult;
}
-
+ //鍒犻櫎鍓嶆煡鎵惧綋鍓嶅崟鎹殑鎵�鏈夊櫒鍏稩D
+ //string swhere = "";
+ //DataSet ds = oCn.RunProcReturn("select HMaterID from Sc_MouldStockBillSub where HinterID=" + HInterID, "Sc_MouldStockBillSub");
+ //for (var i = 0; i < ds.Tables[0].Rows.Count; i++)
+ //{
+ // swhere = swhere + ds.Tables[0].Rows[i]["HMaterID"].ToString() + ",";
+ //}
+ //swhere = swhere.Substring(0, swhere.Length - 1);
bool IsDete = oBill.DeleteBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
if (IsDete)
{
+ //鍒犻櫎鎴愬姛淇敼鍣ㄥ叿妗ｆ浣嶇疆
+ //string sql = string.Format($"exec h_p_Sc_MouldChangeNowWHID 0,0,'{swhere}' ");
+ string sql = string.Format($"exec h_p_Sc_MouldChangeNowWHID ");
+ oCn.RunProc(sql);
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
@@ -4819,6 +4845,89 @@
}
#endregion
+ #region 鍣ㄥ叿鏀瑰埗鍏ュ簱鍗曞鏍�/鍙嶅鏍�
+ [Route("Sc_MouldRepairInBill/AuditMouldRepairInBill")]
+ [HttpGet]
+ public object AuditMouldRepairInBill(string HInterID, string user, int flag)
+ {
+ //flag=1 瀹℃牳锛� flag=2 鍙嶅鏍�
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairIn_SingleBill_Check", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲鏍告潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ Int64 lngBillKey = 0;
+ lngBillKey = DBUtility.ClsPub.isLong(HInterID);
+ if (lngBillKey == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁ID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ DLL.ClsSc_MouldProdOutBill oBill = new DLL.ClsSc_MouldProdOutBill();
+ if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ if (flag == 1)
+ {
+ if (oBill.omodel.HBillStatus == 2)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "褰撳墠鍗曟嵁宸插鏍革紝鏃犻渶鍐嶆瀹℃牳";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ string HCheckDate = DateTime.Now.Date.ToString();
+ oCn.RunProc(" Update Sc_MouldStockBillMain set HChecker ='" + user + "',HCheckDate='" + HCheckDate + "',HBillStatus=2 Where HBillType='3826' and HInterID=" + HInterID);
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ if (oBill.omodel.HBillStatus == 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "褰撳墠鍗曟嵁鏈鏍革紝鏃犻渶鍙嶅鏍�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ string HCheckDate = DateTime.Now.Date.ToString();
+ oCn.RunProc(" Update Sc_MouldStockBillMain set HChecker=' ',HCheckDate=' ',HBillStatus=1 Where HBillType='3826' and HInterID=" + HInterID);
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍告垚鍔燂紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈壘鍒�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
#endregion
//#region 妯″叿棰嗙敤鍗�
@@ -5077,7 +5186,7 @@
//public object DeltetMouldProdOutBill(string HInterID)
//{
// //缂栬緫鏉冮檺
- // //if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdBackBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
+ // //if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdBackBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
// //{
// // objJsonResult.code = "0";
// // objJsonResult.count = 0;
@@ -5407,7 +5516,7 @@
//public object DeltetMouldLifeChangeBill(string HInterID)
//{
// //缂栬緫鏉冮檺
- // //if (!DBUtility.ClsPub.Security_Log("Sc_MouldLifeChangeBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
+ // //if (!DBUtility.ClsPub.Security_Log("Sc_MouldLifeChangeBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
// //{
// // objJsonResult.code = "0";
// // objJsonResult.count = 0;
--
Gitblit v1.9.1