 王奎兴
|
89d6d76423
|
入库单查询报错;
|
2026-04-18 14:49:11 +08:00 |
|
|
王奎兴
|
3241b0fce2
|
Merge remote-tracking branch 'origin/dev_WMS20260401' into dev_WMS20260401
# Conflicts:
# mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/po/ReservationStockInOrderPO.java
# mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
|
2026-04-18 14:27:49 +08:00 |
|
|
王奎兴
|
83ff6c46ca
|
oms入库单订单来源；
|
2026-04-18 14:27:06 +08:00 |
|
 赵辉
|
aa441e0518
|
oms修改
|
2026-04-18 14:26:26 +08:00 |
|
|
赵辉
|
d6ee9fb2ec
|
oms修改
|
2026-04-18 14:19:12 +08:00 |
|
|
赵辉
|
3acca20d16
|
oms与wms修改
|
2026-04-18 09:49:18 +08:00 |
|
|
王奎兴
|
5ed590bfd2
|
查询出入库单审核状态;盘点推送结果oms;
|
2026-04-17 19:09:21 +08:00 |
|
|
王奎兴
|
eec90b054b
|
查询菜单报错;
|
2026-04-16 11:02:00 +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 |
|
|
王奎兴
|
281bf9b965
|
出入库单oms;
|
2026-04-14 19:03:01 +08:00 |
|
|
赵辉
|
287dd2242c
|
oms修改
|
2026-04-13 09:23:58 +08:00 |
|
|
王奎兴
|
42ec0ec4ad
|
入库oms;
|
2026-04-09 10:27:20 +08:00 |
|
|
赵辉
|
6a52f1e1e2
|
oms执行单修改
|
2026-04-08 10:55:22 +08:00 |
|
|
赵辉
|
d8c956f9f4
|
oms业务单修改
|
2026-04-07 11:43:43 +08:00 |
|
|
赵辉
|
9793c0fd71
|
0213oms
|
2026-02-13 16:54:16 +08:00 |
|
|
赵辉
|
d970a01169
|
预约单列表与确认
|
2026-02-12 08:35:41 +08:00 |
|
|
王奎兴
|
5d89fdc0a6
|
Merge branch 'wms_dev' into wms_dev_hbbf
# Conflicts:
# mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/UserServiceFeign.java
# mhd_oms/pom.xml
|
2026-02-09 14:29:47 +08:00 |
|
|
赵辉
|
7f6d04e122
|
oms修改
|
2026-02-02 08:39:31 +08:00 |
|
|
赵辉
|
5b2d4569a7
|
oms发单
|
2026-01-28 19:18:53 +08:00 |
|
 hjx
|
3b9983c68f
|
OMS执行单开发
|
2026-01-27 19:28:53 +08:00 |
|
|
hjx
|
79ca006214
|
业务单和执行单开发
|
2026-01-27 11:03:31 +08:00 |
|
 zhou-hongcheng
|
a51e6e3f3d
|
配置
|
2026-01-23 15:30:46 +08:00 |
|
|
hjx
|
56356839bf
|
集成oms服务模块
|
2026-01-19 15:20:20 +08:00 |
|