From 253c24495ebc405492a40123bf42c74670979a7d Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期三, 25 三月 2026 15:15:36 +0800
Subject: [PATCH] feat(production): 添加uidNo字段并优化API路径配置
---
src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java | 16 +++++++
src/main/resources/mapper/production/ProductWorkOrderMapper.xml | 1
src/main/java/com/ruoyi/stock/dto/StockOutRecordDto.java | 1
src/main/resources/mapper/production/ProductionProductInputMapper.xml | 3 +
src/main/java/com/ruoyi/production/dto/ProductOrderDto.java | 2 +
src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml | 1
src/main/java/com/ruoyi/production/controller/ProductionProductInputController.java | 4 +-
src/main/java/com/ruoyi/production/controller/ProcessRouteController.java | 13 ++----
src/main/java/com/ruoyi/production/dto/ProcessRouteDto.java | 1
src/main/resources/mapper/production/ProcessRouteMapper.xml | 2
src/main/resources/mapper/production/ProductOrderMapper.xml | 1
src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java | 5 +-
src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java | 1
src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java | 1
src/main/resources/mapper/stock/StockOutRecordMapper.xml | 1
src/main/resources/mapper/production/ProductBomMapper.xml | 3 +
src/main/resources/mapper/stock/StockInventoryMapper.xml | 2 +
src/main/resources/mapper/stock/StockInRecordMapper.xml | 1
src/main/java/com/ruoyi/quality/pojo/QualityInspect.java | 1
src/main/java/com/ruoyi/stock/controller/StockInventoryController.java | 6 +-
src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java | 1
src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java | 1
src/main/java/com/ruoyi/production/dto/ProductBomDto.java | 3 -
src/main/java/com/ruoyi/production/dto/ProductionProductInputDto.java | 1
src/main/resources/mapper/production/ProductionProductMainMapper.xml | 1
25 files changed, 51 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProcessRouteController.java b/src/main/java/com/ruoyi/production/controller/ProcessRouteController.java
index 50ac4a8..5ed3e94 100644
--- a/src/main/java/com/ruoyi/production/controller/ProcessRouteController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProcessRouteController.java
@@ -1,12 +1,9 @@
package com.ruoyi.production.controller;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.production.dto.ProcessRouteDto;
import com.ruoyi.production.pojo.ProcessRoute;
-import com.ruoyi.production.pojo.ProcessRouteItem;
-import com.ruoyi.production.service.ProcessRouteItemService;
import com.ruoyi.production.service.ProcessRouteService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -16,30 +13,30 @@
import java.util.Arrays;
@RestController
-@RequestMapping("processRoute")
+@RequestMapping("/processRoute")
@Api(tags = "宸ヨ壓璺嚎")
public class ProcessRouteController {
@Autowired
private ProcessRouteService processRouteService;
- @GetMapping("page")
+ @GetMapping("/page")
@ApiOperation("鍒嗛〉鏌ヨ")
public R page(Page<ProcessRouteDto> page, ProcessRouteDto processRouteDto) {
return R.ok(processRouteService.pageProcessRouteDto(page, processRouteDto));
}
- @ApiOperation("鏂板宸ヨ壓璺嚎")
+ @ApiOperation("/鏂板宸ヨ壓璺嚎")
@PostMapping ()
public R add(@RequestBody ProcessRoute processRoute) {
return R.ok(processRouteService.saveProcessRoute(processRoute));
}
- @ApiOperation("淇敼宸ヨ壓璺嚎")
+ @ApiOperation("/淇敼宸ヨ壓璺嚎")
@PutMapping ()
public R update(@RequestBody ProcessRoute processRoute) {
return R.ok(processRouteService.updateById(processRoute));
}
- @ApiOperation("鍒犻櫎宸ヨ壓璺嚎")
+ @ApiOperation("/鍒犻櫎宸ヨ壓璺嚎")
@DeleteMapping("/{ids}")
public R delete(@PathVariable("ids") Long[] ids) {
return R.ok(processRouteService.batchDelete(Arrays.asList(ids)));
diff --git a/src/main/java/com/ruoyi/production/controller/ProductionProductInputController.java b/src/main/java/com/ruoyi/production/controller/ProductionProductInputController.java
index b4bf7dc..f5e5ef5 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductionProductInputController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductionProductInputController.java
@@ -10,7 +10,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-@RequestMapping("productionProductInput")
+@RequestMapping("/productionProductInput")
@RestController
@Api(value = "鐢熶骇鎶曞叆")
public class ProductionProductInputController {
@@ -18,7 +18,7 @@
@Autowired
private ProductionProductInputService productionProductInputService;
- @GetMapping("listPage")
+ @GetMapping("/listPage")
public R page(Page<ProductionProductInputDto> page, ProductionProductInputDto productionProductInputDto) {
return R.ok(productionProductInputService.listPageProductionProductInputDto(page, productionProductInputDto));
}
diff --git a/src/main/java/com/ruoyi/production/dto/ProcessRouteDto.java b/src/main/java/com/ruoyi/production/dto/ProcessRouteDto.java
index 232a00c..ef57e04 100644
--- a/src/main/java/com/ruoyi/production/dto/ProcessRouteDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProcessRouteDto.java
@@ -15,4 +15,5 @@
private String model;
private String bomNo;
+ private String uidNo;
}
diff --git a/src/main/java/com/ruoyi/production/dto/ProductBomDto.java b/src/main/java/com/ruoyi/production/dto/ProductBomDto.java
index ab695ca..224baa2 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductBomDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductBomDto.java
@@ -3,8 +3,6 @@
import com.ruoyi.production.pojo.ProductBom;
import lombok.Data;
-import java.util.List;
-
//鍒嗛〉鏌ヨ鍥炴樉鏁版嵁
@Data
public class ProductBomDto extends ProductBom {
@@ -15,4 +13,5 @@
//浜у搧瑙勬牸鍨嬪彿
private String productModelName;
+ private String uidNo;
}
diff --git a/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java b/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java
index dc2185a..78d0a83 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java
@@ -57,4 +57,6 @@
//鏄惁鍙戣揣(鍙拌处椤甸潰棰滆壊鎺у埗)
private Boolean isFh;
+
+ private String uidNo;
}
diff --git a/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java b/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
index 6e2ca95..73920e9 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
@@ -1,14 +1,11 @@
package com.ruoyi.production.dto;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.production.pojo.ProductWorkOrder;
-import com.ruoyi.production.pojo.ProductWorkOrderFile;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
-import java.util.List;
@EqualsAndHashCode(callSuper = true)
@Data
@@ -43,4 +40,6 @@
@ApiModelProperty(value = "宸ュ崟绫诲瀷 姝ｅ父 /杩斿伐杩斾慨")
private String workOrderType;
+
+ private String uidNo;
}
diff --git a/src/main/java/com/ruoyi/production/dto/ProductionProductInputDto.java b/src/main/java/com/ruoyi/production/dto/ProductionProductInputDto.java
index 13bb4a3..85e6b93 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductionProductInputDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductionProductInputDto.java
@@ -17,4 +17,5 @@
@ApiModelProperty(value = "鍗曚綅")
private String unit;
+ private String uidNo;
}
diff --git a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
index 3673dbb..facf562 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
@@ -40,6 +40,7 @@
//浜у搧瑙勬牸鍨嬪彿
@Excel(name = "浜у搧瑙勬牸鍨嬪彿")
private String productModelName;
+ private String uidNo;
//鍗曚綅
@Excel(name = "鍗曚綅")
diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java b/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
index 495f298..846cf9b 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
@@ -161,4 +161,5 @@
private String BatchNo;
private BigDecimal inspectedQuantity;
private String manufacturingTeam;
+ private String uidNO;
}
diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java b/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java
index d2f8e88..03deee4 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java
@@ -140,4 +140,5 @@
@ApiModelProperty("鏄惁涓嶅悎鏍煎鐞嗚嚜宸辨柊澧�")
@TableField(exist = false)
private Boolean method;
+ private String uidNo;
}
diff --git a/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java b/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
index 8a1e066..1b9b598 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
@@ -8,8 +8,9 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.deepoove.poi.XWPFTemplate;
import com.deepoove.poi.config.Configure;
+import com.ruoyi.basic.mapper.ProductModelMapper;
+import com.ruoyi.basic.pojo.ProductModel;
import com.ruoyi.common.enums.StockInQualifiedRecordTypeEnum;
-import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum;
import com.ruoyi.common.utils.HackLoopTableRenderPolicy;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.procurementrecord.service.ProcurementRecordService;
@@ -54,6 +55,8 @@
private SalesLedgerProductMapper salesLedgerProductMapper;
private ProcurementRecordService procurementRecordService;
+
+ private ProductModelMapper productModelMapper;
@Override
public int add(QualityInspectDto qualityInspectDto) {
@@ -172,6 +175,17 @@
@Override
public IPage<QualityInspect> qualityInspectListPage(Page page, QualityInspect qualityInspect) {
+ IPage<QualityInspect> qualityInspectIPage = qualityInspectMapper.qualityInspectListPage(page, qualityInspect);
+ List<QualityInspect> records = qualityInspectIPage.getRecords();
+ for (int i = 0; i < records.size(); i++) {
+ QualityInspect item = records.get(i);
+ ProductModel productModel = productModelMapper.selectById(item.getProductModelId());
+ if (productModel == null) {
+ continue;
+ }
+ item.setUidNO(productModel.getUidNo());
+ }
+
return qualityInspectMapper.qualityInspectListPage(page, qualityInspect);
}
diff --git a/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java b/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java
index 70f638e..f878bdb 100644
--- a/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java
+++ b/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java
@@ -62,7 +62,7 @@
}
- @PostMapping("importStockInventory")
+ @PostMapping("/importStockInventory")
@ApiOperation("瀵煎叆搴撳瓨")
public R importStockInventory(MultipartFile file) {
return stockInventoryService.importStockInventory(file);
@@ -82,13 +82,13 @@
stockInventoryService.exportStockInventory(response, stockInventoryDto);
}
- @GetMapping("stockInventoryPage")
+ @GetMapping("/stockInventoryPage")
@ApiOperation("搴撳瓨鎶ヨ〃鏌ヨ")
public R stockInventoryPage(Page page, StockInventoryDto stockInventoryDto) {
return R.ok(stockInventoryService.stockInventoryPage(stockInventoryDto,page));
}
- @GetMapping("stockInAndOutRecord")
+ @GetMapping("/stockInAndOutRecord")
@ApiOperation("缁熻鍚勪釜浜у搧鐨勫叆搴撳拰鍑哄簱璁板綍")
public R stockInAndOutRecord(StockInventoryDto stockInventoryDto,Page page) {
return R.ok(stockInventoryService.stockInAndOutRecord(stockInventoryDto,page));
diff --git a/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java b/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java
index 9f47fd6..4427f91 100644
--- a/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java
@@ -18,6 +18,7 @@
* 浜у搧鍗曚綅
*/
private String unit;
+ private String uidNo;
private String timeStr;
diff --git a/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java b/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
index 125b52b..9c7c7bc 100644
--- a/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
@@ -13,6 +13,7 @@
private String productName;
private String model;
+ private String uidNo;
private String unit;
diff --git a/src/main/java/com/ruoyi/stock/dto/StockOutRecordDto.java b/src/main/java/com/ruoyi/stock/dto/StockOutRecordDto.java
index 3e3abf9..3a17134 100644
--- a/src/main/java/com/ruoyi/stock/dto/StockOutRecordDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/StockOutRecordDto.java
@@ -17,6 +17,7 @@
* 浜у搧瑙勬牸
*/
private String model;
+ private String uidNo;
/**
* 浜у搧鍗曚綅
*/
diff --git a/src/main/resources/mapper/production/ProcessRouteMapper.xml b/src/main/resources/mapper/production/ProcessRouteMapper.xml
index 51c11b4..15d0a69 100644
--- a/src/main/resources/mapper/production/ProcessRouteMapper.xml
+++ b/src/main/resources/mapper/production/ProcessRouteMapper.xml
@@ -13,7 +13,7 @@
</resultMap>
<select id="pageProcessRouteDto" resultType="com.ruoyi.production.dto.ProcessRouteDto">
- select ps.*, p.product_name,pm.product_id,pm.model,pb.bom_no
+ select ps.*, p.product_name,pm.product_id,pm.model,pb.bom_no, pm.uid_no
from process_route ps
left join product_bom pb on ps.bom_id = pb.id
left join product_model pm on ps.product_model_id = pm.id
diff --git a/src/main/resources/mapper/production/ProductBomMapper.xml b/src/main/resources/mapper/production/ProductBomMapper.xml
index ec06cd3..18e2ed3 100644
--- a/src/main/resources/mapper/production/ProductBomMapper.xml
+++ b/src/main/resources/mapper/production/ProductBomMapper.xml
@@ -18,7 +18,8 @@
<select id="listPage" resultType="com.ruoyi.production.dto.ProductBomDto">
select * from (select pb.*,
pm.model productModelName,
- p.product_name productName
+ p.product_name productName,
+ pm.uid_no
from product_bom pb
left join product_model pm on pb.product_model_id = pm.id
left join product p on pm.product_id = p.id)A
diff --git a/src/main/resources/mapper/production/ProductOrderMapper.xml b/src/main/resources/mapper/production/ProductOrderMapper.xml
index f1750da..5052055 100644
--- a/src/main/resources/mapper/production/ProductOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductOrderMapper.xml
@@ -22,6 +22,7 @@
p.product_name as product_category,
pm.model as specification_model,
pm.unit,
+ pm.uid_no,
ppr.process_route_code,
pb.bom_no,
ROUND(po.complete_quantity / po.quantity * 100, 2) AS completionStatus,
diff --git a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
index 14b883e..2f9ceaf 100644
--- a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
@@ -24,6 +24,7 @@
pp.NAME as processName,
pm.model,
pm.unit,
+ pm.uid_no,
p.product_name AS productName,
po.nps_no AS productOrderNpsNo,
ROUND(pwo.complete_quantity / pwo.plan_quantity * 100, 2) AS completionStatus,
diff --git a/src/main/resources/mapper/production/ProductionProductInputMapper.xml b/src/main/resources/mapper/production/ProductionProductInputMapper.xml
index 65e2b96..0094e33 100644
--- a/src/main/resources/mapper/production/ProductionProductInputMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductInputMapper.xml
@@ -15,7 +15,8 @@
pm.model as model,
ppm.product_no as productNo,
p.product_name,
- pm.unit
+ pm.unit,
+ pm.uid_no
from
production_product_input ppi
left join production_product_main ppm on ppm.id = ppi.product_main_id
diff --git a/src/main/resources/mapper/production/ProductionProductMainMapper.xml b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
index 256a984..4708e15 100644
--- a/src/main/resources/mapper/production/ProductionProductMainMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
@@ -24,6 +24,7 @@
ppo.quantity,
ppo.scrap_qty,
pm.unit,
+ pm.uid_no,
sl.sales_contract_no salesContractNo
from
production_product_main ppm
diff --git a/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml b/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
index 5bda4f6..5f784b0 100644
--- a/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
+++ b/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
@@ -16,6 +16,7 @@
qu.deal_result,
qu.deal_name,
qu.deal_time,
+ pm.uid_no,
CASE
WHEN qu.model = pm.id THEN pm.model
ELSE qu.model
diff --git a/src/main/resources/mapper/stock/StockInRecordMapper.xml b/src/main/resources/mapper/stock/StockInRecordMapper.xml
index d5c3f38..21ae17e 100644
--- a/src/main/resources/mapper/stock/StockInRecordMapper.xml
+++ b/src/main/resources/mapper/stock/StockInRecordMapper.xml
@@ -8,6 +8,7 @@
p.product_name as product_name,
pm.model,
pm.unit,
+ pm.uid_no
u.nick_name as createBy
FROM stock_in_record as sir
LEFT JOIN product_model as pm on sir.product_model_id = pm.id
diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index 9db56f9..9013be3 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -64,6 +64,7 @@
pm.model,
si.remark,
pm.unit,
+ pm.uidNo,
p.product_name
from stock_inventory si
left join product_model pm on si.product_model_id = pm.id
@@ -94,6 +95,7 @@
select sir.*,si.qualitity as current_stock,
pm.model,
pm.unit,
+ pm.uidNo,
p.product_name,
su.nick_name as create_by
from
diff --git a/src/main/resources/mapper/stock/StockOutRecordMapper.xml b/src/main/resources/mapper/stock/StockOutRecordMapper.xml
index a441de9..5ab2916 100644
--- a/src/main/resources/mapper/stock/StockOutRecordMapper.xml
+++ b/src/main/resources/mapper/stock/StockOutRecordMapper.xml
@@ -23,6 +23,7 @@
p.product_name as productName,
pm.model,
pm.unit,
+ pm.uidNo,
u.nick_name as createBy
FROM stock_out_record as sor
LEFT JOIN product_model as pm on sor.product_model_id = pm.id
--
Gitblit v1.9.3