Commit Graph

1240 Commits

Author SHA1 Message Date
ljw
e2f53da4e9 fix:
1.随机资料及配件工具包,机型台数根据发运更新
2024-11-27 20:33:37 +08:00
ljw
67ce460142 fix:
1.随机资料及配件工具包,机型台数根据发运更新
2024-11-27 20:33:28 +08:00
ljw
e0b58466a1 fix:
1.随机资料及配件工具包,机型台数根据发运更新
2024-11-27 20:33:23 +08:00
ljw
57860631bc fix:
①收汇比例(小数,不显示尾零,放到预收比例前面),取值逻辑,取合同收款计划行的收汇百分比;
②订舱投保金额(原币种)-关联结算币别,锁定,计算逻辑:订舱合同金额*收汇比例;
2024-11-27 20:33:14 +08:00
ljw
c4ca8a7de5 fix:
1.随机资料及配件工具包,机型台数根据发运更新
2024-11-27 20:33:05 +08:00
ljw
112632a7dd fix:
1.随机资料及配件工具包,机型台数根据发运更新
2024-11-27 20:33:00 +08:00
ljw
7f17c00e9d fix:
①收汇比例(小数,不显示尾零,放到预收比例前面),取值逻辑,取合同收款计划行的收汇百分比;
②订舱投保金额(原币种)-关联结算币别,锁定,计算逻辑:订舱合同金额*收汇比例;
2024-11-27 20:32:52 +08:00
ljw
3edc8cdd70 fix:
①收汇比例(小数,不显示尾零,放到预收比例前面),取值逻辑,取合同收款计划行的收汇百分比;
②订舱投保金额(原币种)-关联结算币别,锁定,计算逻辑:订舱合同金额*收汇比例;
2024-11-27 20:32:47 +08:00
ljw
fd521f73cc fix:
1.随机资料及配件工具包,机型台数根据发运更新
2024-11-27 20:32:37 +08:00
ljw
1dfebb679a fix:
1.订单产品需求单保存处理
2024-11-27 20:32:32 +08:00
ljw
0493b20554 fix:
1.发运明细单汇总报错处理
2.公共方法
2024-11-27 20:32:23 +08:00
ljw
bdc8a0f805 fix:
1.随机资料及配件工具包,机型台数根据发运更新
2024-11-27 20:32:17 +08:00
ljw
1c75dea603 fix:
1.随机资料及配件工具包,机型台数根据发运更新
2024-11-27 20:32:07 +08:00
ljw
80b78fd463 fix:
1.随机资料及配件工具包,机型台数根据发运更新
2024-11-27 20:32:03 +08:00
ljw
5816468c57 fix:
1.随机资料及配件工具包,机型台数根据发运更新
2024-11-27 20:31:55 +08:00
ljw
e02ef10fa1 fix:
1.单台赠送配件金额  为空的行的数量不需要汇总
2024-11-27 20:30:16 +08:00
ljw
bf98c82519 fix:
1.只有是否需同步EAS为是时,才会同步EAS;
2024-11-27 20:30:05 +08:00
ljw
97986428d5 fix:
1.单台赠送配件金额  为空的行的数量不需要汇总
2024-11-27 20:29:59 +08:00
ljw
79eb14fb5c fix:
1.销售出库财务组织判断
2024-11-27 20:29:49 +08:00
ljw
615558b712 fix:
1.单台赠送配件金额  为空的行的数量不需要汇总
2024-11-27 20:29:43 +08:00
ljw
c8915a718e fix:
1.只有是否需同步EAS为是时,才会同步EAS;
2024-11-27 20:29:31 +08:00
ljw
53be70e0db fix:
1.生成随机资料时,只有业务分类为整机,且是否赠品为否的行生成
2024-11-27 20:29:27 +08:00
ljw
af59bf2dfd fix:
1.随机资料及配件工具包,机型台数根据发运更新
2024-11-26 21:33:25 +08:00
ljw
444d8c412e fix:
1.是否需校验物料属性为是时,走判断校验,其他情况保持原逻辑,不需调整;
2024-11-26 18:41:38 +08:00
ljw
861d8279bb fix:
1.接口调整:只有是否需同步EAS为是时,才会同步EAS;(订单产品需求单-整机外购计划,审核时同步EAS,销售出库-整机/配件,提交时同步EAS);
2024-11-26 18:35:04 +08:00
ljw
1d45f34ef8 fix:
1.生成随机资料时,只有业务分类为整机,且是否赠品为否的行生成
2024-11-26 17:10:31 +08:00
ljw
cd4b0d7f9d Merge remote-tracking branch 'orinin/main' 2024-11-26 16:35:56 +08:00
ljw
975ba7f974 fix:
1.配件发货明细表数据重复修复
2024-11-26 16:35:32 +08:00
zzs
9a81a8781f fix:报表国贸订单明细数据错误 2024-11-26 14:14:48 +08:00
zzs
03844240a0 feat:出口报关明细,海运费、保费改为取结算币别 2024-11-25 18:49:58 +08:00
ljw
c8188bfb40 fix:
1.外销合同贸易术语赋值
2024-11-25 18:49:54 +08:00
ljw
1a1e257be8 fix:
1.外销合同变更单打开签到日期赋值
2024-11-25 18:49:46 +08:00
zzs
e99e3380d3 fix:国贸订单明细重复行 2024-11-25 18:49:42 +08:00
zzs
606259d531 fix:生成替换关系取值断点时间错误 2024-11-25 18:49:36 +08:00
zzs
c6e602a675 fix:图册查询报错,断点时间为空 2024-11-25 18:49:33 +08:00
zzs
41802e5a72 feat:提交云之家日志 2024-11-25 18:48:46 +08:00
ljw
503cb7788d fix:
1.外销合同赠送配件页签汇总赋值
2024-11-25 18:47:22 +08:00
ljw
2af9172481 fix:
1.调拨订单 同步EAS的接口  业务类型  给他传单据字段  不穿默认值了
2024-11-25 17:19:04 +08:00
ljw
261d35ff59 fix:
1.外销合同赠送配件页签汇总赋值
2.发运明细单台数发运更新
2024-11-25 10:27:57 +08:00
zzs
2e5a292d3e fix:查询购买过的整机编码 2024-11-23 17:53:26 +08:00
zzs
52e9912eb1 fix:PLM生成替换关系 2024-11-23 17:53:25 +08:00
zzs
b7214cf204 doc:修改未查询到图册提示语 2024-11-23 09:21:57 +08:00
ljw
da686561af fix:
1.订舱通知单提交
2024-11-22 20:06:21 +08:00
ljw
c6f5c05e4c fix:
1.发运明细单金额价格条款赋值
2024-11-22 19:35:11 +08:00
ljw
90506a0127 fix:
1.寄单放单申请提交拼接
2024-11-22 19:35:08 +08:00
ljw
18824050e9 fix:
1.订舱通知单提交
2024-11-22 19:30:13 +08:00
ljw
f35fdecc63 fix:
1.整机发货明细表
2024-11-22 18:48:03 +08:00
ljw
883027d7c6 fix:
1.外销合同签订日期默认当前时间
2024-11-21 20:10:48 +08:00
ljw
6c37b4beaf fix:
1.外销合同签订日期默认当前时间
2024-11-21 20:04:11 +08:00
ljw
e31660e995 fix:
1.外销合同签订日期默认当前时间
2024-11-21 19:40:32 +08:00
ljw
f9f6c5fff7 fix:
1.水单附件必填效验
2024-11-21 19:26:30 +08:00
ljw
b796e9100e fix:
1.外销合同签订日期默认当前时间
2024-11-21 19:26:25 +08:00
zzs
210e61db9a fix:价格库查询到重复数据 2024-11-21 14:58:01 +08:00
ljw
09db507910 fix:
1.收款单认领合同过滤非贷记单
2024-11-21 14:40:01 +08:00
zzs
f76e7f23ca Merge remote-tracking branch 'origin/main' 2024-11-20 18:28:55 +08:00
zzs
99bdc4da6a feat:更新整机档案领料分析时间 2024-11-20 18:28:47 +08:00
ljw
e85ae88a64 fix:
1.订舱通知单额度确认效验修改
2024-11-20 18:14:55 +08:00
zzs
7d9aa70b93 feat:更新整机档案领料分析时间 2024-11-20 17:26:09 +08:00
ljw
fad828255f Merge remote-tracking branch 'orinin/main'
# Conflicts:
#	.gitignore
#	src/main/java/com/yem/rf/salescommission/SalesOfRoyaltyParts.java
#	src/main/java/com/yem/tws/task/CusdecToDeclaredocxTask.java
#	src/main/java/com/yem/wm/es/salescontrac/op/SalesContracUnauditOp.java
#	src/main/java/com/yem/wm/es/salesorder/from/SalesOrderPJEdit.java
#	src/main/java/com/yem/wm/es/salesorder/from/SalesOrderZJEdit.java
#	src/main/java/com/yem/wm/es/salesorder/op/SalesOrderAuditOp.java
#	src/main/java/com/yem/wm/es/salesorder/utils/SalesOrderUtils.java
#	src/main/java/com/yem/wm/es/shippingdetails/op/ShippingDetailsAuditOp.java
#	src/main/java/com/yem/wm/es/shippingdetails/op/XshippingDetailsSaveOp.java
#	src/main/java/com/yem/wm/im/csrCreditLine/task/CsrCreditLineTask.java
#	src/main/java/com/yem/wm/im/inquirylist/op/InquirylistAudit.java
#	src/main/java/com/yem/wm/syn/eas/api/OperationalUniversal.java
#	src/main/java/com/yem/wm/sys/utils/NewVersionHelper.java
#	src/main/java/com/yem/wm/utils/ContactSignUtils.java
2024-11-19 18:09:21 +08:00
zzs
04ad4b12d3 下单平台:配件价格根据名称模糊查询 2024-11-19 15:55:12 +08:00
ljw
07d1a90efe Merge remote-tracking branch 'orinin/test' into test 2024-11-19 14:24:54 +08:00
ljw
08b18bf7f6 fix:
1.订单产品需求单 调拨计划,调入调出仓库清空,不自动带出
2024-11-19 14:24:34 +08:00
zzs
db4a0dabe5 下单平台:只能查询购买过的资源
(cherry picked from commit 743bd6e277)
2024-11-19 10:19:44 +08:00
zzs
743bd6e277 下单平台:只能查询购买过的资源 2024-11-19 10:06:52 +08:00
ljw
1bf68b4811 fix:
1.报错修复
2024-11-18 22:29:40 +08:00
ljw
1fdaefba7b fix:
1.报错修复
2024-11-18 22:24:37 +08:00
ljw
77262dc8dc fix:
1.报错修复
2024-11-18 22:10:18 +08:00
ljw
60c3550fb6 fix:
1.报错修复
2024-11-18 22:10:11 +08:00
ljw
103140e352 fix:
1.报错修复
2024-11-18 22:10:08 +08:00
ljw
593050d6d5 fix:
1.报错修复
2024-11-18 22:10:01 +08:00
ljw
0bb09cf296 fix:
1.报错修复
2024-11-18 22:03:25 +08:00
ljw
d70a61c3f6 fix:
1.报错修复
2024-11-18 21:55:28 +08:00
ljw
1f3bf99c44 fix:
1.报错修复
2024-11-18 21:49:21 +08:00
ljw
6d5494f88b fix:
1.报错修复
2024-11-18 21:42:50 +08:00
ljw
8726d5f026 fix:
1.报错修复
2024-11-18 21:42:09 +08:00
ljw
79c87efddc fix:
1.报错修复

