Commit Graph

1065 Commits

Author SHA1 Message Date
ljw
0278d6e8e4 运输方式+费用项目+港口唯一 2024-09-02 21:18:20 +08:00
ljw
281f5c5207 至不允许小于等于从
从不能小于前一行的至
2024-09-02 21:18:20 +08:00
zzs01@yunemao.com
3b506f4cca feat:CMMP部件明细表审核校验器 2024-09-02 21:18:20 +08:00
7181e6194c feat:外销合同作废 2024-09-02 20:21:51 +08:00
e4bbc145d8 feat:外销合同是否礼品赠送=是 2024-09-02 20:18:28 +08:00
ljw
30bff50325 询价单二开 2024-09-02 19:46:54 +08:00
8dc728d79f Merge branch 'refs/heads/dev-zzs' into test 2024-09-02 19:46:29 +08:00
ed3913face Merge remote-tracking branch 'origin/dev-zzs' into dev-zzs 2024-09-02 19:46:10 +08:00
5bbcce8539 feat:外销合同作废 2024-09-02 19:45:57 +08:00
zzs01@yunemao.com
2aef6d4619 Merge branch 'dev-zzs' into test 2024-09-02 17:54:45 +08:00
zzs01@yunemao.com
777b1b149e wip:PLM匹配,生成替换关系 2024-09-02 15:09:25 +08:00
zzs01@yunemao.com
0b9bb471d2 feat:货代公司,修改字段类型 2024-09-02 11:54:12 +08:00
zzs01@yunemao.com
c1701969f7 fix:销售提成整机,首付款支付日为空 2024-09-02 11:14:27 +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
936313989b feat:订舱委托取消部分字段必填 2024-09-02 10:19:39 +08:00
zzs01@yunemao.com
cdd324831f feat:整机合同带出防水布 2024-09-02 10:18:50 +08:00
zzs01@yunemao.com
f0b12b4959 feat:整机合同带出防水布 2024-09-02 10:18:32 +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
28e8697e2d feat:CMMP部件明细表审核校验器 2024-09-02 09:56:52 +08:00
zzs01@yunemao.com
7dd1363193 feat:订舱委托取消部分字段必填 2024-09-02 09:51:28 +08:00
zzs01@yunemao.com
0f1778e7e3 wip:PLM匹配,生成替换关系 2024-09-02 09:41:57 +08:00
zzs01@yunemao.com
1e074f37ae wip:PLM匹配,生成替换关系 2024-09-02 09:36:08 +08:00
zzs01@yunemao.com
7ea350de04 feat:服务维修单无权限修改 2024-09-02 09:34:33 +08:00
f7147fd98a Merge branch 'refs/heads/test' 2024-08-31 17:51:12 +08:00
4cb081c782 fix:发货联系书欠款校验 2024-08-31 17:50:56 +08:00
ljw
f9511ecb94 运输方式+费用项目+港口唯一 2024-08-31 16:37:44 +08:00
ljw
56b8060d6a 至不允许小于等于从
从不能小于前一行的至
2024-08-31 16:37:28 +08:00
7c052c417a Merge branch 'refs/heads/test' 2024-08-31 14:32:10 +08:00
7d13bfac7e feat:作废 2024-08-31 14:28:38 +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
5155e7aab2 feat:生成贷记单逻辑 2024-08-30 21:50:11 +08:00
73fe7c9407 Merge remote-tracking branch 'origin/test' into test 2024-08-30 21:23:58 +08:00
0862be9930 Merge branch 'refs/heads/dev-zzs' into test 2024-08-30 21:23:45 +08:00
edf4d0d0d6 feat:延付申请拼接标题 2024-08-30 21:23:15 +08:00
7693dc71dd feat:折扣后销售单价计算 2024-08-30 21:22:29 +08:00
zzs01@yunemao.com
ba4c1a8a2a Merge branch 'dev-zzs' into test 2024-08-30 20:43:08 +08:00
97312c2c87 feat:作废 2024-08-30 20:42:51 +08:00
8457b51317 feat:标题拼接 2024-08-30 20:40:36 +08:00
zzs01@yunemao.com
36c95564ea feat:装箱单删除行校验 2024-08-30 20:02:02 +08:00
zzs01@yunemao.com
e301c440ee chore:add merge miss 2024-08-30 18:18:19 +08:00
zzs01@yunemao.com
4134ca0132 Merge branch 'dev-calc' into test
# Conflicts:
#	src/main/java/com/yem/wm/es/storagetrans/form/StorageTransEdit.java
#	src/main/java/com/yem/wm/es/storagetrans/list/StorageTransKDListFilter.java
2024-08-30 18:16:05 +08:00
zzs01@yunemao.com
414689f525 Merge branch 'dev-ljw' into test 2024-08-30 18:15:00 +08:00
zzs01@yunemao.com
4405731da0 feat:外销合同4个公式计算 2024-08-30 18:07:49 +08:00
ljw
12ace7d23a 快递报销明细列表打开过滤 2024-08-30 18:04:23 +08:00
zzs01@yunemao.com
7eb5c3d888 Merge branch 'dev-ljw' into test
# Conflicts:
#	src/main/java/com/yem/wm/es/salesorder/op/SalesOrderSubmitOp.java
#	src/main/java/kd/cosmic/Application.java
2024-08-30 15:42:51 +08:00
ljw
138e2fcedb 外销合同提交时子分录数据汇总到分录 2024-08-30 15:39:40 +08:00
zzs01@yunemao.com
23b0248f08 Merge branch 'dev-zzs' into test 2024-08-30 15:26:47 +08:00