朱园亮 / xingyun-erp · Commits

14 Jan, 2026

4 commits

Merge branch 'cj_tmp' into master_cj_zq
9351026d

yeqianyong authored
2026-01-14 14:31:27 +0800
Browse Files »
资金协调手续：导出区分贸易类型内、外贸
c2d7d55e

房远帅 authored
2026-01-14 11:55:24 +0800
Browse Files »
Merge branch 'master_after20' into master_cj_zq
604e8599

房远帅 authored
2026-01-14 09:16:50 +0800
Browse Files »
延期发货：延期到后日预发问题修复
0f435d3a

房远帅 authored
2026-01-14 09:16:20 +0800
Browse Files »

13 Jan, 2026

8 commits

楚江erp：定时任务生成应收款台账数据
4d4e558a

yeqianyong authored
2026-01-13 17:34:54 +0800
Browse Files »
资金协调手续：资金协调手续打印
02dc099b

房远帅 authored
2026-01-13 15:50:42 +0800
Browse Files »
资金协调手续：问题修复
552e43ae

房远帅 authored
2026-01-13 11:44:14 +0800
Browse Files »
Merge remote-tracking branch 'origin/master_cj_zq' into master_cj_zq
03d3bcd9

房远帅 authored
2026-01-13 11:20:36 +0800
Browse Files »
资金协调手续：问题修复
afcd2b6e

房远帅 authored
2026-01-13 11:20:26 +0800
Browse Files »
楚江erp：应收款台账报表导出逻辑调整
19259c78

yeqianyong authored
2026-01-13 11:09:03 +0800
Browse Files »
资金协调手续：问题修复
a07ae52d

房远帅 authored
2026-01-13 11:01:39 +0800
Browse Files »
楚江erp：应收款台账报表统计数据补充
596cf8cc

yeqianyong authored
2026-01-13 10:29:59 +0800
Browse Files »

12 Jan, 2026

4 commits

楚江erp：台账报表导出相关接口开发
70b10676

yeqianyong authored
2026-01-12 16:09:21 +0800
Browse Files »
资金协调手续：审核消息通知及更新审核意见和审核人
0d31273a

房远帅 authored
2026-01-12 13:47:21 +0800
Browse Files »
资金协调手续：查询冻结的订货单列表改为POST
a602d959

房远帅 authored
2026-01-12 11:00:02 +0800
Browse Files »
资金协调手续：查询冻结的订货单列表-增加筛选条件
6800f454

房远帅 authored
2026-01-12 09:37:25 +0800
Browse Files »

09 Jan, 2026

6 commits

回笼资金：区分内外贸；新增、导入对台账明细进行平账或存款
72926a0a

房远帅 authored
2026-01-09 17:17:32 +0800
Browse Files »
Merge remote-tracking branch 'origin/master_cj_zq' into master_cj_zq
69d77ccd

房远帅 authored
2026-01-09 14:15:30 +0800
Browse Files »
楚江erp：台账明细增加内贸、外贸区分
024dfa53

yeqianyong authored
2026-01-09 11:46:06 +0800
Browse Files »
Merge branch 'master_after20' into master_cj_zq
31fc1b97

yeqianyong authored
2026-01-09 09:52:17 +0800
Browse Files »
楚江erp：可发货列表数据调整（供前端使用，过滤掉不需要的数据）
de430dc0

yeqianyong authored
2026-01-09 09:50:44 +0800
Browse Files »
资金协调手续-审核后续操作
f7ccace1

房远帅 authored
2026-01-09 09:39:52 +0800
Browse Files »

08 Jan, 2026

12 commits

Merge remote-tracking branch 'origin/master_cj_zq' into master_cj_zq
21480ca8

房远帅 authored
2026-01-08 17:28:34 +0800
Browse Files »
Merge branch 'master_after20' into master_cj_zq
00e41a2c

yeqianyong authored
2026-01-08 16:41:25 +0800
Browse Files »
楚江erp：生成发货单-仅在“IN_PROGRESS”状态下更新计划状态数据
4b27f6e4

yeqianyong authored
2026-01-08 16:39:25 +0800
Browse Files »
资金协调手续-审核
6e1f9786

房远帅 authored
2026-01-08 16:13:38 +0800
Browse Files »
Merge branch 'master_after20' into master_cj_zq
9b7fe037

yeqianyong authored
2026-01-08 16:06:11 +0800
Browse Files »
楚江erp：删除三天还未生成发货单的数据
204c7f8d

yeqianyong authored
2026-01-08 16:03:45 +0800
Browse Files »
延期发货：移动端-审核及修改按展示
57cf170c

房远帅 authored
2026-01-08 14:03:14 +0800
Browse Files »
资金协调手续：新增、列表、详情接口
746b9bcf

房远帅 authored
2026-01-08 13:54:32 +0800
Browse Files »
Merge remote-tracking branch 'origin/master_cj_zq' into master_cj_zq
92a6ffe7

房远帅 authored
2026-01-08 11:46:18 +0800
Browse Files »
Merge branch 'master_after20' into master_cj_zq
a175f9bd

yeqianyong authored
2026-01-08 11:38:00 +0800
Browse Files »
楚江erp：1、新增发货计划相关接口开发；2、可发货列表数据逻辑调整；3、发货计划列表增加是否系统自动生成标识
5517e639

yeqianyong authored
2026-01-08 11:26:36 +0800
Browse Files »
资金协调手续：待交付订单量基础方法
8fa16a3a

房远帅 authored
2026-01-08 11:08:44 +0800
Browse Files »

07 Jan, 2026

6 commits

Merge branch 'master_after20' into master_cj_zq
5eb40b11

yeqianyong authored
2026-01-07 16:35:35 +0800
Browse Files »
楚江erp：1、生成发货单增加发货时点校验；2、核对数据校验逻辑调整
aec90255

yeqianyong authored
2026-01-07 16:34:21 +0800
Browse Files »
楚江erp：客户资信-变更导入授信额度必须为数字
b8cef7a1

yeqianyong authored
2026-01-07 16:00:39 +0800
Browse Files »
Merge branch 'master_after20' into master_cj_zq ...
e323ce29
```
# Conflicts:
#	xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/shipments/ShipmentsOrderInfoServiceImpl.java
```
yeqianyong authored
2026-01-07 14:43:36 +0800
Browse Files »
楚江erp：1、业务员可以对本区域的发货计划进行操作；2、自动生成发货单时经营办发货员数据剔除
394b4ee9

yeqianyong authored
2026-01-07 14:40:24 +0800
Browse Files »
Merge branch 'master_after20' into master_cj_zq
2d678f21

yeqianyong authored
2026-01-07 11:39:30 +0800
Browse Files »