|
|
b945d10f26
|
fix:
1.外销合同点击审核报错
(cherry picked from commit dbdcff7c5e)
|
2024-11-08 17:41:12 +08:00 |
|
|
|
480a0388a8
|
fix:
1.发运明细变更单随机资料页签删除效验
|
2024-11-08 17:40:49 +08:00 |
|
|
|
0cb2a82eab
|
fix:
1.发运明细变更单效验
|
2024-11-08 11:36:35 +08:00 |
|
|
|
118f2f9277
|
fix:
1.外销合同删除国贸经理签批附件
|
2024-11-08 11:24:04 +08:00 |
|
|
|
dbdcff7c5e
|
fix:
1.外销合同点击审核报错
|
2024-11-08 11:02:20 +08:00 |
|
|
|
08cf97957c
|
fix:
2.订舱通知单物流订舱完成按钮效验
|
2024-11-07 17:48:17 +08:00 |
|
|
|
21831959cc
|
fix:
2.订舱通知单物流订舱完成按钮效验
|
2024-11-07 17:10:31 +08:00 |
|
|
|
f85526f6e5
|
fix:
2.外销合同变更单删除行效验
|
2024-11-07 15:14:38 +08:00 |
|
|
|
b3c5304596
|
fix:
1.订舱通知单提单日期回填
|
2024-11-06 21:22:18 +08:00 |
|
|
|
192ab9d251
|
fix:
1.订舱通知物流 根据运输方式判断必录
|
2024-11-06 21:22:16 +08:00 |
|
|
|
fc94cf15aa
|
fix:
1.发运明细变更单调用按钮【整机编码效验】
|
2024-11-06 20:15:46 +08:00 |
|
|
|
e4b046f5b4
|
fix:
1.订舱通知单分录变更增删行
|
2024-11-06 20:07:18 +08:00 |
|
|
|
b5a9b3d4b1
|
fix:
1.发运明细变更单增行复制
2.外销合同报错处理
3.订舱通知单日期增加一天
|
2024-11-06 18:33:47 +08:00 |
|
|
|
87d825e0f5
|
fix:
1.发运明细变更单增行复制
|
2024-11-06 18:01:23 +08:00 |
|
|
|
32070bce44
|
fix:
1.订舱通知单提单日期回填
|
2024-11-06 17:13:20 +08:00 |
|
|
|
9084c2a543
|
fix:
1.订舱通知物流 根据运输方式判断必录
|
2024-11-06 11:18:23 +08:00 |
|
|
|
36d3d73250
|
fix:
1.订舱通知变更单删除效验取消
(cherry picked from commit 070a323c28)
|
2024-11-06 09:18:09 +08:00 |
|
|
|
070a323c28
|
fix:
1.订舱通知变更单删除效验取消
|
2024-11-06 09:17:24 +08:00 |
|
|
|
5c8660bba1
|
fix:
1.订舱通知单信保回填更新客户信保额度申请
|
2024-11-05 19:03:26 +08:00 |
|
|
|
a98ad5ae17
|
fix:
1.订舱通知单提交效验迁移
|
2024-11-05 19:02:08 +08:00 |
|
|
|
71092fbc70
|
fix:
1.订舱通知单信保回填更新客户信保额度申请
|
2024-11-05 17:20:36 +08:00 |
|
|
|
ae5989f8fb
|
fix:
1.订舱通知单提交效验迁移
|
2024-11-05 16:58:51 +08:00 |
|
|
|
2996f9d6f6
|
fix:
1.订舱通知单提单日期回填报错处理
(cherry picked from commit dc527ca1a0)
|
2024-11-05 11:00:26 +08:00 |
|
|
|
dc527ca1a0
|
fix:
1.订舱通知单提单日期回填报错处理
|
2024-11-05 10:49:57 +08:00 |
|
|
|
48b6e7985c
|
fix:
1.外销合同港口赋值
|
2024-11-04 21:14:22 +08:00 |
|
|
|
0d9a1f772d
|
fix:
1.发运明细变更单删除行效验
|
2024-11-04 21:14:14 +08:00 |
|
|
|
132a88326c
|
fix:
1.外销合同港口赋值
|
2024-11-04 21:14:09 +08:00 |
|
|
|
e7e1def3d2
|
fix:
1.装箱单锁定重量是否确认为空效验
|
2024-11-04 21:14:00 +08:00 |
|
|
|
cdb01c64e5
|
fix:
1.订舱通知单删除行效验
2.装箱单锁定重量是否确认为空效验
|
2024-11-04 21:13:55 +08:00 |
|
|
|
6a5b99fdaa
|
fix:
1.订舱通知单信保回填赋值
|
2024-11-04 21:13:46 +08:00 |
|
|
|
82c15962ab
|
fix:
1.外销合同填写港口给起运港英文名称赋值
|
2024-11-04 21:13:38 +08:00 |
|
|
|
ff648d4dbd
|
fix:
1.装箱单锁定重量是否确认为空逻辑修改
|
2024-11-04 21:13:34 +08:00 |
|
|
|
54e88cbae3
|
fix:
1.外销合同填写港口给起运港英文名称赋值
(cherry picked from commit 7a82912901)
|
2024-11-04 21:13:26 +08:00 |
|
|
|
25dab22e26
|
Merge remote-tracking branch 'origin/test' into test
|
2024-11-04 20:22:53 +08:00 |
|
|
|
4f0b5bfed9
|
1.修改发运明细审核生成汇总信息
|
2024-11-04 20:17:00 +08:00 |
|
|
|
c281592241
|
fix:
1.外销合同港口赋值
|
2024-11-04 19:59:18 +08:00 |
|
|
|
4a57b0f90a
|
fix:
1.发运明细变更单删除行效验
|
2024-11-04 19:57:28 +08:00 |
|
|
|
00c31c5890
|
fix:
1.外销合同港口赋值
|
2024-11-04 19:44:42 +08:00 |
|
|
|
4ae8998b94
|
fix:
1.装箱单锁定重量是否确认为空效验
|
2024-11-04 19:16:14 +08:00 |
|
|
|
fa5bdfae1c
|
fix:
1.订舱通知单删除行效验
2.装箱单锁定重量是否确认为空效验
|
2024-11-04 19:02:38 +08:00 |
|
|
|
b1ed979906
|
fix:
1.订舱通知单信保回填赋值
|
2024-11-04 18:22:09 +08:00 |
|
|
|
7b782dd435
|
fix:
1.外销合同填写港口给起运港英文名称赋值
|
2024-11-04 18:13:11 +08:00 |
|
|
|
8d35981743
|
fix:
1.装箱单锁定重量是否确认为空逻辑修改
|
2024-11-04 16:58:00 +08:00 |
|
|
|
2c5b8105aa
|
Merge remote-tracking branch 'origin/test' into test
|
2024-11-04 14:58:28 +08:00 |
|
|
|
b3ce35b484
|
1.修改发运明细审核生成汇总信息
|
2024-11-04 14:58:01 +08:00 |
|
|
|
325cdc315b
|
fix:
1.外销合同填写港口给起运港英文名称赋值
(cherry picked from commit 7a82912901)
|
2024-11-04 14:31:29 +08:00 |
|
|
|
7a82912901
|
fix:
1.外销合同填写港口给起运港英文名称赋值
|
2024-11-04 11:50:14 +08:00 |
|
|
|
f6dd4c5f11
|
fix:
1.合同英文名称
|
2024-11-04 09:43:07 +08:00 |
|
|
|
8e5ad493f5
|
fix:
1.合同英文名称
|
2024-11-01 20:36:56 +08:00 |
|
|
|
a7236d8feb
|
fix:
1.外销合同合同回签
|
2024-11-01 11:11:33 +08:00 |
|
|
|
ce36ea9758
|
fix:
1.装箱单效验
2.发运明细审核效验
|
2024-10-31 21:37:22 +08:00 |
|
|
|
39fa056aa4
|
fix:
1.装箱单效验
2.发运明细审核效验
|
2024-10-31 20:48:07 +08:00 |
|
|
|
a5fcb2d853
|
fix:
1.收款单认领查询回款金额
2.发运明细审核效验
|
2024-10-31 18:37:29 +08:00 |
|
|
|
2e3cd377af
|
fix:
1.发运明细单保存生成储运汇总
|
2024-10-30 19:05:04 +08:00 |
|
|
|
329239927a
|
fix:
1.发运明细单保存生成储运汇总
|
2024-10-30 19:00:25 +08:00 |
|
|
|
0396aab3e5
|
fix:
1.发运明细单保存生成储运汇总
2.内审预算单上传附件
(cherry picked from commit 1986782dc4)
|
2024-10-30 18:26:49 +08:00 |
|
|
|
1986782dc4
|
fix:
1.发运明细单保存生成储运汇总
2.内审预算单上传附件
|
2024-10-30 18:26:03 +08:00 |
|
|
|
c836e4f7ba
|
fix:
1.外销合同删除国贸经理签批附件
|
2024-10-29 15:56:01 +08:00 |
|
|
|
6e8255715c
|
fix:
1.框架合同反审核删除国贸经理签批附件
|
2024-10-29 15:20:25 +08:00 |
|
|
|
7c1f573ad6
|
fix:
1.外销合同赠送配件分录赋值
|
2024-10-29 11:46:41 +08:00 |
|
|
|
314d9b51bc
|
fix:
1.外销合同起运港英文名称赋值
|
2024-10-28 19:31:53 +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 |
|
|
|
f71b5c2161
|
1.修改合同计算港杂费、内陆运输费
2.携带方数、吨数
|
2024-10-26 19:30:20 +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 |
|
|
|
8101851d4c
|
fix:
1.外销合同折扣率计算
2.订舱通知单报关分类携带海关编码和申报要素
|
2024-10-25 20:26:00 +08:00 |
|
|
|
626648ecb3
|
fix:正式去除二开功能
|
2024-10-25 19:26:48 +08:00 |
|
|
|
0f861016cd
|
fix:外销合同赠送配件生成
|
2024-10-25 15:53:12 +08:00 |
|
|
|
09e1a145b2
|
1.去除查询CMMP资源号前后空格
|
2024-10-24 18:49:14 +08:00 |
|
|
|
daf729a12c
|
1.去除查询CMMP资源号前后空格
|
2024-10-24 18:44:10 +08:00 |
|
|
|
b04e72e1e1
|
fix:外销合同是否赠品为否的赠品分录
|
2024-10-23 21:34:04 +08:00 |
|
|
|
5bae043614
|
fix:外销合同是否赠品为否的赠品分录
|
2024-10-23 20:28:09 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
a378f0238b
|
fix:外销合同变更单（配件）的折扣金额 不需要触发值更新
|
2024-10-22 17:08:24 +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 |
|
|
|
e6ae689395
|
fix:合同签章
|
2024-10-19 14:57:01 +08:00 |
|
|
|
7ad4258cf6
|
fix:合同签章
|
2024-10-19 14:55:22 +08:00 |
|
|
|
8e4faa84b4
|
修改外销合同签章名称包含 ensign
|
2024-10-18 19:38:44 +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 |
|
|
|
56bf193ea9
|
fix:
外销合同变更单审核生成资金池
|
2024-10-16 18:59:01 +08:00 |
|
|
|
2e1d701e06
|
fix:
1.装箱单，回填配件装柜时配件货物描述和货物（描述）拼接
|
2024-10-16 18:58:19 +08:00 |
|
|
|
e9f0827d16
|
fix:
外销合同变更单审核生成资金池
|
2024-10-16 18:49:14 +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 |
|
|
|
e5370ba618
|
1.增加回填字段【预计入库日期】
|
2024-10-14 22:02:13 +08:00 |
|
zzs
|
cfee129bf2
|
wip(fix):获取价格
|
2024-10-14 21:55:37 +08:00 |
|
