zzs01@yunemao.com
|
e039cda4b4
|
fix:折扣率计算（价格条款）
|
2024-09-11 14:39:10 +08:00 |
|
zzs01@yunemao.com
|
13c3d63ac2
|
fix:折扣率计算
|
2024-09-11 10:30:18 +08:00 |
|
zzs01@yunemao.com
|
70fefff998
|
fix:折扣率计算
(cherry picked from commit 9b0ddf97e2)
|
2024-09-11 09:36:40 +08:00 |
|
zzs01@yunemao.com
|
9b0ddf97e2
|
fix:折扣率计算
|
2024-09-11 09:33:35 +08:00 |
|
zzs01@yunemao.com
|
494f1bc86e
|
change:折扣率计算
|
2024-09-10 19:31:13 +08:00 |
|
zzs01@yunemao.com
|
0cffc88208
|
Merge branch 'fix-discount-rate' into test
|
2024-09-10 19:02:00 +08:00 |
|
zzs01@yunemao.com
|
bf656fa44e
|
fix:库区同步定时任务
(cherry picked from commit 618fc6c004)
|
2024-09-10 19:01:30 +08:00 |
|
zzs01@yunemao.com
|
618fc6c004
|
fix:库区同步定时任务
|
2024-09-10 19:00:49 +08:00 |
|
zzs01@yunemao.com
|
ad42a15754
|
change:折扣率计算
|
2024-09-10 19:00:19 +08:00 |
|
zzs01@yunemao.com
|
a807b931db
|
Merge branch 'refs/heads/fix-warehouse' into test
|
2024-09-10 16:46:13 +08:00 |
|
zzs01@yunemao.com
|
f6f7a2185f
|
change:订单产品需求单下推库区库位携带取消
|
2024-09-10 16:27:39 +08:00 |
|
zzs01@yunemao.com
|
138a2b9a16
|
Merge branch 'dev-plm' into test
|
2024-09-10 15:38:59 +08:00 |
|
zzs01@yunemao.com
|
3eb9de8d7b
|
fix:生成替换关系
|
2024-09-10 15:38:40 +08:00 |
|
zzs01@yunemao.com
|
e8d228de8e
|
fix:贷记单提交报错
(cherry picked from commit 6db339b94f)
|
2024-09-10 14:37:27 +08:00 |
|
zzs01@yunemao.com
|
6db339b94f
|
fix:贷记单提交报错
|
2024-09-10 14:36:51 +08:00 |
|
|
|
75850fd0e1
|
外销合同：提交效验附件面板是否有值
|
2024-09-10 14:29:02 +08:00 |
|
|
|
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
|
7b5163db99
|
Merge branch 'dev-plm' into test
|
2024-09-09 18:14:48 +08:00 |
|
|
|
d553b4b1c6
|
外销合同：提交效验附件面板是否有值
|
2024-09-09 18:14:43 +08:00 |
|
zzs01@yunemao.com
|
fc74f1b690
|
wip:PLM匹配
|
2024-09-09 17:58:30 +08:00 |
|
zzs01@yunemao.com
|
a9e19605a4
|
wip:PLM匹配，生成替换关系
|
2024-09-09 16:23:41 +08:00 |
|
|
|
c11b14cf95
|
销售出库审核效验
|
2024-09-09 15:48:44 +08:00 |
|
zzs01@yunemao.com
|
5b224777e5
|
wip:PLM匹配，生成替换关系
|
2024-09-09 15:31:49 +08:00 |
|
|
|
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 |
|
|
|
532173b6dc
|
Merge branch 'dev-change' into test
|
2024-09-09 11:29:51 +08:00 |
|
|
|
071236a7ef
|
Merge branch 'dev-ljw' into test
|
2024-09-09 11:29:47 +08:00 |
|
zzs01@yunemao.com
|
2c1de947e9
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-09 10:37:43 +08:00 |
|
|
|
a70870989d
|
Revert "配件发货明细表（已发货）"
This reverts commit d2f0ee555b.
|
2024-09-09 10:34:54 +08:00 |
|
|
|
d2f0ee555b
|
配件发货明细表（已发货）
|
2024-09-09 10:33:07 +08:00 |
|
zzs01@yunemao.com
|
a3757c38ed
|
Merge branch 'fix-report-zzs' into test
|
2024-09-09 10:30:55 +08:00 |
|
|
|
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 |
|
|
|
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
|
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 |
|
|
|
9be8a84a57
|
配件发货明细表（已发货）
|
2024-09-07 14:07:21 +08:00 |
|
|
|
1c85620d5b
|
出口报关明细开票金额更换
|
2024-09-07 14:07:21 +08:00 |
|
|
|
671b33287d
|
配件发货明细表（已发货）
|
2024-09-07 11:20:47 +08:00 |
|
|
|
26d48a62e2
|
出口报关明细开票金额更换
|
2024-09-07 10:40:01 +08:00 |
|
|
|
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 |
|
|
|
a26db3adf6
|
feat:发货联系书款项信息
|
2024-09-06 19:06:42 +08:00 |
|
zzs01@yunemao.com
|
ddb6ffd8b7
|
feat:发货联系书款项信息
|
2024-09-06 19:01:56 +08:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
50f0645265
|
发运明细表（提成）修复
|
2024-09-06 14:02:23 +08:00 |
|
|
|
13f5145fc2
|
明细报表开发
|
2024-09-06 14:02:23 +08:00 |
|
|
|
177a6d76b0
|
发运明细表（提成）修复
|
2024-09-06 11:40:36 +08:00 |
|
|
|
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 |
|
|
|
3ec42e3ae9
|
明细报表开发
|
2024-09-05 22:19:41 +08:00 |
|
|
|
36e7cc6dc2
|
明细报表开发
|
2024-09-05 22:19:40 +08:00 |
|
|
|
b157236768
|
明细报表开发
|
2024-09-05 22:17:50 +08:00 |
|
|
|
a97d42f812
|
fix:国贸订单详情
|
2024-09-05 22:11:12 +08:00 |
|
|
|
dcd89945fa
|
明细报表开发
|
2024-09-05 21:54:57 +08:00 |
|
|
|
d427f6a104
|
Merge branch 'refs/heads/fix-report-zzs' into test
|
2024-09-05 21:39:38 +08:00 |
|
|
|
fc33b58c8e
|
fix:报表产品分类多选
|
2024-09-05 21:39:16 +08:00 |
|
|
|
883c25593e
|
明细报表开发
|
2024-09-05 21:28:20 +08:00 |
|
|
|
87c2587c0d
|
明细报表开发
|
2024-09-05 21:27:23 +08:00 |
|
|
|
0ed12d3870
|
Merge branch 'refs/heads/fix-report-zzs' into test
|
2024-09-05 21:25:43 +08:00 |
|
|
|
1d42c39d8c
|
change:报表产品分类多选
|
2024-09-05 20:44:19 +08:00 |
|
|
|
0c6cee0fae
|
Merge remote-tracking branch 'origin/dev-ljw' into test
|
2024-09-05 19:57:31 +08:00 |
|
|
|
abaa19acdc
|
明细报表开发
|
2024-09-05 19:43:27 +08:00 |
|
|
|
8d9af3df5e
|
change:销售提成整机
|
2024-09-05 19:31:51 +08:00 |
|
zzs01@yunemao.com
|
d65809238c
|
Merge branch 'fix-report-zzs'
|
2024-09-05 15:56:58 +08:00 |
|
zzs01@yunemao.com
|
8be25973c9
|
Merge branch 'fix-report-zzs' into test
|
2024-09-05 15:52:50 +08:00 |
|
zzs01@yunemao.com
|
db5e6c097d
|
Merge branch 'dev-declaration' into test
|
2024-09-05 15:52:41 +08:00 |
|
zzs01@yunemao.com
|
a8fef3ed3b
|
change:国贸订单明细
|
2024-09-05 15:51:44 +08:00 |
|
zzs01@yunemao.com
|
fb84350512
|
change:销售提成整机
|
2024-09-05 15:39:16 +08:00 |
|
zzs01@yunemao.com
|
33ec5c134e
|
change:国贸订单明细（生产线）
|
2024-09-05 15:15:15 +08:00 |
|
zzs01@yunemao.com
|
4801a0c93c
|
change:国贸订单明细（生产线）
|
2024-09-05 14:59:01 +08:00 |
|
zzs01@yunemao.com
|
1997d31018
|
change:销售提成整机
|
2024-09-05 14:45:26 +08:00 |
|
zzs01@yunemao.com
|
d1fd8b0efc
|
fix:出口报关明细报表,实际申报要素
|
2024-09-05 14:32:36 +08:00 |
|
zzs01@yunemao.com
|
ecfcde8156
|
fix:出口报关明细报表,实际申报要素
|
2024-09-05 14:18:43 +08:00 |
|
zzs01@yunemao.com
|
3118ea1501
|
change:销售提成整机
|
2024-09-05 14:14:17 +08:00 |
|
zzs01@yunemao.com
|
d98169b17b
|
change:整机发运明细表
|
2024-09-05 11:52:34 +08:00 |
|
zzs01@yunemao.com
|
08a2952879
|
change:整机发运明细表
|
2024-09-05 11:51:35 +08:00 |
|
zzs01@yunemao.com
|
8a571e614a
|
fix:出口报关明细报表,订单号
|
2024-09-05 11:26:30 +08:00 |
|
zzs01@yunemao.com
|
afc3b08ce2
|
fix:出口报关明细报表
|
2024-09-05 11:15:56 +08:00 |
|
zzs01@yunemao.com
|
c026971b54
|
fix:合同号查询错误
|
2024-09-05 10:31:45 +08:00 |
|
zzs01@yunemao.com
|
021d5560d6
|
feat:出口报关数据修复
|
2024-09-05 10:31:33 +08:00 |
|
|
|
12a633c0d4
|
询价单二开
# Conflicts:
# src/main/java/com/yem/wm/im/inquirylist/form/InquirylistEdit.java
|
2024-09-04 20:35:27 +08:00 |
|
|
|
0b5ee97851
|
询价单二开
|
2024-09-04 20:31:51 +08:00 |
|
|
|
a6691b4d9b
|
wip:出口报关明细报表
|
2024-09-04 20:11:03 +08:00 |
|
|
|
e7c5b43607
|
单一窗口报关单给出口报关赋值时同时赋值美元汇率
|
2024-09-04 18:55:12 +08:00 |
|
