zhou-hongcheng
|
5446c3bece
|
Merge remote-tracking branch 'origin/dev_WMS20260401' into dev_WMS20260401
|
2026-04-16 13:58:15 +08:00 |
|
zhou-hongcheng
|
97c0fc386c
|
抄码商品取消分配
|
2026-04-16 13:58:03 +08:00 |
|
秦鸿展
|
2c35c39e52
|
物料查询抄码显示修改
|
2026-04-16 13:35:03 +08:00 |
|
zhou-hongcheng
|
ea4ee08353
|
抄码商品拣货存入id
|
2026-04-16 13:31:23 +08:00 |
|
zhou-hongcheng
|
5943463064
|
抄码商品分配库存存入id
|
2026-04-16 11:45:48 +08:00 |
|
zhou-hongcheng
|
67413368de
|
Merge remote-tracking branch 'origin/dev_WMS20260401' into dev_WMS20260401
|
2026-04-16 11:31:26 +08:00 |
|
zhou-hongcheng
|
99e7c314a0
|
抄码商品生成拣货单存入抄码重量
|
2026-04-16 11:31:13 +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 |
|
zhou-hongcheng
|
913dc6a885
|
Merge remote-tracking branch 'origin/dev_WMS20260401' into dev_WMS20260401
|
2026-04-16 11:13:08 +08:00 |
|
zhou-hongcheng
|
4d9fe3dc40
|
抄码商品分配库存
|
2026-04-16 11:12:54 +08:00 |
|
王奎兴
|
eec90b054b
|
查询菜单报错;
|
2026-04-16 11:02:00 +08:00 |
|
秦鸿展
|
96d81526d9
|
物料查询修改
|
2026-04-16 09:57:40 +08:00 |
|
zhaoqing
|
2b1170bde5
|
wms 抄码Api
|
2026-04-16 08:51:54 +08:00 |
|
zhaoqing
|
a8b039e52f
|
wms 入仓单打印
|
2026-04-15 19:41:38 +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 |
|
秦鸿展
|
551c618820
|
出库导入修改
|
2026-04-15 17:47:48 +08:00 |
|
秦鸿展
|
2a4c4b835a
|
配置修改
|
2026-04-15 17:11:33 +08:00 |
|
秦鸿展
|
be323e975a
|
导入修改
|
2026-04-15 17:10:44 +08:00 |
|
zhou-hongcheng
|
0fac5143a7
|
抄码存入详情
|
2026-04-15 16:08:55 +08:00 |
|
王奎兴
|
662123cdb6
|
上架库存调整记录注释;
|
2026-04-15 15:35:38 +08:00 |
|
zhaoqing
|
9e6357d6e6
|
wms 收货详情-条码打印
|
2026-04-15 15:24:39 +08:00 |
|
zhaoqing
|
ffa741d7ed
|
wms 入库管理-打印入库单
|
2026-04-15 13:51:05 +08:00 |
|
zhou-hongcheng
|
10549fd4ec
|
Merge remote-tracking branch 'origin/dev_WMS20260401' into dev_WMS20260401
|
2026-04-15 12:28:52 +08:00 |
|
zhou-hongcheng
|
e5681bc510
|
抄码存入详情
|
2026-04-15 12:27:38 +08:00 |
|
王奎兴
|
ac51afdb7e
|
发布正式配置修改;
|
2026-04-15 11:27:40 +08:00 |
|
王奎兴
|
7bc6843729
|
wms回传oms出入库结果;
|
2026-04-15 11:25:54 +08:00 |
|
秦鸿展
|
925b4ade1d
|
W配置修改
|
2026-04-15 11:19:22 +08:00 |
|
秦鸿展
|
1fbdaaaf51
|
上架数量显示异常1
|
2026-04-15 10:56:04 +08:00 |
|
秦鸿展
|
fdb70db6f6
|
上架数量显示异常
|
2026-04-15 10:06:46 +08:00 |
|
zhaoqing
|
f89c948da4
|
wms 抄码实体类字段
|
2026-04-15 09:43:11 +08:00 |
|
zhaoqing
|
54113c88be
|
wms sql字段
|
2026-04-15 09:14:21 +08:00 |
|
zhaoqing
|
f56db21de4
|
wms 添加抄码实体类
|
2026-04-15 08:47:06 +08:00 |
|
zhaoqing
|
6aee88748b
|
修改 wms 库存管理 页面查询和打印
|
2026-04-14 22:21:15 +08:00 |
|
秦鸿展
|
f63917ed03
|
PDA收货上架修改内容
|
2026-04-14 21:36:50 +08:00 |
|
zhaoqing
|
76e82f635a
|
wms 库存管理-抄码商品对照表-打印页面查询
|
2026-04-14 20:52:03 +08:00 |
|
王奎兴
|
281bf9b965
|
出入库单oms;
|
2026-04-14 19:03:01 +08:00 |
|
zhaoqing
|
1fa6d88545
|
w 库存管理-抄码商品对照表
|
2026-04-14 17:22:52 +08:00 |
|
zhaoqing
|
d10d899a1c
|
wms-基础数据-物料管理 添加是否抄码
|
2026-04-14 15:51:43 +08:00 |
|
zhaoqing
|
f6a58fefe6
|
恢复
|
2026-04-14 15:27:55 +08:00 |
|
秦鸿展
|
aa0be69556
|
PDA收货修改内容
|
2026-04-14 15:06:50 +08:00 |
|
zhaoqing
|
230edc73e4
|
wms 基础数据-物料管理 添加是否抄码
|
2026-04-14 10:30:41 +08:00 |
|
王奎兴
|
47245a7dee
|
nc推送修改;
|
2026-04-14 08:52:18 +08:00 |
|
王奎兴
|
0ee4ba6428
|
配置;
|
2026-04-13 17:54:21 +08:00 |
|
王奎兴
|
77879c31ff
|
nc
|
2026-04-13 17:47:46 +08:00 |
|
王奎兴
|
0f8e927cd2
|
发布测试配置修改;
|
2026-04-13 16:26:01 +08:00 |
|
王奎兴
|
bce84d0b4c
|
发布测试配置修改;
|
2026-04-13 16:21:10 +08:00 |
|