Commit Graph
651 Commits
Author SHA1 Message Date
王奎兴 5ed590bfd2 查询出入库单审核状态;盘点推送结果oms; 2026-04-17 19:09:21 +08:00
秦鸿展 dfb360e123 PDA抄码修改 2026-04-17 18:06:16 +08:00
zhou-hongcheng 5d78a94f29 抄码新增字段 2026-04-17 16:45:24 +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
zhaoqing e658dfb56d wms-提货单sql 2026-04-17 14:12:54 +08:00
zhou-hongcheng ff32e5d32c 抄码出库交接 2026-04-17 14:04:56 +08:00
zhou-hongcheng 7cc2081ad3 Merge remote-tracking branch 'origin/dev_WMS20260401' into dev_WMS20260401 2026-04-17 11:05:23 +08:00
zhou-hongcheng b86374786f 抄码复合优化拣货 2026-04-17 11:05:06 +08:00
秦鸿展 290b87933e PDA上架详情字段添加 2026-04-17 10:08:43 +08:00
秦鸿展 6916fbb9d2 抄码查询修改 2026-04-17 08:59:55 +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
zhaoqing 2dbc309e35 wms 出库单提货单打印 修改查询字段 2026-04-17 08:52:00 +08:00
zhaoqing 84b467ef04 wms 出库单提货单打印FG 提货单打印添加字段 2026-04-16 18:05:14 +08:00
zhou-hongcheng ce6d42ce61 抄码拣货 2026-04-16 16:47:12 +08:00
zhou-hongcheng 94900ea8e4 Merge remote-tracking branch 'origin/dev_WMS20260401' into dev_WMS20260401 2026-04-16 16:38:42 +08:00
zhou-hongcheng 9531d52ef0 出库和拣货详情增加是否抄码标识 2026-04-16 16:38:29 +08:00
秦鸿展 c3b8779c85 PDA抄码修改 2026-04-16 15:40:55 +08:00
zhou-hongcheng 62f09f74f6 上架详情收货详情增加是否抄码标识 2026-04-16 15:34:15 +08:00
zhou-hongcheng 6fb7d6b991 抄码取消分配 2026-04-16 15:02:38 +08:00
zhou-hongcheng feeb10307c Merge remote-tracking branch 'origin/dev_WMS20260401' into dev_WMS20260401 2026-04-16 14:53:50 +08:00
zhou-hongcheng 67a37c1458 优化 2026-04-16 14:53:36 +08:00
zhaoqing e999675584 wms 出库单提货单打印 2026-04-16 14:10:20 +08:00
秦鸿展 83dd741bbf Merge remote-tracking branch 'origin/dev_WMS20260401' into dev_WMS20260401 2026-04-16 13:58:46 +08:00
秦鸿展 636a96b0ed 物料查询抄码显示修改 2026-04-16 13:58:25 +08:00
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 99e7c314a0 抄码商品生成拣货单存入抄码重量 2026-04-16 11:31:13 +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
秦鸿展 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 e5681bc510 抄码存入详情 2026-04-15 12:27:38 +08:00