~yxj/MES-WEB-API.git

			@@ -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
			{
			@@ -1104,14 +1106,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
			{
			//获取生产汇报单最大InterID和单据号
			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();
			//生产汇报单主表
			@@ -1159,6 +1177,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();
			@@ -1257,7 +1276,7 @@
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = $"来料检验单同步金蝶云失败！单号:{HBillNo.ToString()}" + result;
			objJsonResult.Message = $"来料检验单同步金蝶云失败！单号:{HBillNo.ToString()}" + jsonRoot;
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1270,10 +1289,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;
			@@ -1328,7 +1365,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" +
			@@ -1464,6 +1501,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"] = "",
			@@ -1472,6 +1513,7 @@
			["IsDeleteEntry"] = "false",
			["SubSystemId"] = "",
			["IsVerifyBaseDataField"] = "false",
			["F_PGKJ_Date"] = HCheckDate.ToString(),
			//["IsAutoSubmitAndAudit"] = true,//自动调用提交和审核功能
			["Model"] = model
			};