From 33a5c824cc07854081e08aa9344bafe00cd03fc7 Mon Sep 17 00:00:00 2001
From: 仲国强 <519541279@qq.com>
Date: 星期三, 25 八月 2021 22:00:34 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs | 508 +++++++++++++++++++++++++------------------------------
1 files changed, 230 insertions(+), 278 deletions(-)
diff --git a/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs b/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs
index 13b24c7..df0b009 100644
--- a/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs
+++ b/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs
@@ -219,7 +219,18 @@
public static DataSet Sc_MouldMaintainBillList_s(string sWhere)
{
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldMaintainBillList ", "h_v_Sc_MouldMaintainBillList");
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldMaintain", "h_v_Sc_MouldMaintain");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Sc_MouldMaintain where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldMaintain");
+
+ }
+ //return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldMaintainBillList ", "h_v_Sc_MouldMaintainBillList");
}
#endregion
@@ -317,7 +328,7 @@
public static DataSet Sc_MouldDotCheckBillList_s(string sWhere)
{
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldDotCheckBillList ", "h_v_Sc_MouldDotCheckBillList");
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldDotCheckBillList where 1=1 "+sWhere+" ", "h_v_Sc_MouldDotCheckBillList");
}
#endregion
@@ -610,7 +621,16 @@
public static DataSet Sc_MouldRepairWorkBillList_s(string sWhere)
{
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldRepairWorkBillList ", "h_v_Sc_MouldRepairWorkBillList");
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldRepairWorkBillList " + sWhere, "h_v_Sc_MouldRepairWorkBillList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Sc_MouldRepairWorkBillList where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldRepairWorkBillList");
+ }
}
#endregion
@@ -1353,7 +1373,7 @@
if (sqlWhere == null || sqlWhere.Equals(""))
{
//ds = oCN.RunProcReturn("select HRepairID,HRepairExplanation,HManagerID,HMoney,HRemark from Sc_MouldRepairWorkBillSub", "Sc_MouldRepairWorkBillSub");
- ds = oCN.RunProcReturn("select HRepairSonID HRepairID, 瀛愮淮淇」鐩唬鐮� HRepairCode,瀛愮淮淇」鐩� HRepairName,瀛愮淮淇姹� HRepairExplanation,HManagerSonID HManagerID,瀛愯礋璐ｄ汉浠ｇ爜 HManagerCode,瀛愯礋璐ｄ汉 HManagerName,缁翠慨璐圭敤 HMoney,琛ㄤ綋澶囨敞 HRemark from h_v_Sc_MouldRepairWorkBillList_Edit", "h_v_Sc_MouldRepairWorkBillList_Edit");
+ ds = oCN.RunProcReturn("select HRepairID, 瀛愮淮淇」鐩唬鐮� HRepairCode,瀛愮淮淇」鐩� HRepairName,瀛愮淮淇姹� HRepairExplanation,HManagerSonID HManagerID,瀛愯礋璐ｄ汉浠ｇ爜 HManagerCode,瀛愯礋璐ｄ汉 HManagerName,缁翠慨璐圭敤 HMoney,琛ㄤ綋澶囨敞 HRemark from h_v_Sc_MouldRepairWorkBillList_Edit", "h_v_Sc_MouldRepairWorkBillList_Edit");
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
@@ -1362,7 +1382,7 @@
else
{
//string sql1 = "select HRepairID,HRepairExplanation,HManagerID,HMoney,HRemark from Sc_MouldRepairWorkBillSub where 1 = 1 ";
- string sql1 = "select HRepairSonID HRepairID, 瀛愮淮淇」鐩唬鐮� HRepairCode,瀛愮淮淇」鐩� HRepairName,瀛愮淮淇姹� HRepairExplanation,HManagerSonID HManagerID,瀛愯礋璐ｄ汉浠ｇ爜 HManagerCode,瀛愯礋璐ｄ汉 HManagerName,缁翠慨璐圭敤 HMoney,琛ㄤ綋澶囨敞 HRemark from h_v_Sc_MouldRepairWorkBillList_Edit where 1 = 1 ";
+ string sql1 = "select HRepairID,瀛愮淮淇」鐩唬鐮� HRepairCode,瀛愮淮淇」鐩� HRepairName,瀛愮淮淇姹� HRepairExplanation,HManagerSonID HManagerID,瀛愯礋璐ｄ汉浠ｇ爜 HManagerCode,瀛愯礋璐ｄ汉 HManagerName,缁翠慨璐圭敤 HMoney,琛ㄤ綋澶囨敞 HRemark from h_v_Sc_MouldRepairWorkBillList_Edit where 1 = 1 ";
string sql = sql1 + sqlWhere;
ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldRepairWorkBillList_Edit");
objJsonResult.code = "0";
@@ -2432,6 +2452,7 @@
#endregion
#endregion
+
#region 妯″叿淇濆吇璁板綍琛�
#region 妯″叿淇濆吇璁板綍琛� 淇濆瓨/缂栬緫
@@ -2449,7 +2470,7 @@
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
-
+ string msg4 = sArray[2].ToString();
string UserName = "";
ListModels oListModels = new ListModels();
@@ -2462,10 +2483,10 @@
lsmain = oListModels.getObjectByJson_Sc_MouldMaintainBillMain(msg2);
foreach (Model.ClsSc_MouldMaintainBillMain oItem in lsmain)
{
- //oItem.HMaker = "";
UserName = oItem.HMaker; //鍒跺崟浜�
- oItem.HBillType = "3818";
- oItem.HBillSubType = "3818";
+ DBUtility.ClsPub.CurUserName = UserName;
+ oItem.HBillType = "3819";
+ oItem.HBillSubType = "3819";
//oItem.HInterID =0;
//oItem.HBillNo = "";
@@ -2493,16 +2514,16 @@
}
oBill.omodel = oItem;
}
- //琛ㄤ綋鏁版嵁
+ //淇濆吇椤硅〃浣撴暟鎹�
//鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
msg3 = msg3.Substring(1, msg3.Length - 2);
msg3 = msg3.Replace("\\", "");
msg3 = msg3.Replace("\n", ""); //\n
//msg2 = msg2.Replace("'", "鈥�");
- List<Model.ClsSc_MouldMaintainBillSub> ls = new List<Model.ClsSc_MouldMaintainBillSub>();
- ls = oListModels.getObjectByJson_Sc_MouldMaintainBillSub(msg3);
+ List<Model.ClsSc_MouldMaintainRuleBillSub_Item> ls = new List<Model.ClsSc_MouldMaintainRuleBillSub_Item>();
+ ls = oListModels.getObjectByJson_Sc_MouldMaintainRuleBillSub_Item(msg3);
int i = 0;
- foreach (Model.ClsSc_MouldMaintainBillSub oItemSub in ls)
+ foreach (Model.ClsSc_MouldMaintainRuleBillSub_Item oItemSub in ls)
{
i++;
@@ -2516,6 +2537,32 @@
//oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿
//oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
+ oBill.DetailCol.Add(oItemSub);
+
+ }
+ //閰嶄欢椤硅〃浣撴暟鎹�
+ //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ msg4 = msg4.Substring(1, msg4.Length - 2);
+ msg4 = msg4.Replace("\\", "");
+ msg4 = msg4.Replace("\n", ""); //\n
+ //msg2 = msg2.Replace("'", "鈥�");
+ List<Model.ClsSc_MouldMaintainBillSub> ls1 = new List<Model.ClsSc_MouldMaintainBillSub>();
+ ls1 = oListModels.getObjectByJson_Sc_MouldMaintainBillSub(msg4);
+ int j = 0;
+ foreach (Model.ClsSc_MouldMaintainBillSub Sub in ls1)
+ {
+
+ j++;
+ Sub.HEntryID = j;
+ //oItemSub.HCloseMan = ""; //琛屽叧闂�
+ Sub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ Sub.HCloseType = false; //鍏抽棴绫诲瀷
+ //oItemSub.HRemark = ""; //澶囨敞
+ Sub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
+ Sub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
+ //oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿
+ //oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
+ Sub.HRelationQty = 0; //鍏宠仈鏁伴噺
//oItemSub.HRelationMoney = 0; //鍏宠仈閲戦
//HMaterID = "";//閰嶄欢浠ｇ爜
//HUnitID = "";//鍗曚綅浠ｇ爜
@@ -2523,7 +2570,7 @@
//HQtyMust = "";//鍗曚綅鐢ㄩ噺
//HRemark = "";//澶囨敞
- oBill.DetailColl.Add(oItemSub);
+ oBill.DetailColl.Add(Sub);
}
//淇濆瓨
@@ -2567,7 +2614,6 @@
}
#endregion
-
#region[妯″叿淇濆吇璁板綍琛ㄧ紪杈戞椂鑾峰彇琛ㄥご鏁版嵁]
[Route("Sc_MouldMaintainBill/Sc_MouldMaintainBillListCheckDetai")]
[HttpGet]
@@ -2576,12 +2622,13 @@
if (string.IsNullOrEmpty(HID))
return new ApiResult<DataSet> { code = -1, msg = "ID涓嶈兘涓虹┖" };
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Sc_MouldMaintainBillList where hmainid= " + HID + " ", "h_v_Sc_MouldMaintainBillList");
+ var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Sc_MouldMaintain where hmainid= " + HID + " ", "h_v_Sc_MouldMaintain");
if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄤ繚鍏昏褰曡〃" };
return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
}
#endregion
+
#region[妯″叿淇濆吇璁板綍琛ㄧ紪杈戞椂鑾峰彇琛ㄩ鏁版嵁]
[Route("Sc_MouldMaintainBill/Sc_MouldMaintainBillListProjectDetai")]
[HttpGet]
@@ -2621,13 +2668,56 @@
}
#endregion
+ #region[妯″叿淇濆吇璁板綍琛ㄧ紪杈戞椂鑾峰彇琛ㄤ綋鏁版嵁鏂�(淇濆吇椤瑰垪琛ㄣ�侀厤浠堕」鍒楄〃)]
+ [Route("Sc_MouldMaintainBill/Sc_MouldMaintainBillListProjectDetaiNew")]
+ [HttpGet]
+ public object Sc_MouldMaintainBillListProjectDetaiNew(string HInterID)
+ {
+
+ DataSet ds,ds1;
+ List<object> list = new List<object>();
+ string Swhere = "";
+ try
+ {
+ if (HInterID != "" || HInterID != null)
+ {
+ Swhere = " and hmainid='" + HInterID + "'";
+ }
+ else
+ {
+ Swhere = HInterID;
+ }
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ //鑾峰彇淇濆吇椤圭洰缂栬緫鏁版嵁
+ string sql = "select HMaintainItemID, 淇濆吇椤圭洰浠ｇ爜 HMaintainItemNumber,淇濆吇椤圭洰鍚嶇О HMaintainItem,淇濆吇閮ㄤ綅 HMaintainPart,鍏蜂綋瑕佹眰 HClaim,HManagerID,璐熻矗浜轰唬鐮� HManagerNumber,璐熻矗浜� HManagerName,琛ㄤ綋澶囨敞 HRemark from h_v_Sc_MouldMaintainBillListItem where 1 = 1 " + Swhere + "";
+ ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldMaintainBillListItem");
+ //鑾峰彇閰嶄欢椤圭洰缂栬緫鏁版嵁
+ string sql1 = "select HMaterID, 閰嶄欢浠ｇ爜 HMaterNumber,閰嶄欢鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec,HUnitID,鍗曚綅浠ｇ爜 HUnitNumber,鍗曚綅鍚嶇О HUnitName,瀹為檯鐢ㄩ噺 HQty,鏍囧噯鐢ㄩ噺 HQtyMust,HManagerID,璐熻矗浜轰唬鐮� HManagerNumber,璐熻矗浜� HManagerName,琛ㄤ綋澶囨敞 HRemark from h_v_Sc_MouldMaintainBillList where 1 = 1 " + Swhere + "";
+ ds1 = oCN.RunProcReturn(sql1, "h_v_Sc_MouldMaintainBillList");
+ list.Add(ds.Tables[0]);
+ list.Add(ds1.Tables[0]);
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.list = list;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ }
+ return objJsonResult;
+ }
+ #endregion
#region [妯″叿淇濆吇璁板綍琛ㄥ垹闄ゅ姛鑳絔
- /// <summary>
- /// 妯″叿缁翠慨鍗曞垹闄ゅ姛鑳�
- /// </summary>
- /// <returns></returns>
- [Route("Sc_MouldMaintainBill/DeltetSc_MouldMaintainBill")]
+ /// <summary>
+ /// 妯″叿缁翠慨鍗曞垹闄ゅ姛鑳�
+ /// </summary>
+ /// <returns></returns>
+ [Route("Sc_MouldMaintainBill/DeltetSc_MouldMaintainBill")]
[HttpGet]
public object DeltetSc_MouldMaintainBill(string HInterID)
{
@@ -2702,8 +2792,8 @@
}
#endregion
-
#endregion
+
#region 妯″叿鐐规璁板綍琛�
#region 妯″叿鐐规璁板綍琛� 淇濆瓨/缂栬緫
@@ -2865,7 +2955,7 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
if (sqlWhere == null || sqlWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select HDotCheckItem,HDotCheckPart,HClaim,HRemark,HManagerID from Sc_MouldDotCheckBillSub", "Sc_MouldMaintainBillSub");
+ ds = oCN.RunProcReturn("select 鐐规椤圭洰 HDotCheckItem,鐐规閮ㄤ綅 HDotCheckPart,鍏蜂綋瑕佹眰 HClaim,琛ㄤ綋澶囨敞 HRemark,HManagerID,璐熻矗浜轰唬鐮� HManagerNumber,璐熻矗浜� HManagerName from h_v_Sc_MouldDotCheckBillList", "h_v_Sc_MouldDotCheckBillList");
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
@@ -2873,9 +2963,9 @@
}
else
{
- string sql1 = "select HDotCheckItem,HDotCheckPart,HClaim,HRemark,HManagerID from Sc_MouldDotCheckBillSub where 1 = 1 ";
+ string sql1 = "select 鐐规椤圭洰 HDotCheckItem,鐐规閮ㄤ綅 HDotCheckPart,鍏蜂綋瑕佹眰 HClaim,琛ㄤ綋澶囨敞 HRemark,HManagerID,璐熻矗浜轰唬鐮� HManagerNumber,璐熻矗浜� HManagerName from h_v_Sc_MouldDotCheckBillList where 1 = 1 ";
string sql = sql1 + sqlWhere;
- ds = oCN.RunProcReturn(sql, "Sc_MouldDotCheckBillSub");
+ ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldDotCheckBillList");
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
@@ -2892,7 +2982,6 @@
return objJsonResult;
}
#endregion
-
#region [妯″叿鐐规璁板綍琛ㄥ垹闄ゅ姛鑳絔
/// <summary>
@@ -2976,6 +3065,7 @@
#endregion
+
#region 妯″叿鐐规璁″垝琛�
#region 妯″叿鐐规璁″垝琛� 淇濆瓨/缂栬緫
@@ -3254,48 +3344,6 @@
#region 妯″叿鎶ュ簾鍏ュ簱鍗�
- #region 妯″叿鎶ュ簾鍏ュ簱鍗曞垪琛�
-
- [Route("Sc_MouldScrapInHouseBill/GetMouldScrapInHouseBill")]
- [HttpGet]
- public object GetMouldScrapInHouseBill(string sWhere)
- {
- try
- {
-
- ds = Sc_GetMouldScrapInHouseBill(sWhere);
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
- }
- catch (Exception ex)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
- objJsonResult.data = null;
- return objJsonResult;
- }
- }
-
- public static DataSet Sc_GetMouldScrapInHouseBill(string sWhere)
- {
- if (sWhere == null || sWhere.Equals(""))
- {
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldScrapInHouseBillList " + sWhere, "h_v_Sc_MouldScrapInHouseBillList");
- }
- else
- {
- string sql1 = "select * from h_v_Sc_MouldScrapInHouseBillList where 1 = 1 ";
- string sql = sql1 + sWhere;
- return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldScrapInHouseBillList");
- }
-
- }
-
- #endregion
#region[妯″叿鎶ュ簾鍏ュ簱鍗曠紪杈戞椂鑾峰彇琛ㄥご鏁版嵁]
[Route("Sc_MouldScrapInHouseBill/Sc_MouldScrapInHouseBillListCheckDetai")]
@@ -3388,11 +3436,11 @@
try
{
DLL.ClsSc_MouldScrapInBill oBill = new DLL.ClsSc_MouldScrapInBill();
- List<Model.ClsSc_MouldStockBillMain> lsmain = new List<Model.ClsSc_MouldStockBillMain>();
+ List<Models.ClsSc_MouldStockBillMain> lsmain = new List<Models.ClsSc_MouldStockBillMain>();
msg2 = msg2.Replace("\\", "");
msg2 = msg2.Replace("\n", ""); //\n
lsmain = oListModels.getObjectByJson_Gy_MouldScrapInHouseBillMain(msg2);
- foreach (Model.ClsSc_MouldStockBillMain oItem in lsmain)
+ foreach (Models.ClsSc_MouldStockBillMain oItem in lsmain)
{
if (refSav == "Add")
{
@@ -3480,10 +3528,10 @@
msg3 = msg3.Replace("\\", "");
msg3 = msg3.Replace("\n", ""); //\n
//msg2 = msg2.Replace("'", "鈥�");
- List<Model.ClsSc_MouldStockBillSub> ls = new List<Model.ClsSc_MouldStockBillSub>();
+ List<Models.ClsSc_MouldStockBillSub> ls = new List<Models.ClsSc_MouldStockBillSub>();
ls = oListModels.getObjectByJson_Gy_MouldScrapInHouseBillSub(msg3);
int i = 0;
- foreach (Model.ClsSc_MouldStockBillSub oItemSub in ls)
+ foreach (Models.ClsSc_MouldStockBillSub oItemSub in ls)
{
i++;
@@ -3549,236 +3597,140 @@
}
#endregion
- #region [妯″叿鎶ュ簾鍏ュ簱鍗曞垹闄ゅ姛鑳絔
- /// <summary>
- /// 妯″叿鎶ュ簾鍏ュ簱鍗曞垹闄ゅ姛鑳�
- /// </summary>
- /// <returns></returns>
- [Route("Sc_MouldScrapInHouseBill/DeltetMouldScrapInHouseBill")]
- [HttpGet]
- public object DeltetMouldScrapInHouseBill(string HInterID)
- {
- //缂栬緫鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log("Sc_MouldScrapInBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
- string s = "";
- Int64 lngBillKey = 0;
- lngBillKey = DBUtility.ClsPub.isLong(HInterID);
- if (lngBillKey == 0)
+
+
+ #region 妯″叿鎶ュ簾鍏ュ簱鍗曚繚瀛�
+
+ [Route("Sc_MouldScrapInHouseBill/SaveGetMouldScrapInHouseBillList_PDA")]
+ [HttpPost]
+ public object SaveGetMouldScrapInHouseBillList_PDA([FromBody] JObject msg)
+ {
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+
+ string UserName = "";
+
+ ListModels oListModels = new ListModels();
+ try
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鍗曟嵁ID涓虹┖锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- DAL.ClsSc_MouldScrapInBill oBill = new DAL.ClsSc_MouldScrapInBill();
- if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
- {
- if (oBill.omodel.HBillStatus > 1)
+ DLL.ClsSc_MouldScrapInBill oBill = new DLL.ClsSc_MouldScrapInBill();
+ List<Models.ClsSc_MouldStockBillMain> lsmain = new List<Models.ClsSc_MouldStockBillMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_Gy_MouldScrapInHouseBillMain(msg2);
+ foreach (Models.ClsSc_MouldStockBillMain oItem in lsmain)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鍗曟嵁褰撳墠澶勪簬涓嶈兘鍒犻櫎鐘舵��,涓嶈兘鍒犻櫎锛�";
- objJsonResult.data = null;
- return objJsonResult;
+ //鍗曟嵁鍙锋槸鍚﹂噸澶�
+ if (BillNew0.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, BillOld0.omodel.HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍙烽噸澶嶏紒涓嶅厑璁镐繚瀛橈紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
+ //oItem.HMaker = "";
+ UserName = oItem.HMaker; //鍒跺崟浜�
+ oItem.HBillType = "3831";
+ oItem.HBillSubType = "3831";
+ //oItem.HBillNo = ""; //鍗曟嵁鍙�
+ //oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --鏃ユ湡
+ //oItem.HInnerBillNo = ""; // --鍐呴儴鍗曟嵁鍙�
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+ //oItem.HEquipID = 0; //璁惧ID(Gy_EquipMent)
+ //oItem.HPeriod = 0;
+ //oItem.HCheckBeginDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd")); // --缁翠慨鏃ユ湡
+ //oItem.HCheckResult = ""; //楠屾敹缁撹--(姝ｅ父锛屽紓甯�)
+ //oItem.HEmpID = 0; //楠屾敹浜�(Gy_Employee)
+ //oItem.HManagerID = 0; //璐熻矗浜�(Gy_Employee)
+ //oItem.HDeptID = 0; //楠屾敹閮ㄩ棬(Gy_Department)
+ //oItem.HExplanation = ""; //鎽樿(鏁呴殰鎻忚堪)
+ //oItem.HRemark = ""; //澶囨敞
+
+ //oItem.HMainSourceInterID = oItem.HInterID;
+
+ //oItem.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo);
+ if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ oBill.omodel = oItem;
}
- if (oBill.omodel.HChecker != "")
+ //瀛愯〃浣撴暟鎹�
+
+ List<Models.ClsSc_MouldStockBillSub> ls = new List<Models.ClsSc_MouldStockBillSub>();
+ ls = oListModels.getObjectByJson_Gy_MouldScrapInHouseBillSub(msg2);
+ int i = 0;
+ foreach (Models.ClsSc_MouldStockBillSub oItemSub in ls)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鍗曟嵁宸茬粡瀹℃牳,涓嶈兘鍒犻櫎锛�";
- objJsonResult.data = null;
- return objJsonResult;
+
+ i++;
+ oItemSub.HEntryID = i;
+
+ //oItemSub.HRepairCheckID = 0; //楠屾敹椤圭洰ID
+ //oItemSub.HRepairCheckContent = ""; //楠屾敹鍐呭
+ //oItemSub.HManagerID = 0; //璐熻矗浜篒D
+ //oItemSub.HCloseMan = ""; //琛屽叧闂�
+ oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
+ //oItemSub.HRemark = ""; //澶囨敞
+ oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
+ oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
+ //oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿
+ //oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
+ //oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
+ //oItemSub.HRelationMoney = 0; //鍏宠仈閲戦
+ //oItemSub.HRepairID = 0; //缁翠慨椤圭洰
+ //oItemSub.HRepairExplanation =""; //缁翠慨瑕佹眰
+ //oItemSub.HMoney = 0; //缁翠慨璐圭敤
+ oBill.DetailColl.Add(oItemSub);
+
}
- if (!DBUtility.Xt_BaseBillFun.Fun_AllowDeleteBill(BillOld0, ref s))
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (oBill.omodel.HInterID == 0)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = s + "锛屼笉鍏佽鍒犻櫎";
- objJsonResult.data = null;
- return objJsonResult;
+ // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
}
- bool IsDete = oBill.DeleteBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
- if (IsDete)
+ else
+ {
+ bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ if (bResult)
{
objJsonResult.code = "0";
objJsonResult.count = 1;
- objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
- objJsonResult.data = null;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
+ objJsonResult.data = 1;
return objJsonResult;
}
else
{
-
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
- objJsonResult.data = null;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = 1;
return objJsonResult;
}
- }
- else
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鍗曟嵁鏈壘鍒�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- }
- #endregion
-
- #region [妯″叿鎶ュ簾鍏ュ簱鍗曞鏍搞�佸弽瀹℃牳]
- /// <summary>
- ///
- /// </summary>
- /// <param name="HInterID">鍗曟嵁ID</param>
- /// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
- /// <param name="CurUserName">瀹℃牳浜�</param>
- /// <returns></returns>
- [Route("Sc_MouldScrapInHouseBill/MouldScrapInHouseAudit")]
- [HttpGet]
- public object MouldScrapInHouseAudit(int HInterID, int IsAudit, string CurUserName)
- {
- string ModRightNameCheck = "Sc_MouldScrapInBill_Check";
- DBUtility.ClsPub.CurUserName = CurUserName;
- try
- {
- //瀹℃牳鏉冮檺
- if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- string s = "";
- if (!DBUtility.Xt_BaseBillFun.Fun_AllowCheckBill(BillOld0, ref s))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = s + "锛屼笉鍏佽瀹℃牳";
- objJsonResult.data = null;
- return objJsonResult;
- }
- if (HInterID <= 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "HInterID灏忎簬0锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- Int64 lngBillKey = 0;
- lngBillKey = DBUtility.ClsPub.isLong(HInterID);
- DLL.ClsSc_MouldScrapInBill oBill = new DLL.ClsSc_MouldScrapInBill();
- //鏌ョ湅鏄惁宸插鏍�,鍏抽棴,浣滃簾
- if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
- {
- if (oBill.omodel.HCloseMan.Trim() != "")
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘鍐嶆瀹℃牳锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- if (oBill.omodel.HDeleteMan.Trim() != "")
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘鍐嶆瀹℃牳锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- if (IsAudit == 0) //瀹℃牳鍒ゆ柇
- {
- if (oBill.omodel.HChecker.Trim() != "")
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘鍐嶆瀹℃牳锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- }
- if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
- {
- if (oBill.omodel.HChecker.Trim() == "")
- {
- 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 (oBill.CheckBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
- {
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "瀹℃牳鎴愬姛";
- objJsonResult.data = null;
- return objJsonResult;
- }
- else
- {
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
- objJsonResult.data = null;
- return objJsonResult;
- }
- }
- if (IsAudit == 1) //鍙嶅鏍告彁浜�
- {
- //鍙嶅鏍告彁浜bandonCheck
- if (oBill.AbandonCheck(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
- {
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "鍙嶅鏍告垚鍔�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- else
- {
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
- objJsonResult.data = null;
- return objJsonResult;
- }
- }
- return objJsonResult;
}
catch (Exception e)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "瀹℃牳澶辫触鎴栬�呭弽瀹℃牳澶辫触锛�" + e.ToString();
- objJsonResult.data = null;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
return objJsonResult;
}
}
--
Gitblit v1.9.1