|
|
8d19014968
|
fix:调拨订单申请单提交效验
|
2024-09-18 19:35:10 +08:00 |
|
|
|
612d85537d
|
fix:外销合同提交效验
|
2024-09-14 18:13:58 +08:00 |
|
|
|
45117092b3
|
fix:外销合同提交效验
|
2024-09-14 18:13:34 +08:00 |
|
|
|
56ca1a1883
|
fix:外销合同提交效验
|
2024-09-14 17:52:00 +08:00 |
|
|
|
b8eddb1823
|
fix:外销合同提交效验
|
2024-09-14 17:51:37 +08:00 |
|
|
|
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 |
|
|
|
599aa65181
|
fix:贷记单客户更改为集团客户
|
2024-09-14 14:29:28 +08:00 |
|
|
|
15361766d5
|
fix:贷记单客户更改为集团客户
|
2024-09-13 17:55:45 +08:00 |
|
|
|
6d7975611d
|
fix:贷记单客户更改为集团客户
|
2024-09-13 17:51:45 +08:00 |
|
|
|
571bb72581
|
fix:外销合同数量汇总
|
2024-09-13 16:13:10 +08:00 |
|
|
|
d607e346c1
|
fix:外销合同数量汇总
|
2024-09-13 16:12:50 +08:00 |
|
|
|
ff56780319
|
fix:外销合同报错处理
|
2024-09-13 13:35:16 +08:00 |
|
|
|
64faacc5b6
|
fix:外销合同报错处理
|
2024-09-13 13:35:15 +08:00 |
|
|
|
38287ec1cb
|
fix:业务分类为整机并且是否赠品为否的时候汇总
|
2024-09-13 13:35:14 +08:00 |
|
|
|
95b5de8af1
|
fix:业务分类为整机并且是否赠品为是的必填
|
2024-09-13 13:35:13 +08:00 |
|
|
|
9e041625db
|
fix:外销合同报错处理
|
2024-09-13 13:16:18 +08:00 |
|
|
|
09b784dec7
|
fix:外销合同报错处理
|
2024-09-13 13:16:17 +08:00 |
|
|
|
323bb9997e
|
fix:业务分类为整机并且是否赠品为否的时候汇总
|
2024-09-13 12:57:42 +08:00 |
|
|
|
254308bdc5
|
fix:业务分类为整机并且是否赠品为是的必填
|
2024-09-13 12:57:41 +08:00 |
|
|
|
598d498aaa
|
fix:业务分类为整机并且是否赠品为否的时候汇总
|
2024-09-13 11:27:26 +08:00 |
|
|
|
38b30e43ec
|
fix:外销合同保存效验
|
2024-09-12 20:36:56 +08:00 |
|
|
|
546031f7c1
|
fix:外销合同保存效验
|
2024-09-12 20:36:55 +08:00 |
|
|
|
1ae18e6a7d
|
fix:外销合同保存效验
|
2024-09-12 20:23:12 +08:00 |
|
|
|
39afb0d07a
|
fix:外销合同保存效验
|
2024-09-12 20:11:39 +08:00 |
|
|
|
05b7799960
|
fix:云之家获取按钮
|
2024-09-12 17:37:41 +08:00 |
|
|
|
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 |
|
|
|
f59cf5c382
|
fix:礼品领用申请审核
|
2024-09-12 11:35:29 +08:00 |
|
|
|
b9f79c2e8e
|
fix:礼品领用申请审核
|
2024-09-12 11:35:07 +08:00 |
|
zzs01@yunemao.com
|
d91e0df71d
|
fix:贷记单审核校验
|
2024-09-12 10:40:44 +08:00 |
|
|
|
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
|
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
|
bf656fa44e
|
fix:库区同步定时任务
(cherry picked from commit 618fc6c004)
|
2024-09-10 19:01:30 +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
|
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 |
|
|
|
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
|
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 |
|
|
|
c11b14cf95
|
销售出库审核效验
|
2024-09-09 15:48:44 +08:00 |
|
|
|
532173b6dc
|
Merge branch 'dev-change' into test
|
2024-09-09 11:29:51 +08:00 |
|
|
|
cea38280d9
|
feat:发货联系书款项信息
|
2024-09-06 20:51:16 +08:00 |
|
|
|
1e25a581d2
|
feat:发货联系书款项信息
|
2024-09-06 19:25:18 +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 |
|
zzs01@yunemao.com
|
0c6187c580
|
Merge branch 'fix-report-zzs' into test
|
2024-09-06 14:05:47 +08:00 |
|
|
|
13f5145fc2
|
明细报表开发
|
2024-09-06 14:02:23 +08:00 |
|
|
|
12a633c0d4
|
询价单二开
# Conflicts:
# src/main/java/com/yem/wm/im/inquirylist/form/InquirylistEdit.java
|
2024-09-04 20:35:27 +08:00 |
|
|
|
a19eb6c208
|
订舱通知单，反审核后是否付款变为否
|
2024-09-03 21:56:33 +08:00 |
|
zzs01@yunemao.com
|
b720b5591f
|
feat:收款单校验取值调整
|
2024-09-03 21:56:13 +08:00 |
|
|
|
40cd3bd4e5
|
订舱通知单，审核后是否付款变为是
|
2024-09-03 21:56:13 +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 |
|
zzs01@yunemao.com
|
f57d710de6
|
Merge branch 'dev-zzs' into test
|
2024-09-03 11:23:55 +08:00 |
|
|
|
f70e051b7c
|
订舱通知单，反审核后是否付款变为否
|
2024-09-03 11:23:46 +08:00 |
|
|
|
5c02fd60c5
|
订舱通知单，审核后是否付款变为是
|
2024-09-03 11:23:45 +08:00 |
|
zzs01@yunemao.com
|
c3d07166df
|
feat:收款单校验取值调整
|
2024-09-03 11:22:40 +08:00 |
|
|
|
b9d0be7678
|
订舱通知单，审核后是否付款变为是
|
2024-09-03 10:30:05 +08:00 |
|
|
|
025a400ad2
|
feat:外销合同作废
|
2024-09-02 21:18:20 +08:00 |
|
|
|
63f7458267
|
feat:外销合同是否礼品赠送=是
|
2024-09-02 21:18:20 +08:00 |
|
|
|
c891ae2c75
|
feat:外销合同作废
|
2024-09-02 21:18:20 +08:00 |
|
zzs01@yunemao.com
|
7678ec974e
|
feat:货代公司，修改字段类型
|
2024-09-02 21:18:20 +08:00 |
|
zzs01@yunemao.com
|
f170c82c6b
|
feat:整机合同带出防水布
|
2024-09-02 21:18:20 +08:00 |
|
|
|
0278d6e8e4
|
运输方式+费用项目+港口唯一
|
2024-09-02 21:18:20 +08:00 |
|
|
|
281f5c5207
|
至不允许小于等于从
从不能小于前一行的至
|
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 |
|
|
|
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
|
0b9bb471d2
|
feat:货代公司，修改字段类型
|
2024-09-02 11:54:12 +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
|
7dd1363193
|
feat:订舱委托取消部分字段必填
|
2024-09-02 09:51:28 +08:00 |
|
zzs01@yunemao.com
|
7ea350de04
|
feat:服务维修单无权限修改
|
2024-09-02 09:34:33 +08:00 |
|
|
|
4cb081c782
|
fix:发货联系书欠款校验
|
2024-08-31 17:50:56 +08:00 |
|
|
|
f9511ecb94
|
运输方式+费用项目+港口唯一
|
2024-08-31 16:37:44 +08:00 |
|
