Commit Graph

735 Commits

Author SHA1 Message Date
ljw
05daa5fef8 配件已发货明细表逻辑修改 2024-09-11 20:06:26 +08:00
ljw
5fe4ed062c 配件未发货明细表逻辑修改 2024-09-11 20:06:25 +08:00
ljw
6f77354be4 配件已发货明细表逻辑修改 2024-09-11 20:05:08 +08:00
zzs01@yunemao.com
37fafa359a Merge branch 'dev-plm' into test 2024-09-11 19:47:17 +08:00
zzs01@yunemao.com
44c0d2de38 wip:同步图片 2024-09-11 19:38:38 +08:00
zzs01@yunemao.com
b705f917ea wip:同步图片 2024-09-11 17:50:37 +08:00
zzs01@yunemao.com
6af629d16f wip:同步图片 2024-09-11 17:40:41 +08:00
zzs01@yunemao.com
f99635f3ef wip:生成替换关系 2024-09-11 17:15:40 +08:00
ljw
9bfc3e1847 配件已发货明细表逻辑修改 2024-09-11 16:14:18 +08:00
ljw
52391d9725 Merge branch 'test' 2024-09-11 15:34:24 +08:00
ljw
5446b00e36 配件已发货明细表逻辑修改 2024-09-11 15:34:19 +08:00
ljw
b5671aea9f 配件未发货明细表逻辑修改 2024-09-11 15:34:18 +08:00
ljw
72e155b072 配件已发货明细表逻辑修改 2024-09-11 15:33:38 +08:00
ljw
58078affba 配件未发货明细表逻辑修改 2024-09-11 15:08:38 +08:00
ljw
180f8fbcda 本地类 2024-09-11 15:02:03 +08:00
ljw
23ef73e3ac 外销合同:新增单据报错处理 2024-09-11 14:40:22 +08:00
zzs01@yunemao.com
9817b240bf fix:折扣率计算(价格条款)
(cherry picked from commit e039cda4b4)
2024-09-11 14:40:02 +08:00
zzs01@yunemao.com
fecad339e3 fix:折扣率计算
(cherry picked from commit 13c3d63ac2)
2024-09-11 14:40:01 +08:00
zzs01@yunemao.com
e039cda4b4 fix:折扣率计算(价格条款) 2024-09-11 14:39:10 +08:00
ljw
ae66b4b326 Merge branch 'dev-change' into dev-ljw 2024-09-11 10:52:08 +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
64b6d83aa5 Revert "chore:untrack Application.java"
This reverts commit 9d2e4db858.
2024-09-11 09:17:36 +08:00
zzs01@yunemao.com
a776b0fc4b Revert "update .gitignore"
This reverts commit 0465cb88c4.
2024-09-11 09:17:36 +08:00
zzs01@yunemao.com
0465cb88c4 update .gitignore 2024-09-11 09:16:01 +08:00
zzs01@yunemao.com
9d2e4db858 chore:untrack Application.java 2024-09-11 09:14:06 +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
ljw
c8bf28a942 外销合同:新增单据报错处理 2024-09-10 17:46:51 +08:00
zzs01@yunemao.com
e04dd91174 wip:整机价格 2024-09-10 17:18:11 +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
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