From 2dbef66ac71486aab54299460970ed920cf699c5 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 30 三月 2026 14:32:53 +0800
Subject: [PATCH] 增加各个接口uid码
---
src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java | 6 ++++--
src/main/java/com/ruoyi/production/dto/ProductOrderDto.java | 5 +++--
src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml | 2 +-
src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml | 8 +++++---
src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java | 4 ++++
src/main/java/com/ruoyi/quality/pojo/QualityInspect.java | 6 ++++--
src/main/java/com/ruoyi/production/dto/ProductProcessRouteItemDto.java | 3 +++
src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java | 2 ++
src/main/resources/mapper/quality/QualityInspectMapper.xml | 8 ++++++--
src/main/resources/mapper/production/ProductOrderMapper.xml | 1 +
src/main/java/com/ruoyi/basic/dto/ProductModelExportDto.java | 2 ++
src/main/resources/mapper/production/ProductProcessRouteItemMapper.xml | 1 +
src/main/resources/mapper/production/ProductionProductMainMapper.xml | 1 +
src/main/java/com/ruoyi/basic/pojo/ProductModel.java | 1 +
src/main/java/com/ruoyi/production/dto/ProductStructureDto.java | 3 +++
src/main/resources/mapper/production/ProductProcessRouteMapper.xml | 2 +-
16 files changed, 42 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/dto/ProductModelExportDto.java b/src/main/java/com/ruoyi/basic/dto/ProductModelExportDto.java
index c8c838a..0ee8d7b 100644
--- a/src/main/java/com/ruoyi/basic/dto/ProductModelExportDto.java
+++ b/src/main/java/com/ruoyi/basic/dto/ProductModelExportDto.java
@@ -21,4 +21,6 @@
@Excel(name = "鍗曚綅")
private String unit;
+ @Excel(name = "UID鐮�")
+ private String uidNo;
}
diff --git a/src/main/java/com/ruoyi/basic/pojo/ProductModel.java b/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
index 1705753..8a765d6 100644
--- a/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
+++ b/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
@@ -81,5 +81,6 @@
/**
* UID鐮�
*/
+ @Excel(name = "UID鐮�")
private String uidNo;
}
diff --git a/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
index 9382134..56c339b 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
@@ -114,6 +114,7 @@
List<ProductModel> waitToSaveList = new ArrayList<>();
int skipCount = 0;
+ System.out.println(productModelList);
for (int i = 0; i < productModelList.size(); i++) {
ProductModel item = productModelList.get(i);
int rowNum = i + 2;
@@ -124,6 +125,9 @@
if (StringUtils.isEmpty(item.getUnit())) {
return AjaxResult.error("绗� " + rowNum + " 琛屽鍏ュけ璐�: [鍗曚綅] 涓嶈兘涓虹┖");
}
+ if (StringUtils.isEmpty(item.getUidNo())) {
+ return AjaxResult.error("绗� " + rowNum + " 琛屽鍏ュけ璐�: [UID鐮乚 涓嶈兘涓虹┖");
+ }
// 鍘婚噸,濡傛灉宸插寘鍚鍨嬪彿,鍒欒烦杩�
if (existingModelNames.contains(item.getModel())) {
diff --git a/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java b/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java
index 59983cb..3a14d53 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java
@@ -37,6 +37,9 @@
@Excel(name = "瑙勬牸")
private String specificationModel;
+ @Excel(name = "UID鐮�")
+ private String uidNo;
+
@ApiModelProperty(value = "宸ヨ壓璺嚎缂栧彿")
@Excel(name = "宸ヨ壓璺嚎缂栧彿")
private String processRouteCode;
@@ -59,8 +62,6 @@
//鏄惁鍙戣揣(鍙拌处椤甸潰棰滆壊鎺у埗)
private Boolean isFh;
-
- private String uidNo;
@ApiModelProperty(value = "BOM缂栧彿id")
private Long bomId;
diff --git a/src/main/java/com/ruoyi/production/dto/ProductProcessRouteItemDto.java b/src/main/java/com/ruoyi/production/dto/ProductProcessRouteItemDto.java
index d6ec3f1..4f83560 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductProcessRouteItemDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductProcessRouteItemDto.java
@@ -19,6 +19,9 @@
@ApiModelProperty(value = "鍗曚綅")
private String unit;
+ @ApiModelProperty(value = "UID鐮�")
+ private String uidNo;
+
private Long productId;
private String productName;
diff --git a/src/main/java/com/ruoyi/production/dto/ProductStructureDto.java b/src/main/java/com/ruoyi/production/dto/ProductStructureDto.java
index ec43eef..f9fd491 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductStructureDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductStructureDto.java
@@ -23,6 +23,9 @@
private String model;
+ @ApiModelProperty(value = "UID鐮�")
+ private String uidNo;
+
@TableField(exist = false)
private String tempId;
diff --git a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
index 1e1948a..3fde6d7 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
@@ -40,6 +40,8 @@
//浜у搧瑙勬牸鍨嬪彿
@Excel(name = "浜у搧瑙勬牸鍨嬪彿")
private String productModelName;
+
+ @Excel(name = "UID鐮�")
private String uidNo;
//鍗曚綅
diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java b/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
index 3cc1e24..43d64c9 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
@@ -87,6 +87,10 @@
@Excel(name = "瑙勬牸鍨嬪彿")
private String model;
+ @TableField(exist = false)
+ @Excel(name = "UID鐮�")
+ private String uidNo;
+
/**
* 鍗曚綅
*/
@@ -161,6 +165,4 @@
private String BatchNo;
private BigDecimal inspectedQuantity;
private String manufacturingTeam;
- @TableField(exist = false)
- 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 d87a80f..c039f69 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java
@@ -74,6 +74,10 @@
@Excel(name = "瑙勬牸鍨嬪彿")
private String model;
+ @TableField(exist = false)
+ @Excel(name = "UID鐮�")
+ private String uidNo;
+
/**
* 鍗曚綅
*/
@@ -140,6 +144,4 @@
@ApiModelProperty("鏄惁涓嶅悎鏍煎鐞嗚嚜宸辨柊澧�")
@TableField(exist = false)
private Boolean method;
- @TableField(exist = false)
- private String uidNo;
}
diff --git a/src/main/resources/mapper/production/ProductOrderMapper.xml b/src/main/resources/mapper/production/ProductOrderMapper.xml
index b01fdad..49c8eb2 100644
--- a/src/main/resources/mapper/production/ProductOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductOrderMapper.xml
@@ -87,6 +87,7 @@
p.product_name,
pp.name as process_name,
pm.product_id,
+ pm.uid_no,
pm.model
from
product_structure ps
diff --git a/src/main/resources/mapper/production/ProductProcessRouteItemMapper.xml b/src/main/resources/mapper/production/ProductProcessRouteItemMapper.xml
index 302a0fb..ccef890 100644
--- a/src/main/resources/mapper/production/ProductProcessRouteItemMapper.xml
+++ b/src/main/resources/mapper/production/ProductProcessRouteItemMapper.xml
@@ -15,6 +15,7 @@
pp.name as process_name,
pm.model,
pm.unit,
+ pm.uid_no,
p.product_name,
case when pwo.complete_quantity>0 then true else false end as is_complete
from product_process_route_item ppri
diff --git a/src/main/resources/mapper/production/ProductProcessRouteMapper.xml b/src/main/resources/mapper/production/ProductProcessRouteMapper.xml
index dd4809f..0d31f8c 100644
--- a/src/main/resources/mapper/production/ProductProcessRouteMapper.xml
+++ b/src/main/resources/mapper/production/ProductProcessRouteMapper.xml
@@ -15,7 +15,7 @@
<result column="product_order_id" property="productOrderId"/>
</resultMap>
<select id="listMain" resultType="com.ruoyi.production.dto.ProcessRouteDto">
- select ppr.*, p.product_name, pm.product_id, pm.model, pb.bom_no
+ select ppr.*, p.product_name, pm.product_id, pm.model, pm.uid_no, pb.bom_no
from product_process_route ppr
left join product_bom pb on ppr.bom_id = pb.id
left join product_model pm on ppr.product_model_id = pm.id
diff --git a/src/main/resources/mapper/production/ProductionProductMainMapper.xml b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
index e4ac324..9cb3993 100644
--- a/src/main/resources/mapper/production/ProductionProductMainMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
@@ -71,6 +71,7 @@
p.product_name,
pm.model as product_model_name,
pm.unit,
+ pm.uid_no,
slpa.process,
ppo.quantity,
slpa.work_hours,
diff --git a/src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml b/src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml
index 74c4a17..85e670f 100644
--- a/src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml
+++ b/src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml
@@ -22,7 +22,7 @@
FROM
sales_ledger_production_accounting t4
LEFT JOIN sales_ledger T1 ON T1.id = t4.sales_ledger_id
- left join sales_ledger_product t3 on t4.sales_ledger_product_id = t3.id and slp.type = 1
+ left join sales_ledger_product t3 on t4.sales_ledger_product_id = t3.id and t3.type = 1
<where>
t3.type = 1
<if test="salesLedgerDto.schedulingUserName != null and salesLedgerDto.schedulingUserName != '' ">
diff --git a/src/main/resources/mapper/quality/QualityInspectMapper.xml b/src/main/resources/mapper/quality/QualityInspectMapper.xml
index 48fb369..27a69ce 100644
--- a/src/main/resources/mapper/quality/QualityInspectMapper.xml
+++ b/src/main/resources/mapper/quality/QualityInspectMapper.xml
@@ -4,6 +4,7 @@
<select id="qualityInspectListPage" resultType="com.ruoyi.quality.pojo.QualityInspect">
SELECT
qi.*,
+ pm.uid_no,
<choose>
<when test="qualityInspect.inspectType == 0">
pl.purchase_contract_number as purchase_contract_no
@@ -23,6 +24,7 @@
LEFT JOIN product_work_order pwo ON ppm.work_order_id = pwo.id
</otherwise>
</choose>
+ LEFT JOIN product_model pm on qi.product_model_id = pm.id
WHERE
inspect_type=#{qualityInspect.inspectType}
<if test="qualityInspect.supplier != null and qualityInspect.supplier != '' ">
@@ -48,8 +50,10 @@
<select id="qualityInspectExport" resultType="com.ruoyi.quality.pojo.QualityInspect">
SELECT
- *
- FROM quality_inspect
+ qi.*,
+ pm.uid_no
+ FROM quality_inspect qi
+ LEFT JOIN product_model pm on qi.product_model_id = pm.id
where
inspect_type=#{qualityInspect.inspectType}
<if test="qualityInspect.supplier != null and qualityInspect.supplier != '' ">
diff --git a/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml b/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
index 5f784b0..be7c7d1 100644
--- a/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
+++ b/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
@@ -26,7 +26,7 @@
ELSE false
END AS method
FROM quality_unqualified qu
- LEFT JOIN product_model pm ON qu.model = pm.id
+ LEFT JOIN product_model pm ON qu.model = pm.model
where
1=1
<if test="qualityUnqualified.inspectType != null ">
@@ -47,8 +47,10 @@
</select>
<select id="qualityUnqualifiedExport" resultType="com.ruoyi.quality.pojo.QualityUnqualified">
SELECT
- *
- FROM quality_unqualified
+ qu.*,
+ pm.uid_no
+ FROM quality_unqualified qu
+ LEFT JOIN product_model pm ON qu.model = pm.model
where
1=1
<if test="qualityUnqualified.inspectType != null">
--
Gitblit v1.9.3