dengyu
/
DS7
1
0
Fork 0
Code Issues Pull Requests Projects 1 Releases Wiki Activity
598 Commits
14 Branches
0 Tags
1.5 GiB
dev
ShenZhenCHJY
YingHang
JinHanShengHang
QDHHYT
DS7_XiangRongDa
DS7_HYRD
DS7_JinGang
master
临时发布20240103
DS7_JingHan
DS7Zhanhao
HuanHaiYunTong
shenzhenchjy
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '7e9e2d2336'
${ noResults }
Commit Graph

170 Commits (7e9e2d2336e4b07065d2e419ea90af74df60cec4)

Author SHA1 Message Date
ddlucky 3e060d3d47 旧仓储，仓储费结算清单，改为对明细出库的业务同样适用。 2 years ago
hanxuntao 2ab901f249 1 2 years ago
hanxuntao 4a10c2c51d 1 2 years ago
hanxuntao 12cfcabc97 1 2 years ago
hanxuntao 779f5f1259 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 
# Conflicts:
#	DSWeb/DSWeb.csproj.user
 2 years ago
hanxuntao c2abbeebbe 1 2 years ago
ddlucky 628d9982f4 荣圣达泛微OA接口，增加对附件的发送 2 years ago
ddlucky 5f28226bee 20230129-2 2 years ago
ddlucky acca263354 荣圣达服务微调；诚锐钉钉接口返回值处理微调 2 years ago
hanxuntao e0f1dd75bf 1 2 years ago
ddlucky 38a8dd8717 荣圣达泛微OA对接，增加对oa返回错误的处理；发送时增加取部门id写道sqbm字段 2 years ago
ddlucky 4feeab87fa 诺诺开票逻辑回滚至原逻辑 2 years ago
ddlucky a9d938f7a7 20230110-2 2 years ago
ddlucky 9eb25d6395 诺诺开票接口变更，初步完成待测试；ds7仓储入库费用入账加钉钉审核，未完成； 2 years ago
hanxuntao 8c3b6cf098 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
hanxuntao 8998fbc262 1 2 years ago
ddlucky 544e405828 荣圣达泛微OA审批对接完成 2 years ago
hanxuntao bea67ab9f4 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
hanxuntao c82b56cfdd 1 2 years ago
ddlucky 2206329be2 webconfig中FanWeiOAAPI=true时付费申请审核不允许执行撤回操作 2 years ago
ddlucky 1fb765dc50 荣圣达泛微OA对接，DS7部分回写泛微OA的流程ID至ch_fee_payapplication的PAYAPPID 2 years ago
hanxuntao 0e32f06764 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
hanxuntao f11a1b1c32 1 2 years ago
ddlucky 5df720d0f8 荣圣达泛微OA对接，DS7已完成待测试；读取服务未完成 2 years ago
ddlucky 2030df5b52 20230104-2 2 years ago
ddlucky 0c2744c5dc Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
ddlucky fef96f0f60 海运出口合规校验，未完成（缺少箱信息） 2 years ago
hanxuntao e1ef1d090f 1 2 years ago
ddlucky fcf82c652e 荣盛达泛微系统对接，未完成 2 years ago
hanxuntao 611fdfe0e3 1 2 years ago
ddlucky 2e0b8acaf3 付费申请增加的部分目前不影响正常业务 2 years ago
dengyu 75b60efa46 付费申请编辑页的提交审核后台方法增加对荣圣达的泛微OA系统流程的支持，未完成 2 years ago
ddlucky 65ae6d02ef '20221209-1' 2 years ago
ddlucky 4e3170d980 '20221205佣金导入，对费用锁定的业务产生费用更改单' 2 years ago
hanxuntao 2234cee050 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
hanxuntao 6f9099858c 1 2 years ago
ddlucky d47e01f0c8 收费申请的申请人改为仅insert，不可修改（防止丢收费申请申请人） 2 years ago
hanxuntao 77eac79b0d Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
hanxuntao 8dc10d1311 11 2 years ago
ddlucky 45b729d148 20221130-仓储期间对账，如仓储业务已费用锁定，则将费用产生至费用更改单；取消时如相应更改单费用1或6，则相应删除。注意该费用备注为仓储期间对账的DUINO 2 years ago
ddlucky 22350df0be '20221130-仓储结算清单当中点击【费用入账】向仓储业务中生成费用时，如果仓储业务已费用锁定，则在这些业务中增加费用更改单，并在其下面产生相应的费用，并将这些费用提交审核。如果点击【取消入账】，则判断是否有费用的备注内容是这个仓储结算清单的DUINO，如果有，判断其是否能删除（feestatus=1或6），如可以删除，则删除这些费用和更改单。' 2 years ago
hanxuntao 97b57f33ac 1 2 years ago
hanxuntao 100ce9ef98 1 2 years ago
hanxuntao c6f56f93b2 钉钉接口 2 years ago
hanxuntao a6c5e7ffa2 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
hanxuntao abf1bf7641 1 2 years ago
ddlucky f70d4ac736 20221021令P2开票模块显示冲红按钮 2 years ago
hanxuntao 3f0bdf6519 1 2 years ago
hanxuntao 8b59c5c0f6 pp 2 years ago
hanxuntao 8186222919 1 2 years ago
hanxuntao 893a44a56f 1 2 years ago
hanxuntao 78f6ad5177 1 2 years ago
hanxuntao 6cedf7dd31 1 2 years ago
hanxuntao 8c0d5375a5 1 2 years ago
hanxuntao b7bbf5d833 1 2 years ago
ddlucky d154d9a4c3 发票申请的申请单号增加可点击的复制单号按钮 2 years ago
hanxuntao ed89d3ace7 1 2 years ago
hanxuntao cf2d4d1132 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
hanxuntao 202fc0c534 箱管 2 years ago
ddlucky 86a3ad7d52 从应收应付费用生成收费申请后清空收费申请下方的查询结果 2 years ago
ddlucky 726752d29e '消除几个列表的重复字段' 2 years ago
hanxuntao 4ae5e8a67e 0815 2 years ago
hanxuntao c896e7c875 2 2 years ago
hanxuntao d013f7c848 Merge branch 'dev' of http://123.234.225.158:13080/dengyu/DS7 into dev 
# Conflicts:
#	.gitignore
#	BookingJieFeng/obj/Debug/BookingJieFeng.csproj.CoreCompileInputs.cache
#	BookingJieFeng/obj/Release/BookingJieFeng.csproj.CoreCompileInputs.cache
#	BookingJieFeng/obj/Release/BookingJieFeng.csprojAssemblyReference.cache
#	BookingWeb/BookingWeb.csproj.user
#	BookingWeb/obj/Debug/BookingWeb.csproj.CoreCompileInputs.cache
#	BookingWeb/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
#	BookingWeb/obj/Release/BookingWeb.csproj.CoreCompileInputs.cache
#	BookingWeb/obj/Release/BookingWeb.csprojAssemblyReference.cache
#	D7MqClient/D7MqClient/obj/Debug/D7MqClient.csproj.CoreCompileInputs.cache
#	D7MqClient/D7MqClient/obj/Debug/D7MqClient.csprojAssemblyReference.cache
#	D7MqClient/D7MqClient/obj/Release/D7MqClient.csproj.CoreCompileInputs.cache
#	D7MqClient/D7MqClient/obj/Release/D7MqClient.csprojAssemblyReference.cache
#	DSWeb.Common/bin/Debug/DSWeb.Common.dll
#	DSWeb.Common/bin/Debug/DSWeb.Common.pdb
#	DSWeb.Common/bin/Release/DSWeb.Common.dll
#	DSWeb.Common/bin/Release/DSWeb.Common.pdb
#	DSWeb.Common/obj/Debug/DSWeb.Common.csproj.CoreCompileInputs.cache
#	DSWeb.Common/obj/Debug/DSWeb.Common.csproj.FileListAbsolute.txt
#	DSWeb.Common/obj/Debug/DSWeb.Common.dll
#	DSWeb.Common/obj/Debug/DSWeb.Common.pdb
#	DSWeb.Interface/bin/Debug/DSWeb.Common.dll
#	DSWeb.Interface/bin/Debug/DSWeb.Common.pdb
#	DSWeb.Interface/bin/Debug/DSWeb.Interface.dll
#	DSWeb.Interface/bin/Debug/DSWeb.Interface.pdb
#	DSWeb.Interface/bin/Debug/HcDBUtility.dll
#	DSWeb.Interface/bin/Debug/HcDBUtility.pdb
#	DSWeb.Interface/bin/Release/DSWeb.Common.dll
#	DSWeb.Interface/bin/Release/DSWeb.Common.pdb
#	DSWeb.Interface/bin/Release/HcDBUtility.dll
#	DSWeb.Interface/bin/Release/HcDBUtility.pdb
#	DSWeb.Interface/obj/Debug/DSWeb.Interface.csproj.CoreCompileInputs.cache
#	DSWeb.Interface/obj/Debug/DSWeb.Interface.csproj.FileListAbsolute.txt
#	DSWeb.Interface/obj/Debug/DSWeb.Interface.csprojAssemblyReference.cache
#	DSWeb.Interface/obj/Debug/DSWeb.Interface.dll
#	DSWeb.Interface/obj/Debug/DSWeb.Interface.pdb
#	DSWeb/UploadFiles/SysUser_Sign/1BEC90E1-9780-472F-90C2-0C6390C044A4.jpg
#	DSWeb/Web.config
#	DSWeb/bin/DSWeb.Common.dll
#	DSWeb/bin/DSWeb.Common.pdb
#	DSWeb/bin/DSWeb.Interface.dll
#	DSWeb/bin/DSWeb.Interface.pdb
#	DSWeb/bin/DSWeb.XmlSerializers.dll
#	DSWeb/bin/DSWeb.dll
#	DSWeb/bin/DSWeb.dll.config
#	DSWeb/bin/DSWeb.pdb
#	DSWeb/bin/DSWebComponent.dll
#	DSWeb/bin/DSWebComponent.pdb
#	DSWeb/bin/FrmHttpHelper.dll
#	DSWeb/bin/FrmHttpHelper.pdb
#	DSWeb/bin/HcDBUtility.dll
#	DSWeb/bin/HcDBUtility.pdb
#	DSWeb/bin/JsonHelper.dll
#	DSWeb/bin/JsonHelper.pdb
#	DSWeb/bin/OfficeHelper.dll
#	DSWeb/bin/OfficeHelper.pdb
#	DSWeb/bin/SocialExplorer.FastDBF.dll
#	DSWeb/bin/SocialExplorer.FastDBF.pdb
#	DSWeb/bin/WebSqlHelper.dll
#	DSWeb/bin/WebSqlHelper.pdb
#	DispatchWeb/obj/Debug/DispatchWeb.csproj.CoreCompileInputs.cache
#	DispatchWeb/obj/Release/DispatchWeb.csproj.CoreCompileInputs.cache
#	DispatchWeb/obj/Release/DispatchWeb.csprojAssemblyReference.cache
#	HcDBUtility/bin/Debug/HcDBUtility.dll
#	HcDBUtility/bin/Debug/HcDBUtility.pdb
#	HcDBUtility/bin/Release/HcDBUtility.dll
#	HcDBUtility/bin/Release/HcDBUtility.pdb
#	JobAutoCreateFee/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
#	JobAutoCreateFee/obj/Debug/JobAutoCreateFee.csproj.CoreCompileInputs.cache
#	JobAutoCreateFee/obj/Release/JobAutoCreateFee.csproj.CoreCompileInputs.cache
#	JobAutoCreateFee/obj/Release/JobAutoCreateFee.csprojAssemblyReference.cache
#	JobPingTaiWork/obj/Debug/JobPingTaiWork.csproj.CoreCompileInputs.cache
#	JobPingTaiWork/obj/Release/JobPingTaiWork.csproj.CoreCompileInputs.cache
#	JobReqWebData/obj/Debug/JobReqWebData.csproj.CoreCompileInputs.cache
#	JobReqWebData/obj/Release/JobReqWebData.csproj.CoreCompileInputs.cache
#	JobReqWebData/obj/Release/JobReqWebData.csprojAssemblyReference.cache
#	JobScheduler/JobScheduler.csproj
#	JobScheduler/obj/Debug/JobScheduler.csproj.CoreCompileInputs.cache
#	JobScheduler/obj/Release/JobScheduler.csproj.CoreCompileInputs.cache
#	JobSendAgentMail/obj/Debug/JobSendAgentMail.csproj.CoreCompileInputs.cache
#	JobYunDang/obj/Debug/JobYunDang.csproj.CoreCompileInputs.cache
#	JobYunDang/obj/Release/JobYunDang.csproj.CoreCompileInputs.cache
#	JobYunDang/obj/Release/JobYunDang.csprojAssemblyReference.cache
#	Job_BoschEdi_FTP/obj/Debug/Job_BoschEdi_FTP.csproj.CoreCompileInputs.cache
#	Job_BoschEdi_FTP/obj/Release/Job_BoschEdi_FTP.csprojAssemblyReference.cache
#	Job_DSWMS_REPORT/obj/Debug/Job_DSWMS_REPORT.csproj.CoreCompileInputs.cache
#	Job_JieFeng_FTP/obj/Debug/Job_JieFeng_FTP.csproj.CoreCompileInputs.cache
#	Job_JieFeng_FTP/obj/Release/Job_JieFeng_FTP.csproj.CoreCompileInputs.cache
#	Job_JieFeng_FTP/obj/Release/Job_JieFeng_FTP.csprojAssemblyReference.cache
#	JsonHelper/obj/Debug/JsonHelper.csproj.CoreCompileInputs.cache
#	JsonHelper/obj/Release/JsonHelper.csproj.CoreCompileInputs.cache
#	OfficeHelper/obj/Debug/OfficeHelper.csproj.CoreCompileInputs.cache
#	OfficeHelper/obj/Release/OfficeHelper.csproj.CoreCompileInputs.cache
#	WebSqlHelper/obj/Debug/WebSqlHelper.csproj.CoreCompileInputs.cache
#	WebSqlHelper/obj/Release/WebSqlHelper.csproj.CoreCompileInputs.cache
 2 years ago
hanxuntao d634a95779 ss 2 years ago
hanxuntao 16a97d6174 0721 2 years ago
hanxuntao 749f067ccc A 2 years ago
ddlucky 166500de26 '' 2 years ago
hanxuntao 658e6ce3b2 2022-7-1 2 years ago
ddlucky a51c24da13 'first' 2 years ago