 王奎兴
|
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 |
|
|
王奎兴
|
7bc6843729
|
wms回传oms出入库结果;
|
2026-04-15 11:25:54 +08:00 |
|
|
王奎兴
|
281bf9b965
|
出入库单oms;
|
2026-04-14 19:03:01 +08:00 |
|
 赵辉
|
287dd2242c
|
oms修改
|
2026-04-13 09:23:58 +08:00 |
|
|
赵辉
|
51dc67957c
|
oms修改
|
2026-04-11 09:43:19 +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 |
|
|
赵辉
|
73e7811b13
|
oms修改
|
2026-02-06 15:25:23 +08:00 |
|
|
赵辉
|
7f6d04e122
|
oms修改
|
2026-02-02 08:39:31 +08:00 |
|
 高正杨
|
d914f48ef0
|
发单报found2；
|
2026-01-30 10:25:08 +08:00 |
|
 hjx
|
5786521755
|
去掉货主判断
|
2026-01-29 11:43:01 +08:00 |
|
|
赵辉
|
62b779d1f0
|
oms
|
2026-01-29 09:15:04 +08:00 |
|
|
hjx
|
58f2e70f21
|
异常修改
|
2026-01-29 09:03:07 +08:00 |
|
|
赵辉
|
9dd3be3507
|
oms发单
|
2026-01-29 08:52:18 +08:00 |
|
|
hjx
|
6adcc406b9
|
执行单取消下发
|
2026-01-28 19:50:20 +08:00 |
|
|
赵辉
|
5b2d4569a7
|
oms发单
|
2026-01-28 19:18:53 +08:00 |
|
|
hjx
|
126a826513
|
执行单下发
|
2026-01-28 17:58:51 +08:00 |
|
|
赵辉
|
e5476beb07
|
oms发单
|
2026-01-28 15:22:53 +08:00 |
|
|
赵辉
|
e26dc853d5
|
oms发单
|
2026-01-28 13:20:09 +08:00 |
|
|
hjx
|
bbbb0b835d
|
下发操作
|
2026-01-27 21:34:02 +08:00 |
|
|
hjx
|
3b9983c68f
|
OMS执行单开发
|
2026-01-27 19:28:53 +08:00 |
|
|
hjx
|
a52984b103
|
业务单添加预约单字段
|
2026-01-27 11:25:15 +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 |
|