|
|
ee18edfb02
|
fix:
发运明细变更单:
1、变更后，出运汇总页签重复。每次保存都是重复生成，删行时没有控制；
2、商品明细删行报错，数量减少时，系统有提示，但是可以修改成功；
3、商品明细新增的行，没有更新到出运汇总页签
|
2024-11-11 21:26:35 +08:00 |
|
|
|
00123c56ca
|
fix:
1.整机档案查询报错
|
2024-11-11 18:39:37 +08:00 |
|
|
|
53414d26b2
|
fix:
1.整机档案查询报错
|
2024-11-11 18:37:08 +08:00 |
|
|
|
3f1d7e2cd6
|
fix:
1.收款单修改认领保存改变计算逻辑
(cherry picked from commit 39b2a4a81c)
|
2024-11-11 17:01:06 +08:00 |
|
|
|
39b2a4a81c
|
fix:
1.收款单修改认领保存改变计算逻辑
|
2024-11-11 17:00:27 +08:00 |
|
|
|
595983c907
|
fix:
1.外销合同提交效验
(cherry picked from commit 547bf40721)
|
2024-11-11 16:12:49 +08:00 |
|
|
|
5afb148064
|
fix:
1.外销合同提交效验
(cherry picked from commit a5bafa64d9)
|
2024-11-11 16:12:46 +08:00 |
|
|
|
547bf40721
|
fix:
1.外销合同提交效验
|
2024-11-11 16:12:10 +08:00 |
|
|
|
a5bafa64d9
|
fix:
1.外销合同提交效验
|
2024-11-11 16:11:49 +08:00 |
|
|
|
2251109306
|
fix:
1.发运明细变更单保存生成出运明细
|
2024-11-11 15:10:07 +08:00 |
|
|
|
48c1b4252b
|
fix:
1.报关合并
|
2024-11-11 15:10:03 +08:00 |
|
|
|
7e0a3a6190
|
fix:
1.报关合并
|
2024-11-11 14:44:30 +08:00 |
|
|
|
7964860624
|
fix:
1.发运明细变更单保存生成出运明细
|
2024-11-11 10:03:55 +08:00 |
|
|
|
02efc0db6d
|
1.取消日期计算差判断
|
2024-11-11 09:30:06 +08:00 |
|
|
|
41634c7726
|
fix:
1.订舱通知单物流效验
|
2024-11-08 22:44:26 +08:00 |
|
|
|
59cef79f81
|
fix:
1.订舱通知单物流效验
|
2024-11-08 22:44:02 +08:00 |
|
|
|
7ff37285e7
|
fix:
1.订舱通知单物流
|
2024-11-08 22:36:16 +08:00 |
|
|
|
69d8000cf5
|
fix:
1.订舱通知单物流
|
2024-11-08 22:35:42 +08:00 |
|
|
|
6c1d90e759
|
fix:
1.订舱通知单物流
|
2024-11-08 22:29:14 +08:00 |
|
|
|
082e094637
|
fix:
1.订舱通知单物流
|
2024-11-08 22:10:18 +08:00 |
|
|
|
b945d10f26
|
fix:
1.外销合同点击审核报错
(cherry picked from commit dbdcff7c5e)
|
2024-11-08 17:41:12 +08:00 |
|
|
|
480a0388a8
|
fix:
1.发运明细变更单随机资料页签删除效验
|
2024-11-08 17:40:49 +08:00 |
|
|
|
0cb2a82eab
|
fix:
1.发运明细变更单效验
|
2024-11-08 11:36:35 +08:00 |
|
|
|
118f2f9277
|
fix:
1.外销合同删除国贸经理签批附件
|
2024-11-08 11:24:04 +08:00 |
|
|
|
dbdcff7c5e
|
fix:
1.外销合同点击审核报错
|
2024-11-08 11:02:20 +08:00 |
|
|
|
f58d6f4dd4
|
1.修改计算应回款倒计时错误
|
2024-11-07 20:00:51 +08:00 |
|
|
|
cf2d63b1ff
|
1.修改计算应回款倒计时
|
2024-11-07 19:58:19 +08:00 |
|
|
|
914f140829
|
fix:
2.客户信保额度申请调度计划执行
|
2024-11-07 17:48:33 +08:00 |
|
|
|
0b5d21b5da
|
fix:
2.客户信保额度申请调度计划执行
|
2024-11-07 17:48:30 +08:00 |
|
|
|
62fa9393cf
|
fix:
2.客户信保额度申请调度计划执行
|
2024-11-07 17:48:21 +08:00 |
|
|
|
08cf97957c
|
fix:
2.订舱通知单物流订舱完成按钮效验
|
2024-11-07 17:48:17 +08:00 |
|
|
|
2a6198f8c1
|
fix:
2.客户信保额度申请调度计划执行
|
2024-11-07 17:48:09 +08:00 |
|
|
|
d0f1d35c04
|
fix:
2.外销合同变更单删除行效验
|
2024-11-07 17:48:06 +08:00 |
|
|
|
5adcd90936
|
fix:
2.客户信保额度申请调度计划执行
|
2024-11-07 17:40:16 +08:00 |
|
|
|
a98faa8843
|
fix:
2.客户信保额度申请调度计划执行
|
2024-11-07 17:29:28 +08:00 |
|
|
|
bad891dfe5
|
fix:
2.客户信保额度申请调度计划执行
|
2024-11-07 17:28:28 +08:00 |
|
|
|
21831959cc
|
fix:
2.订舱通知单物流订舱完成按钮效验
|
2024-11-07 17:10:31 +08:00 |
|
|
|
c07857d288
|
fix:
2.客户信保额度申请调度计划执行
|
2024-11-07 16:42:42 +08:00 |
|
|
|
01d4c4b3e4
|
fix:
2.外销合同变更单删除行效验
|
2024-11-07 16:42:07 +08:00 |
|
|
|
f85526f6e5
|
fix:
2.外销合同变更单删除行效验
|
2024-11-07 15:14:38 +08:00 |
|
|
|
ce129ac8e0
|
fix:
1.订舱通知单分录变更
|
2024-11-06 21:25:07 +08:00 |
|
|
|
fed2764e22
|
fix:
1.外销合同【实际整车单价向上取整】
|
2024-11-06 21:24:52 +08:00 |
|
|
|
4227fdc87d
|
fix:
1.外销合同【销售单价价格条款向上取整】
|
2024-11-06 21:24:47 +08:00 |
|
|
|
8cc5b85032
|
fix:
2.外销合同报错处理
3.订舱通知单日期增加一天
|
2024-11-06 21:24:14 +08:00 |
|
|
|
39feb3744a
|
fix:
1.订舱通知单变更效验
|
2024-11-06 21:23:26 +08:00 |
|
|
|
9583baeda0
|
fix:
1.外销合同，整机行单价取整
|
2024-11-06 21:22:23 +08:00 |
|
|
|
b3c5304596
|
fix:
1.订舱通知单提单日期回填
|
2024-11-06 21:22:18 +08:00 |
|
|
|
192ab9d251
|
fix:
1.订舱通知物流 根据运输方式判断必录
|
2024-11-06 21:22:16 +08:00 |
|
|
|
49f5cb17cf
|
fix:
1.收款单修改认领金额更新
|
2024-11-06 21:22:09 +08:00 |
|
|
|
1c8ea3464e
|
fix:
1.收款单修改认领金额更新
|
2024-11-06 21:22:01 +08:00 |
|
|
|
6d8536d823
|
fix:
1.收款单修改认领金额更新
(cherry picked from commit 97004d94bb)
|
2024-11-06 21:21:58 +08:00 |
|
|
|
e383cc7904
|
fix:
1.收款单修改认领金额更新
|
2024-11-06 21:21:52 +08:00 |
|
|
|
8f8c8b3f68
|
fix:
1.外销合同【实际整车单价向上取整】
|
2024-11-06 20:37:08 +08:00 |
|
|
|
1684b553df
|
fix:
1.外销合同【销售单价价格条款向上取整】
|
2024-11-06 20:19:12 +08:00 |
|
|
|
fc94cf15aa
|
fix:
1.发运明细变更单调用按钮【整机编码效验】
|
2024-11-06 20:15:46 +08:00 |
|
|
|
e4b046f5b4
|
fix:
1.订舱通知单分录变更增删行
|
2024-11-06 20:07:18 +08:00 |
|
|
|
76e8c9d5e7
|
fix:
1.订舱通知单分录变更
|
2024-11-06 19:37:31 +08:00 |
|
|
|
b5a9b3d4b1
|
fix:
1.发运明细变更单增行复制
2.外销合同报错处理
3.订舱通知单日期增加一天
|
2024-11-06 18:33:47 +08:00 |
|
|
|
87d825e0f5
|
fix:
1.发运明细变更单增行复制
|
2024-11-06 18:01:23 +08:00 |
|
|
|
2701fa9f02
|
fix:
1.订舱通知单变更效验
|
2024-11-06 17:47:56 +08:00 |
|
|
|
4715899dc5
|
fix:
1.外销合同，整机行单价取整
|
2024-11-06 17:40:02 +08:00 |
|
|
|
32070bce44
|
fix:
1.订舱通知单提单日期回填
|
2024-11-06 17:13:20 +08:00 |
|
|
|
9084c2a543
|
fix:
1.订舱通知物流 根据运输方式判断必录
|
2024-11-06 11:18:23 +08:00 |
|
|
|
36d3d73250
|
fix:
1.订舱通知变更单删除效验取消
(cherry picked from commit 070a323c28)
|
2024-11-06 09:18:09 +08:00 |
|
|
|
070a323c28
|
fix:
1.订舱通知变更单删除效验取消
|
2024-11-06 09:17:24 +08:00 |
|
|
|
5c8660bba1
|
fix:
1.订舱通知单信保回填更新客户信保额度申请
|
2024-11-05 19:03:26 +08:00 |
|
|
|
a98ad5ae17
|
fix:
1.订舱通知单提交效验迁移
|
2024-11-05 19:02:08 +08:00 |
|
|
|
71092fbc70
|
fix:
1.订舱通知单信保回填更新客户信保额度申请
|
2024-11-05 17:20:36 +08:00 |
|
|
|
ae5989f8fb
|
fix:
1.订舱通知单提交效验迁移
|
2024-11-05 16:58:51 +08:00 |
|
|
|
23ee31b715
|
fix:
1.外销合同报错处理
|
2024-11-05 16:09:51 +08:00 |
|
|
|
f90fff0199
|
fix:
1.外销合同报错处理
|
2024-11-05 14:30:39 +08:00 |
|
|
|
2996f9d6f6
|
fix:
1.订舱通知单提单日期回填报错处理
(cherry picked from commit dc527ca1a0)
|
2024-11-05 11:00:26 +08:00 |
|
|
|
9ee3459aad
|
fix:
1.订舱通知单提单日期回填报错处理
(cherry picked from commit dc779ed717)
|
2024-11-05 11:00:21 +08:00 |
|
|
|
dc527ca1a0
|
fix:
1.订舱通知单提单日期回填报错处理
|
2024-11-05 10:49:57 +08:00 |
|
|
|
dc779ed717
|
fix:
1.订舱通知单提单日期回填报错处理
|
2024-11-05 10:49:45 +08:00 |
|
|
|
2caaf2c850
|
fix:
1.单价四舍五入保留两位小数
|
2024-11-04 21:14:51 +08:00 |
|
|
|
3031c43db3
|
fix:
1.单价四舍五入保留两位小数
|
2024-11-04 21:14:41 +08:00 |
|
|
|
9608a4293b
|
fix:
1.单价四舍五入
|
2024-11-04 21:14:37 +08:00 |
|
|
|
8a91fb11b9
|
fix:
1.单价四舍五入
|
2024-11-04 21:14:27 +08:00 |
|
|
|
48b6e7985c
|
fix:
1.外销合同港口赋值
|
2024-11-04 21:14:22 +08:00 |
|
|
|
0d9a1f772d
|
fix:
1.发运明细变更单删除行效验
|
2024-11-04 21:14:14 +08:00 |
|
|
|
132a88326c
|
fix:
1.外销合同港口赋值
|
2024-11-04 21:14:09 +08:00 |
|
|
|
e7e1def3d2
|
fix:
1.装箱单锁定重量是否确认为空效验
|
2024-11-04 21:14:00 +08:00 |
|
|
|
cdb01c64e5
|
fix:
1.订舱通知单删除行效验
2.装箱单锁定重量是否确认为空效验
|
2024-11-04 21:13:55 +08:00 |
|
|
|
6a5b99fdaa
|
fix:
1.订舱通知单信保回填赋值
|
2024-11-04 21:13:46 +08:00 |
|
|
|
82c15962ab
|
fix:
1.外销合同填写港口给起运港英文名称赋值
|
2024-11-04 21:13:38 +08:00 |
|
|
|
ff648d4dbd
|
fix:
1.装箱单锁定重量是否确认为空逻辑修改
|
2024-11-04 21:13:34 +08:00 |
|
|
|
54e88cbae3
|
fix:
1.外销合同填写港口给起运港英文名称赋值
(cherry picked from commit 7a82912901)
|
2024-11-04 21:13:26 +08:00 |
|
|
|
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 |
|
|
|
1aba97a804
|
fix:
1.单价四舍五入保留两位小数
|
2024-11-04 20:22:35 +08:00 |
|
|
|
4f0b5bfed9
|
1.修改发运明细审核生成汇总信息
|
2024-11-04 20:17:00 +08:00 |
|
|
|
0ac2f0532f
|
fix:
1.单价四舍五入
|
2024-11-04 20:07:12 +08:00 |
|
|
|
c46c136239
|
fix:
1.单价四舍五入
|
2024-11-04 20:05:36 +08:00 |
|
|
|
c281592241
|
fix:
1.外销合同港口赋值
|
2024-11-04 19:59:18 +08:00 |
|
|
|
4a57b0f90a
|
fix:
1.发运明细变更单删除行效验
|
2024-11-04 19:57:28 +08:00 |
|
|
|
00c31c5890
|
fix:
1.外销合同港口赋值
|
2024-11-04 19:44:42 +08:00 |
|
|
|
4ae8998b94
|
fix:
1.装箱单锁定重量是否确认为空效验
|
2024-11-04 19:16:14 +08:00 |
|
|
|
fa5bdfae1c
|
fix:
1.订舱通知单删除行效验
2.装箱单锁定重量是否确认为空效验
|
2024-11-04 19:02:38 +08:00 |
|
|
|
b1ed979906
|
fix:
1.订舱通知单信保回填赋值
|
2024-11-04 18:22:09 +08:00 |
|
|
|
7b782dd435
|
fix:
1.外销合同填写港口给起运港英文名称赋值
|
2024-11-04 18:13:11 +08:00 |
|
|
|
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 |
|
|
|
325cdc315b
|
fix:
1.外销合同填写港口给起运港英文名称赋值
(cherry picked from commit 7a82912901)
|
2024-11-04 14:31:29 +08:00 |
|
|
|
7a82912901
|
fix:
1.外销合同填写港口给起运港英文名称赋值
|
2024-11-04 11:50:14 +08:00 |
|
|
|
f6dd4c5f11
|
fix:
1.合同英文名称
|
2024-11-04 09:43:07 +08:00 |
|
|
|
774e7226a4
|
fix:
1.收款单修改认领金额更新
|
2024-11-01 20:37:48 +08:00 |
|
|
|
8e5ad493f5
|
fix:
1.合同英文名称
|
2024-11-01 20:36:56 +08:00 |
|
|
|
6911427d0a
|
fix:
1.收款单修改认领金额更新
|
2024-11-01 20:28:53 +08:00 |
|
|
|
f087aea531
|
fix:
1.收款单修改认领金额更新
|
2024-11-01 17:41:18 +08:00 |
|
|
|
762ecf3414
|
fix:
1.收款单修改认领金额更新
(cherry picked from commit 97004d94bb)
|
2024-11-01 17:03:21 +08:00 |
|
|
|
97004d94bb
|
fix:
1.收款单修改认领金额更新
|
2024-11-01 17:02:56 +08:00 |
|
|
|
6cee3a4d7f
|
fix:
1.收款单修改认领金额更新
|
2024-11-01 16:21:08 +08:00 |
|
|
|
c1907a51e1
|
fix:
1.收款单修改认领金额更新
|
2024-11-01 16:20:10 +08:00 |
|
|
|
a7236d8feb
|
fix:
1.外销合同合同回签
|
2024-11-01 11:11:33 +08:00 |
|
|
|
ce36ea9758
|
fix:
1.装箱单效验
2.发运明细审核效验
|
2024-10-31 21:37:22 +08:00 |
|
|
|
870e5512d8
|
fix:
1.装箱单效验
2.发运明细审核效验
|
2024-10-31 21:30:44 +08:00 |
|
|
|
5d09ac27c6
|
fix:
1.装箱单效验
2.发运明细审核效验
|
2024-10-31 21:25:42 +08:00 |
|
|
|
9f4522a0d5
|
Merge remote-tracking branch 'orinin/test' into test
|
2024-10-31 20:48:32 +08:00 |
|
|
|
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 |
|
|
|
67fec9f726
|
fix:
1.收款单认领查询回款金额
|
2024-10-31 20:05:38 +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 |
|
|
|
a5fcb2d853
|
fix:
1.收款单认领查询回款金额
2.发运明细审核效验
|
2024-10-31 18:37:29 +08:00 |
|
|
|
2e3cd377af
|
fix:
1.发运明细单保存生成储运汇总
|
2024-10-30 19:05:04 +08:00 |
|
|
|
329239927a
|
fix:
1.发运明细单保存生成储运汇总
|
2024-10-30 19:00:25 +08:00 |
|
|
|
735f1345d9
|
fix:
1.内审预算单上传附件
(cherry picked from commit 60aa3d46cc)
|
2024-10-30 18:41:03 +08:00 |
|
|
|
60aa3d46cc
|
fix:
1.内审预算单上传附件
|
2024-10-30 18:40:34 +08:00 |
|
|
|
0396aab3e5
|
fix:
1.发运明细单保存生成储运汇总
2.内审预算单上传附件
(cherry picked from commit 1986782dc4)
|
2024-10-30 18:26:49 +08:00 |
|
|
|
1986782dc4
|
fix:
1.发运明细单保存生成储运汇总
2.内审预算单上传附件
|
2024-10-30 18:26:03 +08:00 |
|
|
|
46050525c3
|
fix:
1.删除订单产品需求单业务类型
|
2024-10-29 19:35:00 +08:00 |
|
|
|
8969e35ee9
|
fix:
1.删除订单产品需求单业务类型
|
2024-10-29 18:54:08 +08:00 |
|
|
|
0befcddf00
|
1.修改询价单审核缺失字段属性
|
2024-10-29 18:03:48 +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 |
|
|
|
a19f1e43ac
|
fix:
1.订单产品需求单整机外购计划财务组织和库存组织默认锐科，业务类型默认普通采购
|
2024-10-29 16:28:00 +08:00 |
|
|
|
c836e4f7ba
|
fix:
1.外销合同删除国贸经理签批附件
|
2024-10-29 15:56:01 +08:00 |
|
|
|
6e8255715c
|
fix:
1.框架合同反审核删除国贸经理签批附件
|
2024-10-29 15:20:25 +08:00 |
|
|
|
7c1f573ad6
|
fix:
1.外销合同赠送配件分录赋值
|
2024-10-29 11:46:41 +08:00 |
|
|
|
0ce59ea7cd
|
fix:
1.外销合同销售FOB单价金额计算
|
2024-10-28 20:17:32 +08:00 |
|
|
|
314d9b51bc
|
fix:
1.外销合同起运港英文名称赋值
|
2024-10-28 19:31:53 +08:00 |
|
|
|
3c27d895e3
|
fix:
1.订单产品需求单整机外购计划财务组织和库存组织默认锐科，业务类型默认普通采购
|
2024-10-28 17:44:14 +08:00 |
|
|
|
60981f994d
|
fix:
1.订单产品需求单整机外购计划财务组织和库存组织默认锐科，业务类型默认普通采购
|
2024-10-28 17:43:33 +08:00 |
|
|
|
5e53a39e68
|
fix:
1.内审预算单上传合同附件
|
2024-10-28 16:25:00 +08:00 |
|
|
|
d62d767f6e
|
fix:
1.内审预算单上传合同附件
|
2024-10-28 15:15:12 +08:00 |
|
|
|
49acc4eee8
|
fix:
1.外销合同销售FOB单价金额计算
|
2024-10-28 14:52:19 +08:00 |
|
|
|
96a8138473
|
fix:
1.外销合同起运港英文名称赋值
|
2024-10-28 11:26:53 +08:00 |
|
|
|
89c6723d26
|
fix:
1.外销合同起运港英文名称赋值
|
2024-10-28 11:25:44 +08:00 |
|
|
|
f888460175
|
1.修改分录价格条款不更新任何数据
|
2024-10-26 23:26:42 +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 |
|
|
|
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 |
|
|
|
8dc4b0db77
|
fix:
1.外销合同折扣率计算
2.订舱通知单报关分类携带海关编码和申报要素
(cherry picked from commit 8101851d4c)
|
2024-10-25 20:42:34 +08:00 |
|
|
|
613e7ebe78
|
fix:外销合同赠送配件生成
(cherry picked from commit 0f861016cd)
|
2024-10-25 20:42:27 +08:00 |
|
|
|
cd515f67d3
|
fix:外购
(cherry picked from commit c51617528e)
|
2024-10-25 20:42:24 +08:00 |
|
|
|
8101851d4c
|
fix:
1.外销合同折扣率计算
2.订舱通知单报关分类携带海关编码和申报要素
|
2024-10-25 20:26:00 +08:00 |
|
|
|
626648ecb3
|
fix:正式去除二开功能
|
2024-10-25 19:26:48 +08:00 |
|
|
|
b3565bf466
|
fix:测试
|
2024-10-25 19:17:45 +08:00 |
|
|
|
23c20be0ff
|
fix:外销合同折扣后金额计算
|
2024-10-25 18:37:13 +08:00 |
|
|
|
f6cd6e5a71
|
Revert "wip:获取标准价：FOB与FCA费用差额标配FOB（青岛）价"
This reverts commit 5a2d7eda
|
2024-10-25 18:32:50 +08:00 |
|
|
|
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 |
|
|
|
0f861016cd
|
fix:外销合同赠送配件生成
|
2024-10-25 15:53:12 +08:00 |
|
|
|
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 |
|
|
|
26a0a5a9b2
|
1.修改合同权杖附件数 生效不携带源单
|
2024-10-24 19:14:16 +08:00 |
|
|
|
09e1a145b2
|
1.去除查询CMMP资源号前后空格
|
2024-10-24 18:49:14 +08:00 |
|
|
|
daf729a12c
|
1.去除查询CMMP资源号前后空格
|
2024-10-24 18:44:10 +08:00 |
|
|
|
0b029535ea
|
1.修改变更单生效清空回签人
|
2024-10-24 16:11:20 +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 |
|
|
|
b04e72e1e1
|
fix:外销合同是否赠品为否的赠品分录
|
2024-10-23 21:34:04 +08:00 |
|
|
|
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 |
|
|
|
0444812e3a
|
fix:外销合同是否赠品为否的赠品分录
(cherry picked from commit dc7eafc2c4)
|
2024-10-23 19:56:05 +08:00 |
|
|
|
dc7eafc2c4
|
fix:外销合同是否赠品为否的赠品分录
|
2024-10-23 19:55:09 +08:00 |
|
|
|
538cc3b339
|
fix:订舱通知单是否信保合同功能完善
|
2024-10-23 19:53:47 +08:00 |
|
|
|
ccb1638193
|
fix:订舱通知单是否信保合同功能完善
|
2024-10-23 11:19:45 +08:00 |
|
|
|
d9ef332698
|
fix:订舱通知单是否信保合同功能完善
|
2024-10-23 11:14:56 +08:00 |
|
|
|
c6ea61153a
|
fix:订舱通知单是否信保合同功能完善
|
2024-10-23 10:57:32 +08:00 |
|
|
|
84b4d935fe
|
fix:订舱通知单是否信保合同功能完善
|
2024-10-23 10:53:00 +08:00 |
|
|
|
9a9819dffb
|
fix:
信保合同生成订舱通知单时，应收款金额（本位币）默认等于信保本位币金额；
|
2024-10-22 22:56:48 +08:00 |
|
|
|
a5217da705
|
fix:变更单的折扣金额 不需要触发值更新
|
2024-10-22 22:53:04 +08:00 |
|
|
|
0324937d60
|
fix:变更单的折扣金额 不需要触发值更新
|
2024-10-22 22:50:26 +08:00 |
|
|
|
839e6308b7
|
fix:变更单的折扣金额 不需要触发值更新
|
2024-10-22 22:29:12 +08:00 |
|
|
|
881b8073eb
|
fix:铭牌数量不允许低于本次非赠品行的整机数量
|
2024-10-22 22:27:07 +08:00 |
|
|
|
0dd35751e9
|
fix:外销合同变更单（配件）的折扣金额 不需要触发值更新
|
2024-10-22 22:27:03 +08:00 |
|
|
|
81552e6128
|
1.修改合同删行汇总表头金额不正确问题
|
2024-10-22 21:39:48 +08:00 |
|
|
|
751c6fbe97
|
1.修改合同删行汇总表头金额不正确问题
|
2024-10-22 21:38:28 +08:00 |
|
|
|
f73fc7b404
|
fix:变更单的折扣金额 不需要触发值更新
|
2024-10-22 20:54:47 +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 |
|
|
|
d66e10f2a0
|
fix:铭牌数量不允许低于本次非赠品行的整机数量
|
2024-10-22 19:02:15 +08:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
7e12e7e7c8
|
fix:外销合同赠送配件分录条件设置
|
2024-10-22 11:54:15 +08:00 |
|
|
|
20417cb4fa
|
fix:订舱通知单提交反写客户信保额度申请
(cherry picked from commit 1f86c71340)
|
2024-10-21 23:12:40 +08:00 |
|
|
|
1f86c71340
|
fix:订舱通知单提交反写客户信保额度申请
|
2024-10-21 23:06:45 +08:00 |
|
|
|
1194acecf0
|
fix:订舱通知单提交反写客户信保额度申请
|
2024-10-21 22:54:36 +08:00 |
|
|
|
0134038149
|
fix:订舱通知单提交反写客户信保额度申请
|
2024-10-21 22:54:22 +08:00 |
|
|
|
2ecd5c47d1
|
fix:订舱通知单提交反写客户信保额度申请
|
2024-10-21 22:54:16 +08:00 |
|
|
|
011ec4db02
|
fix:订舱通知单提交反写客户信保额度申请
|
2024-10-21 22:54:01 +08:00 |
|
|
|
897722cf0f
|
fix:订舱通知单提交反写客户信保额度申请
|
2024-10-21 22:53:43 +08:00 |
|
|
|
f162efc6a3
|
fix:订舱通知单审核反写客户信保额度申请
|
2024-10-21 22:53:28 +08:00 |
|
|
|
d53d68e5b5
|
1.增加合同提交是校验【合同提交附件】中的word是否包含ensign标签
|
2024-10-21 22:53:22 +08:00 |
|
|
|
7ebba9d98b
|
fix:订舱通知单提交反写客户信保额度申请
|
2024-10-21 22:46:06 +08:00 |
|
|
|
db3a3eac41
|
fix:订舱通知单提交反写客户信保额度申请
|
2024-10-21 22:23:26 +08:00 |
|
|
|
0ce7c9102a
|
fix:订舱通知单提交反写客户信保额度申请
|
2024-10-21 21:26:20 +08:00 |
|
|
|
b90525eaa7
|
fix:订舱通知单提交反写客户信保额度申请
|
2024-10-21 19:59:48 +08:00 |
|
|
|
fefb9a0d1a
|
fix:订舱通知单提交反写客户信保额度申请
|
2024-10-21 19:57:07 +08:00 |
|
|
|
fe675f250f
|
fix:订舱通知单审核反写客户信保额度申请
|
2024-10-21 19:42:26 +08:00 |
|
|
|
e435d4442f
|
1.增加合同提交是校验【合同提交附件】中的word是否包含ensign标签
|
2024-10-21 16:09:52 +08:00 |
|
|
|
fabfdf41f6
|
fix:框架合同反审核清空
(cherry picked from commit 8e1fdec8d3)
|
2024-10-19 17:58:08 +08:00 |
|
|
|
8e1fdec8d3
|
fix:框架合同反审核清空
|
2024-10-19 17:42:18 +08:00 |
|
|
|
a308233878
|
fix:合同签章
|
2024-10-19 16:50:10 +08:00 |
|
|
|
9f1ecfc5c1
|
fix:合同签章
|
2024-10-19 16:48:28 +08:00 |
|
|
|
1ec6ddad83
|
fix:合同签章
|
2024-10-19 16:47:14 +08:00 |
|
|
|
8e4ab9ea29
|
fix:合同签章
|
2024-10-19 16:45:14 +08:00 |
|
|
|
13df2436d9
|
fix:收款单财务确认
|
2024-10-19 15:46:41 +08:00 |
|
|
|
cef522fbd2
|
fix:收款单财务确认
|
2024-10-19 15:45:27 +08:00 |
|
|
|
114feb4ef7
|
fix:收款单财务确认
(cherry picked from commit fbf6338866)
|
2024-10-19 15:40:59 +08:00 |
|
|
|
fbf6338866
|
fix:收款单财务确认
|
2024-10-19 15:40:12 +08:00 |
|
|
|
bd0137604f
|
fix:合同签章
|
2024-10-19 15:00:22 +08:00 |
|
|
|
0a6cfa8091
|
fix:合同签章
|
2024-10-19 14:59:07 +08:00 |
|
|
|
e6ae689395
|
fix:合同签章
|
2024-10-19 14:57:01 +08:00 |
|
|
|
7ad4258cf6
|
fix:合同签章
|
2024-10-19 14:55:22 +08:00 |
|
|
|
2ceceaaa05
|
fix:收款单财务确认
|
2024-10-19 14:40:05 +08:00 |
|
|
|
e3828c8e3a
|
fix:收款单财务确认
|
2024-10-19 14:14:11 +08:00 |
|
|
|
8f3b26351f
|
fix:收款单问题处理
|
2024-10-18 21:15:35 +08:00 |
|
|
|
8791d3ad5f
|
fix:收款单问题处理
|
2024-10-18 21:12:04 +08:00 |
|
|
|
0def669bb1
|
fix:价格库配件问题调整
|
2024-10-18 20:15:36 +08:00 |
|
|
|
f43eb8d02f
|
fix:销售出库审核编码
|
2024-10-18 19:52:54 +08:00 |
|
|
|
11795de0e6
|
fix:销售出库审核编码
|
2024-10-18 19:52:10 +08:00 |
|
|
|
0324f74f0b
|
fix:销售出库审核编码汇总
|
2024-10-18 19:50:22 +08:00 |
|
|
|
7e67415e2e
|
fix:销售出库反审核功能处理
|
2024-10-18 19:49:29 +08:00 |
|
|
|
9ae923a3bf
|
fix:销售出库审核功能处理
|
2024-10-18 19:49:15 +08:00 |
|
|
|
bc0f65d84f
|
fix:销售出库审核功能处理
|
2024-10-18 19:49:11 +08:00 |
|
|
|
a7972c9d0a
|
fix:价格库配件问题调整
|
2024-10-18 19:47:44 +08:00 |
|
|
|
5ea607fe81
|
Merge remote-tracking branch 'orinin/main'
|
2024-10-18 19:47:42 +08:00 |
|
|
|
fb7b088d1c
|
fix:价格库配件问题调整
|
2024-10-18 19:46:30 +08:00 |
|
|
|
8e4faa84b4
|
修改外销合同签章名称包含 ensign
|
2024-10-18 19:38:44 +08:00 |
|
|
|
a5445de5c4
|
fix:配件价格库获取标准价条件增加
|
2024-10-18 19:12:57 +08:00 |
|
|
|
c6c15c007b
|
fix:二开公共类
|
2024-10-18 18:28:17 +08:00 |
|
|
|
9a00961183
|
fix:二开公共类
|
2024-10-18 18:27:08 +08:00 |
|
zzs01@yunemao.com
|
d6e971c34f
|
wip:获取标准价：FOB与FCA费用差额标配FOB（青岛）价
|
2024-10-18 18:20:34 +08:00 |
|
|
|
d582ad8ac9
|
fix:配件价格库反审核调用
|
2024-10-18 18:19:12 +08:00 |
|
|
|
5292248d54
|
fix:配件价格库禁用按钮调用
|
2024-10-18 18:17:55 +08:00 |
|
|
|
fbff30b432
|
fix:配件价格库禁用按钮调用
|
2024-10-18 18:17:42 +08:00 |
|
|
|
da6c3a3276
|
fix:配件价格库禁用按钮调用
|
2024-10-18 18:17:35 +08:00 |
|
|
|
421a81fe4f
|
fix:配件价格库禁用按钮调用
|
2024-10-18 18:17:26 +08:00 |
|
|
|
e84cafc61d
|
fix:审核时根据合同号获取财务信息《价税合计》汇总，将单据编号拼接（包含当前单
|
2024-10-18 18:15:53 +08:00 |
|
|
|
26367aa759
|
fix:收款单报错处理
|
2024-10-18 18:14:44 +08:00 |
|
|
|
b7515cfc02
|
fix:收款单报错处理
|
2024-10-18 18:14:36 +08:00 |
|
|
|
edfda79cac
|
fix:收款单报错处理
|
2024-10-18 18:14:29 +08:00 |
|
|
|
eb2542f276
|
fix:收款单报错处理
|
2024-10-18 18:14:21 +08:00 |
|
|
|
fb1cd71f9d
|
fix:收款单报错处理
|
2024-10-18 18:13:24 +08:00 |
|
|
|
6759ea30d7
|
fix:收款单报错处理
|
2024-10-18 18:13:20 +08:00 |
|
|
|
5c73612df7
|
fix:收款单财务确认功能更改至认领确认后
|
2024-10-18 18:12:22 +08:00 |
|
|
|
9b987aa882
|
fix:
云之家获取逻辑修改
|
2024-10-18 16:54:29 +08:00 |
|
|
|
ccde1671b9
|
fix:配件价格库获取标准价条件增加
|
2024-10-18 14:41:59 +08:00 |
|
|
|
349940649a
|
fix:
-整机编号校验时，在原判断逻辑增加条件：是否赠品为否；
|
2024-10-18 14:17:18 +08:00 |
|
|
|
eca195901d
|
fix:
-整机编号校验时，在原判断逻辑增加条件：是否赠品为否；
|
2024-10-18 10:39:02 +08:00 |
|
|
|
4c6bf5aa90
|
fix:
信保合同生成订舱通知单时，应收款金额（本位币）默认等于信保本位币金额；
|
2024-10-18 10:23:46 +08:00 |
|
|
|
f70896224b
|
fix:
外销合同变更单审核生成资金池
|
2024-10-16 19:49:22 +08:00 |
|
|
|
9abd286265
|
fix:
外销合同变更单审核生成资金池
|
2024-10-16 19:20:55 +08:00 |
|
|
|
56bf193ea9
|
fix:
外销合同变更单审核生成资金池
|
2024-10-16 18:59:01 +08:00 |
|
|
|
07d8562ae2
|
fix:
销售提成配件报表处理
|
2024-10-16 18:58:20 +08:00 |
|
|
|
2e1d701e06
|
fix:
1.装箱单，回填配件装柜时配件货物描述和货物（描述）拼接
|
2024-10-16 18:58:19 +08:00 |
|
|
|
e9f0827d16
|
fix:
外销合同变更单审核生成资金池
|
2024-10-16 18:49:14 +08:00 |
|
|
|
751b7f7169
|
fix:
销售提成配件报表处理
|
2024-10-16 18:44:10 +08:00 |
|
|
|
53c94dbe80
|
fix:
1.装箱单，回填配件装柜时配件货物描述和货物（描述）拼接
|
2024-10-16 18:33:55 +08:00 |
|
|
|
5306a321af
|
fix:
1.装箱单，回填配件装柜时配件货物描述和货物（描述）拼接
|
2024-10-16 18:19:10 +08:00 |
|
|
|
9869d3a4a1
|
fix:
1.储运脱单审核更新礼品资金池
|
2024-10-16 18:16:29 +08:00 |
|
|
|
21dc1df101
|
fix:
1.装箱单，回填配件装柜时配件货物描述和货物（描述）拼接
|
2024-10-16 17:50:25 +08:00 |
|
|
|
dc7fdcb706
|
fix:
1.储运脱单审核更新礼品资金池
2.装箱单，回填配件装柜时配件货物描述和货物（描述）拼接
|
2024-10-16 17:05:07 +08:00 |
|
|
|
0462634b64
|
fix:
1.外销合同审核更新礼品资金池
|
2024-10-15 21:18:51 +08:00 |
|
|
|
44890ef65f
|
fix:
1.储运脱单审核更新礼品资金池
|
2024-10-15 21:17:31 +08:00 |
|
|
|
9a964a26be
|
fix:
1.储运脱单审核更新礼品资金池
|
2024-10-15 21:14:17 +08:00 |
|
|
|
e92b0692a4
|
fix:
1.储运脱单审核更新礼品资金池
|
2024-10-15 20:54:28 +08:00 |
|
|
|
783c5f7850
|
fix:
1.储运脱单审核更新礼品资金池
|
2024-10-15 20:21:15 +08:00 |
|
|
|
a4a7a9f313
|
fix:
1.外销合同审核更新礼品资金池
|
2024-10-15 19:12:23 +08:00 |
|
|
|
3efa5d3e76
|
fix:
1.外销合同报错处理
|
2024-10-15 18:50:18 +08:00 |
|
|
|
23692d6e49
|
Merge remote-tracking branch 'orinin/test' into test
|
2024-10-15 18:38:52 +08:00 |
|
