DAL/生产管理/设备管理/ClsSb_EquipDotCheckBill.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
DAL/生产管理/设备管理/ClsSb_EquipMaintainBill.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Model/生产管理/设备管理/ClsSb_EquipDotCheckBillMain.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Model/生产管理/设备管理/ClsSb_EquipMaintainBillMain.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Controllers/POStockInBillController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Controllers/SBGL/Sb_EquipDotCheckPlanBillController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Controllers/SCGL/Sc_ICMOBillWorkQtyStatus_TmpController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Controllers/Sc_ProcessMangementController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Web.config | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/WebAPI.csproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
DAL/Éú²ú¹ÜÀí/É豸¹ÜÀí/ClsSb_EquipDotCheckBill.cs
@@ -137,6 +137,9 @@ "'," + oSub.HManagerID.ToString() + ",'" + oSub.HManagerNumber + "'" + ") "); } //ç¹æ£å®æï¼åå设å¤ç¹æ£è®¡ååå表æ¯å¦ç¹æ£æ è®° oCn.RunProc("exec h_p_Sb_EquipDotCheck_AfterSaveCtrl " + omodel.HEquipDotCheckPlanInterID + "," + omodel.HEquipDotCheckPlanEntryID); // //foreach (Model.ClsSb_EquipDotCheckBillSub oSub in DetailColl) //{ DAL/Éú²ú¹ÜÀí/É豸¹ÜÀí/ClsSb_EquipMaintainBill.cs
@@ -162,6 +162,10 @@ "'" + ") "); } //ä¿å »å®æï¼åå设å¤ä¿å »è®¡ååå表æ¯å¦ç¹æ£æ è®° oCn.RunProc("exec h_p_Sb_EquipMaintain_AfterSaveCtrl " + omodel.HEquipMaintainPlanInterID + "," + omodel.HEquipMaintainPlanEntryID); sReturn = "æ°å¢åæ®æåï¼"; oCn.Commit(); return true; Model/Éú²ú¹ÜÀí/É豸¹ÜÀí/ClsSb_EquipDotCheckBillMain.cs
@@ -16,7 +16,8 @@ public int HEquipMaintainRuleInterID; public int HEquipDotCheckRuleInterID; public int HEquipDotCheckPlanInterID; //设å¤ç¹æ£è®¡ååï¼Sb_EquipDotCheckPlanBillSub_Planï¼ä¸»å ç public int HEquipDotCheckPlanEntryID; //设å¤ç¹æ£è®¡ååï¼Sb_EquipDotCheckPlanBillSub_Planï¼åå ç } } Model/Éú²ú¹ÜÀí/É豸¹ÜÀí/ClsSb_EquipMaintainBillMain.cs
@@ -15,6 +15,7 @@ public Int64 HDeptID; public int HEquipMaintainRuleInterID; public int HEquipMaintainPlanInterID; //设å¤ä¿å »è®¡ååï¼Sb_EquipMaintainPlanBillSub_Planï¼ä¸»å ç public int HEquipMaintainPlanEntryID; //设å¤ä¿å »è®¡ååï¼Sb_EquipMaintainPlanBillSub_Planï¼åå ç } } WebAPI/Controllers/POStockInBillController.cs
@@ -4439,6 +4439,7 @@ jobject16.Add("FSRCENTRYID", dataRow2["FENTRYID"].ToString()); jobject16.Add("FORDERBILLNO", dataRow2["FBILLNO"].ToString()); jobject16.Add("FPOORDERENTRYID", dataRow2["FENTRYID"].ToString()); jobject16.Add("FGiveAway", dataRow2["FGIVEAWAY"].ToString());//æ¯å¦èµ å //jobject16.Add("FPrice", dataRow2["FPRICE"].ToString()); //jobject16.Add("FTaxPrice", dataRow2["FTAXPRICE"].ToString()); //jobject16.Add("FEntryTaxRate", dataRow2["FTAXRATE"].ToString()); @@ -5060,6 +5061,7 @@ ,D.FSUPPLIERID,DS.FNUMBER AS FSUPPLIERNUMBER,D.FPURCHASEORGID,DOO.FNUMBER AS FPURCHASEORGNUMBER,CROO.FNUMBER AS FSETTLEORGNUMBER, E.FPRICETIMEPOINT,E.FSETTLECURRID,EC.FNUMBER AS FSETTLECURRNUMBER,C.FMATERIALID,CM.FNUMBER AS FMATERIALNUMBER ,C.FUNITID ,CU.FNUMBER AS FUNITNUMBER,CR.FPRICE,CR.FTAXPRICE,CR.FTAXRATE,D.FPURCHASERID,isnull(T4.FNUMBER,'') AS FPURCHASERNUMBER ,C.FGIVEAWAY AS FGIVEAWAY FROM CG_POINSTOCKBILLSUB B JOIN CG_POINSTOCKBILLMAIN M ON B.HINTERID = M.HINTERID JOIN {0}..T_PUR_POORDERENTRY C ON B.HSOURCEINTERID = C.FID AND B.HSOURCEENTRYID = C.FENTRYID @@ -5143,6 +5145,7 @@ FentityModel.Add("FPrice", item["FPRICE"].ToString());//åä»· FentityModel.Add("FTaxPrice", item["FTAXPRICE"].ToString());//å«ç¨åä»· FentityModel.Add("FEntryTaxRate", item["FTAXRATE"].ToString());//ç¨ç FentityModel.Add("FGiveAway", item["FGIVEAWAY"].ToString());//æ¯å¦èµ å JArray Fentity2 = new JArray(); JObject FentityModel2 = new JObject(); WebAPI/Controllers/SBGL/Sb_EquipDotCheckPlanBillController.cs
@@ -355,6 +355,44 @@ } #endregion #region[设å¤ç¹æ£è®°å½è¡¨ï¼éç¹æ£è®¡åè·åç¹æ£è®¡åæ¸ åä¿¡æ¯] [Route("Sb_EquipDotCheckPlanBill/Sb_EquipDotCheckPlanBill_PlanList")] [HttpGet] public object Sb_EquipDotCheckPlanBill_PlanList(string HInterID,string HDate) { DataSet ds; try { SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); ds = oCN.RunProcReturn("exec h_p_Sb_EquipDotCheck_GetPlanList " + HInterID + ",'" + HDate + "'", "h_p_Sb_EquipDotCheck_GetPlanList"); if (ds.Tables[0].Rows.Count != 0 || ds != null) { objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "è·åä¿¡æ¯æåï¼"; objJsonResult.data = ds.Tables[0]; } else { objJsonResult.code = "0"; objJsonResult.count = 0; 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[设å¤ç¹æ£è®¡å表ç¼è¾æ¶è·åè¡¨ä½æ°æ®--ç¹æ£è®¡å] [Route("Sb_EquipDotCheckPlanBill/GetPlanList")] [HttpGet] WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs
@@ -413,6 +413,54 @@ } #endregion #region[设å¤ä¿å »è®°å½è¡¨ï¼éä¿å »è®¡åè·åä¿å »è®¡åæ¸ åä¿¡æ¯] [Route("Sb_EquipMaintainPlanBill/Sb_EquipMaintainPlanBill_PlanList")] [HttpGet] public object Sb_EquipMaintainPlanBill_PlanList(string HInterID, string HDate) { DataSet ds,ds1; try { SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); List<DataTable> tableList = new List<DataTable>(); //è·åä¿å »é¡¹ç® ds = oCN.RunProcReturn("exec h_p_Sb_EquipMaintain_GetPlanList " + HInterID + ",'" + HDate + "'", "h_p_Sb_EquipMaintain_GetPlanList"); //è·åé 件项ç®ç¼è¾æ°æ® string sql1 = "select HMaterID, é 件代ç HMaterNumber,é ä»¶åç§° HMaterName,åä½ID HUnitID,åä½ä»£ç HUnitNumber,åä½åç§° HUnitName,ç¨é HQty,æ åç¨é HQtyMust,表ä½å¤æ³¨ HRemark,è´è´£äººID HManagerID,è´è´£äººä»£ç HManagerNumber,è´è´£äºº HManagerName from h_v_Sb_EquipMaintainPlanBillList where 1 = 1 and hmainid = " + HInterID; ds1 = oCN.RunProcReturn(sql1, "h_v_Sb_EquipMaintainPlanBillList"); tableList.Add(ds.Tables[0]); tableList.Add(ds1.Tables[0]); if (ds.Tables[0].Rows.Count != 0 || ds != null) { objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "è·åä¿¡æ¯æåï¼"; objJsonResult.data = tableList; } else { objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "æ²¡ææ¥è¯¢å°æ°æ®ä¿¡æ¯ï¼"; objJsonResult.data = tableList; } } catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "åçå¼å¸¸ï¼æ²¡æè¿åä»»ä½è®¡åï¼" + e.ToString(); objJsonResult.data = null; } return objJsonResult; } #endregion #region[设å¤ä¿å »è®¡å表ç¼è¾æ¶è·åè¡¨ä½æ°æ®--ä¿å »è®¡å] [Route("Sb_EquipMaintainPlanBill/GetPlanList")] [HttpGet] WebAPI/Controllers/SCGL/Sc_ICMOBillWorkQtyStatus_TmpController.cs
New file @@ -0,0 +1,105 @@ 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.IO; using System.Web.Http; using WebAPI.DLL; using WebAPI.Models; using WebAPI.Service; using Kingdee.BOS.WebApi.Client; namespace WebAPI.Controllers { public class Sc_ICMOBillWorkQtyStatus_TmpController : ApiController { private json objJsonResult = new json(); SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); DataSet ds; #region 设å¤äº§éééå表 [Route("Sc_ICMOBillWorkQtyStatus_Tmp/Sc_ICMOBillWorkQtyStatus_TmpList")] [HttpGet] public object Sc_ICMOBillWorkQtyStatus_TmpList(string sWhere, string user) { try { List<object> columnNameList = new List<object>(); string sql1 = "select * from Sc_ICMOBillWorkQtyStatus_TmpList where 1 = 1 "; string sql = sql1 + sWhere + " order by ééæ¶é´ desc"; ds = oCN.RunProcReturn(sql, "Sc_ICMOBillWorkQtyStatus_TmpList"); //æ·»å åå 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_ICMOBillQualityStatus_Tmp/Sc_ICMOBillQualityStatus_TmpList")] [HttpGet] public object Sc_ICMOBillQualityStatus_TmpList(string sWhere, string user) { try { List<object> columnNameList = new List<object>(); string sql1 = "select * from Sc_ICMOBillQualityStatus_TmpList where 1 = 1 "; string sql = sql1 + sWhere + " order by å¶åæ¥æ desc"; ds = oCN.RunProcReturn(sql, "Sc_ICMOBillQualityStatus_TmpList"); //æ·»å åå 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 } } WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -394,6 +394,83 @@ //} #endregion /// <summary> /// å ¥åºââçäº§æ±æ¥å /// </summary> /// <param name="InterID">å·¥åºæ±æ¥å主ID</param> /// <returns></returns> [Route("Sc_ProcessMangement/SaveICMOReportBill_Batch")] [HttpPost] public object SaveICMOReportBill_Batch([FromBody] JObject msg) { var _value = msg["msg"].ToString(); string msg1 = _value.ToString(); string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); string InterID = sArray[0].ToString(); string user = sArray[1].ToString(); string BillNo = sArray[2].ToString(); string OrganizationID = sArray[3].ToString(); ArrayList InterIDArray = new ArrayList(InterID.Split(',')); ArrayList BillNoArray = new ArrayList(BillNo.Split(',')); try { string bResult; string HMessage = ""; string HSuccessBillNo = ""; string HFailBillNo = ""; WebAPI.Controllers.Sc_ProcessMangementController oBill = new WebAPI.Controllers.Sc_ProcessMangementController(); if (InterIDArray.Count != BillNoArray.Count) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æ°æ®ä¸å®æ´ï¼å ç æ°éä¸çäºåæ®å·æ°é"; objJsonResult.data = null; return objJsonResult; } else { for (int i = 0; i < InterIDArray.Count;i++) { bResult = JsonConvert.SerializeObject(oBill.SaveICMOReportBill(InterIDArray[i].ToString(), user, BillNoArray[i].ToString(), OrganizationID)); //ååºåå bResult = "[" + bResult.ToString() + "]"; List<JsonResult> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<JsonResult>>(bResult); if (list[0].count == 1) { HSuccessBillNo = HSuccessBillNo + BillNoArray[i].ToString()+"," + "\r\n" ; } else { HFailBillNo = HFailBillNo + BillNoArray[i].ToString() + ":" + list[0].Message + "," + "\r\n"; } HMessage = "æ±æ¥æååå·ï¼" + HSuccessBillNo + "\r\n" + " æ±æ¥å¤±è´¥åå·ï¼" + HFailBillNo; } } objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = HMessage; 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; } } /// <summary> /// å ¥åºââçäº§æ±æ¥å /// </summary> @@ -613,6 +690,71 @@ } } /// <summary> /// å ¥åºââçäº§æ±æ¥å /// </summary> /// <param name="InterID">å·¥åºæ±æ¥å主ID</param> /// <returns></returns> [Route("Sc_ProcessMangement/SaveProcdutInBill_Batch")] [HttpPost] public object SaveProcdutInBill_Batch([FromBody] JObject msg) { var _value = msg["msg"].ToString(); string msg1 = _value.ToString(); string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); string BillNo = sArray[0].ToString(); BillNo = BillNo.Replace("\r\n", "").Replace("[ ", "").Replace("]", ""); BillNo = BillNo.Replace("\\", "").Replace("\n", "").Replace("\"", ""); BillNo = BillNo.Trim(); ArrayList BillNoArray = new ArrayList(BillNo.Split(',')); try { string bResult; string HMessage = ""; string HSuccessBillNo = ""; string HFailBillNo = ""; WebAPI.Controllers.Sc_ProcessMangementController oBill = new WebAPI.Controllers.Sc_ProcessMangementController(); for (int i = 0; i < BillNoArray.Count; i++) { bResult = JsonConvert.SerializeObject(oBill.SaveProcdutInBill(BillNoArray[i].ToString().Trim())); //ååºåå bResult = "[" + bResult.ToString() + "]"; List<JsonResult> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<JsonResult>>(bResult); if (list[0].count == 1) { HSuccessBillNo = HSuccessBillNo + BillNoArray[i].ToString() + "," + "\r\n"; } else { HFailBillNo = HFailBillNo + BillNoArray[i].ToString() + ":" + list[0].Message + "," + "\r\n"; } HMessage = "å ¥åºæååå·ï¼" + HSuccessBillNo + "\r\n" + " å ¥åºå¤±è´¥åå·ï¼" + HFailBillNo; } objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = HMessage; 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; } } /// <summary> /// å ¥åºââ产åå ¥åºå WebAPI/Web.config
@@ -51,8 +51,9 @@ </system.Web> --> <system.web> <customErrors mode="Off"/> <compilation debug="true" targetFramework="4.5" /> <httpRuntime /> <httpRuntime maxQueryStringLength="102400" /> <pages controlRenderingCompatibilityVersion="4.0" /> </system.web> WebAPI/WebAPI.csproj
@@ -425,6 +425,8 @@ <Compile Include="Controllers\SBGL\Sb_EquipStockInCheckBillSController.cs" /> <Compile Include="Controllers\SCGL\Gy_SourceWorkStationSetController.cs" /> <Compile Include="Controllers\SCGL\Sc_ComplementGoodBill_ZXBZController.cs" /> <Compile Include="Controllers\SCGL\Sc_ICMOBillQualityStatus_TmpController.cs" /> <Compile Include="Controllers\SCGL\Sc_ICMOBillWorkQtyStatus_TmpController.cs" /> <Compile Include="Controllers\SCGL\Sc_ICMOChangeBillController.cs" /> <Compile Include="Controllers\SCGL\æ¥è®¡å管ç\DataHelper.cs" /> <Compile Include="Controllers\SCGL\æ¥è®¡å管ç\JIT_Cg_PODemandPlanBillController.cs" />