From 4d1df5bededf90dfa91350e5258cee1e6b5ba010 Mon Sep 17 00:00:00 2001 From: yusijie <ysj@hz-kingdee.com> Date: 星期三, 12 二月 2025 14:05:43 +0800 Subject: [PATCH] 产线器具对应清单 --- WebAPI/Controllers/JHGL/Gy_SourceMouldBillController.cs | 648 ++++++++++++++++++++++++++++++++++++++ WebAPI/ListModels.cs | 24 + Model/计划管理/ClsGy_SourceMouldBillSub.cs | 14 DAL/DAL.csproj | 1 Model/Model.csproj | 2 WebAPI/WebAPI.csproj | 1 DAL/计划管理/ClsGy_SourceMouldBillMain.cs | 271 +++++++++++++++ Model/计划管理/ClsGy_SourceMouldBillMain.cs | 17 + 8 files changed, 978 insertions(+), 0 deletions(-) diff --git a/DAL/DAL.csproj b/DAL/DAL.csproj index ed4923e..e801991 100644 --- a/DAL/DAL.csproj +++ b/DAL/DAL.csproj @@ -95,6 +95,7 @@ <Compile Include="婧愬崟\InterFace婧愬崟\Cls_S_IF_ICMOBillList_CusBarCodeBill.cs" /> <Compile Include="婧愬崟\InterFace婧愬崟\Cls_S_IF_ICMOReportBillList_CusBarCodeBill.cs" /> <Compile Include="绯荤粺鍏敤\ClsXt_DefineBillMainSet.cs" /> + <Compile Include="璁″垝绠$悊\ClsGy_SourceMouldBillMain.cs" /> <Compile Include="璐ㄦ绠$悊\ClsQC_EnvironmentTestDotCheckBillMain.cs" /> <Compile Include="璐ㄦ绠$悊\ClsQC_MonthTarGetBill.cs" /> <Compile Include="鐢熶骇绠$悊\璁惧绠$悊\ClsSb_EquipRepairSignBill.cs" /> diff --git "a/DAL/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_SourceMouldBillMain.cs" "b/DAL/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_SourceMouldBillMain.cs" new file mode 100644 index 0000000..5514547 --- /dev/null +++ "b/DAL/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_SourceMouldBillMain.cs" @@ -0,0 +1,271 @@ +锘縰sing System; +using System.Collections.Generic; +using System.Text; +using System.Data; + +namespace DAL +{ + public class ClsGy_SourceMouldBillMain : DBUtility.ClsXt_BaseBill + { + public Model.ClsGy_SourceMouldBillMain omodel = new Model.ClsGy_SourceMouldBillMain(); + public List<Model.ClsGy_SourceMouldBillSub> DetailColl = new List<Model.ClsGy_SourceMouldBillSub>(); + + public ClsGy_SourceMouldBillMain() + { + base.MvarItemKeySub = "Gy_SourceMouldBillSub"; + base.MvarItemKeySub2 = ""; + base.MvarItemKeySub3 = ""; + base.MvarItemKeySub4 = ""; + base.MvarItemKey = "Gy_SourceMouldBillMain"; + base.MvarReportTitle = "浜х嚎鍣ㄥ叿娓呭崟"; + base.BillType = "4617"; + base.HBillSubType = "4617"; + + } + + #region 鍥哄畾浠g爜 + #region 鏃犲弬鏋勯�犲嚱鏁� + ~ClsGy_SourceMouldBillMain() + { + DetailColl = null; + } + #endregion + #endregion + + //#region 淇敼鍗曟嵁 + public override bool ModifyBill(Int64 lngBillKey, ref string sReturn) + { + try + { + oCn.BeginTran(); + //鏇存柊涓昏〃 + string mainSql = "update Gy_SourceMouldBillMain set " + + " HBillNo = '" + omodel.HBillNo + + "', HDate = '" + omodel.HDate + + "', HRemark = '" + omodel.HRemark + + "', HUpDater = '" + omodel.HUpDater + + "', HUpDateDate = getdate()" + + //=============================================================== + + ", HDeptID = '" + omodel.HDeptID + + "', HEmpID = '" + omodel.HEmpID + + "', HSourceID = '" + omodel.HSourceID + + "', HWorkCenterID = '" + omodel.HWorkCenterID + + "', HEquipID = '" + omodel.HEquipID + + "', HOrgID = '" + omodel.HOrgID + + "', HProcID = " + omodel.HProcID + + " where HInterID = " + omodel.HInterID; + + oCn.RunProc(mainSql); + //鍒犻櫎鍏宠仈 + DeleteRelation(ref sReturn, lngBillKey); + //鍒犻櫎瀛愯〃 + DeleteBillSub(lngBillKey); + + //鎻掑叆瀛愯〃 + omodel.HInterID = lngBillKey; + foreach (Model.ClsGy_SourceMouldBillSub oSub in DetailColl) + { + string subSql = "insert into Gy_SourceMouldBillSub" + + "(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" + + ",HMouldID,HQty,HMouldQty,HRate) " + + " values(" + + "" + omodel.HInterID.ToString() + + "," + oSub.HEntryID.ToString() + + "," + oSub.HSourceInterID + + "," + oSub.HSourceEntryID + + ",'" + oSub.HSourceBillNo + + "','" + oSub.HSourceBillType + + "','" + oSub.HMouldID + + "'," + oSub.HQty + + "," + oSub.HMouldQty + + ",'" + oSub.HRate + + "')"; + oCn.RunProc(subSql); + } + + sReturn = "淇敼鍗曟嵁鎴愬姛锛�"; + oCn.Commit(); + return true; + } + catch (Exception e) + { + sReturn = e.Message; + oCn.RollBack(); + throw (e); + } + } + //#endregion + + #region 鏂板鍗曟嵁 + public override bool AddBill(ref string sReturn) + { + try + { + DataSet ds; + + + oCn.BeginTran(); + + //妫�鏌ヤ富琛ㄥ唴鐮佹槸鍚﹂噸澶嶏紝鑻ラ噸澶嶅垯閲嶆柊鐢熸垚骞剁户缁鏌ワ紝鐩村埌涓嶅啀閲嶅 + while (true) + { + ds = oCn.RunProcReturn("select * from Gy_SourceMouldBillMain where HInterID = " + omodel.HInterID, "Gy_SourceMouldBillMain"); + if (ds != null && ds.Tables[0].Rows.Count > 0) + { + omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo); + } + else + { + break; + } + } + + //鎻掑叆涓昏〃 + string mainSql = "insert into Gy_SourceMouldBillMain" + + "(HYear,HPeriod,HBillType,HBillSubType,HInterID,HDate,HBillNo,HRemark,HMaker,HMakeDate" + + ",HDeptID,HEmpID,HSourceID,HWorkCenterID,HEquipID,HOrgID,HProcID) " + + "values(" + + "" + omodel.HYear.ToString() + + "," + omodel.HPeriod.ToString() + + ",'" + this.BillType + + "','" + this.HBillSubType + + "'," + omodel.HInterID + + ",'" + omodel.HDate + + "','" + omodel.HBillNo + + "','" + omodel.HRemark + + "','" + omodel.HMaker + + "',getdate()" + + "," + omodel.HDeptID + + "," + omodel.HEmpID + + ",'" + omodel.HSourceID + + "','" + omodel.HWorkCenterID + + "','" + omodel.HEquipID + + "','" + omodel.HOrgID + + "'," + omodel.HProcID + + ")"; + + oCn.RunProc(mainSql); + + //鎻掑叆瀛愯〃 + foreach (Model.ClsGy_SourceMouldBillSub oSub in DetailColl) + { + string subSql = "insert into Gy_SourceMouldBillSub" + + "" + + "" + + "" + + "(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" + + ",HMouldID,HQty,HMouldQty,HRate) " + + " values(" + + "" + omodel.HInterID.ToString() + + "," + oSub.HEntryID.ToString() + + "," + oSub.HSourceInterID + + "," + oSub.HSourceEntryID + + ",'" + oSub.HSourceBillNo + + "','" + oSub.HSourceBillType + + "','" + oSub.HMouldID + + "'," + oSub.HQty + + "," + oSub.HMouldQty + + ",'" + oSub.HRate + + "')"; + oCn.RunProc(subSql); + } + sReturn = "鏂板鍗曟嵁鎴愬姛锛�"; + oCn.Commit(); + return true; + } + catch (Exception e) + { + sReturn = e.Message; + oCn.RollBack(); + throw (e); + } + } + #endregion + + #region 鏄剧ず鍗曟嵁 + public override bool ShowBill(Int64 lngBillKey, ref string sReturn) + { + try + { + //鏌ヨ涓昏〃 + DataSet Ds; + Ds = oCn.RunProcReturn("select * from Gy_SourceMouldBillMain Where HInterID = " + lngBillKey.ToString(), "Gy_SourceMouldBillMain"); + if (Ds.Tables[0].Rows.Count == 0) + { + sReturn = "鍗曟嵁鏈壘鍒帮紒"; + return false; + } + + //鍥哄畾璧嬪��=========================================== + omodel.HYear = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HYear"]); + omodel.HPeriod = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HPeriod"]); + omodel.HBillType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillType"]); + omodel.HBillSubType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillSubType"]); + omodel.HInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HInterID"]); + omodel.HDate = DBUtility.ClsPub.isDate(Ds.Tables[0].Rows[0]["HDate"]); + omodel.HBillNo = Ds.Tables[0].Rows[0]["HBillNo"].ToString().Trim(); + omodel.HBillStatus = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HBillStatus"]); + omodel.HCheckItemNowID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckItemNowID"]); + omodel.HCheckItemNextID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckItemNextID"]); + omodel.HCheckFlowID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckFlowID"]); + omodel.HRemark = Ds.Tables[0].Rows[0]["HRemark"].ToString().Trim(); + omodel.HBackDate = Ds.Tables[0].Rows[0]["HBackDate"].ToString().Trim(); + omodel.HBacker = Ds.Tables[0].Rows[0]["HBacker"].ToString().Trim(); + omodel.HCheckDate = Ds.Tables[0].Rows[0]["HCheckDate"].ToString().Trim(); + omodel.HChecker = Ds.Tables[0].Rows[0]["HChecker"].ToString().Trim(); + omodel.HMaker = Ds.Tables[0].Rows[0]["HMaker"].ToString().Trim(); + omodel.HMakeDate = Ds.Tables[0].Rows[0]["HMakeDate"].ToString().Trim(); + omodel.HUpDateDate = Ds.Tables[0].Rows[0]["HUpDateDate"].ToString().Trim(); + omodel.HUpDater = Ds.Tables[0].Rows[0]["HUpDater"].ToString().Trim(); + omodel.HCloseDate = Ds.Tables[0].Rows[0]["HCloseDate"].ToString().Trim(); + omodel.HCloseMan = Ds.Tables[0].Rows[0]["HCloseMan"].ToString().Trim(); + omodel.HCloseType = DBUtility.ClsPub.isBool(Ds.Tables[0].Rows[0]["HCloseType"]); + omodel.HDeleteDate = Ds.Tables[0].Rows[0]["HDeleteDate"].ToString().Trim(); + omodel.HDeleteMan = Ds.Tables[0].Rows[0]["HDeleteMan"].ToString().Trim(); + //======================================================== + + omodel.HOrgID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HOrgID"]); + + + // + + //寰幆 + DataSet DsSub; + DsSub = oCn.RunProcReturn("select * from Gy_SourceMouldBillSub where HInterID = " + lngBillKey.ToString() + "order by HEntryID", "Gy_SourceMouldBillSub"); + DetailColl.Clear();//娓呯┖ + for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++) + { + Model.ClsGy_SourceMouldBillSub oSub = new Model.ClsGy_SourceMouldBillSub(); + // 鍥哄畾璧嬪��=============================================== + oSub.HInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HInterID"]); + oSub.HEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HEntryID"]); + oSub.HSourceInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceInterID"]); + oSub.HSourceEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceEntryID"]); + oSub.HSourceBillType = DsSub.Tables[0].Rows[i]["HSourceBillType"].ToString().Trim(); + oSub.HSourceBillNo = DsSub.Tables[0].Rows[i]["HSourceBillNo"].ToString().Trim(); + oSub.HRelationQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationQty"]); + oSub.HRelationMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationMoney"]); + oSub.HCloseMan = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HCloseMan"]); + oSub.HCloseType = DBUtility.ClsPub.isBool(DsSub.Tables[0].Rows[i]["HCloseType"]); + oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HEntryCloseDate"]); + oSub.HRemark = DsSub.Tables[0].Rows[i]["HRemark"].ToString().Trim(); + //=================================================== + + + DetailColl.Add(oSub); + } + sReturn = "鏄剧ず鍗曟嵁鎴愬姛锛�"; + return true; + } + catch (Exception e) + { + sReturn = e.Message; + throw (e); + } + } + #endregion + + } + +} diff --git a/Model/Model.csproj b/Model/Model.csproj index 594fa4d..cde9819 100644 --- a/Model/Model.csproj +++ b/Model/Model.csproj @@ -155,6 +155,8 @@ <Compile Include="鐢熶骇绠$悊\妯″叿绠$悊\ClsSc_MouldMaintainPlanBillSub_Plan.cs" /> <Compile Include="绯荤粺鍏敤\ClsXt_DefineBillMainSetSub.cs" /> <Compile Include="绯荤粺鍏敤\ClsXt_DefineBillMainSetMain.cs" /> + <Compile Include="璁″垝绠$悊\ClsGy_SourceMouldBillMain.cs" /> + <Compile Include="璁″垝绠$悊\ClsGy_SourceMouldBillSub.cs" /> <Compile Include="璐ㄦ绠$悊\ClsQC_EnvironmentTestDotCheckBillMain.cs" /> <Compile Include="璐ㄦ绠$悊\ClsQC_EnvironmentTestDotCheckBillSub.cs" /> <Compile Include="璐ㄦ绠$悊\ClsQC_MonthTarGetBillMain.cs" /> diff --git "a/Model/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_SourceMouldBillMain.cs" "b/Model/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_SourceMouldBillMain.cs" new file mode 100644 index 0000000..959d94e --- /dev/null +++ "b/Model/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_SourceMouldBillMain.cs" @@ -0,0 +1,17 @@ +锘縰sing System; +using System.Collections.Generic; +using System.Text; +namespace Model +{ + public class ClsGy_SourceMouldBillMain : DBUtility.ClsXt_BaseBillMain + { + public Int64 HOrgID; //int 缁勭粐 + public Int64 HDeptID; //int 閮ㄩ棬 + public Int64 HEmpID; //int 璐熻矗浜� + public Int64 HSourceID; //int 浜х嚎 + public Int64 HWorkCenterID; //int 宸ヤ綔涓績 + public Int64 HEquipID; //int 璁惧ID + + public Int64 HProcID; //宸ュ簭ID + } +} diff --git "a/Model/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_SourceMouldBillSub.cs" "b/Model/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_SourceMouldBillSub.cs" new file mode 100644 index 0000000..d1f52d2 --- /dev/null +++ "b/Model/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_SourceMouldBillSub.cs" @@ -0,0 +1,14 @@ +锘縰sing System; +using System.Collections.Generic; +using System.Text; + +namespace Model +{ + public class ClsGy_SourceMouldBillSub : DBUtility.ClsXt_BaseBillSub + { + public Int64 HMouldID; + public Int64 HMouldQty; + public decimal HQty; + public decimal HRate; + } +} diff --git a/WebAPI/Controllers/JHGL/Gy_SourceMouldBillController.cs b/WebAPI/Controllers/JHGL/Gy_SourceMouldBillController.cs new file mode 100644 index 0000000..4fd3b93 --- /dev/null +++ b/WebAPI/Controllers/JHGL/Gy_SourceMouldBillController.cs @@ -0,0 +1,648 @@ +锘縰sing DBUtility; +using Model; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq; +using System.Web; +using System.Web.Http; +using System.Windows.Forms; +using WebAPI.Models; + + +namespace WebAPI.Controllers.JHGL +{ + public class Gy_SourceMouldBillController : ApiController + { + private json objJsonResult = new json(); + public DataSet ds = new DataSet(); + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + public DAL.ClsGy_SourceMouldBillMain BillNew1 = new DAL.ClsGy_SourceMouldBillMain(); //浜у搧鍣ㄥ叿娓呭崟瀵瑰簲鍗曟嵁绫� + public DAL.ClsGy_SourceMouldBillMain BillOld1 = new DAL.ClsGy_SourceMouldBillMain(); + public DBUtility.ClsPub.Enum_BillStatus BillStatus;//鍗曟嵁鐘舵�侊紙鏂板锛屼慨鏀癸紝娴忚锛屾洿鏂板崟浠凤紝鍙樻洿锛� + + + #region 浜х嚎鍣ㄥ叿娓呭崟鍗曞垪琛� + [Route("Gy_SourceMouldBill/Gy_SourceMouldBillList")] + [HttpGet] + public object Gy_SourceMouldBillList(string sWhere, string user) + { + try + { + List<object> columnNameList = new List<object>(); + //鏌ヨ鏉冮檺 + if (!DBUtility.ClsPub.Security_Log("Gy_SourceMouldBill_Query", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒"; + objJsonResult.data = null; + return objJsonResult; + } + + if (sWhere == null || sWhere.Equals("")) + { + ds = oCN.RunProcReturn("select * from h_v_Gy_SourceMouldBillMainList order by 鍗曟嵁鍙� desc", "h_v_Gy_SourceMouldBillMainList"); + } + else + { + string sql1 = "select * from h_v_Gy_SourceMouldBillMainList where 1 = 1 "; + string sql = sql1 + sWhere + " order by 鍗曟嵁鍙� desc"; + ds = oCN.RunProcReturn(sql, "h_v_Gy_SourceMouldBillMainList"); + } + //娣诲姞鍒楀悕 + foreach (DataColumn col in ds.Tables[0].Columns) + { + Type dataType = col.DataType; + string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; + columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕 + } + + + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "Sucess锛�"; + objJsonResult.data = ds.Tables[0]; + objJsonResult.list = columnNameList; + return objJsonResult; + } + catch (Exception ex) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + #endregion + + #region 浜у搧鍣ㄥ叿娓呭崟缂栬緫鏃惰幏鍙栬〃浣撴暟鎹� + [Route("Gy_SourceMouldBill/Gy_SourceMouldBillEditList")] + [HttpGet] + public object Gy_SourceMouldBillEditList(string HInterID, string User) + { + try + { + //鏌ョ湅鏉冮檺 + if (!DBUtility.ClsPub.Security_Log("Gy_SourceMouldBill_Edit", 1, false, User)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒"; + objJsonResult.data = null; + return objJsonResult; + } + + if (HInterID == null || HInterID.Equals("")) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "HInterID涓嶈兘涓虹┖锛�"; + objJsonResult.data = null; + return objJsonResult; + } + + ds = oCN.RunProcReturn("select * from h_v_Gy_SourceMouldBill_Edit where HInterID = " + HInterID, "h_v_Gy_SourceMouldBill_Edit"); + + if (ds != null && ds.Tables.Count > 0) + { + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "Sucess锛�"; + objJsonResult.data = ds.Tables[0]; + return objJsonResult; + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "娌℃湁鏌ヨ鍒版暟鎹紒"; + objJsonResult.data = ""; + return objJsonResult; + } + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + #endregion + + #region 浜у搧鍣ㄥ叿娓呭崟 淇濆瓨/缂栬緫 + /// <summary> + /// 淇濆瓨妯″叿缁翠慨鍗� + /// </summary> + /// <param name="msg"></param> + /// <returns></returns> + [Route("Gy_SourceMouldBill/SaveGy_SourceMouldBillMain")] + [HttpPost] + public object SaveGy_SourceMouldBillMain([FromBody] JObject sMainSub) + { + var _value = sMainSub["sMainSub"].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();//鎿嶄綔鏂瑰紡鏁版嵁绫诲瀷 1娣诲姞 3淇敼 2 澶嶅埗 + string user = sArray[3].ToString();//鐢ㄦ埛鍚� + + string UserName = ""; + string s = ""; + ListModels oListModels = new ListModels(); + try + { + //淇濆瓨鏉冮檺 + if (!DBUtility.ClsPub.Security_Log_second("Gy_SourceMouldBill_Edit", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒"; + objJsonResult.data = null; + return objJsonResult; + } + + DAL.ClsGy_SourceMouldBillMain oBill = new DAL.ClsGy_SourceMouldBillMain(); + List<Model.ClsGy_SourceMouldBillMain> lsmain = new List<Model.ClsGy_SourceMouldBillMain>(); + msg2 = msg2.Replace("\\", ""); + msg2 = msg2.Replace("\n", ""); //\n + lsmain = oListModels.getObjectByJson_Gy_SourceMouldBillMain(msg2); + foreach (Model.ClsGy_SourceMouldBillMain oItem in lsmain) + { + if (refSav == "Add") + { + //鍗曟嵁鍙锋槸鍚﹂噸澶� + if (BillNew1.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, BillOld1.omodel.HInterID)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍗曟嵁鍙烽噸澶嶏紒涓嶅厑璁镐繚瀛橈紒"; + objJsonResult.data = 1; + return objJsonResult; + } + } + if (refSav == "Update") + { + if (BillOld1.ShowBill(oItem.HInterID, ref s) == false) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "姝ゅ崟鎹湁璇紒"; + objJsonResult.data = 1; + return objJsonResult; + } + //鍒ゆ柇鏄惁鍙紪杈� + if (BillOld1.omodel.HChecker != "" && BillOld1.omodel.HChecker != null) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "姝ゅ崟鎹凡缁忚瀹℃牳锛屼笉鍏佽淇敼锛�"; + objJsonResult.data = 1; + return objJsonResult; + } + if (BillOld1.omodel.HBillStatus > 1) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "姝ゅ崟鎹浜庝笉鍙紪杈戠姸鎬侊紝涓嶅厑璁镐慨鏀癸紒"; + objJsonResult.data = 1; + return objJsonResult; + } + if (!DBUtility.Xt_BaseBillFun.Fun_AllowEditBill(BillOld1, ref s)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = s + "锛屼笉鍏佽淇敼"; + objJsonResult.data = 1; + return objJsonResult; + } + } + UserName = oItem.HMaker; //鍒跺崟浜� + oItem.HBillType = "4617"; + oItem.HBillSubType = "4617"; + + oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year); + oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month); + oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd")); + + 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 + List<Model.ClsGy_SourceMouldBillSub> ls = new List<Model.ClsGy_SourceMouldBillSub>(); + ls = oListModels.getObjectByJson_Gy_SourceMouldBillSub(msg3); + int i = 0; + foreach (Model.ClsGy_SourceMouldBillSub oItemSub in ls) + { + i++; + oItemSub.HEntryID = i; + + oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now); + oItemSub.HCloseType = false; //鍏抽棴绫诲瀷 + + oBill.DetailColl.Add(oItemSub); + + } + //淇濆瓨 + //淇濆瓨瀹屾瘯鍚庡鐞� + bool bResult; + if (refSav == "Add") + { + + bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo); + } + else if (refSav == "Update") + { + bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo); + } + else + { + bResult = false; + } + if (bResult) + { + objJsonResult.code = "0"; + objJsonResult.count = 1; + objJsonResult.Message = "淇濆瓨鎴愬姛锛�"; + 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 浜х嚎鍣ㄥ叿娓呭崟璁板綍鍒犻櫎鍔熻兘 + [Route("Gy_SourceMouldBill/DeleteGy_SourceMould")] + [HttpGet] + public object DeleteGy_SourceMould(string HInterID, string user) + { + try + { + //鍒犻櫎鏉冮檺 + if (!DBUtility.ClsPub.Security_Log("Gy_SourceMouldBill_Delete", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒"; + objJsonResult.data = null; + return objJsonResult; + } + + if (HInterID == null || HInterID.Equals("")) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "HInterID涓嶈兘涓虹┖锛�"; + objJsonResult.data = null; + return objJsonResult; + } + + oCN.BeginTran(); + + oCN.RunProc("delete from Gy_SourceMouldBillMain where HInterID = " + HInterID); + oCN.RunProc("delete from Gy_SourceMouldBillSub where HInterID = " + HInterID); + + oCN.Commit(); + + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "鍒犻櫎鎴愬姛锛�"; + objJsonResult.data = null; + return objJsonResult; + } + catch (Exception e) + { + oCN.RollBack(); + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + #endregion + + #region 浜у搧鍣ㄥ叿娓呭崟鍒楄〃 瀹℃牳/鍙嶅鏍稿姛鑳� + [Route("Gy_SourceMouldBill/CheckGy_SourceMouldBillMain")] + [HttpGet] + public object CheckGy_SourceMouldBillMain(int HInterID, int IsAudit, string CurUserName) + { + DBUtility.ClsPub.CurUserName = CurUserName; + try + { + //瀹℃牳鏉冮檺 + if (!DBUtility.ClsPub.Security_Log_second("Gy_SourceMouldBill_Check", 1, false, CurUserName)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�"; + objJsonResult.data = null; + return objJsonResult; + } + + //HInterID鏁版嵁鍒ゆ柇 + 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); //瀵笻InterID杩涜绫诲瀷鐨勮浆鎹� + DAL.ClsGy_SourceMouldBillMain oBill = new DAL.ClsGy_SourceMouldBillMain(); //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣� + + //閽堝闇�瑕佽繘琛岀殑鎿嶄綔锛屾楠屽綋鍓嶅崟鎹殑鐘舵�佹槸鍚︽敮鎸侀渶瑕佽繘琛岀殑鎿嶄綔 + if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo)) //鏍规嵁HInterID鑾峰彇璇ュ崟鎹殑鏁版嵁 + { + 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) //瀹℃牳鎻愪氦 + { + oCN.BeginTran(); + + //璁板綍杩斿洖淇℃伅 + string msg = ""; + + + + //瀹℃牳鍓嶆帶鍒�========================================= + string sql1 = "exec h_p_Gy_SourceMouldBill_BeforeCheckCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'"; + ds = oCN.RunProcReturn(sql1, "h_p_Gy_SourceMouldBill_BeforeCheckCtrl"); + if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 1; + objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:瀹℃牳鍓嶅垽鏂け璐ワ紝璇蜂笌缃戠粶绠$悊浜哄憳鑱旂郴"; + objJsonResult.data = null; + oCN.RollBack(); + return objJsonResult; + } + + if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0") + { + objJsonResult.code = "0"; + objJsonResult.count = 1; + objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ; + objJsonResult.data = null; + oCN.RollBack(); + return objJsonResult; + } + //================================================================================== + + //瀹℃牳鎻愪氦 + if (oBill.CheckBill(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Gy_SourceMouldBill_AfterCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true) + { + oCN.Commit(); + + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "瀹℃牳鎴愬姛锛�" + msg; + objJsonResult.data = null; + return objJsonResult; + } + else + { + oCN.RollBack(); + + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo; + objJsonResult.data = null; + return objJsonResult; + } + } + if (IsAudit == 1) //鍙嶅鏍告彁浜� + { + + //鍙嶅鏍稿墠鎺у埗========================================= + string sql1 = "exec h_p_Gy_SourceMouldBill_BeforeUnCheckCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'"; + ds = oCN.RunProcReturn(sql1, "h_p_Gy_SourceMouldBill_BeforeUnCheckCtrl"); + if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 1; + objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:鍙嶅鏍稿墠鍒ゆ柇澶辫触锛岃涓庣綉缁滅鐞嗕汉鍛樿仈绯�"; + objJsonResult.data = null; + return objJsonResult; + + } + if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0") + { + objJsonResult.code = "0"; + objJsonResult.count = 1; + objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ; + objJsonResult.data = null; + return objJsonResult; + } + //=========================================================== + + //鍙嶅鏍告彁浜bandonCheck + if (oBill.AbandonCheck(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Gy_SourceMouldBill_AfterUnCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true) + { + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "鍙嶅鏍告垚鍔�"; + objJsonResult.data = null; + return objJsonResult; + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo; + objJsonResult.data = null; + return objJsonResult; + } + } + return objJsonResult; + } + catch (Exception e) + { + oCN.RollBack(); + + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "瀹℃牳澶辫触鎴栬�呭弽瀹℃牳澶辫触锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + + } + #endregion + + #region 浜х嚎鍣ㄥ叿娓呭崟鍒楄〃 鍏抽棴/鍙嶅叧闂姛鑳� + [Route("Gy_SourceMouldBill/CloseGy_SourceMouldBillMain")] + [HttpGet] + public object CloseGy_SourceMouldBillMain(string HInterID, int IsAudit, string user) + { + try + { + //鍒ゆ柇鏄惁鏈夊叧闂潈闄� + if (!DBUtility.ClsPub.Security_Log("Gy_SourceMouldBill_Close", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犳潈闄愬叧闂�!"; + objJsonResult.data = null; + return objJsonResult; + } + + + var ds = oCN.RunProcReturn("select * from Gy_SourceMouldBillMain where HInterID=" + HInterID, "Gy_SourceMouldBillMain"); + if (ds.Tables[0].Rows.Count > 0) + { + if (IsAudit == 0) //鍏抽棴鍒ゆ柇 + { + if (ds.Tables[0].Rows[0]["HCloseMan"].ToString() != "") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘鍐嶆鍏抽棴锛�"; + objJsonResult.data = null; + return objJsonResult; + } + } + if (IsAudit == 1) //鍙嶅叧闂垽鏂� + { + if (ds.Tables[0].Rows[0]["HCloseMan"].ToString() == "") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍗曟嵁鏈叧闂�!涓嶉渶瑕佸弽鍏抽棴!"; + objJsonResult.data = null; + return objJsonResult; + } + } + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!"; + objJsonResult.data = null; + return objJsonResult; + } + + oCN.BeginTran(); + + if (IsAudit == 0) //鍏抽棴鍒ゆ柇 + { + oCN.RunProc("update Gy_SourceMouldBillMain set HCloseMan='" + user + "',HCloseDate=getdate() where HInterID=" + HInterID); + + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "鍏抽棴鎴愬姛"; + objJsonResult.data = null; + } + if (IsAudit == 1) //鍙嶅鏍稿垽鏂� + { + oCN.RunProc("update Gy_SourceMouldBillMain set HCloseMan='',HCloseDate=null where HInterID=" + HInterID); + + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "鍙嶅叧闂垚鍔�"; + objJsonResult.data = null; + } + oCN.Commit(); + + return objJsonResult; + + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + #endregion + + } +} diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs index 201b0bd..8d41335 100644 --- a/WebAPI/ListModels.cs +++ b/WebAPI/ListModels.cs @@ -1637,6 +1637,30 @@ } /// <summary> + /// 澶勭悊鏂板浜х嚎鍣ㄥ叿娓呭崟琛ㄧ殑json + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsGy_SourceMouldBillMain> getObjectByJson_Gy_SourceMouldBillMain(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsGy_SourceMouldBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_SourceMouldBillMain>>(jsonString); + return list; + } + + /// <summary> + /// 澶勭悊鏂板浜х嚎鍣ㄥ叿娓呭崟瀛愯〃鐨刯son + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsGy_SourceMouldBillSub> getObjectByJson_Gy_SourceMouldBillSub(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsGy_SourceMouldBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_SourceMouldBillSub>>(jsonString); + return list; + } + + /// <summary> /// 澶勭悊鏂板浜у搧宸ヨ壓鍙傛暟娓呭崟琛ㄧ殑json /// </summary> /// <param name="jsonString"></param> diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj index 06d7a93..2525845 100644 --- a/WebAPI/WebAPI.csproj +++ b/WebAPI/WebAPI.csproj @@ -441,6 +441,7 @@ <Compile Include="Controllers\CJGL\Sc_KeyElementBindingController.cs" /> <Compile Include="Controllers\CJGL\Sc_OEEReportController.cs" /> <Compile Include="Controllers\CKGL\TMZD\Gy_BarCodeBillListController.cs" /> + <Compile Include="Controllers\JHGL\Gy_SourceMouldBillController.cs" /> <Compile Include="Controllers\Xt_DefineBillMainSetController.cs" /> <Compile Include="Controllers\MJGL\Sc_MouldBatchWorkCheckBillController.cs" /> <Compile Include="Controllers\SBGL\SBBB\Sb_EquipMentCollectionTechParamController.cs" /> -- Gitblit v1.9.1