zzs
|
9d10166b7f
|
feat:出口报关明细，海运费、保费改为取结算币别
|
2024-11-25 17:26:04 +08:00 |
|
|
|
b207d40d76
|
fix:
1.外销合同贸易术语赋值
|
2024-11-25 16:55:40 +08:00 |
|
|
|
b8170416a7
|
Merge remote-tracking branch 'orinin/test' into test
|
2024-11-25 16:38:04 +08:00 |
|
|
|
c458340add
|
fix:
1.外销合同变更单打开签到日期赋值
|
2024-11-25 16:37:41 +08:00 |
|
zzs
|
71cc9e15f2
|
fix:国贸订单明细重复行
|
2024-11-25 15:40:29 +08:00 |
|
zzs
|
6809bb47ec
|
fix:生成替换关系取值断点时间错误
|
2024-11-25 15:30:14 +08:00 |
|
zzs
|
29baa7a74f
|
fix:图册查询报错，断点时间为空
|
2024-11-25 14:58:10 +08:00 |
|
zzs
|
44ded3a0cb
|
Merge remote-tracking branch 'origin/test' into test
|
2024-11-25 10:39:29 +08:00 |
|
zzs
|
2da8320ff9
|
feat:提交云之家日志
|
2024-11-25 10:39:20 +08:00 |
|
|
|
63c4a38bd9
|
fix:
1.外销合同赠送配件页签汇总赋值
2.发运明细单台数发运更新
(cherry picked from commit 261d35ff59)
|
2024-11-25 10:29:04 +08:00 |
|
zzs
|
d7b1352a04
|
fix:查询购买过的整机编码
|
2024-11-23 14:11:16 +08:00 |
|
zzs
|
4ad03482d2
|
fix:PLM生成替换关系
|
2024-11-23 11:31:56 +08:00 |
|
zzs
|
2eea9f32cb
|
doc:修改未查询到图册提示语
(cherry picked from commit b7214cf204)
|
2024-11-23 09:22:40 +08:00 |
|
|
|
992113f7e4
|
fix:
1.订舱通知单提交
|
2024-11-22 20:02:10 +08:00 |
|
|
|
540a4ec882
|
fix:
1.整机发货明细表
(cherry picked from commit f35fdecc63)
|
2024-11-22 19:56:05 +08:00 |
|
|
|
b36fd5d827
|
fix:
1.订舱通知单提交
(cherry picked from commit 18824050e9)
|
2024-11-22 19:55:21 +08:00 |
|
|
|
a61901d58f
|
fix:
1.整机发货明细表
(cherry picked from commit f35fdecc63)
|
2024-11-22 19:38:43 +08:00 |
|
|
|
1f37e4a0f8
|
fix:
1.发运明细单金额价格条款赋值
|
2024-11-22 15:31:09 +08:00 |
|
|
|
63125333a2
|
fix:
1.寄单放单申请提交拼接
|
2024-11-22 15:14:14 +08:00 |
|
|
|
a00a136221
|
fix:
1.外销合同签订日期默认当前时间
|
2024-11-22 10:52:03 +08:00 |
|
|
|
7d845450f0
|
fix:
1.外销合同签订日期默认当前时间
|
2024-11-21 20:10:20 +08:00 |
|
|
|
9a698ae473
|
fix:
1.外销合同签订日期默认当前时间
|
2024-11-21 20:02:34 +08:00 |
|
|
|
8f8a308e13
|
fix:
1.外销合同签订日期默认当前时间
|
2024-11-21 19:40:06 +08:00 |
|
|
|
df0f6c6e52
|
fix:
1.水单附件必填效验
|
2024-11-21 18:17:08 +08:00 |
|
|
|
f9a6b210fd
|
fix:
1.外销合同签订日期默认当前时间
|
2024-11-21 18:09:22 +08:00 |
|
|
|
5050ae8fb9
|
fix:
1.收款单认领合同过滤非贷记单
(cherry picked from commit 09db507910)
|
2024-11-21 15:30:57 +08:00 |
|
zzs
|
00f6d27a37
|
fix:价格库查询到重复数据
|
2024-11-21 14:56:21 +08:00 |
|
zzs
|
0dac6a13eb
|
feat:更新整机档案领料分析时间
(cherry picked from commit 99bdc4da6a)
|
2024-11-21 09:10:30 +08:00 |
|
|
|
14e892f1a1
|
fix:
1.订舱通知单额度确认效验修改
|
2024-11-20 17:53:07 +08:00 |
|
zzs
|
42d7cec955
|
feat:更新整机档案领料分析时间
|
2024-11-20 16:14:55 +08:00 |
|
zzs
|
4ebf483e9e
|
下单平台：配件价格根据名称模糊查询
(cherry picked from commit 04ad4b12d3)
|
2024-11-19 15:57:33 +08:00 |
|
|
|
07d1a90efe
|
Merge remote-tracking branch 'orinin/test' into test
|
2024-11-19 14:24:54 +08:00 |
|
|
|
08b18bf7f6
|
fix:
1.订单产品需求单 调拨计划，调入调出仓库清空，不自动带出
|
2024-11-19 14:24:34 +08:00 |
|
zzs
|
db4a0dabe5
|
下单平台：只能查询购买过的资源
(cherry picked from commit 743bd6e277)
|
2024-11-19 10:19:44 +08:00 |
|
|
|
1bf68b4811
|
fix:
1.报错修复
|
2024-11-18 22:29:40 +08:00 |
|
|
|
0bb09cf296
|
fix:
1.报错修复
|
2024-11-18 22:03:25 +08:00 |
|
|
|
d70a61c3f6
|
fix:
1.报错修复
|
2024-11-18 21:55:28 +08:00 |
|
|
|
1f3bf99c44
|
fix:
1.报错修复
|
2024-11-18 21:49:21 +08:00 |
|
|
|
6d5494f88b
|
fix:
1.报错修复
|
2024-11-18 21:42:50 +08:00 |
|
|
|
8726d5f026
|
fix:
1.报错修复
|
2024-11-18 21:42:09 +08:00 |
|
|
|
79c87efddc
|
fix:
1.报错修复
(cherry picked from commit 88ddf7970f)
|
2024-11-18 21:36:54 +08:00 |
|
|
|
124e9bb69b
|
fix:
1.发运明细变更单修改数量逻辑修改
|
2024-11-18 18:15:09 +08:00 |
|
|
|
c817f189c0
|
fix:
1.合同签章合同盖章
2.发运明细变更单修改数量逻辑修改
|
2024-11-18 17:40:57 +08:00 |
|
|
|
5787908a4d
|
fix:
1.合同签章合同盖章
(cherry picked from commit 5ac851a07d)
|
2024-11-18 15:25:56 +08:00 |
|
|
|
ae66636140
|
Merge remote-tracking branch 'orinin/test' into test
|
2024-11-18 15:25:53 +08:00 |
|
|
|
12b0c26e23
|
fix:
1.合同签章合同盖章
|
2024-11-18 15:25:35 +08:00 |
|
|
|
1629349030
|
fix:
1.发运明细单（单证）报表日期汇总显示
(cherry picked from commit 31386ef6dc)
|
2024-11-15 23:58:56 +08:00 |
|
|
|
6b802e04ee
|
fix:
1.发运明细单（单证）报表日期汇总显示
(cherry picked from commit 813c72a5db)
|
2024-11-15 23:47:05 +08:00 |
|
|
|
fb56bb116a
|
fix:
1.word文档书签处理
|
2024-11-15 18:15:05 +08:00 |
|
|
|
070e883567
|
fix:
1.回填时，只能将信保年度的第一行回填到单据中
|
2024-11-15 16:12:19 +08:00 |
|
|
|
b7e7eb190b
|
fix:
1.发运明细备注赋值
|
2024-11-14 21:30:32 +08:00 |
|
|
|
2d7cd037e3
|
fix:
1.发运明细备注赋值
|
2024-11-14 21:26:45 +08:00 |
|
|
|
30c7aeb79e
|
fix:
1.发运明细备注赋值
|
2024-11-14 21:18:22 +08:00 |
|
|
|
c568e17470
|
fix:
1.发运明细备注赋值
|
2024-11-14 21:17:55 +08:00 |
|
|
|
fc6dc5bbcd
|
fix:
1.发运明细备注赋值
|
2024-11-14 21:13:17 +08:00 |
|
|
|
273339a464
|
fix:
1.发运明细备注赋值
(cherry picked from commit 5182295971)
|
2024-11-14 20:56:03 +08:00 |
|
|
|
94b7b9fa8a
|
fix:
1.报表处理
2.订舱通知单增加效验
(cherry picked from commit c62ff30599)
|
2024-11-14 19:59:49 +08:00 |
|
|
|
d0ea675721
|
fix:
1.国贸订单生产线缺少值
(cherry picked from commit 9102995aa3)
|
2024-11-14 19:59:39 +08:00 |
|
|
|
8822ce3ce5
|
fix:
1.订舱通知单保存报错处理
(cherry picked from commit e9b19fe3cd)
|
2024-11-14 19:59:36 +08:00 |
|
|
|
2848c97f81
|
fix:
1.订舱通知单分摊金额本位币计算
|
2024-11-14 19:39:03 +08:00 |
|
|
|
bd421b7f8c
|
fix:
1.附件上传删除自动删除
|
2024-11-13 20:48:07 +08:00 |
|
|
|
c8dcd77fcb
|
fix:
1.整机储备申请提交拼接
|
2024-11-13 20:14:27 +08:00 |
|
|
|
35afa2617d
|
fix:
1.储备申请标题
|
2024-11-13 19:55:55 +08:00 |
|
|
|
f50553cb46
|
fix:
1.附件上传自动保存
|
2024-11-13 19:48:47 +08:00 |
|
|
|
2b4af2f0f7
|
fix:
1.外销合同系统最大贷记单号排序错误
|
2024-11-13 18:57:36 +08:00 |
|
|
|
924b007ad0
|
fix:
1.整机储运申请下推到云之家的标题形式为：整机储运申请+业务员+国家+合同号。
|
2024-11-13 18:25:08 +08:00 |
|
|
|
62399ef804
|
fix:
1.发货明细表（未发货）起运港 目的港没有带出来
|
2024-11-13 17:37:07 +08:00 |
|
|
|
ae06bb6c2f
|
fix:
1.外销合同系统最大贷记单号排序错误
(cherry picked from commit a1ee8acc93)
|
2024-11-13 16:33:53 +08:00 |
|
|
|
cad042604a
|
fix:
1.业务分类为整机、提成分类为整机且是否赠品为否
|
2024-11-13 16:33:38 +08:00 |
|
|
|
2dd73412c4
|
fix:
1.资源确认时，资源号必填
|
2024-11-13 15:10:51 +08:00 |
|
|
|
1c896a1175
|
fix:
1.资源确认时，资源号必填
|
2024-11-13 15:09:13 +08:00 |
|
|
|
21e7248b55
|
fix:
1.152订舱通知单：订单总台数未更新
|
2024-11-13 15:05:11 +08:00 |
|
|
|
bf75fa8f67
|
fix:
1.销售提成-整机 功能完善
|
2024-11-13 11:35:10 +08:00 |
|
|
|
dc7fb5bbc3
|
fix:
1.订舱通知单提交效验汇总明细信息分录数量
(cherry picked from commit 425d7d29a2)
|
2024-11-12 18:26:47 +08:00 |
|
|
|
2040adef30
|
fix:
1.订舱通知单保存汇总明细信息分录数量
2.注册优化
(cherry picked from commit d755bffaee)
|
2024-11-12 18:26:43 +08:00 |
|
|
|
ee18edfb02
|
fix:
发运明细变更单:
1、变更后，出运汇总页签重复。每次保存都是重复生成，删行时没有控制；
2、商品明细删行报错，数量减少时，系统有提示，但是可以修改成功；
3、商品明细新增的行，没有更新到出运汇总页签
|
2024-11-11 21:26:35 +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 |
|
|
|
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 |
|
|
|
7e0a3a6190
|
fix:
1.报关合并
|
2024-11-11 14:44:30 +08:00 |
|
|
|
7964860624
|
fix:
1.发运明细变更单保存生成出运明细
|
2024-11-11 10:03:55 +08:00 |
|
|
|
59cef79f81
|
fix:
1.订舱通知单物流效验
|
2024-11-08 22:44:02 +08:00 |
|
|
|
69d8000cf5
|
fix:
1.订舱通知单物流
|
2024-11-08 22:35:42 +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 |
|
|
|
cf2d63b1ff
|
1.修改计算应回款倒计时
|
2024-11-07 19:58:19 +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 |
|
|
|
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 |
|
|
|
71092fbc70
|
fix:
1.订舱通知单信保回填更新客户信保额度申请
|
2024-11-05 17:20:36 +08:00 |
|
|
|
ae5989f8fb
|
fix:
1.订舱通知单提交效验迁移
|
2024-11-05 16:58: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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
c1907a51e1
|
fix:
1.收款单修改认领金额更新
|
2024-11-01 16:20:10 +08:00 |
|
|
|
a7236d8feb
|
fix:
1.外销合同合同回签
|
2024-11-01 11:11:33 +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 |
|
|
|
a5fcb2d853
|
fix:
1.收款单认领查询回款金额
2.发运明细审核效验
|
2024-10-31 18:37:29 +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 |
|
|
|
0396aab3e5
|
fix:
1.发运明细单保存生成储运汇总
2.内审预算单上传附件
(cherry picked from commit 1986782dc4)
|
2024-10-30 18:26:49 +08:00 |
|
|
|
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 |
|
