From 62e9b968c6f6a624b8d633c3c9551f1c814ea6e4 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 01 四月 2026 16:31:23 +0800
Subject: [PATCH] 生产计划追踪进度2.0
---
src/main/java/com/ruoyi/productionPlan/mapper/ProductionPlanMapper.java | 1 +
src/main/java/com/ruoyi/productionPlan/service/ProductOrderPlanService.java | 2 +-
src/main/java/com/ruoyi/production/service/impl/ProductionRecordServiceImpl.java | 1 +
src/main/java/com/ruoyi/productionPlan/controller/TrackController.java | 4 ++--
src/main/java/com/ruoyi/productionPlan/dto/OrderDto.java | 3 ++-
src/main/resources/mapper/production/ProductionProductMainMapper.xml | 15 +++++++++++++++
src/main/resources/mapper/productionPlan/ProductionPlanMapper.xml | 14 ++++++++++++++
src/main/java/com/ruoyi/productionPlan/service/impl/ProductOrderPlanServiceImpl.java | 13 +++++--------
src/main/java/com/ruoyi/production/mapper/ProductionProductMainMapper.java | 2 ++
9 files changed, 43 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/mapper/ProductionProductMainMapper.java b/src/main/java/com/ruoyi/production/mapper/ProductionProductMainMapper.java
index e63e032..23c2800 100644
--- a/src/main/java/com/ruoyi/production/mapper/ProductionProductMainMapper.java
+++ b/src/main/java/com/ruoyi/production/mapper/ProductionProductMainMapper.java
@@ -33,4 +33,6 @@
IPage<ProductionProductMainDto> listProductionDetails(@Param("ew") SalesLedgerProductionAccountingDto salesLedgerProductionAccountingDto, Page page);
ArrayList<Long> listMain(List<Long> idList);
+
+ List<ProductionProductMainDto> selectProductionProductMainDto(@Param("productOrderId") Long productOrderId);
}
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionRecordServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionRecordServiceImpl.java
index 0b85bbf..22695ae 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionRecordServiceImpl.java
@@ -298,6 +298,7 @@
paramEntity.setParamFormat(orderParam.getParamFormat());
paramEntity.setValueMode(orderParam.getValueMode());
paramEntity.setUnit(orderParam.getUnit());
+ paramEntity.setStandardValue(orderParam.getStandardValue());
}
}
productionProductRouteItemParamService.save(paramEntity);
diff --git a/src/main/java/com/ruoyi/productionPlan/controller/TrackController.java b/src/main/java/com/ruoyi/productionPlan/controller/TrackController.java
index b11c29b..ce3450e 100644
--- a/src/main/java/com/ruoyi/productionPlan/controller/TrackController.java
+++ b/src/main/java/com/ruoyi/productionPlan/controller/TrackController.java
@@ -29,8 +29,8 @@
@GetMapping("/trackProgressByNo")
@ApiOperation("鏍规嵁涓荤敓浜ц鍒掓煡璇㈣繘搴�")
- public AjaxResult trackProgressByNo(String applyNo) {
- return AjaxResult.success(productOrderPlanService.trackProgressByNo(applyNo));
+ public AjaxResult trackProgressByNo(Long productionPlanId) {
+ return AjaxResult.success(productOrderPlanService.trackProgressByNo(productionPlanId));
}
}
diff --git a/src/main/java/com/ruoyi/productionPlan/dto/OrderDto.java b/src/main/java/com/ruoyi/productionPlan/dto/OrderDto.java
index 5f9a16b..6369179 100644
--- a/src/main/java/com/ruoyi/productionPlan/dto/OrderDto.java
+++ b/src/main/java/com/ruoyi/productionPlan/dto/OrderDto.java
@@ -1,6 +1,7 @@
package com.ruoyi.productionPlan.dto;
import com.ruoyi.production.dto.ProductOrderDto;
+import com.ruoyi.production.dto.ProductionProductMainDto;
import com.ruoyi.production.pojo.ProductionProductMain;
import io.swagger.annotations.ApiModel;
import lombok.Data;
@@ -15,5 +16,5 @@
private ProductOrderDto productOrderDto;
//鎶ュ伐璇︽儏
- private List<ProductionProductMain> productionProductMains;
+ private List<ProductionProductMainDto> productionProductMainDtos;
}
diff --git a/src/main/java/com/ruoyi/productionPlan/mapper/ProductionPlanMapper.java b/src/main/java/com/ruoyi/productionPlan/mapper/ProductionPlanMapper.java
index d0b9bd1..434be4d 100644
--- a/src/main/java/com/ruoyi/productionPlan/mapper/ProductionPlanMapper.java
+++ b/src/main/java/com/ruoyi/productionPlan/mapper/ProductionPlanMapper.java
@@ -28,4 +28,5 @@
List<ProductionPlanDto> selectWithMaterialByIds(@Param("ids") List<Long> ids);
+ ProductionPlanDto selectProductionPlanDtoById(@Param("productionPlanId") Long productionPlanId);
}
diff --git a/src/main/java/com/ruoyi/productionPlan/service/ProductOrderPlanService.java b/src/main/java/com/ruoyi/productionPlan/service/ProductOrderPlanService.java
index 94a8d10..755340a 100644
--- a/src/main/java/com/ruoyi/productionPlan/service/ProductOrderPlanService.java
+++ b/src/main/java/com/ruoyi/productionPlan/service/ProductOrderPlanService.java
@@ -14,5 +14,5 @@
*/
public interface ProductOrderPlanService extends IService<ProductOrderPlan> {
- TrackDto trackProgressByNo(String applyNo);
+ TrackDto trackProgressByNo(Long productionPlanId);
}
diff --git a/src/main/java/com/ruoyi/productionPlan/service/impl/ProductOrderPlanServiceImpl.java b/src/main/java/com/ruoyi/productionPlan/service/impl/ProductOrderPlanServiceImpl.java
index 7325c59..92398f9 100644
--- a/src/main/java/com/ruoyi/productionPlan/service/impl/ProductOrderPlanServiceImpl.java
+++ b/src/main/java/com/ruoyi/productionPlan/service/impl/ProductOrderPlanServiceImpl.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.production.dto.ProductOrderDto;
+import com.ruoyi.production.dto.ProductionProductMainDto;
import com.ruoyi.production.mapper.ProductOrderMapper;
import com.ruoyi.production.mapper.ProductionOrderRouteMapper;
import com.ruoyi.production.mapper.ProductionProductMainMapper;
@@ -46,12 +47,10 @@
private ProductionProductMainMapper productionProductMainMapper;
@Override
- public TrackDto trackProgressByNo(String applyNo) {
+ public TrackDto trackProgressByNo(Long productionPlanId) {
TrackDto trackDto = new TrackDto();
//鐢熶骇璁″垝鏁版嵁
- ProductionPlanDto planDto = new ProductionPlanDto();
- planDto.setApplyNo(applyNo);
- ProductionPlanDto productionPlanDto = productionPlanMapper.listPage(new Page(1, -1), planDto).getRecords().get(0);
+ ProductionPlanDto productionPlanDto=productionPlanMapper.selectProductionPlanDtoById(productionPlanId);
trackDto.setProductionPlanDto(productionPlanDto);
//鐢熶骇璁㈠崟鏁版嵁
List<OrderDto> orderDtos = listByApplyNo(productionPlanDto);
@@ -73,10 +72,8 @@
ProductOrderDto productOrderDto=productOrderMapper.getProductOrderDto(productOrderPlan.getProductOrderId());
orderDto.setProductOrderDto(productOrderDto);
//鎶ュ伐璇︽儏
- List<ProductionProductMain> productionProductMains = productionProductMainMapper.selectList(Wrappers.<ProductionProductMain>lambdaQuery()
- .eq(ProductionProductMain::getProductOrderId, productOrderPlan.getProductOrderId())
- .orderByAsc(ProductionProductMain::getReportingTime));
- orderDto.setProductionProductMains(productionProductMains);
+ List<ProductionProductMainDto> productionProductMainDtos = productionProductMainMapper.selectProductionProductMainDto(productOrderPlan.getProductOrderId());
+ orderDto.setProductionProductMainDtos(productionProductMainDtos);
orderDtos.add(orderDto);
});
return orderDtos;
diff --git a/src/main/resources/mapper/production/ProductionProductMainMapper.xml b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
index 798c2b9..4096bad 100644
--- a/src/main/resources/mapper/production/ProductionProductMainMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
@@ -106,6 +106,21 @@
</if>
</where>
</select>
+ <select id="selectProductionProductMainDto"
+ resultType="com.ruoyi.production.dto.ProductionProductMainDto">
+ SELECT ppm.id,
+ ppm.product_no,
+ ppm.post_name,
+ ppm.schedule,
+ ppm.reporting_time,
+ ppo.quantity,
+ ppo.scrap_qty,
+ ppo.total_quantity
+ FROM production_product_main ppm
+ left join production_product_output ppo on ppm.id = ppo.product_main_id
+ WHERE product_order_id=#{productOrderId}
+ order by reporting_time
+ </select>
<delete id="deleteByWorkOrderIds" parameterType="java.util.List">
DELETE FROM production_product_main
diff --git a/src/main/resources/mapper/productionPlan/ProductionPlanMapper.xml b/src/main/resources/mapper/productionPlan/ProductionPlanMapper.xml
index f7a3f17..e86b7d2 100644
--- a/src/main/resources/mapper/productionPlan/ProductionPlanMapper.xml
+++ b/src/main/resources/mapper/productionPlan/ProductionPlanMapper.xml
@@ -128,4 +128,18 @@
</foreach>
ORDER BY pp.id ASC
</select>
+ <select id="selectProductionPlanDtoById"
+ resultType="com.ruoyi.productionPlan.dto.ProductionPlanDto">
+ SELECT
+ pp.*,
+ pms.material_code AS materialCode,
+ pms.model,
+ pms.product_id AS productMaterialId,
+ pm.product_name AS productName,
+ pm.unit
+ FROM production_plan pp
+ left join product_material_sku pms on pp.product_material_sku_id = pms.id
+ left join product_material pm on pms.product_id = pm.id
+ WHERE pp.id = #{productionPlanId}
+ </select>
</mapper>
--
Gitblit v1.9.3