purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决不同商品的批号重复导致采购价获取错误的bug

Browse Source
This commit is contained in:
jishenghua
2024-04-07 15:20:57 +08:00
parent fc2125ae2c
commit 9e173e39b1
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java
View File

@@ -234,6 +234,7 @@ public interface DepotItemMapperEx {
@Param("batchNumber") String batchNumber); @Param("batchNumber") String batchNumber);
List<DepotItem> getDepotItemByBatchNumber( List<DepotItem> getDepotItemByBatchNumber(
@Param("materialExtendId") Long materialExtendId,
@Param("batchNumber") String batchNumber); @Param("batchNumber") String batchNumber);
List<MaterialVo4Unit> getBillItemByParam( List<MaterialVo4Unit> getBillItemByParam(

7
jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java
View File

@@ -585,7 +585,7 @@ public class DepotItemService {
BusinessConstants.SUB_TYPE_RETAIL_RETURN.equals(depotHead.getSubType())) { BusinessConstants.SUB_TYPE_RETAIL_RETURN.equals(depotHead.getSubType())) {
depotItem.setPurchaseUnitPrice(materialExtend.getPurchaseDecimal()); depotItem.setPurchaseUnitPrice(materialExtend.getPurchaseDecimal());
if(StringUtil.isNotEmpty(depotItem.getBatchNumber())) { 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"))) { if (StringUtil.isExist(rowObj.get("taxUnitPrice"))) {
@@ -771,11 +771,12 @@ public class DepotItemService {
/** /**
* 根据批号查询单据明细信息 * 根据批号查询单据明细信息
* @param materialExtendId
* @param batchNumber * @param batchNumber
* @return * @return
*/ */
public DepotItem getDepotItemByBatchNumber(String batchNumber) { public DepotItem getDepotItemByBatchNumber(Long materialExtendId, String batchNumber) {
List<DepotItem> depotItemList = depotItemMapperEx.getDepotItemByBatchNumber(batchNumber); List<DepotItem> depotItemList = depotItemMapperEx.getDepotItemByBatchNumber(materialExtendId, batchNumber);
if(null != depotItemList && depotItemList.size() > 0){ if(null != depotItemList && depotItemList.size() > 0){
return depotItemList.get(0); return depotItemList.get(0);
} else { } else {

1
jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml
View File

@@ -1003,6 +1003,7 @@
left join jsh_depot_item di on dh.id=di.header_id and ifnull(di.delete_flag,'0') !='1' left join jsh_depot_item di on dh.id=di.header_id and ifnull(di.delete_flag,'0') !='1'
where 1=1 where 1=1
and ifnull(dh.delete_flag,'0') !='1' and ifnull(dh.delete_flag,'0') !='1'
and di.material_extend_id = #{materialExtendId}
and di.batch_number = #{batchNumber} and di.batch_number = #{batchNumber}
and dh.type = '入库' and dh.type = '入库'
</select> </select>