From bde13a9d1a0c62a3d920ac638ad13ee3583f284f Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期四, 16 四月 2026 16:55:47 +0800
Subject: [PATCH] feat(productWorkOrder): 新增产品工单相关模块及工单流转卡导出功能
---
src/main/java/com/ruoyi/production/mapper/ProductWorkOrderMapper.java | 2 --
src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java | 10 ++++++----
src/main/java/com/ruoyi/production/controller/ProductWorkOrderController.java | 2 +-
src/main/resources/mapper/stock/StockInventoryMapper.xml | 30 +++++++++++++++++++++++++++++-
src/main/java/com/ruoyi/production/service/ProductWorkOrderService.java | 3 +++
5 files changed, 39 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductWorkOrderController.java b/src/main/java/com/ruoyi/production/controller/ProductWorkOrderController.java
index 029e457..54198a2 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductWorkOrderController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductWorkOrderController.java
@@ -44,7 +44,7 @@
@ApiOperation("pda鏍规嵁浜岀淮鐮佺殑宸ュ崟id鏌ヨ鏁版嵁")
@GetMapping("/getProductWorkOrderById")
public R getProductWorkOrderById(Long id) {
- return R.ok(productWorkOrderservice.getById(id));
+ return R.ok(productWorkOrderservice.getProductWorkOrderById(id));
}
/**
diff --git a/src/main/java/com/ruoyi/production/mapper/ProductWorkOrderMapper.java b/src/main/java/com/ruoyi/production/mapper/ProductWorkOrderMapper.java
index d637f7d..bf46540 100644
--- a/src/main/java/com/ruoyi/production/mapper/ProductWorkOrderMapper.java
+++ b/src/main/java/com/ruoyi/production/mapper/ProductWorkOrderMapper.java
@@ -1,6 +1,5 @@
package com.ruoyi.production.mapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -10,7 +9,6 @@
import org.apache.ibatis.annotations.Param;
import java.util.List;
-import java.util.Map;
@Mapper
public interface ProductWorkOrderMapper extends BaseMapper<ProductWorkOrder> {
diff --git a/src/main/java/com/ruoyi/production/service/ProductWorkOrderService.java b/src/main/java/com/ruoyi/production/service/ProductWorkOrderService.java
index 8ef28e6..b092a40 100644
--- a/src/main/java/com/ruoyi/production/service/ProductWorkOrderService.java
+++ b/src/main/java/com/ruoyi/production/service/ProductWorkOrderService.java
@@ -7,6 +7,7 @@
import com.ruoyi.production.pojo.ProductWorkOrder;
import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.NotNull;
public interface ProductWorkOrderService extends IService<ProductWorkOrder>{
@@ -15,4 +16,6 @@
int updateProductWorkOrder(ProductWorkOrderDto productWorkOrderDto);
void down(HttpServletResponse response, ProductWorkOrder productWorkOrder);
+
+ ProductWorkOrderDto getProductWorkOrderById(@NotNull Long id);
}
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java
index b0f663d..2c355fc 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java
@@ -7,10 +7,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.deepoove.poi.XWPFTemplate;
-import com.deepoove.poi.config.Configure;
import com.deepoove.poi.data.PictureRenderData;
import com.deepoove.poi.data.Pictures;
-import com.ruoyi.common.utils.HackLoopTableRenderPolicy;
import com.ruoyi.common.utils.MatrixToImageWriter;
import com.ruoyi.production.dto.ProductWorkOrderDto;
import com.ruoyi.production.mapper.ProductWorkOrderFileMapper;
@@ -18,8 +16,6 @@
import com.ruoyi.production.pojo.ProductWorkOrder;
import com.ruoyi.production.pojo.ProductWorkOrderFile;
import com.ruoyi.production.service.ProductWorkOrderService;
-import com.ruoyi.quality.pojo.QualityInspectParam;
-import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -114,4 +110,10 @@
}
}
+ @Override
+ public ProductWorkOrderDto getProductWorkOrderById(Long id) {
+ return productWorkOrdermapper.getProductWorkOrderFlowCard(id);
+ }
+
+
}
diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index 5be7130..ef3813b 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -114,6 +114,25 @@
</if>
</select>
<select id="listStockInventoryExportData" resultType="com.ruoyi.stock.execl.StockInventoryExportData">
+ WITH RECURSIVE cte AS (
+ SELECT id, product_name, parent_id, id AS current_id
+ FROM product
+
+ UNION ALL
+
+ SELECT c.id, c.product_name, p.parent_id, p.id
+ FROM cte c
+ JOIN product p ON c.parent_id = p.id
+ ),
+ root_map AS (
+ SELECT
+ c.id,
+ p.id AS root_id,
+ p.product_name AS root_name
+ FROM cte c
+ JOIN product p ON c.current_id = p.id
+ WHERE p.parent_id IS NULL
+ )
select si.qualitity,
pm.model,
pm.unit,
@@ -121,14 +140,23 @@
coalesce(si.warn_num, 0) as warn_num,
coalesce(si.locked_quantity, 0) as locked_quantity,
si.remark,
- si.update_time
+ si.update_time,
+ si.warehouse_code,
+ si.warehouse_name,
+ pm.sub_unit,
+ si.sub_qualitity,
+ si.product_code
from stock_inventory si
left join product_model pm on si.product_model_id = pm.id
left join product p on pm.product_id = p.id
+ left join root_map rm ON pm.product_id = rm.id
where 1 = 1
<if test="ew.productName != null and ew.productName !=''">
and p.product_name like concat('%',#{ew.productName},'%')
</if>
+ <if test="ew.rootName != null and ew.rootName != '' ">
+ and rm.root_name = #{ew.rootName}
+ </if>
</select>
<select id="stockInventoryPage" resultType="com.ruoyi.stock.dto.StockInRecordDto">
select sir.*,si.qualitity as current_stock,
--
Gitblit v1.9.3