|
|
0fe98ca955
|
fix:
1.订舱通知单，发运明细单 获取整机信息功能增加
|
2024-12-09 19:57:36 +08:00 |
|
|
|
25ac523502
|
fix:
1.订舱通知单，发运明细单 获取整机信息功能增加
|
2024-12-09 19:57:33 +08:00 |
|
|
|
37857e0346
|
fix:
1.已存在的数据不在生成
|
2024-12-07 17:52:21 +08:00 |
|
zzs
|
35d101386a
|
fix:智能审批单据注册，子单据体修改会清空父分录标识
|
2024-12-06 18:25:43 +08:00 |
|
|
|
9ceaea2803
|
fix:
1.配件发货明细表（已发货）逻辑修改
|
2024-12-06 17:57:35 +08:00 |
|
|
|
d26d5dcc7b
|
fix:
1.取消收款单打开视图默认为标准收款单
|
2024-12-06 17:57:32 +08:00 |
|
zzs
|
4bc02913a5
|
feat:定时任务获取到BOM变更单后自动审核
|
2024-12-05 19:22:08 +08:00 |
|
zzs
|
1194ed3c99
|
fix:出口报关，保存前不能进行报关合并
|
2024-12-05 19:21:47 +08:00 |
|
zzs
|
883fc64c67
|
fix:出口报关明细，合同号不显示
|
2024-12-05 19:21:38 +08:00 |
|
zzs
|
31ed751f18
|
feat:整机发运明细表增加字段销售员
|
2024-12-05 19:21:20 +08:00 |
|
zzs
|
10601acb44
|
fix:报关合并-特殊规则未清空合并对照表
|
2024-12-05 19:21:14 +08:00 |
|
|
|
def41ec6e9
|
fix:
1.发运提交的时候 如果该合同下发运明细单的历史总数量+本次发运总数量等于 关联合同的总数量，那么历史发运金额+当前发运金额的汇总值必须等于合同金额
否则，不需判断
|
2024-12-05 19:12:20 +08:00 |
|
|
|
5f718ba1cb
|
fix:
1.发运提交的时候 如果该合同下发运明细单的历史总数量+本次发运总数量等于 关联合同的总数量，那么历史发运金额+当前发运金额的汇总值必须等于合同金额
否则，不需判断
|
2024-12-05 18:44:45 +08:00 |
|
|
|
0d1a1ea2c2
|
fix:
1.外销合同变更单审核反写值出错
|
2024-12-05 18:44:24 +08:00 |
|
|
|
23aaba1d1b
|
fix:
1.订舱通知单信保回填回填时将年度赋值至客户信保额度申请
|
2024-12-04 19:19:15 +08:00 |
|
|
|
b6f7bed50d
|
fix:
1.订舱通知单信保回填回填时将年度赋值至客户信保额度申请
|
2024-12-04 19:19:00 +08:00 |
|
|
|
5549ab1bd6
|
fix:
1.发运提交效验
|
2024-12-04 19:18:54 +08:00 |
|
|
|
bd8a9ad8ce
|
fix:
1.订舱通知单信保回填回填时将年度赋值至客户信保额度申请
|
2024-12-04 11:35:30 +08:00 |
|
zzs
|
e97f8bad74
|
fix:可选中机型过滤问题
|
2024-12-04 10:58:07 +08:00 |
|
zzs
|
02d604790b
|
fix:非信保合同不进行投保金额校验
|
2024-12-03 17:15:10 +08:00 |
|
zzs
|
534ed72806
|
fix:保存后刷新清除了创建组织
|
2024-12-03 16:15:41 +08:00 |
|
zzs
|
b58d6c65f0
|
fix:订舱审核校验提示剩余额度不足校验问题
|
2024-12-03 15:54:31 +08:00 |
|
zzs
|
bd36c4ec3b
|
log:订舱提交信保额度校验增加日志输出
|
2024-12-03 15:08:54 +08:00 |
|
zzs
|
f292ea085a
|
fix:国贸订单明细，已发货行不显示
|
2024-12-03 11:35:57 +08:00 |
|
|
|
06e61efd62
|
fix:
1.云之家获取审核失败调用撤销取消
|
2024-11-30 11:14:59 +08:00 |
|
|
|
6edece8faa
|
fix:
1.出口发票保存生成备注调整一下格式，按照要求换行，金额不要显示尾零
|
2024-11-30 10:15:00 +08:00 |
|
|
|
aa1106ad08
|
fix:
1.收款条件带出收款天数
|
2024-11-30 09:31:05 +08:00 |
|
|
|
30e29f01a5
|
fix:
1.出口发票报错处理
|
2024-11-29 18:06:08 +08:00 |
|
|
|
298a8963af
|
fix:
1.外销合同报错处理
|
2024-11-29 16:55:10 +08:00 |
|
|
|
833f54a242
|
fix:
1.出口发票报错处理
|
2024-11-29 10:06:18 +08:00 |
|
|
|
eae662b125
|
fix:
1.出口发票报错处理
|
2024-11-29 09:12:31 +08:00 |
|
|
|
72cba3ae69
|
Merge remote-tracking branch 'orinin/main'
|
2024-11-28 18:37:39 +08:00 |
|
|
|
cb45727a2e
|
fix:
1.出口发票保存生成备注及合同号
|
2024-11-28 18:36:16 +08:00 |
|
zzs
|
45ae3aa7cc
|
fix:替换关系反审核报错
|
2024-11-28 17:54:39 +08:00 |
|
|
|
894e3882f3
|
fix:
1.装箱单报错处理
|
2024-11-28 14:25:26 +08:00 |
|
|
|
a3a41e576c
|
fix:
1.出口报关数量问题处理
|
2024-11-27 23:15:11 +08:00 |
|
|
|
4c6a3545ec
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-27 22:00:05 +08:00 |
|
|
|
8717a78715
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-27 21:39:51 +08:00 |
|
|
|
8b824b084e
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-27 20:33:43 +08:00 |
|
|
|
e2f53da4e9
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-27 20:33:37 +08:00 |
|
|
|
67ce460142
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-27 20:33:28 +08:00 |
|
|
|
e0b58466a1
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-27 20:33:23 +08:00 |
|
|
|
57860631bc
|
fix:
①收汇比例（小数，不显示尾零，放到预收比例前面），取值逻辑，取合同收款计划行的收汇百分比；
②订舱投保金额（原币种）-关联结算币别，锁定，计算逻辑：订舱合同金额*收汇比例；
|
2024-11-27 20:33:14 +08:00 |
|
|
|
c4ca8a7de5
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-27 20:33:05 +08:00 |
|
|
|
112632a7dd
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-27 20:33:00 +08:00 |
|
|
|
7f17c00e9d
|
fix:
①收汇比例（小数，不显示尾零，放到预收比例前面），取值逻辑，取合同收款计划行的收汇百分比；
②订舱投保金额（原币种）-关联结算币别，锁定，计算逻辑：订舱合同金额*收汇比例；
|
2024-11-27 20:32:52 +08:00 |
|
|
|
3edc8cdd70
|
fix:
①收汇比例（小数，不显示尾零，放到预收比例前面），取值逻辑，取合同收款计划行的收汇百分比；
②订舱投保金额（原币种）-关联结算币别，锁定，计算逻辑：订舱合同金额*收汇比例；
|
2024-11-27 20:32:47 +08:00 |
|
|
|
fd521f73cc
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-27 20:32:37 +08:00 |
|
|
|
1dfebb679a
|
fix:
1.订单产品需求单保存处理
|
2024-11-27 20:32:32 +08:00 |
|
|
|
0493b20554
|
fix:
1.发运明细单汇总报错处理
2.公共方法
|
2024-11-27 20:32:23 +08:00 |
|
|
|
bdc8a0f805
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-27 20:32:17 +08:00 |
|
|
|
1c75dea603
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-27 20:32:07 +08:00 |
|
|
|
80b78fd463
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-27 20:32:03 +08:00 |
|
|
|
5816468c57
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-27 20:31:55 +08:00 |
|
|
|
e02ef10fa1
|
fix:
1.单台赠送配件金额 为空的行的数量不需要汇总
|
2024-11-27 20:30:16 +08:00 |
|
|
|
bf98c82519
|
fix:
1.只有是否需同步EAS为是时，才会同步EAS；
|
2024-11-27 20:30:05 +08:00 |
|
|
|
97986428d5
|
fix:
1.单台赠送配件金额 为空的行的数量不需要汇总
|
2024-11-27 20:29:59 +08:00 |
|
|
|
79eb14fb5c
|
fix:
1.销售出库财务组织判断
|
2024-11-27 20:29:49 +08:00 |
|
|
|
615558b712
|
fix:
1.单台赠送配件金额 为空的行的数量不需要汇总
|
2024-11-27 20:29:43 +08:00 |
|
|
|
c8915a718e
|
fix:
1.只有是否需同步EAS为是时，才会同步EAS；
|
2024-11-27 20:29:31 +08:00 |
|
|
|
53be70e0db
|
fix:
1.生成随机资料时，只有业务分类为整机，且是否赠品为否的行生成
|
2024-11-27 20:29:27 +08:00 |
|
|
|
af59bf2dfd
|
fix:
1.随机资料及配件工具包，机型台数根据发运更新
|
2024-11-26 21:33:25 +08:00 |
|
|
|
444d8c412e
|
fix:
1.是否需校验物料属性为是时，走判断校验，其他情况保持原逻辑，不需调整；
|
2024-11-26 18:41:38 +08:00 |
|
|
|
861d8279bb
|
fix:
1.接口调整：只有是否需同步EAS为是时，才会同步EAS；（订单产品需求单-整机外购计划，审核时同步EAS，销售出库-整机/配件，提交时同步EAS）；
|
2024-11-26 18:35:04 +08:00 |
|
|
|
1d45f34ef8
|
fix:
1.生成随机资料时，只有业务分类为整机，且是否赠品为否的行生成
|
2024-11-26 17:10:31 +08:00 |
|
|
|
cd4b0d7f9d
|
Merge remote-tracking branch 'orinin/main'
|
2024-11-26 16:35:56 +08:00 |
|
|
|
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 |
|
|
|
c8188bfb40
|
fix:
1.外销合同贸易术语赋值
|
2024-11-25 18:49:54 +08:00 |
|
|
|
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 |
|
|
|
503cb7788d
|
fix:
1.外销合同赠送配件页签汇总赋值
|
2024-11-25 18:47:22 +08:00 |
|
|
|
2af9172481
|
fix:
1.调拨订单 同步EAS的接口 业务类型 给他传单据字段 不穿默认值了
|
2024-11-25 17:19:04 +08:00 |
|
|
|
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 |
|
|
|
da686561af
|
fix:
1.订舱通知单提交
|
2024-11-22 20:06:21 +08:00 |
|
|
|
c6f5c05e4c
|
fix:
1.发运明细单金额价格条款赋值
|
2024-11-22 19:35:11 +08:00 |
|
|
|
90506a0127
|
fix:
1.寄单放单申请提交拼接
|
2024-11-22 19:35:08 +08:00 |
|
|
|
18824050e9
|
fix:
1.订舱通知单提交
|
2024-11-22 19:30:13 +08:00 |
|
|
|
f35fdecc63
|
fix:
1.整机发货明细表
|
2024-11-22 18:48:03 +08:00 |
|
|
|
883027d7c6
|
fix:
1.外销合同签订日期默认当前时间
|
2024-11-21 20:10:48 +08:00 |
|
|
|
6c37b4beaf
|
fix:
1.外销合同签订日期默认当前时间
|
2024-11-21 20:04:11 +08:00 |
|
|
|
e31660e995
|
fix:
1.外销合同签订日期默认当前时间
|
2024-11-21 19:40:32 +08:00 |
|
|
|
f9f6c5fff7
|
fix:
1.水单附件必填效验
|
2024-11-21 19:26:30 +08:00 |
|
|
|
b796e9100e
|
fix:
1.外销合同签订日期默认当前时间
|
2024-11-21 19:26:25 +08:00 |
|
zzs
|
210e61db9a
|
fix:价格库查询到重复数据
|
2024-11-21 14:58:01 +08:00 |
|
|
|
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 |
|
|
|
e85ae88a64
|
fix:
1.订舱通知单额度确认效验修改
|
2024-11-20 18:14:55 +08:00 |
|
zzs
|
7d9aa70b93
|
feat:更新整机档案领料分析时间
|
2024-11-20 17:26:09 +08:00 |
|
|
|
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 |
|
|
|
07d1a90efe
|
Merge remote-tracking branch 'orinin/test' into test
|
2024-11-19 14:24:54 +08:00 |
|
|
|
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 |
|
|
|
1bf68b4811
|
fix:
1.报错修复
|
2024-11-18 22:29:40 +08:00 |
|
|
|
1fdaefba7b
|
fix:
1.报错修复
|
2024-11-18 22:24:37 +08:00 |
|
|
|
77262dc8dc
|
fix:
1.报错修复
|
2024-11-18 22:10:18 +08:00 |
|
|
|
60c3550fb6
|
fix:
1.报错修复
|
2024-11-18 22:10:11 +08:00 |
|
|
|
103140e352
|
fix:
1.报错修复
|
2024-11-18 22:10:08 +08:00 |
|
|
|
593050d6d5
|
fix:
1.报错修复
|
2024-11-18 22:10:01 +08:00 |
|
|
|
0bb09cf296
|
fix:
1.报错修复
|
2024-11-18 22:03:25 +08:00 |
|
|
|
d70a61c3f6
|
fix:
1.报错修复
|
2024-11-18 21:55:28 +08:00 |
|
|
|
1f3bf99c44
|
fix:
1.报错修复
|
2024-11-18 21:49:21 +08:00 |
|
|
|
6d5494f88b
|
fix:
1.报错修复
|
2024-11-18 21:42:50 +08:00 |
|
|
|
8726d5f026
|
fix:
1.报错修复
|
2024-11-18 21:42:09 +08:00 |
|
|
|
79c87efddc
|
fix:
1.报错修复
(cherry picked from commit 88ddf7970f)
|
2024-11-18 21:36:54 +08:00 |
|
|
|
88ddf7970f
|
fix:
1.报错修复
|
2024-11-18 21:36:15 +08:00 |
|
|
|
756209a56a
|
fix:
1.报错修复
|
2024-11-18 20:46:56 +08:00 |
|
|
|
1145b6b3d6
|
fix:
1.报错修复
|
2024-11-18 20:34:28 +08:00 |
|
|
|
124e9bb69b
|
fix:
1.发运明细变更单修改数量逻辑修改
|
2024-11-18 18:15:09 +08:00 |
|
|
|
c817f189c0
|
fix:
1.合同签章合同盖章
2.发运明细变更单修改数量逻辑修改
|
2024-11-18 17:40:57 +08:00 |
|
|
|
5787908a4d
|
fix:
1.合同签章合同盖章
(cherry picked from commit 5ac851a07d)
|
2024-11-18 15:25:56 +08:00 |
|
|
|
ae66636140
|
Merge remote-tracking branch 'orinin/test' into test
|
2024-11-18 15:25:53 +08:00 |
|
|
|
12b0c26e23
|
fix:
1.合同签章合同盖章
|
2024-11-18 15:25:35 +08:00 |
|
|
|
5ac851a07d
|
fix:
1.合同签章合同盖章
|
2024-11-18 15:21:40 +08:00 |
|
|
|
a7738dbc3a
|
fix:
1.配件价格库禁用按钮调用
|
2024-11-16 12:51:40 +08:00 |
|
|
|
1629349030
|
fix:
1.发运明细单（单证）报表日期汇总显示
(cherry picked from commit 31386ef6dc)
|
2024-11-15 23:58:56 +08:00 |
|
|
|
31386ef6dc
|
fix:
1.发运明细单（单证）报表日期汇总显示
|
2024-11-15 23:56:06 +08:00 |
|
|
|
6b802e04ee
|
fix:
1.发运明细单（单证）报表日期汇总显示
(cherry picked from commit 813c72a5db)
|
2024-11-15 23:47:05 +08:00 |
|
|
|
d7b1da08a7
|
Revert "fix:"
This reverts commit fb56bb116a.
|
2024-11-15 23:40:58 +08:00 |
|
|
|
312f208205
|
fix:
1.word文档书签处理
|
2024-11-15 23:39:27 +08:00 |
|
|
|
78f3330522
|
fix:
1.回填时，只能将信保年度的第一行回填到单据中
|
2024-11-15 23:39:25 +08:00 |
|
|
|
813c72a5db
|
fix:
1.发运明细单（单证）报表日期汇总显示
|
2024-11-15 23:32:22 +08:00 |
|
|
|
fb56bb116a
|
fix:
1.word文档书签处理
|
2024-11-15 18:15:05 +08:00 |
|
|
|
070e883567
|
fix:
1.回填时，只能将信保年度的第一行回填到单据中
|
2024-11-15 16:12:19 +08:00 |
|
|
|
bab8485b37
|
fix:
1.发运明细备注赋值
|
2024-11-14 21:40:16 +08:00 |
|
|
|
8d32ec95a6
|
fix:
1.发运明细备注赋值
|
2024-11-14 21:40:06 +08:00 |
|
|
|
32c084caa4
|
fix:
1.发运明细备注赋值
|
2024-11-14 21:40:01 +08:00 |
|
|
|
c92ad04e0d
|
fix:
1.发运明细备注赋值
|
2024-11-14 21:39:52 +08:00 |
|
|
|
8002035dd3
|
fix:
1.发运明细备注赋值
|
2024-11-14 21:39:48 +08:00 |
|
|
|
b7e7eb190b
|
fix:
1.发运明细备注赋值
|
2024-11-14 21:30:32 +08:00 |
|
|
|
2d7cd037e3
|
fix:
1.发运明细备注赋值
|
2024-11-14 21:26:45 +08:00 |
|
|
|
30c7aeb79e
|
fix:
1.发运明细备注赋值
|
2024-11-14 21:18:22 +08:00 |
|
|
|
c568e17470
|
fix:
1.发运明细备注赋值
|
2024-11-14 21:17:55 +08:00 |
|
|
|
fc6dc5bbcd
|
fix:
1.发运明细备注赋值
|
2024-11-14 21:13:17 +08:00 |
|
|
|
273339a464
|
fix:
1.发运明细备注赋值
(cherry picked from commit 5182295971)
|
2024-11-14 20:56:03 +08:00 |
|
|
|
5182295971
|
fix:
1.发运明细备注赋值
|
2024-11-14 20:52:41 +08:00 |
|
|
|
399d28e075
|
fix:
1.订舱通知单分摊金额本位币计算
|
2024-11-14 20:10:21 +08:00 |
|
|
|
94b7b9fa8a
|
fix:
1.报表处理
2.订舱通知单增加效验
(cherry picked from commit c62ff30599)
|
2024-11-14 19:59:49 +08:00 |
|
|
|
d0ea675721
|
fix:
1.国贸订单生产线缺少值
(cherry picked from commit 9102995aa3)
|
2024-11-14 19:59:39 +08:00 |
|
|
|
8822ce3ce5
|
fix:
1.订舱通知单保存报错处理
(cherry picked from commit e9b19fe3cd)
|
2024-11-14 19:59:36 +08:00 |
|