(cherry picked from commit 88ddf7970f)
2024-11-18 21:36:54 +08:00
ljw
88ddf7970f fix:
1.报错修复
2024-11-18 21:36:15 +08:00
ljw
756209a56a fix:
1.报错修复
2024-11-18 20:46:56 +08:00
ljw
1145b6b3d6 fix:
1.报错修复
2024-11-18 20:34:28 +08:00
ljw
124e9bb69b fix:
1.发运明细变更单修改数量逻辑修改
2024-11-18 18:15:09 +08:00
ljw
c817f189c0 fix:
1.合同签章合同盖章
2.发运明细变更单修改数量逻辑修改
2024-11-18 17:40:57 +08:00
ljw
5787908a4d fix:
1.合同签章合同盖章

(cherry picked from commit 5ac851a07d)
2024-11-18 15:25:56 +08:00
ljw
ae66636140 Merge remote-tracking branch 'orinin/test' into test 2024-11-18 15:25:53 +08:00
ljw
12b0c26e23 fix:
1.合同签章合同盖章
2024-11-18 15:25:35 +08:00
ljw
5ac851a07d fix:
1.合同签章合同盖章
2024-11-18 15:21:40 +08:00
ljw
a7738dbc3a fix:
1.配件价格库禁用按钮调用
2024-11-16 12:51:40 +08:00
ljw
1629349030 fix:
1.发运明细单(单证)报表日期汇总显示

