hanxuntao
|
13fd390fba
|
1
|
2 years ago |
 ddlucky
|
6789149b42
|
诚锐，出入库钉钉审批，改为通过入库明细gid和出库明细gid来对应数据。原有的按提单号箱号品名对应的方式存在问题，客户实际上是有这些字段均相同的出入库明细的。
|
2 years ago |
|
ddlucky
|
c06211b2b4
|
调整几个模块的本部门权限的写法
|
2 years ago |
|
ddlucky
|
44170cf9bc
|
出库费用入账，参数略作修改；出库管理，store载入简化
|
2 years ago |
|
ddlucky
|
c071170cb2
|
1
|
2 years ago |
|
ddlucky
|
ac844ae117
|
1
|
2 years ago |
|
ddlucky
|
0dee2a2575
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
2 years ago |
|
ddlucky
|
278896a6ee
|
瑞京内贸空运；1如果主单有应收应付费用，则分单保存时不计算主单右下方的费用；2如果主单或分单保存时，该单有应收应付费用，则该单下方的费用信息保存时不会修改。
|
2 years ago |
|
hanxuntao
|
9257d51a29
|
1
|
2 years ago |
|
ddlucky
|
3e060d3d47
|
旧仓储，仓储费结算清单，改为对明细出库的业务同样适用。
|
2 years ago |
|
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
|
cc2f9c54e3
|
诚锐钉钉审批入库，反写审批内容到入库明细之后，入库总量也相应重新计算反写。
|
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
|
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
|
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
|
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 |
|
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
|
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
|
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
|
8998fbc262
|
1
|
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
|
2030df5b52
|
20230104-2
|
2 years ago |
|
ddlucky
|
44897d6ceb
|
直发vgm，未填写账号密码的告警
|
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
|
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 |
|
ddlucky
|
45749a8471
|
20221224
|
2 years ago |
|
dengyu
|
deffcebe81
|
20221222-1
|
2 years ago |
|
ddlucky
|
1961ef2ad7
|
'20221221-1'
|
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 |
|
dengyu
|
75b60efa46
|
付费申请编辑页的提交审核后台方法增加对荣圣达的泛微OA系统流程的支持，未完成
|
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 |
|
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
|
27a7425c12
|
20221201
|
2 years ago |
|
ddlucky
|
04119ba67d
|
倍通公众号司机费用界面苹果手机样式；
|
2 years ago |
|
hanxuntao
|
1e08d7311b
|
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
|
d14172c98c
|
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
|
8186222919
|
1
|
2 years ago |
|
ddlucky
|
24298f30ef
|
青银红柿子，向wms发送的报文增加委托编号
|
2 years ago |
|
ddlucky
|
5955d77398
|
直发舱单分单生成费用时，费用的数量改为此次发送的分单的数量。
|
2 years ago |
|
ddlucky
|
bc227d5e4d
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
2 years ago |
|
ddlucky
|
d3aba0f1a8
|
网上订舱序号确保从0001开始；泰邦提成按工单SR2022092300004的要求修改；
|
2 years ago |
|
hanxuntao
|
1a4079951e
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
# Conflicts:
# .gitignore
|
2 years ago |
|
hanxuntao
|
b1e83ca4c4
|
1
|
2 years ago |
|
hanxuntao
|
893a44a56f
|
1
|
2 years ago |
|
ddlucky
|
4408e980b3
|
'20220923网上订舱,流程略变动,已审核通过产生了海运出口业务的网上订舱改为不允许驳回'
|
2 years ago |
|
ddlucky
|
fd33e107ab
|
'20220923网上订舱,流程略变动,已审核通过产生了海运出口业务的网上订舱改为不允许驳回'
|
2 years ago |
|
hanxuntao
|
e55fc05c41
|
1
|
2 years ago |
|
hanxuntao
|
743486a902
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
2 years ago |
|
hanxuntao
|
4e6f6e7496
|
1
|
2 years ago |
|
ddlucky
|
0ab58842b4
|
'20220922发送VGM费用数量改为业务的箱数量'
|
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
|
a345036932
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
2 years ago |
|
hanxuntao
|
6cedf7dd31
|
1
|
2 years ago |
|
ddlucky
|
553284d17f
|
泰邦 提成计算模块 增加乘以天数
|
2 years ago |
|
hanxuntao
|
8c0d5375a5
|
1
|
2 years ago |
|
hanxuntao
|
6626a76cf6
|
1
|
2 years ago |