Commit Graph

671 Commits

Author SHA1 Message Date
ljw
ae5989f8fb fix:
1.订舱通知单提交效验迁移
2024-11-05 16:58:51 +08:00
ljw
f90fff0199 fix:
1.外销合同报错处理
2024-11-05 14:30:39 +08:00
ljw
2996f9d6f6 fix:
1.订舱通知单提单日期回填报错处理

(cherry picked from commit dc527ca1a0)
2024-11-05 11:00:26 +08:00
ljw
9ee3459aad fix:
1.订舱通知单提单日期回填报错处理

(cherry picked from commit dc779ed717)
2024-11-05 11:00:21 +08:00
ljw
cad34ebca4 fix:
1.单价四舍五入保留两位小数
2024-11-04 21:03:36 +08:00
582c32cbd8 Merge remote-tracking branch 'origin/test' into test 2024-11-04 20:23:23 +08:00
25dab22e26 Merge remote-tracking branch 'origin/test' into test 2024-11-04 20:22:53 +08:00
ljw
1aba97a804 fix:
1.单价四舍五入保留两位小数
2024-11-04 20:22:35 +08:00
4f0b5bfed9 1.修改发运明细审核生成汇总信息 2024-11-04 20:17:00 +08:00
ljw
0ac2f0532f fix:
1.单价四舍五入
2024-11-04 20:07:12 +08:00
ljw
c46c136239 fix:
1.单价四舍五入
2024-11-04 20:05:36 +08:00
ljw
c281592241 fix:
1.外销合同港口赋值
2024-11-04 19:59:18 +08:00
ljw
4a57b0f90a fix:
1.发运明细变更单删除行效验
2024-11-04 19:57:28 +08:00
ljw
00c31c5890 fix:
1.外销合同港口赋值
2024-11-04 19:44:42 +08:00
ljw
4ae8998b94 fix:
1.装箱单锁定重量是否确认为空效验
2024-11-04 19:16:14 +08:00
ljw
fa5bdfae1c fix:
1.订舱通知单删除行效验
2.装箱单锁定重量是否确认为空效验
2024-11-04 19:02:38 +08:00
ljw
b1ed979906 fix:
1.订舱通知单信保回填赋值
2024-11-04 18:22:09 +08:00
ljw
7b782dd435 fix:
1.外销合同填写港口给起运港英文名称赋值
2024-11-04 18:13:11 +08:00
ljw
8d35981743 fix:
1.装箱单锁定重量是否确认为空逻辑修改
2024-11-04 16:58:00 +08:00
2c5b8105aa Merge remote-tracking branch 'origin/test' into test 2024-11-04 14:58:28 +08:00
b3ce35b484 1.修改发运明细审核生成汇总信息 2024-11-04 14:58:01 +08:00
ljw
325cdc315b fix:
1.外销合同填写港口给起运港英文名称赋值

(cherry picked from commit 7a82912901)
2024-11-04 14:31:29 +08:00
ljw
8e5ad493f5 fix:
1.合同英文名称
2024-11-01 20:36:56 +08:00
ljw
6911427d0a fix:
1.收款单修改认领金额更新
2024-11-01 20:28:53 +08:00
ljw
f087aea531 fix:
1.收款单修改认领金额更新
2024-11-01 17:41:18 +08:00
ljw
762ecf3414 fix:
1.收款单修改认领金额更新

(cherry picked from commit 97004d94bb)
2024-11-01 17:03:21 +08:00
ljw
c1907a51e1 fix:
1.收款单修改认领金额更新
2024-11-01 16:20:10 +08:00
ljw
a7236d8feb fix:
1.外销合同合同回签
2024-11-01 11:11:33 +08:00
ljw
870e5512d8 fix:
1.装箱单效验
2.发运明细审核效验
2024-10-31 21:30:44 +08:00
ljw
5d09ac27c6 fix:
1.装箱单效验
2.发运明细审核效验
2024-10-31 21:25:42 +08:00
ljw
9f4522a0d5 Merge remote-tracking branch 'orinin/test' into test 2024-10-31 20:48:32 +08:00
ljw
39fa056aa4 fix:
1.装箱单效验
2.发运明细审核效验
2024-10-31 20:48:07 +08:00
3e92771397 Merge remote-tracking branch 'origin/test' into test 2024-10-31 20:06:36 +08:00
963efc52d0 1.修改同步云之家拼接json中存在空行数据问题 2024-10-31 20:06:08 +08:00
ljw
67fec9f726 fix:
1.收款单认领查询回款金额
2024-10-31 20:05:38 +08:00
ljw
a5fcb2d853 fix:
1.收款单认领查询回款金额
2.发运明细审核效验
2024-10-31 18:37:29 +08:00
ljw
329239927a fix:
1.发运明细单保存生成储运汇总
2024-10-30 19:00:25 +08:00
ljw
735f1345d9 fix:
1.内审预算单上传附件

