|
|
36af563da2
|
Revert "fix:合同签章申请"
This reverts commit 6eddee92ea.
|
2024-09-25 21:58:52 +08:00 |
|
|
|
8050609cad
|
Revert "fix:合同签章申请"
This reverts commit b55fecb7fa.
|
2024-09-25 21:58:51 +08:00 |
|
|
|
b55fecb7fa
|
fix:合同签章申请
|
2024-09-25 16:02:34 +08:00 |
|
|
|
6eddee92ea
|
fix:合同签章申请
|
2024-09-25 14:44:51 +08:00 |
|
|
|
a9b0deebb5
|
fix:报错处理
|
2024-09-24 21:48:48 +08:00 |
|
|
|
1d4466e3e5
|
fix:时间计算
|
2024-09-24 21:47:59 +08:00 |
|
|
|
060992387b
|
fix:赠品行净重下单确认时不必填
|
2024-09-24 21:47:22 +08:00 |
|
|
|
9a6f438937
|
1.修改明细删除行提示null
|
2024-09-24 18:04:46 +08:00 |
|
|
|
8364d05f2a
|
fix:外销合同变更单报错处理
|
2024-09-24 16:32:21 +08:00 |
|
|
|
480b492654
|
fix:外销合同变更单报错处理
|
2024-09-24 15:36:34 +08:00 |
|
zzs01@yunemao.com
|
43c5701dbd
|
fix:发货联系书款项到位情况
|
2024-09-23 22:51:23 +08:00 |
|
|
|
978bdb2b26
|
fix:收款单财务确认功能更改至认领确认后
|
2024-09-23 22:49:42 +08:00 |
|
|
|
ecc9b889ae
|
fix:衣总签章
|
2024-09-23 22:47:46 +08:00 |
|
|
|
3fa79bb04c
|
Revert "fix:合同签章申请服务插件"
This reverts commit b0f6155c4b.
|
2024-09-23 22:46:54 +08:00 |
|
|
|
b0f6155c4b
|
fix:合同签章申请服务插件
|
2024-09-23 22:46:32 +08:00 |
|
|
|
78f5579366
|
fix:收款单报错处理
|
2024-09-23 22:45:45 +08:00 |
|
|
|
377bb236cf
|
fix:删除衣总签章
|
2024-09-23 22:44:24 +08:00 |
|
|
|
c4596c2bf7
|
fix:查询库存报错处理
|
2024-09-23 22:44:19 +08:00 |
|
|
|
f6f86c1d28
|
fix:收款单
|
2024-09-21 22:09:03 +08:00 |
|
|
|
a27582fae7
|
修改表头金额值更新调用保存 提交后调用刷新
|
2024-09-21 20:43:36 +08:00 |
|
|
|
d180dc7f14
|
fix:询价单审核时，价格库的禁用状态更新为可用
|
2024-09-21 20:41:49 +08:00 |
|
|
|
a878e6015d
|
fix:配件价格库禁用按钮调用
|
2024-09-21 16:09:05 +08:00 |
|
|
|
b142e561f8
|
fix:装箱单报错处理
|
2024-09-21 11:05:50 +08:00 |
|
|
|
eef4daa0e8
|
1.增加合同签章只同步pdf格式文件
2.增加回签确认必须上传附件校验
|
2024-09-20 21:44:19 +08:00 |
|
|
|
28e7e9df7a
|
修改标签包含ensign盖章
|
2024-09-20 21:43:29 +08:00 |
|
|
|
11e24c935d
|
fix:申报要素
|
2024-09-20 21:43:26 +08:00 |
|
|
|
b137e168b8
|
fix:配件价格库禁用按钮调用
|
2024-09-20 21:43:23 +08:00 |
|
|
|
449f6a8a8b
|
fix:询价单替换
|
2024-09-20 21:43:19 +08:00 |
|
|
|
ee55ddee6c
|
1.增加外销合同上传附件 只校验 word格式存在标签；
2.增加框架合同上传附件 只校验 word格式存在标签；
3.增加框架合同合同签章同步云之家；
4.增加框架合同签章同步云之家回写；
|
2024-09-20 21:42:45 +08:00 |
|
|
|
68476609dc
|
fix:提交时云之家标题拼接
|
2024-09-20 20:19:24 +08:00 |
|
|
|
d72ac65118
|
fix:配件价格库禁用按钮调用
|
2024-09-20 20:19:00 +08:00 |
|
|
|
6af1233925
|
fix:外销合同所有的物料都重新获取一遍申报要素
|
2024-09-20 20:18:59 +08:00 |
|
|
|
ec6e0ae2f3
|
fix:配件价格库禁用按钮调用
|
2024-09-20 20:18:59 +08:00 |
|
|
|
e86bf0bb29
|
fix:保存时，按照 客户所在国 +买方英文名称+类型+信保限额申请 （4个字段，以空格间隔，拼接生成）
|
2024-09-20 20:18:57 +08:00 |
|
|
|
0091e8c9f7
|
fix:询价单过滤
|
2024-09-20 20:18:56 +08:00 |
|
|
|
ed0b238480
|
fix:工厂价逻辑取消
|
2024-09-20 20:18:56 +08:00 |
|
|
|
4ea3974eec
|
fix:收款单审核改变单据状态
|
2024-09-20 20:18:55 +08:00 |
|
|
|
8c3730356b
|
fix:配件价格库反审核调用
|
2024-09-19 19:19:25 +08:00 |
|
|
|
88510b0c60
|
fix:跟单任务控制台整机下拉值控制
|
2024-09-19 17:08:36 +08:00 |
|
|
|
ae2c51e7e0
|
fix:铭牌数量不允许低于本次非赠品行的整机数量
|
2024-09-19 15:28:34 +08:00 |
|
|
|
80219cf6dd
|
fix:明细信息的销售方式包含CKD时，装柜信息的整机件数不锁定，其他情况都锁定
|
2024-09-18 22:54:47 +08:00 |
|
|
|
727a10a3a3
|
Revert "fix:明细信息的销售方式包含CKD时，装柜信息的整机件数不锁定，其他情况都锁定"
This reverts commit 93fa1a00
|
2024-09-18 22:39:47 +08:00 |
|
|
|
96e7ad5152
|
fix:外销合同软提示
|
2024-09-18 22:38:57 +08:00 |
|
|
|
ff033202d9
|
fix:调拨订单申请单提交效验
|
2024-09-18 22:38:56 +08:00 |
|
|
|
612d85537d
|
fix:外销合同提交效验
|
2024-09-14 18:13:58 +08:00 |
|
|
|
b8eddb1823
|
fix:外销合同提交效验
|
2024-09-14 17:51:37 +08:00 |
|
|
|
eb2c1c4a3e
|
fix:贷记单客户更改为集团客户
|
2024-09-14 16:30:25 +08:00 |
|
|
|
15361766d5
|
fix:贷记单客户更改为集团客户
|
2024-09-13 17:55:45 +08:00 |
|
|
|
571bb72581
|
fix:外销合同数量汇总
|
2024-09-13 16:13:10 +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 |
|
|
|
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 |
|
|
|
05b7799960
|
fix:云之家获取按钮
|
2024-09-12 17:37:41 +08:00 |
|
|
|
043c719773
|
fix:云之家获取按钮
|
2024-09-12 16:58:37 +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 |
|
|
|
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
|
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 |
|
|
|
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 |
|
|
|
56b8060d6a
|
至不允许小于等于从
从不能小于前一行的至
|
2024-08-31 16:37:28 +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 |
|
|
|
5155e7aab2
|
feat:生成贷记单逻辑
|
2024-08-30 21:50:11 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
zzs01@yunemao.com
|
1424d9616a
|
feat:出库报关差值大于不为0，不允许下推
|
2024-08-30 15:17:54 +08:00 |
|
|
|
18d40f65c6
|
快递报销明细列表打开过滤
|
2024-08-30 10:31:20 +08:00 |
|
|
|
9af58dec3a
|
外销合同提交时子分录数据汇总到分录
|
2024-08-30 10:18:52 +08:00 |
|
zzs01@yunemao.com
|
43c219e4b9
|
feat:应回款倒计时调整，加负号
|
2024-08-29 21:15:14 +08:00 |
|
zzs01@yunemao.com
|
0b170c32de
|
feat: 出库报关金额差值（合计）
|
2024-08-29 21:15:14 +08:00 |
|
|
|
b6a819ecfa
|
快递报销明细列表打开过滤
|
2024-08-29 21:14:41 +08:00 |
|
zzs01@yunemao.com
|
1d129a25ed
|
Merge branch 'feat-void-reason'
|
2024-08-29 21:14:09 +08:00 |
|
|
|
f4f7a1a668
|
快递报销明细列表打开过滤
|
2024-08-29 18:29:17 +08:00 |
|
zzs01@yunemao.com
|
7756bbcf57
|
Merge branch 'dev-zzs' into test
|
2024-08-29 18:08:28 +08:00 |
|
|
|
2d76446768
|
外销合同 将子分录的配置英文名称拼接到该字段，拼接格式：
|
2024-08-29 18:07:54 +08:00 |
|
|
|
828106a3ea
|
外销合同 将子分录的配置英文名称拼接到该字段，拼接格式：
|
2024-08-29 18:07:40 +08:00 |
|
zzs01@yunemao.com
|
e4b60d8433
|
feat:应回款倒计时调整，加负号
|
2024-08-29 18:06:14 +08:00 |
|
|
|
aa6a3e0b31
|
外销合同 将子分录的配置英文名称拼接到该字段，拼接格式：
|
2024-08-29 18:03:35 +08:00 |
|
|
|
af565627e5
|
外销合同 将子分录的配置英文名称拼接到该字段，拼接格式：
|
2024-08-29 18:02:25 +08:00 |
|
