Commit Graph

68 Commits

Author SHA1 Message Date
ljw
a5445de5c4 fix:配件价格库获取标准价条件增加 2024-10-18 19:12:57 +08:00
ljw
c6c15c007b fix:二开公共类 2024-10-18 18:28:17 +08:00
zzs01@yunemao.com
d6e971c34f wip:获取标准价:FOB与FCA费用差额标配FOB(青岛)价 2024-10-18 18:20:34 +08:00
ljw
e84cafc61d fix:审核时根据合同号获取财务信息《价税合计》汇总,将单据编号拼接(包含当前单 2024-10-18 18:15:53 +08:00
ljw
ccde1671b9 fix:配件价格库获取标准价条件增加 2024-10-18 14:41:59 +08:00
zzs
d666656ff4 fix:物料长宽高检查 2024-10-14 22:06:06 +08:00
zzs
a09e00a0a2 feat:物料长宽高赠品不判断 2024-10-14 21:58:35 +08:00
676b128aa6 1.修改贷记单提交后获取上次贷记单号节点 2024-10-08 15:42:44 +08:00
ljw
9d395b1f7b fix:计算闲置期倒计时 2024-10-08 15:41:49 +08:00
ljw
be7e31fae5 fix:内审预算单 2024-09-27 22:33:02 +08:00
ljw
5d6265f122 fix:产品经理下单确认报错 2024-09-26 14:22:48 +08:00
ljw
1d4466e3e5 fix:时间计算 2024-09-24 21:47:59 +08:00
ljw
060992387b fix:赠品行净重下单确认时不必填 2024-09-24 21:47:22 +08:00
ljw
d180dc7f14 fix:询价单审核时,价格库的禁用状态更新为可用 2024-09-21 20:41:49 +08:00
ljw
449f6a8a8b fix:询价单替换 2024-09-20 21:43:19 +08:00
ljw
e86bf0bb29 fix:保存时,按照 客户所在国 +买方英文名称+类型+信保限额申请 (4个字段,以空格间隔,拼接生成) 2024-09-20 20:18:57 +08:00
ljw
0091e8c9f7 fix:询价单过滤 2024-09-20 20:18:56 +08:00
ljw
ed0b238480 fix:工厂价逻辑取消 2024-09-20 20:18:56 +08:00
ljw
88510b0c60 fix:跟单任务控制台整机下拉值控制 2024-09-19 17:08:36 +08:00
ljw
ff033202d9 fix:调拨订单申请单提交效验 2024-09-18 22:38:56 +08:00
ljw
15361766d5 fix:贷记单客户更改为集团客户 2024-09-13 17:55:45 +08:00
zzs01@yunemao.com
135a1b4b5a fix:贷记单审核校验 2024-09-12 15:15:17 +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
70fefff998 fix:折扣率计算
(cherry picked from commit 9b0ddf97e2)
2024-09-11 09:36:40 +08:00
zzs01@yunemao.com
0cffc88208 Merge branch 'fix-discount-rate' into test 2024-09-10 19:02:00 +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
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
e524223637 销售出库审核效验 2024-09-10 14:29:02 +08:00
ljw
c11b14cf95 销售出库审核效验 2024-09-09 15:48:44 +08:00
ljw
532173b6dc Merge branch 'dev-change' into test 2024-09-09 11:29:51 +08:00
zzs01@yunemao.com
0c6187c580 Merge branch 'fix-report-zzs' into test 2024-09-06 14:05:47 +08:00
ljw
13f5145fc2 明细报表开发 2024-09-06 14:02:23 +08:00
ljw
12a633c0d4 询价单二开
# Conflicts:
#	src/main/java/com/yem/wm/im/inquirylist/form/InquirylistEdit.java
2024-09-04 20:35:27 +08:00
8d4dfbe487 Merge remote-tracking branch 'origin/dev-price' into test
# Conflicts:
#	src/main/java/com/yem/wm/es/storagetrans/form/StorageTransEdit_wl.java
2024-09-03 20:32:01 +08:00
ljw
0278d6e8e4 运输方式+费用项目+港口唯一 2024-09-02 21:18:20 +08:00
ljw
281f5c5207 至不允许小于等于从
从不能小于前一行的至
2024-09-02 21:18:20 +08:00
ljw
30bff50325 询价单二开 2024-09-02 19:46:54 +08:00
zzs01@yunemao.com
6039d8867f Revert "feat:服务维修单无权限修改"
This reverts commit eb8fcb0a2d.
2024-09-02 10:40:31 +08:00
zzs01@yunemao.com
eb8fcb0a2d feat:服务维修单无权限修改 2024-09-02 10:21:23 +08:00
zzs01@yunemao.com
26dd984ff8 Merge branch 'dev-ljw' into test 2024-09-02 09:57:27 +08:00
zzs01@yunemao.com
f90e7f8d58 Merge branch 'dev-zzs' into test 2024-09-02 09:57:11 +08:00
zzs01@yunemao.com
7ea350de04 feat:服务维修单无权限修改 2024-09-02 09:34:33 +08:00
ljw
f9511ecb94 运输方式+费用项目+港口唯一 2024-08-31 16:37:44 +08:00
ljw
56b8060d6a 至不允许小于等于从
从不能小于前一行的至
2024-08-31 16:37:28 +08:00
88299446ed feat:作废
(cherry picked from commit b34dff0fdb)
2024-08-31 14:03:14 +08:00
b34dff0fdb feat:作废 2024-08-31 14:02:20 +08:00