(cherry picked from commit 60aa3d46cc)
2024-10-30 18:41:03 +08:00
ljw
0396aab3e5 fix:
1.发运明细单保存生成储运汇总
2.内审预算单上传附件

(cherry picked from commit 1986782dc4)
2024-10-30 18:26:49 +08:00
ljw
8969e35ee9 fix:
1.删除订单产品需求单业务类型
2024-10-29 18:54:08 +08:00
de3ad95380 Merge remote-tracking branch 'origin/test' into test 2024-10-29 18:00:00 +08:00
bd491adc69 1.修改询价单审核缺失字段属性 2024-10-29 17:59:29 +08:00
ljw
a19f1e43ac fix:
1.订单产品需求单整机外购计划财务组织和库存组织默认锐科,业务类型默认普通采购
2024-10-29 16:28:00 +08:00
ljw
c836e4f7ba fix:
1.外销合同删除国贸经理签批附件
2024-10-29 15:56:01 +08:00
ljw
6e8255715c fix:
1.框架合同反审核删除国贸经理签批附件
2024-10-29 15:20:25 +08:00
ljw
7c1f573ad6 fix:
1.外销合同赠送配件分录赋值
2024-10-29 11:46:41 +08:00
ljw
314d9b51bc fix:
1.外销合同起运港英文名称赋值
2024-10-28 19:31:53 +08:00
ljw
3c27d895e3 fix:
1.订单产品需求单整机外购计划财务组织和库存组织默认锐科,业务类型默认普通采购
2024-10-28 17:44:14 +08:00
ljw
d62d767f6e fix:
1.内审预算单上传合同附件
2024-10-28 15:15:12 +08:00
ljw
49acc4eee8 fix:
1.外销合同销售FOB单价金额计算
2024-10-28 14:52:19 +08:00
ljw
89c6723d26 fix:
1.外销合同起运港英文名称赋值
2024-10-28 11:25:44 +08:00
f888460175 1.修改分录价格条款不更新任何数据 2024-10-26 23:26:42 +08:00
ljw
8dc4b0db77 fix:
1.外销合同折扣率计算
2.订舱通知单报关分类携带海关编码和申报要素