(cherry picked from commit 31386ef6dc)
2024-11-15 23:58:56 +08:00
ljw
31386ef6dc fix:
1.发运明细单(单证)报表日期汇总显示
2024-11-15 23:56:06 +08:00
ljw
6b802e04ee fix:
1.发运明细单(单证)报表日期汇总显示

(cherry picked from commit 813c72a5db)
2024-11-15 23:47:05 +08:00
ljw
d7b1da08a7 Revert "fix:"
This reverts commit fb56bb116a.
2024-11-15 23:40:58 +08:00
ljw
312f208205 fix:
1.word文档书签处理
2024-11-15 23:39:27 +08:00
ljw
78f3330522 fix:
1.回填时,只能将信保年度的第一行回填到单据中
2024-11-15 23:39:25 +08:00
ljw
813c72a5db fix:
1.发运明细单(单证)报表日期汇总显示
2024-11-15 23:32:22 +08:00
ljw
fb56bb116a fix:
1.word文档书签处理
2024-11-15 18:15:05 +08:00
ljw
070e883567 fix:
1.回填时,只能将信保年度的第一行回填到单据中
2024-11-15 16:12:19 +08:00
ljw
bab8485b37 fix:
1.发运明细备注赋值
2024-11-14 21:40:16 +08:00
ljw
8d32ec95a6 fix:
1.发运明细备注赋值
2024-11-14 21:40:06 +08:00
ljw
32c084caa4 fix:
1.发运明细备注赋值
2024-11-14 21:40:01 +08:00
ljw
c92ad04e0d fix:
1.发运明细备注赋值
2024-11-14 21:39:52 +08:00
ljw
8002035dd3 fix:
1.发运明细备注赋值
2024-11-14 21:39:48 +08:00
ljw
b7e7eb190b fix:
1.发运明细备注赋值
2024-11-14 21:30:32 +08:00
ljw
2d7cd037e3 fix:
1.发运明细备注赋值
2024-11-14 21:26:45 +08:00
ljw
30c7aeb79e fix:
1.发运明细备注赋值
2024-11-14 21:18:22 +08:00
ljw
c568e17470 fix:
1.发运明细备注赋值
2024-11-14 21:17:55 +08:00
ljw
fc6dc5bbcd fix:
1.发运明细备注赋值
2024-11-14 21:13:17 +08:00
ljw
273339a464 fix:
1.发运明细备注赋值

