DAL/DAL.csproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
DAL/车间管理/ClsSc_ProcExchWorkBackBill.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Model/Model.csproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Model/车间管理/ClsSc_ProcExchWorkBackBillMain.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Model/车间管理/ClsSc_ProcExchWorkBackBillSub.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Controllers/CJGL/Sc_ProcExchWorkBackBillController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Controllers/LMESController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/ListModels.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/WebAPI.csproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
DAL/DAL.csproj
@@ -621,6 +621,7 @@ <Compile Include="è´¨æ£ç®¡ç\ClsQC_POStockInCheckBill.cs" /> <Compile Include="è´¨æ£ç®¡ç\ClsQC_ProcessCheckBill.cs" /> <Compile Include="è´¨æ£ç®¡ç\ClsQC_ProdReportCheckBill.cs" /> <Compile Include="车é´ç®¡ç\ClsSc_ProcExchWorkBackBill.cs" /> <Compile Include="车é´ç®¡ç\ClsSc_CutMaterProcExchBill.cs" /> <Compile Include="车é´ç®¡ç\ClsSc_MaterBackBill.cs" /> <Compile Include="车é´ç®¡ç\ClsSc_MaterDownBill.cs" /> DAL/³µ¼ä¹ÜÀí/ClsSc_ProcExchWorkBackBill.cs
New file @@ -0,0 +1,136 @@ using System; using System.Collections.Generic; using System.Text; using System.Data; namespace DAL { public class ClsSc_ProcExchWorkBackBill : DBUtility.ClsXt_BaseBill { public Model.ClsSc_ProcExchWorkBackBillMain omodel = new Model.ClsSc_ProcExchWorkBackBillMain(); public List<Model.ClsSc_ProcExchWorkBackBillSub> DetailColl = new List<Model.ClsSc_ProcExchWorkBackBillSub>(); public ClsSc_ProcExchWorkBackBill() { base.MvarItemKeySub = "Sc_ProcExchWorkBackBillSub"; base.MvarItemKeySub2 = ""; base.MvarItemKeySub3 = ""; base.MvarItemKeySub4 = ""; base.MvarItemKey= "Sc_ProcExchWorkBackBillMain"; base.MvarReportTitle= "å·¥åºè¿å·¥ç³è¯·å"; base.BillType = "3796"; base.HBillSubType = "3796"; } #region åºå®ä»£ç ~ClsSc_ProcExchWorkBackBill() { DetailColl = null; } #endregion èªå®ä¹æ¹æ³ //ä¿®æ¹åæ® public override bool ModifyBill(Int64 lngBillKey, ref string sReturn) { try { // oCn.BeginTran(); //æ´æ°ä¸»è¡¨ oCn.RunProc("UpDate Sc_ProcExchWorkBackBillMain set " + " HBillNo='" + omodel.HBillNo + "'" + //åºå®èµå¼=============== //",HDate='" + omodel.HDate + "'" + //",HYear='" + omodel.HYear.ToString() + "'" + //",HPeriod='" + omodel.HPeriod.ToString() + "'" + ",HRemark='" + omodel.HRemark + "'" + ",HUpDater='" + omodel.HMaker + "'" + ",HUpDateDate=getdate()" + //======================================== ",HInnerBillNo='" + omodel.HInnerBillNo.ToString() +"'"+ ",HEmpID=" + omodel.HEmpID.ToString() + " where HInterID=" + lngBillKey.ToString()); //å é¤å ³è DeleteRelation(ref sReturn, lngBillKey); //å é¤å表 DeleteBillSub(lngBillKey); //æå ¥å表 omodel.HInterID = lngBillKey; foreach (Model.ClsSc_ProcExchWorkBackBillSub oSub in DetailColl) { oCn.RunProc("Insert into Sc_ProcExchWorkBackBillSub (HInterID, HEntryID, HCloseMan, HEntryCloseDate, HCloseType" + ", HRemark, HSourceInterID, HSourceEntryID, HSourceBillNo, HSourceBillType" + ", HRelationQty, HRelationMoney, HBillNo_bak, HProcNo, HProcID" + ", HWorkRemark, HCenterID, HDeptID, HSupID, HSupFlag" + ", HQty)values(" + $"{omodel.HInterID}, {oSub.HEntryID.ToString()}, '{oSub.HCloseMan.ToString()}', GETDATE(), {(oSub.HCloseType == true ? 1 : 0)}" + $",'{oSub.HRemark.ToString()}', {oSub.HSourceInterID.ToString()},{oSub.HSourceEntryID.ToString()}, '{oSub.HSourceBillNo.ToString()}', '{oSub.HSourceBillType.ToString()}'" + $",{oSub.HRelationQty.ToString()},{oSub.HRelationMoney.ToString()}, '{oSub.HBillNo_bak.ToString()}', '{oSub.HProcNo.ToString()}',{oSub.HProcID.ToString()}" + $", '{oSub.HWorkRemark.ToString()}', {oSub.HCenterID.ToString()},{oSub.HDeptID.ToString()},{oSub.HSupID.ToString()},{(oSub.HSupFlag == true ? 1 : 0)}" + $", {oSub.HQty.ToString()}) "); } sReturn = "ä¿®æ¹åæ®æåï¼"; oCn.Commit(); return true; } catch (Exception e) { sReturn = e.Message; oCn.RollBack(); throw (e); } } //æ°å¢åæ® public override bool AddBill(ref string sReturn) { try { //å¾å°mainid omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo); //è¥MAINDIéå¤åéæ°è·å oCn.BeginTran(); //主表 oCn.RunProc("insert Into Sc_ProcExchWorkBackBillMain(HBillType, HBillSubType, HInterID, HBillNo, HDate,HBillStatus" + ", HMaker, HMakeDate, HYear, HPeriod, HRemark" + ", HICMOInterID, HICMOBillNo, HICMOEntryID, HProcExchInterID, HProcExchEntryID" + ", HProcExchBillNo, HProcExchBegNO, HProcExchEndNO, HProcBegID, HProcEndID" + ", HMaterID, HUnitID, HEmpID, HPlanQty, HQty" + ", HExplanation, HInnerBillNo, HWorkShopID, HOrderProcNo, HPRDORGID) values(" + $"'{omodel.HBillType}','{omodel.HBillSubType}',{omodel.HInterID},'{omodel.HBillNo}','{omodel.HDate}',1" + $",'{omodel.HMaker}','{omodel.HMakeDate}',{omodel.HYear},{omodel.HPeriod},'{omodel.HRemark}'" + $",{omodel.HICMOInterID},'{omodel.HICMOBillNo}',{omodel.HICMOEntryID},{omodel.HProcExchInterID},{omodel.HProcExchEntryID}" + $",'{omodel.HProcExchBillNo}',{omodel.HProcExchBegNO},{omodel.HProcExchEndNO},{omodel.HProcBegID},{omodel.HProcEndID}" + $",{omodel.HMaterID},{omodel.HUnitID},{omodel.HEmpID},{omodel.HPlanQty},{omodel.HQty}" + $",'{omodel.HExplanation}','{omodel.HInnerBillNo}',{omodel.HWorkShopID},'{omodel.HOrderProcNo}',{omodel.HPRDORGID})"); //æå ¥å表 foreach (Model.ClsSc_ProcExchWorkBackBillSub oSub in DetailColl) { oCn.RunProc("Insert into Sc_ProcExchWorkBackBillSub (HInterID, HEntryID, HCloseMan, HEntryCloseDate, HCloseType" + ", HRemark, HSourceInterID, HSourceEntryID, HSourceBillNo, HSourceBillType" + ", HRelationQty, HRelationMoney, HBillNo_bak, HProcNo, HProcID" + ", HWorkRemark, HCenterID, HDeptID, HSupID, HSupFlag" + ", HQty)values(" + $"{omodel.HInterID}, {oSub.HEntryID.ToString()}, '{oSub.HCloseMan.ToString()}', GETDATE(), {(oSub.HCloseType== true ? 1:0)}" + $",'{oSub.HRemark.ToString()}', {oSub.HSourceInterID.ToString()},{oSub.HSourceEntryID.ToString()}, '{oSub.HSourceBillNo.ToString()}', '{oSub.HSourceBillType.ToString()}'" + $",{oSub.HRelationQty.ToString()},{oSub.HRelationMoney.ToString()}, '{oSub.HBillNo_bak.ToString()}', '{oSub.HProcNo.ToString()}',{oSub.HProcID.ToString()}" + $", '{oSub.HWorkRemark.ToString()}', {oSub.HCenterID.ToString()},{oSub.HDeptID.ToString()},{oSub.HSupID.ToString()},{(oSub.HSupFlag== true?1:0)}" + $", {oSub.HQty.ToString()}) "); } sReturn = "æ°å¢åæ®æåï¼"; oCn.Commit(); return true; } catch (Exception e) { sReturn = e.Message; oCn.RollBack(); throw (e); } } } } Model/Model.csproj
@@ -580,6 +580,8 @@ <Compile Include="ç产管ç\æ¨¡å ·ç®¡ç\ClsSc_MouldStockBillSub.cs" /> <Compile Include="ç产管ç\设å¤ç®¡ç\ClsSb_EquipConkBookBillMain.cs" /> <Compile Include="ç产管ç\设å¤ç®¡ç\ClsSb_EquipConkBookBillSub.cs" /> <Compile Include="车é´ç®¡ç\ClsSc_ProcExchWorkBackBillSub.cs" /> <Compile Include="车é´ç®¡ç\ClsSc_ProcExchWorkBackBillMain.cs" /> <Compile Include="ç产管ç\设å¤ç®¡ç\ClsSb_EquipWorkBeforeCheckBillMain.cs" /> <Compile Include="ç产管ç\设å¤ç®¡ç\ClsSb_EquipWorkBeforeCheckBillSub.cs" /> <Compile Include="ç产管ç\设å¤ç®¡ç\ClsSb_EquipStockInCheckBillSub.cs" /> Model/³µ¼ä¹ÜÀí/ClsSc_ProcExchWorkBackBillMain.cs
New file @@ -0,0 +1,32 @@ using System; using System.Collections.Generic; using System.Text; namespace Model { public class ClsSc_ProcExchWorkBackBillMain : DBUtility.ClsXt_BaseBillMain { public Int64 HPrintQty { get; set; } //æå°æ¬¡æ° public Int64 HICMOInterID { get; set; } public Int64 HICMOEntryID { get; set; } public Int64 HProcExchInterID { get; set; } public Int64 HProcExchEntryID { get; set; } public Int64 HProcExchBegNO { get; set; } public Int64 HProcExchEndNO { get; set; } public Int64 HProcBegID { get; set; } public Int64 HProcEndID { get; set; } public Int64 HMaterID { get; set; } public Int64 HUnitID { get; set; } public Int64 HEmpID { get; set; } public Int64 HWorkShopID { get; set; } public Int64 HPRDORGID { get; set; } public string HICMOBillNo { get; set; } public string HProcExchBillNo { get; set; } public string HExplanation { get; set; } public string HBatchNo { get; set; } public string HOrderProcNo { get; set; } public string HInnerBillNo { get; set; } public double HPlanQty { get; set; } public double HQty { get; set; } } } Model/³µ¼ä¹ÜÀí/ClsSc_ProcExchWorkBackBillSub.cs
New file @@ -0,0 +1,37 @@ using System; using System.Collections.Generic; using System.Text; namespace Model { public class ClsSc_ProcExchWorkBackBillSub : DBUtility.ClsXt_BaseBillSub { public string HBillNo_bak; //åæ®å·ï¼å¤ä»½ï¼ä»¥å å ç ä¸¢å¤±ï¼æ¾ä¸å°å¯¹åºä¸»è¡¨ï¼ public Int64 HItemSubID; //èªå¢å(GUID) public Int64 HProcNo { get; set; } public Int64 HProcID { get; set; } public Int64 HCenterID { get; set; } public Int64 HSupID { get; set; } public Int64 HDeptID { get; set; } public Int64 HICMOInterID { get; set; } public Int64 HSeOrderInterID { get; set; } public Int64 HSeOrderEntryID { get; set; } public Int64 HICMOEntryID { get; set; } public Int64 HWWOrderInterID { get; set; } public Int64 HWWOrderEntryID { get; set; } public bool HSupFlag { get; set; } public string HWorkRemark { get; set; } public string HMouldNo { get; set; } public string HWWOrderBillNo { get; set; } public string HProcWorkNum { get; set; } public string HICMOBillNo { get; set; } public string HSeOrderBillNo { get; set; } public string HTimeUnit { get; set; } public string HProcType { get; set; } public double HQty { get; set; } public double HPlanWorkTimes { get; set; } public double HStdWorkTime { get; set; } public DateTime HPlanBeginDate { get; set; } public DateTime HPlanEndDate { get; set; } } } WebAPI/Controllers/CJGL/Sc_ProcExchWorkBackBillController.cs
New file @@ -0,0 +1,402 @@ using Newtonsoft.Json; using Newtonsoft.Json.Linq; using Pub_Class; using System; using System.Collections; using System.Collections.Generic; using System.Data; using System.Data.SqlClient; using System.Web.Http; using WebAPI.Models; namespace WebAPI.Controllers.CJGL { public class Sc_ProcExchWorkBackBillController : ApiController { public DBUtility.ClsPub.Enum_BillStatus BillStatus; private json objJsonResult = new json(); SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); DataSet ds; #region å·¥åºè¿å·¥ç³è¯·åå表 [Route("Sc_ProcExchWorkBackBill/Sc_ProcExchWorkBackBillList")] [HttpGet] public object Sc_ProcExchWorkBackBillList(string sWhere, string user) { try { List<object> columnNameList = new List<object>(); //夿æ¯å¦ææ¥è¯¢æé if (!DBUtility.ClsPub.Security_Log("Sc_ProcExchWorkBackBill_Query", 1, false, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æ æ¥è¯¢æé!"; objJsonResult.data = null; return objJsonResult; } string sql1 = "select * from h_v_Sc_ProcExchWorkBackBillList where 1 = 1 "; string sql = sql1 + sWhere + " order by hmainid desc"; ds = oCN.RunProcReturn(sql, "h_v_Sc_ProcExchWorkBackBillList"); //æ·»å åå 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));//è·åå°DataColumnå对象çåå } objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "Sucessï¼"; objJsonResult.list = columnNameList; objJsonResult.data = ds.Tables[0]; return objJsonResult; } catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "Exceptionï¼" + e.ToString(); objJsonResult.data = null; return objJsonResult; } } #endregion #region æ¥è¯¢å·¥åºæµè½¬å¡æ°æ® æ¥è¯¢ å½å å ä¸ä¸æ¡æ°æ® [Route("Sc_ProcExchWorkBackBill/GetProcessExchangeBillSub")] [HttpGet] public object GetProcessExchangeBillSub_cf(string sWhere) { DataSet ds; try { SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); string sql = string.Format(@"select top 2 * from h_v_Sc_ProcessExchangeBillQuerySub"); ds = oCN.RunProcReturn(sql + sWhere, "h_v_Sc_ProcessExchangeBillQuerySub"); 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> /// æ°å¢åæ®-ä¿åæé® ///åæ°ï¼string sqlã ///è¿åå¼ï¼objectã /// </summary> [Route("Sc_ProcExchWorkBackBill/Sc_ProcExchWorkBackBillAddBill")] [HttpPost] public object Sc_ProcExchWorkBackBillAddBill([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();//å表 int msg5 = int.Parse(sArray[2].ToString());//ç±»å string msg6 = sArray[3].ToString();//ç¨æ· ListModels oListModels = new ListModels(); try { if (!DBUtility.ClsPub.Security_Log("Sc_ProcessExchangeBill_Edit", 1, false, msg6)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æ ä¿åæéï¼"; objJsonResult.data = null; return objJsonResult; } //主表 DAL.ClsSc_ProcExchWorkBackBill oBill = new DAL.ClsSc_ProcExchWorkBackBill(); List<Model.ClsSc_ProcExchWorkBackBillMain> lsmain = new List<Model.ClsSc_ProcExchWorkBackBillMain>(); msg2 = msg2.Replace("\\", ""); msg2 = msg2.Replace("\n", ""); //\n lsmain = oListModels.getObjectByJson_ClsSc_ProcExchWorkBackBillMain(msg2); foreach (Model.ClsSc_ProcExchWorkBackBillMain oItem in lsmain) { oItem.HBillType = "3796"; oItem.HBillSubType = "3796"; oItem.HBillStatus = 1; oItem.HMaker = msg6; oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year); oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month); 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.ClsSc_ProcExchWorkBackBillSub> ls = new List<Model.ClsSc_ProcExchWorkBackBillSub>(); ls = oListModels.getObjectByJson_ClsSc_ProcExchWorkBackBillSub(msg3); int i = 0; foreach (Model.ClsSc_ProcExchWorkBackBillSub oItemSub in ls) { i++; oItemSub.HEntryID = i; oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now); oItemSub.HCloseType = false; //å ³éç±»å oItemSub.HSourceInterID = 0; // æºå主å ç oItemSub.HSourceEntryID = 0; //æºååå ç oItemSub.HRelationQty = 0; //å ³èæ°é oItemSub.HBillNo_bak = oBill.omodel.HBillNo; //å¤ä»½åæ®å· oItemSub.HCloseMan = ""; oItemSub.HSourceBillNo = ""; oItemSub.HSourceBillType = ""; oBill.DetailColl.Add(oItemSub); } //ä¿å //ä¿å宿¯åå¤ç bool bResult; if (msg5==1) { // 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 = "ä¿åæåï¼"; 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 å·¥åºè¿å·¥ç³è¯·å å é¤ /// <summary> /// å·¥åºè¿å·¥ç³è¯·å /// </summary> /// <returns></returns> [Route("Sc_ProcExchWorkBackBill/DelProcExchWorkBackBill")] [HttpGet] public object DelProcExchWorkBackBill(string HInterID, string user) { //ç¼è¾æé if (!DBUtility.ClsPub.Security_Log("Sc_ProcExchWorkBackBill_Drop", 1, false, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æ å 餿éï¼"; objJsonResult.data = null; return objJsonResult; } Int64 lngBillKey = 0; lngBillKey = DBUtility.ClsPub.isLong(HInterID); if (lngBillKey == 0) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "åæ®ID为空ï¼"; objJsonResult.data = null; return objJsonResult; } DAL.ClsSc_ProcExchWorkBackBill oBill = new DAL.ClsSc_ProcExchWorkBackBill(); ds = oCN.RunProcReturn("select * from Sc_ProcExchWorkBackBillMain where HInterID=" + lngBillKey, "Sc_ProcExchWorkBackBillMain"); if (ds.Tables[0].Rows.Count>0) { if (int.Parse(ds.Tables[0].Rows[0]["HBillStatus"].ToString()) > 1) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "åæ®å½åå¤äºä¸è½å é¤ç¶æ,ä¸è½å é¤ï¼"; objJsonResult.data = null; return objJsonResult; } if (ds.Tables[0].Rows[0]["HChecker"].ToString() != "") { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "忮已ç»å®¡æ ¸,ä¸è½å é¤ï¼"; objJsonResult.data = null; return objJsonResult; } bool IsDete = oBill.DeleteBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo); if (IsDete) { objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo; objJsonResult.data = null; return objJsonResult; } else { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo; objJsonResult.data = null; return objJsonResult; } } else { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "åæ®æªæ¾å°"; objJsonResult.data = null; return objJsonResult; } } #endregion #region å·¥åºè¿å·¥ç³è¯·å å®¡æ ¸ [Route("Sc_ProcExchWorkBackBill/set_CheckBill")] [HttpGet] public object set_CheckBill(int HInterID, string CurUserName) { try { //å®¡æ ¸æé if (!DBUtility.ClsPub.Security_Log("Sc_ProcExchWorkBackBill_Check", 1, false, CurUserName)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "å®¡æ ¸å¤±è´¥ï¼æ æéï¼"; objJsonResult.data = null; return objJsonResult; } if (HInterID == 0) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "åæ®ID为0ï¼ä¸è½å®¡æ ¸ï¼"; objJsonResult.data = null; return objJsonResult; } DataSet Ds = oCN.RunProcReturn("Select * from Sc_ProcExchWorkBackBillMain Where HInterID=" + HInterID, "Sc_ProcExchWorkBackBillMain"); if (Ds.Tables[0].Rows.Count > 0) { //æ¥çæ¯å¦å·²å®¡æ ¸,å ³é,ä½åº if (Ds.Tables[0].Rows[0]["HChecker"].ToString() != "") { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "åæ®å·²å®¡æ ¸!ä¸è½åæ¬¡å®¡æ ¸"; objJsonResult.data = null; return objJsonResult; } //å®¡æ ¸ if (Cj_StationInBillCheckBill(HInterID, CurUserName, ref DBUtility.ClsPub.sExeReturnInfo)) { 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; } } else { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "åæ®æªæ¾å°!"; objJsonResult.data = null; return objJsonResult; } } catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "å®¡æ ¸å¤±è´¥ï¼" + e.ToString(); objJsonResult.data = null; return objJsonResult; } } //å®¡æ ¸ public bool Cj_StationInBillCheckBill(Int64 HInterID, string CurUserName, ref string sReturn) { try { oCN.BeginTran(); oCN.RunProc(" Update Sc_ProcExchWorkBackBillMain set HChecker='" + CurUserName + "',HBillStatus=2,HCheckDate='getdate()' Where HInterID=" + HInterID.ToString()); oCN.RunProc("exec h_p_ProcExchWorkBackBill_Check_In " + HInterID.ToString()); oCN.Commit(); return true; } catch (Exception e) { sReturn = e.Message; oCN.RollBack(); return false; ; } } #endregion } } WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
@@ -373,6 +373,126 @@ //} #endregion #region[æ¹éæ°å¢åæ®-ä¿åæé®] /// <summary> /// æ°å¢åæ®-ä¿åæé® ///åæ°ï¼string sqlã ///è¿åå¼ï¼objectã /// </summary> [Route("Sc_ProcessExchangeBill/AddBill_pl")] [HttpPost] public object AddBill_pl([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 msg4 = sArray[2].ToString();//å·¥èºè·¯çº¿ string msg5 = sArray[3].ToString();//ç±»å string msg6 = sArray[4].ToString();//ç¨æ· ListModels oListModels = new ListModels(); try { if (!DBUtility.ClsPub.Security_Log("Sc_ProcessExchangeBill_Edit", 1, false, msg6)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æ ä¿åæéï¼"; objJsonResult.data = null; return objJsonResult; } //åæ®å· åæ°é DAL.ClsSc_ProcessExchangeBill oBill = new DAL.ClsSc_ProcessExchangeBill(); List<Model.ClsSc_ProcessExchangeBillMain> ListHbillNo = new List<Model.ClsSc_ProcessExchangeBillMain>(); msg3 = msg3.Replace("\\", ""); msg3 = msg3.Replace("\n", ""); //\n ListHbillNo = JsonConvert.DeserializeObject<List<Model.ClsSc_ProcessExchangeBillMain>>(msg3); //ä¸»è¡¨ä¿¡æ¯ Model.ClsSc_ProcessExchangeBillMain Main = new Model.ClsSc_ProcessExchangeBillMain(); msg2 = msg2.Replace("\\", ""); msg2 = msg2.Replace("\n", ""); //\n Main = JsonConvert.DeserializeObject<Model.ClsSc_ProcessExchangeBillMain>(msg2); DBUtility.ClsPub.CurUserName = msg6; Main.HMaker = msg6; //å¶å人 Main.HBillType = "3772"; Main.HBillSubType = "3772"; Main.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year); Main.HMaterID = Main.HMaterID2; if (DBUtility.ClsPub.isStrNull(Main.HDate) == "") { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "ä¿åå¤±è´¥ï¼æ²¡æåæ®æ¥æï¼æ æ³ä¿åï¼"; objJsonResult.data = 1; return objJsonResult; } //è¡¨ä½æ°æ® //æ },{æ¥æåæ°ç» //廿ãåã msg4 = msg4.Substring(1, msg4.Length - 2); msg4 = msg4.Replace("\\", ""); msg4 = msg4.Replace("\n", ""); //\n List<Model.ClsSc_ProcessExchangeBillSub> ls = new List<Model.ClsSc_ProcessExchangeBillSub>(); ls = oListModels.getObjectByJson_Sc_ProcessExchangeBillSub(msg4); //å¾ªç¯æ°å¢åæ® for (int i = 0; i < ListHbillNo.Count; i++) { Main.HBillNo = ListHbillNo[i].HBillNo; Main.HQty = ListHbillNo[i].HQty; oBill.omodel = Main; int j = 0; foreach (Model.ClsSc_ProcessExchangeBillSub oItemSub in ls) { j++; oItemSub.HEntryID = j; oItemSub.HQty = Main.HQty; oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now); oBill.DetailColl.Add(oItemSub); } //ä¿å //ä¿å宿¯åå¤ç bool bResult=false; if (msg5 == "2") { bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo); } oBill.DetailColl.Clear(); if (!bResult) { oCN.RollBack(); objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "ä¿å失败ï¼" + DBUtility.ClsPub.sExeReturnInfo; objJsonResult.data = 1; return objJsonResult; } } objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "ä¿åæåï¼"; 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("Sc_ProcessExchangeBillList/QJQD")] [HttpGet] WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
@@ -231,25 +231,25 @@ return objJsonResult; } //string sErrMsg = ""; //if (oSystemParameter.ShowBill(ref sErrMsg)) //{ // if (oSystemParameter.omodel.WMS_CampanyName == "çä¸ç¥º") // { // if (oSystemParameter.omodel.Gy_RoutingBill_SaveAutoLastProc == "Y" && OperationType == 1) // { // //è®¾ç½®è½¬å·¥åº // oCN.RunProc("exec Gy_RoutingBill_LastProNo " + HInterID); // } // } //} if (IsProNo == 1 && OperationType == 1) string sErrMsg = ""; if (oSystemParameter.ShowBill(ref sErrMsg)) { //è®¾ç½®è½¬å·¥åº oCN.RunProc("exec Gy_RoutingBill_LastProNo " + HInterID); if (oSystemParameter.omodel.WMS_CampanyName == "çä¸ç¥º") { if (oSystemParameter.omodel.Gy_RoutingBill_SaveAutoLastProc == "Y" && OperationType == 1) { //è®¾ç½®è½¬å·¥åº oCN.RunProc("exec Gy_RoutingBill_LastProNo " + HInterID); } } else if (IsProNo == 1 && OperationType == 1) { //è®¾ç½®è½¬å·¥åº oCN.RunProc("exec Gy_RoutingBill_LastProNo " + HInterID); } } //æ¯å¦å¾éé»è®¤å·¥èºè·¯çº¿ if (HStandard) { WebAPI/Controllers/LMESController.cs
@@ -600,8 +600,7 @@ try { List<object> columnNameList = new List<object>(); //if (ds.Tables[0].Rows.Count != 0 || ds != null) //{ //æ·»å åå foreach (DataColumn col in ds.Tables[0].Columns) { @@ -616,15 +615,6 @@ objJsonResult.list = columnNameList; objJsonResult.data = ds.Tables[0]; return objJsonResult; //} //else //{ //objJsonResult.code = "0"; //objJsonResult.count = 0; //objJsonResult.Message = "æ æ°æ®"; //objJsonResult.data = null; //return objJsonResult; //} } catch (Exception e) { WebAPI/ListModels.cs
@@ -1502,6 +1502,24 @@ return list; } ///å·¥åºè¿å·¥ç³è¯·å 主表 ///ClsSc_ProcExchWorkBackBillMain public List<Model.ClsSc_ProcExchWorkBackBillMain> getObjectByJson_ClsSc_ProcExchWorkBackBillMain(string jsonString) { jsonString = "[" + jsonString.ToString() + "]"; List<Model.ClsSc_ProcExchWorkBackBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ProcExchWorkBackBillMain>>(jsonString); return list; } ///å·¥åºè¿å·¥ç³è¯·å å表 ///ClsSb_EquipStockInCheckBillSub public List<Model.ClsSc_ProcExchWorkBackBillSub> getObjectByJson_ClsSc_ProcExchWorkBackBillSub(string jsonString) { jsonString = "[" + jsonString.ToString() + "]"; List<Model.ClsSc_ProcExchWorkBackBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ProcExchWorkBackBillSub>>(jsonString); return list; } ///è®¾å¤æäº§æ£éªéªæ¶å å表 ///ClsSb_EquipWorkBeforeCheckBillSub public List<Model.ClsSb_EquipWorkBeforeCheckBillSub> getObjectByJson_ClsSb_EquipWorkBeforeCheckBillSub(string jsonString) WebAPI/WebAPI.csproj
@@ -395,6 +395,7 @@ <Compile Include="Controllers\CJGL\Cj_StationOutBillController.cs" /> <Compile Include="Controllers\CJGL\Cj_StationInBillController.cs" /> <Compile Include="Controllers\CJGL\Cj_StationEntrustOutBillController.cs" /> <Compile Include="Controllers\CJGL\Sc_ProcExchWorkBackBillController.cs" /> <Compile Include="Controllers\CJGL\Sc_WorkBillAutoSortBillMainController.cs" /> <Compile Include="Controllers\Gy_MateMouldController.cs" /> <Compile Include="Controllers\Gy_StdMinPickQtyController.cs" /> @@ -979,6 +980,7 @@ <Folder Include="Views\Sc_MouldRepairSendWorkBill\" /> <Folder Include="Views\Sc_MouldScrapRequestBill\" /> <Folder Include="Views\Sc_MouldStatusChangeBill\" /> <Folder Include="Views\Sc_ProcessExchangeIssueBill\" /> <Folder Include="Views\Sc_WorkBillAutoSortBillMain\" /> <Folder Include="Views\Sc_WorkBillSortBill\" /> <Folder Include="Views\Sc_WorkDemandPlanBill\" />