hanxuntao
|
b4d420d7c2
|
1
|
2 years ago |
hanxuntao
|
a36dee13f3
|
1
|
2 years ago |
hanxuntao
|
a26fcd9ebf
|
1
|
2 years ago |
hanxuntao
|
482f15e817
|
1
|
2 years ago |
hanxuntao
|
43fb5ea25b
|
1
|
2 years ago |
hanxuntao
|
4992b38cdf
|
1
|
2 years ago |
hanxuntao
|
f99ed39a1f
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
2 years ago |
hanxuntao
|
a8cf2cc266
|
1
|
2 years ago |
ddlucky
|
5eb3ea3bdb
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
2 years ago |
ddlucky
|
9a5eaec679
|
报关业务相关 微调
|
2 years ago |
hanxuntao
|
16674a31f8
|
1
|
2 years ago |
hanxuntao
|
5e96c606cd
|
1
|
2 years ago |
ddlucky
|
b6d94b3cae
|
仓储结算清单调整,主要解决如下问题:仓储结算清单的删除为标记删除,但判断现有业务的逻辑没有按标记删除记录。修改后新增仓储结算清单,或删除时,对已有业务的判断应已正常。
|
2 years ago |
hanxuntao
|
e6747f3cdb
|
1
|
2 years ago |
ddlucky
|
857325164f
|
荣圣达泛微接口调用微调;展鸿船务签单条,发出签单信息按钮,改为防止连续点击的形式
|
2 years ago |
ddlucky
|
7f4c742830
|
内贸空运生成费用改为调用后台生成费用方法
|
2 years ago |
ddlucky
|
8e30d14f20
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
2 years ago |
ddlucky
|
a0800b629e
|
newtonsoft.dll统一升级至13.0.3;
|
2 years ago |
hanxuntao
|
6d8d23a9d6
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
2 years ago |
hanxuntao
|
dd76fb4716
|
1
|
2 years ago |
ddlucky
|
e4c2a7c569
|
展鸿船务用,签单条模块的邮件发送改为使用传统的smtpclient方式
|
2 years ago |
ddlucky
|
b3b3b69d6a
|
签单条模块,查询界面签单条编号一旦输入长度大于等于10的文本,就执行查询一次,如查询结果个数为1,自动将其打开。这样可以配合扫码枪工作。
|
2 years ago |
ddlucky
|
ec258d4cb8
|
签单条模块,查询界面签单条编号一旦输入长度大于等于10的文本,就执行查询一次。这样可以配合扫码枪工作。
|
2 years ago |
hanxuntao
|
141d069377
|
1
|
2 years ago |
hanxuntao
|
a8b78968df
|
1
|
2 years ago |
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
|
2db9cf2b14
|
济南虎鲸,旧仓储,出库明细增加显示入库明细中的生产日期
|
2 years ago |
ddlucky
|
217b1d1672
|
良通捷运的明细仓储部分,查询修改为通用分页方式;
|
2 years ago |
ddlucky
|
007910c8af
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
2 years ago |
ddlucky
|
b57b6259d1
|
20230313-略微改进提单信息页面的新建和复制新建逻辑
|
2 years ago |
hanxuntao
|
754fa7e7d2
|
1
|
2 years ago |
ddlucky
|
56ef6162cb
|
ESL那三个功能完成了
1:通过写在主提单号格里面的SO号,获取ESL号,如能获取到,则将SO号写入申请放箱号,ESL号写入主提单号
2:通过写在主提单号里面的ESL号获取ETA并更新至预抵日期;
3:批量发送格式单到自己的邮箱;通过写在主提单号里面的ESL号获取EP号,并隐蔽记录;再根据此EP号和操作者自己个人信息的邮箱,触发目前已有的发送draft邮件接口,同时在海运出口的单据管理里面增加一条附件draft.pdf
|
2 years ago |
ddlucky
|
f47a7ee9a2
|
20230310-2
|
2 years ago |
hanxuntao
|
e058d0321a
|
1
|
2 years ago |
ddlucky
|
af4b56571f
|
20230307瑞京内贸空运:1主单内的分单号改为不允许修改;2不论主单还是分单,费用锁定时不允许执行保存。
|
2 years ago |
ddlucky
|
6754eb5d4f
|
ESL相关功能。未完成,先做对瑞京内贸空运的功能修改
|
2 years ago |
ddlucky
|
751453df1e
|
海运出口,业务列表,增加【推送费用至港联顺接口】的功能
|
2 years ago |
ddlucky
|
0e6b952182
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
2 years ago |
ddlucky
|
b9b42028f4
|
海运出口委托管理,引入场站数据,改为用重量+皮重填充参考重量和称重重量,并将称重方式默认为累加
|
2 years ago |
hanxuntao
|
cc168345d4
|
1
|
2 years ago |
hanxuntao
|
20064bb0b7
|
1
|
2 years ago |
hanxuntao
|
4ad8780a3a
|
1
|
2 years ago |
hanxuntao
|
959fe906de
|
1
|
2 years ago |
hanxuntao
|
13fd390fba
|
1
|
2 years ago |
ddlucky
|
44170cf9bc
|
出库费用入账,参数略作修改;出库管理,store载入简化
|
2 years ago |
hanxuntao
|
9257d51a29
|
1
|
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
|
b100a5d9e4
|
佣金导入,如提单号未找到对应业务,则告警然后不导入;内贸空运主单的保存增加日志记录;
|
2 years ago |
ddlucky
|
0264c3a7fb
|
新仓储去掉复制添加
|
2 years ago |
ddlucky
|
2fdaf12500
|
20230207-2
|
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
|
ead2707c07
|
grid单元格可垂直居中
|
2 years ago |
ddlucky
|
ae64419adb
|
合规校验:每行前方的图片水平居中
|
2 years ago |
ddlucky
|
fe168e3196
|
DS7合规校验内容的显示样式稍作修改;诚锐出库流程变动
|
2 years ago |
ddlucky
|
be33cabfc1
|
旧仓储,出库,钉钉审批。如果已提交则在出库业务列表的【钉钉审批】列显示“已提交钉钉”
|
2 years ago |
ddlucky
|
314f83cf68
|
旧仓储出库的钉钉审核部分,如果设为钉钉审核,则点击费用入账后提交钉钉,钉钉审核后实际执行费用入账。
|
2 years ago |
ddlucky
|
4420e0790c
|
模块允许复制
|
2 years ago |
hanxuntao
|
e0f1dd75bf
|
1
|
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 |
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
|
9eb25d6395
|
诺诺开票接口变更,初步完成待测试;ds7仓储入库费用入账加钉钉审核,未完成;
|
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
|
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
|
5f144a4ae9
|
vgm接口直发增加对接口支持的船公司范围的支持
|
2 years ago |
hanxuntao
|
e1ef1d090f
|
1
|
2 years ago |
ddlucky
|
35d720eef3
|
对大简云的信息对接:读取状态的消息队列已完成,目前使用测试地址;发送VGM未完成;对接合规接口未完成。20221227
|
2 years ago |
hanxuntao
|
611fdfe0e3
|
1
|
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 |
hanxuntao
|
6f9099858c
|
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
|
8186222919
|
1
|
2 years ago |
hanxuntao
|
893a44a56f
|
1
|
2 years ago |
hanxuntao
|
e55fc05c41
|
1
|
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
|
6cedf7dd31
|
1
|
2 years ago |
hanxuntao
|
8c0d5375a5
|
1
|
2 years ago |
hanxuntao
|
6626a76cf6
|
1
|
2 years ago |
hanxuntao
|
b7bbf5d833
|
1
|
2 years ago |
hanxuntao
|
28ba1f7056
|
1
|
2 years ago |
hanxuntao
|
3de3d1c480
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
2 years ago |
hanxuntao
|
d86993e3e2
|
1
|
2 years ago |
ddlucky
|
179f2d835f
|
'20220907网上订舱确认增加防止重复'
|
2 years ago |
hanxuntao
|
3525e55ec2
|
1
|
2 years ago |
hanxuntao
|
ed89d3ace7
|
1
|
2 years ago |
hanxuntao
|
d21e63bc97
|
1
|
2 years ago |
hanxuntao
|
cf2d4d1132
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
2 years ago |