(cherry picked from commit 5182295971)
2024-11-14 20:56:03 +08:00
ljw
5182295971 fix:
1.发运明细备注赋值
2024-11-14 20:52:41 +08:00
ljw
399d28e075 fix:
1.订舱通知单分摊金额本位币计算
2024-11-14 20:10:21 +08:00
ljw
94b7b9fa8a fix:
1.报表处理
2.订舱通知单增加效验

(cherry picked from commit c62ff30599)
2024-11-14 19:59:49 +08:00
ljw
d0ea675721 fix:
1.国贸订单生产线缺少值

(cherry picked from commit 9102995aa3)
2024-11-14 19:59:39 +08:00
ljw
8822ce3ce5 fix:
1.订舱通知单保存报错处理

(cherry picked from commit e9b19fe3cd)
2024-11-14 19:59:36 +08:00
ljw
2848c97f81 fix:
1.订舱通知单分摊金额本位币计算
2024-11-14 19:39:03 +08:00
ljw
c62ff30599 fix:
1.报表处理
2.订舱通知单增加效验
2024-11-14 18:50:08 +08:00
ljw
9102995aa3 fix:
1.国贸订单生产线缺少值
2024-11-14 15:16:37 +08:00
ljw
e9b19fe3cd fix:
1.订舱通知单保存报错处理
2024-11-14 11:48:12 +08:00
ljw
a5f7af3567 fix:
1.附件上传删除自动删除
2024-11-13 21:02:02 +08:00
ljw
bd421b7f8c fix:
1.附件上传删除自动删除
2024-11-13 20:48:07 +08:00
ljw
1eb311e1fe fix:
1.整机储备申请提交拼接
2024-11-13 20:35:23 +08:00
ljw
b71df461a1 fix:
1.储备申请标题
2024-11-13 20:35:14 +08:00
ljw
e8a35daa9f fix:
1.附件上传自动保存
2024-11-13 20:35:09 +08:00
ljw
aeca4ae7d4 fix:
1.外销合同系统最大贷记单号排序错误
2024-11-13 20:35:00 +08:00
ljw
f70eec6dce fix:
1.整机储运申请下推到云之家的标题形式为:整机储运申请+业务员+国家+合同号。
2024-11-13 20:34:56 +08:00
ljw
873234cfda fix:
1.发货明细表(未发货)起运港  目的港没有带出来
2024-11-13 20:34:46 +08:00
ljw
dece3cf388 fix:
1.业务分类为整机、提成分类为整机且是否赠品为否
2024-11-13 20:34:39 +08:00
ljw
3f3fab9aea fix:
1.资源确认时,资源号必填
2024-11-13 20:34:30 +08:00
ljw
d1605cb6e7 fix:
1.资源确认时,资源号必填
2024-11-13 20:34:26 +08:00
ljw
386062cc11 fix:
1.152订舱通知单:订单总台数未更新
2024-11-13 20:34:17 +08:00
ljw
8098107719 fix:
1.销售提成-整机 功能完善
2024-11-13 20:34:14 +08:00
ljw
c8dcd77fcb fix:
1.整机储备申请提交拼接
2024-11-13 20:14:27 +08:00
ljw
35afa2617d fix:
1.储备申请标题
2024-11-13 19:55:55 +08:00
ljw
f50553cb46 fix:
1.附件上传自动保存
2024-11-13 19:48:47 +08:00
ljw
2b4af2f0f7 fix:
1.外销合同系统最大贷记单号排序错误
2024-11-13 18:57:36 +08:00
ljw
924b007ad0 fix:
1.整机储运申请下推到云之家的标题形式为:整机储运申请+业务员+国家+合同号。
2024-11-13 18:25:08 +08:00
ljw
62399ef804 fix:
1.发货明细表(未发货)起运港  目的港没有带出来
2024-11-13 17:37:07 +08:00
ljw
ae06bb6c2f fix:
1.外销合同系统最大贷记单号排序错误

