hanxuntao
|
311a1039f2
|
1
|
1 year ago |
 dengyu
|
20090bfe3c
|
Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev
|
1 year ago |
|
dengyu
|
6490d0b5e8
|
内贸空运，后台增加锁定时防止保存
前端修正一个复制新建时，某些情况下没有清空分单号的问题。
|
1 year ago |
|
hanxuntao
|
4633df5113
|
1
|
1 year ago |
|
hanxuntao
|
7eab7c9803
|
Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev
|
1 year ago |
|
hanxuntao
|
10344c5f3d
|
1
|
1 year ago |
|
hanxuntao
|
6ae07467c3
|
1
|
1 year ago |
|
dengyu
|
510fd866ab
|
发票接口设置，增加重置token选项
|
1 year ago |
|
hanxuntao
|
d9efa450b5
|
1
|
1 year ago |
|
hanxuntao
|
ce3dc0504f
|
1
|
1 year ago |
|
dengyu
|
24eab8b043
|
内贸海运excel导入，操作、单整、客服、揽货人，改为使用USERID
|
1 year ago |
|
dengyu
|
52b5ab95fc
|
1
|
1 year ago |
|
dengyu
|
8fe5eae533
|
1
|
1 year ago |
|
dengyu
|
50a595fa13
|
Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev
|
1 year ago |
|
dengyu
|
dd2f8d4073
|
荣圣达泛微，cansend方法改回原处，防止死锁
|
1 year ago |
|
hanxuntao
|
9f9f9663a7
|
Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev
|
1 year ago |
|
hanxuntao
|
9b57744ef4
|
1
|
1 year ago |
|
dengyu
|
d56ac1f81b
|
1
|
1 year ago |
|
dengyu
|
d0bfb7d381
|
Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev
|
1 year ago |
|
dengyu
|
a8555a1f4b
|
函数名拼写错误修正GetOrcResult改为GetOcrResult
|
1 year ago |
|
ddlucky
|
0c31a23f27
|
荣圣达泛微OA，防止重复提交
|
1 year ago |
|
dengyu
|
2802808cb4
|
1
|
1 year ago |
|
dengyu
|
2559daa5bb
|
1
|
1 year ago |
|
dengyu
|
a1ee09e173
|
1
|
1 year ago |
|
ddlucky
|
396a44de2e
|
1
|
1 year ago |
|
dengyu
|
f5f9eac7aa
|
1
|
1 year ago |
|
dengyu
|
710344e4dc
|
Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev
|
1 year ago |
|
dengyu
|
5044b29f29
|
1
|
1 year ago |
|
hanxuntao
|
6d7fd2c57d
|
Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev
|
1 year ago |
|
hanxuntao
|
49e485889e
|
1
|
1 year ago |
|
dengyu
|
51a9d4ea77
|
全电发票，取key的公司，由head.companyid改为salecorpid
|
1 year ago |
|
dengyu
|
756c46d57f
|
付费申请审批，debug
|
1 year ago |
|
dengyu
|
6b51dffe96
|
20230831
|
1 year ago |
|
dengyu
|
4ec392f719
|
1
|
1 year ago |
|
dengyu
|
c378cfdfe5
|
工作流当中通过optype对应工作流名字，改为用一个函数管理；诺诺全电发票获取信息，查询之前没有加上公司id，现已增加
|
1 year ago |
|
dengyu
|
f443d0fc6a
|
增加供dswms调用的费用提交审核接口
|
1 year ago |
|
dengyu
|
ae942ec77c
|
Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev
|
1 year ago |
|
dengyu
|
853305f4cf
|
1
|
1 year ago |
|
dengyu
|
c23d7cf0c5
|
1
|
1 year ago |
|
hanxuntao
|
3c759cba24
|
1
|
1 year ago |
|
hanxuntao
|
b0aeaa651e
|
1
|
1 year ago |
|
dengyu
|
329d9a004a
|
Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev
|
1 year ago |
|
dengyu
|
14b3da6f3e
|
1
|
1 year ago |
|
dengyu
|
16a3b3932b
|
荣圣达泛微OA接口，票结业务明细增加启运港、卸货港、目的港
|
1 year ago |
|
hanxuntao
|
640a09ecff
|
Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev
|
1 year ago |
|
hanxuntao
|
fd7c9de4bf
|
1
|
1 year ago |
|
dengyu
|
7fa3735ff2
|
单一窗口货物明细增加显示法定第一数量
|
1 year ago |
|
dengyu
|
6b53040d4c
|
Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev
|
1 year ago |
|
dengyu
|
b5ec18c95e
|
20230822
|
1 year ago |
|
hanxuntao
|
32564a977d
|
1
|
1 year ago |
|
dengyu
|
95159f9b4e
|
裕龙仓储小程序，增加上传图片时图片的公司id
|
1 year ago |
|
dengyu
|
2eea9593bb
|
付费发票核销 审核界面 增加双击明细显示业务信息
|
1 year ago |
|
hanxuntao
|
9d4e2d739b
|
1
|
1 year ago |
|
hanxuntao
|
1ee64841dd
|
1
|
1 year ago |
|
dengyu
|
e6c9a5c386
|
Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev
|
1 year ago |
|
dengyu
|
0bd0a3f1ee
|
增加针对金港物流的dswms，读取客户合同的需求
|
1 year ago |
|
hanxuntao
|
1f9f0afa95
|
1
|
1 year ago |
|
hanxuntao
|
e63193d9c1
|
1
|
1 year ago |
|
hanxuntao
|
53500c0721
|
1
|
1 year ago |
|
dengyu
|
93cec7cede
|
Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev
|
1 year ago |
|
dengyu
|
396435e578
|
增加定时读取单一窗口信息的服务；ds7相应增加了一个接口
|
1 year ago |
|
hanxuntao
|
7e9e2d2336
|
1
|
1 year ago |
|
hanxuntao
|
27a951c708
|
Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev
|
1 year ago |
|
hanxuntao
|
ec69380dad
|
12
|
1 year ago |
|
dengyu
|
7cad378229
|
删除无用的文档
|
1 year ago |
|
dengyu
|
37a4020809
|
方合派车小程序，和任务生成费用。全部完成
|
1 year ago |
|
dengyu
|
6e13621688
|
方合微信小程序用后台部分完成
|
1 year ago |
|
dengyu
|
18e8094472
|
Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev
|
1 year ago |
|
dengyu
|
0467fbc717
|
方合派车20230807
|
1 year ago |
|
hanxuntao
|
80b5cef19f
|
1
|
1 year ago |
|
hanxuntao
|
b4d93a0e12
|
Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev
|
1 year ago |
|
dengyu
|
22f759046b
|
1
|
1 year ago |
|
hanxuntao
|
81e0bfe49b
|
Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev
|
1 year ago |
|
hanxuntao
|
3f6208b665
|
1
|
1 year ago |
|
dengyu
|
0cfdd4f6c4
|
1
|
1 year ago |
|
dengyu
|
53dba8aa9b
|
1
|
1 year ago |
|
dengyu
|
4517264358
|
Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev
|
1 year ago |
|
dengyu
|
92465a9332
|
诺诺全电，增加分机号逻辑
|
1 year ago |
|
hanxuntao
|
5ac4924f72
|
1
|
1 year ago |
|
dengyu
|
9fb600baab
|
青岛金港物流，给海运出口增加一些针对新仓储的功能
|
1 year ago |
|
hanxuntao
|
e91a1e954a
|
1
|
1 year ago |
|
hanxuntao
|
09fba917dc
|
Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev
|
1 year ago |
|
hanxuntao
|
bd3855130d
|
1
|
1 year ago |
|
dengyu
|
f4cb3af177
|
Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev
|
1 year ago |
|
dengyu
|
28b89b5cb6
|
1
|
1 year ago |
|
hanxuntao
|
42a7bb6411
|
Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev
|
1 year ago |
|
dengyu
|
c3c2a3b7f4
|
20230724
|
1 year ago |
|
hanxuntao
|
79dd52bd5a
|
1
|
1 year ago |
|
dengyu
|
67b92f17f8
|
Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev
|
1 year ago |
|
dengyu
|
d1abdb4f49
|
1
|
1 year ago |
|
hanxuntao
|
3ee5414241
|
1
|
1 year ago |
|
hanxuntao
|
1fb55c9be5
|
1
|
1 year ago |
|
hanxuntao
|
c88a5f7b21
|
1
|
1 year ago |
|
ddlucky
|
582344d070
|
1
|
1 year ago |
|
ddlucky
|
f02e890e0d
|
1
|
1 year ago |
|
dengyu
|
9a10166413
|
Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev
|
1 year ago |
|
dengyu
|
d8614e2500
|
2
|
1 year ago |
|
hanxuntao
|
764939dcdb
|
Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev
|
1 year ago |
|
hanxuntao
|
290bea30dd
|
1
|
1 year ago |
|
dengyu
|
13527af340
|
海运进口模块，引入报关信息时，将第一条货物信息的规格，写到opseai.remark2里面
|
1 year ago |
|
hanxuntao
|
c88048487e
|
1
|
1 year ago |
|
hanxuntao
|
6d056f2330
|
1
|
1 year ago |
|
hanxuntao
|
4028f618c5
|
1
|
1 year ago |
|
hanxuntao
|
64d3f83222
|
1
|
1 year ago |
|
hanxuntao
|
9ac51debf2
|
1
|
1 year ago |
|
hanxuntao
|
99e3b357c2
|
1
|
1 year ago |
|
hanxuntao
|
df1ccb6350
|
Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev
|
1 year ago |
|
hanxuntao
|
2e7432598c
|
1
|
1 year ago |
|
dengyu
|
55331cc3f0
|
1
|
1 year ago |
|
dengyu
|
c2f8c5b9fb
|
1
|
1 year ago |
|
dengyu
|
0c88adba84
|
付费发票核销，查询子句除错
|
1 year ago |
|
dengyu
|
c636a7e6ac
|
海运进口的[引入报关信息]功能，改为优先匹配报关单号，如无报关单号则匹配主提单号；付费发票核销查询语句除错；针对dswebapp的接口未完成
|
1 year ago |
|
dengyu
|
190d2eea91
|
全电红票的读取，改为不受“无流水号”的限制
|
1 year ago |
|
dengyu
|
deafea4cc2
|
Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev
|
1 year ago |
|
dengyu
|
f586ff471b
|
单一窗口，读取信息，商品信息防止重复；增加对dswmsapp的一些支持；
|
1 year ago |
|
hanxuntao
|
5b0aefc51b
|
1
|
1 year ago |
|
hanxuntao
|
627a89cb8d
|
1
|
1 year ago |
|
hanxuntao
|
6539c9037b
|
Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev
|
1 year ago |
|
hanxuntao
|
a6abc298f3
|
1
|
1 year ago |
|
dengyu
|
1dd87bbe54
|
Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev
|
1 year ago |
|
dengyu
|
397b1cfc55
|
综合业务的装货港卸货港改为依赖枚举类型83000，保存综合业务时，向这个表中添加数据(如果需要的话)
|
1 year ago |
|
hanxuntao
|
3e6b28fa85
|
1
|
1 year ago |
|
hanxuntao
|
de44236762
|
1
|
1 year ago |
|
hanxuntao
|
7220d1f2b6
|
1
|
1 year ago |
|
hanxuntao
|
aef908a12b
|
1
|
1 year ago |
|
hanxuntao
|
6a39663ff8
|
1
|
1 year ago |
|
hanxuntao
|
21b681e64b
|
1
|
1 year ago |
|
hanxuntao
|
98122f4d3f
|
12
|
1 year ago |
|
hanxuntao
|
b8bc3b137d
|
1
|
1 year ago |
|
hanxuntao
|
595d45f230
|
11
|
1 year ago |
|
hanxuntao
|
ba452e7d01
|
1
|
1 year ago |
|
hanxuntao
|
642abc6d68
|
Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev
|
1 year ago |
|
dengyu
|
3c2ab7853c
|
内贸空运防止修改，增加对主单内主单号选择按钮的控制
|
1 year ago |
|
dengyu
|
0a69eda5dc
|
feedrcrgrid已消除的错误
|
1 year ago |
|
ddlucky
|
4f5e05cb45
|
20230626
|
1 year ago |
|
ddlucky
|
98551247c0
|
针对dswms的app接口
|
1 year ago |
|
hanxuntao
|
6e43b394bd
|
1
|
1 year ago |
|
hanxuntao
|
16ca4c4559
|
1
|
1 year ago |
|
hanxuntao
|
421c544dfe
|
1
|
1 year ago |
|
hanxuntao
|
346eb78aa4
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
1 year ago |
|
hanxuntao
|
29f4d04616
|
1
|
1 year ago |
|
ddlucky
|
9d237e73aa
|
1
|
1 year ago |
|
ddlucky
|
6c87545aa7
|
增加对dswms的手机app当中财务审批部分的接口
|
1 year ago |
|
ddlucky
|
2492ae13e7
|
增加应对dswms的app当中财务审批功能的接口；
单一窗口读取后，增加刷新前端的文档
|
1 year ago |
|
hanxuntao
|
ec091f3048
|
1
|
1 year ago |
|
hanxuntao
|
04a9414f84
|
1
|
1 year ago |
|
hanxuntao
|
ab726b343d
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
1 year ago |
|
hanxuntao
|
20f8557de8
|
1
|
1 year ago |
|
ddlucky
|
4f9f0c1b79
|
调用固定费用时，修改税率后，计算一次发票金额和发票税额
|
1 year ago |
|
ddlucky
|
787711b597
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
1 year ago |
|
ddlucky
|
b48e641789
|
费用选择时，用客户的固定费用填充发票税率
|
1 year ago |
|
hanxuntao
|
f513acd9ab
|
1
|
1 year ago |
|
hanxuntao
|
0a987e5115
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
1 year ago |
|
ddlucky
|
2153dcb179
|
诺诺全电冲红，功能微调
|
1 year ago |
|
ddlucky
|
f7c6993af2
|
单一窗口商品明细，增加对“监管要求”的记录和显示；签单条业务明细表增加选择复制
|
1 year ago |
|
hanxuntao
|
1e42243021
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
1 year ago |
|
hanxuntao
|
f9df8a838a
|
1
|
1 year ago |
|
ddlucky
|
5120927697
|
全店冲红修改
|
1 year ago |
|
hanxuntao
|
6e712f5f25
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
1 year ago |
|
hanxuntao
|
16701baf25
|
1
|
1 year ago |
|
ddlucky
|
6eb6f26fac
|
20230614
|
1 year ago |
|
ddlucky
|
8a10c204eb
|
签单条业务修改；报关业务修改（金港 增加查验通知记录）；
|
1 year ago |
|
hanxuntao
|
93009361f1
|
1
|
1 year ago |
|
hanxuntao
|
72ccee3461
|
1
|
1 year ago |
|
hanxuntao
|
2c83c244ee
|
1
|
1 year ago |
|
hanxuntao
|
6b9d774da9
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
1 year ago |
|
hanxuntao
|
79a9b578a2
|
1
|
1 year ago |
|
ddlucky
|
1d8fd1dd37
|
展鸿船务：签单条业务微调；往来单位固定费用增加发票税率
|
1 year ago |
|
ddlucky
|
2f63fa9b35
|
展鸿船务签单条业务修改
|
1 year ago |
|
ddlucky
|
c6d712ab4b
|
1
|
1 year ago |
|
ddlucky
|
347b395d78
|
增加一个可通用的客户欠费查询小窗口；诺诺冲红对蓝票的重复点击冲红增加处理细节
|
1 year ago |
|
hanxuntao
|
309fb45515
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
1 year ago |
|
hanxuntao
|
0185e8ed32
|
1
|
1 year ago |
|
ddlucky
|
a02a7db2ef
|
诺诺全电
|
1 year ago |
|
ddlucky
|
ebe655e84a
|
发票接口信息增加分公司选项。
|
1 year ago |
|
ddlucky
|
bb3f81c7bd
|
全电发票冲红测完/业务信息发布，逻辑微调
|
1 year ago |
|
ddlucky
|
8b118143a8
|
1
|
1 year ago |
|
ddlucky
|
9f2ab594ee
|
读取单一窗口时，是否对应进口业务并写入，改为通过系统配置进行。
|
1 year ago |
|
hanxuntao
|
8afbc696e0
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
1 year ago |
|
hanxuntao
|
75e42a7945
|
1
|
1 year ago |
|
ddlucky
|
62b65b1fe7
|
1
|
2 years ago |
|
ddlucky
|
82616149d2
|
1
|
2 years ago |
|
ddlucky
|
9c6a5a3bee
|
1
|
2 years ago |
|
ddlucky
|
6445723d7b
|
诺诺全电冲红测试1
|
2 years ago |
|
hanxuntao
|
6dceea1927
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
2 years ago |
|
hanxuntao
|
faeb865ad9
|
dd
|
2 years ago |
|
ddlucky
|
f89ff171f6
|
诺诺开票访问地址改为使用https开头的地址
|
2 years ago |
|
ddlucky
|
f2f5476c1e
|
1
|
2 years ago |
|
ddlucky
|
1c71220d7e
|
诺诺全电冲红逻辑修改未测试
|
2 years ago |
|
ddlucky
|
891dd94e3d
|
单一窗口，保存时同步至海运进口业务，条件为：
如果在单一窗口点读取的时候，
存在一个海运进口业务的:
‘提单号不为空且与该单一窗口报关业务一致’
或‘报关单号不为空且与该单一窗口报关业务一致’
而且符合条件的业务只有一条
才做同步处理
|
2 years ago |
|
ddlucky
|
56f4017b6d
|
单一窗口读取后回写海运进口业务，原逻辑为报关单或提单号有一个一致即回写，实际当提单号同为空时产生了错误的回写
目前改为【只有海运进口业务的提单号和报关单号都不为空且都与报关业务相同时，才进行回写】
|
2 years ago |
|
hanxuntao
|
9e80a4cfde
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
2 years ago |
|
hanxuntao
|
1ed33e906e
|
1
|
2 years ago |
|
ddlucky
|
561f8a94db
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
2 years ago |
|
ddlucky
|
16fb1ff074
|
签单条业务查询允许二次签出；海运进口获取报关业务信息，如对应多个报关业务的话改为报错
|
2 years ago |
|
hanxuntao
|
0b976f73f1
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
2 years ago |
|
hanxuntao
|
0029b847c4
|
1
|
2 years ago |
|
ddlucky
|
7c99712b3a
|
增加对诺诺全电发票的支持。需配合升级脚本。未测试完成；原有的选择诺诺发票或者瑞宏发票的客户不受影响。
|
2 years ago |
|
ddlucky
|
927c343e7f
|
报关业务单一窗口，字段对应微调
|
2 years ago |
|
ddlucky
|
65a0ace4aa
|
虎鲸场站管理小程序 功能微调
|
2 years ago |