From 3fa3b7e1711f055a41ef1f306887e8cedf5896f7 Mon Sep 17 00:00:00 2001
From: pzy <2829717936@qq.com>
Date: 星期四, 15 八月 2024 16:26:57 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/MJGL/Sc_MouldRepairOutBillController.cs | 487 ++++++++++++++++++++++++++++++++++++------------------
1 files changed, 325 insertions(+), 162 deletions(-)
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldRepairOutBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldRepairOutBillController.cs
index 22a8add..cdb898f 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldRepairOutBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldRepairOutBillController.cs
@@ -17,6 +17,8 @@
private json objJsonResult = new json();
public DataSet ds = new DataSet();
public SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+ DAL.ClsSc_MouldRepairOutBill oBill = new DAL.ClsSc_MouldRepairOutBill();
public DLL.ClsSc_MouldRepairOutBill BillNew0 = new DLL.ClsSc_MouldRepairOutBill(); //妯″叿鏀瑰埗鍑哄簱瀵瑰簲鍗曟嵁绫�
public DLL.ClsSc_MouldRepairOutBill BillOld0 = new DLL.ClsSc_MouldRepairOutBill(); //妯″叿鏀瑰埗鍑哄簱瀵瑰簲鍗曟嵁绫�
@@ -61,11 +63,11 @@
string sql1 = string.Format(@"select * from h_v_Sc_MouldRepairOutBillList where 搴撳瓨缁勭粐='" + Organization + "'");
if (sWhere == null || sWhere.Equals(""))
{
- return new SQLHelper.ClsCN().RunProcReturn(sql1+ "order by hmainid desc", "h_v_Sc_MouldRepairOutBillList");
+ return new SQLHelper.ClsCN().RunProcReturn(sql1+ "order by 鍒跺崟鏃ユ湡 desc", "h_v_Sc_MouldRepairOutBillList");
}
else
{
- string sql = sql1 + sWhere+ "order by hmainid desc";
+ string sql = sql1 + sWhere+ "order by 鍒跺崟鏃ユ湡 desc";
return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldRepairOutBillList");
}
@@ -172,7 +174,208 @@
#endregion
- #region 妯″叿鏀瑰埗鍑哄簱淇濆瓨/缂栬緫
+ #region 妯″叿鏀瑰埗鍑哄簱淇濆瓨/缂栬緫 20240702浣滃簾
+ /// <summary>
+ /// 淇濆瓨妯″叿閲囪喘鍏ュ簱鍗�
+ /// </summary>
+ /// <param name="msg"></param>
+ /// <returns></returns>
+ //[Route("Sc_MouldRepairOutHouseBill/SaveGetMouldRepairOutHouseBillList")]
+ //[HttpPost]
+ //public object SaveGetMouldRepairOutHouseBillList([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 msg3 = sArray[1].ToString();
+ // string refSav = sArray[2].ToString();
+ // string msg4 = sArray[3].ToString();
+
+ // string UserName = "";
+ // string s = "";
+ // ListModels oListModels = new ListModels();
+ // try
+ // {
+ // //缂栬緫鏉冮檺
+ // if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairOut_SingleBill_Edit", 1, false, msg4))
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+
+ // DLL.ClsSc_MouldRepairOutBill oBill = new DLL.ClsSc_MouldRepairOutBill();
+ // List<Models.ClsSc_MouldRepairOutBillMain> lsmain = new List<Models.ClsSc_MouldRepairOutBillMain>();
+ // msg2 = msg2.Replace("\\", "");
+ // msg2 = msg2.Replace("\n", ""); //\n
+ // lsmain = oListModels.getObjectByJson_Gy_MouldRepairOutHouseBillMain(msg2);
+ // foreach (Models.ClsSc_MouldRepairOutBillMain oItem in lsmain)
+ // {
+ // if (refSav == "Add")
+ // {
+ // //鍗曟嵁鍙锋槸鍚﹂噸澶�
+ // 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;
+ // }
+ // }
+ // if (refSav == "Update")
+ // {
+ // if (BillOld0.ShowBill(oItem.HInterID, ref s) == false)
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "姝ゅ崟鎹湁璇紒";
+ // objJsonResult.data = 1;
+ // return objJsonResult;
+ // }
+ // //鍒ゆ柇鏄惁鍙紪杈�
+ // if (BillOld0.omodel.HChecker != "" && BillOld0.omodel.HChecker != null)
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "姝ゅ崟鎹凡缁忚瀹℃牳锛屼笉鍏佽淇敼锛�";
+ // objJsonResult.data = 1;
+ // return objJsonResult;
+ // }
+ // if (BillOld0.omodel.HBillStatus > 1)
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "姝ゅ崟鎹浜庝笉鍙紪杈戠姸鎬侊紝涓嶅厑璁镐慨鏀癸紒";
+ // objJsonResult.data = 1;
+ // return objJsonResult;
+ // }
+ // if (!DBUtility.Xt_BaseBillFun.Fun_AllowEditBill(BillOld0, ref s))
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = s + "锛屼笉鍏佽淇敼";
+ // objJsonResult.data = 1;
+ // return objJsonResult;
+ // }
+ // }
+ // //oItem.HMaker = "";
+ // UserName = oItem.HMaker; //鍒跺崟浜�
+ // oItem.HBillType = "3825";
+ // oItem.HBillSubType = "3825";
+ // //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;
+ // }
+ // //琛ㄤ綋鏁版嵁
+ // //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ // msg3 = msg3.Substring(1, msg3.Length - 2);
+ // msg3 = msg3.Replace("\\", "");
+ // msg3 = msg3.Replace("\n", ""); //\n
+ // //msg2 = msg2.Replace("'", "鈥�");
+ // List<Models.ClsSc_MouldRepairOutBillSub> ls = new List<Models.ClsSc_MouldRepairOutBillSub>();
+ // ls = oListModels.getObjectByJson_Gy_MouldRepairOutHouseBillSub(msg3);
+ // int i = 0;
+ // foreach (Models.ClsSc_MouldRepairOutBillSub oItemSub in ls)
+ // {
+
+ // 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);
+
+ // }
+ // //淇濆瓨
+ // //淇濆瓨瀹屾瘯鍚庡鐞�
+ // bool bResult;
+ // if (oBill.omodel.HInterID == 0)
+ // {
+ // // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ // string sql = string.Format($"exec h_p_Sc_MouldChangeFileStatus 'out',{oBill.omodel.HInterID.ToString()} ");
+ // oCn.RunProc(sql);
+ // }
+ // else
+ // {
+ // bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ // //淇敼鎴愬姛
+ // //string sql = string.Format($"exec h_p_Sc_MouldChangeNowWHID 1,{oBill.omodel.HInterID.ToString()},' ' ");
+ // string sql = string.Format($"exec h_p_Sc_MouldChangeNowWHID ");
+ // oCn.RunProc(sql);
+ // }
+ // if (bResult)
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 1;
+ // 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 = 1;
+ // return objJsonResult;
+ // }
+ // }
+ // catch (Exception e)
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ // objJsonResult.data = 1;
+ // return objJsonResult;
+ // }
+ //}
+ #endregion
+
+ #region 妯″叿鏀瑰埗鍑哄簱淇濆瓨/缂栬緫 20240702
/// <summary>
/// 淇濆瓨妯″叿閲囪喘鍏ュ簱鍗�
/// </summary>
@@ -185,172 +388,132 @@
var _value = msg["msg"].ToString();
string msg1 = _value.ToString();
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
- string msg2 = sArray[0].ToString();
- string msg3 = sArray[1].ToString();
- string refSav = sArray[2].ToString();
- string msg4 = sArray[3].ToString();
-
- string UserName = "";
- string s = "";
- ListModels oListModels = new ListModels();
+ string sMainStr = sArray[0].ToString(); //涓昏〃鏁版嵁
+ string sSubStr = sArray[1].ToString(); //瀛愯〃鏁版嵁
+ string OperationType = sArray[2].ToString(); //鎿嶄綔绫诲瀷锛圓dd鏂板銆乁pdate缂栬緫锛�
+ string HMaker = sArray[3].ToString(); //鍒跺崟浜�
try
{
- //缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairOut_SingleBill_Edit", 1, false, msg4))
+ //鍒ゆ柇鏉冮檺
+ if (OperationType == "Add")
+ {
+ BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew;
+ //鍒ゆ柇鏂板鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldRepairOut_SingleBill", 1, false, HMaker))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡鏂板鏉冮檺,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_Modify;
+ //鍒ゆ柇缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldRepairOut_SingleBill_Edit", 1, false, HMaker))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡缂栬緫鏉冮檺,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ //琛ㄥご璧嬪��
+ sMainStr = sMainStr.Replace("\\", "");
+ sMainStr = sMainStr.Replace("\n", "");
+ sMainStr = "[" + sMainStr.ToString() + "]";
+ List<Model.ClsSc_MouldStockBillMain> lsmain = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldStockBillMain>>(sMainStr);
+ foreach (Model.ClsSc_MouldStockBillMain oItem in lsmain)
+ {
+ //鍗曟嵁鍙锋槸鍚﹂噸澶�
+ if (oBill.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, oItem.HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍙烽噸澶嶏紒涓嶅厑璁镐繚瀛橈紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
+ string s = "";
+ int sYear = 0;
+ int sPeriod = 0;
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(oItem.HDate, ref sYear, ref sPeriod, ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = s;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oItem.HYear = sYear;
+ oItem.HPeriod = sPeriod;
+ DBUtility.ClsPub.CurUserName = oItem.HMaker;
+ oBill.omodel = oItem;
+ }
+ //琛ㄤ綋璧嬪��
+ //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ sSubStr = sSubStr.Substring(1, sSubStr.Length - 2);
+ sSubStr = sSubStr.Replace("\\", "");
+ sSubStr = sSubStr.Replace("\n", "");
+ sSubStr = "[" + sSubStr.ToString() + "]";
+ List<Model.ClsSc_MouldStockBillSub> ls = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldStockBillSub>>(sSubStr);
+ int i = 0;
+ foreach (Model.ClsSc_MouldStockBillSub oItemSub in ls)
+ {
+ i++;
+ oItemSub.HEntryID = i;
+ oBill.DetailColl.Add(oItemSub);
+ }
+
+ string sErrMsg = "";
+ bool bResult;
+ //鑾峰彇绯荤粺鍙傛暟
+ if (oSystemParameter.ShowBill(ref sErrMsg) == true)
+ {
+ //淇濆瓨
+ if (OperationType == "Add") //鏂板淇濆瓨
+ {
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+
+ if (oSystemParameter.omodel.WMS_CampanyName == "鍥涚淮灏�") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
+ {
+ //淇敼鍣ㄥ叿妗ｆ浣嶇疆
+ string sql = string.Format($"exec h_p_Sc_MouldChangeFileStatus 'out',{oBill.omodel.HInterID.ToString()} ");
+ oCn.RunProc(sql);
+ }
+ }
+ else //缂栬緫淇濆瓨
+ {
+ bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+
+ if (oSystemParameter.omodel.WMS_CampanyName == "鍥涚淮灏�") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
+ {
+ //淇敼鍣ㄥ叿妗ｆ浣嶇疆
+ string sql = string.Format($"exec h_p_Sc_MouldChangeNowWHID ");
+ oCn.RunProc(sql);
+ }
+ }
+ }
+ else
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.Message = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg;
objJsonResult.data = null;
return objJsonResult;
}
- DLL.ClsSc_MouldRepairOutBill oBill = new DLL.ClsSc_MouldRepairOutBill();
- List<Models.ClsSc_MouldRepairOutBillMain> lsmain = new List<Models.ClsSc_MouldRepairOutBillMain>();
- msg2 = msg2.Replace("\\", "");
- msg2 = msg2.Replace("\n", ""); //\n
- lsmain = oListModels.getObjectByJson_Gy_MouldRepairOutHouseBillMain(msg2);
- foreach (Models.ClsSc_MouldRepairOutBillMain oItem in lsmain)
- {
- if (refSav == "Add")
- {
- //鍗曟嵁鍙锋槸鍚﹂噸澶�
- 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;
- }
- }
- if (refSav == "Update")
- {
- if (BillOld0.ShowBill(oItem.HInterID, ref s) == false)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "姝ゅ崟鎹湁璇紒";
- objJsonResult.data = 1;
- return objJsonResult;
- }
- //鍒ゆ柇鏄惁鍙紪杈�
- if (BillOld0.omodel.HChecker != "" && BillOld0.omodel.HChecker != null)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "姝ゅ崟鎹凡缁忚瀹℃牳锛屼笉鍏佽淇敼锛�";
- objJsonResult.data = 1;
- return objJsonResult;
- }
- if (BillOld0.omodel.HBillStatus > 1)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "姝ゅ崟鎹浜庝笉鍙紪杈戠姸鎬侊紝涓嶅厑璁镐慨鏀癸紒";
- objJsonResult.data = 1;
- return objJsonResult;
- }
- if (!DBUtility.Xt_BaseBillFun.Fun_AllowEditBill(BillOld0, ref s))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = s + "锛屼笉鍏佽淇敼";
- objJsonResult.data = 1;
- return objJsonResult;
- }
- }
- //oItem.HMaker = "";
- UserName = oItem.HMaker; //鍒跺崟浜�
- oItem.HBillType = "3825";
- oItem.HBillSubType = "3825";
- //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;
- }
- //琛ㄤ綋鏁版嵁
- //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
- msg3 = msg3.Substring(1, msg3.Length - 2);
- msg3 = msg3.Replace("\\", "");
- msg3 = msg3.Replace("\n", ""); //\n
- //msg2 = msg2.Replace("'", "鈥�");
- List<Models.ClsSc_MouldRepairOutBillSub> ls = new List<Models.ClsSc_MouldRepairOutBillSub>();
- ls = oListModels.getObjectByJson_Gy_MouldRepairOutHouseBillSub(msg3);
- int i = 0;
- foreach (Models.ClsSc_MouldRepairOutBillSub oItemSub in ls)
- {
-
- 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);
-
- }
- //淇濆瓨
- //淇濆瓨瀹屾瘯鍚庡鐞�
- bool bResult;
- if (oBill.omodel.HInterID == 0)
- {
- // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
- bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
- string sql = string.Format($"exec h_p_Sc_MouldChangeFileStatus 'out',{oBill.omodel.HInterID.ToString()} ");
- oCn.RunProc(sql);
- }
- else
- {
- bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
- //淇敼鎴愬姛
- //string sql = string.Format($"exec h_p_Sc_MouldChangeNowWHID 1,{oBill.omodel.HInterID.ToString()},' ' ");
- string sql = string.Format($"exec h_p_Sc_MouldChangeNowWHID ");
- oCn.RunProc(sql);
- }
if (bResult)
{
objJsonResult.code = "0";
objJsonResult.count = 1;
- objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
- //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
- objJsonResult.data = 1;
+ objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo; //鎴愬姛锛�
+ objJsonResult.data = null;
return objJsonResult;
}
else
@@ -358,7 +521,7 @@
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
- objJsonResult.data = 1;
+ objJsonResult.data = null;
return objJsonResult;
}
}
@@ -366,8 +529,8 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
- objJsonResult.data = 1;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.Message;
+ objJsonResult.data = null;
return objJsonResult;
}
}
@@ -477,7 +640,7 @@
#region[鍣ㄥ叿鏀瑰埗鍑哄簱鍗曠紪杈戞椂鑾峰彇琛ㄤ綋鏁版嵁]
[Route("Sc_MouldRepairOutBill/Sc_MouldRepairOutBillListCheckDetai1")]
[HttpGet]
- public object Sc_MouldRepairOutBillListCheckDetai(string sqlWhere)
+ public object Sc_MouldRepairOutBillListCheckDetai1(string sqlWhere)
{
DataSet ds;
DataSet ds1;
@@ -489,7 +652,7 @@
{
ds = oCN.RunProcReturn(string.Format(@"SELECT HMaterID,妯″叿浠ｇ爜 HMaterCode,妯″叿鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec,
鎵规 HBatchNo,璁捐瀵垮懡 HDesignLife, 鍓╀綑瀵垮懡 HLeaveLife, 浣跨敤瀵垮懡 HUseLife,搴旀敹鏁伴噺 HQtyMust,
- 瀹炴敹鏁伴噺 HQty, HWHID, 浠撳簱浠ｇ爜 HWHCode,浠撳簱 HWHName,瀛愬娉� HRemark,HStockOrgID,HUnitID,璁￠噺鍗曚綅浠ｇ爜,璁￠噺鍗曚綅
+ 瀹炴敹鏁伴噺 HQty, HWHID, 浠撳簱浠ｇ爜 HWHCode,浠撳簱 HWHName,瀛愬娉� HRemark,HStockOrgID,HUnitID,璁￠噺鍗曚綅浠ｇ爜 HUnitCode,璁￠噺鍗曚綅 HUnitName
FROM h_v_Sc_MouldRepairOutBillList"), "h_v_Sc_MouldRepairOutBillList");
}
else
@@ -498,7 +661,7 @@
//string sql1 = "select HRepairCheckID,HRepairCheckContent,HManagerID,HRemark from Sc_MouldRepairCheckBillSub where 1 = 1 ";
string sql1 = string.Format(@"SELECT HMaterID,妯″叿浠ｇ爜 HMaterCode,妯″叿鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec,
鎵规 HBatchNo,璁捐瀵垮懡 HDesignLife, 鍓╀綑瀵垮懡 HLeaveLife, 浣跨敤瀵垮懡 HUseLife,搴旀敹鏁伴噺 HQtyMust,
- 瀹炴敹鏁伴噺 HQty, HWHID, 浠撳簱浠ｇ爜 HWHCode,浠撳簱 HWHName,瀛愬娉� HRemark,HStockOrgID,HUnitID,璁￠噺鍗曚綅浠ｇ爜,璁￠噺鍗曚綅
+ 瀹炴敹鏁伴噺 HQty, HWHID, 浠撳簱浠ｇ爜 HWHCode,浠撳簱 HWHName,瀛愬娉� HRemark,HStockOrgID,HUnitID,璁￠噺鍗曚綅浠ｇ爜 HUnitCode,璁￠噺鍗曚綅 HUnitName
FROM h_v_Sc_MouldRepairOutBillList where 1=1 ");
string sql = sql1 + sqlWhere;
ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldRepairOutBillList");
--
Gitblit v1.9.1