(cherry picked from commit a1ee8acc93)
2024-11-13 16:33:53 +08:00
ljw
cad042604a fix:
1.业务分类为整机、提成分类为整机且是否赠品为否
2024-11-13 16:33:38 +08:00
ljw
a1ee8acc93 fix:
1.外销合同系统最大贷记单号排序错误
2024-11-13 16:21:03 +08:00
ljw
2dd73412c4 fix:
1.资源确认时,资源号必填
2024-11-13 15:10:51 +08:00
ljw
1c896a1175 fix:
1.资源确认时,资源号必填
2024-11-13 15:09:13 +08:00
ljw
21e7248b55 fix:
1.152订舱通知单:订单总台数未更新
2024-11-13 15:05:11 +08:00
ljw
bf75fa8f67 fix:
1.销售提成-整机 功能完善
2024-11-13 11:35:10 +08:00
ljw
dc7fb5bbc3 fix:
1.订舱通知单提交效验汇总明细信息分录数量

(cherry picked from commit 425d7d29a2)
2024-11-12 18:26:47 +08:00
ljw
2040adef30 fix:
1.订舱通知单保存汇总明细信息分录数量
2.注册优化

(cherry picked from commit d755bffaee)
2024-11-12 18:26:43 +08:00
ljw
425d7d29a2 fix:
1.订舱通知单提交效验汇总明细信息分录数量
2024-11-12 18:07:07 +08:00
ljw
d755bffaee fix:
1.订舱通知单保存汇总明细信息分录数量
2.注册优化
2024-11-12 17:45:44 +08:00
ljw
ee18edfb02 fix:
发运明细变更单:
1、变更后,出运汇总页签重复。每次保存都是重复生成,删行时没有控制;
2、商品明细删行报错,数量减少时,系统有提示,但是可以修改成功;
3、商品明细新增的行,没有更新到出运汇总页签
2024-11-11 21:26:35 +08:00
ljw
00123c56ca fix:
1.整机档案查询报错
2024-11-11 18:39:37 +08:00
ljw
53414d26b2 fix:
1.整机档案查询报错
2024-11-11 18:37:08 +08:00
ljw
3f1d7e2cd6 fix:
1.收款单修改认领保存改变计算逻辑

