|
|
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 |
|
|
|
194d791d62
|
fix:发运明细表报错处理
|
2024-09-21 20:41:48 +08:00 |
|
|
|
6b2bb8715e
|
fix:发运明细表报错处理
|
2024-09-21 16:09:06 +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 |
|
|
|
b4e48b88a8
|
fix:配件未发货明细表逻辑修改
|
2024-09-20 20:18:58 +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 |
|
|
|
6f77354be4
|
配件已发货明细表逻辑修改
|
2024-09-11 20:05:08 +08:00 |
|
|
|
52391d9725
|
Merge branch 'test'
|
2024-09-11 15:34:24 +08:00 |
|
|
|
5446b00e36
|
配件已发货明细表逻辑修改
|
2024-09-11 15:34:19 +08:00 |
|
|
|
b5671aea9f
|
配件未发货明细表逻辑修改
|
2024-09-11 15:34:18 +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
|
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
|
64b6d83aa5
|
Revert "chore:untrack Application.java"
This reverts commit 9d2e4db858.
|
2024-09-11 09:17:36 +08:00 |
|
zzs01@yunemao.com
|
9d2e4db858
|
chore:untrack Application.java
|
2024-09-11 09:14:06 +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
|
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 |
|
|
|
75850fd0e1
|
外销合同：提交效验附件面板是否有值
|
2024-09-10 14:29:02 +08:00 |
|
|
|
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 |
|
|
|
d553b4b1c6
|
外销合同：提交效验附件面板是否有值
|
2024-09-09 18:14:43 +08:00 |
|
zzs01@yunemao.com
|
fc74f1b690
|
wip:PLM匹配
|
2024-09-09 17:58:30 +08:00 |
|
zzs01@yunemao.com
|
a9e19605a4
|
wip:PLM匹配，生成替换关系
|
2024-09-09 16:23:41 +08:00 |
|
|
|
c11b14cf95
|
销售出库审核效验
|
2024-09-09 15:48:44 +08:00 |
|
zzs01@yunemao.com
|
5b224777e5
|
wip:PLM匹配，生成替换关系
|
2024-09-09 15:31:49 +08:00 |
|
|
|
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 |
|
|
|
532173b6dc
|
Merge branch 'dev-change' into test
|
2024-09-09 11:29:51 +08:00 |
|
|
|
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 |
|
|
|
a70870989d
|
Revert "配件发货明细表（已发货）"
This reverts commit d2f0ee555b.
|
2024-09-09 10:34:54 +08:00 |
|
|
|
d2f0ee555b
|
配件发货明细表（已发货）
|
2024-09-09 10:33:07 +08:00 |
|
|
|
d69ed19b26
|
Application
|
2024-09-09 10:32:51 +08:00 |
|
zzs01@yunemao.com
|
a3757c38ed
|
Merge branch 'fix-report-zzs' into test
|
2024-09-09 10:30:55 +08:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
9be8a84a57
|
配件发货明细表（已发货）
|
2024-09-07 14:07:21 +08:00 |
|
|
|
1c85620d5b
|
出口报关明细开票金额更换
|
2024-09-07 14:07:21 +08:00 |
|
|
|
671b33287d
|
配件发货明细表（已发货）
|
2024-09-07 11:20:47 +08:00 |
|
|
|
26d48a62e2
|
出口报关明细开票金额更换
|
2024-09-07 10:40:01 +08:00 |
|
|
|
22da2d8574
|
Merge branch 'test' into dev-ljw
|
2024-09-07 10:36:07 +08:00 |
|
|
|
0937b74657
|
Merge branch 'refs/heads/dev-book-payment' into test
|
2024-09-06 20:51:34 +08:00 |
|
|
|
cea38280d9
|
feat:发货联系书款项信息
|
2024-09-06 20:51:16 +08:00 |
|
|
|
d8d13f7dbc
|
Merge branch 'refs/heads/fix-report-zzs' into test
|
2024-09-06 19:28:09 +08:00 |
|
|
|
1e25a581d2
|
feat:发货联系书款项信息
|
2024-09-06 19:25:18 +08:00 |
|
|
|
9928b2fb86
|
change:国贸订单明细
|
2024-09-06 19:23:43 +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 |
|
|
|
dea7868d6b
|
发运明细表（未发货）修复
|
2024-09-06 17:37:23 +08:00 |
|
zzs01@yunemao.com
|
752f50ebc3
|
Merge branch 'fix-report-zzs' into test
|
2024-09-06 15:34:52 +08:00 |
|
zzs01@yunemao.com
|
7f3dcb4e65
|
Merge branch 'fix-report-zzs'
|
2024-09-06 15:34:43 +08:00 |
|
zzs01@yunemao.com
|
51d8af6a7d
|
change:整机发运明细表
|
2024-09-06 15:34:25 +08:00 |
|
|
|
5a31c48ff2
|
配件发货明细表（未发货）
|
2024-09-06 15:23:53 +08:00 |
|
|
|
fbe6d5d043
|
配件发货明细表（未发货）
|
2024-09-06 15:23:03 +08:00 |
|
zzs01@yunemao.com
|
0c6187c580
|
Merge branch 'fix-report-zzs' into test
|
2024-09-06 14:05:47 +08:00 |
|
zzs01@yunemao.com
|
3a8c70150c
|
Merge branch 'fix-report-zzs'
|
2024-09-06 14:02:36 +08:00 |
|
|
|
50f0645265
|
发运明细表（提成）修复
|
2024-09-06 14:02:23 +08:00 |
|
|
|
13f5145fc2
|
明细报表开发
|
2024-09-06 14:02:23 +08:00 |
|
|
|
177a6d76b0
|
发运明细表（提成）修复
|
2024-09-06 11:40:36 +08:00 |
|
|
|
03e2317d6f
|
明细报表开发
|
2024-09-06 10:45:02 +08:00 |
|
zzs01@yunemao.com
|
b5900ccd56
|
change:整机发运明细表
|
2024-09-06 10:22:15 +08:00 |
|
|
|
8dc3b760ed
|
Merge branch 'refs/heads/fix-report-zzs' into test
|
2024-09-05 22:19:49 +08:00 |
|
|
|
3ec42e3ae9
|
明细报表开发
|
2024-09-05 22:19:41 +08:00 |
|
|
|
36e7cc6dc2
|
明细报表开发
|
2024-09-05 22:19:40 +08:00 |
|
|
|
b157236768
|
明细报表开发
|
2024-09-05 22:17:50 +08:00 |
|
|
|
a97d42f812
|
fix:国贸订单详情
|
2024-09-05 22:11:12 +08:00 |
|
|
|
dcd89945fa
|
明细报表开发
|
2024-09-05 21:54:57 +08:00 |
|
|
|
d427f6a104
|
Merge branch 'refs/heads/fix-report-zzs' into test
|
2024-09-05 21:39:38 +08:00 |
|
|
|
fc33b58c8e
|
fix:报表产品分类多选
|
2024-09-05 21:39:16 +08:00 |
|
|
|
883c25593e
|
明细报表开发
|
2024-09-05 21:28:20 +08:00 |
|
|
|
87c2587c0d
|
明细报表开发
|
2024-09-05 21:27:23 +08:00 |
|
|
|
0ed12d3870
|
Merge branch 'refs/heads/fix-report-zzs' into test
|
2024-09-05 21:25:43 +08:00 |
|
|
|
1d42c39d8c
|
change:报表产品分类多选
|
2024-09-05 20:44:19 +08:00 |
|
|
|
0c6cee0fae
|
Merge remote-tracking branch 'origin/dev-ljw' into test
|
2024-09-05 19:57:31 +08:00 |
|
|
|
abaa19acdc
|
明细报表开发
|
2024-09-05 19:43:27 +08:00 |
|
|
|
8d9af3df5e
|
change:销售提成整机
|
2024-09-05 19:31:51 +08:00 |
|
zzs01@yunemao.com
|
d65809238c
|
Merge branch 'fix-report-zzs'
|
2024-09-05 15:56:58 +08:00 |
|
zzs01@yunemao.com
|
8be25973c9
|
Merge branch 'fix-report-zzs' into test
|
2024-09-05 15:52:50 +08:00 |
|
zzs01@yunemao.com
|
db5e6c097d
|
Merge branch 'dev-declaration' into test
|
2024-09-05 15:52:41 +08:00 |
|
zzs01@yunemao.com
|
a8fef3ed3b
|
change:国贸订单明细
|
2024-09-05 15:51:44 +08:00 |
|
zzs01@yunemao.com
|
fb84350512
|
change:销售提成整机
|
2024-09-05 15:39:16 +08:00 |
|
zzs01@yunemao.com
|
33ec5c134e
|
change:国贸订单明细（生产线）
|
2024-09-05 15:15:15 +08:00 |
|
zzs01@yunemao.com
|
4801a0c93c
|
change:国贸订单明细（生产线）
|
2024-09-05 14:59:01 +08:00 |
|
zzs01@yunemao.com
|
1997d31018
|
change:销售提成整机
|
2024-09-05 14:45:26 +08:00 |
|
