zzs
|
3b218758d9
|
fix:出口报关明细，合同号不显示
|
2024-12-05 14:48:33 +08:00 |
|
zzs
|
f26aeadc35
|
feat:整机发运明细表增加字段销售员
|
2024-12-05 14:32:52 +08:00 |
|
zzs
|
3e9816f5ba
|
Merge remote-tracking branch 'origin/test' into test
|
2024-12-05 11:14:22 +08:00 |
|
zzs
|
b513e92010
|
fix:报关合并-特殊规则未清空合并对照表
|
2024-12-05 11:14:14 +08:00 |
|
|
|
c81b40dafc
|
fix:
1.外销合同变更单审核反写值出错
|
2024-12-05 10:23:41 +08:00 |
|
|
|
23aaba1d1b
|
fix:
1.订舱通知单信保回填回填时将年度赋值至客户信保额度申请
|
2024-12-04 19:19:15 +08:00 |
|
|
|
b6f7bed50d
|
fix:
1.订舱通知单信保回填回填时将年度赋值至客户信保额度申请
|
2024-12-04 19:19:00 +08:00 |
|
|
|
5549ab1bd6
|
fix:
1.发运提交效验
|
2024-12-04 19:18:54 +08:00 |
|
|
|
636b73b8b5
|
fix:
1.订舱通知单信保回填回填时将年度赋值至客户信保额度申请
|
2024-12-04 19:12:49 +08:00 |
|
|
|
16ee20ec60
|
fix:
1.订舱通知单信保回填回填时将年度赋值至客户信保额度申请
|
2024-12-04 18:49:48 +08:00 |
|
|
|
865064995f
|
fix:
1.发运提交效验
|
2024-12-04 17:40:03 +08:00 |
|
zzs
|
a184683b25
|
fix:可选中机型过滤问题
(cherry picked from commit e97f8bad74)
|
2024-12-04 15:43:15 +08:00 |
|
|
|
07306341b3
|
fix:
1.订舱通知单信保回填回填时将年度赋值至客户信保额度申请
(cherry picked from commit bd8a9ad8ce)
|
2024-12-04 11:36:40 +08:00 |
|
|
|
bd8a9ad8ce
|
fix:
1.订舱通知单信保回填回填时将年度赋值至客户信保额度申请
|
2024-12-04 11:35:30 +08:00 |
|
zzs
|
e97f8bad74
|
fix:可选中机型过滤问题
|
2024-12-04 10:58:07 +08:00 |
|
zzs
|
fc3faf2ae1
|
fix:非信保合同不进行投保金额校验
(cherry picked from commit 02d604790b)
|
2024-12-03 18:51:08 +08:00 |
|
zzs
|
01748e340d
|
fix:保存后刷新清除了创建组织
(cherry picked from commit 534ed72806)
|
2024-12-03 18:51:05 +08:00 |
|
zzs
|
3908b74286
|
fix:订舱审核校验提示剩余额度不足校验问题
(cherry picked from commit b58d6c65f0)
|
2024-12-03 18:51:02 +08:00 |
|
zzs
|
d0d1c12966
|
log:订舱提交信保额度校验增加日志输出
(cherry picked from commit bd36c4ec3b)
|
2024-12-03 18:50:58 +08:00 |
|
zzs
|
02d604790b
|
fix:非信保合同不进行投保金额校验
|
2024-12-03 17:15:10 +08:00 |
|
zzs
|
534ed72806
|
fix:保存后刷新清除了创建组织
|
2024-12-03 16:15:41 +08:00 |
|
zzs
|
b58d6c65f0
|
fix:订舱审核校验提示剩余额度不足校验问题
|
2024-12-03 15:54:31 +08:00 |
|
zzs
|
bd36c4ec3b
|
log:订舱提交信保额度校验增加日志输出
|
2024-12-03 15:08:54 +08:00 |
|
zzs
|
c9422d650b
|
fix:国贸订单明细，已发货行不显示
(cherry picked from commit f292ea085a)
|
2024-12-03 11:37:05 +08:00 |
|
zzs
|
f292ea085a
|
fix:国贸订单明细，已发货行不显示
|
2024-12-03 11:35:57 +08:00 |
|
|
|
6027fef0ec
|
fix:
1.云之家获取审核失败调用撤销取消
(cherry picked from commit 06e61efd62)
|
2024-11-30 11:16:09 +08:00 |
|
|
|
f1943582ff
|
fix:
1.出口发票保存生成备注调整一下格式，按照要求换行，金额不要显示尾零
(cherry picked from commit 6edece8faa)
|
2024-11-30 11:16:00 +08:00 |
|
|
|
106f713919
|
fix:
1.收款条件带出收款天数
(cherry picked from commit aa1106ad08)
|
2024-11-30 11:15:56 +08:00 |
|
|
|
06e61efd62
|
fix:
1.云之家获取审核失败调用撤销取消
|
2024-11-30 11:14:59 +08:00 |
|
|
|
6edece8faa
|
fix:
1.出口发票保存生成备注调整一下格式，按照要求换行，金额不要显示尾零
|
2024-11-30 10:15:00 +08:00 |
|
|
|
aa1106ad08
|
fix:
1.收款条件带出收款天数
|
2024-11-30 09:31:05 +08:00 |
|
|
|
30e29f01a5
|
fix:
1.出口发票报错处理
|
2024-11-29 18:06:08 +08:00 |
|
|
|
a21d14d3e9
|
fix:
1.外销合同报错处理
(cherry picked from commit 298a8963af)
|
2024-11-29 17:09:57 +08:00 |
|
|
|
8b4b6b46a8
|
fix:
1.出口发票报错处理
|
2024-11-29 17:09:24 +08:00 |
|
|
|
298a8963af
|
fix:
1.外销合同报错处理
|
2024-11-29 16:55:10 +08:00 |
|
|
|
833f54a242
|
fix:
1.出口发票报错处理
|
2024-11-29 10:06:18 +08:00 |
|
|
|
4d8de42ac2
|
fix:
1.出口发票报错处理
|
2024-11-29 10:05:09 +08:00 |
|
|
|
71048412d0
|
fix:
1.出口发票报错处理
(cherry picked from commit eae662b125)
|
2024-11-29 09:17:27 +08:00 |
|
|
|
eae662b125
|
fix:
1.出口发票报错处理
|
2024-11-29 09:12:31 +08:00 |
|
|
|
7e099839a0
|
fix:
1.装箱单报错处理
(cherry picked from commit 894e3882f3)
|
2024-11-28 18:41:03 +08:00 |
|
|
|
1cefbd0d47
|
fix:
1.出口发票保存生成备注及合同号
(cherry picked from commit cb45727a2e)
|
2024-11-28 18:38:47 +08:00 |
|
|
|
72cba3ae69
|
Merge remote-tracking branch 'orinin/main'
|
2024-11-28 18:37:39 +08:00 |
|
|
|
cb45727a2e
|
fix:
1.出口发票保存生成备注及合同号
|
2024-11-28 18:36:16 +08:00 |
|
zzs
|
45ae3aa7cc
|
fix:替换关系反审核报错
|
2024-11-28 17:54:39 +08:00 |
|
zzs
|
396efe9827
|
fix:替换关系反审核报错
|
2024-11-28 17:41:44 +08:00 |
|
|
|
894e3882f3
|
fix:
1.装箱单报错处理
|
2024-11-28 14:25:26 +08:00 |
|
|
|
4bb1f39f24
|
fix:
1.出口报关数量问题处理
(cherry picked from commit a3a41e576c)
|
2024-11-27 23:23:57 +08:00 |
|
|
|
f5b8c7dd5b
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
(cherry picked from commit 4c6a3545ec)
|
2024-11-27 23:23:47 +08:00 |
|
|
|
6d1e69425d
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
(cherry picked from commit 8717a78715)
|
2024-11-27 23:23:43 +08:00 |
|
|
|
a3a41e576c
|
fix:
1.出口报关数量问题处理
|
2024-11-27 23:15:11 +08:00 |
|
|
|
4c6a3545ec
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-27 22:00:05 +08:00 |
|
|
|
8717a78715
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-27 21:39:51 +08:00 |
|
|
|
8b824b084e
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-27 20:33:43 +08:00 |
|
|
|
e2f53da4e9
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-27 20:33:37 +08:00 |
|
|
|
67ce460142
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-27 20:33:28 +08:00 |
|
|
|
e0b58466a1
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-27 20:33:23 +08:00 |
|
|
|
57860631bc
|
fix:
①收汇比例（小数，不显示尾零，放到预收比例前面），取值逻辑，取合同收款计划行的收汇百分比；
②订舱投保金额（原币种）-关联结算币别，锁定，计算逻辑：订舱合同金额*收汇比例；
|
2024-11-27 20:33:14 +08:00 |
|
|
|
c4ca8a7de5
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-27 20:33:05 +08:00 |
|
|
|
112632a7dd
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-27 20:33:00 +08:00 |
|
|
|
7f17c00e9d
|
fix:
①收汇比例（小数，不显示尾零，放到预收比例前面），取值逻辑，取合同收款计划行的收汇百分比；
②订舱投保金额（原币种）-关联结算币别，锁定，计算逻辑：订舱合同金额*收汇比例；
|
2024-11-27 20:32:52 +08:00 |
|
|
|
3edc8cdd70
|
fix:
①收汇比例（小数，不显示尾零，放到预收比例前面），取值逻辑，取合同收款计划行的收汇百分比；
②订舱投保金额（原币种）-关联结算币别，锁定，计算逻辑：订舱合同金额*收汇比例；
|
2024-11-27 20:32:47 +08:00 |
|
|
|
fd521f73cc
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-27 20:32:37 +08:00 |
|
|
|
1dfebb679a
|
fix:
1.订单产品需求单保存处理
|
2024-11-27 20:32:32 +08:00 |
|
|
|
0493b20554
|
fix:
1.发运明细单汇总报错处理
2.公共方法
|
2024-11-27 20:32:23 +08:00 |
|
|
|
bdc8a0f805
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-27 20:32:17 +08:00 |
|
|
|
1c75dea603
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-27 20:32:07 +08:00 |
|
|
|
80b78fd463
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-27 20:32:03 +08:00 |
|
|
|
5816468c57
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-27 20:31:55 +08:00 |
|
|
|
e02ef10fa1
|
fix:
1.单台赠送配件金额 为空的行的数量不需要汇总
|
2024-11-27 20:30:16 +08:00 |
|
|
|
bf98c82519
|
fix:
1.只有是否需同步EAS为是时，才会同步EAS；
|
2024-11-27 20:30:05 +08:00 |
|
|
|
97986428d5
|
fix:
1.单台赠送配件金额 为空的行的数量不需要汇总
|
2024-11-27 20:29:59 +08:00 |
|
|
|
79eb14fb5c
|
fix:
1.销售出库财务组织判断
|
2024-11-27 20:29:49 +08:00 |
|
|
|
615558b712
|
fix:
1.单台赠送配件金额 为空的行的数量不需要汇总
|
2024-11-27 20:29:43 +08:00 |
|
|
|
c8915a718e
|
fix:
1.只有是否需同步EAS为是时，才会同步EAS；
|
2024-11-27 20:29:31 +08:00 |
|
|
|
53be70e0db
|
fix:
1.生成随机资料时，只有业务分类为整机，且是否赠品为否的行生成
|
2024-11-27 20:29:27 +08:00 |
|
|
|
23c3692927
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-27 20:24:46 +08:00 |
|
|
|
b60b48b63b
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-27 20:06:45 +08:00 |
|
|
|
70cfa83e53
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-27 20:05:46 +08:00 |
|
|
|
13e95d97b7
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-27 19:51:27 +08:00 |
|
|
|
ec3bb451c5
|
fix:
①收汇比例（小数，不显示尾零，放到预收比例前面），取值逻辑，取合同收款计划行的收汇百分比；
②订舱投保金额（原币种）-关联结算币别，锁定，计算逻辑：订舱合同金额*收汇比例；
|
2024-11-27 19:09:31 +08:00 |
|
|
|
316e1100dd
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-27 19:05:48 +08:00 |
|
|
|
62a6418f88
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-27 18:58:53 +08:00 |
|
|
|
bec7401ad1
|
fix:
①收汇比例（小数，不显示尾零，放到预收比例前面），取值逻辑，取合同收款计划行的收汇百分比；
②订舱投保金额（原币种）-关联结算币别，锁定，计算逻辑：订舱合同金额*收汇比例；
|
2024-11-27 18:54:05 +08:00 |
|
|
|
eb83105684
|
fix:
①收汇比例（小数，不显示尾零，放到预收比例前面），取值逻辑，取合同收款计划行的收汇百分比；
②订舱投保金额（原币种）-关联结算币别，锁定，计算逻辑：订舱合同金额*收汇比例；
|
2024-11-27 18:46:22 +08:00 |
|
|
|
fc875a8c69
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-27 18:37:58 +08:00 |
|
|
|
2de105968a
|
fix:
1.订单产品需求单保存处理
|
2024-11-27 17:22:07 +08:00 |
|
|
|
04fca9f826
|
fix:
1.发运明细单汇总报错处理
2.公共方法
|
2024-11-27 01:30:06 +08:00 |
|
|
|
b2606b74b4
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-26 21:38:03 +08:00 |
|
|
|
1af4357d6f
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-26 21:34:00 +08:00 |
|
|
|
af59bf2dfd
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-26 21:33:25 +08:00 |
|
|
|
6feb245b58
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-26 21:21:44 +08:00 |
|
|
|
550a4463db
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-26 21:13:25 +08:00 |
|
|
|
091b36894e
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-26 21:05:43 +08:00 |
|
|
|
58618daa8b
|
fix:
1.单台赠送配件金额 为空的行的数量不需要汇总
|
2024-11-26 20:27:25 +08:00 |
|
|
|
cb1d195f0d
|
fix:
1.只有是否需同步EAS为是时，才会同步EAS；
|
2024-11-26 20:25:46 +08:00 |
|
|
|
3823a99628
|
fix:
1.单台赠送配件金额 为空的行的数量不需要汇总
|
2024-11-26 20:13:57 +08:00 |
|
|
|
40f1d10aef
|
fix:
1.销售出库财务组织判断
|
2024-11-26 20:01:14 +08:00 |
|
|
|
14347d83e4
|
fix:
1.单台赠送配件金额 为空的行的数量不需要汇总
|
2024-11-26 19:48:42 +08:00 |
|
|
|
dfc042d6ec
|
fix:
1.只有是否需同步EAS为是时，才会同步EAS；
|
2024-11-26 19:42:25 +08:00 |
|
|
|
d2f097d658
|
fix:
1.生成随机资料时，只有业务分类为整机，且是否赠品为否的行生成
|
2024-11-26 19:38:47 +08:00 |
|
|
|
4c04b538aa
|
fix:
1.配件发货明细表数据重复修复
(cherry picked from commit 975ba7f974)
|
2024-11-26 18:45:35 +08:00 |
|
|
|
e0bbeea4fd
|
fix:
1.是否需校验物料属性为是时，走判断校验，其他情况保持原逻辑，不需调整；
(cherry picked from commit 444d8c412e)
|
2024-11-26 18:44:43 +08:00 |
|
|
|
7b18623719
|
fix:
1.接口调整：只有是否需同步EAS为是时，才会同步EAS；（订单产品需求单-整机外购计划，审核时同步EAS，销售出库-整机/配件，提交时同步EAS）；
(cherry picked from commit 861d8279bb)
|
2024-11-26 18:44:36 +08:00 |
|
|
|
2e71eb7779
|
fix:
1.生成随机资料时，只有业务分类为整机，且是否赠品为否的行生成
(cherry picked from commit 1d45f34ef8)
|
2024-11-26 18:44:33 +08:00 |
|
|
|
444d8c412e
|
fix:
1.是否需校验物料属性为是时，走判断校验，其他情况保持原逻辑，不需调整；
|
2024-11-26 18:41:38 +08:00 |
|
|
|
861d8279bb
|
fix:
1.接口调整：只有是否需同步EAS为是时，才会同步EAS；（订单产品需求单-整机外购计划，审核时同步EAS，销售出库-整机/配件，提交时同步EAS）；
|
2024-11-26 18:35:04 +08:00 |
|
|
|
1d45f34ef8
|
fix:
1.生成随机资料时，只有业务分类为整机，且是否赠品为否的行生成
|
2024-11-26 17:10:31 +08:00 |
|
|
|
cd4b0d7f9d
|
Merge remote-tracking branch 'orinin/main'
|
2024-11-26 16:35:56 +08:00 |
|
|
|
975ba7f974
|
fix:
1.配件发货明细表数据重复修复
|
2024-11-26 16:35:32 +08:00 |
|
zzs
|
cb5a3bbaca
|
fix:报表国贸订单明细数据错误
(cherry picked from commit 9a81a8781f)
|
2024-11-26 15:23:10 +08:00 |
|
zzs
|
9a81a8781f
|
fix:报表国贸订单明细数据错误
|
2024-11-26 14:14:48 +08:00 |
|
zzs
|
03844240a0
|
feat:出口报关明细，海运费、保费改为取结算币别
|
2024-11-25 18:49:58 +08:00 |
|
|
|
c8188bfb40
|
fix:
1.外销合同贸易术语赋值
|
2024-11-25 18:49:54 +08:00 |
|
|
|
1a1e257be8
|
fix:
1.外销合同变更单打开签到日期赋值
|
2024-11-25 18:49:46 +08:00 |
|
zzs
|
e99e3380d3
|
fix:国贸订单明细重复行
|
2024-11-25 18:49:42 +08:00 |
|
zzs
|
606259d531
|
fix:生成替换关系取值断点时间错误
|
2024-11-25 18:49:36 +08:00 |
|
zzs
|
c6e602a675
|
fix:图册查询报错，断点时间为空
|
2024-11-25 18:49:33 +08:00 |
|
zzs
|
41802e5a72
|
feat:提交云之家日志
|
2024-11-25 18:48:46 +08:00 |
|
|
|
503cb7788d
|
fix:
1.外销合同赠送配件页签汇总赋值
|
2024-11-25 18:47:22 +08:00 |
|
|
|
8206570fde
|
fix:
1.外销合同赠送配件页签汇总赋值
|
2024-11-25 18:27:01 +08:00 |
|
|
|
5834e7e53f
|
fix:
1.调拨订单 同步EAS的接口 业务类型 给他传单据字段 不穿默认值了
(cherry picked from commit 2af9172481)
|
2024-11-25 17:47:49 +08:00 |
|
zzs
|
7c89041f82
|
Merge remote-tracking branch 'origin/test' into test
|
2024-11-25 17:26:13 +08:00 |
|
zzs
|
9d10166b7f
|
feat:出口报关明细，海运费、保费改为取结算币别
|
2024-11-25 17:26:04 +08:00 |
|
|
|
2af9172481
|
fix:
1.调拨订单 同步EAS的接口 业务类型 给他传单据字段 不穿默认值了
|
2024-11-25 17:19: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 |
|
|
|
261d35ff59
|
fix:
1.外销合同赠送配件页签汇总赋值
2.发运明细单台数发运更新
|
2024-11-25 10:27:57 +08:00 |
|
zzs
|
2e5a292d3e
|
fix:查询购买过的整机编码
|
2024-11-23 17:53:26 +08:00 |
|
zzs
|
52e9912eb1
|
fix:PLM生成替换关系
|
2024-11-23 17:53:25 +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 |
|
zzs
|
b7214cf204
|
doc:修改未查询到图册提示语
|
2024-11-23 09:21:57 +08:00 |
|
|
|
da686561af
|
fix:
1.订舱通知单提交
|
2024-11-22 20:06:21 +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 |
|
|
|
c6f5c05e4c
|
fix:
1.发运明细单金额价格条款赋值
|
2024-11-22 19:35:11 +08:00 |
|
|
|
90506a0127
|
fix:
1.寄单放单申请提交拼接
|
2024-11-22 19:35:08 +08:00 |
|
|
|
18824050e9
|
fix:
1.订舱通知单提交
|
2024-11-22 19:30:13 +08:00 |
|
|
|
f35fdecc63
|
fix:
1.整机发货明细表
|
2024-11-22 18:48:03 +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 |
|
|
|
883027d7c6
|
fix:
1.外销合同签订日期默认当前时间
|
2024-11-21 20:10:48 +08:00 |
|
|
|
7d845450f0
|
fix:
1.外销合同签订日期默认当前时间
|
2024-11-21 20:10:20 +08:00 |
|
|
|
6c37b4beaf
|
fix:
1.外销合同签订日期默认当前时间
|
2024-11-21 20:04:11 +08:00 |
|
|
|
9a698ae473
|
fix:
1.外销合同签订日期默认当前时间
|
2024-11-21 20:02:34 +08:00 |
|
|
|
e31660e995
|
fix:
1.外销合同签订日期默认当前时间
|
2024-11-21 19:40:32 +08:00 |
|
|
|
8f8a308e13
|
fix:
1.外销合同签订日期默认当前时间
|
2024-11-21 19:40:06 +08:00 |
|
|
|
f9f6c5fff7
|
fix:
1.水单附件必填效验
|
2024-11-21 19:26:30 +08:00 |
|
|
|
b796e9100e
|
fix:
1.外销合同签订日期默认当前时间
|
2024-11-21 19:26:25 +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
|
210e61db9a
|
fix:价格库查询到重复数据
|
2024-11-21 14:58:01 +08:00 |
|
zzs
|
00f6d27a37
|
fix:价格库查询到重复数据
|
2024-11-21 14:56:21 +08:00 |
|
|
|
09db507910
|
fix:
1.收款单认领合同过滤非贷记单
|
2024-11-21 14:40:01 +08:00 |
|
zzs
|
0dac6a13eb
|
feat:更新整机档案领料分析时间
(cherry picked from commit 99bdc4da6a)
|
2024-11-21 09:10:30 +08:00 |
|
zzs
|
f76e7f23ca
|
Merge remote-tracking branch 'origin/main'
|
2024-11-20 18:28:55 +08:00 |
|
zzs
|
99bdc4da6a
|
feat:更新整机档案领料分析时间
|
2024-11-20 18:28:47 +08:00 |
|
|
|
e85ae88a64
|
fix:
1.订舱通知单额度确认效验修改
|
2024-11-20 18:14:55 +08:00 |
|
|
|
14e892f1a1
|
fix:
1.订舱通知单额度确认效验修改
|
2024-11-20 17:53:07 +08:00 |
|
zzs
|
7d9aa70b93
|
feat:更新整机档案领料分析时间
|
2024-11-20 17:26:09 +08:00 |
|
zzs
|
42d7cec955
|
feat:更新整机档案领料分析时间
|
2024-11-20 16:14:55 +08:00 |
|
|
|
fad828255f
|
Merge remote-tracking branch 'orinin/main'
# Conflicts:
# .gitignore
# src/main/java/com/yem/rf/salescommission/SalesOfRoyaltyParts.java
# src/main/java/com/yem/tws/task/CusdecToDeclaredocxTask.java
# src/main/java/com/yem/wm/es/salescontrac/op/SalesContracUnauditOp.java
# src/main/java/com/yem/wm/es/salesorder/from/SalesOrderPJEdit.java
# src/main/java/com/yem/wm/es/salesorder/from/SalesOrderZJEdit.java
# src/main/java/com/yem/wm/es/salesorder/op/SalesOrderAuditOp.java
# src/main/java/com/yem/wm/es/salesorder/utils/SalesOrderUtils.java
# src/main/java/com/yem/wm/es/shippingdetails/op/ShippingDetailsAuditOp.java
# src/main/java/com/yem/wm/es/shippingdetails/op/XshippingDetailsSaveOp.java
# src/main/java/com/yem/wm/im/csrCreditLine/task/CsrCreditLineTask.java
# src/main/java/com/yem/wm/im/inquirylist/op/InquirylistAudit.java
# src/main/java/com/yem/wm/syn/eas/api/OperationalUniversal.java
# src/main/java/com/yem/wm/sys/utils/NewVersionHelper.java
# src/main/java/com/yem/wm/utils/ContactSignUtils.java
|
2024-11-19 18:09:21 +08:00 |
|
zzs
|
4ebf483e9e
|
下单平台：配件价格根据名称模糊查询
(cherry picked from commit 04ad4b12d3)
|
2024-11-19 15:57:33 +08:00 |
|
zzs
|
04ad4b12d3
|
下单平台：配件价格根据名称模糊查询
|
2024-11-19 15:55:12 +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 |
|
zzs
|
743bd6e277
|
下单平台：只能查询购买过的资源
|
2024-11-19 10:06:52 +08:00 |
|
|
|
1bf68b4811
|
fix:
1.报错修复
|
2024-11-18 22:29:40 +08:00 |
|
|
|
1fdaefba7b
|
fix:
1.报错修复
|
2024-11-18 22:24:37 +08:00 |
|
|
|
77262dc8dc
|
fix:
1.报错修复
|
2024-11-18 22:10:18 +08:00 |
|
|
|
60c3550fb6
|
fix:
1.报错修复
|
2024-11-18 22:10:11 +08:00 |
|
|
|
103140e352
|
fix:
1.报错修复
|
2024-11-18 22:10:08 +08:00 |
|
|
|
593050d6d5
|
fix:
1.报错修复
|
2024-11-18 22:10:01 +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 |
|
|
|
88ddf7970f
|
fix:
1.报错修复
|
2024-11-18 21:36:15 +08:00 |
|
|
|
756209a56a
|
fix:
1.报错修复
|
2024-11-18 20:46:56 +08:00 |
|
|
|
1145b6b3d6
|
fix:
1.报错修复
|
2024-11-18 20:34:28 +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 |
|
|
|
5ac851a07d
|
fix:
1.合同签章合同盖章
|
2024-11-18 15:21:40 +08:00 |
|
|
|
a7738dbc3a
|
fix:
1.配件价格库禁用按钮调用
|
2024-11-16 12:51:40 +08:00 |
|
|
|
1629349030
|
fix:
1.发运明细单（单证）报表日期汇总显示
(cherry picked from commit 31386ef6dc)
|
2024-11-15 23:58:56 +08:00 |
|
|
|
31386ef6dc
|
fix:
1.发运明细单（单证）报表日期汇总显示
|
2024-11-15 23:56:06 +08:00 |
|
|
|
6b802e04ee
|
fix:
1.发运明细单（单证）报表日期汇总显示
(cherry picked from commit 813c72a5db)
|
2024-11-15 23:47:05 +08:00 |
|
|
|
d7b1da08a7
|
Revert "fix:"
This reverts commit fb56bb116a.
|
2024-11-15 23:40:58 +08:00 |
|
|
|
312f208205
|
fix:
1.word文档书签处理
|
2024-11-15 23:39:27 +08:00 |
|
|
|
78f3330522
|
fix:
1.回填时，只能将信保年度的第一行回填到单据中
|
2024-11-15 23:39:25 +08:00 |
|
|
|
813c72a5db
|
fix:
1.发运明细单（单证）报表日期汇总显示
|
2024-11-15 23:32:22 +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 |
|
|
|
bab8485b37
|
fix:
1.发运明细备注赋值
|
2024-11-14 21:40:16 +08:00 |
|
|
|
8d32ec95a6
|
fix:
1.发运明细备注赋值
|
2024-11-14 21:40:06 +08:00 |
|
|
|
32c084caa4
|
fix:
1.发运明细备注赋值
|
2024-11-14 21:40:01 +08:00 |
|
|
|
c92ad04e0d
|
fix:
1.发运明细备注赋值
|
2024-11-14 21:39:52 +08:00 |
|
|
|
8002035dd3
|
fix:
1.发运明细备注赋值
|
2024-11-14 21:39:48 +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 |
|
|
|
5182295971
|
fix:
1.发运明细备注赋值
|
2024-11-14 20:52:41 +08:00 |
|
|
|
399d28e075
|
fix:
1.订舱通知单分摊金额本位币计算
|
2024-11-14 20:10:21 +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 |
|
|
|
c62ff30599
|
fix:
1.报表处理
2.订舱通知单增加效验
|
2024-11-14 18:50:08 +08:00 |
|
|
|
9102995aa3
|
fix:
1.国贸订单生产线缺少值
|
2024-11-14 15:16:37 +08:00 |
|
|
|
e9b19fe3cd
|
fix:
1.订舱通知单保存报错处理
|
2024-11-14 11:48:12 +08:00 |
|
|
|
a5f7af3567
|
fix:
1.附件上传删除自动删除
|
2024-11-13 21:02:02 +08:00 |
|
|
|
bd421b7f8c
|
fix:
1.附件上传删除自动删除
|
2024-11-13 20:48:07 +08:00 |
|
|
|
1eb311e1fe
|
fix:
1.整机储备申请提交拼接
|
2024-11-13 20:35:23 +08:00 |
|
|
|
b71df461a1
|
fix:
1.储备申请标题
|
2024-11-13 20:35:14 +08:00 |
|
|
|
e8a35daa9f
|
fix:
1.附件上传自动保存
|
2024-11-13 20:35:09 +08:00 |
|
|
|
aeca4ae7d4
|
fix:
1.外销合同系统最大贷记单号排序错误
|
2024-11-13 20:35:00 +08:00 |
|
|
|
f70eec6dce
|
fix:
1.整机储运申请下推到云之家的标题形式为：整机储运申请+业务员+国家+合同号。
|
2024-11-13 20:34:56 +08:00 |
|
|
|
873234cfda
|
fix:
1.发货明细表（未发货）起运港 目的港没有带出来
|
2024-11-13 20:34:46 +08:00 |
|
|
|
dece3cf388
|
fix:
1.业务分类为整机、提成分类为整机且是否赠品为否
|
2024-11-13 20:34:39 +08:00 |
|
|
|
3f3fab9aea
|
fix:
1.资源确认时，资源号必填
|
2024-11-13 20:34:30 +08:00 |
|
|
|
d1605cb6e7
|
fix:
1.资源确认时，资源号必填
|
2024-11-13 20:34:26 +08:00 |
|
|
|
386062cc11
|
fix:
1.152订舱通知单：订单总台数未更新
|
2024-11-13 20:34:17 +08:00 |
|
|
|
8098107719
|
fix:
1.销售提成-整机 功能完善
|
2024-11-13 20:34:14 +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 |
|
|
|
a1ee8acc93
|
fix:
1.外销合同系统最大贷记单号排序错误
|
2024-11-13 16:21:03 +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 |
|
|
|
425d7d29a2
|
fix:
1.订舱通知单提交效验汇总明细信息分录数量
|
2024-11-12 18:07:07 +08:00 |
|
|
|
d755bffaee
|
fix:
1.订舱通知单保存汇总明细信息分录数量
2.注册优化
|
2024-11-12 17:45:44 +08:00 |
|
|
|
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 |
|
