~yxj/MES-WEB-API.git

			@@ -64,6 +64,8 @@
			ds = oCN.RunProcReturn($"exec h_p_JIT_ComplementGoodsBillList_Query '{com.MaterialNumber}','{com.MaterialName}','{com.MaterialModel}','{com.HGD}'," +
			$"'{com.HWHName}','{com.HDeptName}','{com.Organization}','{com.user}','{com.HJLStatus}','{com.HBeginDate}','{com.HEndDate}'", "h_p_JIT_ComplementGoodsBillList_Query");

			//bool a = AddSendGoodsBillSynChronizAtion("PLD00000114", ref DBUtility.ClsPub.sExeReturnInfo);

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			@@ -211,6 +213,9 @@
			public int? HMaterID = 0;
			public int? HWHID = 0;
			public int? HSPID = 0;
			public int? HStockOutOrgID = 0;
			public int? HStockInOrgID = 0;
			public int? HSCWHID = 0;
			}

			[Route("Sc_ComplementGoods/JIT_SendGoodsBill")]
			@@ -252,15 +257,15 @@
			}
			}

			bool flag = false;
			flag = AddSendGoodsBill(listCa, SourceInterID, SourceBillNo, user, ref DBUtility.ClsPub.sExeReturnInfo);

			objJsonResult = AddSendGoodsBill(listCa, SourceInterID, SourceBillNo, user);


			if (flag)
			if (objJsonResult.count==1)
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "配送成功!";
			objJsonResult.Message = "调拨单生成成功!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -268,7 +273,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "配送失败!";
			objJsonResult.Message = "调拨单生成失败";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -283,48 +288,39 @@
			}
			}
			//新增
			public bool AddSendGoodsBill(List<SendGoodsBill> listCa, string SourceInterID, string SourceBillNo, string user, ref string sReturn)
			public json AddSendGoodsBill(List<SendGoodsBill> listCa, string SourceInterID, string SourceBillNo, string user)
			{
			try
			{
			oCN.BeginTran();

			//oCN.RunProc($"delete from JIT_SendGoodsBillMain where HMainSourceInterID={SourceInterID} and HMainSourceBillNo='{SourceBillNo}' and HBillStatus=1");

			//oCN.RunProc($"delete from JIT_SendGoodsBillSub where HInterID in (select HInterID from JIT_SendGoodsBillMain where HMainSourceInterID={SourceInterID} and HMainSourceBillNo='{SourceBillNo}' and HBillStatus=1)");

			ds = oCN.RunProcReturn($"select a.HMainSourceEntryID,b.HMaterID from JIT_SendGoodsBillMain a with(nolock) inner join JIT_SendGoodsBillSub b with(nolock) on a.HInterID = b.HInterID where a.HMainSourceInterID={SourceInterID} and a.HBillStatus=1", "JIT_SendGoodsBillMain");

			long InterID = 0;
			string HBillNo = "";
			for (int i = 0; i < listCa.Count; i++)
			{
			int a = -1;
			for (int j = 0; j < ds.Tables[0].Rows.Count; j++)
			// 则代表配送单没有数据需要添加数据
			if (ds.Tables[0].Rows.Count == 0)
			{
			if (ds.Tables[0].Rows[j]["HMaterID"].ToString() == listCa[i].HMaterID.ToString()&& ds.Tables[0].Rows[j]["HMainSourceEntryID"].ToString() == listCa[i].HEntryID.ToString())
			if (i == 0)
			{
			a = j;
			break;
			InterID = DBUtility.ClsPub.CreateBillID_Prod("460201", ref DBUtility.ClsPub.sExeReturnInfo);
			HBillNo = DBUtility.ClsPub.CreateBillCode_Prod("460201", ref DBUtility.ClsPub.sExeReturnInfo, true);

			//添加主表数据
			oCN.RunProc("insert into JIT_SendGoodsBillMain(HYear,HPeriod,HBillType,HBillSubType,HInterID,HDate" +
			",HBillNo,HBillStatus,HMaker,HMakeDate,HISCheck, HMainSourceInterID, HMainSourceEntryID" +
			", HMainSourceBillNo, HMainSourceBillType)" +
			$"values({DateTime.Now.Year},{DateTime.Now.Month},'460201','460201',{InterID}, GETDATE(), '{HBillNo}'," +
			$" 1,'{user}', GETDATE(), 0, {SourceInterID}, {listCa[i].HEntryID}, '{SourceBillNo}', '4602')");
			}
			}

			//a=0 则代表配送单没有数据需要添加数据
			if (a == -1 )
			{
			long InterID = DBUtility.ClsPub.CreateBillID_Prod("460201", ref DBUtility.ClsPub.sExeReturnInfo);
			string HBillNo = DBUtility.ClsPub.CreateBillCode_Prod("460201", ref DBUtility.ClsPub.sExeReturnInfo, true);

			//添加主表数据
			oCN.RunProc("insert into JIT_SendGoodsBillMain(HYear,HPeriod,HBillType,HBillSubType,HInterID,HDate" +
			",HBillNo,HBillStatus,HMaker,HMakeDate,HISCheck, HMainSourceInterID, HMainSourceEntryID" +
			", HMainSourceBillNo, HMainSourceBillType)" +
			$"values({DateTime.Now.Year},{DateTime.Now.Month},'460201','460201',{InterID}, GETDATE(), '{HBillNo}'," +
			$" 1,'{user}', GETDATE(), 0, {SourceInterID}, {listCa[i].HEntryID}, '{SourceBillNo}', '4602')");

			//添加子表数据
			oCN.RunProc("insert into JIT_SendGoodsBillSub(HInterID,HBillNo_bak,HEntryID" +
			",HMaterID,HQty,HWHID,HSPID,HISCheck,HCheckSubMan,HCheckSubDate)" +
			",HMaterID,HQty,HWHID,HSPID,HISCheck,HCheckSubMan,HCheckSubDate,HStockOutOrgID,HStockInOrgID,HSCWHID)" +
			$"values({InterID},'{HBillNo}',{i + 1}, {listCa[i].HMaterID},{listCa[i].本次拣料数量}," +
			$" {listCa[i].HWHID},{listCa[i].HSPID},0,'{user}', GETDATE())");
			$" {listCa[i].HWHID},{listCa[i].HSPID},0,'{user}', GETDATE(),{listCa[i].HStockOutOrgID},{listCa[i].HStockInOrgID},{listCa[i].HSCWHID})");
			}
			else
			{
			@@ -363,17 +359,123 @@
			}
			}

			sReturn = "新增单据成功！";
			objJsonResult = AddSendGoodsBillSynChronizAtion(HBillNo);

			oCN.Commit();
			return true;

			if (objJsonResult.count == 1)
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = null;
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = null;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			oCN.RollBack();
			sReturn = e.Message;

			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = e.Message;
			return objJsonResult;
			throw (e);
			}
			}

			//同步金蝶直接调拨单
			public json AddSendGoodsBillSynChronizAtion(string HBillNo)
			{
			ds = oCN.RunProcReturn("exec JIT_SendGoodsBillSynChronizAtion '" + HBillNo + "'", "JIT_SendGoodsBillSynChronizAtion");

			foreach (DataRow dr in ds.Tables[0].Rows)
			{
			JObject model = new JObject();
			model.Add("FBillTypeID", new JObject() { ["Fnumber"] = dr["FBillTypeID"].ToString() }); //单据类型
			model.Add("FDate", dr["FDate"].ToString());
			model.Add("FBILLNO", dr["FBILLNO"].ToString());
			model.Add("FStockOrgId", new JObject() { ["Fnumber"] = dr["FStockOrgId"].ToString() });
			model.Add("FOwnerTypeIdHead", dr["FOwnerTypeIdHead"].ToString());
			model.Add("FTransferBizType", dr["FTransferBizType"].ToString());
			model.Add("FOwnerTypeOutIdHead", dr["FOwnerTypeOutIdHead"].ToString());
			model.Add("FTransferDirect", dr["FTransferDirect"].ToString());
			model.Add("FStockOutOrgId", new JObject() { ["Fnumber"] = dr["FStockOutOrgId"].ToString() });

			JArray Fentity = new JArray();
			foreach (DataRow item in ds.Tables[1].Rows)
			{
			JObject FentityModel = new JObject();
			FentityModel.Add("FMaterialId", new JObject() { ["Fnumber"] = item["FMaterialId"].ToString() });
			FentityModel.Add("FUnitID", new JObject() { ["Fnumber"] = item["FUnitID"].ToString() });
			FentityModel.Add("FBaseUnitId", new JObject() { ["Fnumber"] = item["FBaseUnitId"].ToString() });
			FentityModel.Add("FOwnerTypeId", item["FOwnerTypeId"].ToString());
			FentityModel.Add("FOwnerId", new JObject() { ["Fnumber"] = item["FOwnerId"].ToString() });
			FentityModel.Add("FOwnerTypeOutId", item["FOwnerTypeOutId"].ToString());
			FentityModel.Add("FOwnerOutId", new JObject() { ["Fnumber"] = item["FOwnerOutId"].ToString() });
			FentityModel.Add("FKeeperTypeId", item["FKeeperTypeId"].ToString());
			FentityModel.Add("FKeeperId", new JObject() { ["Fnumber"] = item["FKeeperId"].ToString() });
			FentityModel.Add("FKeeperTypeOutId", item["FKeeperTypeOutId"].ToString());
			FentityModel.Add("FKeeperOutId", new JObject() { ["Fnumber"] = item["FKeeperOutId"].ToString() });
			FentityModel.Add("FDestStockId", new JObject() { ["Fnumber"] = item["FDestStockId"].ToString() });
			FentityModel.Add("FSrcStockId", new JObject() { ["Fnumber"] = item["FSrcStockId"].ToString() });
			FentityModel.Add("FQty", item["FQty"].ToString());
			Fentity.Add(FentityModel);
			}
			model.Add("FBillEntry", Fentity);

			JObject jsonRoot = new JObject()
			{
			["Creator"] = "",
			["NeedUpDateFields"] = new JArray(),
			["NeedReturnFields"] = new JArray(),
			["IsDeleteEntry"] = "false",
			["SubSystemId"] = "",
			["IsVerifyBaseDataField"] = "false",
			["Model"] = model
			};
			var loginRet = InvokeHelper.Login();
			var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
			if (isSuccess < 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = loginRet;
			objJsonResult.data = null;
			return objJsonResult;
			}
			var result = InvokeHelper.Save("STK_TransferDirect", jsonRoot.ToString());
			if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() == "TRUE")
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = null;
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = result;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = null;
			objJsonResult.data = null;
			return objJsonResult;
			}
			#endregion

			#region 上查