MESWMS-WEBS.git

			@@ -5997,7 +5997,32 @@
			//直接调拨
			private bool SaveMoveOut_CLD(Model.ClsKf_MoveStockBillMain oMain, Pub_Class.ClsXt_SystemParameterMain oSystemParameterMain, ref string sErrMsg)
			{
			//从配置文件获取 CLOUD网址、账套信息、登录用户、登录密码
			if (!Pub_Class.ClsPub.GetCLOUDLoginInfo(ref Pub_Class.ClsPub.sExeReturnInfo))
			{
			sErrMsg = Pub_Class.ClsPub.sExeReturnInfo;
			return false;
			}

			//获取CLOUD账号密码
			string sCLOUDUseName = Pub_Class.ClsPub.sCLOUDUseName;
			string sCLOUDPsd = Pub_Class.ClsPub.sCLOUDPsd;
			DataSet ds11 = get_SaveCLOUDUseNameandPsd(oMain.HInterID);
			if (ds11 == null \|\| ds11.Tables[0].Rows.Count == 0)
			{
			}
			else
			{
			sCLOUDUseName = DBUtility.ClsPub.isStrNull(ds11.Tables[0].Rows[0]["HCloudUserName"]);
			sCLOUDPsd = DBUtility.ClsPub.isStrNull(ds11.Tables[0].Rows[0]["HCloudUserPsd"]);
			}

			string HReturn;
			ApiClient client = new ApiClient(Pub_Class.ClsPub.sCLOUDUrl);
			string dbId = Pub_Class.ClsPub.sCLOUDAcc; //AotuTest117
			bool bLogin = client.Login(dbId, sCLOUDUseName, sCLOUDPsd, 2052);
			SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();

			try
			{
			DataSet Ds;
			@@ -6023,12 +6048,6 @@
			",'" + oMain.HStockStyle + "','" + oMain.HTransferDirect + "','" + oMain.HShipType + "'" +
			", " + oMain.HSTOCKORGID.ToString() + "," + oMain.HOWNERID.ToString() +
			") ");

			if (oSystemParameterMain.Kf_MoveStockBill_AutoCheck == "Y") //系统参数自动审核
			{
			//审核单据
			oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=convert(varchar(10),getdate(),120),HBillStatus=2 where HInterID= " + oMain.HInterID.ToString());
			}

			if (oSystemParameterMain.WMS_MouldManagerCtl == "Y") //系统参数启用器具管理
			{
			@@ -6191,31 +6210,7 @@
			string sJson_End = " ] }}";
			string sJson = sJson_Main + sJson_Entry + sJson_End;

			//从配置文件获取 CLOUD网址、账套信息、登录用户、登录密码
			if (!Pub_Class.ClsPub.GetCLOUDLoginInfo(ref Pub_Class.ClsPub.sExeReturnInfo))
			{
			sErrMsg = Pub_Class.ClsPub.sExeReturnInfo;
			return false;
			}

			//获取CLOUD账号密码
			string sCLOUDUseName = Pub_Class.ClsPub.sCLOUDUseName;
			string sCLOUDPsd = Pub_Class.ClsPub.sCLOUDPsd;
			DataSet ds11 = get_SaveCLOUDUseNameandPsd(oMain.HInterID);
			if (ds11 == null \|\| ds11.Tables[0].Rows.Count == 0)
			{
			}
			else
			{
			sCLOUDUseName = DBUtility.ClsPub.isStrNull(ds11.Tables[0].Rows[0]["HCloudUserName"]);
			sCLOUDPsd = DBUtility.ClsPub.isStrNull(ds11.Tables[0].Rows[0]["HCloudUserPsd"]);
			}

			//生成直接调拨 1个物料1单
			string HReturn;
			ApiClient client = new ApiClient(Pub_Class.ClsPub.sCLOUDUrl);
			string dbId = Pub_Class.ClsPub.sCLOUDAcc; //AotuTest117
			bool bLogin = client.Login(dbId, sCLOUDUseName, sCLOUDPsd, 2052);
			//生成金蝶云单据
			if (bLogin)
			{
			var result = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Save",
			@@ -6224,22 +6219,8 @@
			//生成单据后更新自定义字段
			oCn.RunProc("exec h_p_Sc_UpDateSelfFildMove '" + oMain.HBillNo + "','-1'");

			if (oSystemParameterMain.Kf_MoveStockBill_AutoCheck == "Y") //系统参数自动审核
			{
			string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
			var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
			new object[] { "STK_TransferDirect", sJson2 });
			HReturn = result.ToString();

			string sJson3 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
			var result3 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit",
			new object[] { "STK_TransferDirect", sJson3 });

			HReturn = result.ToString() + "," + result2.ToString() + "," + result3.ToString();
			}
			else
			{
			HReturn = result.ToString();
			}
			if (HReturn.Contains("\"IsSuccess\":false") == true)
			{
			sErrMsg = "生成直接调拨单失败！" + HReturn + sJson;
			@@ -6249,12 +6230,11 @@
			else
			{
			oCn.Commit();
			return true;
			}
			}
			else
			{
			sErrMsg = "生成直接调拨单失败！登录失败！";
			sErrMsg = "生成直接调拨单失败！金蝶云登录失败！";
			oCn.RollBack();
			return false;
			}
			@@ -6265,6 +6245,52 @@
			sErrMsg = "生成直接调拨单失败！" + e.Message;
			oCn.RollBack();
			return false;
			}

			if (oSystemParameterMain.Kf_MoveStockBill_AutoCheck == "Y") //系统参数自动审核
			{
			try
			{
			oCn.BeginTran();
			//审核WMS单据
			oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=convert(varchar(10),getdate(),120),HBillStatus=2 where HInterID= " + oMain.HInterID.ToString());

			//提交、审核金蝶云单据
			HReturn = "";
			string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
			var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
			new object[] { "STK_TransferDirect", sJson2 });

			string sJson3 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
			var result3 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit",
			new object[] { "STK_TransferDirect", sJson3 });

			HReturn = result2.ToString() + "," + result3.ToString();

			if (HReturn.Contains("\"IsSuccess\":false") == true)
			{
			sErrMsg = "生成直接调拨单成功，审核单据失败！" + HReturn;
			oCn.RollBack();
			return true;
			}
			else
			{
			sErrMsg = "生成并审核直接调拨单成功！单据号为：" + oMain.HBillNo;
			oCn.Commit();
			return true;
			}
			}
			catch (Exception e)
			{
			sErrMsg = "生成直接调拨单失败！" + e.Message;
			oCn.RollBack();
			return false;
			}
			}
			else
			{
			sErrMsg = "生成直接调拨单成功！单据号为：" + oMain.HBillNo;
			return true;
			}
			}

			@@ -7363,7 +7389,6 @@
			if (SaveMoveOut_CLD(oMain, oSystemParameterMain, ref sErrMsg))
			{
			//"保存成功！";
			sErrMsg = "保存成功！" + oMain.HBillNo;
			return true;
			}
			else
			@@ -34575,61 +34600,19 @@
			//源单条码
			else if (sBarBillType == "源单条码")
			{
			DataSet Ds = oCn.RunProcReturn(" select HSourceName from Xt_BarCodeType where HSourceNumber= '" + sBarCodePrefix + "' and HBillType= '" + HBillType + "'", "Xt_BarCodeType");

			if (Ds == null \|\| Ds.Tables[0].Rows.Count == 0)
			if (sBarBillName == "入库申请单")
			{
			sErrMsg = "所扫源单条码不属于此模块源单范围！";
			return null;
			oBar = get_SourceBarCode_OtherIn(HBillID, HBillNo, HBillType, sBarCode, "1241", HMaker, HOWNERID, ref sErrMsg);
			if (oBar == null)
			{
			return null;
			}
			return oBar;
			}
			else
			{
			sBarBillName = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HSourceName"]);
			//扫描源单条码时判断是否已经扫描过源单信息
			if (SourceFlag)
			{
			sErrMsg = "明细信息列表已有扫码记录，不允许多次扫描源单条码！";
			return null;
			}
			else
			{
			if (sBarBillName == "发货通知单" && HBillType == "1205")
			{
			DAL.Cls_S_IF_SeOutStockBill_Lite dal = new DAL.Cls_S_IF_SeOutStockBill_Lite();
			DataSet DS;
			//根据单据号获取过滤条件
			string sWhere = " Where 单据号 like '" + sBarCode + "'";
			DS = dal.DisSourceBillList(sWhere);
			if (DS == null \|\| DS.Tables[0].Rows.Count <= 0)
			{
			sErrMsg = "没有返回任何记录！";
			return null;
			}
			oBar.HBarType = "源单条码";
			oBar.HSourceBillNo = Convert.ToString(DS.Tables[0].Rows[0]["HBillNo"]);
			oBar.HSourceBillType = Convert.ToString(DS.Tables[0].Rows[0]["HBillType"]);
			oBar.HSupID = Convert.ToInt64(DS.Tables[0].Rows[0]["HSupID"]);
			oBar.HSupName = Convert.ToString(DS.Tables[0].Rows[0]["HSupName"]);
			oBar.HDeptID = Convert.ToInt64(DS.Tables[0].Rows[0]["HDeptID"]);
			oBar.HDeptName = Convert.ToString(DS.Tables[0].Rows[0]["HDeptName"]);
			oBar.HCustom = Convert.ToString(DS.Tables[0].Rows[0]["HCustom"]);
			}
			else
			{
			sErrMsg = "源单类型名称设置不正确！";
			return null;
			}
			// 将源单信息写入临时缓存表
			if (tem.AddNew_Source(HBillID, HBillNo, HBillType, oBar.HSourceBillNo, oBar.HSourceBillType, sRedBlue, ref sErrMsg))
			{
			return oBar;
			}
			else
			{
			sErrMsg = "保存源单信息失败！" + sErrMsg;
			return null;
			}
			}
			sErrMsg = "源单类型名称设置不正确！";
			return null;
			}
			}
			else