weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

复核查询体积等信息逻辑修改;

Browse Source
This commit is contained in:
王奎兴
2026-02-24 16:03:23 +08:00
parent f20bab8de3
commit 7f5f1615ae
5 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/facade/IPickingMaterialDetailService.java
+1 -1
View File
@@ -24,7 +24,7 @@ public interface IPickingMaterialDetailService extends IService<PickingMaterialD
*/
public List<PickingMaterialDetailPO> queryList(PickingMaterialDetailDO pickingMaterialDetailDO);
public PickingMaterialDetailPO queryTotalsByOutNumberAndBaseId(String orderNumber, Long materialBaseInfoId);
public PickingMaterialDetailPO queryTotalsByOutNumberAndBaseId(String orderNumber, Long materialBaseInfoId, Long materialInventoryId);
/**
* 新增拣货单物料明细
mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/mapper/PickingMaterialDetailMapper.java
+1 -1
View File
@@ -22,7 +22,7 @@ public interface PickingMaterialDetailMapper extends BaseMapper<PickingMaterialD
*/
public List<PickingMaterialDetailPO> queryList(PickingMaterialDetailDO pickingMaterialDetailDO);
public PickingMaterialDetailPO queryTotalsByOutNumberAndBaseId( @Param("orderNumber") String orderNumber, @Param("materialBaseInfoId") Long materialBaseInfoId);
public PickingMaterialDetailPO queryTotalsByOutNumberAndBaseId(@Param("orderNumber") String orderNumber, @Param("materialBaseInfoId") Long materialBaseInfoId, @Param("materialInventoryId") Long materialInventoryId);
/**
* @description 根据拣货单增加拣货数量
mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/persistence/PickingMaterialDetailImpl.java
+2 -2
View File
@@ -62,9 +62,9 @@ public class PickingMaterialDetailImpl extends ServiceImpl<PickingMaterialDetail
}
@Override
public PickingMaterialDetailPO queryTotalsByOutNumberAndBaseId( String orderNumber, Long materialBaseInfoId)
public PickingMaterialDetailPO queryTotalsByOutNumberAndBaseId(String orderNumber, Long materialBaseInfoId, Long materialInventoryId)
{
return pickingMaterialDetailMapper.queryTotalsByOutNumberAndBaseId(orderNumber, materialBaseInfoId);
return pickingMaterialDetailMapper.queryTotalsByOutNumberAndBaseId(orderNumber, materialBaseInfoId, materialInventoryId);
}
/**
mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java
+2 -1
View File
@@ -699,7 +699,8 @@ public class StockOutOrderDomainService {
outMaterialDetailPO.setMaterialCode(outMaterialDetailPO.getMaterialNo());
outMaterialDetailPO.setMaterialName(outMaterialDetailPO.getCommodityName());
Long materialBaseInfoId = outMaterialDetailPO.getMaterialBaseInfoId();
PickingMaterialDetailPO pickingMaterialDetailPO = pickingMaterialDetailService.queryTotalsByOutNumberAndBaseId(outOrderNumber, materialBaseInfoId);
Long materialInventoryId = outMaterialDetailPO.getMaterialInventoryId();
PickingMaterialDetailPO pickingMaterialDetailPO = pickingMaterialDetailService.queryTotalsByOutNumberAndBaseId(outOrderNumber, materialBaseInfoId, materialInventoryId);
if (ObjectUtils.isNotEmpty(pickingMaterialDetailPO)) {
outMaterialDetailPO.setTotalArea(pickingMaterialDetailPO.getTotalArea());
outMaterialDetailPO.setTotalVolume(pickingMaterialDetailPO.getTotalVolume());