From 54329f0ab6bf4d87d95e37a553ffdf0b14fa4bea Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期四, 08 八月 2024 17:31:07 +0800
Subject: [PATCH] 产品工艺参数清单， 增加 字段 HTechParamClassID int //工艺参数大类（Gy_TechnologyParameterClass） HSNO int //工艺次序 HStdNextTimes money //理论次序间隔 HTechParamIDStd int //对应设定值工艺参数(Gy_TechnologyParameter) （都是非必录）,修改出战斗获取模具
---
WebAPI/Controllers/CGGL/Cg_PayableBillController.cs | 103 ++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 92 insertions(+), 11 deletions(-)
diff --git a/WebAPI/Controllers/CGGL/Cg_PayableBillController.cs b/WebAPI/Controllers/CGGL/Cg_PayableBillController.cs
index 2027a30..acfea6f 100644
--- a/WebAPI/Controllers/CGGL/Cg_PayableBillController.cs
+++ b/WebAPI/Controllers/CGGL/Cg_PayableBillController.cs
@@ -85,10 +85,11 @@
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString(); //琛ㄥご鏁版嵁
string msg3 = sArray[1].ToString(); //瀛愯〃1鏁版嵁
- string refSav = sArray[2].ToString(); //鎿嶄綔鏂瑰紡
- string msg4 = sArray[3].ToString(); //鐢ㄦ埛
+ string msg4 = sArray[2].ToString(); //瀛愯〃2鏁版嵁
+ string refSav = sArray[3].ToString(); //鎿嶄綔鏂瑰紡
+ string msg5 = sArray[4].ToString(); //鐢ㄦ埛
- DBUtility.ClsPub.CurUserName = msg4;
+ DBUtility.ClsPub.CurUserName = msg5;
string UserName = "";
string s = "";
@@ -151,6 +152,7 @@
return objJsonResult;
}
}
+
UserName = oItem.HMaker; //鍒跺崟浜�
oItem.HBillType = "1114";
oItem.HBillSubType = "1114";
@@ -173,10 +175,10 @@
msg3 = msg3.Replace("\\", "");
msg3 = msg3.Replace("\n", ""); //\n
//msg2 = msg2.Replace("'", "鈥�");
- List<Model.ClsCg_PayableBillSub> ls = new List<Model.ClsCg_PayableBillSub>();
- ls = oListModels.getObjectByJson_Cg_PayableBillSub(msg3);
+ List<Model.ClsCg_PayableSub> ls = new List<Model.ClsCg_PayableSub>();
+ ls = oListModels.getObjectByJson_Cg_PayableSub(msg3);
int i = 0;
- foreach (Model.ClsCg_PayableBillSub oItemSub in ls)
+ foreach (Model.ClsCg_PayableSub oItemSub in ls)
{
i++;
oItemSub.HEntryID = i;
@@ -188,12 +190,44 @@
oBill.DetailColl.Add(oItemSub);
}
+ //瀛愯〃Entry
+ //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ msg4 = msg4.Substring(1, msg4.Length - 2);
+ msg4 = msg4.Replace("\\", "");
+ msg4 = msg4.Replace("\n", ""); //\n
+ //msg2 = msg2.Replace("'", "鈥�");
+ List<Model.ClsCg_PayableSub> ls2 = new List<Model.ClsCg_PayableSub>();
+ ls2 = oListModels.getObjectByJson_Cg_PayableSub(msg4);
+ int j = 0;
+ foreach (Model.ClsCg_PayableSub oItemSub in ls2)
+ {
+ j++;
+ oItemSub.HEntryID = j;
+
+ oItemSub.HCloseMan = ""; //琛屽叧闂�
+ oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
+
+ oBill.DetailCol2.Add(oItemSub);
+
+ }
+
+ //杩涜 浼氳鏈熼棿 缁撹处 鐨勫垽鏂拰鎺у埗
+ int sYear = 0;
+ int sPeriod = 0;
+ DateTime HDate = DateTime.Now;
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
+ {
+ objJsonResult.Message = s;
+ return objJsonResult;
+ }
//淇濆瓨
//淇濆瓨瀹屾瘯鍚庡鐞�
bool bResult;
if (refSav == "Add")
{
+
// bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
}
@@ -241,6 +275,7 @@
try
{
ds = oCN.RunProcReturn("select * from h_v_Cg_PayableBillList_EditInit where hmainid=" + HInterID, "h_v_Cg_PayableBillList_EditInit");
+ objJsonResult.data = ds.Tables[0];
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -251,10 +286,16 @@
}
else
{
+ ds = oCN.RunProcReturn(@"select a.*,mater.HNumber AS 鐗╂枡浠ｇ爜, mater.HName AS 鐗╂枡鍚嶇О, mater.HModel AS 瑙勬牸鍨嬪彿, mater.HUnitID, unit.HName AS 璁￠噺鍗曚綅 from Cg_PayableSub_Entry AS a LEFT OUTER JOIN
+ dbo.Gy_Material AS mater ON a.HMaterID = mater.HItemID LEFT OUTER JOIN
+ dbo.Gy_Unit AS unit ON mater.HUnitID = unit.HItemID where HInterID=" + HInterID, "Cg_PayableSub_Entry");
+ List<Object> dataTables = new List<Object>();
+ dataTables.Add(ds.Tables[0]);
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = dataTables;
+
return objJsonResult;
}
}
@@ -331,13 +372,28 @@
//}
////==================================================================================
+ //杩涜 浼氳鏈熼棿 缁撹处 鐨勫垽鏂拰鎺у埗
+ int sYear = 0;
+ int sPeriod = 0;
+ DateTime HDate = DateTime.Now;
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
+ {
+ objJsonResult.Message = s;
+ return objJsonResult;
+ }
oCN.BeginTran();
- oCN.RunProc("delete from Cg_PayableBillMain where HInterID = " + HInterID);
- oCN.RunProc("delete from Cg_PayableBillSub where HInterID= " + HInterID);
+ //搴斾粯鍗� 鍒犻櫎 鎾ら攢 閲囪喘鍏ュ簱鍗� 鍏宠仈鏁伴噺
+ oCN.RunProc("exec h_p_Cg_UpDateRelation_POStockInToPayable_Del " + HInterID);
+ //搴斾粯鍗� 鍒犻櫎 鎾ら攢 閲囪喘璁㈠崟 鍏宠仈鏁伴噺
+ oCN.RunProc("exec h_p_Cg_UpDateRelation_POOrderToPayable_Del " + HInterID);
+
+ oCN.RunProc("delete from Cg_PayableBillMain where HInterID = " + HInterID);
+ oCN.RunProc("delete from Cg_PayableSub where HInterID= " + HInterID);
+ oCN.RunProc("delete from Cg_PayableSub_Entry where HInterID= " + HInterID);
////鍒犻櫎鍚庢帶鍒�==================================================================================
//string sql2 = "exec h_p_Xs_ReceivableBill_AfterDelCtrl " + BillOld.omodel.HInterID + ",'" + BillOld.omodel.HBillNo + "','" + user + "'";
//ds = oCN.RunProcReturn(sql2, "h_p_Xs_ReceivableBill_AfterDelCtrl");
@@ -367,7 +423,7 @@
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "鎮ㄥ凡鍒犻櫎鍗曟嵁鍙蜂负" + BillOld.omodel.HBillNo + "鐨勫簲鏀跺崟锛�";
+ objJsonResult.Message = "鎮ㄥ凡鍒犻櫎鍗曟嵁鍙蜂负" + BillOld.omodel.HBillNo + "鐨勫簲浠樺崟锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -382,6 +438,8 @@
}
}
#endregion
+
+
#region 搴斾粯鍗� 瀹℃牳/鍙嶅鏍�
/// <summary>
@@ -477,6 +535,17 @@
//杩涜闇�瑕佽繘琛岀殑瀹℃牳/鍙嶅鏍告搷浣�
if (IsAudit == 0) //瀹℃牳鎻愪氦
{
+ //杩涜 浼氳鏈熼棿 缁撹处 鐨勫垽鏂拰鎺у埗
+ string s = "";
+ int sYear = 0;
+ int sPeriod = 0;
+ DateTime HDate = DateTime.Now;
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
+ {
+ objJsonResult.Message = s;
+ return objJsonResult;
+ }
+
oCN.BeginTran();
//璁板綍杩斿洖淇℃伅
@@ -531,6 +600,17 @@
}
if (IsAudit == 1) //鍙嶅鏍告彁浜�
{
+ //杩涜 浼氳鏈熼棿 缁撹处 鐨勫垽鏂拰鎺у埗
+ string s = "";
+ int sYear = 0;
+ int sPeriod = 0;
+ DateTime HDate = DateTime.Now;
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
+ {
+ objJsonResult.Message = s;
+ return objJsonResult;
+ }
+
////鍙嶅鏍稿墠鎺у埗=========================================
//string sql1 = "exec h_p_Xs_ReceivableBill_BeforeUnCheckCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'";
//ds = oCN.RunProcReturn(sql1, "h_p_Xs_ReceivableBill_BeforeUnCheckCtrl");
@@ -576,7 +656,7 @@
}
catch (Exception e)
{
- oCN.RollBack();
+ //oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -587,6 +667,7 @@
}
#endregion
+
#region 搴斾粯鍗� 鍏抽棴/鍙嶅叧闂�
/// <summary>
/// </summary>
--
Gitblit v1.9.1