Commit Graph
64 Commits
Author SHA1 Message Date
王奎兴 838a7d6acd 发布正式修改配置; 2026-04-21 16:56:19 +08:00
zhou-hongcheng c703c339fc oms入库单同步到wms增加oms主键id信息 2026-04-21 13:21:41 +08:00
赵辉 9a5e63e6f0 oms修改 2026-04-20 21:48:21 +08:00
赵辉 209d87409e oms修改 2026-04-20 20:51:52 +08:00
王奎兴 7c57a10321 出入库时间同步oms; 2026-04-20 20:13:38 +08:00
王奎兴 34ebb4d992 出库单订单来源; 2026-04-20 20:05:21 +08:00
王奎兴 ad5efe0087 docker配置修改; 2026-04-20 13:44:56 +08:00
王奎兴 07b4c3cbcc 发布测试配置修改; 2026-04-20 13:39:32 +08:00
王奎兴 951d2d98f5 发布测试配置修改; 2026-04-20 13:30:09 +08:00
王奎兴 76f2e87eae 出入库添加仓库负责人信息回显; 2026-04-20 13:26:44 +08:00
王奎兴 fffebc5003 出入库添加仓库负责人信息; 2026-04-20 11:46:14 +08:00
zhaoqing c8fa72878b oms-出库单提货单打印 2026-04-18 16:44:21 +08:00
王奎兴 565eb609d1 oms入库单添加数量信息;库存调整添加库存调整记录; 2026-04-18 16:40:49 +08:00
王奎兴 1d78832604 oms入库单添加数量信息; 2026-04-18 16:11:14 +08:00
zhaoqing 8898a4e798 oms-入仓通知单打印 2026-04-18 15:30:17 +08:00
王奎兴 a92b21403b Merge remote-tracking branch 'origin/dev_WMS20260401' into dev_WMS20260401 2026-04-18 14:49:21 +08:00
王奎兴 89d6d76423 入库单查询报错; 2026-04-18 14:49:11 +08:00
赵辉 a47b1b8e65 oms修改 2026-04-18 14:45:40 +08:00
王奎兴 b1cf9c118b oms入库单订单来源; 2026-04-18 14:44:29 +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
秦鸿展 bd2a5915ba OMS新增计划数量为0问题 2026-04-18 11:07:07 +08:00
赵辉 3acca20d16 oms与wms修改 2026-04-18 09:49:18 +08:00
王奎兴 c987ee31d6 库存调整记录添加入库单号 lotno; 2026-04-17 21:42:43 +08:00
王奎兴 5ed590bfd2 查询出入库单审核状态;盘点推送结果oms; 2026-04-17 19:09:21 +08:00
王奎兴 89d78e3275 出入库前端生成单号; 2026-04-17 16:21:20 +08:00
王奎兴 f7ad272b8c oms出入库; 2026-04-17 14:19:43 +08:00
赵辉 514cd7df61 Merge branch 'dev' into dev_WMS20260401 2026-04-17 10:02:34 +08:00
赵辉 3d4907f49c oms与bms修改 2026-04-17 09:29:27 +08:00
王奎兴 ddc1f5d2ea oms出入库; 2026-04-17 08:59:16 +08:00
赵辉 4ca0f10e61 oms修改 2026-04-16 11:22:32 +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
王奎兴 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