(cherry picked from commit 8101851d4c)
2024-10-25 20:42:34 +08:00
ljw
613e7ebe78 fix:外销合同赠送配件生成
(cherry picked from commit 0f861016cd)
2024-10-25 20:42:27 +08:00
ljw
cd515f67d3 fix:外购
(cherry picked from commit c51617528e)
2024-10-25 20:42:24 +08:00
26a0a5a9b2 1.修改合同权杖附件数 生效不携带源单 2024-10-24 19:14:16 +08:00
daf729a12c 1.去除查询CMMP资源号前后空格 2024-10-24 18:44:10 +08:00
0b029535ea 1.修改变更单生效清空回签人 2024-10-24 16:11:20 +08:00
ljw
5bae043614 fix:外销合同是否赠品为否的赠品分录 2024-10-23 20:28:09 +08:00
8bc9e649f3 Merge remote-tracking branch 'origin/test' into test 2024-10-23 20:07:59 +08:00
d7856ccef9 1.修改变更单生效 不清空回签人相关信息 2024-10-23 20:07:47 +08:00
ljw
0444812e3a fix:外销合同是否赠品为否的赠品分录
(cherry picked from commit dc7eafc2c4)
2024-10-23 19:56:05 +08:00
ljw
d9ef332698 fix:订舱通知单是否信保合同功能完善 2024-10-23 11:14:56 +08:00
ljw
84b4d935fe fix:订舱通知单是否信保合同功能完善 2024-10-23 10:53:00 +08:00
ljw
0324937d60 fix:变更单的折扣金额 不需要触发值更新 2024-10-22 22:50:26 +08:00
751c6fbe97 1.修改合同删行汇总表头金额不正确问题 2024-10-22 21:38:28 +08:00
ljw
f73fc7b404 fix:变更单的折扣金额 不需要触发值更新 2024-10-22 20:54:47 +08:00
ljw
d66e10f2a0 fix:铭牌数量不允许低于本次非赠品行的整机数量 2024-10-22 19:02:15 +08:00
ljw
16413251d0 fix:外销合同赠送配件分录条件设置
(cherry picked from commit 7e12e7e7c8)
2024-10-22 19:00:39 +08:00
9dbba5e2af Merge remote-tracking branch 'origin/test' into test 2024-10-22 17:55:12 +08:00
fe8e17ada8 修改价格库接口 2024-10-22 17:54:55 +08:00
ljw
a378f0238b fix:外销合同变更单(配件)的折扣金额 不需要触发值更新 2024-10-22 17:08:24 +08:00
d825633af3 增加获取云之家状态,撤销失败显示原因 2024-10-22 16:40:19 +08:00
073126d9b8 Merge remote-tracking branch 'origin/test' into test 2024-10-22 14:14:45 +08:00
527f22c029 1.EAS调用Cosmic价格库表头分录增加作废状态 2024-10-22 14:14:26 +08:00
ljw
20417cb4fa fix:订舱通知单提交反写客户信保额度申请
(cherry picked from commit 1f86c71340)
2024-10-21 23:12:40 +08:00
ljw
7ebba9d98b fix:订舱通知单提交反写客户信保额度申请 2024-10-21 22:46:06 +08:00
ljw
db3a3eac41 fix:订舱通知单提交反写客户信保额度申请 2024-10-21 22:23:26 +08:00
ljw
0ce7c9102a fix:订舱通知单提交反写客户信保额度申请 2024-10-21 21:26:20 +08:00
ljw
b90525eaa7 fix:订舱通知单提交反写客户信保额度申请 2024-10-21 19:59:48 +08:00
ljw
fefb9a0d1a fix:订舱通知单提交反写客户信保额度申请 2024-10-21 19:57:07 +08:00
ljw
fe675f250f fix:订舱通知单审核反写客户信保额度申请 2024-10-21 19:42:26 +08:00
e435d4442f 1.增加合同提交是校验【合同提交附件】中的word是否包含ensign标签 2024-10-21 16:09:52 +08:00
ljw
fabfdf41f6 fix:框架合同反审核清空
(cherry picked from commit 8e1fdec8d3)
2024-10-19 17:58:08 +08:00
ljw
9f1ecfc5c1 fix:合同签章 2024-10-19 16:48:28 +08:00
ljw
8e4ab9ea29 fix:合同签章 2024-10-19 16:45:14 +08:00
ljw
cef522fbd2 fix:收款单财务确认 2024-10-19 15:45:27 +08:00
ljw
114feb4ef7 fix:收款单财务确认
(cherry picked from commit fbf6338866)
2024-10-19 15:40:59 +08:00
ljw
0a6cfa8091 fix:合同签章 2024-10-19 14:59:07 +08:00
ljw
7ad4258cf6 fix:合同签章 2024-10-19 14:55:22 +08:00
ljw
e3828c8e3a fix:收款单财务确认 2024-10-19 14:14:11 +08:00
ljw
8791d3ad5f fix:收款单问题处理 2024-10-18 21:12:04 +08:00
ljw
fb7b088d1c fix:价格库配件问题调整 2024-10-18 19:46:30 +08:00
ljw
9a00961183 fix:二开公共类 2024-10-18 18:27:08 +08:00
ljw
9b987aa882 fix:
云之家获取逻辑修改
2024-10-18 16:54:29 +08:00
ljw
eca195901d fix:
-整机编号校验时,在原判断逻辑增加条件:是否赠品为否;
2024-10-18 10:39:02 +08:00
ljw
4c6bf5aa90 fix:
信保合同生成订舱通知单时,应收款金额(本位币)默认等于信保本位币金额;
2024-10-18 10:23:46 +08:00
ljw
f70896224b fix:
外销合同变更单审核生成资金池
2024-10-16 19:49:22 +08:00
ljw
56bf193ea9 fix:
外销合同变更单审核生成资金池
2024-10-16 18:59:01 +08:00
ljw
e9f0827d16 fix:
外销合同变更单审核生成资金池
2024-10-16 18:49:14 +08:00