(cherry picked from commit 39b2a4a81c)
2024-11-11 17:01:06 +08:00
ljw
39b2a4a81c fix:
1.收款单修改认领保存改变计算逻辑
2024-11-11 17:00:27 +08:00
ljw
595983c907 fix:
1.外销合同提交效验

(cherry picked from commit 547bf40721)
2024-11-11 16:12:49 +08:00
ljw
5afb148064 fix:
1.外销合同提交效验

(cherry picked from commit a5bafa64d9)
2024-11-11 16:12:46 +08:00
ljw
547bf40721 fix:
1.外销合同提交效验
2024-11-11 16:12:10 +08:00
ljw
a5bafa64d9 fix:
1.外销合同提交效验
2024-11-11 16:11:49 +08:00
ljw
2251109306 fix:
1.发运明细变更单保存生成出运明细
2024-11-11 15:10:07 +08:00
ljw
48c1b4252b fix:
1.报关合并
2024-11-11 15:10:03 +08:00
ljw
7e0a3a6190 fix:
1.报关合并
2024-11-11 14:44:30 +08:00
ljw
7964860624 fix:
1.发运明细变更单保存生成出运明细
2024-11-11 10:03:55 +08:00
02efc0db6d 1.取消日期计算差判断 2024-11-11 09:30:06 +08:00
ljw
41634c7726 fix:
1.订舱通知单物流效验
2024-11-08 22:44:26 +08:00
ljw
59cef79f81 fix:
1.订舱通知单物流效验
2024-11-08 22:44:02 +08:00
ljw
7ff37285e7 fix:
1.订舱通知单物流
2024-11-08 22:36:16 +08:00
ljw
69d8000cf5 fix:
1.订舱通知单物流
2024-11-08 22:35:42 +08:00
ljw
6c1d90e759 fix:
1.订舱通知单物流
2024-11-08 22:29:14 +08:00
ljw
082e094637 fix:
1.订舱通知单物流
2024-11-08 22:10:18 +08:00
ljw
b945d10f26 fix:
1.外销合同点击审核报错

