diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java index 3acacb3f..5917f526 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java @@ -234,6 +234,7 @@ public interface DepotItemMapperEx { @Param("batchNumber") String batchNumber); List getDepotItemByBatchNumber( + @Param("materialExtendId") Long materialExtendId, @Param("batchNumber") String batchNumber); List getBillItemByParam( diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java index a577e1a1..12c038ea 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java @@ -585,7 +585,7 @@ public class DepotItemService { BusinessConstants.SUB_TYPE_RETAIL_RETURN.equals(depotHead.getSubType())) { depotItem.setPurchaseUnitPrice(materialExtend.getPurchaseDecimal()); if(StringUtil.isNotEmpty(depotItem.getBatchNumber())) { - depotItem.setPurchaseUnitPrice(getDepotItemByBatchNumber(depotItem.getBatchNumber()).getUnitPrice()); + depotItem.setPurchaseUnitPrice(getDepotItemByBatchNumber(depotItem.getMaterialExtendId(),depotItem.getBatchNumber()).getUnitPrice()); } } if (StringUtil.isExist(rowObj.get("taxUnitPrice"))) { @@ -771,11 +771,12 @@ public class DepotItemService { /** * 根据批号查询单据明细信息 + * @param materialExtendId * @param batchNumber * @return */ - public DepotItem getDepotItemByBatchNumber(String batchNumber) { - List depotItemList = depotItemMapperEx.getDepotItemByBatchNumber(batchNumber); + public DepotItem getDepotItemByBatchNumber(Long materialExtendId, String batchNumber) { + List depotItemList = depotItemMapperEx.getDepotItemByBatchNumber(materialExtendId, batchNumber); if(null != depotItemList && depotItemList.size() > 0){ return depotItemList.get(0); } else { diff --git a/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml index 431e7e4a..002d6e07 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml @@ -1003,6 +1003,7 @@ left join jsh_depot_item di on dh.id=di.header_id and ifnull(di.delete_flag,'0') !='1' where 1=1 and ifnull(dh.delete_flag,'0') !='1' + and di.material_extend_id = #{materialExtendId} and di.batch_number = #{batchNumber} and dh.type = '入库'