Commit Graph

553 Commits

Author SHA1 Message Date
f58d6f4dd4 1.修改计算应回款倒计时错误 2024-11-07 20:00:51 +08:00
ljw
914f140829 fix:
2.客户信保额度申请调度计划执行
2024-11-07 17:48:33 +08:00
ljw
0b5d21b5da fix:
2.客户信保额度申请调度计划执行
2024-11-07 17:48:30 +08:00
ljw
62fa9393cf fix:
2.客户信保额度申请调度计划执行
2024-11-07 17:48:21 +08:00
ljw
08cf97957c fix:
2.订舱通知单物流订舱完成按钮效验
2024-11-07 17:48:17 +08:00
ljw
2a6198f8c1 fix:
2.客户信保额度申请调度计划执行
2024-11-07 17:48:09 +08:00
ljw
d0f1d35c04 fix:
2.外销合同变更单删除行效验
2024-11-07 17:48:06 +08:00
ljw
f85526f6e5 fix:
2.外销合同变更单删除行效验
2024-11-07 15:14:38 +08:00
ljw
ce129ac8e0 fix:
1.订舱通知单分录变更
2024-11-06 21:25:07 +08:00
ljw
fed2764e22 fix:
1.外销合同【实际整车单价向上取整】
2024-11-06 21:24:52 +08:00
ljw
4227fdc87d fix:
1.外销合同【销售单价价格条款向上取整】
2024-11-06 21:24:47 +08:00
ljw
8cc5b85032 fix:
2.外销合同报错处理
3.订舱通知单日期增加一天
2024-11-06 21:24:14 +08:00
ljw
39feb3744a fix:
1.订舱通知单变更效验
2024-11-06 21:23:26 +08:00
ljw
9583baeda0 fix:
1.外销合同,整机行单价取整
2024-11-06 21:22:23 +08:00
ljw
b3c5304596 fix:
1.订舱通知单提单日期回填
2024-11-06 21:22:18 +08:00
ljw
192ab9d251 fix:
1.订舱通知物流  根据运输方式判断必录
2024-11-06 21:22:16 +08:00
ljw
49f5cb17cf fix:
1.收款单修改认领金额更新
2024-11-06 21:22:09 +08:00
ljw
1c8ea3464e fix:
1.收款单修改认领金额更新
2024-11-06 21:22:01 +08:00
ljw
6d8536d823 fix:
1.收款单修改认领金额更新

(cherry picked from commit 97004d94bb)
2024-11-06 21:21:58 +08:00
ljw
e383cc7904 fix:
1.收款单修改认领金额更新
2024-11-06 21:21:52 +08:00
ljw
070a323c28 fix:
1.订舱通知变更单删除效验取消
2024-11-06 09:17:24 +08:00
ljw
5c8660bba1 fix:
1.订舱通知单信保回填更新客户信保额度申请
2024-11-05 19:03:26 +08:00
ljw
a98ad5ae17 fix:
1.订舱通知单提交效验迁移
2024-11-05 19:02:08 +08:00
ljw
23ee31b715 fix:
1.外销合同报错处理
2024-11-05 16:09:51 +08:00
ljw
dc527ca1a0 fix:
1.订舱通知单提单日期回填报错处理
2024-11-05 10:49:57 +08:00
ljw
dc779ed717 fix:
1.订舱通知单提单日期回填报错处理
2024-11-05 10:49:45 +08:00
ljw
2caaf2c850 fix:
1.单价四舍五入保留两位小数
2024-11-04 21:14:51 +08:00
ljw
3031c43db3 fix:
1.单价四舍五入保留两位小数
2024-11-04 21:14:41 +08:00
ljw
9608a4293b fix:
1.单价四舍五入
2024-11-04 21:14:37 +08:00
ljw
8a91fb11b9 fix:
1.单价四舍五入
2024-11-04 21:14:27 +08:00
ljw
48b6e7985c fix:
1.外销合同港口赋值
2024-11-04 21:14:22 +08:00
ljw
0d9a1f772d fix:
1.发运明细变更单删除行效验
2024-11-04 21:14:14 +08:00
ljw
132a88326c fix:
1.外销合同港口赋值
2024-11-04 21:14:09 +08:00
ljw
e7e1def3d2 fix:
1.装箱单锁定重量是否确认为空效验
2024-11-04 21:14:00 +08:00
ljw
cdb01c64e5 fix:
1.订舱通知单删除行效验
2.装箱单锁定重量是否确认为空效验
2024-11-04 21:13:55 +08:00
ljw
6a5b99fdaa fix:
1.订舱通知单信保回填赋值
2024-11-04 21:13:46 +08:00
ljw
82c15962ab fix:
1.外销合同填写港口给起运港英文名称赋值
2024-11-04 21:13:38 +08:00
ljw
ff648d4dbd fix:
1.装箱单锁定重量是否确认为空逻辑修改
2024-11-04 21:13:34 +08:00
ljw
54e88cbae3 fix:
1.外销合同填写港口给起运港英文名称赋值

