zhangxiaofeng
|
e6e8c4af23
|
Merge branch 'usertest' into dev
|
2 months ago |
|
zhangxiaofeng
|
db28488261
|
调整主库SqlSugarScope对IUser的取值方式
|
2 months ago |
嵇文龙
|
ff0a271a64
|
审核任务驳回时更新驳回理由
|
2 months ago |
cjy
|
229d5b9e69
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
2 months ago |
|
cjy
|
3fd63b3dc6
|
数据权限模板复制
|
2 months ago |
|
zhangxiaofeng
|
66feddbbd2
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
2 months ago |
|
zhangxiaofeng
|
723233cf95
|
任务台任务转交时，更新FlowInstance、BusinessTask
|
2 months ago |
|
cjy
|
b5b9d8f91d
|
数据权限模板修改
|
2 months ago |
|
cjy
|
3ee59e2a29
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
2 months ago |
|
cjy
|
1d38ef6489
|
数据权限修改
|
2 months ago |
|
嵇文龙
|
4266377560
|
客户列表bug修复
|
2 months ago |
|
嵇文龙
|
afb69390af
|
客户列表查询bug修复
|
2 months ago |
|
cjy
|
20fcfca0e2
|
换Token测试
|
2 months ago |
jianghaiqing
|
9f6cfa81b3
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
2 months ago |
|
jianghaiqing
|
05f94b4d13
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
2 months ago |
|
jianghaiqing
|
83613772c5
|
修改ONE的YT截单
|
2 months ago |
|
嵇文龙
|
ce9fb01862
|
工作GetNextConditionNodeId方法bug修复
|
2 months ago |
|
cjy
|
786ed4fc90
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
2 months ago |
|
cjy
|
bc90f4d1bc
|
用户可视、操作权限应用全部
|
2 months ago |
|
zhangxiaofeng
|
8bc2067ef9
|
ApiUserFilter修改
|
2 months ago |
|
zhangxiaofeng
|
01ee01d139
|
AspNetUser优化
|
2 months ago |
|
嵇文龙
|
a96d8022ac
|
命名空间冲突解决
|
2 months ago |
|
嵇文龙
|
496d8cf27e
|
申请单获取费用明细时增加费用对象维度
|
2 months ago |
|
cjy
|
4aeee28be4
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
cjy
|
c5f5366b38
|
修改
|
3 months ago |
|
jianghaiqing
|
1295a6b100
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
jianghaiqing
|
782136f26b
|
修改易通截单
|
3 months ago |
 dengyu
