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

yudao-module-sale/yudao-module-sale-core/src/main/java/cn/iocoder/yudao/module/sale/dal/dataobject/offer/OfferDO.java

@@ -104,10 +104,12 @@ public class OfferDO extends BaseDO {
     /**
      * 价格有效期开始
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Date startTime;
     /**
      * 价格有效期结束
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Date endTime;
     /**
      * 交货方式：FOB(离岸价)，CIF(到岸价)，CNF(成本加运费)，EXW(出厂价)

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

@@ -382,6 +382,12 @@ public interface OfferMapper extends BaseMapperX<OfferDO> {
             "AND o.relation_id = #{pageVO.customerId} ",
             "</when>",
 
+            //startWarehouseIds
+            "<when test = 'pageVO.startWarehouseIds != null and pageVO.startWarehouseIds.size() > 0'>",
+            "AND st.id IN",
+            "<foreach item='startWarehouseId' collection='pageVO.startWarehouseIds' open='(' close=')' separator=','> #{startWarehouseId} </foreach>",
+            "</when>",
+
             "<when test = 'pageVO.beginEstimatedShippingTime != null and pageVO.endEstimatedShippingTime != null '>",
             "AND o.`estimated_shipping_time` between #{pageVO.beginEstimatedShippingTime} and #{pageVO.endEstimatedShippingTime}",
             "</when>",

yudao-module-sale/yudao-module-sale-core/src/main/java/cn/iocoder/yudao/module/sale/service/offer/impl/OfferServiceImpl.java

@@ -500,9 +500,9 @@ public class OfferServiceImpl extends AbstractService<OfferMapper, OfferDO> impl
                 throw exception(MARKS_LENGTH_MAX, 20);
             }
         }
-        if (null == updateReqVO.getStartTime() || null == updateReqVO.getEndTime()) {
-            throw exception(OFFER_START_END_TIME_NOT_NULL);
-        }
+//        if (null == updateReqVO.getStartTime() || null == updateReqVO.getEndTime()) {
+//            throw exception(OFFER_START_END_TIME_NOT_NULL);
+//        }
         if (updateReqVO.getRelation() == 1 && (Objects.isNull(updateReqVO.getConsignorId()) || updateReqVO.getConsignorId() == 0)) {
             throw exception(OFFER_ASCRIPTION_CONSIGNOR_NOT_NULL);
         }
@@ -585,7 +585,7 @@ public class OfferServiceImpl extends AbstractService<OfferMapper, OfferDO> impl
         if (Objects.nonNull(customerContactsDO.getCustomerId())) {
             CustomerDO customerDO = customerService.getById(customerContactsDO.getCustomerId());
             if (Objects.nonNull(customerDO) && Objects.nonNull(customerDO.getCustomerService())) {
-                updateObj.setFollowUpSalesmanId(String.valueOf(customerDO.getCustomerService()));
+//                updateObj.setFollowUpSalesmanId(String.valueOf(customerDO.getCustomerService()));
                 updateObj.setSalesmanId(customerDO.getCustomerService());
                 AdminUserRespDTO adminUserRespDTO = adminUserApi.getUser(customerDO.getCustomerService());
                 if (Objects.nonNull(adminUserRespDTO)) {