1、增加“采购状态”字段（已采购、部分采购、未采购）；

2、显示所有数据；
3、待采购数量为 0 的数据，可以继续发起采购（即：不限制）；

hx-sale/src/main/java/com/fjhx/sale/entity/contract/vo/ContractProductVo.java

@@ -197,4 +197,9 @@ public class ContractProductVo extends ContractProduct {
      */
     private Long flowId;
 
+    /**
+     * 采购状态
+     */
+    private Integer purchaseStatus;
+
 }

hx-sale/src/main/java/com/fjhx/sale/flow/PurchaseFlow.java

@@ -165,7 +165,8 @@ public class PurchaseFlow extends FlowDelegate {
                 SampleProduct sampleProduct = sampleProductService.getById(p.getDataResourceId());
                 BigDecimal expendQuantity = sampleProduct.getExpendQuantity().subtract(p.getCount());
                 if (expendQuantity.compareTo(BigDecimal.ZERO) < 1) {//小于0不让继续执行
-                    throw new ServiceException("采购数量不得大于合同剩余采购数量");
+//                    throw new ServiceException("采购数量不得大于合同剩余采购数量");
+                    expendQuantity = BigDecimal.ZERO;
                 }
                 sampleProduct.setExpendQuantity(expendQuantity);
                 upSampleProduct.add(sampleProduct);

hx-sale/src/main/java/com/fjhx/sale/service/sample/impl/SampleServiceImpl.java

@@ -269,7 +269,7 @@ public class SampleServiceImpl extends ServiceImpl<SampleMapper, Sample> impleme
             );
         }
         wrapper.eq("t2.`status`", 30);
-        wrapper.gt("t1.expend_quantity", 0);
+        wrapper.ge("t1.expend_quantity", 0);
         //查询样品交接单列表（只查询有交接单的数据）
         Page<ContractProductVo> page = this.baseMapper.sampleHandoverList(dto.getPage(), wrapper);
 

hx-sale/src/main/resources/mapper/sample/SampleMapper.xml

@@ -25,6 +25,7 @@
 
     <select id="sampleHandoverList" resultType="com.fjhx.sale.entity.contract.vo.ContractProductVo">
         SELECT
+            t1.quantity,
             t1.create_time AS ct,
             t1.id,
             t1.sample_id sampleId,