diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/SparePartsLedgerServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/SparePartsLedgerServiceImpl.java index ca6fc897e..0b30fbbe7 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/SparePartsLedgerServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/SparePartsLedgerServiceImpl.java @@ -68,6 +68,7 @@ public class SparePartsLedgerServiceImpl implements ISparePartsLedgerService { //查询出入库总数 EquSparepartsInOut sparepartsInOut =new EquSparepartsInOut(); sparepartsInOut.setSpareCode(sparePartsLedgerList.get(i).getMaterialCode()); + sparepartsInOut.setParams(sparePartsLedger.getParams()); sparepartsInOut=equSparepartsInOutMapper.selectEquSparepartsInOutListSum(sparepartsInOut); // 设置入库记录(带非空判断) if(sparepartsInOut != null && sparepartsInOut.getInAmount() != null) { diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquSparepartsInOutMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquSparepartsInOutMapper.xml index 063f62e99..e933ee103 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquSparepartsInOutMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquSparepartsInOutMapper.xml @@ -165,6 +165,9 @@ equ_spareparts_in_out WHERE spare_code = #{spareCode} + + AND create_time between #{params.beginTime} and #{params.endTime} + AND del_flag = '0'