王奎兴 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

..

commonSettings

集成wms服务模块

2026-01-19 18:55:23 +08:00

containerUsageRecord

集成wms服务模块

2026-01-19 18:55:23 +08:00

copyCodeReference

修改 wms 库存管理 页面查询和打印

2026-04-14 22:21:15 +08:00

deliveTask

PDA工作台出库交接查询

2026-03-17 11:01:56 +08:00

differentManage

倒序

2026-03-11 17:14:00 +08:00

handoverTaskOrder

Merge branch 'dev' into dev_WMS20260401

2026-04-15 18:48:55 +08:00

inMaterialDetail

查询入库单明细新字段;

2026-04-07 16:55:25 +08:00

inMaterialDetailSerialNumber

集成wms服务模块

2026-01-19 18:55:23 +08:00

inOrderAbnormal

PDA复核内容修改

2026-04-10 14:46:28 +08:00

inventoryAdjustmentRecord

库存调整记录物料明细物料库存查询入库编号和lot编号

2026-03-30 15:56:51 +08:00

inventoryAllocationRule

集成wms服务模块

2026-01-19 18:55:23 +08:00

inventoryAllocationRuleDetail

集成wms服务模块

2026-01-19 18:55:23 +08:00

inventoryStandingDetail

集成wms服务模块

2026-01-19 18:55:23 +08:00

inventoryStandingReport

入库管理修改bug

2026-01-27 13:50:19 +08:00

inventoryTurnoverRule

集成wms服务模块

2026-01-19 18:55:23 +08:00

inventoryTurnoverRuleDetail

集成wms服务模块

2026-01-19 18:55:23 +08:00

inventoryWarningAnalyze

集成wms服务模块

2026-01-19 18:55:23 +08:00

investigationManage

PDA盘点修改进度不显示问题，状态显示问题

2026-03-17 13:17:47 +08:00

investigetionManageDetail

集成wms服务模块

2026-01-19 18:55:23 +08:00

materialBarCode

集成wms服务模块

2026-01-19 18:55:23 +08:00

materialBaseInfo

查询物料库存数量;

2026-04-08 16:12:15 +08:00

materialCommon

集成wms服务模块

2026-01-19 18:55:23 +08:00

materialGoodsRule

集成wms服务模块

2026-01-19 18:55:23 +08:00

materialInventory

库存查询更新时间倒序

2026-03-31 09:53:52 +08:00

materialInventoryWarning

出库明细;

2026-01-24 17:42:05 +08:00

materialMoreDetail

集成wms服务模块

2026-01-19 18:55:23 +08:00

materialWarehouseControl

集成wms服务模块

2026-01-19 18:55:23 +08:00

mobilizeManage

集成wms服务模块

2026-01-19 18:55:23 +08:00

mobilizeManageDetail

集成wms服务模块

2026-01-19 18:55:23 +08:00

noticeMaterialDetail

集成wms服务模块

2026-01-19 18:55:23 +08:00

OutMaterialDetail

出库单新增字段查询;

2026-04-08 15:12:57 +08:00

outMaterialDetailSerialNumber

PDA移位管理批次属性查询修改，库存查询修改

2026-03-13 16:57:48 +08:00

outOrderAbnormal

入库异常，入库作业单，出库异常详情查询

2026-04-10 16:20:01 +08:00

overStock

集成wms服务模块

2026-01-19 18:55:23 +08:00

pickingMaterialDetail

入库异常，入库作业单，出库异常详情查询

2026-04-10 16:20:01 +08:00

pickingOrder

PC拣货高级筛选货主查询

2026-03-19 04:12:40 +08:00

putawayRule

集成wms服务模块

2026-01-19 18:55:23 +08:00

putawayRuleDetail

集成wms服务模块

2026-01-19 18:55:23 +08:00

qcRule

集成wms服务模块

2026-01-19 18:55:23 +08:00

qcRuleDetail

集成wms服务模块

2026-01-19 18:55:23 +08:00

qualityInspection

集成wms服务模块

2026-01-19 18:55:23 +08:00

receiptMaterialDetail

抄码存入详情

2026-04-15 12:27:38 +08:00

receiptOrderAccount

费用科目按是否出入库显示查询及费用表;

2026-04-02 17:29:18 +08:00

replenishmentNotice

集成wms服务模块

2026-01-19 18:55:23 +08:00

reviewOrder

20260409修改内容

2026-04-10 09:29:26 +08:00

serialNumber

集成wms服务模块

2026-01-19 18:55:23 +08:00

shelfMaterialDetail

20260409修改内容

2026-04-10 09:29:26 +08:00

shiftManage

集成wms服务模块

2026-01-19 18:55:23 +08:00

shiftMaterialDetail

PDA按单移位修改

2026-03-16 16:16:28 +08:00

sowingDistributionDetails

集成wms服务模块

2026-01-19 18:55:23 +08:00

sowingWall

集成wms服务模块

2026-01-19 18:55:23 +08:00

stockInOrder

Merge branch 'dev' into dev_WMS20260401

2026-04-15 18:48:55 +08:00

stockInTaskOrder

入库异常，入库作业单，出库异常详情查询

2026-04-10 16:20:01 +08:00

stockOutOrder

wms费用科目修改;

2026-04-11 15:35:16 +08:00

stockOutTaskOrder

作业单页面调整修改BUG

2026-04-11 10:15:36 +08:00

stockReceiptNotice

集成wms服务模块

2026-01-19 18:55:23 +08:00

stockReceiptOrder

Merge branch 'dev' into dev_WMS20260401

2026-04-15 18:48:55 +08:00

stockShelfOrder

oms修改;

2026-04-15 18:29:06 +08:00

sysTableConfig

仓储动态表单;

2026-03-31 10:22:37 +08:00

taskHandoverMaterialDetail

集成wms服务模块

2026-01-19 18:55:23 +08:00

taskPickingMaterialDetail

集成wms服务模块

2026-01-19 18:55:23 +08:00

taskReceiptMaterialDetail

集成wms服务模块

2026-01-19 18:55:23 +08:00

taskShelfMaterialDetail

集成wms服务模块

2026-01-19 18:55:23 +08:00

userCommonSettings

集成wms服务模块

2026-01-19 18:55:23 +08:00

waveMaterialDetail

集成wms服务模块

2026-01-19 18:55:23 +08:00

waveOrder

集成wms服务模块

2026-01-19 18:55:23 +08:00

waveRule

集成wms服务模块

2026-01-19 18:55:23 +08:00