朱园亮 / xingyun-erp · Commits

16 Jan, 2026

10 commits

Merge branch 'master_after20' into master_cj_zq
29d9c748

房远帅 authored
2026-01-16 18:00:47 +0800
Browse Files »
分厂排序
e487bf08

房远帅 authored
2026-01-16 18:00:06 +0800
Browse Files »
楚江erp：1、台账报表统计逻辑调整；2、定时任务更新台账欠款状态
309dd01b

yeqianyong authored
2026-01-16 17:52:12 +0800
Browse Files »
框架合同：重复校验
d1b529ba

房远帅 authored
2026-01-16 17:28:08 +0800
Browse Files »
Merge remote-tracking branch 'origin/master_cj_zq' into master_cj_zq
a1eb252c

yeqianyong authored
2026-01-16 16:45:38 +0800
Browse Files »
Merge branch 'master_after20' into master_cj_zq
adb2386d

yeqianyong authored
2026-01-16 16:44:57 +0800
Browse Files »
Merge branch 'master_after20' into master_cj_zq
582bacf1

房远帅 authored
2026-01-16 16:37:17 +0800
Browse Files »
框架合同：重复校验
5bb8337e

房远帅 authored
2026-01-16 16:36:00 +0800
Browse Files »
Merge branch 'master_after20' into master_cj_zq
73dfeb69

房远帅 authored
2026-01-16 15:03:05 +0800
Browse Files »
加工标准合同:原材料使用新词典，原材料牌号使用词典
52ab1532

房远帅 authored
2026-01-16 15:02:36 +0800
Browse Files »

15 Jan, 2026

14 commits

Merge branch 'master_after20' into master_cj_zq
c5f7e869

房远帅 authored
2026-01-15 17:41:17 +0800
Browse Files »
合同:数据权限修改
6227a861

房远帅 authored
2026-01-15 17:40:47 +0800
Browse Files »
楚江erp：发货单上传签单接口bug修复
25e555c1

yeqianyong authored
2026-01-15 17:35:19 +0800
Browse Files »
楚江erp：冻结功能逻辑调整
bd99f69f

yeqianyong authored
2026-01-15 16:52:45 +0800
Browse Files »
Merge branch 'master_after20' into master_cj_zq
3765f7f1

房远帅 authored
2026-01-15 16:51:13 +0800
Browse Files »
合同:数据权限修改
84375891

房远帅 authored
2026-01-15 16:50:33 +0800
Browse Files »
Merge branch 'master_after20' into master_cj_zq
bb32d38d

yeqianyong authored
2026-01-15 15:47:15 +0800
Browse Files »
楚江erp：根据账期数据管控发货相关接口开发（冻结）
b35d3000

yeqianyong authored
2026-01-15 15:45:07 +0800
Browse Files »
账期：台账明细-存款平账
31decd2c

房远帅 authored
2026-01-15 10:57:02 +0800
Browse Files »
账期：台账明细-存款平账
28e6818c

房远帅 authored
2026-01-15 10:11:17 +0800
Browse Files »
账期：台账明细-存款拆分
5875f334

房远帅 authored
2026-01-15 10:06:30 +0800
Browse Files »
楚江erp：发货单计划相关权限code修改
5967443a

yeqianyong authored
2026-01-15 10:03:14 +0800
Browse Files »
账期：台账明细-添加贸易类型
c23db05a

房远帅 authored
2026-01-15 10:00:01 +0800
Browse Files »
账期：台账明细-存款拆分
66e431f7

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

14 Jan, 2026

13 commits

账期：台账明细-存款平账
6328a313

房远帅 authored
2026-01-14 17:57:32 +0800
Browse Files »
Merge branch 'master_after20' into master_cj_zq ...
38bb355b
```
# Conflicts:
#	xingyun-sc/src/main/java/com/lframework/xingyun/sc/handlers/BusinessDataHandlerServiceImpl.java
```
yeqianyong authored
2026-01-14 16:47:24 +0800
Browse Files »
楚江erp：1、客户开发字段类型调整；2、生成发货单逻辑调整；3、草稿要车单审核通过逻辑调整
06af520b

yeqianyong authored
2026-01-14 16:43:50 +0800
Browse Files »
Merge branch 'master_after20' into master_cj_zq
9a3b5f16

房远帅 authored
2026-01-14 14:52:35 +0800
Browse Files »
客户开发筛选问题修改
b90edf01

房远帅 authored
2026-01-14 14:52:09 +0800
Browse Files »
Merge branch 'master_after20' into master_cj_zq
1fbdd583

房远帅 authored
2026-01-14 14:36:26 +0800
Browse Files »
客户开发筛选问题修改
e00568a4

房远帅 authored
2026-01-14 14:36:01 +0800
Browse Files »
楚江erp：草稿要车单增加“是否冻结”字段
0f929580

yeqianyong authored
2026-01-14 14:32:36 +0800
Browse Files »
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 remote-tracking branch 'origin/master_after20' into master_after20
52d27eb2

yeqianyong authored
2026-01-14 09:19: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

3 commits

Merge branch 'cj_tmp' into master_after20
7b05724f

yeqianyong authored
2026-01-13 17:51:44 +0800
Browse Files »
楚江erp：定时任务生成应收款台账数据
4d4e558a

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

房远帅 authored
2026-01-13 15:50:42 +0800
Browse Files »