Commit Graph

331 Commits

Author SHA1 Message Date
ljw
45117092b3 fix:外销合同提交效验 2024-09-14 18:13:34 +08:00
ljw
56ca1a1883 fix:外销合同提交效验 2024-09-14 17:52:00 +08:00
ljw
b8eddb1823 fix:外销合同提交效验 2024-09-14 17:51:37 +08:00
ljw
eb2c1c4a3e fix:贷记单客户更改为集团客户 2024-09-14 16:30:25 +08:00
zzs01@yunemao.com
4f2b123a08 Merge remote-tracking branch 'origin/test' into test 2024-09-14 16:14:58 +08:00
zzs01@yunemao.com
1f2e6ec504 fix:发货联系书款项到位情况 2024-09-14 16:14:51 +08:00
ljw
599aa65181 fix:贷记单客户更改为集团客户 2024-09-14 14:29:28 +08:00
ljw
15361766d5 fix:贷记单客户更改为集团客户 2024-09-13 17:55:45 +08:00
ljw
6d7975611d fix:贷记单客户更改为集团客户 2024-09-13 17:51:45 +08:00
ljw
571bb72581 fix:外销合同数量汇总 2024-09-13 16:13:10 +08:00
ljw
d607e346c1 fix:外销合同数量汇总 2024-09-13 16:12:50 +08:00
ljw
ff56780319 fix:外销合同报错处理 2024-09-13 13:35:16 +08:00
ljw
64faacc5b6 fix:外销合同报错处理 2024-09-13 13:35:15 +08:00
ljw
38287ec1cb fix:业务分类为整机并且是否赠品为否的时候汇总 2024-09-13 13:35:14 +08:00
ljw
95b5de8af1 fix:业务分类为整机并且是否赠品为是的必填 2024-09-13 13:35:13 +08:00
ljw
9e041625db fix:外销合同报错处理 2024-09-13 13:16:18 +08:00
ljw
09b784dec7 fix:外销合同报错处理 2024-09-13 13:16:17 +08:00
ljw
323bb9997e fix:业务分类为整机并且是否赠品为否的时候汇总 2024-09-13 12:57:42 +08:00
ljw
254308bdc5 fix:业务分类为整机并且是否赠品为是的必填 2024-09-13 12:57:41 +08:00
ljw
598d498aaa fix:业务分类为整机并且是否赠品为否的时候汇总 2024-09-13 11:27:26 +08:00
ljw
38b30e43ec fix:外销合同保存效验 2024-09-12 20:36:56 +08:00
ljw
546031f7c1 fix:外销合同保存效验 2024-09-12 20:36:55 +08:00
ljw
1ae18e6a7d fix:外销合同保存效验 2024-09-12 20:23:12 +08:00
ljw
39afb0d07a fix:外销合同保存效验 2024-09-12 20:11:39 +08:00
ljw
05b7799960 fix:云之家获取按钮 2024-09-12 17:37:41 +08:00
ljw
043c719773 fix:云之家获取按钮 2024-09-12 16:58:37 +08:00
zzs01@yunemao.com
e61f6fe6f5 Merge branch 'dev-comp-price' into test 2024-09-12 16:17:00 +08:00
zzs01@yunemao.com
91e9efd122 feat:整机价格 2024-09-12 16:11:42 +08:00
zzs01@yunemao.com
85d54a455f feat:整机价格 2024-09-12 16:06:25 +08:00
zzs01@yunemao.com
3d344212fc Merge branch 'dev-comp-price' into test
# Conflicts:
#	src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java
2024-09-12 15:51:23 +08:00
zzs01@yunemao.com
788f9a2aa8 feat:整机价格 2024-09-12 15:49:08 +08:00
zzs01@yunemao.com
135a1b4b5a fix:贷记单审核校验 2024-09-12 15:15:17 +08:00
ljw
f59cf5c382 fix:礼品领用申请审核 2024-09-12 11:35:29 +08:00
ljw
b9f79c2e8e fix:礼品领用申请审核 2024-09-12 11:35:07 +08:00
zzs01@yunemao.com
d91e0df71d fix:贷记单审核校验 2024-09-12 10:40:44 +08:00
b8cd25b566 Merge branch 'refs/heads/dev-plm' into test 2024-09-11 22:10:38 +08:00
bfd822f79f fix:时间更新 2024-09-11 22:10:04 +08:00
317ac7fd93 fix:时间更新 2024-09-11 21:57:13 +08:00
a1992cf25a fix:子件英文名称 2024-09-11 21:05:17 +08:00
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
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
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
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
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
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
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
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
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
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