朱园亮 / xingyun-erp · Commits

20 Jan, 2026

8 commits

试样订单：订货单新增试样订单字段、生成试样订单；撤销单、变更单、补货单排除试样订单
9fa78665

房远帅 authored
2026-01-20 15:52:01 +0800
Browse Files »
试样订单：合同物料行新增是否为试样订单字段
b485c690

房远帅 authored
2026-01-20 12:16:53 +0800
Browse Files »
Merge branch 'master_cj_zq' into master_sample_order ...
c8f2520a
```
# Conflicts:
#	xingyun-api/src/main/resources/db/chujiang/base.sql
```
房远帅 authored
2026-01-20 11:24:17 +0800
Browse Files »
Merge branch 'master_after20' into master_cj_zq
916887ed

房远帅 authored
2026-01-20 10:48:55 +0800
Browse Files »
延期发货：区分发货单延期和发货计划延期
ea158c30

房远帅 authored
2026-01-20 10:48:33 +0800
Browse Files »
代码冲突
3d455b6a

房远帅 authored
2026-01-20 10:19:15 +0800
Browse Files »

Merge branch 'master_after20' into master_cj_zq ...

# Conflicts:
#	xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/shipments/delay/DelayedShipmentController.java

authored

2026-01-20 10:17:09 +0800

Browse Files »

延期发货：消息提醒
0b4c30ab

房远帅 authored
2026-01-20 10:15:01 +0800
Browse Files »

19 Jan, 2026

14 commits

楚江erp：样品反馈单和样品追踪单相关基础接口开发
6137aed1

yeqianyong authored
2026-01-19 17:51:29 +0800
Browse Files »
楚江erp：SQL补充
a8d52f5f

yeqianyong authored
2026-01-19 17:14:04 +0800
Browse Files »
楚江erp：SQL补充
49ea1b0c

yeqianyong authored
2026-01-19 17:07:36 +0800
Browse Files »
客户：排序
33b102d0

房远帅 authored
2026-01-19 16:27:16 +0800
Browse Files »
客户资信、延期发货：审核详情按钮展示权限
9ad31537

房远帅 authored
2026-01-19 16:22:42 +0800
Browse Files »
楚江erp：台账报表总欠款逻辑处理
55df39dd

yeqianyong authored
2026-01-19 15:22:22 +0800
Browse Files »
发货计划：去除延期发货审核中的数据
ba15ee6b

房远帅 authored
2026-01-19 15:07:23 +0800
Browse Files »
楚江erp：台账数据相关bug修复
3b785bc7

yeqianyong authored
2026-01-19 14:24:17 +0800
Browse Files »
发货计划：移动端审核按钮展示权限
866d8ab0

房远帅 authored
2026-01-19 11:48:02 +0800
Browse Files »
订货单：导出添加价格表编号
fdc2f500

房远帅 authored
2026-01-19 10:05:56 +0800
Browse Files »
Merge branch 'master_after20' into master_cj_zq
b2bff4f3

房远帅 authored
2026-01-19 09:50:24 +0800
Browse Files »
分厂排序
76b0be06

房远帅 authored
2026-01-19 09:50:07 +0800
Browse Files »
Merge branch 'master_after20' into master_cj_zq
0d85fcc9

房远帅 authored
2026-01-19 09:45:09 +0800
Browse Files »
分厂排序
71aa3321

房远帅 authored
2026-01-19 09:44:46 +0800
Browse Files »

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

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