Commit Graph

1396 Commits

Author SHA1 Message Date
zzs01@yunemao.com
6db339b94f fix:贷记单提交报错 2024-09-10 14:36:51 +08:00
ljw
75850fd0e1 外销合同:提交效验附件面板是否有值 2024-09-10 14:29:02 +08:00
ljw
e524223637 销售出库审核效验 2024-09-10 14:29:02 +08:00
zzs01@yunemao.com
7bbd8ddc54 fix:生成替换关系 2024-09-10 14:27:50 +08:00
zzs01@yunemao.com
d195e76bbf fix:生成替换关系 2024-09-10 09:54:15 +08:00
zzs01@yunemao.com
e96e8dd38f update .gitignore 2024-09-10 09:21:21 +08:00
zzs01@yunemao.com
7b5163db99 Merge branch 'dev-plm' into test 2024-09-09 18:14:48 +08:00
ljw
d553b4b1c6 外销合同:提交效验附件面板是否有值 2024-09-09 18:14:43 +08:00
zzs01@yunemao.com
51e0d68059 wip:整机价格 2024-09-09 18:14:04 +08:00
zzs01@yunemao.com
fc74f1b690 wip:PLM匹配 2024-09-09 17:58:30 +08:00
zzs01@yunemao.com
1c5a7e853f wip:获取标准价 2024-09-09 17:54:35 +08:00
zzs01@yunemao.com
a27d050b49 wip:获取标准价:销售FCA标配青岛单价、金额 2024-09-09 17:30:04 +08:00
zzs01@yunemao.com
5a2d7edaa0 wip:获取标准价:FOB与FCA费用差额标配FOB(青岛)价 2024-09-09 17:15:34 +08:00
ljw
2beaa7f72c 外销合同:提交效验附件面板是否有值 2024-09-09 17:06:58 +08:00
zzs01@yunemao.com
a9e19605a4 wip:PLM匹配,生成替换关系 2024-09-09 16:23:41 +08:00
ljw
c11b14cf95 销售出库审核效验 2024-09-09 15:48:44 +08:00
zzs01@yunemao.com
5b224777e5 wip:PLM匹配,生成替换关系 2024-09-09 15:31:49 +08:00
ljw
e2d3be798e Merge branch 'fix-report-zzs' 2024-09-09 11:47:41 +08:00
zzs01@yunemao.com
9f60bc0f0c wip:PLM匹配,生成替换关系 2024-09-09 11:45:33 +08:00
ljw
532173b6dc Merge branch 'dev-change' into test 2024-09-09 11:29:51 +08:00
ljw
071236a7ef Merge branch 'dev-ljw' into test 2024-09-09 11:29:47 +08:00
ljw
f591dd136c Merge branch 'dev-price' into test 2024-09-09 11:29:42 +08:00
ljw
1bc08b00a9 Merge branch 'dev-zzs' into test 2024-09-09 11:29:34 +08:00
zzs01@yunemao.com
2c1de947e9 Merge remote-tracking branch 'origin/test' into test 2024-09-09 10:37:43 +08:00
ljw
a70870989d Revert "配件发货明细表(已发货)"
This reverts commit d2f0ee555b.
2024-09-09 10:34:54 +08:00
ljw
d2f0ee555b 配件发货明细表(已发货) 2024-09-09 10:33:07 +08:00
ljw
d69ed19b26 Application 2024-09-09 10:32:51 +08:00
zzs01@yunemao.com
a3757c38ed Merge branch 'fix-report-zzs' into test 2024-09-09 10:30:55 +08:00
ljw
3c938c0b6d Merge branch 'dev-plm' into test 2024-09-09 10:29:12 +08:00
zzs01@yunemao.com
d442546b87 wip:PLM匹配,生成替换关系 2024-09-09 10:27:18 +08:00
zzs01@yunemao.com
17228240da fix:出口报关明细报表 2024-09-09 09:53:12 +08:00
ljw
f80ab3761c 出口报关明细开票金额更换 2024-09-09 09:31:17 +08:00
zzs01@yunemao.com
68359ed3dd Revert "fix:出口报关明细报表"
This reverts commit 9783f6cbb0.
2024-09-09 09:31:04 +08:00
zzs01@yunemao.com
ae32277b96 Merge branch 'main' into dev-zzs
# Conflicts:
#	src/main/java/com/yem/wm/es/salesorder/validator/SaleOrdeExportisVoidValidator.java
2024-09-09 09:20:00 +08:00
zzs01@yunemao.com
9783f6cbb0 fix:出口报关明细报表 2024-09-09 09:17:29 +08:00
zzs01@yunemao.com
5d2c224238 Merge branch 'dev-declaration' into fix-report-zzs 2024-09-09 09:14:41 +08:00
ljw
9be8a84a57 配件发货明细表(已发货) 2024-09-07 14:07:21 +08:00
ljw
1c85620d5b 出口报关明细开票金额更换 2024-09-07 14:07:21 +08:00
ljw
671b33287d 配件发货明细表(已发货) 2024-09-07 11:20:47 +08:00
ljw
26d48a62e2 出口报关明细开票金额更换 2024-09-07 10:40:01 +08:00
ljw
22da2d8574 Merge branch 'test' into dev-ljw 2024-09-07 10:36:07 +08:00
0937b74657 Merge branch 'refs/heads/dev-book-payment' into test 2024-09-06 20:51:34 +08:00
cea38280d9 feat:发货联系书款项信息 2024-09-06 20:51:16 +08:00
d8d13f7dbc Merge branch 'refs/heads/fix-report-zzs' into test 2024-09-06 19:28:09 +08:00
1e25a581d2 feat:发货联系书款项信息 2024-09-06 19:25:18 +08:00
9928b2fb86 change:国贸订单明细 2024-09-06 19:23:43 +08:00
ljw
a26db3adf6 feat:发货联系书款项信息 2024-09-06 19:06:42 +08:00
zzs01@yunemao.com
ddb6ffd8b7 feat:发货联系书款项信息 2024-09-06 19:01:56 +08:00
ljw
dea7868d6b 发运明细表(未发货)修复 2024-09-06 17:37:23 +08:00
zzs01@yunemao.com
752f50ebc3 Merge branch 'fix-report-zzs' into test 2024-09-06 15:34:52 +08:00