 王奎兴
|
71936b50a7
|
Merge remote-tracking branch 'origin/dev' into dev
|
2026-09-12 09:59:56 +08:00 |
|
 赵辉
|
9cfffe1224
|
去除验证码校验
|
2026-09-12 09:59:39 +08:00 |
|
|
王奎兴
|
d7574d188a
|
客户月结报告;
|
2026-09-12 09:59:30 +08:00 |
|
|
赵辉
|
1c1b06c1bf
|
去除验证码校验
|
2026-09-12 09:24:11 +08:00 |
|
 rcx
|
117019c55c
|
30
|
2026-09-11 17:46:07 +08:00 |
|
|
rcx
|
171909b68d
|
31
|
2026-09-11 17:44:15 +08:00 |
|
|
赵辉
|
31c27c16c6
|
user31
|
2026-09-11 17:28:40 +08:00 |
|
|
赵辉
|
8dfe9545aa
|
user30
|
2026-09-11 17:22:50 +08:00 |
|
|
赵辉
|
028afb57d7
|
用户-yms同步新增与修改密码
|
2026-09-11 15:45:15 +08:00 |
|
|
rcx
|
37dd374bda
|
fix(wms): 入库单导入"该货主下不存在该料号"误报修复
- 根因：Excel客户名称按USER表user_name解析货主ID，同名双账号（如3519/3525）解析到非档案归属账号，带错误shipperId查物料必为空
- 料号匹配：主查询（料号+顶级组织+解析shipperId）为空时，去掉货主条件按档案shipper_name与Excel客户名称等值兜底匹配，命中后以档案货主纠正单据shipperId/shipperCode/shipperName
- 新增pickMaterialByCode挑选：料号精确等值优先于LIKE模糊命中，避免子串料号截胡
- SKU校验：档案条码barCode为空时跳过比对，档案有值时仍严格校验
- 校验失败输出诊断日志并附解析shipperId/登录topOrganizationId，区分货主错配(原因A)与组织口径(原因B)
|
2026-09-11 15:14:46 +08:00 |
|
 秦鸿展
|
d69af9ef20
|
30
|
2026-09-10 16:49:24 +08:00 |
|
|
秦鸿展
|
9704dbfb07
|
导入物料组织覆盖问题
|
2026-09-10 16:20:59 +08:00 |
|
|
秦鸿展
|
3276792bb5
|
告警修改
|
2026-09-10 13:20:07 +08:00 |
|
|
秦鸿展
|
b57db4b8cc
|
30
|
2026-09-10 11:49:34 +08:00 |
|
|
秦鸿展
|
8a31ed9974
|
BI月台指标检测修改
|
2026-09-10 11:46:34 +08:00 |
|
|
秦鸿展
|
9777156959
|
31
|
2026-09-09 23:46:09 +08:00 |
|
|
秦鸿展
|
ba5d78b36c
|
准时率统计修改
|
2026-09-09 23:40:33 +08:00 |
|
|
秦鸿展
|
dea39a1a4b
|
30
|
2026-09-09 22:05:47 +08:00 |
|
|
秦鸿展
|
0493030620
|
BI月台作业准时率计算
|
2026-09-09 22:02:31 +08:00 |
|
|
秦鸿展
|
3907b126d9
|
31
|
2026-09-09 19:42:39 +08:00 |
|
|
秦鸿展
|
7b76d5c203
|
BI接口业务类型恢复
|
2026-09-09 19:38:47 +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 |
|
|
秦鸿展
|
752216ad45
|
31
|
2026-09-09 14:22:58 +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 |
|
|
王奎兴
|
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 |
|