(cherry picked from commit dbdcff7c5e)
2024-11-08 17:41:12 +08:00
ljw
480a0388a8 fix:
1.发运明细变更单随机资料页签删除效验
2024-11-08 17:40:49 +08:00
ljw
0cb2a82eab fix:
1.发运明细变更单效验
2024-11-08 11:36:35 +08:00
ljw
118f2f9277 fix:
1.外销合同删除国贸经理签批附件
2024-11-08 11:24:04 +08:00
ljw
dbdcff7c5e fix:
1.外销合同点击审核报错
2024-11-08 11:02:20 +08:00
f58d6f4dd4 1.修改计算应回款倒计时错误 2024-11-07 20:00:51 +08:00
cf2d63b1ff 1.修改计算应回款倒计时 2024-11-07 19:58:19 +08:00
ljw
914f140829 fix:
2.客户信保额度申请调度计划执行
2024-11-07 17:48:33 +08:00
ljw
0b5d21b5da fix:
2.客户信保额度申请调度计划执行
2024-11-07 17:48:30 +08:00
ljw
62fa9393cf fix:
2.客户信保额度申请调度计划执行
2024-11-07 17:48:21 +08:00
ljw
08cf97957c fix:
2.订舱通知单物流订舱完成按钮效验
2024-11-07 17:48:17 +08:00
ljw
2a6198f8c1 fix:
2.客户信保额度申请调度计划执行
2024-11-07 17:48:09 +08:00
ljw
d0f1d35c04 fix:
2.外销合同变更单删除行效验
2024-11-07 17:48:06 +08:00
ljw
5adcd90936 fix:
2.客户信保额度申请调度计划执行
2024-11-07 17:40:16 +08:00
ljw
a98faa8843 fix:
2.客户信保额度申请调度计划执行
2024-11-07 17:29:28 +08:00
ljw
bad891dfe5 fix:
2.客户信保额度申请调度计划执行
2024-11-07 17:28:28 +08:00
ljw
21831959cc fix:
2.订舱通知单物流订舱完成按钮效验
2024-11-07 17:10:31 +08:00
ljw
c07857d288 fix:
2.客户信保额度申请调度计划执行
2024-11-07 16:42:42 +08:00
ljw
01d4c4b3e4 fix:
2.外销合同变更单删除行效验
2024-11-07 16:42:07 +08:00
ljw
f85526f6e5 fix:
2.外销合同变更单删除行效验
2024-11-07 15:14:38 +08:00
ljw
ce129ac8e0 fix:
1.订舱通知单分录变更
2024-11-06 21:25:07 +08:00
ljw
fed2764e22 fix:
1.外销合同【实际整车单价向上取整】
2024-11-06 21:24:52 +08:00
ljw
4227fdc87d fix:
1.外销合同【销售单价价格条款向上取整】
2024-11-06 21:24:47 +08:00
ljw
8cc5b85032 fix:
2.外销合同报错处理
3.订舱通知单日期增加一天
2024-11-06 21:24:14 +08:00
ljw
39feb3744a fix:
1.订舱通知单变更效验
2024-11-06 21:23:26 +08:00
ljw
9583baeda0 fix:
1.外销合同,整机行单价取整
2024-11-06 21:22:23 +08:00
ljw
b3c5304596 fix:
1.订舱通知单提单日期回填
2024-11-06 21:22:18 +08:00
ljw
192ab9d251 fix:
1.订舱通知物流  根据运输方式判断必录
2024-11-06 21:22:16 +08:00
ljw
49f5cb17cf fix:
1.收款单修改认领金额更新
2024-11-06 21:22:09 +08:00
ljw
1c8ea3464e fix:
1.收款单修改认领金额更新
2024-11-06 21:22:01 +08:00
ljw
6d8536d823 fix:
1.收款单修改认领金额更新

(cherry picked from commit 97004d94bb)
2024-11-06 21:21:58 +08:00
ljw
e383cc7904 fix:
1.收款单修改认领金额更新
2024-11-06 21:21:52 +08:00
ljw
8f8c8b3f68 fix:
1.外销合同【实际整车单价向上取整】
2024-11-06 20:37:08 +08:00
ljw
1684b553df fix:
1.外销合同【销售单价价格条款向上取整】
2024-11-06 20:19:12 +08:00
ljw
fc94cf15aa fix:
1.发运明细变更单调用按钮【整机编码效验】
2024-11-06 20:15:46 +08:00
ljw
e4b046f5b4 fix:
1.订舱通知单分录变更增删行
2024-11-06 20:07:18 +08:00
ljw
76e8c9d5e7 fix:
1.订舱通知单分录变更
2024-11-06 19:37:31 +08:00
ljw
b5a9b3d4b1 fix:
1.发运明细变更单增行复制
2.外销合同报错处理
3.订舱通知单日期增加一天
2024-11-06 18:33:47 +08:00
ljw
87d825e0f5 fix:
1.发运明细变更单增行复制
2024-11-06 18:01:23 +08:00
ljw
2701fa9f02 fix:
1.订舱通知单变更效验
2024-11-06 17:47:56 +08:00
ljw
4715899dc5 fix:
1.外销合同,整机行单价取整
2024-11-06 17:40:02 +08:00
ljw
32070bce44 fix:
1.订舱通知单提单日期回填
2024-11-06 17:13:20 +08:00
ljw
9084c2a543 fix:
1.订舱通知物流  根据运输方式判断必录
2024-11-06 11:18:23 +08:00
ljw
36d3d73250 fix:
1.订舱通知变更单删除效验取消

