Commit Graph

487 Commits (d1abdb4f490048aaedd7d97a7f29106a5cdd7ee0)

Author SHA1 Message Date
hanxuntao e6747f3cdb 1 2 years ago
ddlucky 857325164f 荣圣达泛微接口调用微调;展鸿船务签单条,发出签单信息按钮,改为防止连续点击的形式 2 years ago
ddlucky 0f7dd8d75f 荣圣达泛微对接,增加月结功能,调试完成;鼎世旧仓储,仓储结算清单,对明细出库业务的支持,修改查询逻辑 2 years ago
ddlucky 7f4c742830 内贸空运生成费用改为调用后台生成费用方法 2 years ago
ddlucky cee9330eb7 消除两处多余的引用 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 39eabb093f 1 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 f1bb5de47a 明港东港,海运出口点场站查询页面,增加处理,去掉页面上最后一个多余的</div> 2 years ago
ddlucky b3b3b69d6a 签单条模块,查询界面签单条编号一旦输入长度大于等于10的文本,就执行查询一次,如查询结果个数为1,自动将其打开。这样可以配合扫码枪工作。 2 years ago
ddlucky ec258d4cb8 签单条模块,查询界面签单条编号一旦输入长度大于等于10的文本,就执行查询一次。这样可以配合扫码枪工作。 2 years ago
ddlucky 3d83e7bec5 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
ddlucky 5bdf9fed2b 增加公开接口模块。暂时无用 2 years ago
hanxuntao 141d069377 1 2 years ago
ddlucky 22562ef40f 展鸿船务用手写签字板修改完成 2 years ago
hanxuntao 23f0f7bd56 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
hanxuntao a8b78968df 1 2 years ago
ddlucky d46b179a4e 签单条功能完善 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 125b849a0b Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
ddlucky fc022a9f33 瑞京,内贸空运防止修改下方费用的部分,改为【如果业务的应收应付费用存在(录入状态 驳回提交)两状态之外的费用】则不允许修改。原逻辑是业务存在应收应付费用即不允许修改,这样当驳回费用之后修改运费后保存,下方费用保存后仍恢复成原来的。 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 a3fbbf133b 展鸿需求,发draft时邮件标题改为提单号esl号;而esl号和ep号的关系在接口那边并未维护,因此改为【发draft接口】增加参数esl_code,如不传则一切照旧,如传此参数则使用此内容作为邮件标题号 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 22df2bbd92 诚锐入库审批后,重量也进行合计 2 years ago
ddlucky 6014d60b04 通过综合接口直发VGM的提示逻辑,略微调整 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
hanxuntao 9c87cc6a29 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
ddlucky 9ce7dc549c 20230310-4 2 years ago
hanxuntao d1b2c3cb2a Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
ddlucky 29c2a3efb9 20230310-3 2 years ago
ddlucky 56ef6162cb ESL那三个功能完成了
1:通过写在主提单号格里面的SO号,获取ESL号,如能获取到,则将SO号写入申请放箱号,ESL号写入主提单号
2:通过写在主提单号里面的ESL号获取ETA并更新至预抵日期;
3:批量发送格式单到自己的邮箱;通过写在主提单号里面的ESL号获取EP号,并隐蔽记录;再根据此EP号和操作者自己个人信息的邮箱,触发目前已有的发送draft邮件接口,同时在海运出口的单据管理里面增加一条附件draft.pdf
2 years ago
hanxuntao c406456d3b Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
ddlucky f47a7ee9a2 20230310-2 2 years ago
hanxuntao 0abcd43ef8 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
ddlucky cef0f9a63a Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
hanxuntao 76246667c1 1 2 years ago
ddlucky 6acc85904f 诚锐钉钉审批,入库时增加回写重量字段 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 025bd2fd3a 上述问题2先取消不做限制,目前只在主单有chfee时限制费用信息和。 2 years ago
ddlucky af4b56571f 20230307瑞京内贸空运:1主单内的分单号改为不允许修改;2不论主单还是分单,费用锁定时不允许执行保存。 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 0e6b952182 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
ddlucky b9b42028f4 海运出口委托管理,引入场站数据,改为用重量+皮重填充参考重量和称重重量,并将称重方式默认为累加 2 years ago
hanxuntao 156d1941cb 1 2 years ago
hanxuntao cc168345d4 1 2 years ago
ddlucky af2071de06 直发VGM后台验证箱信息,对ESL和ONE放宽至,必须有提单号、箱型、箱号、毛重 2 years ago
ddlucky 43bab0b2b4 内贸空运,主单保存时查询旧数据的查询参数不对,改正 2 years ago
hanxuntao 20064bb0b7 1 2 years ago
hanxuntao 4ad8780a3a 1 2 years ago
hanxuntao a2ae301518 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
hanxuntao 317fcafa50 11 2 years ago
ddlucky 898cec9330 仓储和钉钉审批微调 2 years ago
hanxuntao dfae206f75 1 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 6789149b42 诚锐,出入库钉钉审批,改为通过入库明细gid和出库明细gid来对应数据。原有的按提单号箱号品名对应的方式存在问题,客户实际上是有这些字段均相同的出入库明细的。 2 years ago
ddlucky c06211b2b4 调整几个模块的本部门权限的写法 2 years ago
ddlucky 4af7716002 略微调整几个模块的本公司权限的写法 2 years ago
ddlucky 44170cf9bc 出库费用入账,参数略作修改;出库管理,store载入简化 2 years ago
ddlucky c071170cb2 1 2 years ago
ddlucky ac844ae117 1 2 years ago
ddlucky 0dee2a2575 Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev 2 years ago
ddlucky 278896a6ee 瑞京内贸空运;1如果主单有应收应付费用,则分单保存时不计算主单右下方的费用;2如果主单或分单保存时,该单有应收应付费用,则该单下方的费用信息保存时不会修改。 2 years ago
hanxuntao 5c3e1931fc 1 2 years ago
hanxuntao 9257d51a29 1 2 years ago
ddlucky ca36f7db28 荣圣达对接泛微OA:值在发送前用UrlEncode转义;文件名微调 2 years ago
ddlucky b2e49572d4 2 2 years ago
ddlucky cb8dfccb78 荣圣达泛微OA对接,运输类型改为取vopbs.bstype;附件文件名改为取中文File_OriginalName加文件名扩展名 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 a688bf1479 20230209-1 2 years ago
ddlucky cc2f9c54e3 诚锐钉钉审批入库,反写审批内容到入库明细之后,入库总量也相应重新计算反写。 2 years ago
ddlucky f5e5939177 删除意外导入的不相关内容 2 years ago
ddlucky ab046e1030 内贸空运,增加日志,分单生成主单时的燃油费生成。 2 years ago
ddlucky b100a5d9e4 佣金导入,如提单号未找到对应业务,则告警然后不导入;内贸空运主单的保存增加日志记录; 2 years ago
ddlucky 0264c3a7fb 新仓储去掉复制添加 2 years ago
ddlucky 2fdaf12500 20230207-2 2 years ago
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