Commit 98f928aa989d5d1e93231a26ea94104452263b21

Authored by 房远帅
1 parent 48b3c003

合同:物料行数量为0不查出来

... ... @@ -326,6 +326,7 @@ public class ContractDistributorStandardController extends DefaultBaseController
326 326 GetContractDistributorStandardBo result = new GetContractDistributorStandardBo(data);
327 327 Wrapper<ContractDistributorLine> lineWrapper = Wrappers.lambdaQuery(ContractDistributorLine.class)
328 328 .eq(ContractDistributorLine::getContractId, id)
  329 + .gt(ContractDistributorLine::getQuantity, BigDecimal.ZERO)
329 330 .orderByAsc(ContractDistributorLine::getShowOrder);
330 331 List<ContractDistributorLine> contractDistributorLineList = contractDistributorLineService.list(lineWrapper);
331 332
... ...
... ... @@ -787,8 +787,8 @@ public class ContractDistributorStandardServiceImpl extends
787 787 }
788 788
789 789 BigDecimal newOriginalTotalQuantity = original.getTotalQuantity().subtract(splitTotalQuantity);
790   - if (newOriginalTotalQuantity.compareTo(BigDecimal.ZERO) < 0) {
791   - throw new DefaultClientException("拆分数量不能大于合同合计数量!");
  790 + if (newOriginalTotalQuantity.compareTo(BigDecimal.ZERO) <= 0) {
  791 + throw new DefaultClientException("拆分数量不能大于等于合同合计数量!");
792 792 }
793 793
794 794 String baseCode = original.getCode();
... ...
... ... @@ -79,6 +79,8 @@
79 79 <if test="vo.contractId != null and vo.contractId != ''">
80 80 AND tb.contract_id = #{vo.contractId}
81 81 </if>
  82 + AND tb.quantity IS NOT NULL
  83 + AND tb.quantity <![CDATA[>]]> 0
82 84 </where>
83 85 </select>
84 86 </mapper>
... ...