 赵辉
|
aa82c42190
|
Merge branch 'refs/heads/dev_WMS20260401' into dev
# Conflicts:
# mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/UserServiceFeign.java
# mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteUserFeignFallbackFactory.java
|
2026-04-29 11:16:40 +08:00 |
|
 zhaoqing
|
8f5bf53620
|
OMS-商业合作伙伴页面查询
|
2026-04-28 16:59:41 +08:00 |
|
 王奎兴
|
cfbef4bc30
|
发布测试环境修改配置;
|
2026-04-28 14:50:25 +08:00 |
|
|
赵辉
|
269fef04b2
|
Merge branch 'dev' into dev_WMS20260401
# Conflicts:
# mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/repository/persistence/ShelfMaterialDetailImpl.java
|
2026-04-28 13:41:57 +08:00 |
|
|
王奎兴
|
745bb12dba
|
oms预约入库单驳回及确认;
|
2026-04-28 11:32:11 +08:00 |
|
|
王奎兴
|
99f086fdfa
|
上架库存修改;
|
2026-04-28 10:52:03 +08:00 |
|
|
赵辉
|
359c612c65
|
执行单添加业务单元
|
2026-04-28 09:44:05 +08:00 |
|
|
王奎兴
|
4416e2ecf5
|
入库单添加客户信息;
|
2026-04-27 17:00:28 +08:00 |
|
|
王奎兴
|
52d50506c8
|
预约单查询报错;
|
2026-04-27 16:27:49 +08:00 |
|
|
王奎兴
|
3ae19e5a55
|
oms入库预约单添加字段;
|
2026-04-27 14:31:43 +08:00 |
|
|
王奎兴
|
293e6ee342
|
oms启动报错;
|
2026-04-27 13:13:02 +08:00 |
|
|
王奎兴
|
90652840bb
|
oms出入库预约单；
|
2026-04-27 10:45:29 +08:00 |
|
|
王奎兴
|
4be0a804a4
|
Merge branch 'dev' into dev_WMS20260401
# Conflicts:
# mhd_wms/src/main/resources/mapper/reviewOrder/ReviewOrderMapper.xml
|
2026-04-27 09:30:55 +08:00 |
|
 zhou-hongcheng
|
6bdbaa0fda
|
oms入库存入库存
|
2026-04-23 14:22:48 +08:00 |
|
 秦鸿展
|
40d63d6fd8
|
仓库控制信息
|
2026-04-23 01:11:54 +08:00 |
|
|
王奎兴
|
4559bbc121
|
入库单查询报错;
|
2026-04-22 20:55:27 +08:00 |
|
|
王奎兴
|
724ae6c774
|
Merge branch 'dev_WMS20260401' into dev
|
2026-04-22 18:42:51 +08:00 |
|
|
王奎兴
|
48f53b2d35
|
推送oms报错问题修改;
|
2026-04-22 18:23:43 +08:00 |
|
|
王奎兴
|
e94fd329a1
|
推送oms报错问题修改;
|
2026-04-22 18:22:07 +08:00 |
|
|
王奎兴
|
676c95233e
|
推送oms报错问题修改;
|
2026-04-22 18:19:10 +08:00 |
|
|
王奎兴
|
5b792ccae5
|
oms出库单查询查询业务单号;
|
2026-04-22 17:46:09 +08:00 |
|
|
赵辉
|
927e6a332a
|
Merge remote-tracking branch 'origin/dev' into dev
|
2026-04-22 17:22:18 +08:00 |
|
|
赵辉
|
bf33392aed
|
oms修改
|
2026-04-22 17:22:06 +08:00 |
|
|
王奎兴
|
1f8b7ef0e8
|
oms入库单入库数量;
|
2026-04-22 15:48:21 +08:00 |
|
|
王奎兴
|
f11c7aad9a
|
sql报错修改;
|
2026-04-22 15:16:59 +08:00 |
|
|
王奎兴
|
775dfecf9f
|
部门id改为字符串;修改库存推送oms;
|
2026-04-22 14:41:20 +08:00 |
|
|
王奎兴
|
f5451a51f0
|
Merge branch 'dev_WMS20260401' into dev
|
2026-04-21 16:56:36 +08:00 |
|
|
王奎兴
|
838a7d6acd
|
发布正式修改配置;
|
2026-04-21 16:56:19 +08:00 |
|
|
赵辉
|
e667f22564
|
oms修改
|
2026-04-21 16:25:52 +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 |
|