hanxuntao
|
4b634b7c7f
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
2 years ago |
|
hanxuntao
|
2610a3f16f
|
12
|
2 years ago |
 ddlucky
|
755aa9fc09
|
签单条模块，功能完善
|
2 years ago |
|
ddlucky
|
eae2a1a31b
|
签单业务模块完成；目前使用http://39.101.1.89:18886服务器地址，唯一对应一个证书；
|
2 years ago |
|
hanxuntao
|
059a02e378
|
1
|
2 years ago |
|
hanxuntao
|
546ff9bd2e
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
2 years ago |
|
hanxuntao
|
fdaf6cc78f
|
1
|
2 years ago |
|
ddlucky
|
d1a42c8ca4
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
2 years ago |
|
ddlucky
|
2db9cf2b14
|
济南虎鲸，旧仓储，出库明细增加显示入库明细中的生产日期
|
2 years ago |
|
hanxuntao
|
16d39a3814
|
1
|
2 years ago |
|
ddlucky
|
217b1d1672
|
良通捷运的明细仓储部分，查询修改为通用分页方式；
|
2 years ago |
|
ddlucky
|
2d17c38117
|
旧仓储的自增费率，修改算法错误，防止高于封顶价的价格出现
|
2 years ago |
|
ddlucky
|
6014d60b04
|
通过综合接口直发VGM的提示逻辑，略微调整
|
2 years ago |
|
hanxuntao
|
754fa7e7d2
|
1
|
2 years ago |
|
ddlucky
|
f47a7ee9a2
|
20230310-2
|
2 years ago |
|
hanxuntao
|
e058d0321a
|
1
|
2 years ago |
|
hanxuntao
|
8d6b90b626
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
2 years ago |
|
ddlucky
|
6754eb5d4f
|
ESL相关功能。未完成，先做对瑞京内贸空运的功能修改
|
2 years ago |
|
hanxuntao
|
9302e01c6f
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
2 years ago |
|
ddlucky
|
751453df1e
|
海运出口，业务列表，增加【推送费用至港联顺接口】的功能
|
2 years ago |
|
hanxuntao
|
2b6cf757e5
|
1
|
2 years ago |
|
ddlucky
|
af2071de06
|
直发VGM后台验证箱信息，对ESL和ONE放宽至，必须有提单号、箱型、箱号、毛重
|
2 years ago |
|
hanxuntao
|
20064bb0b7
|
1
|
2 years ago |
|
hanxuntao
|
4ad8780a3a
|
1
|
2 years ago |
|
hanxuntao
|
959fe906de
|
1
|
2 years ago |
|
ddlucky
|
c7c0c81c9f
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
2 years ago |
|
ddlucky
|
898cec9330
|
仓储和钉钉审批微调
|
2 years ago |
|
hanxuntao
|
2773f78a3f
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
2 years ago |
|
hanxuntao
|
13fd390fba
|
1
|
2 years ago |
|
ddlucky
|
c06211b2b4
|
调整几个模块的本部门权限的写法
|
2 years ago |
|
ddlucky
|
44170cf9bc
|
出库费用入账，参数略作修改；出库管理，store载入简化
|
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
|
2fdaf12500
|
20230207-2
|
2 years ago |
|
ddlucky
|
27d0f0b5e9
|
仓储入库的箱号下拉菜单载入条件稍作调整；去掉钉钉审核后件重尺内的非数字字符
|
2 years ago |
|
hanxuntao
|
4a10c2c51d
|
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
|
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
|
d2812d1b30
|
自动对账中的提单号判断改为都转换为大写再判断相同
|
2 years ago |
|
hanxuntao
|
e0f1dd75bf
|
1
|
2 years ago |
|
ddlucky
|
ca34cba5a0
|
泰邦资金占用，标准由120天改为90天
|
2 years ago |
|
ddlucky
|
07d5d6b589
|
钉钉出入库审核调试完成
|
2 years ago |
|
ddlucky
|
23c70befcd
|
诚锐钉钉审批入库费用入账，完成
|
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
|
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
|
a9d938f7a7
|
20230110-2
|
2 years ago |
|
ddlucky
|
9eb25d6395
|
诺诺开票接口变更，初步完成待测试；ds7仓储入库费用入账加钉钉审核，未完成；
|
2 years ago |
|
hanxuntao
|
8998fbc262
|
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
|
44897d6ceb
|
直发vgm，未填写账号密码的告警
|
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 |
|
ddlucky
|
8e5e7ae17f
|
vgm新直发与读取状态服务完成
|
2 years ago |
|
hanxuntao
|
e1ef1d090f
|
1
|
2 years ago |
|
ddlucky
|
45749a8471
|
20221224
|
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
|
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 |
|
hanxuntao
|
100ce9ef98
|
1
|
2 years ago |
|
hanxuntao
|
d7ed85e16d
|
json新版本
|
2 years ago |
|
hanxuntao
|
c6f56f93b2
|
钉钉接口
|
2 years ago |
|
hanxuntao
|
abf1bf7641
|
1
|
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 |
|
hanxuntao
|
8b59c5c0f6
|
pp
|
2 years ago |
|
ddlucky
|
c704d998b2
|
'20220930-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
|
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
|
893a44a56f
|
1
|
2 years ago |