|
d3de764d83
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
dengyu
|
f8cb21b5c8
|
20240912
|
3 months ago |
|
cjy
|
1b105690b6
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
cjy
|
be6802374d
|
mainapi注入大简云服务
|
3 months ago |
|
zhangxiaofeng
|
2f1265e258
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
zhangxiaofeng
|
ca170e4dc7
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
zhangxiaofeng
|
f59357fc08
|
任务台自定义列优化
|
3 months ago |
|
dengyu
|
2e7e2ae9b6
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
dengyu
|
a2e5b22eaf
|
20240912
|
3 months ago |
|
cjy
|
6dc6b77fa5
|
查询客户端 用户拥有的菜单权限修改
|
3 months ago |
|
cjy
|
6b558a78b0
|
往来单位下拉添加全称检索
|
3 months ago |
|
cjy
|
d166f870cc
|
回写商品信息修改
|
3 months ago |
|
cjy
|
e160115653
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
cjy
|
1d2e94eb94
|
海运出口日志结构修改
|
3 months ago |
|
zhangxiaofeng
|
a75711df45
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
zhangxiaofeng
|
1846b23d9a
|
任务变为公共任务bug修复
|
3 months ago |
|
嵇文龙
|
e46a7419a2
|
费用审核回调bug修复
|
3 months ago |
|
cjy
|
4aa968f44c
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
cjy
|
313c3633d6
|
海运出口保存回写商品信息
|
3 months ago |
|
zhangxiaofeng
|
4e92851c7d
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
zhangxiaofeng
|
3c32c01946
|
1.货物状态节点添加状态预审批人、时间、状态 2.添加任务完成时自动完成货物状态的功能
|
3 months ago |
|
cjy
|
047ee81907
|
海运出口商品信息回写接口
|
3 months ago |
|
zhangxiaofeng
|
302f124be0
|
TaskApi注册mq
|
3 months ago |
|
cjy
|
d07e0abb2e
|
复制单据单号重新赋值修改
|
3 months ago |
|
cjy
|
fec26482a2
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
cjy
|
758f2d71cd
|
可视数据权限调整
|
3 months ago |
|
嵇文龙
|
a2d70cc517
|
批量创建关联任务存在时返回提示
|
3 months ago |
|
嵇文龙
|
a7c0fa68de
|
增加用于发送邮件的任务动作
|
3 months ago |
|
cjy
|
82d1149da4
|
数据权限复制
|
3 months ago |
|
zhangxiaofeng
|
5c42fa3289
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
dengyu
|
2d6f46e0d4
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
dengyu
|
ffa903e878
|
20240911
|
3 months ago |
|
zhangxiaofeng
|
ca175c4586
|
任务完成时设置货物状态
|
3 months ago |
|
cjy
|
94bd128515
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
嵇文龙
|
0dbc57ca25
|
二次提交审核bug修复
|
3 months ago |
|
嵇文龙
|
f2c67d6b80
|
撤销后审核bug
|
3 months ago |
|
cjy
|
96a97b7867
|
设置租户用户授权数
|
3 months ago |
|
cjy
|
5ae607af2e
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
cjy
|
ea02724b8c
|
数据权限修改，优化字段、列表初始化权限、指定权限范围等；获取机构用户树；海运出口复制单号处理；角色代码唯一判断修改；合约号下拉添加船公司传值
|
3 months ago |
|
嵇文龙
|
6386ae372e
|
客户列表非分组bug
|
3 months ago |
|
嵇文龙
|
c813074860
|
往来单位列表支持高级查询
|
3 months ago |
|
嵇文龙
|
e4273640e6
|
往来单位获取列表bug修复
|
3 months ago |
|
zhangxiaofeng
|
e4783bdfd4
|
任务台台账相关
|
3 months ago |
|
zhangxiaofeng
|
13d213faed
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
zhangxiaofeng
|
8f3025b6d4
|
任务台台账相关
|
3 months ago |
|
cjy
|
bc3aeb1f09
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
cjy
|
00670e1a22
|
数据权限模板及用户权限范围修改
|
3 months ago |
|
jianghaiqing
|
13144a9ae6
|
修改INTTRA
|
3 months ago |
|
jianghaiqing
|
13f9a7bcfe
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
jianghaiqing
|
5ea350f6d0
|
修改INTTRA
|
3 months ago |
|
dengyu
|
d1e9e5dda8
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
dengyu
|
5a94b6d8b4
|
箱管20240830-0909
|
3 months ago |
|
cjy
|
2822c8a5cc
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
cjy
|
06e30198b8
|
海运出口复制单据单号重新赋值
|
3 months ago |
|
嵇文龙
|
a0b486dae1
|
根据业务ID和类型获取模板所需数据
|
3 months ago |
|
cjy
|
602ff7a527
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
cjy
|
5078e44e4b
|
提单差异修改
|
3 months ago |
|
嵇文龙
|
b0320c3903
|
已使用的往来单位不更新简称
|
3 months ago |
|
cjy
|
22b21338f5
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
cjy
|
5dbc63b619
|
海运出口提单修改
|
3 months ago |
|
jianghaiqing
|
c835db87c6
|
修改INTTRA
|
3 months ago |
|
jianghaiqing
|
3aa2e8f45f
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
jianghaiqing
|
2e7c9e4926
|
修改INTTRA EDI
|
3 months ago |
|
嵇文龙
|
d9bda89dba
|
批量创建关联任务
|
3 months ago |
|
嵇文龙
|
9e6fca5480
|
邮件模板bug修复
|
3 months ago |
|
jianghaiqing
|
98fe643efb
|
修改发送订舱校验
|
3 months ago |
|
jianghaiqing
|
82195c80f9
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
jianghaiqing
|
ec517a5982
|
修改mapper
|
3 months ago |
|
cjy
|
0222f6a240
|
揽货人下拉添加来源及来源明细
|
3 months ago |
|
cjy
|
d71503db2b
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
cjy
|
3d661a07e5
|
用户添加来源及来源明细；租户数据权限模板和数据权限
|
3 months ago |
|
jianghaiqing
|
aed4d6078d
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
jianghaiqing
|
b49cc048e9
|
修改同步东胜功能
|
3 months ago |
|
嵇文龙
|
82fa2a7395
|
确定往来单位是否已使用
|
3 months ago |
|
jianghaiqing
|
88a4bab957
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
jianghaiqing
|
d4b6c7872f
|
新增订单扩展状态表
|
3 months ago |
|
cjy
|
246a765131
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
cjy
|
a59921842c
|
海运出口处理订单联系人添加国内发货人
|
3 months ago |
|
嵇文龙
|
8e490d395a
|
允许修改助记码
|
3 months ago |
|
嵇文龙
|
0098fd8e60
|
往来单位增加若干字段
|
3 months ago |
|
嵇文龙
|
a4970cf033
|
审核费用统计
|
3 months ago |
|
嵇文龙
|
0e25cef38e
|
获取汇率bug修复
|
3 months ago |
|
cjy
|
0c3fd95f86
|
订单编号根据揽货人编号生成
|
3 months ago |
|
cjy
|
c766404a6f
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
cjy
|
6b07145af6
|
用户添加QQ、删除用户航线信息
|
3 months ago |
|
jianghaiqing
|
0cb0c87cac
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
jianghaiqing
|
f8ad4b82b2
|
增加MQ
|
3 months ago |
|
cjy
|
b8e01c14ba
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
cjy
|
b1722e89d9
|
用户列表添加角色信息
|
3 months ago |
|
jianghaiqing
|
929a312f29
|
新增rabbit mq
|
3 months ago |
|
jianghaiqing
|
6bc64de1e1
|
修改BC
|
3 months ago |
|
jianghaiqing
|
d6d41ec659
|
修改BC
|
3 months ago |
|
jianghaiqing
|
690aa31b9d
|
1、新增同步东胜7功能
2、修改BC拆单转发功能
|
3 months ago |
|
cjy
|
6ea7de1026
|
修改
|
3 months ago |
|
cjy
|
8bfa19896f
|
设置表单模板公共标识
|
3 months ago |
|
cjy
|
2f9f2a2a0a
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
cjy
|
a83803bd04
|
表单模板设置添加公共标识，标识公共则整个租户通用此表单模板
|
3 months ago |
|
嵇文龙
|
d0a0aac21e
|
邮件数据获取bug
|
3 months ago |
|
嵇文龙
|
1e366e6c93
|
邮件数据获取bug
|
3 months ago |
|
嵇文龙
|
a99f99135c
|
一键审核
|
3 months ago |
|
zhangxiaofeng
|
43117d94d4
|
AspNetUser取值调整
|
3 months ago |
|
zhangxiaofeng
|
2ee86448a4
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
zhangxiaofeng
|
ea39fc8f2b
|
转交方法优化
|
3 months ago |
|
嵇文龙
|
86e408f0fb
|
往来单位服务项目bug修复
|
3 months ago |
|
嵇文龙
|
b3005d8fdf
|
提交错误修复
|
3 months ago |
|
cjy
|
ce7a325120
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
cjy
|
2c50fcb981
|
包装信息必填去除
|
3 months ago |
|
zhangxiaofeng
|
72d0fec2ef
|
事务测试
|
3 months ago |
|
zhangxiaofeng
|
f106af5af7
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
zhangxiaofeng
|
bcb795fc18
|
合约管理：合约与航线改为一对多的关系
|
3 months ago |
|
嵇文龙
|
c3de27b7b0
|
根据业务ID和类型获取模板所需数据
|
3 months ago |
|
嵇文龙
|
c798a4bfd8
|
根据业务和查询条件获取费用明细
|
3 months ago |
|
嵇文龙
|
c0fe2d44ed
|
按业务审核费用
|
3 months ago |
|
zhangxiaofeng
|
4d2828f70a
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
zhangxiaofeng
|
6f18973793
|
附件保存逻辑的字段名及注释完善
|
3 months ago |
|
cjy
|
f437009c8b
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
cjy
|
32a00d3ddb
|
机构添加结算机构标识；
|
3 months ago |
|
zhangxiaofeng
|
3b1c97a6a5
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
zhangxiaofeng
|
0568abd6b4
|
BC附件保存调整
|
3 months ago |
|
cjy
|
57b65302f1
|
Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev
|
3 months ago |
|
cjy
|
b229901c96
|
租户端基础编码规则
|
3 months ago |
|
嵇文龙
|
a613784c5e
|
发票模板渲染
|
3 months ago |
|
cjy
|
0d96551453
|
获取部门列表修改
|
3 months ago |