|
|
35f1156283
|
fix:发运明细表报错处理
|
2024-09-21 15:49:27 +08:00 |
|
|
|
6d06de8e69
|
fix:配件价格库禁用按钮调用
|
2024-09-21 15:22:06 +08:00 |
|
|
|
8705d697b1
|
Merge branch 'test' into dev-ljw
|
2024-09-21 15:20:28 +08:00 |
|
|
|
163a751eed
|
fix:装箱单报错处理
|
2024-09-21 10:50:17 +08:00 |
|
|
|
7a9fe95e46
|
fix:装箱单报错处理
|
2024-09-21 10:49:42 +08:00 |
|
|
|
7e219c2ee0
|
fix:询价单替换
|
2024-09-20 21:29:05 +08:00 |
|
|
|
fe50c336ee
|
fix:询价单替换
|
2024-09-20 21:28:50 +08:00 |
|
|
|
a559d9c38d
|
fix:配件价格库禁用按钮调用
|
2024-09-20 21:05:36 +08:00 |
|
|
|
8c13ff38a2
|
fix:配件价格库禁用按钮调用
|
2024-09-20 21:05:21 +08:00 |
|
|
|
c33a75aa18
|
fix:申报要素
|
2024-09-20 20:54:53 +08:00 |
|
|
|
e257bc5cb5
|
fix:申报要素
|
2024-09-20 20:54:38 +08:00 |
|
|
|
29a25ef7a9
|
fix:申报要素
|
2024-09-20 20:35:50 +08:00 |
|
|
|
bb9051668f
|
fix:申报要素
|
2024-09-20 20:35:14 +08:00 |
|
|
|
fd3d2f3dbc
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-20 20:13:36 +08:00 |
|
|
|
756bf2c97d
|
修改标签包含ensign盖章
|
2024-09-20 20:13:14 +08:00 |
|
|
|
113c90615d
|
fix:提交时云之家标题拼接
|
2024-09-20 20:12:41 +08:00 |
|
|
|
433d2bc5c2
|
fix:提交时云之家标题拼接
|
2024-09-20 20:12:18 +08:00 |
|
|
|
0d9a6b2eba
|
fix:提交时云之家标题拼接
|
2024-09-20 19:52:21 +08:00 |
|
|
|
942c267b3c
|
fix:配件价格库禁用按钮调用
|
2024-09-20 19:52:20 +08:00 |
|
|
|
0afb9bbc48
|
fix:提交时云之家标题拼接
|
2024-09-20 19:51:48 +08:00 |
|
|
|
29a4e78c25
|
fix:配件价格库禁用按钮调用
|
2024-09-20 19:40:59 +08:00 |
|
|
|
5dc72ce621
|
fix:外销合同所有的物料都重新获取一遍申报要素
|
2024-09-20 18:39:47 +08:00 |
|
|
|
b820f15fda
|
fix:外销合同所有的物料都重新获取一遍申报要素
|
2024-09-20 18:39:35 +08:00 |
|
|
|
7c5f442291
|
Merge remote-tracking branch 'orinin/test' into test
|
2024-09-20 18:20:52 +08:00 |
|
|
|
85e79a1105
|
fix:配件价格库禁用按钮调用
|
2024-09-20 18:20:45 +08:00 |
|
|
|
bc1ba79716
|
fix:配件未发货明细表逻辑修改
|
2024-09-20 18:20:44 +08:00 |
|
|
|
e3fa18f4e5
|
fix:保存时，按照 客户所在国 +买方英文名称+类型+信保限额申请 （4个字段，以空格间隔，拼接生成）
|
2024-09-20 18:20:43 +08:00 |
|
|
|
cc363d3e8d
|
fix:询价单过滤
|
2024-09-20 18:20:43 +08:00 |
|
|
|
8fd73f664a
|
fix:工厂价逻辑取消
|
2024-09-20 18:20:42 +08:00 |
|
|
|
cf699f2cc2
|
fix:收款单审核改变单据状态
|
2024-09-20 18:20:41 +08:00 |
|
|
|
a19d8fd639
|
1.增加合同签章只同步pdf格式文件
2.增加回签确认必须上传附件校验
|
2024-09-20 18:18:10 +08:00 |
|
|
|
696f6e724f
|
fix:配件价格库禁用按钮调用
|
2024-09-20 17:28:34 +08:00 |
|
|
|
2df8e38c06
|
Merge branch 'dev-zhouc' into test
|
2024-09-20 17:04:49 +08:00 |
|
|
|
ea7b0e6279
|
1.增加外销合同上传附件 只校验 word格式存在标签；
2.增加框架合同上传附件 只校验 word格式存在标签；
3.增加框架合同合同签章同步云之家；
4.增加框架合同签章同步云之家回写；
|
2024-09-20 17:04:04 +08:00 |
|
|
|
151c45bd51
|
fix:配件未发货明细表逻辑修改
|
2024-09-20 16:58:23 +08:00 |
|
|
|
58955639ea
|
fix:保存时，按照 客户所在国 +买方英文名称+类型+信保限额申请 （4个字段，以空格间隔，拼接生成）
|
2024-09-20 15:56:37 +08:00 |
|
|
|
e1290107e1
|
fix:询价单过滤
|
2024-09-20 15:05:33 +08:00 |
|
|
|
3f0b5a421f
|
fix:工厂价逻辑取消
|
2024-09-20 10:52:00 +08:00 |
|
|
|
3c200f6d95
|
fix:收款单审核改变单据状态
|
2024-09-20 09:34:53 +08:00 |
|
|
|
1e4efeaa88
|
fix:跟单任务控制台整机下拉值控制
|
2024-09-19 16:32:02 +08:00 |
|
|
|
d31a79e414
|
fix:跟单任务控制台整机下拉值控制
|
2024-09-19 16:31:44 +08:00 |
|
|
|
622831c3f5
|
fix:配件价格库反审核调用
|
2024-09-19 16:25:23 +08:00 |
|
|
|
0762b92fad
|
fix:配件价格库反审核调用
|
2024-09-19 16:24:44 +08:00 |
|
|
|
858bcba932
|
Merge branch 'dev-zhouc' into test
|
2024-09-19 11:23:04 +08:00 |
|
|
|
015f53e685
|
1.修改外销合同签章名称包含 ensign
2.增加框架合同合同签章
|
2024-09-19 11:20:23 +08:00 |
|
|
|
47f3009e31
|
fix:铭牌数量不允许低于本次非赠品行的整机数量
|
2024-09-19 10:32:27 +08:00 |
|
|
|
e04e811087
|
fix:铭牌数量不允许低于本次非赠品行的整机数量
|
2024-09-19 10:32:09 +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 |
|
|
|
93fa1a00a2
|
fix:明细信息的销售方式包含CKD时，装柜信息的整机件数不锁定，其他情况都锁定
|
2024-09-18 22:34:07 +08:00 |
|
|
|
270c17a302
|
fix:明细信息的销售方式包含CKD时，装柜信息的整机件数不锁定，其他情况都锁定
|
2024-09-18 22:33:46 +08:00 |
|
|
|
2dd9af9aa2
|
fix:明细信息的销售方式包含CKD时，装柜信息的整机件数不锁定，其他情况都锁定
|
2024-09-18 22:19:51 +08:00 |
|
|
|
e40425d02c
|
fix:明细信息的销售方式包含CKD时，装柜信息的整机件数不锁定，其他情况都锁定
|
2024-09-18 22:13:01 +08:00 |
|
|
|
ca6671b388
|
fix:明细信息的销售方式包含CKD时，装柜信息的整机件数不锁定，其他情况都锁定
|
2024-09-18 22:12:40 +08:00 |
|
|
|
7eb1ecacc2
|
fix:明细信息的销售方式包含CKD时，装柜信息的整机件数不锁定，其他情况都锁定
|
2024-09-18 22:09:56 +08:00 |
|
|
|
e29dbb6aac
|
fix:明细信息的销售方式包含CKD时，装柜信息的整机件数不锁定，其他情况都锁定
|
2024-09-18 22:09:25 +08:00 |
|
|
|
be3cb232d3
|
fix:明细信息的销售方式包含CKD时，装柜信息的整机件数不锁定，其他情况都锁定
|
2024-09-18 19:36:28 +08:00 |
|
|
|
685402c9c0
|
fix:外销合同软提示
|
2024-09-18 19:35:10 +08:00 |
|
|
|
8d19014968
|
fix:调拨订单申请单提交效验
|
2024-09-18 19:35:10 +08:00 |
|
|
|
fc05859dac
|
fix:明细信息的销售方式包含CKD时，装柜信息的整机件数不锁定，其他情况都锁定
|
2024-09-18 17:37:41 +08:00 |
|
|
|
db0264cc6e
|
fix:明细信息的销售方式包含CKD时，装柜信息的整机件数不锁定，其他情况都锁定
|
2024-09-18 16:48:25 +08:00 |
|
|
|
03d2c7a8eb
|
fix:外销合同软提示
|
2024-09-18 16:48:03 +08:00 |
|
|
|
3177cc32bf
|
fix:调拨订单申请单提交效验
|
2024-09-18 11:21:50 +08:00 |
|
|
|
77695e713d
|
fix:外销合同提交效验
|
2024-09-14 18:14:07 +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 |
|
|
|
f24a52881b
|
fix:外销合同提交效验
|
2024-09-14 17:48:04 +08:00 |
|
|
|
81079a5b31
|
fix:外销合同提交效验
|
2024-09-14 17:44:51 +08:00 |
|
|
|
ea8d9fa222
|
fix:外销合同提交效验
|
2024-09-14 17:34:11 +08:00 |
|
|
|
577661be20
|
Merge branch 'test' into dev-ljw
|
2024-09-14 17:15:05 +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 |
|
|
|
7e35c677ce
|
fix:贷记单客户更改为集团客户
|
2024-09-14 14:29:07 +08:00 |
|
|
|
15361766d5
|
fix:贷记单客户更改为集团客户
|
2024-09-13 17:55:45 +08:00 |
|
|
|
6d7975611d
|
fix:贷记单客户更改为集团客户
|
2024-09-13 17:51:45 +08:00 |
|
|
|
77ceedb342
|
fix:贷记单客户更改为集团客户
|
2024-09-13 17:49:16 +08:00 |
|
|
|
571bb72581
|
fix:外销合同数量汇总
|
2024-09-13 16:13:10 +08:00 |
|
|
|
d607e346c1
|
fix:外销合同数量汇总
|
2024-09-13 16:12:50 +08:00 |
|
|
|
ebad3d6430
|
fix:外销合同数量汇总
|
2024-09-13 16:12:09 +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 |
|
|
|
e46d0607ff
|
fix:外销合同报错处理
|
2024-09-13 13:16:05 +08:00 |
|
|
|
f23e5859b5
|
fix:外销合同报错处理
|
2024-09-13 13:15:16 +08:00 |
|
|
|
323bb9997e
|
fix:业务分类为整机并且是否赠品为否的时候汇总
|
2024-09-13 12:57:42 +08:00 |
|
|
|
254308bdc5
|
fix:业务分类为整机并且是否赠品为是的必填
|
2024-09-13 12:57:41 +08:00 |
|
|
|
e0444aa985
|
fix:业务分类为整机并且是否赠品为否的时候汇总
|
2024-09-13 11:32:51 +08:00 |
|
|
|
beb8ba050e
|
fix:业务分类为整机并且是否赠品为是的必填
|
2024-09-13 11:32:35 +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 |
|
|
|
8df8c434f2
|
fix:外销合同保存效验
|
2024-09-12 20:22:56 +08:00 |
|
|
|
39afb0d07a
|
fix:外销合同保存效验
|
2024-09-12 20:11:39 +08:00 |
|
|
|
53fda19d54
|
fix:外销合同保存效验
|
2024-09-12 20:03:44 +08:00 |
|
|
|
05b7799960
|
fix:云之家获取按钮
|
2024-09-12 17:37:41 +08:00 |
|
|
|
2b328be8ea
|
fix:云之家获取按钮
|
2024-09-12 17:37:25 +08:00 |
|
|
|
043c719773
|
fix:云之家获取按钮
|
2024-09-12 16:58:37 +08:00 |
|
|
|
3087a59a1e
|
fix:云之家获取按钮
|
2024-09-12 16:53:43 +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 |
|
|
|
dacfce217a
|
fix:云之家回写日志
|
2024-09-12 14:33:45 +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 |
|
|
|
b8cd25b566
|
Merge branch 'refs/heads/dev-plm' into test
|
2024-09-11 22:10:38 +08:00 |
|
|
|
bfd822f79f
|
fix:时间更新
|
2024-09-11 22:10:04 +08:00 |
|
|
|
317ac7fd93
|
fix:时间更新
|
2024-09-11 21:57:13 +08:00 |
|
|
|
a1992cf25a
|
fix:子件英文名称
|
2024-09-11 21:05:17 +08:00 |
|
|
|
05daa5fef8
|
配件已发货明细表逻辑修改
|
2024-09-11 20:06:26 +08:00 |
|
|
|
5fe4ed062c
|
配件未发货明细表逻辑修改
|
2024-09-11 20:06:25 +08:00 |
|
|
|
6f77354be4
|
配件已发货明细表逻辑修改
|
2024-09-11 20:05:08 +08:00 |
|
zzs01@yunemao.com
|
37fafa359a
|
Merge branch 'dev-plm' into test
|
2024-09-11 19:47:17 +08:00 |
|
zzs01@yunemao.com
|
44c0d2de38
|
wip:同步图片
|
2024-09-11 19:38:38 +08:00 |
|
zzs01@yunemao.com
|
b705f917ea
|
wip:同步图片
|
2024-09-11 17:50:37 +08:00 |
|
zzs01@yunemao.com
|
6af629d16f
|
wip:同步图片
|
2024-09-11 17:40:41 +08:00 |
|
zzs01@yunemao.com
|
f99635f3ef
|
wip:生成替换关系
|
2024-09-11 17:15:40 +08:00 |
|
|
|
9bfc3e1847
|
配件已发货明细表逻辑修改
|
2024-09-11 16:14:18 +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 |
|
|
|
72e155b072
|
配件已发货明细表逻辑修改
|
2024-09-11 15:33:38 +08:00 |
|
|
|
58078affba
|
配件未发货明细表逻辑修改
|
2024-09-11 15:08:38 +08:00 |
|
|
|
180f8fbcda
|
本地类
|
2024-09-11 15:02:03 +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 |
|
|
|
ae66b4b326
|
Merge branch 'dev-change' into dev-ljw
|
2024-09-11 10:52:08 +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 |
|
|
|
c8bf28a942
|
外销合同：新增单据报错处理
|
2024-09-10 17:46:51 +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
|
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
|
51e0d68059
|
wip:整机价格
|
2024-09-09 18:14:04 +08:00 |
|
zzs01@yunemao.com
|
fc74f1b690
|
wip:PLM匹配
|
2024-09-09 17:58:30 +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 |
|
|
|
2beaa7f72c
|
外销合同：提交效验附件面板是否有值
|
2024-09-09 17:06:58 +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 |
|
zzs01@yunemao.com
|
d1fd8b0efc
|
fix:出口报关明细报表,实际申报要素
|
2024-09-05 14:32:36 +08:00 |
|
zzs01@yunemao.com
|
ecfcde8156
|
fix:出口报关明细报表,实际申报要素
|
2024-09-05 14:18:43 +08:00 |
|
zzs01@yunemao.com
|
3118ea1501
|
change:销售提成整机
|
2024-09-05 14:14:17 +08:00 |
|
zzs01@yunemao.com
|
d98169b17b
|
change:整机发运明细表
|
2024-09-05 11:52:34 +08:00 |
|
zzs01@yunemao.com
|
08a2952879
|
change:整机发运明细表
|
2024-09-05 11:51:35 +08:00 |
|
zzs01@yunemao.com
|
8a571e614a
|
fix:出口报关明细报表,订单号
|
2024-09-05 11:26:30 +08:00 |
|
zzs01@yunemao.com
|
afc3b08ce2
|
fix:出口报关明细报表
|
2024-09-05 11:15:56 +08:00 |
|
zzs01@yunemao.com
|
c026971b54
|
fix:合同号查询错误
|
2024-09-05 10:31:45 +08:00 |
|
zzs01@yunemao.com
|
021d5560d6
|
feat:出口报关数据修复
|
2024-09-05 10:31:33 +08:00 |
|
|
|
12a633c0d4
|
询价单二开
# Conflicts:
# src/main/java/com/yem/wm/im/inquirylist/form/InquirylistEdit.java
|
2024-09-04 20:35:27 +08:00 |
|
|
|
0b5ee97851
|
询价单二开
|
2024-09-04 20:31:51 +08:00 |
|
|
|
a6691b4d9b
|
wip:出口报关明细报表
|
2024-09-04 20:11:03 +08:00 |
|
|
|
e7c5b43607
|
单一窗口报关单给出口报关赋值时同时赋值美元汇率
|
2024-09-04 18:55:12 +08:00 |
|
zzs01@yunemao.com
|
3899b142bd
|
Reapply "wip:出口报关明细报表"
This reverts commit 714b6f8ce7.
|
2024-09-04 18:53:48 +08:00 |
|
zzs01@yunemao.com
|
714b6f8ce7
|
Revert "wip:出口报关明细报表"
This reverts commit 3f669694c9.
|
2024-09-04 18:53:23 +08:00 |
|
zzs01@yunemao.com
|
ca485cb29d
|
Merge branch 'dev-declaration' into test
|
2024-09-04 18:52:42 +08:00 |
|
zzs01@yunemao.com
|
3f669694c9
|
wip:出口报关明细报表
|
2024-09-04 18:51:59 +08:00 |
|
zzs01@yunemao.com
|
fd75a6a02e
|
wip:出口报关明细报表,计算
|
2024-09-04 18:18:15 +08:00 |
|
zzs01@yunemao.com
|
9d0393bf46
|
wip:出口报关明细报表,保费（结算币别）
|
2024-09-04 17:59:00 +08:00 |
|
zzs01@yunemao.com
|
aaa6982cda
|
wip:出口报关明细报表,海运费（结算币别）
|
2024-09-04 17:53:54 +08:00 |
|
zzs01@yunemao.com
|
a65e1d2a52
|
wip:出口报关明细报表,美元保险费
|
2024-09-04 17:34:16 +08:00 |
|
zzs01@yunemao.com
|
efa308487f
|
wip:出口报关明细报表,原币保险费
|
2024-09-04 17:26:44 +08:00 |
|
zzs01@yunemao.com
|
7aac46297b
|
wip:出口报关明细报表,原币保险费
|
2024-09-04 17:24:51 +08:00 |
|
zzs01@yunemao.com
|
92f5446ce8
|
wip:出口报关明细报表,原币海运费,美元海运费
|
2024-09-04 17:16:59 +08:00 |
|
|
|
d428ff953e
|
fix:报表产品机型过滤不生效
|
2024-09-03 21:56:50 +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 |
|
|
|
d5c1164669
|
Merge branch 'refs/heads/dev-zzs' into test
|
2024-09-03 20:32:10 +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 |
|
|
|
d46ad9a63a
|
Merge remote-tracking branch 'origin/dev-zzs' into dev-zzs
|
2024-09-03 20:17:40 +08:00 |
|
|
|
ab5ebbda1c
|
fix:报表产品机型过滤不生效
|
2024-09-03 20:17:14 +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 |
|
|
|
630b9212d2
|
订舱通知单，反审核后是否付款变为否
|
2024-09-03 10:36:01 +08:00 |
|
|
|
821ef4e448
|
订舱通知单，审核后是否付款变为是
|
2024-09-03 10:31:21 +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
|
373148ac90
|
fix:销售提成整机，首付款支付日为空
|
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 |
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
f4c1de4baf
|
Merge branch 'dev-ljw' into dev-change
|
2024-08-30 10:31:31 +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 |
|
zzs01@yunemao.com
|
c8cda50b5b
|
wip:PLM匹配，生成替换关系
|
2024-08-29 17:48:29 +08:00 |
|
zzs01@yunemao.com
|
db1cce9b4d
|
wip:PLM匹配，生成替换关系
|
2024-08-29 17:31:52 +08:00 |
|
zzs01@yunemao.com
|
15ec1e9cac
|
wip:PLM匹配，生成替换关系
|
2024-08-29 17:01:41 +08:00 |
|
zzs01@yunemao.com
|
901b12f2ed
|
feat: 出库报关金额差值（合计）
|
2024-08-29 14:47:49 +08:00 |
|
zzs01@yunemao.com
|
8fc5708bed
|
Merge branch 'feat-void-reason' into test
|
2024-08-29 14:34:51 +08:00 |
|
zzs01@yunemao.com
|
7c59762995
|
feat: 作废原因
|
2024-08-29 14:32:51 +08:00 |
|
zzs01@yunemao.com
|
1f1535a6a9
|
fix: 销售出库提交差值
|
2024-08-29 14:07:01 +08:00 |
|
|
|
47f627e91c
|
订舱产品需求单 作废功能完善 （作废时同时删除【云之家表单实例id】、【云之家流程实例id】 ）
|
2024-08-29 11:33:11 +08:00 |
|
|
|
0205f3f397
|
订舱产品需求单 作废功能完善 （作废时同时删除【云之家表单实例id】、【云之家流程实例id】 ）
|
2024-08-29 11:30:12 +08:00 |
|
|
|
c9022a8e35
|
l
|
2024-08-29 10:10:20 +08:00 |
|
zzs01@yunemao.com
|
98a5437cbf
|
Merge branch 'main' into dev-zzs
|
2024-08-29 09:24:26 +08:00 |
|
zzs01@yunemao.com
|
068d66138b
|
Merge branch 'dev-ljw'
|
2024-08-28 22:13:26 +08:00 |
|
|
|
fd585814d5
|
l
|
2024-08-28 22:12:12 +08:00 |
|
zzs01@yunemao.com
|
eddc69e089
|
Merge branch 'dev-ljw'
|
2024-08-28 22:03:01 +08:00 |
|
|
|
6bdc942369
|
Merge remote-tracking branch 'orinin/dev-ljw' into dev-ljw
|
2024-08-28 22:01:01 +08:00 |
|
|
|
28069ceb59
|
l
|
2024-08-28 22:00:41 +08:00 |
|
|
|
e85348a1b5
|
Merge pull request 'ljw' (#5) from dev-ljw into main
Reviewed-on: #5
|
2024-08-28 21:13:15 +08:00 |
|
|
|
f1f4337099
|
l
|
2024-08-28 21:12:43 +08:00 |
|
zzs01@yunemao.com
|
fe577e254b
|
Merge branch 'dev-ljw' into test
|
2024-08-28 19:24:45 +08:00 |
|
zzs01@yunemao.com
|
38da4269be
|
fix: yem_sharethecost
|
2024-08-28 19:24:20 +08:00 |
|
zzs01@yunemao.com
|
d7458c3f8d
|
chore: Application
|
2024-08-28 17:50:45 +08:00 |
|
|
|
c6f606c769
|
Merge pull request 'dev-ljw' (#4) from dev-ljw into test
Reviewed-on: #4
|
2024-08-28 17:42:18 +08:00 |
|
|
|
12ba81e92a
|
l
|
2024-08-28 17:38:58 +08:00 |
|
zzs01@yunemao.com
|
728a223675
|
Merge branch 'feat-order-api' into test
|
2024-08-28 16:51:52 +08:00 |
|
zzs01@yunemao.com
|
eac83a3efe
|
feat:查询购买过的产品机型
|
2024-08-28 16:50:32 +08:00 |
|
|
|
25b7dd7643
|
Merge pull request 'fix-st-audit' (#3) from fix-st-audit into test
Reviewed-on: #3
|
2024-08-28 16:20:20 +08:00 |
|
zzs01@yunemao.com
|
6812e76958
|
fix:流程中订舱审核报错
|
2024-08-28 16:15:08 +08:00 |
|
zzs01@yunemao.com
|
286e959c4f
|
wip:WORD转PDF
|
2024-08-28 15:47:20 +08:00 |
|
|
|
fab8a9cd9f
|
l
|
2024-08-27 20:04:06 +08:00 |
|
zzs01@yunemao.com
|
713cc279a8
|
wip
|
2024-08-27 14:50:37 +08:00 |
|
zzs01@yunemao.com
|
cf4598c101
|
wip
|
2024-08-27 14:48:49 +08:00 |
|
|
|
8966670dec
|
l
|
2024-08-27 14:40:40 +08:00 |
|
zzs01@yunemao.com
|
c30a97c291
|
wip
|
2024-08-27 14:28:28 +08:00 |
|
zzs01@yunemao.com
|
f3e95505a5
|
价格库查询API
|
2024-08-27 11:35:45 +08:00 |
|
zzs01@yunemao.com
|
f0288c563b
|
查询客户购买过的资源API
|
2024-08-27 10:33:00 +08:00 |
|
zzs01@yunemao.com
|
e5519f773d
|
服务维修作废状态更新到整机档案
|
2024-08-26 14:34:24 +08:00 |
|
violet
|
672713b3c2
|
first commit
|
2024-08-26 09:19:12 +08:00 |
|
