From 367402f05144b484390568227d3a6a1d40778a14 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 03 二月 2026 10:21:27 +0800
Subject: [PATCH] 代码注释完善
---
src/main/java/com/ruoyi/production/mapper/ProductOrderMapper.java | 4 ----
src/main/resources/mapper/production/ProductOrderMapper.xml | 11 -----------
src/main/java/com/ruoyi/production/dto/ProductOrderDto.java | 1 +
src/main/java/com/ruoyi/production/pojo/ProductProcess.java | 3 ++-
src/main/java/com/ruoyi/sales/pojo/SalesLedger.java | 1 +
src/main/java/com/ruoyi/production/pojo/ProductOrder.java | 5 +++--
6 files changed, 7 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java b/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java
index 84539b0..1a99346 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java
@@ -55,5 +55,6 @@
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate deliveryDate;
+ //鏄惁鍙戣揣(鍙拌处椤甸潰棰滆壊鎺у埗)
private Boolean isFh;
}
diff --git a/src/main/java/com/ruoyi/production/mapper/ProductOrderMapper.java b/src/main/java/com/ruoyi/production/mapper/ProductOrderMapper.java
index ad76d3f..72aa6cd 100644
--- a/src/main/java/com/ruoyi/production/mapper/ProductOrderMapper.java
+++ b/src/main/java/com/ruoyi/production/mapper/ProductOrderMapper.java
@@ -17,10 +17,6 @@
public interface ProductOrderMapper extends BaseMapper<ProductOrder> {
IPage<ProductOrderDto> pageProductOrder(Page page, @Param("c") ProductOrderDto productOrder);
- /**
- * 鏍规嵁璁㈠崟ID鏌ヨ宸ュ崟鎶ュ伐
- */
- ProductOrderDto productMainByOrderId(@Param("c") ProductOrder productOrder);
List<ProcessRoute> listProcessRoute(@Param("productModelId") Long productModelId);
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductOrder.java b/src/main/java/com/ruoyi/production/pojo/ProductOrder.java
index 70c82d8..5286cd3 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductOrder.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductOrder.java
@@ -30,12 +30,13 @@
/**
* 閿�鍞彴璐︿骇鍝乮d(sales_ledger_product)
*/
+ @ApiModelProperty(value = "閿�鍞彴璐︿骇鍝乮d")
private Long saleLedgerProductId;
/**
- * 閿�鍞彴璐︿骇鍝乮d(sales_ledger_product)
+ * 浜у搧瑙勬牸id
*/
- @ApiModelProperty(value = "閿�鍞彴璐︿骇鍝乮d")
+ @ApiModelProperty(value = "浜у搧瑙勬牸id")
private Long productModelId;
/**
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductProcess.java b/src/main/java/com/ruoyi/production/pojo/ProductProcess.java
index 5903783..1462c49 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductProcess.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductProcess.java
@@ -5,6 +5,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -70,7 +71,7 @@
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
-
+ @ApiModelProperty(value ="鏄惁璐ㄦ")
private Boolean isQuality;
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
index 695a17c..35ac5f5 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
@@ -141,6 +141,7 @@
private Integer deliveryDaysDiff;
@TableField(exist = false)
+ //鏄惁鍙戣揣(鍙拌处椤甸潰棰滆壊鎺у埗)
private Boolean isFh;
}
diff --git a/src/main/resources/mapper/production/ProductOrderMapper.xml b/src/main/resources/mapper/production/ProductOrderMapper.xml
index 4837e64..2581105 100644
--- a/src/main/resources/mapper/production/ProductOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductOrderMapper.xml
@@ -62,17 +62,6 @@
</if>
</where>
</select>
- <select id="productMainByOrderId" resultType="com.ruoyi.production.dto.ProductOrderDto">
- select po.*,
- pwo.work_order_no,
- pwo.report_work,
- pwo.status,
- pwo.quantity,
- pwo.plan_quantity
- from product_order po
- left join product_work_order pwo on po.id = pwo.product_order_id
- where po.id = #{c.id}
- </select>
<select id="listProcessRoute" resultType="com.ruoyi.production.pojo.ProcessRoute">
select pr.*
from process_route pr
--
Gitblit v1.9.3