Commit Graph

177 Commits

Author SHA1 Message Date
ljw
070a323c28 fix:
1.订舱通知变更单删除效验取消
2024-11-06 09:17:24 +08:00
ljw
5c8660bba1 fix:
1.订舱通知单信保回填更新客户信保额度申请
2024-11-05 19:03:26 +08:00
ljw
a98ad5ae17 fix:
1.订舱通知单提交效验迁移
2024-11-05 19:02:08 +08:00
ljw
dc527ca1a0 fix:
1.订舱通知单提单日期回填报错处理
2024-11-05 10:49:57 +08:00
ljw
48b6e7985c fix:
1.外销合同港口赋值
2024-11-04 21:14:22 +08:00
ljw
0d9a1f772d fix:
1.发运明细变更单删除行效验
2024-11-04 21:14:14 +08:00
ljw
132a88326c fix:
1.外销合同港口赋值
2024-11-04 21:14:09 +08:00
ljw
e7e1def3d2 fix:
1.装箱单锁定重量是否确认为空效验
2024-11-04 21:14:00 +08:00
ljw
cdb01c64e5 fix:
1.订舱通知单删除行效验
2.装箱单锁定重量是否确认为空效验
2024-11-04 21:13:55 +08:00
ljw
6a5b99fdaa fix:
1.订舱通知单信保回填赋值
2024-11-04 21:13:46 +08:00
ljw
82c15962ab fix:
1.外销合同填写港口给起运港英文名称赋值
2024-11-04 21:13:38 +08:00
ljw
ff648d4dbd fix:
1.装箱单锁定重量是否确认为空逻辑修改
2024-11-04 21:13:34 +08:00
ljw
54e88cbae3 fix:
1.外销合同填写港口给起运港英文名称赋值

(cherry picked from commit 7a82912901)
2024-11-04 21:13:26 +08:00
ljw
7a82912901 fix:
1.外销合同填写港口给起运港英文名称赋值
2024-11-04 11:50:14 +08:00
ljw
f6dd4c5f11 fix:
1.合同英文名称
2024-11-04 09:43:07 +08:00
ljw
ce36ea9758 fix:
1.装箱单效验
2.发运明细审核效验
2024-10-31 21:37:22 +08:00
ljw
2e3cd377af fix:
1.发运明细单保存生成储运汇总
2024-10-30 19:05:04 +08:00
ljw
1986782dc4 fix:
1.发运明细单保存生成储运汇总
2.内审预算单上传附件
2024-10-30 18:26:03 +08:00
ljw
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
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
ljw
8101851d4c fix:
1.外销合同折扣率计算
2.订舱通知单报关分类携带海关编码和申报要素
2024-10-25 20:26:00 +08:00
ljw
626648ecb3 fix:正式去除二开功能 2024-10-25 19:26:48 +08:00
ljw
0f861016cd fix:外销合同赠送配件生成 2024-10-25 15:53:12 +08:00
09e1a145b2 1.去除查询CMMP资源号前后空格 2024-10-24 18:49:14 +08:00
ljw
b04e72e1e1 fix:外销合同是否赠品为否的赠品分录 2024-10-23 21:34:04 +08:00
ljw
dc7eafc2c4 fix:外销合同是否赠品为否的赠品分录 2024-10-23 19:55:09 +08:00
ljw
538cc3b339 fix:订舱通知单是否信保合同功能完善 2024-10-23 19:53:47 +08:00
ljw
ccb1638193 fix:订舱通知单是否信保合同功能完善 2024-10-23 11:19:45 +08:00
ljw
c6ea61153a fix:订舱通知单是否信保合同功能完善 2024-10-23 10:57:32 +08:00
ljw
9a9819dffb fix:
信保合同生成订舱通知单时,应收款金额(本位币)默认等于信保本位币金额;
2024-10-22 22:56:48 +08:00
ljw
839e6308b7 fix:变更单的折扣金额 不需要触发值更新 2024-10-22 22:29:12 +08:00
ljw
881b8073eb fix:铭牌数量不允许低于本次非赠品行的整机数量 2024-10-22 22:27:07 +08:00
ljw
0dd35751e9 fix:外销合同变更单(配件)的折扣金额 不需要触发值更新 2024-10-22 22:27:03 +08:00
81552e6128 1.修改合同删行汇总表头金额不正确问题 2024-10-22 21:39:48 +08:00
ljw
7e12e7e7c8 fix:外销合同赠送配件分录条件设置 2024-10-22 11:54:15 +08:00
ljw
1f86c71340 fix:订舱通知单提交反写客户信保额度申请 2024-10-21 23:06:45 +08:00
ljw
1194acecf0 fix:订舱通知单提交反写客户信保额度申请 2024-10-21 22:54:36 +08:00
ljw
0134038149 fix:订舱通知单提交反写客户信保额度申请 2024-10-21 22:54:22 +08:00
ljw
2ecd5c47d1 fix:订舱通知单提交反写客户信保额度申请 2024-10-21 22:54:16 +08:00
ljw
011ec4db02 fix:订舱通知单提交反写客户信保额度申请 2024-10-21 22:54:01 +08:00
ljw
897722cf0f fix:订舱通知单提交反写客户信保额度申请 2024-10-21 22:53:43 +08:00
ljw
f162efc6a3 fix:订舱通知单审核反写客户信保额度申请 2024-10-21 22:53:28 +08:00
d53d68e5b5 1.增加合同提交是校验【合同提交附件】中的word是否包含ensign标签 2024-10-21 22:53:22 +08:00
ljw
8e1fdec8d3 fix:框架合同反审核清空 2024-10-19 17:42:18 +08:00
ljw
e6ae689395 fix:合同签章 2024-10-19 14:57:01 +08:00
8e4faa84b4 修改外销合同签章名称包含 ensign 2024-10-18 19:38:44 +08:00
ljw
349940649a fix:
-整机编号校验时,在原判断逻辑增加条件:是否赠品为否;
2024-10-18 14:17:18 +08:00