|
|
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 |
|
