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
|
ead2707c07
|
grid单元格可垂直居中
|
2 years ago |
|
ddlucky
|
ae64419adb
|
合规校验：每行前方的图片水平居中
|
2 years ago |
|
ddlucky
|
fe168e3196
|
DS7合规校验内容的显示样式稍作修改；诚锐出库流程变动
|
2 years ago |
|
ddlucky
|
be33cabfc1
|
旧仓储，出库，钉钉审批。如果已提交则在出库业务列表的【钉钉审批】列显示“已提交钉钉”
|
2 years ago |
|
ddlucky
|
314f83cf68
|
旧仓储出库的钉钉审核部分，如果设为钉钉审核，则点击费用入账后提交钉钉，钉钉审核后实际执行费用入账。
|
2 years ago |
|
ddlucky
|
4420e0790c
|
模块允许复制
|
2 years ago |
|
hanxuntao
|
e0f1dd75bf
|
1
|
2 years ago |
|
hanxuntao
|
e930ebe797
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
2 years ago |
|
hanxuntao
|
22c53d569e
|
12
|
2 years ago |
|
ddlucky
|
182c51d1d2
|
20230113-2
|
2 years ago |
|
ddlucky
|
0f77ab7080
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
2 years ago |
|
ddlucky
|
ae11e28fbf
|
仓储入库费用入账时触发钉钉审批，未完成
|
2 years ago |
|
hanxuntao
|
37fc5dc7ef
|
1
|
2 years ago |
|
hanxuntao
|
6ecb5d860c
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
2 years ago |
|
hanxuntao
|
17456878e3
|
1
|
2 years ago |
|
ddlucky
|
b426ab2ca6
|
防止一沓科技的ocr识别执行无recordId的获取识别结果。
|
2 years ago |
|
ddlucky
|
9eb25d6395
|
诺诺开票接口变更，初步完成待测试；ds7仓储入库费用入账加钉钉审核，未完成；
|
2 years ago |
|
hanxuntao
|
c82b56cfdd
|
1
|
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
|
abd387c52c
|
左右版chfee页面的允许编辑逻辑改为和正常上下版的一致
|
2 years ago |
|
ddlucky
|
33646893cf
|
取消原有的合规校验逻辑
|
2 years ago |
|
ddlucky
|
3a8642b56d
|
20230103合规校验完成
|
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
|
435a55e8c8
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
2 years ago |
|
ddlucky
|
5f144a4ae9
|
vgm接口直发增加对接口支持的船公司范围的支持
|
2 years ago |
|
hanxuntao
|
e1ef1d090f
|
1
|
2 years ago |
|
ddlucky
|
35d720eef3
|
对大简云的信息对接：读取状态的消息队列已完成，目前使用测试地址；发送VGM未完成；对接合规接口未完成。20221227
|
2 years ago |
|
hanxuntao
|
611fdfe0e3
|
1
|
2 years ago |
|
hanxuntao
|
1c535646a4
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
2 years ago |
|
hanxuntao
|
0125ca9a32
|
1
|
2 years ago |
|
ddlucky
|
1541ed13d0
|
'20221208壹沓科技ocr识别接口完成'
|
2 years ago |
|
hanxuntao
|
6f9099858c
|
1
|
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
|
6ecbc3d456
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
2 years ago |
|
hanxuntao
|
97b57f33ac
|
1
|
2 years ago |
|
ddlucky
|
514a21d1f5
|
'单一窗口改客户端文件解析模式，未完成'
|
2 years ago |
|
ddlucky
|
a33ddad90e
|
'内贸空运编辑页面增加显示所属公司下拉框'
|
2 years ago |
|
ddlucky
|
f9c9f2a73b
|
'MsOpSeaiComtroller.GetCtnDetailList增加返回值数量，由默认50改为1000'
|
2 years ago |
|
ddlucky
|
76ef191632
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
2 years ago |
|
ddlucky
|
10664575c6
|
'仓储入库的子列表行数从未指定改为1000条，以应对多于50条的入库明细和导入入库信息'
|
2 years ago |
|
hanxuntao
|
100ce9ef98
|
1
|
2 years ago |
|
hanxuntao
|
04404b446e
|
1
|
2 years ago |
|
hanxuntao
|
d7ed85e16d
|
json新版本
|
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 |
|
ddlucky
|
5bb1815df0
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
2 years ago |
|
hanxuntao
|
3f0bdf6519
|
1
|
2 years ago |
|
hanxuntao
|
78c14143e8
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
2 years ago |
|
ddlucky
|
763299a61f
|
'20221019-仓储入库，入库明细分页改为1000行每页，原50行，导致显示不全'
|
2 years ago |
|
hanxuntao
|
8b59c5c0f6
|
pp
|
2 years ago |
|
ddlucky
|
8a13562616
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
2 years ago |
|
ddlucky
|
c704d998b2
|
'20220930-1'
|
2 years ago |
|
hanxuntao
|
99f5c6f503
|
1
|
2 years ago |
|
hanxuntao
|
8186222919
|
1
|
2 years ago |
|
hanxuntao
|
893a44a56f
|
1
|
2 years ago |
|
hanxuntao
|
e55fc05c41
|
1
|
2 years ago |
|
hanxuntao
|
583e13394f
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
2 years ago |
|
hanxuntao
|
78f6ad5177
|
1
|
2 years ago |
|
ddlucky
|
eb0f0cd2aa
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
2 years ago |
|
ddlucky
|
428350e3f7
|
'泰邦-资金占用表：增加【应结日期-ETD】用来显示按ETD+60天计算的应结日期，该日期只在该模块内起作用'
|
2 years ago |
|
hanxuntao
|
380d7404d6
|
1
|
2 years ago |
|
hanxuntao
|
90e5b66de2
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
# Conflicts:
# DSWeb/Properties/PublishProfiles/配置文件1.pubxml.user
|
2 years ago |
|
hanxuntao
|
a0c925375e
|
1
|
2 years ago |
|
ddlucky
|
e7a444b2d9
|
'泰邦修改提成计算方法'
|
2 years ago |
|
hanxuntao
|
6cedf7dd31
|
1
|
2 years ago |
|
hanxuntao
|
8c0d5375a5
|
1
|
2 years ago |
|
hanxuntao
|
6626a76cf6
|
1
|
2 years ago |
|
hanxuntao
|
b7bbf5d833
|
1
|
2 years ago |
|
hanxuntao
|
28ba1f7056
|
1
|
2 years ago |
|
hanxuntao
|
3de3d1c480
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
2 years ago |
|
hanxuntao
|
d86993e3e2
|
1
|
2 years ago |
|
ddlucky
|
179f2d835f
|
'20220907网上订舱确认增加防止重复'
|
2 years ago |
|
hanxuntao
|
3525e55ec2
|
1
|
2 years ago |
|
hanxuntao
|
ed89d3ace7
|
1
|
2 years ago |
|
hanxuntao
|
d21e63bc97
|
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
|
b05239955e
|
1
|
2 years ago |
|
hanxuntao
|
08756d4289
|
Merge branch 'dev' of http://123.234.225.158:13080/dengyu/DS7 into dev
|
2 years ago |
|
ddlucky
|
bcfad35e3c
|
'往来单位中上一客户下一客户改好'
|
2 years ago |
|
ddlucky
|
f10d9c163c
|
'DJY账号注册_未完成，暂时隐藏'
|
2 years ago |
|
ddlucky
|
b6a8571918
|
内贸空运 部分修改
|
2 years ago |
|
hanxuntao
|
c896e7c875
|
2
|
2 years ago |
|
ddlucky
|
3eb069907b
|
'内贸空运主单显示揽货人和客服'
|
2 years ago |
|
ddlucky
|
1c4cf0e6d1
|
'内贸空运主单显示揽货人和客服'
|
2 years ago |
|
hanxuntao
|
55cef2da8c
|
q
|
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
|
75f72d1ffb
|
'hxt20220726'
|
2 years ago |
|
hanxuntao
|
077b95db40
|
2
|
2 years ago |
|
hanxuntao
|
d634a95779
|
ss
|
2 years ago |
|
hanxuntao
|
16a97d6174
|
0721
|
2 years ago |
|
ddlucky
|
fd1b76a758
|
'bc解析修改初步完成'
|
2 years ago |
|
hanxuntao
|
749f067ccc
|
A
|
2 years ago |
|
ddlucky
|
0cedf20ee1
|
'几处js中的合计数由使用加号改为使用add'
|
2 years ago |
|
ddlucky
|
7c3182f0b0
|
'20220711'
|
2 years ago |
|
hanxuntao
|
658e6ce3b2
|
2022-7-1
|
2 years ago |
|
ddlucky
|
14e6227ce6
|
'自动生成舱单费，分单功能'
|
2 years ago |
|
ddlucky
|
4b7ab86c1a
|
'海运出口-直发舱单，发送成功后产生应收应付费用'
|
2 years ago |
|
hanxuntao
|
b52e179fbd
|
11
|
2 years ago |
|
ddlucky
|
a51c24da13
|
'first'
|
2 years ago |