hanxuntao
|
8c2d76c74f
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
# Conflicts:
# BookingJieFeng/BookingJieFeng.csproj.user
# BookingWeb/BookingWeb.csproj.user
# DSWeb/DSWeb.csproj.user
# DispatchWeb/DispatchWeb.csproj.user
|
2 years ago |
|
hanxuntao
|
2ab901f249
|
1
|
2 years ago |
 ddlucky
|
b45d05d11c
|
总账管理-凭证录入，复制时清空凭证号。
|
2 years ago |
|
ddlucky
|
a688bf1479
|
20230209-1
|
2 years ago |
|
ddlucky
|
cc2f9c54e3
|
诚锐钉钉审批入库，反写审批内容到入库明细之后，入库总量也相应重新计算反写。
|
2 years ago |
|
ddlucky
|
f5e5939177
|
删除意外导入的不相关内容
|
2 years ago |
|
ddlucky
|
ab046e1030
|
内贸空运，增加日志，分单生成主单时的燃油费生成。
|
2 years ago |
|
ddlucky
|
b100a5d9e4
|
佣金导入，如提单号未找到对应业务，则告警然后不导入；内贸空运主单的保存增加日志记录；
|
2 years ago |
|
ddlucky
|
0264c3a7fb
|
新仓储去掉复制添加
|
2 years ago |
|
ddlucky
|
2fdaf12500
|
20230207-2
|
2 years ago |
|
ddlucky
|
d99c992d95
|
佣金导入，改回成费用锁定后无法导入的逻辑
|
2 years ago |
|
ddlucky
|
27d0f0b5e9
|
仓储入库的箱号下拉菜单载入条件稍作调整；去掉钉钉审核后件重尺内的非数字字符
|
2 years ago |
|
dengyu
|
f343648b0f
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
2 years ago |
|
dengyu
|
aa8ffdab92
|
20230206-1仓储入库增加复制添加
|
2 years ago |
|
hanxuntao
|
31da09ec7e
|
1
|
2 years ago |
|
hanxuntao
|
4a10c2c51d
|
1
|
2 years ago |
|
hanxuntao
|
8a2f50c5f7
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
2 years ago |
|
hanxuntao
|
12cfcabc97
|
1
|
2 years ago |
|
ddlucky
|
1d9dc08487
|
工作流增加功能，但未做调用。（GetWorkFlowmb）用于按companyid获取工作流
|
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
|
5561796a55
|
1
|
2 years ago |
|
hanxuntao
|
c2abbeebbe
|
1
|
2 years ago |
|
ddlucky
|
628d9982f4
|
荣圣达泛微OA接口，增加对附件的发送
|
2 years ago |
|
ddlucky
|
7a415fbcfa
|
20230130-2
|
2 years ago |
|
ddlucky
|
ead2707c07
|
grid单元格可垂直居中
|
2 years ago |
|
ddlucky
|
ae64419adb
|
合规校验：每行前方的图片水平居中
|
2 years ago |
|
ddlucky
|
fe168e3196
|
DS7合规校验内容的显示样式稍作修改；诚锐出库流程变动
|
2 years ago |
|
ddlucky
|
ff878d2261
|
诚锐钉钉审批，入库流程取消车辆信息列表，在入库信息加车队和车牌号
|
2 years ago |
|
ddlucky
|
67a7f137c8
|
20230129-3
|
2 years ago |
|
ddlucky
|
5f28226bee
|
20230129-2
|
2 years ago |
|
ddlucky
|
be33cabfc1
|
旧仓储，出库，钉钉审批。如果已提交则在出库业务列表的【钉钉审批】列显示“已提交钉钉”
|
2 years ago |
|
ddlucky
|
314f83cf68
|
旧仓储出库的钉钉审核部分，如果设为钉钉审核，则点击费用入账后提交钉钉，钉钉审核后实际执行费用入账。
|
2 years ago |
|
ddlucky
|
63e756e13d
|
20230128-1
|
2 years ago |
|
ddlucky
|
acca263354
|
荣圣达服务微调；诚锐钉钉接口返回值处理微调
|
2 years ago |
|
ddlucky
|
9bfb872062
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
2 years ago |
|
ddlucky
|
d2812d1b30
|
自动对账中的提单号判断改为都转换为大写再判断相同
|
2 years ago |
|
ddlucky
|
4420e0790c
|
模块允许复制
|
2 years ago |
|
ddlucky
|
dfa50ca935
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
2 years ago |
|
ddlucky
|
7dd6ca30cb
|
合规校验，货描传错了GOODSNAME，应为DESCRIPTION
|
2 years ago |
|
hanxuntao
|
e0f1dd75bf
|
1
|
2 years ago |
|
hanxuntao
|
64f422bc2d
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
2 years ago |
|
ddlucky
|
ca34cba5a0
|
泰邦资金占用，标准由120天改为90天
|
2 years ago |
|
ddlucky
|
74c969f886
|
荣圣达泛微OA对接，修改了一些字段的对应；申请人和付款对象改为根据对方提供的视图中的ID，对应关系依照user.showname和info_client.description
|
2 years ago |
|
ddlucky
|
38a8dd8717
|
荣圣达泛微OA对接，增加对oa返回错误的处理；发送时增加取部门id写道sqbm字段
|
2 years ago |
|
ddlucky
|
07d5d6b589
|
钉钉出入库审核调试完成
|
2 years ago |
|
hanxuntao
|
daf574a601
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
2 years ago |
|
ddlucky
|
23c70befcd
|
诚锐钉钉审批入库费用入账，完成
|
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 |
|
ddlucky
|
9ac779e46c
|
vgm接口直发，增加对箱信息的验证
|
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
|
4feeab87fa
|
诺诺开票逻辑回滚至原逻辑
|
2 years ago |
|
ddlucky
|
a9d938f7a7
|
20230110-2
|
2 years ago |
|
ddlucky
|
9eb25d6395
|
诺诺开票接口变更，初步完成待测试；ds7仓储入库费用入账加钉钉审核，未完成；
|
2 years ago |
|
ddlucky
|
4246e1044b
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
2 years ago |
|
ddlucky
|
82410aea01
|
20230109-1
|
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
|
44897d6ceb
|
直发vgm，未填写账号密码的告警
|
2 years ago |
|
ddlucky
|
abd387c52c
|
左右版chfee页面的允许编辑逻辑改为和正常上下版的一致
|
2 years ago |
|
ddlucky
|
3681c01ebc
|
20230103-4
|
2 years ago |
|
ddlucky
|
ec16624689
|
合规校验，船公司id改为通过edicode中的ediname=vgm的edicode值
|
2 years ago |
|
ddlucky
|
da89f8f894
|
20230103-3
|
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
|
43f7d8e2aa
|
海运出口业务合规判定；开始开发
|
2 years ago |
|
ddlucky
|
727bc98357
|
20221228-4
|
2 years ago |
|
ddlucky
|
5f144a4ae9
|
vgm接口直发增加对接口支持的船公司范围的支持
|
2 years ago |
|
ddlucky
|
bd1d0b5e92
|
20221228-2
|
2 years ago |
|
ddlucky
|
8e5e7ae17f
|
vgm新直发与读取状态服务完成
|
2 years ago |
|
hanxuntao
|
e1ef1d090f
|
1
|
2 years ago |
|
ddlucky
|
3919ae37e2
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
2 years ago |
|
ddlucky
|
35d720eef3
|
对大简云的信息对接：读取状态的消息队列已完成，目前使用测试地址；发送VGM未完成；对接合规接口未完成。20221227
|
2 years ago |
|
hanxuntao
|
e3b2d4b0d9
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
2 years ago |
|
hanxuntao
|
16f65ee53b
|
1
|
2 years ago |
|
ddlucky
|
45749a8471
|
20221224
|
2 years ago |
|
dengyu
|
deffcebe81
|
20221222-1
|
2 years ago |
|
ddlucky
|
1961ef2ad7
|
'20221221-1'
|
2 years ago |
|
ddlucky
|
fcf82c652e
|
荣盛达泛微系统对接，未完成
|
2 years ago |
|
ddlucky
|
b30e0cd01e
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
2 years ago |
|
ddlucky
|
5bff1b6297
|
解决一个壹沓科技OCR时ETD为空引发的问题；解决MsCodeOpStatusDetail查询条件为空时的报错
|
2 years ago |
|
hanxuntao
|
611fdfe0e3
|
1
|
2 years ago |