|
|
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 |
|
|
|
8e5ad493f5
|
fix:
1.合同英文名称
|
2024-11-01 20:36:56 +08:00 |
|
|
|
a7236d8feb
|
fix:
1.外销合同合同回签
|
2024-11-01 11:11:33 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
89c6723d26
|
fix:
1.外销合同起运港英文名称赋值
|
2024-10-28 11:25:44 +08:00 |
|
|
|
f888460175
|
1.修改分录价格条款不更新任何数据
|
2024-10-26 23:26:42 +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 |
|
|
|
daf729a12c
|
1.去除查询CMMP资源号前后空格
|
2024-10-24 18:44:10 +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 |
|
|
|
d9ef332698
|
fix:订舱通知单是否信保合同功能完善
|
2024-10-23 11:14:56 +08:00 |
|
|
|
84b4d935fe
|
fix:订舱通知单是否信保合同功能完善
|
2024-10-23 10:53:00 +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 |
|
|
|
20417cb4fa
|
fix:订舱通知单提交反写客户信保额度申请
(cherry picked from commit 1f86c71340)
|
2024-10-21 23:12:40 +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 |
|
|
|
7ad4258cf6
|
fix:合同签章
|
2024-10-19 14:55:22 +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 |
|
|
|
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 |
|
|
|
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
|
cfee129bf2
|
wip(fix):获取价格
|
2024-10-14 21:55:37 +08:00 |
|
|
|
bd1f866fbe
|
1.增加回填字段【预计入库日期】
|
2024-10-14 15:50:19 +08:00 |
|
|
|
973a11838b
|
fix:发运明细申报要素
|
2024-10-14 12:02:03 +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 |
|
|
|
dca9f3f93d
|
fix:外销合同变更单费用分摊增加限制
|
2024-10-12 20:46:44 +08:00 |
|
zzs
|
8137198072
|
wip(version1011):整机价格
|
2024-10-12 16:50:26 +08:00 |
|
zzs
|
800c4994da
|
fix:发货联系书云之家提交标题拼接
(cherry picked from commit d5128f866d)
|
2024-10-12 15:55:32 +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 |
|
|
|
907ea73905
|
fix:报关对比
|
2024-09-29 19:33:28 +08:00 |
|
|
|
4f83e6c995
|
fix:配件合同费用分摊
|
2024-09-29 17:13:51 +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 |
|
|
|
ae7730afd0
|
fix:收款单报错处理
|
2024-09-26 22:34:20 +08:00 |
|
|
|
e6ac411ca8
|
fix:信保回填报错处理
|
2024-09-26 18:08:21 +08:00 |
|
|
|
d3ab4271ec
|
fix:报关单报关对比
|
2024-09-26 18:08:20 +08:00 |
|
|
|
ef49929a52
|
fix:报错处理
|
2024-09-24 21:16:49 +08:00 |
|
|
|
a955344dfa
|
fix:款项类型 = 普通选项 时，判断当前 客户 在 【订舱通知单-信保回填 】中是否存在满足以下条件的信保明细：（应回款倒计时<0 并且投保回款金额<应收款金额）
如果满足， 提示：当前寄单放单客户存在历史合同：***，订舱通知单：****，逾期未收款，请确认！！！
款项类型=特殊情况不判断。
|
2024-09-24 19:37:33 +08:00 |
|
|
|
22e9d11e90
|
fix:外销合同变更单报错处理
|
2024-09-24 16:32:56 +08:00 |
|
|
|
452a04c11b
|
fix:外销合同变更单报错处理
(cherry picked from commit 480b492654)
|
2024-09-24 15:37:08 +08:00 |
|
|
|
4615f3ce68
|
1.修改明细删除行提示null
|
2024-09-24 14:48:53 +08:00 |
|
|
|
b09f2c1666
|
Merge branch 'dev-ljw' into test
# Conflicts:
# src/main/java/com/yem/wm/es/shippingdetails/form/ShippingDetailsFormPlugin.java
|
2024-09-23 21:52:13 +08:00 |
|
|
|
30a4b6e65c
|
fix:删除衣总签章
|
2024-09-23 21:27:17 +08:00 |
|
|
|
5a1dc32804
|
fix:查询库存报错处理
|
2024-09-23 21:27:11 +08:00 |
|
|
|
3695bd063c
|
fix:查询库存报错处理
|
2024-09-23 21:26:54 +08:00 |
|
|
|
7d01e25b7a
|
fix:删除衣总签章
|
2024-09-23 20:37:50 +08:00 |
|
|
|
934abaa194
|
fix:发运明细单物料查询库存
|
2024-09-23 16:33:30 +08:00 |
|
|
|
5310b017db
|
fix:发运明细单物料查询库存
|
2024-09-23 16:30:44 +08:00 |
|
