Commit Graph

1379 Commits

Author SHA1 Message Date
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
zzs01@yunemao.com
7f3dcb4e65 Merge branch 'fix-report-zzs' 2024-09-06 15:34:43 +08:00
zzs01@yunemao.com
51d8af6a7d change:整机发运明细表 2024-09-06 15:34:25 +08:00
ljw
5a31c48ff2 配件发货明细表(未发货) 2024-09-06 15:23:53 +08:00
ljw
fbe6d5d043 配件发货明细表(未发货) 2024-09-06 15:23:03 +08:00
zzs01@yunemao.com
0c6187c580 Merge branch 'fix-report-zzs' into test 2024-09-06 14:05:47 +08:00
zzs01@yunemao.com
3a8c70150c Merge branch 'fix-report-zzs' 2024-09-06 14:02:36 +08:00
ljw
50f0645265 发运明细表(提成)修复 2024-09-06 14:02:23 +08:00
ljw
13f5145fc2 明细报表开发 2024-09-06 14:02:23 +08:00
ljw
177a6d76b0 发运明细表(提成)修复 2024-09-06 11:40:36 +08:00
ljw
03e2317d6f 明细报表开发 2024-09-06 10:45:02 +08:00
zzs01@yunemao.com
b5900ccd56 change:整机发运明细表 2024-09-06 10:22:15 +08:00
8dc3b760ed Merge branch 'refs/heads/fix-report-zzs' into test 2024-09-05 22:19:49 +08:00
ljw
3ec42e3ae9 明细报表开发 2024-09-05 22:19:41 +08:00
ljw
36e7cc6dc2 明细报表开发 2024-09-05 22:19:40 +08:00
ljw
b157236768 明细报表开发 2024-09-05 22:17:50 +08:00
a97d42f812 fix:国贸订单详情 2024-09-05 22:11:12 +08:00
ljw
dcd89945fa 明细报表开发 2024-09-05 21:54:57 +08:00