From b129762a4bb5ec2cde5edf16bc9cbda57c73587d Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 24 五月 2023 09:33:10 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/Sc_MouldRepairInBillListController.cs | 157 ++++++++++++++++++++++++++++++++++------------------
1 files changed, 102 insertions(+), 55 deletions(-)
diff --git a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
index 44c6e98..63e2e3d 100644
--- a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
+++ b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
@@ -336,8 +336,7 @@
columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
}
- //if (ds.Tables[0].Rows.Count != 0 || ds != null)
- //{
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
@@ -345,15 +344,6 @@
objJsonResult.list = columnNameList;
return objJsonResult;
- //}
- //else
- //{
- //objJsonResult.code = "0";
- //objJsonResult.count = 0;
- //objJsonResult.Message = "鏃犳暟鎹�";
- //objJsonResult.data = null;
- //return objJsonResult;
- //}
}
catch (Exception ex)
{
@@ -3200,6 +3190,7 @@
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
string msg4 = sArray[2].ToString();
+ //string msg5 = sArray[3].ToString();
string UserName = "";
ListModels oListModels = new ListModels();
@@ -3223,6 +3214,7 @@
{
//oItem.HMaker = "";
UserName = oItem.HMaker; //鍒跺崟浜�
+ oItem.HMaker = msg4;
oItem.HBillType = "3821";
oItem.HBillSubType = "3821";
@@ -3285,6 +3277,32 @@
oBill.DetailColl.Add(oItemSub);
}
+
+ ////閰嶄欢椤硅〃浣撴暟鎹�
+ ////鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ //msg5 = msg5.Substring(1, msg5.Length - 2);
+ //msg5 = msg5.Replace("\\", "");
+ //msg5 = msg5.Replace("\n", ""); //\n
+ // //msg2 = msg2.Replace("'", "鈥�");
+ //List<Model.ClsSc_MouldDotCheckBillSub_Item> ls1 = new List<Model.ClsSc_MouldDotCheckBillSub_Item>();
+ //ls1 = oListModels.getObjectByJson_Sc_MouldDotCheckBillSub_Item(msg5);
+ //int j = 0;
+ //foreach (Model.ClsSc_MouldDotCheckBillSub_Item oItemSub in ls1)
+ //{
+
+ // j++;
+ // oItemSub.HEntryID = j;
+ // //oItemSub.HCloseMan = ""; //琛屽叧闂�
+ // oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ // oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
+
+ // oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
+ // oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
+
+ // oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
+ // oBill.DetailCol.Add(oItemSub);
+ //}
+
//淇濆瓨
//淇濆瓨瀹屾瘯鍚庡鐞�
bool bResult;
@@ -3346,28 +3364,29 @@
[HttpGet]
public object Sc_MouldDotCheckBillListProjectDetai(string sqlWhere)
{
- DataSet ds;
+ DataSet ds, ds1;
+ List<object> list = new List<object>();
+ string Swhere = "";
try
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- if (sqlWhere == null || sqlWhere.Equals(""))
- {
- ds = oCN.RunProcReturn("select HDotCheckItemID,鐐规椤圭洰 HDotCheckItem,鐐规閮ㄤ綅 HDotCheckPart,鍏蜂綋瑕佹眰 HClaim,琛ㄤ綋澶囨敞 HRemark,HManagerID,璐熻矗浜轰唬鐮� HManagerNumber,璐熻矗浜� HManagerName from h_v_Sc_MouldDotCheckBillList", "h_v_Sc_MouldDotCheckBillList");
- objJsonResult.code = "0";
- objJsonResult.count = 1;
- objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
- objJsonResult.data = ds.Tables[0];
- }
- else
- {
- string sql1 = "select HDotCheckItemID,鐐规椤圭洰 HDotCheckItem,鐐规閮ㄤ綅 HDotCheckPart,鍏蜂綋瑕佹眰 HClaim,琛ㄤ綋澶囨敞 HRemark,HManagerID,璐熻矗浜轰唬鐮� HManagerNumber,璐熻矗浜� HManagerName from h_v_Sc_MouldDotCheckBillList where 1 = 1 ";
- string sql = sql1 + sqlWhere;
- ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldDotCheckBillList");
- objJsonResult.code = "0";
- objJsonResult.count = 1;
- objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
- objJsonResult.data = ds.Tables[0];
- }
+ //鑾峰彇鐐规椤圭洰缂栬緫鏁版嵁
+ ds = oCN.RunProcReturn("select HDotCheckItem, HDotCheckPart , HClaim, a.HRemark,a.HManagerID,e.HNumber HManagerCode,e.HName HManagerName from Sc_MouldDotCheckBillSub a left join Gy_Employee e on a.HManagerID=e.HItemID where 1=1 " + sqlWhere, "Sc_MouldDotCheckBillSub");
+ //鑾峰彇閰嶄欢椤圭洰缂栬緫鏁版嵁
+ ds1 = oCN.RunProcReturn(@"select b.HMaterID, mt.Hnumber HMaterNumber ,mt.HName HMaterName, b.HUnitID
+ ,u2.hnumber HUnitNumber,u2.HName HUnitName,b.HQty,b.HQtyMust,b.HRemark
+ from Sc_MouldDotCheckBillSub_Item b
+ left join Gy_Material mt on b.HMaterID=mt.HItemID
+ left join h_v_IF_Unit u2 on b.HUnitID=u2.HItemID where 1=1 " + sqlWhere, "Sc_MouldDotCheckBillSub_Item");
+ list.Add(ds.Tables[0]);
+ list.Add(ds1.Tables[0]);
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = null;
+ objJsonResult.list = list;
+
}
catch (Exception e)
{
@@ -3506,6 +3525,7 @@
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
string msg4 = sArray[2].ToString();
+ //string msg5 = sArray[3].ToString();
string UserName = "";
@@ -3520,7 +3540,7 @@
objJsonResult.data = null;
return objJsonResult;
}
-
+ DBUtility.ClsPub.CurUserName = msg4;
DAL.ClsSc_MouldDotCheckPlanBill oBill = new DAL.ClsSc_MouldDotCheckPlanBill();
List<Model.ClsSc_MouldDotCheckPlanBillMain> lsmain = new List<Model.ClsSc_MouldDotCheckPlanBillMain>();
msg2 = msg2.Replace("\\", "");
@@ -3530,8 +3550,8 @@
{
//oItem.HMaker = "";
UserName = oItem.HMaker; //鍒跺崟浜�
- oItem.HBillType = "3821";
- oItem.HBillSubType = "3821";
+ oItem.HBillType = "3820";
+ oItem.HBillSubType = "3820";
//oItem.HInterID =0;
//oItem.HBillNo = "";
@@ -3559,7 +3579,7 @@
}
oBill.omodel = oItem;
}
- //琛ㄤ綋鏁版嵁
+ //鐐规椤圭洰琛ㄤ綋鏁版嵁
//鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
msg3 = msg3.Substring(1, msg3.Length - 2);
msg3 = msg3.Replace("\\", "");
@@ -3592,6 +3612,32 @@
oBill.DetailColl.Add(oItemSub);
}
+
+ ////閰嶄欢椤硅〃浣撴暟鎹�
+ ////鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ //msg5 = msg5.Substring(1, msg5.Length - 2);
+ //msg5 = msg5.Replace("\\", "");
+ //msg5 = msg5.Replace("\n", ""); //\n
+ // //msg2 = msg2.Replace("'", "鈥�");
+ //List<Model.ClsSc_MouldDotCheckPlanBillSub_Item> ls1 = new List<Model.ClsSc_MouldDotCheckPlanBillSub_Item>();
+ //ls1 = oListModels.getObjectByJson_Sc_MouldDotCheckPlanBillSub_Item(msg5);
+ //int j = 0;
+ //foreach (Model.ClsSc_MouldDotCheckPlanBillSub_Item oItemSub in ls1)
+ //{
+
+ // j++;
+ // oItemSub.HEntryID = j;
+ // //oItemSub.HCloseMan = ""; //琛屽叧闂�
+ // oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ // oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
+
+ // oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
+ // oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
+
+ // oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
+ // oBill.DetailCol.Add(oItemSub);
+ //}
+
//淇濆瓨
//淇濆瓨瀹屾瘯鍚庡鐞�
bool bResult;
@@ -3653,28 +3699,29 @@
[HttpGet]
public object Sc_MouldDotCheckPlanBillListProjectDetai(string sqlWhere)
{
- DataSet ds;
+ DataSet ds, ds1;
+ List<object> list = new List<object>();
+ string Swhere = "";
try
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- if (sqlWhere == null || sqlWhere.Equals(""))
- {
- ds = oCN.RunProcReturn("select HDotCheckItem, HDotCheckPart , HClaim, a.HRemark,a.HManagerID,e.HNumber HManagerCode,e.HName HManagerName from Sc_MouldDotCheckPlanBillSub a left join Gy_Employee e on a.HManagerID=e.HItemID", "Sc_MouldDotCheckPlanBillSub");
- objJsonResult.code = "0";
- objJsonResult.count = 1;
- objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
- objJsonResult.data = ds.Tables[0];
- }
- else
- {
- string sql1 = "select HDotCheckItem, HDotCheckPart , HClaim, a.HRemark,a.HManagerID,e.HNumber HManagerCode,e.HName HManagerName from Sc_MouldDotCheckPlanBillSub a left join Gy_Employee e on a.HManagerID=e.HItemID where 1 = 1 ";
- string sql = sql1 + sqlWhere;
- ds = oCN.RunProcReturn(sql, "Sc_MouldDotCheckPlanBillSub");
- objJsonResult.code = "0";
- objJsonResult.count = 1;
- objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
- objJsonResult.data = ds.Tables[0];
- }
+ //鑾峰彇鐐规椤圭洰缂栬緫鏁版嵁
+ ds = oCN.RunProcReturn(@"select a.HDotCheckItemID,HDotCheckItem, HDotCheckPart , HClaim, a.HRemark,a.HManagerID,e.HNumber HManagerCode,e.HName HManagerName from Sc_MouldDotCheckPlanBillSub a
+ left join Gy_Employee e on a.HManagerID=e.HItemID
+ where 1=1 " + sqlWhere, "Sc_MouldDotCheckPlanBillSub");
+ ////鑾峰彇閰嶄欢椤圭洰缂栬緫鏁版嵁
+ //ds1 = oCN.RunProcReturn(@"select b.HMaterID, mt.Hnumber HMaterNumber ,mt.HName HMaterName, b.HUnitID
+ // ,u2.hnumber HUnitNumber,u2.HName HUnitName,b.HQty,b.HQtyMust,b.HRemark
+ // from Sc_MouldDotCheckPlanBillSub_Item b
+ // left join Gy_Material mt on b.HMaterID=mt.HItemID
+ // left join h_v_IF_Unit u2 on b.HUnitID=u2.HItemID where 1=1 " + sqlWhere, "Sc_MouldDotCheckPlanBillSub_Item");
+ list.Add(ds.Tables[0]);
+ //list.Add(ds1.Tables[0]);
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = null;
+ objJsonResult.list = list;
}
catch (Exception e)
{
@@ -3808,7 +3855,7 @@
ds = oCN.RunProcReturn(string.Format(@"SELECT HMaterID,妯″叿浠ｇ爜 HMaterCode,妯″叿鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec,HPropertyID,杈呭姪灞炴�т唬鐮� HPropertyCode,杈呭姪灞炴�у悕绉� HPropertyName,
HSecUnitID, 杈呭姪璁￠噺鍗曚綅浠ｇ爜 HSecUnitCode, 杈呭姪璁￠噺鍗曚綅鍚嶇О HSecUnitName, HUnitID, 璁￠噺鍗曚綅浠ｇ爜 HUnitCode, 璁￠噺鍗曚綅鍚嶇О HUnitName, 鎵规 HBatchNo,
璁捐瀵垮懡 HDesignLife, 鍓╀綑瀵垮懡 HLeaveLife, 浣跨敤瀵垮懡 HUseLife, 瀹炴敹鏁伴噺 HQty, 鍗曚环 HPrice, 閲戦 HMoney, HWHID, 鏀舵枡浠撳簱浠ｇ爜 HWHCode, 鏀舵枡浠撳簱鍚嶇О HWHName,
- HSPID, 浠撲綅浠ｇ爜 HSPCode, 浠撲綅鍚嶇О HSPName, 澶囨敞 HRemark,HStockOrgID
+ HSPID, 浠撲綅浠ｇ爜 HSPCode, 浠撲綅鍚嶇О HSPName, 瀛愬娉� HRemark,HStockOrgID
FROM h_v_Sc_MouldScrapInHouseBillList"), "h_v_Sc_MouldScrapInHouseBillList");
}
@@ -3819,7 +3866,7 @@
string sql1 = string.Format(@"SELECT HMaterID,妯″叿浠ｇ爜 HMaterCode,妯″叿鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec,HPropertyID,杈呭姪灞炴�т唬鐮� HPropertyCode,杈呭姪灞炴�у悕绉� HPropertyName,
HSecUnitID, 杈呭姪璁￠噺鍗曚綅浠ｇ爜 HSecUnitCode, 杈呭姪璁￠噺鍗曚綅鍚嶇О HSecUnitName, HUnitID, 璁￠噺鍗曚綅浠ｇ爜 HUnitCode, 璁￠噺鍗曚綅鍚嶇О HUnitName, 鎵规 HBatchNo,
璁捐瀵垮懡 HDesignLife, 鍓╀綑瀵垮懡 HLeaveLife, 浣跨敤瀵垮懡 HUseLife, 瀹炴敹鏁伴噺 HQty, 鍗曚环 HPrice, 閲戦 HMoney, HWHID, 鏀舵枡浠撳簱浠ｇ爜 HWHCode, 鏀舵枡浠撳簱鍚嶇О HWHName,
- HSPID, 浠撲綅浠ｇ爜 HSPCode, 浠撲綅鍚嶇О HSPName, 澶囨敞 HRemark,HStockOrgID
+ HSPID, 浠撲綅浠ｇ爜 HSPCode, 浠撲綅鍚嶇О HSPName, 瀛愬娉� HRemark,HStockOrgID
FROM h_v_Sc_MouldScrapInHouseBillList where 1 = 1 ");
string sql = sql1 + sqlWhere;
ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldScrapInHouseBillList");
--
Gitblit v1.9.1