From 11112827c5ccdd0e03fdd7620c22729351ca6ba5 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 10 二月 2023 16:28:39 +0800
Subject: [PATCH] 工序流转卡 保存工艺路线内码 生产订单完善 工艺路线添加字段 仓库
---
WebAPI/Controllers/SBGL/Sb_EquipRepairSendWorkBillController.cs | 277 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 228 insertions(+), 49 deletions(-)
diff --git a/WebAPI/Controllers/SBGL/Sb_EquipRepairSendWorkBillController.cs b/WebAPI/Controllers/SBGL/Sb_EquipRepairSendWorkBillController.cs
index 2090c65..f33336d 100644
--- a/WebAPI/Controllers/SBGL/Sb_EquipRepairSendWorkBillController.cs
+++ b/WebAPI/Controllers/SBGL/Sb_EquipRepairSendWorkBillController.cs
@@ -24,39 +24,50 @@
#region 璁惧缁翠慨娲惧伐鍗曟煡璇㈠垪琛�
[Route("Sb_EquipRepairSendWorkBill/GetEquipRepairSendWorkBillList")]
[HttpGet]
- public object GetEquipRepairSendWorkBillList(string sWhere)
+ public object GetEquipRepairSendWorkBillList(string sWhere,string user)
{
try
{
- string sql = "select * from h_v_Sb_EquipRepairSendWorkBillList where 1=1 ";
- if (sWhere == "" || sWhere == null)
- {
- ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipRepairSendWorkBillList");
- }
- else
- {
- ds = oCN.RunProcReturn(sql + sWhere, "h_v_Sb_EquipRepairSendWorkBillList");
- }
-
- if (ds.Tables[0].Rows.Count == 0||ds==null)
+ if (!DBUtility.ClsPub.Security_Log("Sb_EquipRepairSendWorkBillList", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message ="鏃犺褰�";
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
}
+ string sql = "select * from h_v_Sb_EquipRepairSendWorkBillList where 1=1 ";
+ if (sWhere == "" || sWhere == null)
+ {
+ ds = oCN.RunProcReturn(sql+ " order by hmainid desc ", "h_v_Sb_EquipRepairSendWorkBillList");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn(sql + sWhere+ " order by hmainid desc ", "h_v_Sb_EquipRepairSendWorkBillList");
+ }
+
+ //if (ds.Tables[0].Rows.Count != 0 || ds != null)
+ //{
objJsonResult.code = "1";
objJsonResult.count = ds.Tables[0].Rows.Count;
- objJsonResult.Message = "Sucess";
+ objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
return objJsonResult;
+ //}
+ //else
+ //{
+ //objJsonResult.code = "0";
+ //objJsonResult.count = 0;
+ //objJsonResult.Message = "鏃犳暟鎹�";
+ //objJsonResult.data = null;
+ //return objJsonResult;
+ //}
}
catch (Exception e)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "Exception"+e.ToString();
+ objJsonResult.Message = "Exception" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
@@ -98,8 +109,18 @@
int hentryid = int.Parse(sArray[2].ToString());//瀛愯〃鐨勯『搴廼d
int OperationType = int.Parse(sArray[3].ToString());//鏁版嵁绫诲瀷 1娣诲姞 3淇敼
+ string msg4 = sArray[4].ToString();
try
{
+ if (!DBUtility.ClsPub.Security_Log("Sb_EquipRepairSendWorkBill_Edit", 1, false, msg4))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
omodel = Newtonsoft.Json.JsonConvert.DeserializeObject<ClsSb_EquipRepairSendWorkBillMain>(msg2);
string BillType = "3909";
@@ -189,7 +210,7 @@
",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
",HRepairID,HManagerID,HRepairExplanation" +
") values("
- + omodel.HInterID.ToString() + "," + (hentryid==-1?i: hentryid) + ",'" + oSub.HCloseMan + "'," + oSub.HEntryCloseDate.ToShortDateString() + "," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
+ + omodel.HInterID.ToString() + "," + (hentryid == -1 ? i : hentryid) + ",'" + oSub.HCloseMan + "'," + oSub.HEntryCloseDate.ToShortDateString() + "," + 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.HRepairID.ToString() + "," + oSub.HManagerID.ToString() + ",'" + oSub.HRepairExplanation + "'" +
") ");
@@ -207,45 +228,21 @@
#region 璁惧缁翠慨娲惧伐鍗� 鍒犻櫎
[Route("Sb_EquipRepairSendWorkBill/DeleteWorkBill")]
[HttpGet]
- public object MouldDeleteBill(long HInterID, string User, string ModRightNameDelete)
+ public object MouldDeleteBill(long HInterID, string User)
{
try
{
//鍒ゆ柇鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, false, User))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁鍒犻櫎鏉冮檺";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ if (!DBUtility.ClsPub.Security_Log("Sb_EquipRepairSendWorkBill_Delete", 1, false, User))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鍒犻櫎鏉冮檺";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
- if (oBill.omodel.HBillStatus > 1)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 1;
- objJsonResult.Message = "鍗曟嵁褰撳墠澶勪簬涓嶈兘鍒犻櫎鐨勭姸鎬�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- if (oBill.omodel.HCloseMan != "")
- {
- objJsonResult.code = "0";
- objJsonResult.count = 1;
- objJsonResult.Message = "鍗曟嵁褰撳墠宸插叧闂�,涓嶈兘鍒犻櫎";
- objJsonResult.data = null;
- return objJsonResult;
- }
- if (oBill.omodel.HDeleteMan != "")
- {
- objJsonResult.code = "0";
- objJsonResult.count = 1;
- objJsonResult.Message = "鍗曟嵁褰撳墠宸蹭綔搴�,涓嶈兘鍒犻櫎";
- objJsonResult.data = null;
- return objJsonResult;
- }
if (oBill.omodel.HChecker != "")
{
objJsonResult.code = "0";
@@ -281,5 +278,187 @@
}
}
#endregion
+
+ #region 璁惧缁翠慨娲惧伐鍗� 瀹℃牳/鍙嶅鏍�
+ [Route("Sb_EquipRepairSendWorkBill/EquipAuditBill")]
+ [HttpGet]
+ public object EquipAuditBill(int HInterID, int IsAudit, string CurUserName)
+ {
+ string ModRightNameCheck = "Sb_EquipRepairSendWorkBill_Check"; //璇ユā鍧楃殑瀹℃牳鍔熻兘
+ DBUtility.ClsPub.CurUserName = CurUserName;//瀛樺偍鐢ㄦ埛鍚�
+ try
+ {
+ ////鍒ゆ柇鏄惁鏈夊鏍告潈闄�
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (HInterID <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "ID灏忎簬0";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ Int64 lngBillKey = 0;
+ lngBillKey = DBUtility.ClsPub.isLong(HInterID);//鏁版嵁杞崲
+
+ //鏌ヨ瀹℃牳鐨勬暟鎹�
+ ds = oCN.RunProcReturn("select * from Sb_EquipRepairSendWorkBillMain where HInterID='" + HInterID + "'", "Sb_EquipRepairSendWorkBillMain");
+
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ var hcloseman = ds.Tables[0].Rows[0]["hcloseman"].ToString();//鍏抽棴浜�
+ var hdeleteman = ds.Tables[0].Rows[0]["hdeleteman"].ToString();//浣滃簾浜�
+ var hchecker = ds.Tables[0].Rows[0]["hchecker"].ToString();//瀹℃牳浜�
+
+ if (hcloseman != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "褰撳墠鍗曟嵁宸插叧闂�,鏃犳硶瀹℃牳!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (hdeleteman != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "褰撳墠鍗曟嵁宸蹭綔搴�,鏃犳硶瀹℃牳!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //IsAudit==0 瀹℃牳
+ if (IsAudit == 0)
+ {
+ if (hchecker != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "褰撳墠鍗曟嵁宸插鏍�,鏃犳硶鍐嶆瀹℃牳!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ //IsAudit==1 鍙嶅鏍�
+ if (IsAudit == 1)
+ {
+ if (hchecker == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "褰撳墠鍗曟嵁鏈鏍�,鏃犳硶鍙嶅鏍�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�;鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //瀹℃牳鎻愪氦
+ if (IsAudit == 0)
+ {
+ if (CheckBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳鎴愬姛!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ //鍙嶅鏍告彁浜�
+ if (IsAudit == 1)
+ {
+ if (AbandonCheck(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍告垚鍔�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触鎴栧弽瀹℃牳澶辫触" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ //瀹℃牳
+ public bool CheckBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ string Hchecker = DBUtility.ClsPub.CurUserName;
+
+ oCN.BeginTran();//鎵撳紑浜嬪姟
+ oCN.RunProc("update Sb_EquipRepairSendWorkBillMain set HBillStatus=2,hchecker='"+Hchecker+ "',hcheckdate='"+DateTime.Now+ "' where HInterID='"+ lngBillKey + "'");
+ oCN.Commit();//鍏抽棴浜嬪姟
+ sReturn = "瀹℃牳鎴愬姛!";
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ throw (e);
+ }
+ }
+ //鍙嶅鏍�
+ public bool AbandonCheck(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ string Hchecker = DBUtility.ClsPub.CurUserName;
+
+ oCN.BeginTran();//鎵撳紑浜嬪姟
+ oCN.RunProc("update Sb_EquipRepairSendWorkBillMain set HBillStatus=1,hchecker='',hcheckdate=null where HInterID='" + lngBillKey + "'");
+ oCN.Commit();//鍏抽棴浜嬪姟
+ sReturn = "鍙嶅鏍稿崟鎹垚鍔�!";
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ throw(e);
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
--
Gitblit v1.9.1