1
This commit is contained in:
commit
44a044af8e
8
.gitignore
vendored
8
.gitignore
vendored
@ -106,6 +106,14 @@
|
|||||||
/NoPackageMachine/obj/Debug/NoPackageMachine.pdb
|
/NoPackageMachine/obj/Debug/NoPackageMachine.pdb
|
||||||
/Gatedge.K3.Pilot.PlugIn/bin/Debug/Gatedge.K3.Pilot.PlugIn.dll
|
/Gatedge.K3.Pilot.PlugIn/bin/Debug/Gatedge.K3.Pilot.PlugIn.dll
|
||||||
/Gatedge.K3.Pilot.PlugIn/bin/Debug/Gatedge.K3.Pilot.PlugIn.pdb
|
/Gatedge.K3.Pilot.PlugIn/bin/Debug/Gatedge.K3.Pilot.PlugIn.pdb
|
||||||
|
/Gatedge.K3.Pilot.PlugIn/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
|
||||||
|
/Gatedge.K3.Pilot.PlugIn/obj/Debug/Gatedge.K3.Pilot.PlugIn.csproj.AssemblyReference.cache
|
||||||
|
/Gatedge.K3.Pilot.PlugIn/obj/Debug/Gatedge.K3.Pilot.PlugIn.csproj.CoreCompileInputs.cache
|
||||||
|
/Gatedge.K3.Pilot.PlugIn/obj/Debug/Gatedge.K3.Pilot.PlugIn.csproj.FileListAbsolute.txt
|
||||||
|
/Gatedge.K3.Pilot.PlugIn/obj/Debug/Gatedge.K3.Pilot.PlugIn.dll
|
||||||
|
/Gatedge.K3.Pilot.PlugIn/obj/Debug/Gatedge.K3.Pilot.PlugIn.pdb
|
||||||
|
/Gatedge.K3.Pilot.PlugIn/bin/Debug/Gatedge.K3.Pilot.PlugIn.dll
|
||||||
|
/Gatedge.K3.Pilot.PlugIn/bin/Debug/Gatedge.K3.Pilot.PlugIn.pdb
|
||||||
/Gatedge.K3.Pilot.PlugIn/obj/Debug/Gatedge.K3.Pilot.PlugIn.csproj.CoreCompileInputs.cache
|
/Gatedge.K3.Pilot.PlugIn/obj/Debug/Gatedge.K3.Pilot.PlugIn.csproj.CoreCompileInputs.cache
|
||||||
/Gatedge.K3.Pilot.PlugIn/obj/Debug/Gatedge.K3.Pilot.PlugIn.dll
|
/Gatedge.K3.Pilot.PlugIn/obj/Debug/Gatedge.K3.Pilot.PlugIn.dll
|
||||||
/Gatedge.K3.Pilot.PlugIn/obj/Debug/Gatedge.K3.Pilot.PlugIn.pdb
|
/Gatedge.K3.Pilot.PlugIn/obj/Debug/Gatedge.K3.Pilot.PlugIn.pdb
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
@ -1,25 +0,0 @@
|
|||||||
E:\Work\珠海格致软件有限公司\0.开发任务\5.珠海派诺科技股份有限公司\0.软件工程\Pilot_KD_Parino_yuyubo\Gatedge.K3.Pilot.PlugIn\bin\Debug\Gatedge.K3.Pilot.PlugIn.dll
|
|
||||||
E:\Work\珠海格致软件有限公司\0.开发任务\5.珠海派诺科技股份有限公司\0.软件工程\Pilot_KD_Parino_yuyubo\Gatedge.K3.Pilot.PlugIn\bin\Debug\Gatedge.K3.Pilot.PlugIn.pdb
|
|
||||||
E:\Work\珠海格致软件有限公司\0.开发任务\5.珠海派诺科技股份有限公司\0.软件工程\Pilot_KD_Parino_yuyubo\Gatedge.K3.Pilot.PlugIn\bin\Debug\Kingdee.BOS.App.Core.dll
|
|
||||||
E:\Work\珠海格致软件有限公司\0.开发任务\5.珠海派诺科技股份有限公司\0.软件工程\Pilot_KD_Parino_yuyubo\Gatedge.K3.Pilot.PlugIn\bin\Debug\Kingdee.BOS.App.dll
|
|
||||||
E:\Work\珠海格致软件有限公司\0.开发任务\5.珠海派诺科技股份有限公司\0.软件工程\Pilot_KD_Parino_yuyubo\Gatedge.K3.Pilot.PlugIn\bin\Debug\Kingdee.BOS.Contracts.dll
|
|
||||||
E:\Work\珠海格致软件有限公司\0.开发任务\5.珠海派诺科技股份有限公司\0.软件工程\Pilot_KD_Parino_yuyubo\Gatedge.K3.Pilot.PlugIn\bin\Debug\Kingdee.BOS.Core.dll
|
|
||||||
E:\Work\珠海格致软件有限公司\0.开发任务\5.珠海派诺科技股份有限公司\0.软件工程\Pilot_KD_Parino_yuyubo\Gatedge.K3.Pilot.PlugIn\bin\Debug\Kingdee.BOS.DataEntity.dll
|
|
||||||
E:\Work\珠海格致软件有限公司\0.开发任务\5.珠海派诺科技股份有限公司\0.软件工程\Pilot_KD_Parino_yuyubo\Gatedge.K3.Pilot.PlugIn\bin\Debug\Kingdee.BOS.dll
|
|
||||||
E:\Work\珠海格致软件有限公司\0.开发任务\5.珠海派诺科技股份有限公司\0.软件工程\Pilot_KD_Parino_yuyubo\Gatedge.K3.Pilot.PlugIn\bin\Debug\Kingdee.BOS.ServiceHelper.dll
|
|
||||||
E:\Work\珠海格致软件有限公司\0.开发任务\5.珠海派诺科技股份有限公司\0.软件工程\Pilot_KD_Parino_yuyubo\Gatedge.K3.Pilot.PlugIn\bin\Debug\Kingdee.BOS.VerificationHelper.dll
|
|
||||||
E:\Work\珠海格致软件有限公司\0.开发任务\5.珠海派诺科技股份有限公司\0.软件工程\Pilot_KD_Parino_yuyubo\Gatedge.K3.Pilot.PlugIn\bin\Debug\Kingdee.BOS.Web.dll
|
|
||||||
E:\Work\珠海格致软件有限公司\0.开发任务\5.珠海派诺科技股份有限公司\0.软件工程\Pilot_KD_Parino_yuyubo\Gatedge.K3.Pilot.PlugIn\bin\Debug\Kingdee.BOS.Web.HTML.Core.dll
|
|
||||||
E:\Work\珠海格致软件有限公司\0.开发任务\5.珠海派诺科技股份有限公司\0.软件工程\Pilot_KD_Parino_yuyubo\Gatedge.K3.Pilot.PlugIn\bin\Debug\Kingdee.BOS.Web.HTML.dll
|
|
||||||
E:\Work\珠海格致软件有限公司\0.开发任务\5.珠海派诺科技股份有限公司\0.软件工程\Pilot_KD_Parino_yuyubo\Gatedge.K3.Pilot.PlugIn\bin\Debug\Kingdee.BOS.WebApi.FormService.dll
|
|
||||||
E:\Work\珠海格致软件有限公司\0.开发任务\5.珠海派诺科技股份有限公司\0.软件工程\Pilot_KD_Parino_yuyubo\Gatedge.K3.Pilot.PlugIn\bin\Debug\Kingdee.K3.BD.Contracts.dll
|
|
||||||
E:\Work\珠海格致软件有限公司\0.开发任务\5.珠海派诺科技股份有限公司\0.软件工程\Pilot_KD_Parino_yuyubo\Gatedge.K3.Pilot.PlugIn\bin\Debug\Kingdee.K3.BD.NewCode.Core.dll
|
|
||||||
E:\Work\珠海格致软件有限公司\0.开发任务\5.珠海派诺科技股份有限公司\0.软件工程\Pilot_KD_Parino_yuyubo\Gatedge.K3.Pilot.PlugIn\bin\Debug\Kingdee.K3.BD.ServiceHelper.dll
|
|
||||||
E:\Work\珠海格致软件有限公司\0.开发任务\5.珠海派诺科技股份有限公司\0.软件工程\Pilot_KD_Parino_yuyubo\Gatedge.K3.Pilot.PlugIn\bin\Debug\Kingdee.K3.Core.dll
|
|
||||||
E:\Work\珠海格致软件有限公司\0.开发任务\5.珠海派诺科技股份有限公司\0.软件工程\Pilot_KD_Parino_yuyubo\Gatedge.K3.Pilot.PlugIn\bin\Debug\Newtonsoft.Json.dll
|
|
||||||
E:\Work\珠海格致软件有限公司\0.开发任务\5.珠海派诺科技股份有限公司\0.软件工程\Pilot_KD_Parino_yuyubo\Gatedge.K3.Pilot.PlugIn\bin\Debug\Oracle.DataAccess.dll
|
|
||||||
E:\Work\珠海格致软件有限公司\0.开发任务\5.珠海派诺科技股份有限公司\0.软件工程\Pilot_KD_Parino_yuyubo\Gatedge.K3.Pilot.PlugIn\obj\Debug\Gatedge.K3.Pilot.PlugIn.csproj.AssemblyReference.cache
|
|
||||||
E:\Work\珠海格致软件有限公司\0.开发任务\5.珠海派诺科技股份有限公司\0.软件工程\Pilot_KD_Parino_yuyubo\Gatedge.K3.Pilot.PlugIn\obj\Debug\Gatedge.K3.Pilot.PlugIn.csproj.CoreCompileInputs.cache
|
|
||||||
E:\Work\珠海格致软件有限公司\0.开发任务\5.珠海派诺科技股份有限公司\0.软件工程\Pilot_KD_Parino_yuyubo\Gatedge.K3.Pilot.PlugIn\obj\Debug\Gatedge..4146081E.Up2Date
|
|
||||||
E:\Work\珠海格致软件有限公司\0.开发任务\5.珠海派诺科技股份有限公司\0.软件工程\Pilot_KD_Parino_yuyubo\Gatedge.K3.Pilot.PlugIn\obj\Debug\Gatedge.K3.Pilot.PlugIn.dll
|
|
||||||
E:\Work\珠海格致软件有限公司\0.开发任务\5.珠海派诺科技股份有限公司\0.软件工程\Pilot_KD_Parino_yuyubo\Gatedge.K3.Pilot.PlugIn\obj\Debug\Gatedge.K3.Pilot.PlugIn.pdb
|
|
||||||
@ -75,6 +75,7 @@ namespace Pilot_KD_Parino.Sal_Order
|
|||||||
|
|
||||||
//获取纸质合同号
|
//获取纸质合同号
|
||||||
String F_contractnumber = FEntity["F_contractnumber"].ToString();
|
String F_contractnumber = FEntity["F_contractnumber"].ToString();
|
||||||
|
string yuanF_contractnumber = F_contractnumber;
|
||||||
int dashPosition;
|
int dashPosition;
|
||||||
if (F_contractnumber.Contains("-TH"))
|
if (F_contractnumber.Contains("-TH"))
|
||||||
{
|
{
|
||||||
@ -113,19 +114,25 @@ namespace Pilot_KD_Parino.Sal_Order
|
|||||||
|
|
||||||
int IFnumber = sqlDS[0]["FNUMBER"].Long2Int();
|
int IFnumber = sqlDS[0]["FNUMBER"].Long2Int();
|
||||||
|
|
||||||
if (IFnumber != 0 && !F_Returntype.IsNullOrEmpty() && !F_contractnumber.ToString().Contains("TH") && !F_contractnumber.ToString().Contains("HH"))
|
if (IFnumber != 0 && !F_Returntype.IsNullOrEmpty())
|
||||||
{
|
{
|
||||||
F_contractnumber1 = F_contractnumber.ToString() + '-' + F_Returntype + '0' + number.ToString();
|
F_contractnumber1 = yuanF_contractnumber.ToString() + '-' + F_Returntype + '0' + number.ToString();
|
||||||
FEntity["F_contractnumber"] = F_contractnumber1;
|
FEntity["F_contractnumber"] = F_contractnumber1;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
else if (!F_Returntype.IsNullOrEmpty() && !F_contractnumber.ToString().Contains("TH") && !F_contractnumber.ToString().Contains("HH"))
|
else if (!F_Returntype.IsNullOrEmpty())
|
||||||
{
|
{
|
||||||
F_contractnumber1 = F_contractnumber.ToString() + '-' + F_Returntype + '0' + '1';
|
F_contractnumber1 = yuanF_contractnumber.ToString() + '-' + F_Returntype + '0' + '1';
|
||||||
|
|
||||||
FEntity["F_contractnumber"] = F_contractnumber1;
|
FEntity["F_contractnumber"] = F_contractnumber1;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
//else if (IFnumber != 0 && !F_Returntype.IsNullOrEmpty())
|
||||||
|
//{
|
||||||
|
|
||||||
|
//}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -162,6 +169,7 @@ namespace Pilot_KD_Parino.Sal_Order
|
|||||||
|
|
||||||
//获取纸质合同号
|
//获取纸质合同号
|
||||||
String F_contractnumber = FEntity["F_contractnumber"].ToString();
|
String F_contractnumber = FEntity["F_contractnumber"].ToString();
|
||||||
|
string yuanF_contractnumber = F_contractnumber;
|
||||||
int dashPosition;
|
int dashPosition;
|
||||||
if (F_contractnumber.Contains("-TH"))
|
if (F_contractnumber.Contains("-TH"))
|
||||||
{
|
{
|
||||||
@ -201,15 +209,15 @@ namespace Pilot_KD_Parino.Sal_Order
|
|||||||
|
|
||||||
int IFnumber = sqlDS[0]["FNUMBER"].Long2Int();
|
int IFnumber = sqlDS[0]["FNUMBER"].Long2Int();
|
||||||
|
|
||||||
if (IFnumber != 0 && !F_Returntype.IsNullOrEmpty() && !F_contractnumber.ToString().Contains("TH") && !F_contractnumber.ToString().Contains("HH"))
|
if (IFnumber != 0 && !F_Returntype.IsNullOrEmpty())
|
||||||
{
|
{
|
||||||
F_contractnumber1 = F_contractnumber.ToString() + '-' + F_Returntype + '0' + number.ToString();
|
F_contractnumber1 = yuanF_contractnumber.ToString() + '-' + F_Returntype + '0' + number.ToString();
|
||||||
FEntity["F_contractnumber"]= F_contractnumber1;
|
FEntity["F_contractnumber"]= F_contractnumber1;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
else if (!F_Returntype.IsNullOrEmpty() && !F_contractnumber.ToString().Contains("TH") && !F_contractnumber.ToString().Contains("HH"))
|
else if (!F_Returntype.IsNullOrEmpty() )
|
||||||
{
|
{
|
||||||
F_contractnumber1 = F_contractnumber.ToString() + '-' + F_Returntype + '0' + '1';
|
F_contractnumber1 = yuanF_contractnumber.ToString() + '-' + F_Returntype + '0' + '1';
|
||||||
FEntity["F_contractnumber"] = F_contractnumber1;
|
FEntity["F_contractnumber"] = F_contractnumber1;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user