 王奎兴
|
4416e2ecf5
|
入库单添加客户信息;
|
2026-04-27 17:00:28 +08:00 |
|
|
王奎兴
|
ac2d2b9007
|
Merge remote-tracking branch 'origin/dev_WMS20260401' into dev_WMS20260401
|
2026-04-27 16:27:59 +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 |
|
|
王奎兴
|
4559bbc121
|
入库单查询报错;
|
2026-04-22 20:55:27 +08:00 |
|
|
王奎兴
|
a468ba33e7
|
feign调用地址修改;
|
2026-04-22 20:12:41 +08:00 |
|
|
王奎兴
|
315c107fbb
|
feign调用地址修改;
|
2026-04-22 19:45:57 +08:00 |
|
|
王奎兴
|
77477898d8
|
feign调用地址修改;
|
2026-04-22 19:14:52 +08:00 |
|
|
王奎兴
|
7dd5508006
|
feign调用地址修改;
|
2026-04-22 19:03:04 +08:00 |
|
|
王奎兴
|
724ae6c774
|
Merge branch 'dev_WMS20260401' into dev
|
2026-04-22 18:42:51 +08:00 |
|
|
王奎兴
|
798e95521a
|
散租添加出账日;
|
2026-04-22 18:35:42 +08:00 |
|
|
王奎兴
|
3aa62897f4
|
Merge remote-tracking branch 'origin/dev_WMS20260401' into dev_WMS20260401
|
2026-04-22 18:30:59 +08:00 |
|
|
王奎兴
|
336a33f6e7
|
omsfeign熔断;
|
2026-04-22 18:30:39 +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 |
|
|
王奎兴
|
3ca94bc4cf
|
推送oms报错问题修改;
|
2026-04-22 18:15:24 +08:00 |
|
|
王奎兴
|
5b792ccae5
|
oms出库单查询查询业务单号;
|
2026-04-22 17:46:09 +08:00 |
|
|
王奎兴
|
b7d14706d7
|
Merge branch 'dev' into dev_WMS20260401
|
2026-04-22 17:13:44 +08:00 |
|
|
王奎兴
|
7b4d4cb9a9
|
申请发票报错;
|
2026-04-22 16:58:36 +08:00 |
|
|
王奎兴
|
38fb1c8ce5
|
oms推送wms加结算币种业务员信息;
|
2026-04-22 16:52:40 +08:00 |
|
|
王奎兴
|
62b4f69058
|
Merge remote-tracking branch 'origin/dev_WMS20260401' into dev_WMS20260401
|
2026-04-22 16:21:26 +08:00 |
|
|
王奎兴
|
abd1545c15
|
bms申请发票报错;
|
2026-04-22 16:21:16 +08:00 |
|
|
王奎兴
|
2864812f11
|
Merge remote-tracking branch 'origin/dev_WMS20260401' into dev_WMS20260401
|
2026-04-22 15:48:30 +08:00 |
|
|
王奎兴
|
1f8b7ef0e8
|
oms入库单入库数量;
|
2026-04-22 15:48:21 +08:00 |
|
|
王奎兴
|
f11c7aad9a
|
sql报错修改;
|
2026-04-22 15:16:59 +08:00 |
|
|
王奎兴
|
d2a09baf31
|
Merge branch 'dev' into dev_WMS20260401
|
2026-04-22 14:42:44 +08:00 |
|
|
王奎兴
|
775dfecf9f
|
部门id改为字符串;修改库存推送oms;
|
2026-04-22 14:41:20 +08:00 |
|
|
王奎兴
|
3062adeca9
|
部门id改为字符串;
|
2026-04-21 19:27:45 +08:00 |
|
|
王奎兴
|
3d5be9dd27
|
查询业务单号;
|
2026-04-21 17:56:27 +08:00 |
|
|
王奎兴
|
405bd43f34
|
发布正式修改配置;
|
2026-04-21 16:57:44 +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 |
|
|
王奎兴
|
9a39d329e6
|
添加日志;
|
2026-04-21 16:15:35 +08:00 |
|
|
王奎兴
|
69dc0581c2
|
bms测试环境配置;
|
2026-04-21 14:43:55 +08:00 |
|
|
王奎兴
|
31f2bbcc8a
|
仓库添加是否启用;
|
2026-04-21 09:22:54 +08:00 |
|
|
王奎兴
|
7e5cb10e39
|
库存调整记录批次号;
|
2026-04-20 20:40:26 +08:00 |
|
|
王奎兴
|
850202cb3a
|
库存调整记录批次号;
|
2026-04-20 20:37:23 +08:00 |
|
|
王奎兴
|
7c57a10321
|
出入库时间同步oms;
|
2026-04-20 20:13:38 +08:00 |
|
|
王奎兴
|
34ebb4d992
|
出库单订单来源;
|
2026-04-20 20:05:21 +08:00 |
|
|
王奎兴
|
1664781f51
|
入库调整记录修改;
|
2026-04-20 18:49:28 +08:00 |
|
|
王奎兴
|
f68a509d88
|
入库调整记录修改;
|
2026-04-20 18:21:44 +08:00 |
|
|
王奎兴
|
55c79e11d1
|
Merge branch 'dev' into dev_WMS20260401
|
2026-04-20 18:14:54 +08:00 |
|
|
王奎兴
|
c22b28c484
|
入库调整记录修改;
|
2026-04-20 18:13:40 +08:00 |
|
|
王奎兴
|
2b28b2793a
|
docker配置修改;
|
2026-04-20 13:49:47 +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 |
|
|
王奎兴
|
a4129199ee
|
Merge remote-tracking branch 'origin/dev_WMS20260401' into dev_WMS20260401
|
2026-04-20 11:46:26 +08:00 |
|
|
王奎兴
|
fffebc5003
|
出入库添加仓库负责人信息;
|
2026-04-20 11:46:14 +08:00 |
|
|
王奎兴
|
1b4ce7db91
|
出库库存调整记录修改;
|
2026-04-18 20:31:51 +08:00 |
|
|
王奎兴
|
1b1312e7b4
|
出库交接库存调整记录添加lotno等;
|
2026-04-18 19:00:19 +08:00 |
|
|
王奎兴
|
c0f41e9db4
|
出库交接库存调整记录添加lotno等;
|
2026-04-18 18:42:27 +08:00 |
|
|
王奎兴
|
80cf12c777
|
上架查询物料规则报错;
|
2026-04-18 18:29:24 +08:00 |
|
|
王奎兴
|
38d497392b
|
Merge remote-tracking branch 'origin/dev_WMS20260401' into dev_WMS20260401
|
2026-04-18 17:17:06 +08:00 |
|
|
王奎兴
|
e5441eb415
|
新增的库存添加更新时间;
|
2026-04-18 17:16:56 +08:00 |
|
|
王奎兴
|
7501bde717
|
库存调整记录添加重量体积等调整信息;
|
2026-04-18 16:58:16 +08:00 |
|
|
王奎兴
|
6f4d2ca742
|
Merge remote-tracking branch 'origin/dev_WMS20260401' into dev_WMS20260401
|
2026-04-18 16:51:35 +08:00 |
|
|
王奎兴
|
70d86d490b
|
库存调整记录倒序排序;
|
2026-04-18 16:51:24 +08:00 |
|
|
王奎兴
|
565eb609d1
|
oms入库单添加数量信息;库存调整添加库存调整记录;
|
2026-04-18 16:40:49 +08:00 |
|
|
王奎兴
|
1d78832604
|
oms入库单添加数量信息;
|
2026-04-18 16:11:14 +08:00 |
|
|
王奎兴
|
584ff7ba21
|
lot编号传递;
|
2026-04-18 15:57:55 +08:00 |
|
|
王奎兴
|
041d71b425
|
差异过账结果推送oms;
|
2026-04-18 15:11:49 +08:00 |
|
|
王奎兴
|
92bd85405c
|
差异过账结果推送oms;
|
2026-04-18 14:56:14 +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 |
|
|
王奎兴
|
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 |
|
|
王奎兴
|
90aa6a0aeb
|
制单人;
|
2026-04-17 21:55:38 +08:00 |
|
|
王奎兴
|
c987ee31d6
|
库存调整记录添加入库单号 lotno;
|
2026-04-17 21:42:43 +08:00 |
|
|
王奎兴
|
05a999e2e1
|
上架添加库存修改;
|
2026-04-17 21:17:48 +08:00 |
|
|
王奎兴
|
9a895b8fba
|
库存调整记录修改;
|
2026-04-17 20:38:43 +08:00 |
|
|
王奎兴
|
5a2070bec9
|
上架报错;
|
2026-04-17 20:13:30 +08:00 |
|
|
王奎兴
|
b0fbbf7343
|
盘点结果推送oms;
|
2026-04-17 19:58:56 +08:00 |
|
|
王奎兴
|
a334c99180
|
入库结果回传oms;
|
2026-04-17 19:52:48 +08:00 |
|
|
王奎兴
|
90ede30b14
|
盘点推送结果oms;
|
2026-04-17 19:39:26 +08:00 |
|
|
王奎兴
|
d7cb562a9f
|
Merge remote-tracking branch 'origin/dev_WMS20260401' into dev_WMS20260401
|
2026-04-17 19:34:48 +08:00 |
|
|
王奎兴
|
19a1d192d5
|
盘点推送结果oms;
|
2026-04-17 19:34:33 +08:00 |
|
|
王奎兴
|
5ed590bfd2
|
查询出入库单审核状态;盘点推送结果oms;
|
2026-04-17 19:09:21 +08:00 |
|
|
王奎兴
|
89d78e3275
|
出入库前端生成单号;
|
2026-04-17 16:21:20 +08:00 |
|
|
王奎兴
|
4e62c80763
|
库存冻结体积面积信息;
|
2026-04-17 14:25:29 +08:00 |
|
|
王奎兴
|
5733e839ad
|
Merge remote-tracking branch 'origin/dev_WMS20260401' into dev_WMS20260401
|
2026-04-17 14:20:00 +08:00 |
|
|
王奎兴
|
f7ad272b8c
|
oms出入库;
|
2026-04-17 14:19:43 +08:00 |
|
|
王奎兴
|
f7434a592b
|
Merge remote-tracking branch 'origin/dev_WMS20260401' into dev_WMS20260401
|
2026-04-17 08:59:25 +08:00 |
|
|
王奎兴
|
ddc1f5d2ea
|
oms出入库;
|
2026-04-17 08:59:16 +08:00 |
|
|
王奎兴
|
5ee5dc28a5
|
Merge remote-tracking branch 'origin/dev_WMS20260401' into dev_WMS20260401
|
2026-04-16 11:21:41 +08:00 |
|
|
王奎兴
|
b561342bed
|
查询菜单报错;
|
2026-04-16 11:21:27 +08:00 |
|
|
王奎兴
|
eec90b054b
|
查询菜单报错;
|
2026-04-16 11:02:00 +08:00 |
|
|
王奎兴
|
e731394066
|
合并代码冲突;
|
2026-04-15 19:31:47 +08:00 |
|
|
王奎兴
|
e17216eb7c
|
合并代码冲突;
|
2026-04-15 19:30:05 +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 |
|
|
王奎兴
|
662123cdb6
|
上架库存调整记录注释;
|
2026-04-15 15:35:38 +08:00 |
|
|
王奎兴
|
ac51afdb7e
|
发布正式配置修改;
|
2026-04-15 11:27:40 +08:00 |
|
|
王奎兴
|
7bc6843729
|
wms回传oms出入库结果;
|
2026-04-15 11:25:54 +08:00 |
|