.gitignore | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Config/kdapi.config | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Controllers/MateOutController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Controllers/Sc_ProcessMangementController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Controllers/基础资料/基础资料/Gy_StockCheckItemBillController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Controllers/生产管理/报工台工序/Sc_MESBeginStepWorkBillController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/InvokeHelper.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
.gitignore
@@ -127,3 +127,6 @@ /WorkM/obj/Release /WorkM/obj/x86/Debug /WorkM/obj/x86/Release /WebAPI/Sc_MouldProdInBill/Log /WebAPI/Sc_MouldProdOutBill/Log /WebAPI/Vlog WebAPI/Config/kdapi.config
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <configuration> <appSettings> <add key="DbId" value="5f9258a311401c"></add> <add key="DbId" value="6204a70eba35fc"></add> <add key="UserName" value="Administrator"></add> <add key="PassWord" value="qaz!@#123"></add> <add key="KDApiUrl" value="http://localhost/K3Cloud/"></add> WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -1217,7 +1217,7 @@ DataSet ds = new DataSet(); ds = oCN.RunProcReturn("select * from Gy_MouldFileMain where HInterID=" + HInterID, "Gy_MouldFileMain"); DataRow dr = ds.Tables[0].Rows[0]; string Num = dr["HBillNo"].ToString(); string Num = dr["HBarCode"].ToString(); string Num1 = Num.Substring(0,(Num.Length)-5); oCN.BeginTran(); for (int i = StarNum1; i <= EndNum1; i++) @@ -1246,6 +1246,7 @@ if (ds1.Tables[0].Rows.Count == 0 || ds1 == null) { long HItemID = DBUtility.ClsPub.CreateBillID("3899", ref DBUtility.ClsPub.sExeReturnInfo); //string HBillNo = DBUtility.ClsPub.CreateBillCode("3899", ref DBUtility.ClsPub.sExeReturnInfo, true); string sql = string.Format(@"Insert Into Gy_MouldFileMain " + "(HBillType,HBillSubType,HInterID,HBillNo,HDate" + ",HYear,HPeriod,HRemark,HMaker,HMakeDate,HBarCode" + WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs
@@ -635,7 +635,16 @@ if (bResult) { string sql = $"exec h_p_Sc_MouldChangeFileStatus 'in','{oBill.omodel.HInterID.ToString()}' "; oCn.RunProc(sql); DataSet db=oCn.RunProcReturn(sql, "h_p_Sc_MouldChangeFileStatus"); if (db.Tables[0].Rows[0]["issuccess"].ToString()=="0") { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "å¨å ·ä½ç½®åæ¥å¤±è´¥ï¼"; //WebAPIController.Add_Log("éè´§å䏿¨", UserName, "çæéè´§å"); objJsonResult.data = 1; return objJsonResult; } objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "ä¿åæåï¼"; WebAPI/Controllers/MateOutController.cs
@@ -1,5 +1,6 @@ using DBUtility; using Model; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using SQLHelper; using System; @@ -844,6 +845,55 @@ } } //å·æ°è¡¨ä½ è¿åæ¡ç åºåä¿¡æ¯ç½é¡µPDAç [Route("KF_ICInventoryByMaterID/GetBillEntry_TmpList_Pack1")] [HttpGet] public object GetBillEntry_TmpList_Pack1(string HBarCode, long sHWHID, long sHSPID, long HOWNERID, string sWhere) { try { SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); List<object> columnNameList = new List<object>(); DataSet ds = oCN.RunProcReturn("exec h_p_KF_ICInventoryByMaterIDList1 '" + HBarCode + "'," + sHWHID + "," + sHSPID+","+ HOWNERID+",'"+ sWhere+"'", "h_p_KF_ICInventoryByMaterIDList"); //æ·»å åå 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å对象çåå } if (ds == null || ds.Tables[0].Rows.Count <= 0) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "没æè¿åä»»ä½è®°å½ï¼"; objJsonResult.data = null; return objJsonResult; //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning); } else { objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "è·åä¿¡æ¯æåï¼"; objJsonResult.data = ds.Tables[0]; objJsonResult.list = columnNameList; return objJsonResult; } } catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "没æè¿åä»»ä½è®°å½ï¼" + e.ToString(); objJsonResult.data = null; return objJsonResult; } } [Route("MateOutBill/Delete_Json")] [HttpGet] public object Delete_Json(long HInterID, long HMaterID, long HAuxPropID, string HMTONo, long HSourceInterID, long HSourceEntryID, string sHBillType) WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -216,14 +216,21 @@ DataRow dr1 = ds1.Tables[0].Rows[0]; JObject model = new JObject(); model.Add("FBillType", "50fa7c2eda7947b89fab5431bf25d48e"); //åæ®ç±»å1 model.Add("FBillType", new JObject() { ["Fnumber"] = "SCHBD01_SYS" }); //åæ®ç±»åçäº§æ±æ¥âSCHBD02_SYSâ å ¥åºæ±æ¥SCHBD01_SYS model.Add("FPrdOrgId", new JObject() { ["Fnumber"] = dr1["FPrdOrgNUMBER"].ToString() }); //ç产ç»ç»1 model.Add("FDate", DateTime.Now.ToString("yyyy-MM-dd")); //åæ®æ¥æ1 JArray Fentity = new JArray(); foreach (DataRow item in ds.Tables[0].Rows) { JObject FentityModel = new JObject(); FentityModel.Add("FReportType", "103852");//çäº§æ±æ¥ç±»å FentityModel.Add("FReportType", new JObject() { ["Fnumber"] = "1" });//çäº§æ±æ¥ç±»å FentityModel.Add("FSrcBillType", "PRD_MO");// æºåç±»å FentityModel.Add("FProductType", "1");// 产åç±»å FentityModel.Add("FSrcBillNo", item["ä»»å¡å"].ToString());// æºåç¼å· FentityModel.Add("FSrcInterId", dr1["FMOID"].ToString());// æºåå ç FentityModel.Add("FSrcEntryId", dr1["FMOENTRYID"].ToString());// æºååå½å ç ã FentityModel.Add("FSRCENTRYSEQ", dr1["FMOENTRYSEQ"].ToString());// æºååå½è¡å· FentityModel.Add("FUNITID", new JObject() { ["Fnumber"] = dr1["FUNITNUMBER"].ToString() });//åä½ FentityModel.Add("FTimeUnitId", "1");//æ¶é´åä½ FentityModel.Add("FWorkshipId", new JObject() { ["Fnumber"] = dr1["FWorkShopNUM"].ToString() }); // çäº§è½¦é´ FentityModel.Add("FStandHourUnitId", "3600"); // å使 åå·¥æ¶åä½ @@ -231,25 +238,48 @@ FentityModel.Add("FMoEntrySeq", dr1["HICMOEntryID"].ToString());//ç产订åè¡å· FentityModel.Add("FMoId", dr1["HICMOInterID"].ToString());//ç产订åå ç FentityModel.Add("FFinishQty", item["æ¥æ¶æ°é"].ToString());//宿æ°é1 FentityModel.Add("FQuaQty", item["åæ ¼æ°é"].ToString());//åæ ¼æ°é1 FentityModel.Add("FStockInOrgId ", OrganizationNUM);// å ¥åºç»ç» FentityModel.Add("FQuaQty", item["åæ ¼æ°é"].ToString());//åæ ¼æ°é1FFailQty FentityModel.Add("FFailQty", item["ä¸è¯æ°é"].ToString());//ä¸åæ ¼æ°é FentityModel.Add("FStockInOrgId ", new JObject() { ["Fnumber"] = OrganizationNUM });// å ¥åºç»ç» FentityModel.Add("FStockId", new JObject() { ["Fnumber"] = dr1["FStockNUM"].ToString() }); // ä»åº FentityModel.Add("FSrcBillType", "PRD_MO");// æºåç±»å FentityModel.Add("FSrcBillNo", item["ä»»å¡å"].ToString());// æºåç¼å· FentityModel.Add("FSrcInterId", dr1["HICMOInterID"].ToString());// æºåå ç FentityModel.Add("FSrcEntryId", dr1["HICMOEntryID"].ToString());// æºååå½å ç FentityModel.Add("FMOID", dr1["FMOID"].ToString());// FentityModel.Add("FMOBILLNO", dr1["FMOBILLNO"].ToString());// FentityModel.Add("FMOENTRYID", dr1["FMOENTRYID"].ToString());// FentityModel.Add("FMOENTRYSEQ", dr1["FMOENTRYSEQ"].ToString());// FentityModel.Add("FOwnerTypeId", dr1["FOWNERTYPEID"].ToString()); //货主类åï¼FOwnerTypeId(å¿ å¡«é¡¹) FentityModel.Add("FOwnerId", new JObject() { ["Fnumber"] = dr1["FOwnerNumber"].ToString() }); //货主ï¼FOwnerId(å¿ å¡«é¡¹) FentityModel.Add("FBomId", new JObject() { ["Fnumber"] = dr1["FBOMNUM"].ToString() }); //BOMçæ¬ï¼FBomId(å¿ å¡«é¡¹) FentityModel.Add("FCostRate", dr1["FCostRate"].ToString());// ææ¬æé FentityModel.Add("FISBACKFLUSH", dr1["FISBACKFLUSH"].ToString() == "1" ? true : false);// åå²é¢æ //FFLOWID FFLOWLINEID FRULEID FSTABLENAME //f6e6eec3 - 5267 - 4f02 - 8593 - b633da508a72 3 PRD_MO2MORPT T_PRD_MOENTRY //ä¸å¡æµç¨å¾ï¼FEntity_Link_FFlowId //æ¨è¿è·¯çº¿ï¼FEntity_Link_FFlowLineId //转æ¢è§åï¼FEntity_Link_FRuleId //æºå表å ç ï¼FEntity_Link_FSTableId //æºå表ï¼FEntity_Link_FSTableName //æºåå ç ï¼FEntity_Link_FSBillId //æºååå½å ç ï¼FEntity_Link_FSId //åå§æºå¸¦éï¼FEntity_Link_FBaseQuaQtyOld //ä¿®æ¹æºå¸¦éï¼FEntity_Link_FBaseQuaQty //JArray Fentity2 = new JArray(); //JObject FentityModel2 = new JObject(); //FentityModel2.Add("FDetailEntity_Link_FRULEID", "PUR_PurchaseOrder-PUR_ReceiveBill"); //FentityModel2.Add("FDetailEntity_Link_FSTableName", "t_PUR_POOrderEntry"); //FentityModel2.Add("FDetailEntity_Link_FSBillId", item["FID"].ToString()); //FentityModel2.Add("FDetailEntity_Link_FSId", item["FEntryID"].ToString()); //Fentity2.Add(FentityModel2); //FentityModel.Add("FDetailEntity_Link", Fentity2); //Fentity.Add(FentityModel); JArray Fentity2 = new JArray(); JObject FentityModel2 = new JObject(); FentityModel2.Add("FEntity_Link_FFlowId", "f6e6eec3-5267-4f02-8593-b633da508a72"); FentityModel2.Add("FEntity_Link_FFlowLineId", "PRD_MO2MORPT"); FentityModel2.Add("FEntity_Link_FRuleId", "3"); FentityModel2.Add("FEntity_Link_FSTableId", "0"); FentityModel2.Add("FEntity_Link_FSTableName", "T_PRD_MOENTRY"); FentityModel2.Add("FEntity_Link_FSBillId", dr1["FMOID"].ToString()); FentityModel2.Add("FEntity_Link_FSId", dr1["FMOENTRYID"].ToString()); FentityModel2.Add("FEntity_Link_FBaseQuaQtyOld", item["åæ ¼æ°é"].ToString()); FentityModel2.Add("FEntity_Link_FBaseQuaQty", item["åæ ¼æ°é"].ToString()); Fentity2.Add(FentityModel2); FentityModel.Add("FEntity_Link", Fentity2); FentityModel.Add("FBFLowId", new JObject() { ["FID"] = "f6e6eec3-5267-4f02-8593-b633da508a72" }); // Fentity.Add(FentityModel); } model.Add("FDetailEntity", Fentity); //æç»ä¿¡æ¯ model.Add("FEntity", Fentity); //æç»ä¿¡æ¯ JObject jsonRoot = new JObject() { ["Creator"] = "", @@ -261,14 +291,36 @@ //["IsAutoSubmitAndAudit"] = true,//èªå¨è°ç¨æäº¤åå®¡æ ¸åè½ ["Model"] = model }; string result = InvokeHelper.Submit("PRD_MORPT", JsonConvert.SerializeObject(jsonRoot)); //å¤æå®¡æ ¸æ¯å¦æå LogService.Write("jsonRoot:" + jsonRoot); string result = InvokeHelper.Save("PRD_MORPT", JsonConvert.SerializeObject(jsonRoot));//ä¿å //夿ä¿åæ¯å¦æå if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE") { oCN.RollBack(); objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = $"å·¥åºæ±æ¥å ¥åºå忥éè¶äºå¤±è´¥ï¼åå·:{dr["åæ®å·"].ToString()}" + result; objJsonResult.data = null; return objJsonResult; } //æäº¤å®¡æ ¸ string result1 = string.Empty; string result2 = string.Empty; var fID = JObject.Parse(result)["Result"]["Id"].ToString(); var fBillNo = JObject.Parse(result)["Result"]["Number"].ToString(); var json = new { Ids = fID, }; result1 = InvokeHelper.Submit("PRD_MORPT", JsonConvert.SerializeObject(json));//æäº¤ //result2 = InvokeHelper.Audit("PRD_MORPT", JsonConvert.SerializeObject(json));//å®¡æ ¸ if (JObject.Parse(result1)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE") { oCN.RollBack(); objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = $"çäº§æ±æ¥ååå·ï¼{fBillNo}ï¼æäº¤å¤±è´¥" + result; objJsonResult.data = null; return objJsonResult; } @@ -749,7 +801,8 @@ objJsonResult.data = null; return objJsonResult; } else { else { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "å®¡æ ¸å¤±è´¥,åå :" + DBUtility.ClsPub.sExeReturnInfo; WebAPI/Controllers/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_StockCheckItemBillController.cs
@@ -252,6 +252,46 @@ } #endregion #region çç¹åæåè¡¨å¤æå½åéæ©ççç¹æ¹æ¡æ¯å¦çæè¿åæ® [Route("Gy_StockCheckItemBill/StockItemSubIsExistence")] [HttpGet] public object StockItemSubIsExistence(string sID) { try { DataSet ds; SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); string sql; sql = string.Format(@"select * from Gy_StockCheckItemSub where HInterID=" + sID); ds = oCN.RunProcReturn(sql, "Gy_StockCheckItemSub"); if (ds.Tables[0].Rows.Count == 0) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "ææªçæ"; return objJsonResult; } else { objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "å·²çæ"; return objJsonResult; } } catch (Exception ex) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æ¥è¯¢æ°æ®å¼å¸¸ï¼è¯·ä¸ç®¡çåèç³»ï¼" + ex.ToString(); objJsonResult.data = null; return objJsonResult; } } #endregion #region çç¹åæå表 [Route("Gy_StockCheckItemBill/Get_InventoryAnalysisList")] [HttpGet] @@ -263,15 +303,30 @@ try { SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); //夿æ¯å¦éæ©çç¹æ¹æ¡ï¼æ¯=>ï¼ç¨çç¹æ¹æ¡å表å对æ¯ï¼ï¼å¦=>ï¼ç¨å¨å ·æ¡£æ¡å对æ¯ï¼ if (sID == null || sID == "") { sql = string.Format(@"select * from h_v_Sc_MouldInventoryAnalysisList where " + sWhere + " order by HItemID desc "); if (sWhere=="pk") { sql = string.Format(@"select * from h_v_Sc_MouldInventoryAnalysisPK"); } else { sql = string.Format(@"select * from h_v_Sc_MouldInventoryAnalysisList where " + sWhere + " and HSourceInterID=(select HItemID from Gy_StockCheckItem where HItemID=" + sID + ") and HMakeDate<=(select HEndDate from Gy_StockCheckItem where HItemID=" + sID + ") order by HItemID desc "); sql = string.Format($"exec h_p_Sc_MouldInventoryAnalysisList2 '{sWhere}'"); } ds = oCN.RunProcReturn(sql, "Sc_MouldStockBillMain_Temp"); } else { if (sWhere == "pk") { sql = string.Format(@"select * from h_v_Sc_MouldInventoryAnalysisPK2 WHERE HInterID="+ sID); } else { sql = string.Format($"exec h_p_Sc_MouldInventoryAnalysisList '{sID}','{sWhere}'"); } } ds = oCN.RunProcReturn(sql, "h_p_Sc_MouldInventoryAnalysisList"); list.Add(ds.Tables[0]); objJsonResult.code = "1"; WebAPI/Controllers/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/Sc_MESBeginStepWorkBillController.cs
@@ -1622,7 +1622,7 @@ Ids = Ds.Tables[0].Rows[0][0].ToString(), //PkEntryIds = (EntyID).Split('-')[1] }; LogService.Write("json=" + json); //LogService.Write("json=" + json); string result1 = string.Empty; string result2 = string.Empty; WebAPI/InvokeHelper.cs
@@ -37,9 +37,9 @@ HttpClient httpClient = new HttpClient(); httpClient.Url = string.Concat(CloudUrl, "Kingdee.BOS.WebApi.ServicesStub.AuthService.ValidateUser.common.kdsvc"); List<object> Parameters = new List<object>(); Parameters.Add("5f9258a311401c");//è´¦å¥æ 示 Parameters.Add("622703e117d642");//è´¦å¥æ 示 Parameters.Add("Administrator");//ç¨æ·å Parameters.Add("qaz!@#123");//å¯ç Parameters.Add("sa@123456");//å¯ç Parameters.Add(2052);//2052ä»£è¡¨ä¸æ httpClient.Content = JsonConvert.SerializeObject(Parameters);