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

@@ -326,6 +326,7 @@ public class ContractDistributorStandardController extends DefaultBaseController
         GetContractDistributorStandardBo result = new GetContractDistributorStandardBo(data);
         GetContractDistributorStandardBo result = new GetContractDistributorStandardBo(data);
         Wrapper<ContractDistributorLine> lineWrapper = Wrappers.lambdaQuery(ContractDistributorLine.class)
         Wrapper<ContractDistributorLine> lineWrapper = Wrappers.lambdaQuery(ContractDistributorLine.class)
                 .eq(ContractDistributorLine::getContractId, id)
                 .eq(ContractDistributorLine::getContractId, id)
+                .gt(ContractDistributorLine::getQuantity, BigDecimal.ZERO)
                 .orderByAsc(ContractDistributorLine::getShowOrder);
                 .orderByAsc(ContractDistributorLine::getShowOrder);
         List<ContractDistributorLine> contractDistributorLineList = contractDistributorLineService.list(lineWrapper);
         List<ContractDistributorLine> contractDistributorLineList = contractDistributorLineService.list(lineWrapper);
 
 

@@ -787,8 +787,8 @@ public class ContractDistributorStandardServiceImpl extends
         }
         }
 
 
         BigDecimal newOriginalTotalQuantity = original.getTotalQuantity().subtract(splitTotalQuantity);
         BigDecimal newOriginalTotalQuantity = original.getTotalQuantity().subtract(splitTotalQuantity);
-        if (newOriginalTotalQuantity.compareTo(BigDecimal.ZERO) < 0) {
-            throw new DefaultClientException("拆分数量不能大于合同合计数量！");
+        if (newOriginalTotalQuantity.compareTo(BigDecimal.ZERO) <= 0) {
+            throw new DefaultClientException("拆分数量不能大于等于合同合计数量！");
         }
         }
 
 
         String baseCode = original.getCode();
         String baseCode = original.getCode();

@@ -79,6 +79,8 @@
             <if test="vo.contractId != null and vo.contractId != ''">
             <if test="vo.contractId != null and vo.contractId != ''">
                 AND tb.contract_id = #{vo.contractId}
                 AND tb.contract_id = #{vo.contractId}
             </if>
             </if>
+            AND tb.quantity IS NOT NULL
+            AND tb.quantity <![CDATA[>]]> 0
         </where>
         </where>
     </select>
     </select>
 </mapper>
 </mapper>