报价评估修改

hx-sale/src/main/java/com/fjhx/sale/controller/quotation/QuotationEstimateController.java

@@ -43,4 +43,12 @@ public class QuotationEstimateController {
         quotationEstimateService.addOrEdit(quotationEstimateDto);
     }
 
+    /**
+     * 报价评估新增
+     */
+    @PostMapping("/submitQuotation")
+    public void submitQuotation(@RequestBody QuotationEstimateDto quotationEstimateDto) {
+        quotationEstimateService.submitQuotation(quotationEstimateDto.getQuotationId());
+    }
+
 }

hx-sale/src/main/java/com/fjhx/sale/entity/quotation/po/QuotationProduct.java

@@ -59,4 +59,9 @@ public class QuotationProduct extends BasePo {
      * 付款条件
      */
     private String remark;
+
+    /**
+     * 生产公司报价单价
+     */
+    private BigDecimal prodPrice;
 }

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

@@ -120,4 +120,9 @@ public class SaleQuotation extends BasePo {
      * 归属公司id
      */
     private Long ofCompanyId;
+
+    /**
+     * 确认状态 0未确认 2已确认
+     */
+    private Integer confirmStatus;
 }

hx-sale/src/main/java/com/fjhx/sale/service/quotation/QuotationEstimateService.java

@@ -28,4 +28,8 @@ public interface QuotationEstimateService extends BaseService<QuotationEstimate>
      */
     void addOrEdit(QuotationEstimateDto quotationEstimateDto);
 
+    /**
+     * 提交报价
+     */
+    void submitQuotation(Long id);
 }

hx-sale/src/main/java/com/fjhx/sale/service/quotation/impl/QuotationEstimateServiceImpl.java

@@ -12,10 +12,12 @@ import com.fjhx.sale.entity.quotation.po.QuotationEstimate;
 import com.fjhx.sale.entity.quotation.po.QuotationProduct;
 import com.fjhx.sale.entity.quotation.po.QuotationProductBom;
 import com.fjhx.sale.entity.quotation.vo.QuotationEstimateVo;
+import com.fjhx.sale.entity.sale.po.SaleQuotation;
 import com.fjhx.sale.mapper.quotation.QuotationEstimateMapper;
 import com.fjhx.sale.service.quotation.QuotationEstimateService;
 import com.fjhx.sale.service.quotation.QuotationProductBomService;
 import com.fjhx.sale.service.quotation.QuotationProductService;
+import com.fjhx.sale.service.sale.SaleQuotationService;
 import com.ruoyi.common.core.domain.BasePo;
 import com.ruoyi.common.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,19 +34,24 @@ import java.util.List;
  * <p>
  * 报价评估 服务实现类
  * </p>
- *
- * @author
- * @since 2024-02-04
+ * <p>
+ * \ * @since 2024-02-04
  */
 @Service
 public class QuotationEstimateServiceImpl extends ServiceImpl<QuotationEstimateMapper, QuotationEstimate> implements QuotationEstimateService {
 
+    private final QuotationProductBomService quotationProductBomService;
+    private final QuotationProductService quotationProductService;
+    private final ProductInfoService productInfoService;
+    private final SaleQuotationService saleQuotationService;
+
     @Autowired
-    private QuotationProductBomService quotationProductBomService;
-    @Autowired
-    private QuotationProductService quotationProductService;
-    @Autowired
-    private ProductInfoService productInfoService;
+    public QuotationEstimateServiceImpl(QuotationProductBomService quotationProductBomService, QuotationProductService quotationProductService, ProductInfoService productInfoService, SaleQuotationService saleQuotationService) {
+        this.quotationProductBomService = quotationProductBomService;
+        this.quotationProductService = quotationProductService;
+        this.productInfoService = productInfoService;
+        this.saleQuotationService = saleQuotationService;
+    }
 
     @Override
     public List<QuotationEstimateVo> detail(QuotationEstimateDto dto) {
@@ -132,7 +139,7 @@ public class QuotationEstimateServiceImpl extends ServiceImpl<QuotationEstimateM
         BigDecimal divide = amount.divide(quotationProduct.getQuantity(), 4, RoundingMode.HALF_UP);
         quotationProductService.update(q -> q
                 .eq(QuotationProduct::getId, quotationProductId)
-                .set(QuotationProduct::getPrice, divide)
+                .set(QuotationProduct::getProdPrice, divide)
                 .set(BasePo::getUpdateTime, new Date())
                 .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
         );
@@ -143,4 +150,15 @@ public class QuotationEstimateServiceImpl extends ServiceImpl<QuotationEstimateM
         this.saveOrUpdateBatch(quotationEstimateList);
     }
 
+    @Override
+    public void submitQuotation(Long id) {
+        saleQuotationService.update(q -> q
+                .eq(SaleQuotation::getId, id)
+                .set(SaleQuotation::getQuotationStatus, 2)
+                .set(SaleQuotation::getQuotationTime, new Date())
+                .set(SaleQuotation::getUpdateTime, new Date())
+                .set(SaleQuotation::getUpdateUser, SecurityUtils.getUserId())
+        );
+    }
+
 }

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

@@ -242,9 +242,10 @@ public class SaleQuotationServiceImpl extends ServiceImpl<SaleQuotationMapper, S
     @Override
     @DSTransactional
     public void edit(SaleQuotationDto saleQuotationDto) {
-        if (Objects.equals(saleQuotationDto.getQuotationStatus(), 2)) {
-            saleQuotationDto.setQuotationTime(new Date());
-        }
+//        if (Objects.equals(saleQuotationDto.getQuotationStatus(), 2)) {
+//            saleQuotationDto.setQuotationTime(new Date());
+//        }
+        saleQuotationDto.setConfirmStatus(2);
         saveOrEdit(saleQuotationDto);
     }
 
@@ -893,5 +894,4 @@ public class SaleQuotationServiceImpl extends ServiceImpl<SaleQuotationMapper, S
 //        saleQuotationVo.setBuyDetailedAddress(saleQuotationVo.getBuyAddress());
 //    }
 
-
 }