问题处理

hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProductionReportingServiceImpl.java

@@ -57,6 +57,8 @@ public class ProductionReportingServiceImpl extends ServiceImpl<ProductionReport
     private TechnologyProcessLineService technologyProcessLineService;
     @Autowired
     private ProduceOrderService produceOrderService;
+    @Autowired
+    private ProductionSchedulingService productionSchedulingService;
 
 
     @Override
@@ -160,6 +162,16 @@ public class ProductionReportingServiceImpl extends ServiceImpl<ProductionReport
                 .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
         );
 
+        //更新排程信息
+        productionSchedulingService.update(q -> q
+                .eq(ProductionScheduling::getTaskId, productionTaskId)
+                .eq(ProductionScheduling::getProcessesId, productionProcessesId)
+                .setSql("finish_quantity = finish_quantity + " + dto.getQuantity())
+                .set(BasePo::getUpdateTime, newDateTime)
+                .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
+        );
+
+
         //更新完工数量
         ProductionOrderDetail productionOrderDetail = produceOrderDetailService.getById(productionTaskId);
         Assert.notEmpty(productionOrderDetail, "查询不到生产任务信息！");

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

@@ -37,6 +37,7 @@ public class DiscussPriceFlow extends FlowDelegate {
         List<QuotationProductDto> quotationProductList = saleQuotationDto.getQuotationProductList();
         for (QuotationProductDto quotationProductDto : quotationProductList) {
             //复制议价格信息
+            quotationProductDto.setPrice(null);
             quotationProductDto.setDiscussPrice(quotationProductDto.getPrice());
         }