From 47ebb7042bb5b26640e7136404046edd635841c1 Mon Sep 17 00:00:00 2001 From: ch <37327@LLOOCCY> Date: 星期二, 07 二月 2023 17:36:24 +0800 Subject: [PATCH] 提交 --- WebAPI/Controllers/Sc_ProcessMangementController.cs | 54 ++++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 48 insertions(+), 6 deletions(-) diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs index 74861e0..ee003ae 100644 --- a/WebAPI/Controllers/Sc_ProcessMangementController.cs +++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs @@ -6,10 +6,12 @@ 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 { @@ -848,14 +850,30 @@ Int64 HSourceEntryID, string HSourceBillNo, string user, Int64 HWHID, Int64 HSPID, Int64 HSupID, Int64 HKeeperID, Int64 HMaterID, string HSourceBillType, Int64 HSLInterID, - Int64 HSLEntryID, string HSLBillNo, Int64 HSLSeQ) + Int64 HSLEntryID, string HSLBillNo, Int64 HSLSeQ, string HBillNo, Int64 HInterID) { try { //鑾峰彇鐢熶骇姹囨姤鍗曟渶澶nterID鍜屽崟鎹彿 - Int64 HInterID = DBUtility.ClsPub.CreateBillID("7503", ref DBUtility.ClsPub.sExeReturnInfo); - string HBillNo = DBUtility.ClsPub.CreateBillCode("7503", ref DBUtility.ClsPub.sExeReturnInfo, true); - + //Int64 HInterID = DBUtility.ClsPub.CreateBillID("7503", ref DBUtility.ClsPub.sExeReturnInfo); + //string HBillNo = DBUtility.ClsPub.CreateBillCode("7503", ref DBUtility.ClsPub.sExeReturnInfo, true); + + DataSet ds1 = oCN.RunProcReturn("select * from MES_AccessoriesList where HSourceBillNo = '" + HBillNo + "'", "MES_AccessoriesList"); + string HFileName = DBUtility.ClsPub.isStrNull(ds1.Tables[0].Rows[0]["HFileName"]); + string HFilePath = DBUtility.ClsPub.isStrNull(ds1.Tables[0].Rows[0]["HFilePath"]); + + + + string path = HFilePath; + FileInfo fi = new FileInfo(path); + long len = fi.Length; + byte[] buffer = new byte[len]; + FileStream fs = new FileStream(path, FileMode.Open); + fs.Read(buffer, 0, (int)len); + //鏂囦欢IO娴� + string a = Convert.ToBase64String(buffer); + + //淇濆瓨 oCN.BeginTran(); //鐢熶骇姹囨姤鍗曚富琛� @@ -903,6 +921,7 @@ model.Add("FSourceOrgId", new JObject() { ["Fnumber"] = HZJOrgNumber.ToString() }); //鏉ユ簮缁勭粐 model.Add("FInspectOrgId", new JObject() { ["Fnumber"] = HZJOrgNumber.ToString() }); //璐ㄦ缁勭粐 model.Add("FISSYNCED", "false");// 鏄惁宸插悓姝� + model.Add("F_PGKJ_Date", DateTime.Now.ToString("yyyy-MM-dd"));// 鎶ユ鏃ユ湡 model.Add("FBillNo", HBillNo); JArray Fentity = new JArray(); @@ -1001,7 +1020,7 @@ oCN.RollBack(); objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = $"鏉ユ枡妫�楠屽崟鍚屾閲戣澏浜戝け璐ワ紒鍗曞彿:{HBillNo.ToString()}" + result; + objJsonResult.Message = $"鏉ユ枡妫�楠屽崟鍚屾閲戣澏浜戝け璐ワ紒鍗曞彿:{HBillNo.ToString()}" + jsonRoot; objJsonResult.data = null; return objJsonResult; } @@ -1014,10 +1033,28 @@ { Ids = fID, }; + + K3CloudApiClient client = new K3CloudApiClient("http://192.168.80.90/k3cloud/"); + + + result1 = InvokeHelper.Submit("QM_InspectBill", JsonConvert.SerializeObject(json));//鎻愪氦 result2 = InvokeHelper.Audit("QM_InspectBill", JsonConvert.SerializeObject(json));//鎻愪氦 if (JObject.Parse(result1)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE") { + string jsonStr = "{" + + " \"FileName\":\"" + HFileName + "\"," + + " \"FormId\":\"QM_InspectBill\"," + + " \"IsLast\":\"true\"," + + " \"InterId\":\"" + HInterID + "\"," + + " \"BillNO\":\"" + HBillNo + "\"," + + " \"AliasFileName\":\"test\"," + + " \"SendByte\":\"" + a + "\"," + + "}"; + + var ret = client.AttachmentUpload(jsonStr); + + oCN.RollBack(); objJsonResult.code = "0"; objJsonResult.count = 0; @@ -1072,7 +1109,7 @@ string HBillNo = DBUtility.ClsPub.CreateBillCode("7501", ref DBUtility.ClsPub.sExeReturnInfo, true); //淇濆瓨 - oCN.BeginTran(); + //oCN.BeginTran(); //鐢熸垚浜у搧妫�楠屽崟 //oCN.RunProc("Insert Into QC_POStockInCheckBillMain " + //"(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMaker,HMakeDate,HBillStatus,HChecker,HCheckDate" + @@ -1208,6 +1245,10 @@ //FentityModel.Add("FReferDetail", Fentity3); Fentity.Add(FentityModel); model.Add("FEntity", Fentity); //鏄庣粏淇℃伅 + + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + DataSet ds = oCN.RunProcReturn("select HCheckdate from Sc_ProcessReportMain where hbillno = '" + HSourceBillNo + "'", "Sc_ProcessReportMain"); + DateTime HCheckDate = DBUtility.ClsPub.isDate(ds.Tables[0].Rows[0]["HCheckdate"]); JObject jsonRoot = new JObject() { ["Creator"] = "", @@ -1216,6 +1257,7 @@ ["IsDeleteEntry"] = "false", ["SubSystemId"] = "", ["IsVerifyBaseDataField"] = "false", + ["F_PGKJ_Date"] = HCheckDate.ToString(), //["IsAutoSubmitAndAudit"] = true,//鑷姩璋冪敤鎻愪氦鍜屽鏍稿姛鑳� ["Model"] = model }; -- Gitblit v1.9.1