 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
|
8a2f50c5f7
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
2 years ago |
|
hanxuntao
|
12cfcabc97
|
1
|
2 years ago |
|
ddlucky
|
1d9dc08487
|
工作流增加功能，但未做调用。（GetWorkFlowmb）用于按companyid获取工作流
|
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
|
5561796a55
|
1
|
2 years ago |
|
hanxuntao
|
c2abbeebbe
|
1
|
2 years ago |
|
ddlucky
|
628d9982f4
|
荣圣达泛微OA接口，增加对附件的发送
|
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
|
63e756e13d
|
20230128-1
|
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 |
|
ddlucky
|
dfa50ca935
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
2 years ago |
|
ddlucky
|
7dd6ca30cb
|
合规校验，货描传错了GOODSNAME，应为DESCRIPTION
|
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
|
74c969f886
|
荣圣达泛微OA对接，修改了一些字段的对应；申请人和付款对象改为根据对方提供的视图中的ID，对应关系依照user.showname和info_client.description
|
2 years ago |
|
ddlucky
|
38a8dd8717
|
荣圣达泛微OA对接，增加对oa返回错误的处理；发送时增加取部门id写道sqbm字段
|
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
|
4feeab87fa
|
诺诺开票逻辑回滚至原逻辑
|
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
|
8c3b6cf098
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
2 years ago |
|
hanxuntao
|
8998fbc262
|
1
|
2 years ago |
|
ddlucky
|
544e405828
|
荣圣达泛微OA审批对接完成
|
2 years ago |
|
hanxuntao
|
bea67ab9f4
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
2 years ago |
|
hanxuntao
|
c82b56cfdd
|
1
|
2 years ago |
|
ddlucky
|
2206329be2
|
webconfig中FanWeiOAAPI=true时付费申请审核不允许执行撤回操作
|
2 years ago |
|
ddlucky
|
1fb765dc50
|
荣圣达泛微OA对接，DS7部分回写泛微OA的流程ID至ch_fee_payapplication的PAYAPPID
|
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
|
3681c01ebc
|
20230103-4
|
2 years ago |
|
ddlucky
|
ec16624689
|
合规校验，船公司id改为通过edicode中的ediname=vgm的edicode值
|
2 years ago |
|
ddlucky
|
da89f8f894
|
20230103-3
|
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
|
43f7d8e2aa
|
海运出口业务合规判定；开始开发
|
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 |
|
hanxuntao
|
e3b2d4b0d9
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
2 years ago |
|
hanxuntao
|
16f65ee53b
|
1
|
2 years ago |
|
ddlucky
|
45749a8471
|
20221224
|
2 years ago |
|
dengyu
|
deffcebe81
|
20221222-1
|
2 years ago |
|
ddlucky
|
1961ef2ad7
|
'20221221-1'
|
2 years ago |
|
ddlucky
|
fcf82c652e
|
荣盛达泛微系统对接，未完成
|
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 |
|
ddlucky
|
2e0b8acaf3
|
付费申请增加的部分目前不影响正常业务
|
2 years ago |
|
dengyu
|
75b60efa46
|
付费申请编辑页的提交审核后台方法增加对荣圣达的泛微OA系统流程的支持，未完成
|
2 years ago |
|
ddlucky
|
65ae6d02ef
|
'20221209-1'
|
2 years ago |
|
hanxuntao
|
1c535646a4
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
2 years ago |
|
hanxuntao
|
d4b8a339b7
|
1
|
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
|
d47e01f0c8
|
收费申请的申请人改为仅insert，不可修改（防止丢收费申请申请人）
|
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
|
79f6038e72
|
1
|
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
|
df384f57df
|
'忽略不需要提交的文件'
|
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
|
aa5a97d4a9
|
1
|
2 years ago |
|
hanxuntao
|
b1e83ca4c4
|
1
|
2 years ago |
|
hanxuntao
|
63d1748792
|
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
|
476697ed8b
|
1
|
2 years ago |
|
hanxuntao
|
c0fe1b059b
|
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 |
|
hanxuntao
|
107b06b73c
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
2 years ago |
|
hanxuntao
|
b7bbf5d833
|
1
|
2 years ago |
|
ddlucky
|
23563040fc
|
内贸空运分单变更主单燃油费时 同时变更主单的杂费（otfee1-8之和）和总金额（杂费运费声明价值费和地面运费）
|
2 years ago |
|
hanxuntao
|
28ba1f7056
|
1
|
2 years ago |
|
hanxuntao
|
9b9690d872
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
2 years ago |
|
hanxuntao
|
7315ad6b7d
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
2 years ago |
|
ddlucky
|
778509809e
|
'20220909网上订舱业务生成时BOOKING.OP_SEAE_ORDER.ORDERNO防止重复'
|
2 years ago |
|
ddlucky
|
2999d1828a
|
增加对东胜接口发VGM的客户的【生成对大简云】的应付的业务逻辑。需要配合数据库版本7220906
|
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 |
|
hanxuntao
|
83a1ac73a9
|
1
|
2 years ago |
|
ddlucky
|
179f2d835f
|
'20220907网上订舱确认增加防止重复'
|
2 years ago |
|
hanxuntao
|
7088d6bfd5
|
1
|
2 years ago |
|
hanxuntao
|
5308f38e96
|
1
|
2 years ago |
|
hanxuntao
|
bccaf536f3
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
2 years ago |
|
hanxuntao
|
3525e55ec2
|
1
|
2 years ago |
|
ddlucky
|
d154d9a4c3
|
发票申请的申请单号增加可点击的复制单号按钮
|
2 years ago |
|
hanxuntao
|
1b94f59ec1
|
1
|
2 years ago |
|
hanxuntao
|
ed89d3ace7
|
1
|
2 years ago |
|
hanxuntao
|
9b516f3104
|
1
|
2 years ago |
|
hanxuntao
|
d21e63bc97
|
1
|
2 years ago |
|
hanxuntao
|
b51dc1d0c5
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
2 years ago |
|
hanxuntao
|
ca5f33e8b5
|
1
|
2 years ago |
|
ddlucky
|
862d39f343
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
2 years ago |
|
ddlucky
|
1db11f5546
|
'20220829直发舱单分单时也增加对大简云应付'
|
2 years ago |
|
hanxuntao
|
9ebda82302
|
1
|
2 years ago |
|
hanxuntao
|
6e3bdf33a2
|
箱管
|
2 years ago |
|
hanxuntao
|
7b8c377c69
|
r
|
2 years ago |
|
hanxuntao
|
cf2d4d1132
|
Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev
|
2 years ago |
|
hanxuntao
|
202fc0c534
|
箱管
|
2 years ago |
|
ddlucky
|
86a3ad7d52
|
从应收应付费用生成收费申请后清空收费申请下方的查询结果
|
2 years ago |
|
ddlucky
|
726752d29e
|
'消除几个列表的重复字段'
|
2 years ago |
|
hanxuntao
|
34a7776beb
|
0815
|
2 years ago |
|
hanxuntao
|
4ae5e8a67e
|
0815
|
2 years ago |
|
hanxuntao
|
746ac04dc7
|
1
|
2 years ago |
|
hanxuntao
|
a0fe16a9a2
|
1
|
2 years ago |
|
hanxuntao
|
2df63bd64a
|
1
|
2 years ago |
|
hanxuntao
|
b05239955e
|
1
|
2 years ago |
|
hanxuntao
|
f0ddf3cc81
|
2
|
2 years ago |
|
hanxuntao
|
834a9887c5
|
1
|
2 years ago |
|
hanxuntao
|
08756d4289
|
Merge branch 'dev' of http://123.234.225.158:13080/dengyu/DS7 into dev
|
2 years ago |
|
hanxuntao
|
0543aeeaab
|
1
|
2 years ago |
|
ddlucky
|
bcfad35e3c
|
'往来单位中上一客户下一客户改好'
|
2 years ago |
|
ddlucky
|
f10d9c163c
|
'DJY账号注册_未完成，暂时隐藏'
|
2 years ago |
|
ddlucky
|
b6a8571918
|
内贸空运 部分修改
|
2 years ago |
|
ddlucky
|
b449e631a9
|
Merge branch 'dev' of http://123.234.225.158:13080/dengyu/DS7 into dev
|
2 years ago |
|
ddlucky
|
e253ab5101
|
'去掉无用的上传图片'
|
2 years ago |
|
hanxuntao
|
c896e7c875
|
2
|
2 years ago |
|
ddlucky
|
544f65308c
|
'20220729编译后'
|
2 years ago |
|
ddlucky
|
3eb069907b
|
'内贸空运主单显示揽货人和客服'
|
2 years ago |
|
ddlucky
|
1c4cf0e6d1
|
'内贸空运主单显示揽货人和客服'
|
2 years ago |
|
hanxuntao
|
080b2cc383
|
1
|
2 years ago |
|
hanxuntao
|
55cef2da8c
|
q
|
2 years ago |
|
hanxuntao
|
d013f7c848
|
Merge branch 'dev' of http://123.234.225.158:13080/dengyu/DS7 into dev
# Conflicts:
# .gitignore
# BookingJieFeng/obj/Debug/BookingJieFeng.csproj.CoreCompileInputs.cache
# BookingJieFeng/obj/Release/BookingJieFeng.csproj.CoreCompileInputs.cache
# BookingJieFeng/obj/Release/BookingJieFeng.csprojAssemblyReference.cache
# BookingWeb/BookingWeb.csproj.user
# BookingWeb/obj/Debug/BookingWeb.csproj.CoreCompileInputs.cache
# BookingWeb/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
# BookingWeb/obj/Release/BookingWeb.csproj.CoreCompileInputs.cache
# BookingWeb/obj/Release/BookingWeb.csprojAssemblyReference.cache
# D7MqClient/D7MqClient/obj/Debug/D7MqClient.csproj.CoreCompileInputs.cache
# D7MqClient/D7MqClient/obj/Debug/D7MqClient.csprojAssemblyReference.cache
# D7MqClient/D7MqClient/obj/Release/D7MqClient.csproj.CoreCompileInputs.cache
# D7MqClient/D7MqClient/obj/Release/D7MqClient.csprojAssemblyReference.cache
# DSWeb.Common/bin/Debug/DSWeb.Common.dll
# DSWeb.Common/bin/Debug/DSWeb.Common.pdb
# DSWeb.Common/bin/Release/DSWeb.Common.dll
# DSWeb.Common/bin/Release/DSWeb.Common.pdb
# DSWeb.Common/obj/Debug/DSWeb.Common.csproj.CoreCompileInputs.cache
# DSWeb.Common/obj/Debug/DSWeb.Common.csproj.FileListAbsolute.txt
# DSWeb.Common/obj/Debug/DSWeb.Common.dll
# DSWeb.Common/obj/Debug/DSWeb.Common.pdb
# DSWeb.Interface/bin/Debug/DSWeb.Common.dll
# DSWeb.Interface/bin/Debug/DSWeb.Common.pdb
# DSWeb.Interface/bin/Debug/DSWeb.Interface.dll
# DSWeb.Interface/bin/Debug/DSWeb.Interface.pdb
# DSWeb.Interface/bin/Debug/HcDBUtility.dll
# DSWeb.Interface/bin/Debug/HcDBUtility.pdb
# DSWeb.Interface/bin/Release/DSWeb.Common.dll
# DSWeb.Interface/bin/Release/DSWeb.Common.pdb
# DSWeb.Interface/bin/Release/HcDBUtility.dll
# DSWeb.Interface/bin/Release/HcDBUtility.pdb
# DSWeb.Interface/obj/Debug/DSWeb.Interface.csproj.CoreCompileInputs.cache
# DSWeb.Interface/obj/Debug/DSWeb.Interface.csproj.FileListAbsolute.txt
# DSWeb.Interface/obj/Debug/DSWeb.Interface.csprojAssemblyReference.cache
# DSWeb.Interface/obj/Debug/DSWeb.Interface.dll
# DSWeb.Interface/obj/Debug/DSWeb.Interface.pdb
# DSWeb/UploadFiles/SysUser_Sign/1BEC90E1-9780-472F-90C2-0C6390C044A4.jpg
# DSWeb/Web.config
# DSWeb/bin/DSWeb.Common.dll
# DSWeb/bin/DSWeb.Common.pdb
# DSWeb/bin/DSWeb.Interface.dll
# DSWeb/bin/DSWeb.Interface.pdb
# DSWeb/bin/DSWeb.XmlSerializers.dll
# DSWeb/bin/DSWeb.dll
# DSWeb/bin/DSWeb.dll.config
# DSWeb/bin/DSWeb.pdb
# DSWeb/bin/DSWebComponent.dll
# DSWeb/bin/DSWebComponent.pdb
# DSWeb/bin/FrmHttpHelper.dll
# DSWeb/bin/FrmHttpHelper.pdb
# DSWeb/bin/HcDBUtility.dll
# DSWeb/bin/HcDBUtility.pdb
# DSWeb/bin/JsonHelper.dll
# DSWeb/bin/JsonHelper.pdb
# DSWeb/bin/OfficeHelper.dll
# DSWeb/bin/OfficeHelper.pdb
# DSWeb/bin/SocialExplorer.FastDBF.dll
# DSWeb/bin/SocialExplorer.FastDBF.pdb
# DSWeb/bin/WebSqlHelper.dll
# DSWeb/bin/WebSqlHelper.pdb
# DispatchWeb/obj/Debug/DispatchWeb.csproj.CoreCompileInputs.cache
# DispatchWeb/obj/Release/DispatchWeb.csproj.CoreCompileInputs.cache
# DispatchWeb/obj/Release/DispatchWeb.csprojAssemblyReference.cache
# HcDBUtility/bin/Debug/HcDBUtility.dll
# HcDBUtility/bin/Debug/HcDBUtility.pdb
# HcDBUtility/bin/Release/HcDBUtility.dll
# HcDBUtility/bin/Release/HcDBUtility.pdb
# JobAutoCreateFee/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
# JobAutoCreateFee/obj/Debug/JobAutoCreateFee.csproj.CoreCompileInputs.cache
# JobAutoCreateFee/obj/Release/JobAutoCreateFee.csproj.CoreCompileInputs.cache
# JobAutoCreateFee/obj/Release/JobAutoCreateFee.csprojAssemblyReference.cache
# JobPingTaiWork/obj/Debug/JobPingTaiWork.csproj.CoreCompileInputs.cache
# JobPingTaiWork/obj/Release/JobPingTaiWork.csproj.CoreCompileInputs.cache
# JobReqWebData/obj/Debug/JobReqWebData.csproj.CoreCompileInputs.cache
# JobReqWebData/obj/Release/JobReqWebData.csproj.CoreCompileInputs.cache
# JobReqWebData/obj/Release/JobReqWebData.csprojAssemblyReference.cache
# JobScheduler/JobScheduler.csproj
# JobScheduler/obj/Debug/JobScheduler.csproj.CoreCompileInputs.cache
# JobScheduler/obj/Release/JobScheduler.csproj.CoreCompileInputs.cache
# JobSendAgentMail/obj/Debug/JobSendAgentMail.csproj.CoreCompileInputs.cache
# JobYunDang/obj/Debug/JobYunDang.csproj.CoreCompileInputs.cache
# JobYunDang/obj/Release/JobYunDang.csproj.CoreCompileInputs.cache
# JobYunDang/obj/Release/JobYunDang.csprojAssemblyReference.cache
# Job_BoschEdi_FTP/obj/Debug/Job_BoschEdi_FTP.csproj.CoreCompileInputs.cache
# Job_BoschEdi_FTP/obj/Release/Job_BoschEdi_FTP.csprojAssemblyReference.cache
# Job_DSWMS_REPORT/obj/Debug/Job_DSWMS_REPORT.csproj.CoreCompileInputs.cache
# Job_JieFeng_FTP/obj/Debug/Job_JieFeng_FTP.csproj.CoreCompileInputs.cache
# Job_JieFeng_FTP/obj/Release/Job_JieFeng_FTP.csproj.CoreCompileInputs.cache
# Job_JieFeng_FTP/obj/Release/Job_JieFeng_FTP.csprojAssemblyReference.cache
# JsonHelper/obj/Debug/JsonHelper.csproj.CoreCompileInputs.cache
# JsonHelper/obj/Release/JsonHelper.csproj.CoreCompileInputs.cache
# OfficeHelper/obj/Debug/OfficeHelper.csproj.CoreCompileInputs.cache
# OfficeHelper/obj/Release/OfficeHelper.csproj.CoreCompileInputs.cache
# WebSqlHelper/obj/Debug/WebSqlHelper.csproj.CoreCompileInputs.cache
# WebSqlHelper/obj/Release/WebSqlHelper.csproj.CoreCompileInputs.cache
|
2 years ago |
|
hanxuntao
|
75f72d1ffb
|
'hxt20220726'
|
2 years ago |
|
hanxuntao
|
077b95db40
|
2
|
2 years ago |
|
ddlucky
|
72416046be
|
'个人设置中大简云账号注册改了一半'
|
2 years ago |
|
hanxuntao
|
d634a95779
|
ss
|
2 years ago |
|
hanxuntao
|
16a97d6174
|
0721
|
2 years ago |
|
ddlucky
|
fd1b76a758
|
'bc解析修改初步完成'
|
2 years ago |
|
ddlucky
|
53a8df8fb5
|
'temp'
|
2 years ago |
|
ddlucky
|
72148ff2df
|
''
|
2 years ago |
|
hanxuntao
|
749f067ccc
|
A
|
2 years ago |
|
ddlucky
|
0cedf20ee1
|
'几处js中的合计数由使用加号改为使用add'
|
2 years ago |
|
ddlucky
|
7c3182f0b0
|
'20220711'
|
2 years ago |
|
ddlucky
|
166500de26
|
''
|
2 years ago |
|
ddlucky
|
3cb9ed7992
|
''
|
2 years ago |
|
hanxuntao
|
658e6ce3b2
|
2022-7-1
|
2 years ago |
|
ddlucky
|
14e6227ce6
|
'自动生成舱单费，分单功能'
|
2 years ago |
|
ddlucky
|
4b7ab86c1a
|
'海运出口-直发舱单，发送成功后产生应收应付费用'
|
2 years ago |
|
ddlucky
|
8021ab750e
|
'可以在vs2022用x64编译'
|
2 years ago |
|
hanxuntao
|
b52e179fbd
|
11
|
2 years ago |
|
ddlucky
|
a51c24da13
|
'first'
|
2 years ago |