From 961fa0e1724b2990fed3db3555f32f1d5708bb41 Mon Sep 17 00:00:00 2001 From: zzr99 <1940172413@qq.com> Date: 星期三, 15 九月 2021 17:26:25 +0800 Subject: [PATCH] 模器具采购入库单列表完善以及编辑模器具采购入库单 --- WebAPI/ListModels.cs | 25 ++ WebAPI/Models/ClsSc_MouldProdBillSub.cs | 42 ++++ WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 34 +- WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs | 288 +++++++++++++++++++++++++++- WebAPI/Models/ClsSc_MouldProdBillMain.cs | 23 ++ WebAPI/WebAPI.csproj.user | 2 WebAPI/WebAPI.csproj | 2 WebAPI/DLL/ClsSc_MouldProdInBill.cs | 157 +++++++++++++++ 8 files changed, 535 insertions(+), 38 deletions(-) diff --git a/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs index be3c24f..f70f784 100644 --- a/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs +++ b/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs @@ -1,4 +1,6 @@ -锘縰sing System; +锘縰sing DBUtility; +using Newtonsoft.Json.Linq; +using System; using System.Collections.Generic; using System.Data; using System.Linq; @@ -11,9 +13,11 @@ { public class Sc_MouldProdInBillController : ApiController { + public DBUtility.ClsPub.Enum_BillStatus BillStatus;//鍗曟嵁鐘舵�侊紙鏂板锛屼慨鏀癸紝娴忚锛屾洿鏂板崟浠凤紝鍙樻洿锛� private json objJsonResult = new json(); public DataSet ds = new DataSet(); - + public DLL.ClsSc_MouldProdInBill BillNew0 = new DLL.ClsSc_MouldProdInBill(); //妯″叿鎶ュ簾鍏ュ簱瀵瑰簲鍗曟嵁绫� + public DLL.ClsSc_MouldProdInBill BillOld0 = new DLL.ClsSc_MouldProdInBill(); //妯″叿鎶ュ簾鍏ュ簱瀵瑰簲鍗曟嵁绫� #region 妯″叿閲囪喘鍏ュ簱鍗曞垪琛� @@ -55,37 +59,37 @@ { if (sWhere == null || sWhere.Equals("")) { - return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldProdInBillList " + sWhere, "h_v_Sc_MouldProdInBillList"); + return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldProdInHouseBillList " + sWhere, "h_v_Sc_MouldProdInHouseBillList"); } else { - string sql1 = "select * from h_v_Sc_MouldProdInBillList where 1 = 1 "; + string sql1 = "select * from h_v_Sc_MouldProdInHouseBillList where 1 = 1 "; string sql = sql1 + sWhere; - return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldProdInBillList"); + return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldProdInHouseBillList"); } } #endregion - #region [妯″叿鎶ュ簾鍏ュ簱鍗曞垹闄ゅ姛鑳絔 + #region [妯″叿閲囪喘鍏ュ簱鍗曞垹闄ゅ姛鑳絔 /// <summary> - /// 妯″叿鎶ュ簾鍏ュ簱鍗曞垹闄ゅ姛鑳� + /// 妯″叿閲囪喘鍏ュ簱鍗曞垹闄ゅ姛鑳� /// </summary> /// <returns></returns> [Route("Sc_MouldProdInBill/set_DeleteBill")] [HttpGet] public object set_DeleteBill(string HInterID) { - //缂栬緫鏉冮檺 - if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdInBill_Edit", 1, true, DBUtility.ClsPub.CurUserName)) - { - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒"; - objJsonResult.data = null; - return objJsonResult; - } + ////缂栬緫鏉冮檺 + //if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdInBill_Delete", 1, true, DBUtility.ClsPub.CurUserName)) + //{ + // objJsonResult.code = "0"; + // objJsonResult.count = 0; + // objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒"; + // objJsonResult.data = null; + // return objJsonResult; + //} string s = ""; Int64 lngBillKey = 0; @@ -155,7 +159,7 @@ #endregion - #region [妯″叿鎶ュ簾鍏ュ簱鍗曞鏍搞�佸弽瀹℃牳] + #region [妯″叿閲囪喘鍏ュ簱鍗曞鏍搞�佸弽瀹℃牳] /// <summary> /// 瀹℃牳 /// </summary> @@ -371,5 +375,255 @@ } } #endregion + + #region[妯″叿閲囪喘鍏ュ簱鍗曠紪杈戞椂鑾峰彇琛ㄥご鏁版嵁] + [Route("Sc_MouldProdInBill/Sc_MouldProdInHouseBillListCheckDetai")] + [HttpGet] + public ApiResult<DataSet> Sc_MouldProdInHouseBillListCheckDetai(string HID) + { + 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_MouldProdInHouseBillList where hmainid= " + HID + " ", "h_v_Sc_MouldProdInHouseBillList"); + 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_MouldProdInBill/Sc_MouldScrapInProdBillListProjectDetai")] + [HttpGet] + public object Sc_MouldScrapInProdBillListProjectDetai(string sqlWhere) + { + DataSet ds; + try + { + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + if (sqlWhere == null || sqlWhere.Equals("")) + { + ds = oCN.RunProcReturn(string.Format(@"SELECT HMaterID,妯″叿浠g爜 HMaterCode,妯″叿鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec, + 鎵规 HBatchNo,璁捐瀵垮懡 HDesignLife, 鍓╀綑瀵垮懡 HLeaveLife, 浣跨敤瀵垮懡 HUseLife,搴旀敹鏁伴噺 HQtyMust, + 瀹炴敹鏁伴噺 HQty, 鍗曚环 HPrice, 閲戦 HMoney, HWHID, 鏀舵枡浠撳簱浠g爜 HWHCode,鏀舵枡浠撳簱 HWHName,琛ㄤ綋澶囨敞 HRemark + FROM h_v_Sc_MouldProdInHouseBillList"), "h_v_Sc_MouldProdInHouseBillList"); + + objJsonResult.code = "0"; + objJsonResult.count = 1; + objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�"; + objJsonResult.data = ds.Tables[0]; + } + else + { + + //string sql1 = "select HRepairCheckID,HRepairCheckContent,HManagerID,HRemark from Sc_MouldRepairCheckBillSub where 1 = 1 "; + string sql1 = string.Format(@"SELECT HMaterID,妯″叿浠g爜 HMaterCode,妯″叿鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec, + 鎵规 HBatchNo,璁捐瀵垮懡 HDesignLife, 鍓╀綑瀵垮懡 HLeaveLife, 浣跨敤瀵垮懡 HUseLife,搴旀敹鏁伴噺 HQtyMust, + 瀹炴敹鏁伴噺 HQty, 鍗曚环 HPrice, 閲戦 HMoney, HWHID, 鏀舵枡浠撳簱浠g爜 HWHCode,鏀舵枡浠撳簱 HWHName,琛ㄤ綋澶囨敞 HRemark + FROM h_v_Sc_MouldProdInHouseBillList where 1=1"); + string sql = sql1 + sqlWhere; + ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldProdInHouseBillList"); + + objJsonResult.code = "0"; + objJsonResult.count = 1; + objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�"; + objJsonResult.data = ds.Tables[0]; + } + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString(); + objJsonResult.data = null; + } + return objJsonResult; + } + #endregion + + #region 妯″叿閲囪喘鍏ュ簱鍗曚繚瀛�/缂栬緫 + /// <summary> + /// 淇濆瓨妯″叿閲囪喘鍏ュ簱鍗� + /// </summary> + /// <param name="msg"></param> + /// <returns></returns> + [Route("Sc_MouldProdInHouseBill/SaveGetMouldProdInHouseBillList")] + [HttpPost] + public object SaveGetMouldScrapInHouseBillList([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 UserName = ""; + string s = ""; + ListModels oListModels = new ListModels(); + try + { + DLL.ClsSc_MouldProdInBill oBill = new DLL.ClsSc_MouldProdInBill(); + List<Models.ClsSc_MouldProdBillMain> lsmain = new List<Models.ClsSc_MouldProdBillMain>(); + msg2 = msg2.Replace("\\", ""); + msg2 = msg2.Replace("\n", ""); //\n + lsmain = oListModels.getObjectByJson_Gy_MouldProdInHouseBillMain(msg2); + foreach (Models.ClsSc_MouldProdBillMain 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 = "3801"; + oItem.HBillSubType = "3801"; + //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 = ""; //楠屾敹缁撹--(姝e父锛屽紓甯�) + //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_MouldProdBillSub> ls = new List<Models.ClsSc_MouldProdBillSub>(); + ls = oListModels.getObjectByJson_Gy_MouldProdInHouseBillSub(msg3); + int i = 0; + foreach (Models.ClsSc_MouldProdBillSub 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); + } + else + { + bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo); + } + 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 } } diff --git a/WebAPI/DLL/ClsSc_MouldProdInBill.cs b/WebAPI/DLL/ClsSc_MouldProdInBill.cs index 4568d28..90a331f 100644 --- a/WebAPI/DLL/ClsSc_MouldProdInBill.cs +++ b/WebAPI/DLL/ClsSc_MouldProdInBill.cs @@ -8,8 +8,8 @@ { public class ClsSc_MouldProdInBill : DBUtility.ClsXt_BaseBill { - public Model.ClsSc_MouldProdInBillMain omodel = new Model.ClsSc_MouldProdInBillMain(); - public List<Model.ClsSc_MouldProdInBillSub> DetailColl = new List<Model.ClsSc_MouldProdInBillSub>(); + public Models.ClsSc_MouldProdBillMain omodel = new Models.ClsSc_MouldProdBillMain(); + public List<Models.ClsSc_MouldProdBillSub> DetailColl = new List<Models.ClsSc_MouldProdBillSub>(); public ClsSc_MouldProdInBill() { @@ -32,6 +32,157 @@ #endregion 鑷畾涔夋柟娉� - + //鏂板鍗曟嵁 + public override bool AddBill(ref string sReturn) + { + try + { + //寰楀埌mainid + omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo); + //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙� + oCn.BeginTran(); + //涓昏〃 + oCn.RunProc("Insert Into Sc_MouldStockBillMain " + + "(HBillType,HBillSubType,HInterID,HBillNo,HDate" + + ",HYear,HPeriod,HRemark,HMaker,HMakeDate" + + ",HSupID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" + + ",HKeeperID,HDeptID,HExplanation,HInnerBillNo,HRedBlueFlag" + + ") " + + " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" + + ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HMaker + "',getdate()" + + ", " + omodel.HSupID.ToString() + "," + omodel.HWHID.ToString() + "," + omodel.HSCWHID.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HManagerID.ToString() + "," + omodel.HSecManagerID.ToString() + + ", " + omodel.HKeeperID.ToString() + "," + omodel.HDeptID.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," + DBUtility.ClsPub.BoolToString(omodel.HRedBlueFlag) + + + ") "); + //鎻掑叆瀛愯〃 + foreach (Models.ClsSc_MouldProdBillSub oSub in DetailColl) + { + + oCn.RunProc("Insert into Sc_MouldStockBillSub " + + " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" + + ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" + + ",HMaterID,HPropertyID,HSecUnitID,HSecUnitRate,HUnitID,HQtyMust" + + ",HQty,HPrice,HMoney,HWHID,HSCWHID,HSPID" + + ",HDesignLife,HLeaveLife,HUseLife" + + ",HSCSPID,HSPGroupID,HBatchNo" + + ") values(" + + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" + + "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() + + "," + oSub.HMaterID.ToString() + "," + oSub.HPropertyID.ToString() + "," + oSub.HSecUnitID.ToString() + "," + oSub.HSecUnitRate.ToString() + "," + oSub.HUnitID.ToString() + "," + oSub.HQtyMust.ToString() + + "," + oSub.HQty.ToString() + "," + oSub.HPrice.ToString() + "," + oSub.HMoney.ToString() + "," + oSub.HWHID.ToString() + "," + oSub.HSCWHID.ToString() + "," + oSub.HSPID.ToString() + + "," + oSub.HDesignLife.ToString() + "," + oSub.HLeaveLife.ToString() + "," + oSub.HUseLife.ToString() + + "," + oSub.HSCSPID.ToString() + "," + oSub.HSPGroupID.ToString() + ",'" + oSub.HBatchNo + "'" + + ") "); + } + DataSet Ds; + foreach (Models.ClsSc_MouldProdBillSub oSub in DetailColl) + { + Ds = oCn.RunProcReturn("exec h_p_Kf_ICStockBill_CheckKF " + omodel.HInterID + "," + oSub.HMaterID + "," + oSub.HWHID + "," + oSub.HSPID + ", 1", "gy_czygl"); + if (Ds.Tables[0].Rows.Count == 0) + { + oCn.RollBack(); + return false; + } + if (DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0][0]) == "N") + { + sReturn = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0][1]) + ", 涓嶅厑璁镐繚瀛橈紒"; + oCn.RollBack(); + return false; + } + } + sReturn = "鏂板鍗曟嵁鎴愬姛锛�"; + oCn.Commit(); + return true; + } + catch (Exception e) + { + sReturn = e.Message; + oCn.RollBack(); + throw (e); + } + } + + //淇敼鍗曟嵁 + public override bool ModifyBill(Int64 lngBillKey, ref string sReturn) + { + try + { + // + oCn.BeginTran(); + //鏇存柊涓昏〃 + oCn.RunProc("UpDate Sc_MouldStockBillMain set " + + " HBillNo='" + omodel.HBillNo + "'" + //鍥哄畾璧嬪��=============== + ",HDate='" + omodel.HDate + "'" + + ",HYear='" + omodel.HYear.ToString() + "'" + + ",HPeriod='" + omodel.HPeriod.ToString() + "'" + + ",HRemark='" + omodel.HRemark + "'" + + ",HUpDater='" + omodel.HMaker + "'" + + ",HUpDateDate=getdate()" + + //======================================== + ",HSupID=" + omodel.HSupID.ToString() + + ",HWHID=" + omodel.HWHID.ToString() + + ",HSCWHID=" + omodel.HSCWHID.ToString() + + ",HEmpID=" + omodel.HEmpID.ToString() + + ",HManagerID=" + omodel.HManagerID.ToString() + + ",HSecManagerID=" + omodel.HSecManagerID.ToString() + + ",HKeeperID=" + omodel.HKeeperID.ToString() + + ",HDeptID=" + omodel.HDeptID.ToString() + + ",HExplanation='" + omodel.HExplanation + "'" + + ",HInnerBillNo='" + omodel.HInnerBillNo + "'" + + ",HRedBlueFlag=" + DBUtility.ClsPub.BoolToString(omodel.HRedBlueFlag) + + + " where HInterID=" + lngBillKey.ToString()); + //鍒犻櫎鍏宠仈 + DeleteRelation(ref sReturn, lngBillKey); + //鍒犻櫎瀛愯〃 + DeleteBillSub(lngBillKey); + //鎻掑叆瀛愯〃 + omodel.HInterID = lngBillKey; + foreach (Models.ClsSc_MouldProdBillSub oSub in DetailColl) + { + oCn.RunProc("Insert into Sc_MouldStockBillSub " + + " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" + + ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" + + ",HMaterID,HPropertyID,HSecUnitID,HSecUnitRate,HUnitID,HQtyMust" + + ",HQty,HPrice,HMoney,HWHID,HSCWHID,HSPID" + + ",HDesignLife,HLeaveLife,HUseLife" + + ",HSCSPID,HSPGroupID,HBatchNo" + + ") values(" + + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" + + "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() + + "," + oSub.HMaterID.ToString() + "," + oSub.HPropertyID.ToString() + "," + oSub.HSecUnitID.ToString() + "," + oSub.HSecUnitRate.ToString() + "," + oSub.HUnitID.ToString() + "," + oSub.HQtyMust.ToString() + + "," + oSub.HQty.ToString() + "," + oSub.HPrice.ToString() + "," + oSub.HMoney.ToString() + "," + oSub.HWHID.ToString() + "," + oSub.HSCWHID.ToString() + "," + oSub.HSPID.ToString() + + "," + oSub.HDesignLife.ToString() + "," + oSub.HLeaveLife.ToString() + "," + oSub.HUseLife.ToString() + + "," + oSub.HSCSPID.ToString() + "," + oSub.HSPGroupID.ToString() + ",'" + oSub.HBatchNo + "'" + + ") "); + } + DataSet Ds; + foreach (Models.ClsSc_MouldProdBillSub oSub in DetailColl) + { + Ds = oCn.RunProcReturn("exec h_p_Kf_ICStockBill_CheckKF " + omodel.HInterID + "," + oSub.HMaterID + "," + oSub.HWHID + "," + oSub.HSPID + ", 1", "gy_czygl"); + if (Ds.Tables[0].Rows.Count == 0) + { + oCn.RollBack(); + return false; + } + if (DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0][0]) == "N") + { + sReturn = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0][1]) + ", 涓嶅厑璁镐繚瀛橈紒"; + oCn.RollBack(); + return false; + } + } + sReturn = "淇敼鍗曟嵁鎴愬姛锛�"; + oCn.Commit(); + return true; + } + catch (Exception e) + { + sReturn = e.Message; + oCn.RollBack(); + throw (e); + } + } + } } \ No newline at end of file diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs index f2bcf13..2b97fe3 100644 --- a/WebAPI/ListModels.cs +++ b/WebAPI/ListModels.cs @@ -822,6 +822,31 @@ return list; } + /// <summary> + /// 澶勭悊鏂板妯″叿閲囪喘鍏ュ簱鍗曚富琛ㄧ殑json + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Models.ClsSc_MouldProdBillMain> getObjectByJson_Gy_MouldProdInHouseBillMain(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Models.ClsSc_MouldProdBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSc_MouldProdBillMain>>(jsonString); + return list; + } + + + /// <summary> + /// 澶勭悊鏂板妯″叿閲囪喘鍏ュ簱鍗曞瓙琛ㄧ殑json + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Models.ClsSc_MouldProdBillSub> getObjectByJson_Gy_MouldProdInHouseBillSub(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Models.ClsSc_MouldProdBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSc_MouldProdBillSub>>(jsonString); + return list; + } + ///璁惧鐐规璁板綍琛� 涓昏〃 ///ClsSb_EquipDotCheckBillMain public List<Model.ClsSb_EquipDotCheckBillMain> getObjectByJson_Sb_EquipDotCheckBillMain(string jsonString) diff --git a/WebAPI/Models/ClsSc_MouldProdBillMain.cs b/WebAPI/Models/ClsSc_MouldProdBillMain.cs new file mode 100644 index 0000000..c0cb484 --- /dev/null +++ b/WebAPI/Models/ClsSc_MouldProdBillMain.cs @@ -0,0 +1,23 @@ +锘縰sing System; +using System.Collections.Generic; +using System.Linq; +using System.Web; + +namespace WebAPI.Models +{ + public class ClsSc_MouldProdBillMain : DBUtility.ClsXt_BaseBillMain + { + public Int64 HSupID;// int --渚涘簲鍟� + public Int64 HWHID;// int --浠撳簱 + public Int64 HSCWHID;// int --璋冨嚭浠撳簱 + public Int64 HEmpID;// int --涓氬姟鍛� + public Int64 HManagerID;// int --璐熻矗浜� + public Int64 HSecManagerID;// int --楠屾敹 + public Int64 HKeeperID;// int --淇濈鍛� + public Int64 HDeptID;// int --閮ㄩ棬 + public string HExplanation;// varchar(200) --鎽樿 + public string HInnerBillNo;// varchar(50) --鍐呴儴鍗曟嵁鍙� + public string HRemark; //鍔犲伐瑕佹眰 + public bool HRedBlueFlag;// bit --绾㈣摑鍗� + } +} \ No newline at end of file diff --git a/WebAPI/Models/ClsSc_MouldProdBillSub.cs b/WebAPI/Models/ClsSc_MouldProdBillSub.cs new file mode 100644 index 0000000..4083749 --- /dev/null +++ b/WebAPI/Models/ClsSc_MouldProdBillSub.cs @@ -0,0 +1,42 @@ +锘縰sing System; +using System.Collections.Generic; +using System.Linq; +using System.Web; + +namespace WebAPI.Models +{ + public class ClsSc_MouldProdBillSub : DBUtility.ClsXt_BaseBillSub + { + public DateTime HEntryCloseDate;// datetime --琛屽叧闂� (榛樿涓�'') new + public string HRemark;// varchar(200) --澶囨敞 + public Int64 HMaterID;// int --鐗╂枡ID + public Int64 HPropertyID;// int --杈呭姪灞炴�� + public Int64 HSecUnitID;// int --杈呭姪璁¢噺鍗曚綅 + public Single HSecUnitRate;// money --鎹㈢畻鐜� + public Int64 HUnitID;// int --璁¢噺鍗曚綅 + public double HDesignLife;// dec(18,8) --璁捐瀵垮懡 + public double HLeaveLife;// dec(18,8) --鍓╀綑瀵垮懡 + public double HUseLife;// dec(18,8) --浣跨敤瀵垮懡 + public double HQtyMust;// dec(18,8) --搴旀敹鏁伴噺 + public double HQty;// dec(18,8) --瀹炴敹鏁伴噺 + public double HPrice;// dec(18,8) --鍗曚环 + public double HMoney;// dec(18,8) --閲戦 + public Int64 HWHID;// int --鏀舵枡浠撳簱 + public Int64 HSCWHID;// int --璋冨嚭浠撳簱ID + public Int64 HSPID;// int --浠撲綅ID + public Int64 HSCSPID;// int --璋冨嚭浠撲綅ID + public Int64 HSPGroupID;// int --浠撲綅缁処D(浠撳簱閫夋嫨瀹岃嚜鍔ㄥ甫鍑�) + public string HBatchNo;// varchar(50) --鎵规 + public string HEngineNum;// varchar(50) --鍙戝姩鏈哄彿 + public string HUnderPanNum;// varchar(50) --鍦扮洏鍙� + public string HLeaveFactCard;// varchar(50) --鍑哄巶璇� + public Int64 HPOOrderInterID;// int --閲囪喘璁㈠崟涓诲唴鐮� + public Int64 HPOOrderEntryID;// int --閲囪喘璁㈠崟瀛愬唴鐮� + public string HPOOrderBillNo;// varchar(50) --閲囪喘璁㈠崟鍙� + public Int64 HSeOrderInterID;// int --閿�鍞鍗曚富鍐呯爜 + public Int64 HSeOrderEntryID;// int --閿�鍞鍗曞瓙鍐呯爜 + public string HSeOrderBillNo;// varchar(50) --閿�鍞鍗曞彿 + //public string HBatchNo; + public string HBarCode; + } +} \ No newline at end of file diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user index c123f4a..5ec5c07 100644 --- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -18,25 +18,25 @@ <publishTime>02/22/2013 08:43:40</publishTime> </File> <File Include="bin/BLL.dll"> - <publishTime>09/14/2021 17:32:39</publishTime> + <publishTime>09/15/2021 17:22:34</publishTime> </File> <File Include="bin/BLL.pdb"> - <publishTime>09/14/2021 17:32:39</publishTime> + <publishTime>09/15/2021 17:22:34</publishTime> </File> <File Include="bin/DAL.dll"> - <publishTime>09/14/2021 17:32:35</publishTime> + <publishTime>09/15/2021 17:22:32</publishTime> </File> <File Include="bin/DAL.pdb"> - <publishTime>09/14/2021 17:32:35</publishTime> + <publishTime>09/15/2021 17:22:32</publishTime> </File> <File Include="bin/Dapper.dll"> <publishTime>07/22/2016 14:52:40</publishTime> </File> <File Include="bin/DBUtility.dll"> - <publishTime>09/14/2021 17:32:28</publishTime> + <publishTime>09/15/2021 17:22:27</publishTime> </File> <File Include="bin/DBUtility.pdb"> - <publishTime>09/14/2021 17:32:28</publishTime> + <publishTime>09/15/2021 17:22:27</publishTime> </File> <File Include="bin/Interop.gregn6Lib.dll"> <publishTime>08/25/2021 10:28:25</publishTime> @@ -60,10 +60,10 @@ <publishTime>07/25/2012 11:48:56</publishTime> </File> <File Include="bin/Model.dll"> - <publishTime>09/14/2021 17:32:29</publishTime> + <publishTime>09/15/2021 17:22:28</publishTime> </File> <File Include="bin/Model.pdb"> - <publishTime>09/14/2021 17:32:29</publishTime> + <publishTime>09/15/2021 17:22:28</publishTime> </File> <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs"> <publishTime>08/16/2021 17:23:15</publishTime> @@ -72,22 +72,22 @@ <publishTime>08/03/2014 20:33:56</publishTime> </File> <File Include="bin/Pub_Class.dll"> - <publishTime>09/14/2021 17:32:25</publishTime> + <publishTime>09/15/2021 17:22:24</publishTime> </File> <File Include="bin/Pub_Class.pdb"> - <publishTime>09/14/2021 17:32:25</publishTime> + <publishTime>09/15/2021 17:22:24</publishTime> </File> <File Include="bin/Pub_Control.dll"> - <publishTime>09/14/2021 17:32:26</publishTime> + <publishTime>09/15/2021 17:22:25</publishTime> </File> <File Include="bin/Pub_Control.pdb"> - <publishTime>09/14/2021 17:32:26</publishTime> + <publishTime>09/15/2021 17:22:25</publishTime> </File> <File Include="bin/SQLHelper.dll"> - <publishTime>09/14/2021 17:32:27</publishTime> + <publishTime>09/15/2021 17:22:25</publishTime> </File> <File Include="bin/SQLHelper.pdb"> - <publishTime>09/14/2021 17:32:27</publishTime> + <publishTime>09/15/2021 17:22:25</publishTime> </File> <File Include="bin/stdole.dll"> <publishTime>05/09/2021 13:35:37</publishTime> @@ -189,10 +189,10 @@ <publishTime>11/24/2014 11:18:48</publishTime> </File> <File Include="bin/WebAPI.dll"> - <publishTime>09/14/2021 17:32:45</publishTime> + <publishTime>09/15/2021 17:22:40</publishTime> </File> <File Include="bin/WebAPI.pdb"> - <publishTime>09/14/2021 17:32:45</publishTime> + <publishTime>09/15/2021 17:22:40</publishTime> </File> <File Include="bin/WebGrease.dll"> <publishTime>07/17/2013 17:03:52</publishTime> @@ -363,7 +363,7 @@ <publishTime>08/06/2021 22:57:28</publishTime> </File> <File Include="Web.config"> - <publishTime>09/14/2021 17:33:02</publishTime> + <publishTime>09/15/2021 17:22:54</publishTime> </File> </ItemGroup> </Project> \ No newline at end of file diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj index c8ab4d5..06c00cd 100644 --- a/WebAPI/WebAPI.csproj +++ b/WebAPI/WebAPI.csproj @@ -400,6 +400,8 @@ <Compile Include="Models\ClsSb_EquipMaintainBillMain.cs" /> <Compile Include="Models\ClsSb_EquipMaintainBillSub.cs" /> <Compile Include="Models\ClsSb_EquipRepairWorkBillMain.cs" /> + <Compile Include="Models\ClsSc_MouldProdBillMain.cs" /> + <Compile Include="Models\ClsSc_MouldProdBillSub.cs" /> <Compile Include="Models\Xt_ORGANIZATIONS.cs" /> <Compile Include="Models\ClsSb_EquipRepairWorkBillSub.cs" /> <Compile Include="Models\ClsSc_ICMOBillWorkQtyStatus_Tmp.cs" /> diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user index e034e8d..c934955 100644 --- a/WebAPI/WebAPI.csproj.user +++ b/WebAPI/WebAPI.csproj.user @@ -7,7 +7,7 @@ <WebStackScaffolding_IsReferencingScriptLibrariesSelected>True</WebStackScaffolding_IsReferencingScriptLibrariesSelected> <WebStackScaffolding_LayoutPageFile /> <WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected> - <NameOfLastUsedPublishProfile>D:\Git\houduan\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile> + <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile> <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <UseIISExpress>false</UseIISExpress> <Use64BitIISExpress /> -- Gitblit v1.9.1