 王奎兴
|
5a3791e334
|
Merge branch 'dev' into dev-bms-260826
|
2026-09-09 16:44:07 +08:00 |
|
 秦鸿展
|
f02a2d52f2
|
OMS调整接口开发
|
2026-09-09 16:24:05 +08:00 |
|
|
秦鸿展
|
a3c0f15e39
|
30
|
2026-09-09 15:19:29 +08:00 |
|
|
秦鸿展
|
d2a6a5a4f6
|
BI启动报错
|
2026-09-09 15:12:55 +08:00 |
|
|
王奎兴
|
e2bee47aac
|
月度汇总视图查询接口;
|
2026-09-09 14:31:56 +08:00 |
|
|
秦鸿展
|
752216ad45
|
31
|
2026-09-09 14:22:58 +08:00 |
|
|
王奎兴
|
910c7b1701
|
月度汇总视图查询接口;
|
2026-09-09 14:19:38 +08:00 |
|
|
秦鸿展
|
6a8661da63
|
BI模块修改
|
2026-09-09 13:59:55 +08:00 |
|
|
秦鸿展
|
2b6777abe4
|
BI模块修改
|
2026-09-09 13:47:46 +08:00 |
|
 rcx
|
fd3a9afddf
|
发31
|
2026-09-08 17:52:42 +08:00 |
|
|
rcx
|
0358c694ea
|
发30
|
2026-09-08 17:46:49 +08:00 |
|
|
rcx
|
009dc5b3a6
|
feat(wms): 盘点单详情investigetionManageDetailList返回批次号、入库日期、生产日期、过期日期
|
2026-09-08 17:35:29 +08:00 |
|
|
rcx
|
178b7697af
|
fix(oms): 出库单列表totalOutboundQuantity恒为null，queryList改为SQL汇总一级明细出库数量
原Java循环逐单调getInfoChildren汇总(N+1)被注释后无赋值导致恒为null；改为关联子查询coalesce(sum(outbound_quantity),0)，仅统计level=1且del_flag=1，口径与详情页一致；/list与/list1共用同一语句同时生效，无需DDL
|
2026-09-08 15:08:00 +08:00 |
|
|
rcx
|
32364baba8
|
发测试
|
2026-09-08 13:38:54 +08:00 |
|
|
rcx
|
6c6a491ff8
|
feat(oms/wms): WMS上架状态回传OMS入库业务单，修复入库状态不同步
- WMS上架推进入库状态后回传OMS(OmsServiceFeign新增returnInResult)
- OMS回传接收加固：无登录上下文判空、已入库同步issueStatus=4
- 已入库联动同步预约入库单(入库业务单)状态
|
2026-09-08 13:37:43 +08:00 |
|
|
rcx
|
a496fc235b
|
fix(oms): 新增/编辑入库单以业务类型为准同步单据类型，修复退货入库被写成普通入库及编辑类型不生效
|
2026-09-08 10:53:23 +08:00 |
|
|
rcx
|
06202b652a
|
发测试
|
2026-09-08 09:32:47 +08:00 |
|
|
rcx
|
5d748a9ac6
|
fix(oms): 入库业务单新增时用businessType回填单据类型，修复退货单被写成普通入库
|
2026-09-08 09:28:27 +08:00 |
|
|
王奎兴
|
361a91d701
|
发31
|
2026-09-07 19:02:39 +08:00 |
|
|
王奎兴
|
3471874139
|
退货入库;
|
2026-09-07 18:58:33 +08:00 |
|
|
王奎兴
|
a38e28bb97
|
退货入库;
|
2026-09-07 18:57:51 +08:00 |
|
|
rcx
|
ab7a4e265f
|
Merge branch 'dev-ty1.2' into dev
# Conflicts:
# mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java
# mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java
# mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java
# mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java
# mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java
# mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/feign/ThirdPartyServiceFeign.java
# mhd_oms/src/main/java/com/mhd/oms/infrastructure/feign/ThirdPartyServiceFeign.java
# mhd_wms/src/main/resources/bootstrap.yml
|
2026-09-07 18:03:18 +08:00 |
|
|
rcx
|
976ab715af
|
发30
|
2026-09-07 18:02:10 +08:00 |
|
|
王奎兴
|
f118c7ff29
|
组织信息;
|
2026-09-07 17:58:16 +08:00 |
|
|
王奎兴
|
cdc8396b57
|
金额参数;
|
2026-09-07 17:45:25 +08:00 |
|
|
王奎兴
|
6856899afc
|
Merge remote-tracking branch 'origin/dev' into dev
|
2026-09-07 17:23:10 +08:00 |
|
|
王奎兴
|
6d7be15d97
|
发31
|
2026-09-07 17:23:01 +08:00 |
|
|
rcx
|
0babc7dbf8
|
Merge remote-tracking branch 'origin/dev' into dev
|
2026-09-07 17:19:31 +08:00 |
|
|
王奎兴
|
1a80f715dd
|
恢复xxl
|
2026-09-07 17:16:11 +08:00 |
|
|
rcx
|
7742d11d1c
|
发31
|
2026-09-07 17:15:05 +08:00 |
|
|
rcx
|
c4df9b3403
|
Merge remote-tracking branch 'origin/dev' into dev
|
2026-09-07 17:08:20 +08:00 |
|
|
rcx
|
7ed34df81e
|
发30
|
2026-09-07 17:07:16 +08:00 |
|
|
王奎兴
|
0ace96ea9f
|
恢复xxl
|
2026-09-07 17:06:27 +08:00 |
|
|
王奎兴
|
34014f40a5
|
Merge branch 'dev-ty1.2' into dev
|
2026-09-07 16:57:14 +08:00 |
|
|
rcx
|
acbf7c9fdf
|
fix: 退货入库单下发时执行入库单类型被固定写成普通入库
|
2026-09-07 16:56:17 +08:00 |
|
|
王奎兴
|
aad54545f1
|
获取不到登录人
|
2026-09-07 16:27:58 +08:00 |
|
|
王奎兴
|
49fb27f273
|
流水金额取值修改;
|
2026-09-07 16:08:51 +08:00 |
|
|
王奎兴
|
1367a1d225
|
登录用户拿不到问题处理；
|
2026-09-07 15:45:03 +08:00 |
|
|
rcx
|
9e1c5d8570
|
fix(oms): 预约单下发不再推送WMS，修复执行单下发后WMS出现预约单+执行单两张单；三个下发入口补充软删单拦截
|
2026-09-07 15:44:44 +08:00 |
|
|
王奎兴
|
590e840a7b
|
汇率数据类型转换;
|
2026-09-07 15:33:53 +08:00 |
|
|
王奎兴
|
a326af15f7
|
查询汇率；
|
2026-09-07 15:28:47 +08:00 |
|
|
王奎兴
|
494f5f8999
|
计费单据仓库类型；
|
2026-09-07 15:24:59 +08:00 |
|
|
王奎兴
|
9990701c5e
|
冻仓生成应收帐单；
|
2026-09-07 15:10:41 +08:00 |
|
|
王奎兴
|
9a15dc4978
|
查询结算配置
|
2026-09-07 15:05:41 +08:00 |
|
|
王奎兴
|
e55840c485
|
表别名；
|
2026-09-07 14:41:36 +08:00 |
|
|
秦鸿展
|
98b5ce81cc
|
委托方导出功能
|
2026-09-07 14:28:29 +08:00 |
|
|
rcx
|
b6a69411f1
|
发 测试
|
2026-09-07 14:25:29 +08:00 |
|
|
rcx
|
34b27eabd2
|
fix(oms): 出入库导入行级必填校验+页签解析失败完整堆栈日志
一、行级必填校验（ReservationStockInOrderImpl）
- 入库导入：新增校验空【產品編號】/空【支/件数】的明细行，给出明确提示
- 出库导入：新增校验空【支/件数】的明细行
- 修复原因：明细行件数为空时 new BigDecimal(null) 抛无信息的 NullPointerException，页面只显示 页签[x]：java.lang.NullPointerException 无法定位
二、页签解析失败完整堆栈日志
- 出/入库多页签解析第一阶段捕获异常时，将完整堆栈打入服务端日志（LOGGER.error），便于远程定位页签内具体报错行号
|
2026-09-07 14:18:34 +08:00 |
|
|
rcx
|
1c4b520f5a
|
Merge remote-tracking branch 'origin/dev-bms-260826' into dev-ty1.2
|
2026-09-07 13:50:28 +08:00 |
|
|
王奎兴
|
32459fd443
|
xxl-job配置；
|
2026-09-07 11:33:14 +08:00 |
|