From 7fb870f53ccf134a4f3baef58ff98917d8c712bb Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 18 七月 2024 11:31:54 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs | 96 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 89 insertions(+), 7 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
index 15c4b87..1974dc8 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -852,7 +852,7 @@
return objJsonResult;
}
- string sql1 = "select top 1000 * from h_v_IF_BarCodeBillList where 1 = 1 ";
+ string sql1 = "select top 5000 * from h_v_IF_BarCodeBillList where 1 = 1 ";
string sql = sql1 + sWhere + " order by hmainid desc";
ds = oCN.RunProcReturn(sql, "h_v_IF_BarCodeBillList");
@@ -1156,6 +1156,34 @@
}
#endregion
+ #region[鍣ㄥ叿妗ｆ缂栬緫鏃惰幏鍙栧瓙琛ㄦ暟鎹甝
+ [Route("Gy_MouldFileMain/Gy_MouldFileSubDetai")]
+ [HttpGet]
+ public object Gy_MouldFileSubDetai(long HInterID)
+ {
+ try
+ {
+ List<DataTable> tableList = new List<DataTable>();
+ ds = oCN.RunProcReturn("select a.*,b.HBillNo from Gy_MouldFileSub_MaintainRule AS a left join Sc_MouldMaintainRuleBillMain as b on b.HInterID = a.HMaintainRuleID where a.HInterID = " + HInterID, "Gy_MouldFileBill_MaintainRule");
+ tableList.Add(ds.Tables[0]);
+ ds = oCN.RunProcReturn("select a.*,b.HBillNo from Gy_MouldFileSub_DotCheckRule AS a left join Sc_MouldDotCheckRuleBillMain as b on b.HInterID = a.HDotCheckRuleID where a.HInterID = " + HInterID, "Gy_MouldFileBill_DotCheckRule");
+ tableList.Add(ds.Tables[0]);
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "";
+ objJsonResult.data = tableList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
/// <summary>
/// 鏂板妯″叿妗ｆ-淇濆瓨鎸夐挳
///鍙傛暟锛歴tring sql銆�
@@ -1185,7 +1213,6 @@
objJsonResult = AddBillMain(msg1);
if (objJsonResult.code == "0")
{
- oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = objJsonResult.Message;
@@ -1206,6 +1233,8 @@
string msg3 = sArray[1].ToString();//妯″潡鏉冮檺
string msg4 = sArray[2].ToString();//褰撳墠浜�
string msg5 = sArray[3].ToString();//瀛愯〃鏁版嵁
+ string msg6 = sArray[4].ToString();//瀛愯〃1鏁版嵁
+ string msg7 = sArray[5].ToString();//瀛愯〃2鏁版嵁
try
{
msg2 = "[" + msg2.ToString() + "]";
@@ -1295,7 +1324,7 @@
",0,0,'','',0,0 " +
") ");
- objJsonResult = AddBillSub(msg5,HInterID, HBillNo);
+ objJsonResult = AddBillSub(msg5,msg6,msg7,HInterID, HBillNo);
if (objJsonResult.code == "0")
{
@@ -1314,6 +1343,7 @@
}
catch (Exception e)
{
+ oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "Exception锛�" + e.ToString();
@@ -1339,6 +1369,8 @@
string msg3 = sArray[1].ToString();//妯″潡鏉冮檺
string msg4 = sArray[2].ToString();//褰撳墠浜�
string msg5 = sArray[3].ToString();//瀛愯〃鏁版嵁
+ string msg6 = sArray[4].ToString();//瀛愯〃2鏁版嵁
+ string msg7 = sArray[5].ToString();//瀛愯〃3鏁版嵁
try
{
if (!DBUtility.ClsPub.Security_Log(msg3, 1, false, msg4))
@@ -1471,8 +1503,9 @@
// oCN.RunProc("Update Gy_Department set HEndflag=0 where HItemID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
oCN.RunProc("delete from Gy_MouldFileSub_SubMater where HInterID='" + HInterID + "'");
-
- objJsonResult = AddBillSub(msg5, HInterID, HBillNo);
+ oCN.RunProc("delete from Gy_MouldFileSub_MaintainRule where HInterID='" + HInterID + "'");
+ oCN.RunProc("delete from Gy_MouldFileSub_DotCheckRule where HInterID='" + HInterID + "'");
+ objJsonResult = AddBillSub(msg5, msg6, msg7, HInterID, HBillNo);
oCN.Commit();
objJsonResult.code = "1";
@@ -1492,9 +1525,12 @@
}
}
- public json AddBillSub(string msg5, long HInterID, string HBillNo)
+ public json AddBillSub(string msg5, string msg6, string msg7, long HInterID, string HBillNo)
{
List<Gy_MouldFileSub_SubMater> DetailColl = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_MouldFileSub_SubMater>>(msg5);
+ List<ClsGy_MouldFileBillSub_MaintainRule> MaintainRuleColl = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsGy_MouldFileBillSub_MaintainRule>>(msg6);
+
+ List<ClsGy_MouldFileBillSub_DotCheckRule> DotCheckRuleColl = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsGy_MouldFileBillSub_DotCheckRule>>(msg7);
int i = 0; //浣滀负瀛愯〃鍐呯爜
foreach (Gy_MouldFileSub_SubMater oSub in DetailColl)
{
@@ -1517,6 +1553,50 @@
"')";
oCN.RunProc(sql);
+ }
+ i = 0;
+ //淇濆瓨淇濆吇瑙勬牸
+ foreach (ClsGy_MouldFileBillSub_MaintainRule oSub in MaintainRuleColl)
+ {
+ i++;
+ Int64 NewHEntryID = i;
+ Int64 newHFlag = 1;
+ if (oSub.HStdFlag == true)
+ {
+ newHFlag = 1;
+ }
+ else
+ {
+ newHFlag = 0;
+ }
+ oCN.RunProc($@"Insert into Gy_MouldFileSub_MaintainRule
+ (HInterID,HBillNo_bak,HEntryID,HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,
+ HMaintainRuleID,HStdFlag
+ )
+ values({HInterID},'{HBillNo}',{NewHEntryID},'{oSub.HRemark}',{oSub.HSourceInterID},{oSub.HSourceEntryID},'{oSub.HSourceBillNo}','{oSub.HSourceBillType}',{oSub.HRelationQty},{oSub.HRelationMoney}
+ ,{oSub.HMaintainRuleID},{newHFlag})");
+ }
+ i = 0;
+ //淇濆瓨鐐规瑙勭▼
+ foreach (ClsGy_MouldFileBillSub_DotCheckRule oSub in DotCheckRuleColl)
+ {
+ i++;
+ Int64 NewHEntryID = i;
+ Int64 newHFlag = 1;
+ if (oSub.HStdFlag == true)
+ {
+ newHFlag = 1;
+ }
+ else
+ {
+ newHFlag = 0;
+ }
+ oCN.RunProc($@"Insert into Gy_MouldFileSub_DotCheckRule
+ (HInterID,HBillNo_bak,HEntryID,HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,
+ HDotCheckRuleID,HStdFlag
+ )
+ values({HInterID},'{HBillNo}',{NewHEntryID},'{oSub.HRemark}',{oSub.HSourceInterID},{oSub.HSourceEntryID},'{oSub.HSourceBillNo}','{oSub.HSourceBillType}',{oSub.HRelationQty},{oSub.HRelationMoney}
+ ,{oSub.HDotCheckRuleID},{newHFlag})");
}
objJsonResult.code = "1";
@@ -1612,6 +1692,8 @@
}
if (oBill.DeleteBill(hmainid, ref DBUtility.ClsPub.sExeReturnInfo))
{
+ oCN.RunProc("Delete From Gy_MouldFileSub_MaintainRule where HInterID=" + hmainid);
+ oCN.RunProc("Delete From Gy_MouldFileSub_DotCheckRule where HInterID=" + hmainid);
//鍐欏叆鏃ュ織
ClsPub.Add_Log("", "鍒犻櫎椤圭洰锛屼唬鐮侊細" + oBill.omodel.HMouldNo + ",鍚嶇О锛�" + oBill.omodel.HName, ClsPub.CurUserName);
//鏇存柊涓婄骇涓� 鏈骇
@@ -1869,7 +1951,7 @@
,HPERUNITSTANDHOUR,HSTDLABORPREPARETIME,HSTDMACHINEPREPARETIME
)
values
- ({jsonData.HItemID},{jsonData.HERPItemID},'{jsonData.HNumber}','{jsonData.HName}','{jsonData.HModel}',
+ ({jsonData.HItemID},{jsonData.HItemID},'{jsonData.HNumber}','{jsonData.HName}','{jsonData.HModel}',
'{jsonData.HShortNumber}',{jsonData.HParentID},{jsonData.HLevel},{jsonData.HEndFlag},{jsonData.HStopflag},'{jsonData.HRemark}',{jsonData.HMaterClsID},{jsonData.HUnitID},{jsonData.HUnitGroupID},{jsonData.HLength},{jsonData.HWidth},{jsonData.HHeight},{jsonData.HJQty},{jsonData.HMQty},'{jsonData.HOldMaterNumber}',{jsonData.HWHID},{jsonData.HSPID},'{jsonData.HPlanMode}','{jsonData.HUseFlag}','{jsonData.HMakeTime}',{jsonData.HMinPickQty},{jsonData.HCREATEORGID},{jsonData.HUSEORGID},'{jsonData.HBatchManager}',{jsonData.HCHECKINCOMING},{jsonData.HAuxPropFlag},{jsonData.HISKFPERIOD},{jsonData.HAuxUnitID},{jsonData.HSNUnitID},{jsonData.HBASEUNITID},{jsonData.HSALEUNITID},{jsonData.HSALEPRICEUNITID},{jsonData.HPERUNITSTANDHOUR},'{jsonData.HSTDLABORPREPARETIME}','{jsonData.HSTDMACHINEPREPARETIME}')";
oCN.RunProc(sql);
--
Gitblit v1.9.1