采购付款

hx-purchase/src/main/java/com/fjhx/purchase/entity/pay/po/Pay.java

@@ -113,6 +113,21 @@ public class Pay extends BasePo {
      * 付款状态
      */
     private String payStatus;
+
+    /**
+     * 税率
+     */
+    private BigDecimal rate;
+
+    /**
+     * 付款类型  0:未核销  1发票核销
+     */
+    private String type;
+
+    /**
+     * 预付款单号
+     */
+    private String advance_code;
     /**
      * 付款明细
      */

hx-sale/src/main/java/com/fjhx/sale/entity/contract/po/Contract.java

@@ -299,6 +299,11 @@ public class Contract extends BasePo {
     private String isChange;
 
     /**
+     * 是否下发交接单 0未  1下发
+     */
+    private String issue;
+
+    /**
      * 原合同id
      */
     private Long oldContractId;

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

@@ -123,6 +123,11 @@ public class ContractProductVo extends ContractProduct {
     private Date sampleTime;
 
     /**
+     * 下单时间
+     */
+    private Date contractTime;
+
+    /**
      * 客户名称
      */
     private String buyCorporationName;

hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractProductServiceImpl.java

@@ -84,6 +84,7 @@ public class ContractProductServiceImpl extends ServiceImpl<ContractProductMappe
         IWrapper<ContractProduct> wrapper = getWrapper();
         wrapper.orderByDesc("t1", ContractProduct::getCreateTime);
         wrapper.between("t2", Contract::getStatus, FlowStatusEnum.PASS.getKey(), FlowStatusEnum.CANCELLATION.getKey() - 1);
+        wrapper.eq("t2",Contract::getIssue,1);
         wrapper.ne("t1", ContractProduct::getExpendQuantity, BigDecimal.ZERO);
         if (StringUtils.isNotEmpty(dto.getKeyword())) {
             wrapper.keyword(dto.getKeyword(), new SqlField("t2.`code`"), new SqlField("t2.`user_name`"));

hx-sale/src/main/resources/mapper/contract/ContractProductMapper.xml

@@ -4,6 +4,7 @@
 
     <select id="getPage" resultType="com.fjhx.sale.entity.contract.vo.ContractProductVo">
         SELECT t1.id,
+               t2.create_time AS contractTime,
                t1.contract_id,
                t1.product_id,
                t2.`code`          AS contractCode,