From 76ffaf6c0b670ca779523ff22fbfb536bb45bf71 Mon Sep 17 00:00:00 2001
From: 杨乐 <yang.le.192@qq.com>
Date: 星期三, 19 一月 2022 08:49:55 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/Sc_ProcessMangementController.cs | 43 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 36 insertions(+), 7 deletions(-)
diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs
index f004cab..26b7cc7 100644
--- a/WebAPI/Controllers/Sc_ProcessMangementController.cs
+++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -223,6 +223,8 @@
}
#region 宸ュ簭璁″垝鍗�
+
+ #region 宸ュ簭璁″垝鍗曞垪琛�
List<ClsSc_ProcessPlanSub> DetailColl = new List<ClsSc_ProcessPlanSub>();
ClsSc_ProcessPlanMain omodel = new ClsSc_ProcessPlanMain();
/// <summary>
@@ -259,7 +261,9 @@
}
return GetObjectJson(ds);
}
+ #endregion
+ #region 淇濆瓨/缂栬緫
//宸ュ簭璁″垝鍗� 淇濆瓨/缂栬緫
[Route("Sc_ProcessMangement/AddBill")]
[HttpPost]
@@ -315,16 +319,39 @@
",'" + omodel.HDate.ToShortDateString() + "','" + omodel.HBillNo + "'," + omodel.HBillStatus.ToString() + "," + omodel.HCheckItemNowID.ToString() + "," + omodel.HCheckItemNextID.ToString() +
"," + omodel.HICMOInterID.ToString() + ",'" + omodel.HICMOBillNo + "'," + omodel.HMaterID.ToString() + ",'" + omodel.HMaterNumber + "'," + omodel.HUnitID.ToString() +
",'" + omodel.HUnitNumber + "'," + omodel.HPlanQty.ToString() + ",'" + omodel.HPlanBeginDate.ToShortDateString() + "','" + omodel.HPlanEndDate.ToShortDateString() + "','" + omodel.HExplanation + "'" +
- ",'" + omodel.HRemark + "','" + omodel.HInnerBillNo + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
+ ",'" + omodel.HRemark + "','" + omodel.HInnerBillNo + "','" + omodel.HMaker + "',getdate()" +
") ");
}
else if (OperationType == 3)
{
//淇敼
-
-
- //鍒犻櫎瀛愯〃
+ oCN.RunProc("UpDate Sc_ProcessPlanMain set " +
+ " HYear=" + omodel.HYear.ToString() +
+ ",HPeriod=" + omodel.HPeriod.ToString() +
+ //",HInterID=" + omodel.HInterID.ToString() +
+ ",HDate='" + omodel.HDate.ToShortDateString() + "'" +
+ //",HBillNo='" + omodel.HBillNo + "'" +
+ ",HBillStatus=" + omodel.HBillStatus.ToString() +
+ ",HCheckItemNowID=" + omodel.HCheckItemNowID.ToString() +
+ ",HCheckItemNextID=" + omodel.HCheckItemNextID.ToString() +
+ ",HICMOInterID=" + omodel.HICMOInterID.ToString() +
+ ",HICMOBillNo='" + omodel.HICMOBillNo + "'" +
+ ",HMaterID=" + omodel.HMaterID.ToString() +
+ ",HMaterNumber='" + omodel.HMaterNumber + "'" +
+ ",HUnitID=" + omodel.HUnitID.ToString() +
+ ",HUnitNumber='" + omodel.HUnitNumber + "'" +
+ ",HPlanQty=" + omodel.HPlanQty.ToString() +
+ ",HPlanBeginDate='" + omodel.HPlanBeginDate.ToShortDateString() + "'" +
+ ",HPlanEndDate='" + omodel.HPlanEndDate.ToShortDateString() + "'" +
+ ",HExplanation='" + omodel.HExplanation + "'" +
+ ",HRemark='" + omodel.HRemark + "'" +
+ ",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
+ ",HUpDater='" + omodel.HUpDater + "'" +
+ ",HUpDateDate=getdate()" +
+ " where HInterID=" + omodel.HInterID.ToString());
+ //鍒犻櫎瀛愯〃
+ oCN.RunProc("Delete From Sc_ProcessPlanSub where HInterID = " + omodel.HInterID.ToString()+ " and hentryid="+ hentryid);
}
//淇濆瓨瀛愯〃
objJsonResult = AddBillSub(msg3, hentryid);
@@ -374,7 +401,7 @@
+ omodel.HInterID.ToString() + "," +(hentryid==-1?i: hentryid) + ",'" + oSub.HBillNo + "'," + oSub.HProcNo.ToString() + "," + oSub.HProcID.ToString() + "," + oSub.HWorkingQty.ToString() +
",'" + oSub.HProcNumber + "','" + oSub.HWorkRemark + "'," + oSub.HCenterID.ToString() + "," + oSub.HDeptID.ToString() + ",'" + oSub.HDeptNumber + "'" +
"," + oSub.HGroupID.ToString() + ",'" + oSub.HGroupNumber + "'," + oSub.HWorkerID.ToString() + ",'" + oSub.HWorkerNumber + "'," + oSub.HSourceID.ToString() +
- "," + oSub.HQty.ToString() + ",'" + oSub.HTimeUnit + "'," + oSub.HPlanWorkTimes.ToString() + ",'" + oSub.HPlanBeginDate.ToShortDateString() + "','" + oSub.HPlanEndDate.ToShortDateString() + "'" +
+ "," + oSub.HQty.ToString() + ",'" + oSub.HTimeUnit + "'," + oSub.HPlanWorkTimes.ToString() + ",'" + oSub.HPlanBeginDate.ToString() + "','" + oSub.HPlanEndDate.ToString() + "'" +
"," + oSub.HICMOInterID.ToString() + ",'" + oSub.HICMOBillNo + "'," + oSub.HSeOrderInterID.ToString() + "," + oSub.HSeOrderEntryID.ToString() + ",'" + oSub.HSeOrderBillNo + "'" +
",'" + 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() +
@@ -390,6 +417,8 @@
objJsonResult.data = null;
return objJsonResult;
}
+ #endregion
+
#endregion
/// <summary>
/// 杩斿洖鐢熶骇宸ュ簭娲惧伐鍗曞垪琛�
@@ -1445,7 +1474,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;
@@ -1548,7 +1577,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;
--
Gitblit v1.9.1