需求95 报价单页面和列表调整

yudao-module-sale/yudao-module-sale-core/src/main/java/cn/iocoder/yudao/module/sale/dal/mysql/offer/OfferMapper.java

@@ -724,7 +724,7 @@ public interface OfferMapper extends BaseMapperX<OfferDO> {
             "join ecw_customer_contacts cc on (o.relation = 1 and cc.id = o.consignor_id) or (o.relation = 2 and cc.id = o.consignee_id) ",
             "left join system_user u on u.id = o.follow_up_salesman_id ",
             "where o.deleted = 0",
-            "AND o.`status` in(2,1,6,8,3)",
+            "AND o.`status` in(0,1,2,3,4,5,6,7,9)",
             "AND (o.`order_id` is null or o.`order_id` = 0)",
             "AND o.`end_time` > now()",
             "AND (o.`consignor_id` = #{queryVO.consignorId}",

yudao-module-sale/yudao-module-sale-core/src/main/java/cn/iocoder/yudao/module/sale/listener/OfferAssociationOrderListener.java

@@ -36,9 +36,9 @@ public class OfferAssociationOrderListener {
         if (Objects.isNull(offerDO)) {
             throw exception(OFFER_NOT_EXISTS);
         }
-        if (offerDO.getStatus() == 2) {
-            throw exception(OFFER_STATUS_ERROR);
-        }
+//        if (offerDO.getStatus() == 2) {
+//            throw exception(OFFER_STATUS_ERROR);
+//        }
         if (Objects.nonNull(offerDO.getOrderId()) && offerDO.getOrderId() > 0L) {
             if (!Objects.equals(offerDO.getOrderId(), event.getOrderId())) {
                 throw exception(ORDER_ASSOCIATION_OFFER_NO_CAN_UPDATE);