朱园亮 / xingyun-erp · Commits

29 Jan, 2026

4 commits

Merge branch 'master_cj_zq' into master_sample_order
dbfb86d9

yeqianyong authored
2026-01-29 12:07:40 +0800
Browse Files »
楚江erp：草稿要车单审核通过逻辑调整（防止null字符串）
d34e1ee8

yeqianyong authored
2026-01-29 12:06:09 +0800
Browse Files »
楚江erp：草稿要车单审核通过逻辑调整
7a8e87b5

yeqianyong authored
2026-01-29 11:50:41 +0800
Browse Files »
楚江erp：补货单生成订货单逻辑调整
b657041c

yeqianyong authored
2026-01-29 10:23:00 +0800
Browse Files »

28 Jan, 2026

10 commits

Merge branch 'master_cj_zq' into master_sample_order
74e8d0a1

yeqianyong authored
2026-01-28 17:40:16 +0800
Browse Files »
楚江erp：生成发货单接口bug修复
37e9c545

yeqianyong authored
2026-01-28 17:30:17 +0800
Browse Files »
试样订单-跟踪单-流程变量条件不能为空处理
a5ceced0

房远帅 authored
2026-01-28 17:16:31 +0800
Browse Files »
楚江erp：样品反馈单导出样式调整
8868f13a

yeqianyong authored
2026-01-28 16:19:15 +0800
Browse Files »
楚江erp：样品反馈单导出样式调整
0a7efef1

yeqianyong authored
2026-01-28 15:37:32 +0800
Browse Files »
楚江erp：样品反馈单查询接口逻辑调整
f2b52969

yeqianyong authored
2026-01-28 13:54:02 +0800
Browse Files »
Merge branch 'master_cj_zq' into master_sample_order
6893a9c1

yeqianyong authored
2026-01-28 13:48:00 +0800
Browse Files »
楚江erp：样品反馈单导出功能开发（支持PDF）
5958d0b9

yeqianyong authored
2026-01-28 13:46:34 +0800
Browse Files »
楚江erp-账期：1、台账排序调整；2、待交付订单数调整（没有则展示0）；3、导出权限code调整
a23a8d0c

yeqianyong authored
2026-01-28 11:46:03 +0800
Browse Files »
楚江erp：样品反馈单导出功能开发
2d757cc3

yeqianyong authored
2026-01-28 11:00:15 +0800
Browse Files »

27 Jan, 2026

7 commits

楚江erp：样品反馈单基础接口开发
c9baf587

yeqianyong authored
2026-01-27 16:58:19 +0800
Browse Files »
试样订单-bug修改
864c91b5

房远帅 authored
2026-01-27 16:45:05 +0800
Browse Files »
Merge branch 'master_cj_zq' into master_sample_order ...
0bd6a476
```
# Conflicts:
#	xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/customer/FlowTaskServiceImpl.java
```
房远帅 authored
2026-01-27 15:35:00 +0800
Browse Files »
bug修改
2d3f2876

房远帅 authored
2026-01-27 15:24:33 +0800
Browse Files »
试样订单:跟踪单-bug修复
785817bb

房远帅 authored
2026-01-27 15:19:25 +0800
Browse Files »
试样订单:跟踪单-试样结果
a1946dd6

房远帅 authored
2026-01-27 10:39:37 +0800
Browse Files »
试样订单:跟踪单-取消
4919c768

房远帅 authored
2026-01-27 09:54:00 +0800
Browse Files »

26 Jan, 2026

8 commits

试样订单:跟踪单-审核
d1883a82

房远帅 authored
2026-01-26 20:45:10 +0800
Browse Files »
试样订单:跟踪单-导出
5c23d87f

房远帅 authored
2026-01-26 17:53:14 +0800
Browse Files »
Merge branch 'master_cj_zq' into master_sample_order
de999aee

yeqianyong authored
2026-01-26 17:32:16 +0800
Browse Files »
楚江erp：账期-台账明细、台账报表增加特定排序
2aab1287

yeqianyong authored
2026-01-26 17:27:31 +0800
Browse Files »
试样订单:跟踪单-导出
02e48b77

房远帅 authored
2026-01-26 16:30:44 +0800
Browse Files »
楚江erp：申请发货-合同是否规范校验逻辑调整
c6ffecf2

yeqianyong authored
2026-01-26 16:04:14 +0800
Browse Files »
试样订单:跟踪单-生成跟踪单
573c26a3

房远帅 authored
2026-01-26 14:57:17 +0800
Browse Files »
试样订单:跟踪单-基础方法
fd247d7e

房远帅 authored
2026-01-26 10:40:21 +0800
Browse Files »

24 Jan, 2026

8 commits

Merge branch 'master_cj_zq' into master_sample_order
5329db31

yeqianyong authored
2026-01-24 16:50:02 +0800
Browse Files »
楚江erp：台账报表总欠款bug修复
6e03acd3

yeqianyong authored
2026-01-24 16:46:50 +0800
Browse Files »
Merge branch 'master_cj_zq' into master_sample_order
f6d033e8

yeqianyong authored
2026-01-24 15:29:21 +0800
Browse Files »
楚江erp：台账报表统计逻辑调整
1a904837

yeqianyong authored
2026-01-24 15:17:29 +0800
Browse Files »
试样订单:产品试样确单-导出
a296951e

房远帅 authored
2026-01-24 14:52:18 +0800
Browse Files »
试样订单:产品试样确单-导出
fc63c4ec

房远帅 authored
2026-01-24 14:31:00 +0800
Browse Files »
试样订单:产品试样确单-导出
1d8a4288

房远帅 authored
2026-01-24 14:20:52 +0800
Browse Files »
楚江erp：台账明细-手续完善状态逻辑处理
2adb35b8

yeqianyong authored
2026-01-24 10:50:26 +0800
Browse Files »

23 Jan, 2026

3 commits

Merge branch 'master_cj_zq' into master_sample_order
5e265dfc

yeqianyong authored
2026-01-23 17:15:53 +0800
Browse Files »
楚江erp：台账明细相关接口bug修复
6e21cdf9

yeqianyong authored
2026-01-23 17:06:03 +0800
Browse Files »
试样订单:产品试样确单-审核
dfb0293c

房远帅 authored
2026-01-23 11:09:41 +0800
Browse Files »