|
|
7c1f573ad6
|
fix:
1.外销合同赠送配件分录赋值
|
2024-10-29 11:46:41 +08:00 |
|
|
|
0ce59ea7cd
|
fix:
1.外销合同销售FOB单价金额计算
|
2024-10-28 20:17:32 +08:00 |
|
|
|
314d9b51bc
|
fix:
1.外销合同起运港英文名称赋值
|
2024-10-28 19:31:53 +08:00 |
|
|
|
3c27d895e3
|
fix:
1.订单产品需求单整机外购计划财务组织和库存组织默认锐科，业务类型默认普通采购
|
2024-10-28 17:44:14 +08:00 |
|
|
|
60981f994d
|
fix:
1.订单产品需求单整机外购计划财务组织和库存组织默认锐科，业务类型默认普通采购
|
2024-10-28 17:43:33 +08:00 |
|
|
|
5e53a39e68
|
fix:
1.内审预算单上传合同附件
|
2024-10-28 16:25:00 +08:00 |
|
|
|
d62d767f6e
|
fix:
1.内审预算单上传合同附件
|
2024-10-28 15:15:12 +08:00 |
|
|
|
49acc4eee8
|
fix:
1.外销合同销售FOB单价金额计算
|
2024-10-28 14:52:19 +08:00 |
|
|
|
96a8138473
|
fix:
1.外销合同起运港英文名称赋值
|
2024-10-28 11:26:53 +08:00 |
|
|
|
89c6723d26
|
fix:
1.外销合同起运港英文名称赋值
|
2024-10-28 11:25:44 +08:00 |
|
|
|
f888460175
|
1.修改分录价格条款不更新任何数据
|
2024-10-26 23:26:42 +08:00 |
|
|
|
b5edfd40e4
|
1.修改分录价格条款不更新任何数据
|
2024-10-26 23:03:36 +08:00 |
|
|
|
46a4c39cdd
|
1.修改方数不计算港杂费
|
2024-10-26 19:59:10 +08:00 |
|
|
|
c6f7d5dd48
|
1.内审预算单附件
|
2024-10-26 19:40:58 +08:00 |
|
|
|
f7377c1479
|
fix:内审预算单附件回填
|
2024-10-26 19:36:06 +08:00 |
|
|
|
f71b5c2161
|
1.修改合同计算港杂费、内陆运输费
2.携带方数、吨数
|
2024-10-26 19:30:20 +08:00 |
|
|
|
bd1b8d819d
|
fix:补充折扣率计算
|
2024-10-26 17:20:28 +08:00 |
|
|
|
c40404a5e5
|
Merge remote-tracking branch 'origin/dev-comp-price'
# Conflicts:
# src/main/java/com/yem/wm/es/salesorder/from/SalesOrderZJEdit.java
# src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java
|
2024-10-26 17:16:56 +08:00 |
|
|
|
8dc4b0db77
|
fix:
1.外销合同折扣率计算
2.订舱通知单报关分类携带海关编码和申报要素
(cherry picked from commit 8101851d4c)
|
2024-10-25 20:42:34 +08:00 |
|
|
|
613e7ebe78
|
fix:外销合同赠送配件生成
(cherry picked from commit 0f861016cd)
|
2024-10-25 20:42:27 +08:00 |
|
|
|
cd515f67d3
|
fix:外购
(cherry picked from commit c51617528e)
|
2024-10-25 20:42:24 +08:00 |
|
|
|
8101851d4c
|
fix:
1.外销合同折扣率计算
2.订舱通知单报关分类携带海关编码和申报要素
|
2024-10-25 20:26:00 +08:00 |
|
|
|
626648ecb3
|
fix:正式去除二开功能
|
2024-10-25 19:26:48 +08:00 |
|
|
|
b3565bf466
|
fix:测试
|
2024-10-25 19:17:45 +08:00 |
|
|
|
23c20be0ff
|
fix:外销合同折扣后金额计算
|
2024-10-25 18:37:13 +08:00 |
|
|
|
f6cd6e5a71
|
Revert "wip:获取标准价：FOB与FCA费用差额标配FOB（青岛）价"
This reverts commit 5a2d7eda
|
2024-10-25 18:32:50 +08:00 |
|
|
|
c29d56d03e
|
Revert "wip(version1011):整机价格"
This reverts commit 6a25bf15fa.
|
2024-10-25 18:22:31 +08:00 |
|
zzs
|
6a25bf15fa
|
wip(version1011):整机价格
|
2024-10-25 18:21:09 +08:00 |
|
|
|
0f861016cd
|
fix:外销合同赠送配件生成
|
2024-10-25 15:53:12 +08:00 |
|
|
|
c51617528e
|
fix:外购
|
2024-10-25 15:21:37 +08:00 |
|
|
|
de76f20e4d
|
1.修改变更单生效清空回签人
|
2024-10-24 19:45:14 +08:00 |
|
|
|
43f8bf6ab2
|
1.修改变更单生效 不清空回签人相关信息
|
2024-10-24 19:45:08 +08:00 |
|
|
|
da0d9ffe64
|
1.修改合同权杖附件数 生效不携带源单
|
2024-10-24 19:44:25 +08:00 |
|
|
|
26a0a5a9b2
|
1.修改合同权杖附件数 生效不携带源单
|
2024-10-24 19:14:16 +08:00 |
|
|
|
09e1a145b2
|
1.去除查询CMMP资源号前后空格
|
2024-10-24 18:49:14 +08:00 |
|
|
|
daf729a12c
|
1.去除查询CMMP资源号前后空格
|
2024-10-24 18:44:10 +08:00 |
|
|
|
0b029535ea
|
1.修改变更单生效清空回签人
|
2024-10-24 16:11:20 +08:00 |
|
|
|
93910c070e
|
Merge remote-tracking branch 'origin/main'
|
2024-10-23 22:01:39 +08:00 |
|
|
|
2497ae8bba
|
修改查询配置表条件
|
2024-10-23 22:00:33 +08:00 |
|
|
|
b04e72e1e1
|
fix:外销合同是否赠品为否的赠品分录
|
2024-10-23 21:34:04 +08:00 |
|
|
|
5bae043614
|
fix:外销合同是否赠品为否的赠品分录
|
2024-10-23 20:28:09 +08:00 |
|
|
|
8bc9e649f3
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-23 20:07:59 +08:00 |
|
|
|
d7856ccef9
|
1.修改变更单生效 不清空回签人相关信息
|
2024-10-23 20:07:47 +08:00 |
|
|
|
0444812e3a
|
fix:外销合同是否赠品为否的赠品分录
(cherry picked from commit dc7eafc2c4)
|
2024-10-23 19:56:05 +08:00 |
|
|
|
dc7eafc2c4
|
fix:外销合同是否赠品为否的赠品分录
|
2024-10-23 19:55:09 +08:00 |
|
|
|
538cc3b339
|
fix:订舱通知单是否信保合同功能完善
|
2024-10-23 19:53:47 +08:00 |
|
|
|
ccb1638193
|
fix:订舱通知单是否信保合同功能完善
|
2024-10-23 11:19:45 +08:00 |
|
|
|
d9ef332698
|
fix:订舱通知单是否信保合同功能完善
|
2024-10-23 11:14:56 +08:00 |
|
|
|
c6ea61153a
|
fix:订舱通知单是否信保合同功能完善
|
2024-10-23 10:57:32 +08:00 |
|
|
|
84b4d935fe
|
fix:订舱通知单是否信保合同功能完善
|
2024-10-23 10:53:00 +08:00 |
|
|
|
9a9819dffb
|
fix:
信保合同生成订舱通知单时，应收款金额（本位币）默认等于信保本位币金额；
|
2024-10-22 22:56:48 +08:00 |
|
|
|
a5217da705
|
fix:变更单的折扣金额 不需要触发值更新
|
2024-10-22 22:53:04 +08:00 |
|
|
|
0324937d60
|
fix:变更单的折扣金额 不需要触发值更新
|
2024-10-22 22:50:26 +08:00 |
|
|
|
839e6308b7
|
fix:变更单的折扣金额 不需要触发值更新
|
2024-10-22 22:29:12 +08:00 |
|
|
|
881b8073eb
|
fix:铭牌数量不允许低于本次非赠品行的整机数量
|
2024-10-22 22:27:07 +08:00 |
|
|
|
0dd35751e9
|
fix:外销合同变更单（配件）的折扣金额 不需要触发值更新
|
2024-10-22 22:27:03 +08:00 |
|
|
|
81552e6128
|
1.修改合同删行汇总表头金额不正确问题
|
2024-10-22 21:39:48 +08:00 |
|
|
|
751c6fbe97
|
1.修改合同删行汇总表头金额不正确问题
|
2024-10-22 21:38:28 +08:00 |
|
|
|
f73fc7b404
|
fix:变更单的折扣金额 不需要触发值更新
|
2024-10-22 20:54:47 +08:00 |
|
|
|
df3ea5f0b5
|
修改价格库接口
|
2024-10-22 19:58:27 +08:00 |
|
|
|
48f1b71429
|
1.EAS调用Cosmic价格库表头分录增加作废状态
|
2024-10-22 19:58:10 +08:00 |
|
|
|
52ceebd089
|
增加获取云之家状态，撤销失败显示原因
|
2024-10-22 19:53:46 +08:00 |
|
|
|
d66e10f2a0
|
fix:铭牌数量不允许低于本次非赠品行的整机数量
|
2024-10-22 19:02:15 +08:00 |
|
|
|
16413251d0
|
fix:外销合同赠送配件分录条件设置
(cherry picked from commit 7e12e7e7c8)
|
2024-10-22 19:00:39 +08:00 |
|
|
|
9dbba5e2af
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-22 17:55:12 +08:00 |
|
|
|
fe8e17ada8
|
修改价格库接口
|
2024-10-22 17:54:55 +08:00 |
|
|
|
a378f0238b
|
fix:外销合同变更单（配件）的折扣金额 不需要触发值更新
|
2024-10-22 17:08:24 +08:00 |
|
|
|
d825633af3
|
增加获取云之家状态，撤销失败显示原因
|
2024-10-22 16:40:19 +08:00 |
|
|
|
073126d9b8
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-22 14:14:45 +08:00 |
|
|
|
527f22c029
|
1.EAS调用Cosmic价格库表头分录增加作废状态
|
2024-10-22 14:14:26 +08:00 |
|
|
|
7e12e7e7c8
|
fix:外销合同赠送配件分录条件设置
|
2024-10-22 11:54:15 +08:00 |
|
|
|
20417cb4fa
|
fix:订舱通知单提交反写客户信保额度申请
(cherry picked from commit 1f86c71340)
|
2024-10-21 23:12:40 +08:00 |
|
|
|
1f86c71340
|
fix:订舱通知单提交反写客户信保额度申请
|
2024-10-21 23:06:45 +08:00 |
|
|
|
1194acecf0
|
fix:订舱通知单提交反写客户信保额度申请
|
2024-10-21 22:54:36 +08:00 |
|
|
|
0134038149
|
fix:订舱通知单提交反写客户信保额度申请
|
2024-10-21 22:54:22 +08:00 |
|
|
|
2ecd5c47d1
|
fix:订舱通知单提交反写客户信保额度申请
|
2024-10-21 22:54:16 +08:00 |
|
|
|
011ec4db02
|
fix:订舱通知单提交反写客户信保额度申请
|
2024-10-21 22:54:01 +08:00 |
|
|
|
897722cf0f
|
fix:订舱通知单提交反写客户信保额度申请
|
2024-10-21 22:53:43 +08:00 |
|
|
|
f162efc6a3
|
fix:订舱通知单审核反写客户信保额度申请
|
2024-10-21 22:53:28 +08:00 |
|
|
|
d53d68e5b5
|
1.增加合同提交是校验【合同提交附件】中的word是否包含ensign标签
|
2024-10-21 22:53:22 +08:00 |
|
|
|
7ebba9d98b
|
fix:订舱通知单提交反写客户信保额度申请
|
2024-10-21 22:46:06 +08:00 |
|
|
|
db3a3eac41
|
fix:订舱通知单提交反写客户信保额度申请
|
2024-10-21 22:23:26 +08:00 |
|
|
|
0ce7c9102a
|
fix:订舱通知单提交反写客户信保额度申请
|
2024-10-21 21:26:20 +08:00 |
|
|
|
b90525eaa7
|
fix:订舱通知单提交反写客户信保额度申请
|
2024-10-21 19:59:48 +08:00 |
|
|
|
fefb9a0d1a
|
fix:订舱通知单提交反写客户信保额度申请
|
2024-10-21 19:57:07 +08:00 |
|
|
|
fe675f250f
|
fix:订舱通知单审核反写客户信保额度申请
|
2024-10-21 19:42:26 +08:00 |
|
|
|
e435d4442f
|
1.增加合同提交是校验【合同提交附件】中的word是否包含ensign标签
|
2024-10-21 16:09:52 +08:00 |
|
|
|
fabfdf41f6
|
fix:框架合同反审核清空
(cherry picked from commit 8e1fdec8d3)
|
2024-10-19 17:58:08 +08:00 |
|
|
|
8e1fdec8d3
|
fix:框架合同反审核清空
|
2024-10-19 17:42:18 +08:00 |
|
|
|
a308233878
|
fix:合同签章
|
2024-10-19 16:50:10 +08:00 |
|
|
|
9f1ecfc5c1
|
fix:合同签章
|
2024-10-19 16:48:28 +08:00 |
|
|
|
1ec6ddad83
|
fix:合同签章
|
2024-10-19 16:47:14 +08:00 |
|
|
|
8e4ab9ea29
|
fix:合同签章
|
2024-10-19 16:45:14 +08:00 |
|
|
|
13df2436d9
|
fix:收款单财务确认
|
2024-10-19 15:46:41 +08:00 |
|
|
|
cef522fbd2
|
fix:收款单财务确认
|
2024-10-19 15:45:27 +08:00 |
|
|
|
114feb4ef7
|
fix:收款单财务确认
(cherry picked from commit fbf6338866)
|
2024-10-19 15:40:59 +08:00 |
|
|
|
fbf6338866
|
fix:收款单财务确认
|
2024-10-19 15:40:12 +08:00 |
|
|
|
bd0137604f
|
fix:合同签章
|
2024-10-19 15:00:22 +08:00 |
|
|
|
0a6cfa8091
|
fix:合同签章
|
2024-10-19 14:59:07 +08:00 |
|
|
|
e6ae689395
|
fix:合同签章
|
2024-10-19 14:57:01 +08:00 |
|
|
|
7ad4258cf6
|
fix:合同签章
|
2024-10-19 14:55:22 +08:00 |
|
|
|
2ceceaaa05
|
fix:收款单财务确认
|
2024-10-19 14:40:05 +08:00 |
|
|
|
e3828c8e3a
|
fix:收款单财务确认
|
2024-10-19 14:14:11 +08:00 |
|
|
|
8f3b26351f
|
fix:收款单问题处理
|
2024-10-18 21:15:35 +08:00 |
|
|
|
8791d3ad5f
|
fix:收款单问题处理
|
2024-10-18 21:12:04 +08:00 |
|
|
|
0def669bb1
|
fix:价格库配件问题调整
|
2024-10-18 20:15:36 +08:00 |
|
|
|
f43eb8d02f
|
fix:销售出库审核编码
|
2024-10-18 19:52:54 +08:00 |
|
|
|
11795de0e6
|
fix:销售出库审核编码
|
2024-10-18 19:52:10 +08:00 |
|
|
|
0324f74f0b
|
fix:销售出库审核编码汇总
|
2024-10-18 19:50:22 +08:00 |
|
|
|
7e67415e2e
|
fix:销售出库反审核功能处理
|
2024-10-18 19:49:29 +08:00 |
|
|
|
9ae923a3bf
|
fix:销售出库审核功能处理
|
2024-10-18 19:49:15 +08:00 |
|
|
|
bc0f65d84f
|
fix:销售出库审核功能处理
|
2024-10-18 19:49:11 +08:00 |
|
|
|
a7972c9d0a
|
fix:价格库配件问题调整
|
2024-10-18 19:47:44 +08:00 |
|
|
|
5ea607fe81
|
Merge remote-tracking branch 'orinin/main'
|
2024-10-18 19:47:42 +08:00 |
|
|
|
fb7b088d1c
|
fix:价格库配件问题调整
|
2024-10-18 19:46:30 +08:00 |
|
|
|
8e4faa84b4
|
修改外销合同签章名称包含 ensign
|
2024-10-18 19:38:44 +08:00 |
|
|
|
a5445de5c4
|
fix:配件价格库获取标准价条件增加
|
2024-10-18 19:12:57 +08:00 |
|
|
|
c6c15c007b
|
fix:二开公共类
|
2024-10-18 18:28:17 +08:00 |
|
|
|
9a00961183
|
fix:二开公共类
|
2024-10-18 18:27:08 +08:00 |
|
zzs01@yunemao.com
|
d6e971c34f
|
wip:获取标准价：FOB与FCA费用差额标配FOB（青岛）价
|
2024-10-18 18:20:34 +08:00 |
|
|
|
d582ad8ac9
|
fix:配件价格库反审核调用
|
2024-10-18 18:19:12 +08:00 |
|
|
|
5292248d54
|
fix:配件价格库禁用按钮调用
|
2024-10-18 18:17:55 +08:00 |
|
|
|
fbff30b432
|
fix:配件价格库禁用按钮调用
|
2024-10-18 18:17:42 +08:00 |
|
|
|
da6c3a3276
|
fix:配件价格库禁用按钮调用
|
2024-10-18 18:17:35 +08:00 |
|
|
|
421a81fe4f
|
fix:配件价格库禁用按钮调用
|
2024-10-18 18:17:26 +08:00 |
|
|
|
e84cafc61d
|
fix:审核时根据合同号获取财务信息《价税合计》汇总，将单据编号拼接（包含当前单
|
2024-10-18 18:15:53 +08:00 |
|
|
|
26367aa759
|
fix:收款单报错处理
|
2024-10-18 18:14:44 +08:00 |
|
|
|
b7515cfc02
|
fix:收款单报错处理
|
2024-10-18 18:14:36 +08:00 |
|
|
|
edfda79cac
|
fix:收款单报错处理
|
2024-10-18 18:14:29 +08:00 |
|
|
|
eb2542f276
|
fix:收款单报错处理
|
2024-10-18 18:14:21 +08:00 |
|
|
|
fb1cd71f9d
|
fix:收款单报错处理
|
2024-10-18 18:13:24 +08:00 |
|
|
|
6759ea30d7
|
fix:收款单报错处理
|
2024-10-18 18:13:20 +08:00 |
|
|
|
5c73612df7
|
fix:收款单财务确认功能更改至认领确认后
|
2024-10-18 18:12:22 +08:00 |
|
|
|
9b987aa882
|
fix:
云之家获取逻辑修改
|
2024-10-18 16:54:29 +08:00 |
|
|
|
ccde1671b9
|
fix:配件价格库获取标准价条件增加
|
2024-10-18 14:41:59 +08:00 |
|
|
|
349940649a
|
fix:
-整机编号校验时，在原判断逻辑增加条件：是否赠品为否；
|
2024-10-18 14:17:18 +08:00 |
|
|
|
eca195901d
|
fix:
-整机编号校验时，在原判断逻辑增加条件：是否赠品为否；
|
2024-10-18 10:39:02 +08:00 |
|
|
|
4c6bf5aa90
|
fix:
信保合同生成订舱通知单时，应收款金额（本位币）默认等于信保本位币金额；
|
2024-10-18 10:23:46 +08:00 |
|
|
|
f70896224b
|
fix:
外销合同变更单审核生成资金池
|
2024-10-16 19:49:22 +08:00 |
|
|
|
9abd286265
|
fix:
外销合同变更单审核生成资金池
|
2024-10-16 19:20:55 +08:00 |
|
|
|
56bf193ea9
|
fix:
外销合同变更单审核生成资金池
|
2024-10-16 18:59:01 +08:00 |
|
|
|
07d8562ae2
|
fix:
销售提成配件报表处理
|
2024-10-16 18:58:20 +08:00 |
|
|
|
2e1d701e06
|
fix:
1.装箱单，回填配件装柜时配件货物描述和货物（描述）拼接
|
2024-10-16 18:58:19 +08:00 |
|
|
|
e9f0827d16
|
fix:
外销合同变更单审核生成资金池
|
2024-10-16 18:49:14 +08:00 |
|
|
|
751b7f7169
|
fix:
销售提成配件报表处理
|
2024-10-16 18:44:10 +08:00 |
|
|
|
53c94dbe80
|
fix:
1.装箱单，回填配件装柜时配件货物描述和货物（描述）拼接
|
2024-10-16 18:33:55 +08:00 |
|
|
|
5306a321af
|
fix:
1.装箱单，回填配件装柜时配件货物描述和货物（描述）拼接
|
2024-10-16 18:19:10 +08:00 |
|
|
|
9869d3a4a1
|
fix:
1.储运脱单审核更新礼品资金池
|
2024-10-16 18:16:29 +08:00 |
|
|
|
21dc1df101
|
fix:
1.装箱单，回填配件装柜时配件货物描述和货物（描述）拼接
|
2024-10-16 17:50:25 +08:00 |
|
|
|
dc7fdcb706
|
fix:
1.储运脱单审核更新礼品资金池
2.装箱单，回填配件装柜时配件货物描述和货物（描述）拼接
|
2024-10-16 17:05:07 +08:00 |
|
|
|
0462634b64
|
fix:
1.外销合同审核更新礼品资金池
|
2024-10-15 21:18:51 +08:00 |
|
|
|
44890ef65f
|
fix:
1.储运脱单审核更新礼品资金池
|
2024-10-15 21:17:31 +08:00 |
|
|
|
9a964a26be
|
fix:
1.储运脱单审核更新礼品资金池
|
2024-10-15 21:14:17 +08:00 |
|
|
|
e92b0692a4
|
fix:
1.储运脱单审核更新礼品资金池
|
2024-10-15 20:54:28 +08:00 |
|
|
|
783c5f7850
|
fix:
1.储运脱单审核更新礼品资金池
|
2024-10-15 20:21:15 +08:00 |
|
|
|
a4a7a9f313
|
fix:
1.外销合同审核更新礼品资金池
|
2024-10-15 19:12:23 +08:00 |
|
|
|
3efa5d3e76
|
fix:
1.外销合同报错处理
|
2024-10-15 18:50:18 +08:00 |
|
|
|
23692d6e49
|
Merge remote-tracking branch 'orinin/test' into test
|
2024-10-15 18:38:52 +08:00 |
|
|
|
9ee1b51688
|
fix:
1.外销合同审核更新礼品资金池
|
2024-10-15 18:38:34 +08:00 |
|
zzs
|
5a1295b274
|
fix:计算内陆运费报错
|
2024-10-15 18:17:45 +08:00 |
|
|
|
1ba5f2849a
|
fix:
1.外销合同审核更新礼品资金池
|
2024-10-15 17:46:29 +08:00 |
|
|
|
6c385638de
|
fix:
1.填写基础机型时携带方数
|
2024-10-15 16:39:53 +08:00 |
|
|
|
0da67e73a7
|
fix:
1.订舱通知单打开报错
|
2024-10-15 16:00:07 +08:00 |
|
|
|
5b7b0ed8fa
|
fix:
1.订舱通知单打开报错
2.外销合同填写数量报错
|
2024-10-15 15:32:48 +08:00 |
|
|
|
6f42d858a8
|
fix:订舱通知单值更新反写台数
|
2024-10-15 12:04:24 +08:00 |
|
|
|
8f38abe738
|
fix:订舱通知单值更新反写台数
|
2024-10-15 12:03:59 +08:00 |
|
|
|
7bc09049fd
|
fix:订舱通知单审核反写礼品资金池
|
2024-10-15 11:00:32 +08:00 |
|
|
|
4417094943
|
fix:外销合同审核反写礼品资金池
|
2024-10-15 10:38:50 +08:00 |
|
|
|
e13b784ce8
|
Merge remote-tracking branch 'orinin/test' into test
|
2024-10-15 10:38:14 +08:00 |
|
|
|
680f0a89d9
|
fix:外销合同审核反写礼品资金池
|
2024-10-15 10:38:05 +08:00 |
|
zzs
|
fdee718201
|
fix:合同复制报错
|
2024-10-14 22:18:09 +08:00 |
|
zzs
|
5a537f4a1b
|
fix:合同复制报错
|
2024-10-14 22:11:17 +08:00 |
|
zzs
|
ea60566c97
|
fix:物料长宽高检查
(cherry picked from commit d666656ff4)
|
2024-10-14 22:06:28 +08:00 |
|
zzs
|
d666656ff4
|
fix:物料长宽高检查
|
2024-10-14 22:06:06 +08:00 |
|
|
|
e5370ba618
|
1.增加回填字段【预计入库日期】
|
2024-10-14 22:02:13 +08:00 |
|
|
|
cfa5152cdf
|
first commit
|
2024-10-14 22:02:12 +08:00 |
|
zzs
|
a09e00a0a2
|
feat:物料长宽高赠品不判断
|
2024-10-14 21:58:35 +08:00 |
|
zzs
|
cfee129bf2
|
wip(fix):获取价格
|
2024-10-14 21:55:37 +08:00 |
|
zzs
|
850db5c8f1
|
wip(fix):获取价格
|
2024-10-14 20:43:48 +08:00 |
|
zzs
|
ba08ad9172
|
feat:物料长宽高赠品不判断
|
2024-10-14 18:52:41 +08:00 |
|
zzs
|
6fc1cafbba
|
Merge branch 'dev-comp-price' into test
|
2024-10-14 18:06:57 +08:00 |
|
zzs
|
e40d039af2
|
fix(version1011):整机价格
|
2024-10-14 18:06:21 +08:00 |
|
zzs
|
69fce54a49
|
fix(version1011):整机价格
|
2024-10-14 16:02:07 +08:00 |
|
zzs
|
8b7ccb4e09
|
fix(version1011):整机价格
|
2024-10-14 16:02:04 +08:00 |
|
zzs
|
890964f91a
|
fix(version1011):整机价格
|
2024-10-14 16:01:19 +08:00 |
|
zzs
|
d228be2fb9
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-14 15:51:23 +08:00 |
|
zzs
|
de74b712aa
|
fix(version1011):整机价格
|
2024-10-14 15:51:15 +08:00 |
|
|
|
bd1f866fbe
|
1.增加回填字段【预计入库日期】
|
2024-10-14 15:50:19 +08:00 |
|
|
|
973a11838b
|
fix:发运明细申报要素
|
2024-10-14 12:02:03 +08:00 |
|
|
|
bcb90bd469
|
Merge remote-tracking branch 'orinin/test' into test
|
2024-10-14 10:59:14 +08:00 |
|
|
|
ffb583d288
|
fix:内审预算单撤销附件
|
2024-10-14 10:58:58 +08:00 |
|
zzs
|
c7c0222cf3
|
Merge branch 'dev-comp-price' into test
|
2024-10-14 10:56:34 +08:00 |
|
zzs
|
4ed38d065c
|
feat(version1011):整机价格
|
2024-10-14 10:55:42 +08:00 |
|
|
|
40c873034a
|
fix:内审预算单上传附件
|
2024-10-14 10:15:12 +08:00 |
|
zzs
|
b3780baa97
|
feat(version1011):整机价格
|
2024-10-14 10:12:48 +08:00 |
|
|
|
dca9f3f93d
|
fix:外销合同变更单费用分摊增加限制
|
2024-10-12 20:46:44 +08:00 |
|
|
|
727734e38b
|
fix:销售出库审核编码汇总
|
2024-10-12 19:34:58 +08:00 |
|
|
|
f71760fa6a
|
fix:
1.内审预算单生成附件
2.销售出库审核编码汇总
3.销售出库反审核编码消除
|
2024-10-12 17:53:58 +08:00 |
|
zzs
|
8137198072
|
wip(version1011):整机价格
|
2024-10-12 16:50:26 +08:00 |
|
|
|
49e81dc22d
|
Merge remote-tracking branch 'orinin/test' into test
|
2024-10-12 16:45:42 +08:00 |
|
|
|
d24248ab27
|
fix:内审预算单附件回填
|
2024-10-12 16:45:30 +08:00 |
|
zzs
|
800c4994da
|
fix:发货联系书云之家提交标题拼接
(cherry picked from commit d5128f866d)
|
2024-10-12 15:55:32 +08:00 |
|
zzs
|
d5128f866d
|
fix:发货联系书云之家提交标题拼接
|
2024-10-12 15:54:54 +08:00 |
|
|
|
459cb72ddd
|
1.修改合同签章同步云之家发起人为销售员逻辑
|
2024-10-12 15:49:52 +08:00 |
|
|
|
f4c25d5fce
|
fix:销售出库反审核功能处理
|
2024-10-12 11:55:12 +08:00 |
|
|
|
a96872df21
|
1.禁用外销合同提交时已审批人提交
2.增加人员选择字段空间拼接
|
2024-10-11 19:38:22 +08:00 |
|
|
|
4d18f36fc6
|
fix:销售出库审核功能处理
|
2024-10-11 18:38:25 +08:00 |
|
|
|
84c64e6c6d
|
fix:销售出库审核功能处理
|
2024-10-11 18:27:42 +08:00 |
|
|
|
bddafe13d2
|
fix:云之家智能审批
|
2024-10-11 16:31:12 +08:00 |
|
|
|
37e1d6d5f6
|
fix:外销合同价格核算问题处理
|
2024-10-11 16:03:15 +08:00 |
|
|
|
c0a3d7207d
|
fix:外销合同价格核算问题处理
|
2024-10-11 16:00:28 +08:00 |
|
|
|
69028e3d9a
|
fix:外销合同提交效验取消
|
2024-10-11 15:48:08 +08:00 |
|
|
|
ee02591bea
|
fix:外销合同变更单提交报错问题处理
|
2024-10-11 14:52:25 +08:00 |
|
|
|
08575e89d0
|
fix:外销合同提交报错问题处理
|
2024-10-11 09:38:07 +08:00 |
|
zzs
|
e65d62ea53
|
log:智能审批增加日志输出
|
2024-10-11 09:18:17 +08:00 |
|
|
|
d60d14e2e5
|
fix:外销合同变更单合同签章问题处理
|
2024-10-09 18:52:35 +08:00 |
|
|
|
685326f706
|
fix:外销合同变更单合同签章问题处理
|
2024-10-09 18:52:06 +08:00 |
|
|
|
574478862b
|
fix:外销合同变更单合同签章问题处理
|
2024-10-09 17:47:34 +08:00 |
|
|
|
fcc5e56c1a
|
fix:外销合同变更单合同签章问题处理
|
2024-10-09 09:55:03 +08:00 |
|
|
|
13efa4b391
|
fix:外销合同变更单合同签章问题处理
|
2024-10-09 09:44:06 +08:00 |
|
|
|
27415a86b2
|
fix:外销合同变更单合同签章问题处理
|
2024-10-09 09:43:43 +08:00 |
|
|
|
d2a272e0bb
|
fix:外销合同变更单合同签章问题处理
|
2024-10-09 09:41:25 +08:00 |
|
|
|
a11eb92bea
|
fix:外销合同变更单合同签章问题处理
|
2024-10-08 18:11:56 +08:00 |
|
|
|
b94d31f9eb
|
fix:外销合同变更单合同签章问题处理
|
2024-10-08 18:09:48 +08:00 |
|
|
|
eea2e3c614
|
fix:外销合同变更单合同签章问题处理
(cherry picked from commit c9c595ea34)
|
2024-10-08 15:43:02 +08:00 |
|
|
|
58a697a691
|
fix:计算闲置期倒计时
(cherry picked from commit 9d395b1f7b)
|
2024-10-08 15:42:58 +08:00 |
|
|
|
676b128aa6
|
1.修改贷记单提交后获取上次贷记单号节点
|
2024-10-08 15:42:44 +08:00 |
|
|
|
9d395b1f7b
|
fix:计算闲置期倒计时
|
2024-10-08 15:41:49 +08:00 |
|
|
|
2731e382f0
|
1.修改贷记单提交后获取上次贷记单号节点
|
2024-10-08 14:15:01 +08:00 |
|
|
|
c9c595ea34
|
fix:外销合同变更单合同签章问题处理
|
2024-10-08 10:30:53 +08:00 |
|
|
|
82f62fcc41
|
fix:外销合同变更单合同签章问题处理
(cherry picked from commit b25b2e3495)
|
2024-10-08 09:53:55 +08:00 |
|
|
|
b25b2e3495
|
fix:外销合同变更单合同签章问题处理
|
2024-10-08 09:53:22 +08:00 |
|
|
|
457a73cfd5
|
fix:外销合同提交服务插件
|
2024-09-30 16:55:14 +08:00 |
|
|
|
f7c690b4f1
|
fix:配件合同費用分攤報錯處理
|
2024-09-29 22:08:48 +08:00 |
|
|
|
8d91b96515
|
fix:报关对比
|
2024-09-29 21:58:59 +08:00 |
|
|
|
48a7df38ec
|
Revert "fix:合同签章申请"
This reverts commit ccb7aa4a85.
|
2024-09-29 21:05:34 +08:00 |
|
|
|
8b65c813e1
|
fix:合同签章申请
|
2024-09-29 21:02:42 +08:00 |
|
|
|
9cc62548d9
|
fix:配件合同费用分摊
|
2024-09-29 21:02:40 +08:00 |
|
|
|
e860dd03ca
|
fix:合同签章申请
|
2024-09-29 20:58:59 +08:00 |
|
|
|
907ea73905
|
fix:报关对比
|
2024-09-29 19:33:28 +08:00 |
|
|
|
b721c88053
|
fix:报关对比
|
2024-09-29 19:33:01 +08:00 |
|
|
|
4f83e6c995
|
fix:配件合同费用分摊
|
2024-09-29 17:13:51 +08:00 |
|
|
|
f222707c63
|
fix:信保回填报错处理
|
2024-09-27 22:36:41 +08:00 |
|
|
|
be7e31fae5
|
fix:内审预算单
|
2024-09-27 22:33:02 +08:00 |
|
|
|
c9af91ab5c
|
fix:获取不为空的利息天数
|
2024-09-27 22:33:02 +08:00 |
|
|
|
38c1fe1d0f
|
1.修改收款金额、实际收款金额为0不会填
|
2024-09-27 22:33:01 +08:00 |
|
|
|
6e408c4fa6
|
1.修改输入实际收汇值更新光标数据消失
|
2024-09-27 22:33:00 +08:00 |
|
|
|
94676df392
|
fix:获取不为空的利息天数
|
2024-09-27 22:32:59 +08:00 |
|
|
|
ed7dfe051f
|
fix:内审预算单
|
2024-09-27 22:05:53 +08:00 |
|
|
|
f7bc2dbaef
|
fix:获取不为空的利息天数
|
2024-09-27 21:58:48 +08:00 |
|
|
|
e89c386dbe
|
1.修改收款金额、实际收款金额为0不会填
|
2024-09-27 21:41:20 +08:00 |
|
|
|
e1dd657c55
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-27 20:48:40 +08:00 |
|
|
|
e6074461bc
|
1.修改输入实际收汇值更新光标数据消失
|
2024-09-27 20:48:28 +08:00 |
|
|
|
94ffdd96d7
|
fix:获取不为空的利息天数
|
2024-09-27 20:37:31 +08:00 |
|
|
|
039b02891e
|
Revert "fix:收款单功能调整（审核时财务确认，调整至审批流）"
This reverts commit 936d3cef4c.
|
2024-09-27 10:43:24 +08:00 |
|
|
|
0f72583101
|
Revert "fix:收款单功能调整（审核时财务确认，调整至审批流）"
This reverts commit 50b9c137c9.
|
2024-09-27 10:43:21 +08:00 |
|
|
|
50b9c137c9
|
fix:收款单功能调整（审核时财务确认，调整至审批流）
|
2024-09-27 10:43:05 +08:00 |
|
|
|
936d3cef4c
|
fix:收款单功能调整（审核时财务确认，调整至审批流）
|
2024-09-27 10:41:35 +08:00 |
|
|
|
ae7730afd0
|
fix:收款单报错处理
|
2024-09-26 22:34:20 +08:00 |
|
|
|
c07f036840
|
fix:收款单报错处理
|
2024-09-26 22:30:14 +08:00 |
|
|
|
10aacfb7c0
|
fix:收款单报错处理
|
2024-09-26 22:10:54 +08:00 |
|
|
|
5f7948991f
|
fix:报关单报关对比
|
2024-09-26 22:10:53 +08:00 |
|
|
|
a59da5a261
|
fix:收款单报错处理
|
2024-09-26 18:08:22 +08:00 |
|
|
|
e6ac411ca8
|
fix:信保回填报错处理
|
2024-09-26 18:08:21 +08:00 |
|
|
|
d3ab4271ec
|
fix:报关单报关对比
|
2024-09-26 18:08:20 +08:00 |
|
|
|
5d6265f122
|
fix:产品经理下单确认报错
|
2024-09-26 14:22:48 +08:00 |
|
|
|
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 |
|
|
|
6f857727e2
|
fix:合同签章申请
|
2024-09-25 16:01:56 +08:00 |
|
|
|
82406a5786
|
fix:合同签章申请
|
2024-09-25 14:45:05 +08:00 |
|
|
|
6eddee92ea
|
fix:合同签章申请
|
2024-09-25 14:44:51 +08:00 |
|
|
|
fc499f9743
|
fix:报关对比日志定时任务问题处理
|
2024-09-25 11:15:57 +08:00 |
|
|
|
ac07c89372
|
fix:报关对比日志定时任务问题处理
|
2024-09-25 11:15:09 +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 |
|
|
|
b7a40f76d1
|
fix:禁用状态改为作废状态
|
2024-09-24 21:44:20 +08:00 |
|
|
|
ef49929a52
|
fix:报错处理
|
2024-09-24 21:16:49 +08:00 |
|
|
|
b176d71186
|
fix:报错处理
|
2024-09-24 21:10:41 +08:00 |
|
|
|
66215cbec3
|
fix:时间计算
|
2024-09-24 21:10:41 +08:00 |
|
|
|
7d01667867
|
fix:赠品行净重下单确认时不必填
|
2024-09-24 20:03:01 +08:00 |
|
|
|
a64f4b0f3a
|
fix:配件价格库获取标准价条件增加
|
2024-09-24 20:03:00 +08:00 |
|
|
|
a955344dfa
|
fix:款项类型 = 普通选项 时，判断当前 客户 在 【订舱通知单-信保回填 】中是否存在满足以下条件的信保明细：（应回款倒计时<0 并且投保回款金额<应收款金额）
如果满足， 提示：当前寄单放单客户存在历史合同：***，订舱通知单：****，逾期未收款，请确认！！！
款项类型=特殊情况不判断。
|
2024-09-24 19:37:33 +08:00 |
|
|
|
314a0c65c6
|
fix:赠品行净重下单确认时不必填
|
2024-09-24 19:37:33 +08:00 |
|
|
|
9a6f438937
|
1.修改明细删除行提示null
|
2024-09-24 18:04:46 +08:00 |
|
|
|
d1dbb66446
|
fix:单一窗口报关单反写出口报关单下推出口发票问题处理
|
2024-09-24 18:03:56 +08:00 |
|
|
|
18810f924d
|
fix:单一窗口报关单反写出口报关单下推出口发票问题处理
|
2024-09-24 18:03:03 +08:00 |
|
|
|
22e9d11e90
|
fix:外销合同变更单报错处理
|
2024-09-24 16:32:56 +08:00 |
|
|
|
8364d05f2a
|
fix:外销合同变更单报错处理
|
2024-09-24 16:32:21 +08:00 |
|
|
|
452a04c11b
|
fix:外销合同变更单报错处理
(cherry picked from commit 480b492654)
|
2024-09-24 15:37:08 +08:00 |
|
|
|
480b492654
|
fix:外销合同变更单报错处理
|
2024-09-24 15:36:34 +08:00 |
|
|
|
4615f3ce68
|
1.修改明细删除行提示null
|
2024-09-24 14:48:53 +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 |
|
