|
|
8246928024
|
1.修改同步云之家拼接json中存在空行数据问题
|
2024-10-31 20:03:26 +08:00 |
|
|
|
2e3cd377af
|
fix:
1.发运明细单保存生成储运汇总
|
2024-10-30 19:05:04 +08:00 |
|
|
|
60aa3d46cc
|
fix:
1.内审预算单上传附件
|
2024-10-30 18:40:34 +08:00 |
|
|
|
1986782dc4
|
fix:
1.发运明细单保存生成储运汇总
2.内审预算单上传附件
|
2024-10-30 18:26:03 +08:00 |
|
|
|
46050525c3
|
fix:
1.删除订单产品需求单业务类型
|
2024-10-29 19:35:00 +08:00 |
|
|
|
0befcddf00
|
1.修改询价单审核缺失字段属性
|
2024-10-29 18:03:48 +08:00 |
|
|
|
0ce59ea7cd
|
fix:
1.外销合同销售FOB单价金额计算
|
2024-10-28 20:17:32 +08:00 |
|
|
|
60981f994d
|
fix:
1.订单产品需求单整机外购计划财务组织和库存组织默认锐科，业务类型默认普通采购
|
2024-10-28 17:43:33 +08:00 |
|
|
|
5e53a39e68
|
fix:
1.内审预算单上传合同附件
|
2024-10-28 16:25:00 +08:00 |
|
|
|
96a8138473
|
fix:
1.外销合同起运港英文名称赋值
|
2024-10-28 11:26:53 +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 |
|
|
|
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 |
|
|
|
09e1a145b2
|
1.去除查询CMMP资源号前后空格
|
2024-10-24 18:49:14 +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 |
|
|
|
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 |
|
|
|
c6ea61153a
|
fix:订舱通知单是否信保合同功能完善
|
2024-10-23 10:57:32 +08:00 |
|
|
|
9a9819dffb
|
fix:
信保合同生成订舱通知单时，应收款金额（本位币）默认等于信保本位币金额；
|
2024-10-22 22:56:48 +08:00 |
|
|
|
a5217da705
|
fix:变更单的折扣金额 不需要触发值更新
|
2024-10-22 22:53:04 +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 |
|
|
|
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 |
|
|
|
7e12e7e7c8
|
fix:外销合同赠送配件分录条件设置
|
2024-10-22 11:54:15 +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 |
|
|
|
8e1fdec8d3
|
fix:框架合同反审核清空
|
2024-10-19 17:42:18 +08:00 |
|
|
|
a308233878
|
fix:合同签章
|
2024-10-19 16:50:10 +08:00 |
|
|
|
1ec6ddad83
|
fix:合同签章
|
2024-10-19 16:47:14 +08:00 |
|
|
|
13df2436d9
|
fix:收款单财务确认
|
2024-10-19 15:46:41 +08:00 |
|
|
|
fbf6338866
|
fix:收款单财务确认
|
2024-10-19 15:40:12 +08:00 |
|
|
|
bd0137604f
|
fix:合同签章
|
2024-10-19 15:00:22 +08:00 |
|
|
|
e6ae689395
|
fix:合同签章
|
2024-10-19 14:57:01 +08:00 |
|
|
|
2ceceaaa05
|
fix:收款单财务确认
|
2024-10-19 14:40:05 +08:00 |
|
|
|
8f3b26351f
|
fix:收款单问题处理
|
2024-10-18 21:15:35 +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 |
|
|
|
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 |
|
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 |
|
|
|
ccde1671b9
|
fix:配件价格库获取标准价条件增加
|
2024-10-18 14:41:59 +08:00 |
|
|
|
349940649a
|
fix:
-整机编号校验时，在原判断逻辑增加条件：是否赠品为否；
|
2024-10-18 14:17:18 +08:00 |
|
|
|
9abd286265
|
fix:
外销合同变更单审核生成资金池
|
2024-10-16 19:20:55 +08:00 |
|
|
|
07d8562ae2
|
fix:
销售提成配件报表处理
|
2024-10-16 18:58:20 +08:00 |
|
|
|
2e1d701e06
|
fix:
1.装箱单，回填配件装柜时配件货物描述和货物（描述）拼接
|
2024-10-16 18:58:19 +08:00 |
|
|
|
0462634b64
|
fix:
1.外销合同审核更新礼品资金池
|
2024-10-15 21:18:51 +08:00 |
|
|
|
44890ef65f
|
fix:
1.储运脱单审核更新礼品资金池
|
2024-10-15 21:17:31 +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 |
|
