|
|
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 |
|
|
|
2848c97f81
|
fix:
1.订舱通知单分摊金额本位币计算
|
2024-11-14 19:39:03 +08:00 |
|
|
|
c62ff30599
|
fix:
1.报表处理
2.订舱通知单增加效验
|
2024-11-14 18:50:08 +08:00 |
|
|
|
9102995aa3
|
fix:
1.国贸订单生产线缺少值
|
2024-11-14 15:16:37 +08:00 |
|
|
|
e9b19fe3cd
|
fix:
1.订舱通知单保存报错处理
|
2024-11-14 11:48:12 +08:00 |
|
|
|
a5f7af3567
|
fix:
1.附件上传删除自动删除
|
2024-11-13 21:02:02 +08:00 |
|
|
|
bd421b7f8c
|
fix:
1.附件上传删除自动删除
|
2024-11-13 20:48:07 +08:00 |
|
|
|
1eb311e1fe
|
fix:
1.整机储备申请提交拼接
|
2024-11-13 20:35:23 +08:00 |
|
|
|
b71df461a1
|
fix:
1.储备申请标题
|
2024-11-13 20:35:14 +08:00 |
|
|
|
e8a35daa9f
|
fix:
1.附件上传自动保存
|
2024-11-13 20:35:09 +08:00 |
|
|
|
aeca4ae7d4
|
fix:
1.外销合同系统最大贷记单号排序错误
|
2024-11-13 20:35:00 +08:00 |
|
|
|
f70eec6dce
|
fix:
1.整机储运申请下推到云之家的标题形式为：整机储运申请+业务员+国家+合同号。
|
2024-11-13 20:34:56 +08:00 |
|
|
|
873234cfda
|
fix:
1.发货明细表（未发货）起运港 目的港没有带出来
|
2024-11-13 20:34:46 +08:00 |
|
|
|
dece3cf388
|
fix:
1.业务分类为整机、提成分类为整机且是否赠品为否
|
2024-11-13 20:34:39 +08:00 |
|
|
|
3f3fab9aea
|
fix:
1.资源确认时，资源号必填
|
2024-11-13 20:34:30 +08:00 |
|
|
|
d1605cb6e7
|
fix:
1.资源确认时，资源号必填
|
2024-11-13 20:34:26 +08:00 |
|
|
|
386062cc11
|
fix:
1.152订舱通知单：订单总台数未更新
|
2024-11-13 20:34:17 +08:00 |
|
|
|
8098107719
|
fix:
1.销售提成-整机 功能完善
|
2024-11-13 20:34:14 +08:00 |
|
|
|
c8dcd77fcb
|
fix:
1.整机储备申请提交拼接
|
2024-11-13 20:14:27 +08:00 |
|
|
|
35afa2617d
|
fix:
1.储备申请标题
|
2024-11-13 19:55:55 +08:00 |
|
|
|
f50553cb46
|
fix:
1.附件上传自动保存
|
2024-11-13 19:48:47 +08:00 |
|
|
|
2b4af2f0f7
|
fix:
1.外销合同系统最大贷记单号排序错误
|
2024-11-13 18:57:36 +08:00 |
|
|
|
924b007ad0
|
fix:
1.整机储运申请下推到云之家的标题形式为：整机储运申请+业务员+国家+合同号。
|
2024-11-13 18:25:08 +08:00 |
|
|
|
62399ef804
|
fix:
1.发货明细表（未发货）起运港 目的港没有带出来
|
2024-11-13 17:37:07 +08:00 |
|
|
|
ae06bb6c2f
|
fix:
1.外销合同系统最大贷记单号排序错误
(cherry picked from commit a1ee8acc93)
|
2024-11-13 16:33:53 +08:00 |
|
|
|
cad042604a
|
fix:
1.业务分类为整机、提成分类为整机且是否赠品为否
|
2024-11-13 16:33:38 +08:00 |
|
|
|
a1ee8acc93
|
fix:
1.外销合同系统最大贷记单号排序错误
|
2024-11-13 16:21:03 +08:00 |
|
|
|
2dd73412c4
|
fix:
1.资源确认时，资源号必填
|
2024-11-13 15:10:51 +08:00 |
|
|
|
1c896a1175
|
fix:
1.资源确认时，资源号必填
|
2024-11-13 15:09:13 +08:00 |
|
|
|
21e7248b55
|
fix:
1.152订舱通知单：订单总台数未更新
|
2024-11-13 15:05:11 +08:00 |
|
|
|
bf75fa8f67
|
fix:
1.销售提成-整机 功能完善
|
2024-11-13 11:35:10 +08:00 |
|
|
|
dc7fb5bbc3
|
fix:
1.订舱通知单提交效验汇总明细信息分录数量
(cherry picked from commit 425d7d29a2)
|
2024-11-12 18:26:47 +08:00 |
|
|
|
2040adef30
|
fix:
1.订舱通知单保存汇总明细信息分录数量
2.注册优化
(cherry picked from commit d755bffaee)
|
2024-11-12 18:26:43 +08:00 |
|
|
|
425d7d29a2
|
fix:
1.订舱通知单提交效验汇总明细信息分录数量
|
2024-11-12 18:07:07 +08:00 |
|
|
|
d755bffaee
|
fix:
1.订舱通知单保存汇总明细信息分录数量
2.注册优化
|
2024-11-12 17:45:44 +08:00 |
|
|
|
ee18edfb02
|
fix:
发运明细变更单:
1、变更后，出运汇总页签重复。每次保存都是重复生成，删行时没有控制；
2、商品明细删行报错，数量减少时，系统有提示，但是可以修改成功；
3、商品明细新增的行，没有更新到出运汇总页签
|
2024-11-11 21:26:35 +08:00 |
|
|
|
00123c56ca
|
fix:
1.整机档案查询报错
|
2024-11-11 18:39:37 +08:00 |
|
|
|
53414d26b2
|
fix:
1.整机档案查询报错
|
2024-11-11 18:37:08 +08:00 |
|
|
|
3f1d7e2cd6
|
fix:
1.收款单修改认领保存改变计算逻辑
(cherry picked from commit 39b2a4a81c)
|
2024-11-11 17:01:06 +08:00 |
|