(cherry picked from commit 070a323c28)
2024-11-06 09:18:09 +08:00
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
71092fbc70 fix:
1.订舱通知单信保回填更新客户信保额度申请
2024-11-05 17:20:36 +08:00
ljw
ae5989f8fb fix:
1.订舱通知单提交效验迁移
2024-11-05 16:58:51 +08:00
ljw
23ee31b715 fix:
1.外销合同报错处理
2024-11-05 16:09:51 +08:00
ljw
f90fff0199 fix:
1.外销合同报错处理
2024-11-05 14:30:39 +08:00
ljw
2996f9d6f6 fix:
1.订舱通知单提单日期回填报错处理

(cherry picked from commit dc527ca1a0)
2024-11-05 11:00:26 +08:00
ljw
9ee3459aad fix:
1.订舱通知单提单日期回填报错处理

(cherry picked from commit dc779ed717)
2024-11-05 11:00:21 +08:00
ljw
dc527ca1a0 fix:
1.订舱通知单提单日期回填报错处理
2024-11-05 10:49:57 +08:00
ljw
dc779ed717 fix:
1.订舱通知单提单日期回填报错处理
2024-11-05 10:49:45 +08:00
ljw
2caaf2c850 fix:
1.单价四舍五入保留两位小数
2024-11-04 21:14:51 +08:00
ljw
3031c43db3 fix:
1.单价四舍五入保留两位小数
2024-11-04 21:14:41 +08:00
ljw
9608a4293b fix:
1.单价四舍五入
2024-11-04 21:14:37 +08:00
ljw
8a91fb11b9 fix:
1.单价四舍五入
2024-11-04 21:14:27 +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
cad34ebca4 fix:
1.单价四舍五入保留两位小数
2024-11-04 21:03:36 +08:00
582c32cbd8 Merge remote-tracking branch 'origin/test' into test 2024-11-04 20:23:23 +08:00
25dab22e26 Merge remote-tracking branch 'origin/test' into test 2024-11-04 20:22:53 +08:00
ljw
1aba97a804 fix:
1.单价四舍五入保留两位小数
2024-11-04 20:22:35 +08:00
4f0b5bfed9 1.修改发运明细审核生成汇总信息 2024-11-04 20:17:00 +08:00
ljw
0ac2f0532f fix:
1.单价四舍五入
2024-11-04 20:07:12 +08:00
ljw
c46c136239 fix:
1.单价四舍五入
2024-11-04 20:05:36 +08:00
ljw
c281592241 fix:
1.外销合同港口赋值
2024-11-04 19:59:18 +08:00
ljw
4a57b0f90a fix:
1.发运明细变更单删除行效验
2024-11-04 19:57:28 +08:00
ljw
00c31c5890 fix:
1.外销合同港口赋值
2024-11-04 19:44:42 +08:00
ljw
4ae8998b94 fix:
1.装箱单锁定重量是否确认为空效验
2024-11-04 19:16:14 +08:00
ljw
fa5bdfae1c fix:
1.订舱通知单删除行效验
2.装箱单锁定重量是否确认为空效验
2024-11-04 19:02:38 +08:00
ljw
b1ed979906 fix:
1.订舱通知单信保回填赋值
2024-11-04 18:22:09 +08:00
ljw
7b782dd435 fix:
1.外销合同填写港口给起运港英文名称赋值
2024-11-04 18:13:11 +08:00
ljw
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