 rcx
|
50423b4e4b
|
feat(oms,wms): 入库/出库业务单执行单与WMS出入库各页面列表返回计划数量与实际数量总和(全量不分页合计)
- OMS入库业务单/执行单: list/list1返回totalPlanQuantity/totalInQuantity(与行quantity/in_quantity列同源)
- WMS入库/收货/上架: 返回totalPlanQuantity/totalInQuantity(上架计划数量=明细应上架量; 入库数量=收货/上架数量, 与行列同口径)
- WMS出库/拣货/复核/交接: 返回totalPlanQuantity/totalOutboundQuantity(各页实际量列同口径; 复核明细聚合不滤del_flag兼容已反审tab)
- 合计SQL与queryList同条件片段/同JOIN结构, 分页查询后同一DO查询, 响应与total同层级追加字段, 前端纯增量兼容
|
2026-09-14 18:02:57 +08:00 |
|
|
rcx
|
715883f1d4
|
feat(oms,wms): 出库业务单反审——已出库/已审核单据回退已创建
- 新增 POST /reservationStockOutOrderApi/reverseAudit，按issueStatus(2-已审核/4-已出库)判断可反审
- 主单回退已创建并打reverseStatus标记，进【已反审】tab(list status=-2)，重新审核通过自动复位
- 执行单/明细软删+reverseFlag=1，预约库存调整记录软删
- WMS新增/stockOutOrderApi/omsReverseExecutionOrder：已出库还原实物库存+推OMS，未出库仅还原分配占用，WMS无数据幂等成功
- W出库/拣货/复核/交接单软删+reverseFlag=1，列表支持delFlag=2&reverseFlag=1【已反审】tab
- 四页面新增归档详情接口getReverseInfo*
- 生成出库异常记录【反审记录】(abnormalType=3,前缀FSYC)
- 需先执行SQL: 20260908两个反审脚本(OMS库+WMS库)
|
2026-09-09 15:20:13 +08:00 |
|
 秦鸿展
|
4f38ac7cd6
|
ID重复问题
|
2026-08-06 16:39:36 +08:00 |
|
|
秦鸿展
|
2c91368278
|
ID错误问题
|
2026-08-06 15:37:42 +08:00 |
|
 王奎兴
|
20a7978729
|
上架报错；
|
2026-07-01 11:43:32 +08:00 |
|
|
王奎兴
|
8f0e71fe2a
|
预约单改造;
|
2026-06-27 18:06:31 +08:00 |
|
|
王奎兴
|
7c57a10321
|
出入库时间同步oms;
|
2026-04-20 20:13:38 +08:00 |
|
|
王奎兴
|
5a2070bec9
|
上架报错;
|
2026-04-17 20:13:30 +08:00 |
|
|
王奎兴
|
22aef1d84d
|
Merge branch 'dev' into dev_WMS20260401
# Conflicts:
# mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialBaseInfo/entity/MaterialBaseInfo.java
# mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialBaseInfo/repository/po/MaterialBaseInfoPO.java
# mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialBaseInfo/repository/todo/MaterialBaseInfoDO.java
# mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/materialBaseInfo/MaterialBaseInfoDTO.java
# mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java
# mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java
# mhd_wms/src/main/java/com/mhd/wms/application/service/stockReceiptOrder/StockReceiptOrderApplicationService.java
# mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java
# mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/service/PickingOrderDomainService.java
# mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/facade/IReceiptMaterialDetailService.java
# mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/persistence/ReceiptMaterialDetailImpl.java
# mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/repository/todo/ShelfMaterialDetailDO.java
# mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/po/StockInOrderPO.java
# mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/entity/StockOutOrder.java
# mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/po/StockOutOrderPO.java
# mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/todo/StockOutOrderDO.java
# mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/repository/po/StockReceiptOrderPO.java
# mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java
# mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java
# mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockReceiptOrder/StockReceiptOrderApi.java
# mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApp/stockReceiptOrder/StockReceiptOrderAppApi.java
# mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml
# mhd_wms/src/main/resources/mapper/stockReceiptOrder/StockReceiptOrderMapper.xml
|
2026-04-15 18:48:55 +08:00 |
|
|
王奎兴
|
ad310f2fc2
|
oms修改;
|
2026-04-15 18:29:06 +08:00 |
|
|
王奎兴
|
e9d4f699ee
|
wms费用科目修改;
|
2026-04-11 15:35:16 +08:00 |
|
|
秦鸿展
|
9ae80406e2
|
PDA出库交接修改
|
2026-03-16 19:19:41 +08:00 |
|
|
秦鸿展
|
f060b981f6
|
PDA出库[拣货，复核，出库交接]修改
|
2026-03-14 14:12:26 +08:00 |
|
|
秦鸿展
|
543fca9d38
|
出库交接创建时间倒序排序
|
2026-02-10 11:41:29 +08:00 |
|
 zhou-hongcheng
|
8cfd6d435a
|
pda交接作业单图片上传
|
2026-02-04 10:41:35 +08:00 |
|
 hjx
|
1655d57057
|
集成wms服务模块
|
2026-01-19 18:55:23 +08:00 |
|