朱园亮 / xingyun-erp · Commits

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

12 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 »
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 »
楚江erp：发货计划明细新增去除时间限制
20c27e8e

yeqianyong authored
2026-01-07 11:38:33 +0800
Browse Files »
Merge remote-tracking branch 'origin/master_cj_zq' into master_cj_zq
0ee93a92

yeqianyong authored
2026-01-07 11:04:57 +0800
Browse Files »
楚江erp：台账报表金额转换成万元
21038a2b

yeqianyong authored
2026-01-07 11:04:20 +0800
Browse Files »
资金协调手续：协调办理日期取值
2c12ae25

房远帅 authored
2026-01-07 10:39:17 +0800
Browse Files »
Merge branch 'master_after20' into master_cj_zq
8d6ac47b

房远帅 authored
2026-01-07 09:43:23 +0800
Browse Files »
补货单专用-根据ID加载订货单数据
cf6b8ca2

房远帅 authored
2026-01-07 09:41:44 +0800
Browse Files »
楚江erp：台账报表相关接口开发
42c89eef

yeqianyong authored
2026-01-07 09:26:16 +0800
Browse Files »

06 Jan, 2026

5 commits

账期：资金协调手续-获取客户简称列表
2915433b

房远帅 authored
2026-01-06 16:29:12 +0800
Browse Files »
账期：资金协调手续-根据客户简称获取基础数据
65574c96

房远帅 authored
2026-01-06 15:18:47 +0800
Browse Files »
楚江erp：台账报表相关接口开发
86fc74b8

yeqianyong authored
2026-01-06 14:59:57 +0800
Browse Files »
账期：资金协调手续-根据客户简称获取基础数据
dbf33c85

房远帅 authored
2026-01-06 10:03:11 +0800
Browse Files »
账期：资金协调手续-应收款明细基础方法
e840bfe3

房远帅 authored
2026-01-06 10:02:47 +0800
Browse Files »

05 Jan, 2026

5 commits

Merge remote-tracking branch 'origin/master_cj_zq' into master_cj_zq
97c5627c

房远帅 authored
2026-01-05 17:56:16 +0800
Browse Files »
Merge remote-tracking branch 'origin/master_cj_zq' into master_cj_zq
94a0b1fe

yeqianyong authored
2026-01-05 17:24:34 +0800
Browse Files »
楚江erp：生成应收款台账明细相关接口开发
09d28500

yeqianyong authored
2026-01-05 17:24:04 +0800
Browse Files »
账期：资金协调手续-订货单位关联记录
6dfc579c

房远帅 authored
2026-01-05 15:05:25 +0800
Browse Files »
账期：资金协调手续-主表
12388900

房远帅 authored
2026-01-05 14:39:23 +0800
Browse Files »