(cherry picked from commit 7a82912901)
2024-11-04 21:13:26 +08:00
ljw
7a82912901 fix:
1.外销合同填写港口给起运港英文名称赋值
2024-11-04 11:50:14 +08:00
ljw
f6dd4c5f11 fix:
1.合同英文名称
2024-11-04 09:43:07 +08:00
ljw
774e7226a4 fix:
1.收款单修改认领金额更新
2024-11-01 20:37:48 +08:00
ljw
97004d94bb fix:
1.收款单修改认领金额更新
2024-11-01 17:02:56 +08:00
ljw
6cee3a4d7f fix:
1.收款单修改认领金额更新
2024-11-01 16:21:08 +08:00
ljw
ce36ea9758 fix:
1.装箱单效验
2.发运明细审核效验
2024-10-31 21:37:22 +08:00
21316e6fe9 Merge remote-tracking branch 'origin/main' 2024-10-31 20:04:10 +08:00
8246928024 1.修改同步云之家拼接json中存在空行数据问题 2024-10-31 20:03:26 +08:00
ljw
2e3cd377af fix:
1.发运明细单保存生成储运汇总
2024-10-30 19:05:04 +08:00
ljw
60aa3d46cc fix:
1.内审预算单上传附件
2024-10-30 18:40:34 +08:00
ljw
1986782dc4 fix:
1.发运明细单保存生成储运汇总
2.内审预算单上传附件
2024-10-30 18:26:03 +08:00
ljw
46050525c3 fix:
1.删除订单产品需求单业务类型
2024-10-29 19:35:00 +08:00
0befcddf00 1.修改询价单审核缺失字段属性 2024-10-29 18:03:48 +08:00
ljw
0ce59ea7cd fix:
1.外销合同销售FOB单价金额计算
2024-10-28 20:17:32 +08:00
ljw
60981f994d fix:
1.订单产品需求单整机外购计划财务组织和库存组织默认锐科,业务类型默认普通采购
2024-10-28 17:43:33 +08:00
ljw
5e53a39e68 fix:
1.内审预算单上传合同附件
2024-10-28 16:25:00 +08:00
ljw
96a8138473 fix:
1.外销合同起运港英文名称赋值
2024-10-28 11:26:53 +08:00
b5edfd40e4 1.修改分录价格条款不更新任何数据 2024-10-26 23:03:36 +08:00
46a4c39cdd 1.修改方数不计算港杂费 2024-10-26 19:59:10 +08:00
c6f7d5dd48 1.内审预算单附件 2024-10-26 19:40:58 +08:00
ljw
f7377c1479 fix:内审预算单附件回填 2024-10-26 19:36:06 +08:00
f71b5c2161 1.修改合同计算港杂费、内陆运输费
2.携带方数、吨数
2024-10-26 19:30:20 +08:00
bd1b8d819d fix:补充折扣率计算 2024-10-26 17:20:28 +08:00
c40404a5e5 Merge remote-tracking branch 'origin/dev-comp-price'
# Conflicts:
#	src/main/java/com/yem/wm/es/salesorder/from/SalesOrderZJEdit.java
#	src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java
2024-10-26 17:16:56 +08:00
ljw
8101851d4c fix:
1.外销合同折扣率计算
2.订舱通知单报关分类携带海关编码和申报要素
2024-10-25 20:26:00 +08:00
ljw
626648ecb3 fix:正式去除二开功能 2024-10-25 19:26:48 +08:00
ljw
b3565bf466 fix:测试 2024-10-25 19:17:45 +08:00
ljw
23c20be0ff fix:外销合同折扣后金额计算 2024-10-25 18:37:13 +08:00
ljw
f6cd6e5a71 Revert "wip:获取标准价:FOB与FCA费用差额标配FOB(青岛)价"
This reverts commit 5a2d7eda
2024-10-25 18:32:50 +08:00
ljw
c29d56d03e Revert "wip(version1011):整机价格"
This reverts commit 6a25bf15fa.
2024-10-25 18:22:31 +08:00
zzs
6a25bf15fa wip(version1011):整机价格 2024-10-25 18:21:09 +08:00
ljw
0f861016cd fix:外销合同赠送配件生成 2024-10-25 15:53:12 +08:00
ljw
c51617528e fix:外购 2024-10-25 15:21:37 +08:00
de76f20e4d 1.修改变更单生效清空回签人 2024-10-24 19:45:14 +08:00
43f8bf6ab2 1.修改变更单生效 不清空回签人相关信息 2024-10-24 19:45:08 +08:00
da0d9ffe64 1.修改合同权杖附件数 生效不携带源单 2024-10-24 19:44:25 +08:00
09e1a145b2 1.去除查询CMMP资源号前后空格 2024-10-24 18:49:14 +08:00
93910c070e Merge remote-tracking branch 'origin/main' 2024-10-23 22:01:39 +08:00
2497ae8bba 修改查询配置表条件 2024-10-23 22:00:33 +08:00
ljw
b04e72e1e1 fix:外销合同是否赠品为否的赠品分录 2024-10-23 21:34:04 +08:00
ljw
dc7eafc2c4 fix:外销合同是否赠品为否的赠品分录 2024-10-23 19:55:09 +08:00
ljw
538cc3b339 fix:订舱通知单是否信保合同功能完善 2024-10-23 19:53:47 +08:00
ljw
ccb1638193 fix:订舱通知单是否信保合同功能完善 2024-10-23 11:19:45 +08:00
ljw
c6ea61153a fix:订舱通知单是否信保合同功能完善 2024-10-23 10:57:32 +08:00
ljw
9a9819dffb fix:
信保合同生成订舱通知单时,应收款金额(本位币)默认等于信保本位币金额;
2024-10-22 22:56:48 +08:00
ljw
a5217da705 fix:变更单的折扣金额 不需要触发值更新 2024-10-22 22:53:04 +08:00
ljw
839e6308b7 fix:变更单的折扣金额 不需要触发值更新 2024-10-22 22:29:12 +08:00
ljw
881b8073eb fix:铭牌数量不允许低于本次非赠品行的整机数量 2024-10-22 22:27:07 +08:00
ljw
0dd35751e9 fix:外销合同变更单(配件)的折扣金额 不需要触发值更新 2024-10-22 22:27:03 +08:00
81552e6128 1.修改合同删行汇总表头金额不正确问题 2024-10-22 21:39:48 +08:00
df3ea5f0b5 修改价格库接口 2024-10-22 19:58:27 +08:00
48f1b71429 1.EAS调用Cosmic价格库表头分录增加作废状态 2024-10-22 19:58:10 +08:00
52ceebd089 增加获取云之家状态,撤销失败显示原因 2024-10-22 19:53:46 +08:00
ljw
7e12e7e7c8 fix:外销合同赠送配件分录条件设置 2024-10-22 11:54:15 +08:00
ljw
1f86c71340 fix:订舱通知单提交反写客户信保额度申请 2024-10-21 23:06:45 +08:00
ljw
1194acecf0 fix:订舱通知单提交反写客户信保额度申请 2024-10-21 22:54:36 +08:00
ljw
0134038149 fix:订舱通知单提交反写客户信保额度申请 2024-10-21 22:54:22 +08:00
ljw
2ecd5c47d1 fix:订舱通知单提交反写客户信保额度申请 2024-10-21 22:54:16 +08:00
ljw
011ec4db02 fix:订舱通知单提交反写客户信保额度申请 2024-10-21 22:54:01 +08:00
ljw
897722cf0f fix:订舱通知单提交反写客户信保额度申请 2024-10-21 22:53:43 +08:00
ljw
f162efc6a3 fix:订舱通知单审核反写客户信保额度申请 2024-10-21 22:53:28 +08:00