From 6f4d26bba06a096eac4ebdfcec017b3d327551fc Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 25 三月 2026 14:30:03 +0800
Subject: [PATCH] feat:1.生产报工（增加设备选择和展示） 2.报工增加生产记录参数
---
src/main/resources/mapper/production/ProductWorkOrderMapper.xml | 1 +
src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java | 3 +++
src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java | 3 +++
src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java | 2 ++
src/main/resources/mapper/production/ProductionProductMainMapper.xml | 1 +
src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java | 5 ++---
src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java | 5 +++++
7 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java b/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
index 6e2ca95..2dadd14 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
@@ -26,6 +23,8 @@
@ApiModelProperty(value = "宸ュ簭")
private String processName;
+ private Long processId;
+
//鍗曚綅
@ApiModelProperty(value = "鍗曚綅")
private String unit;
diff --git a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
index 3673dbb..8f8d99c 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
@@ -64,4 +64,9 @@
private BigDecimal totalInvestment;
private BigDecimal inspectedQuantity;
+
+ // 鍏朵粬鏁版嵁
+ private String otherData;
+ // 宸ュ簭id
+ private Long processId;
}
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java b/src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java
index 2064e04..af70d0c 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java
@@ -51,4 +51,7 @@
@ApiModelProperty(value = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @ApiModelProperty(value = "璁惧id")
+ private Long deviceId;
}
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java b/src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java
index f78df35..739ca15 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java
@@ -33,4 +33,7 @@
@ApiModelProperty(value = "鎶ュ簾鏁伴噺")
private BigDecimal scrapQty;
+
+ @ApiModelProperty(value = "鍏朵粬鏁版嵁")
+ private String otherData;
}
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
index c7fa600..f499e2f 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
@@ -138,6 +138,7 @@
productionProductMain.setProductProcessRouteItemId(dto.getProductProcessRouteItemId());
productionProductMain.setWorkOrderId(dto.getWorkOrderId());
productionProductMain.setStatus(0);
+ productionProductMain.setDeviceId(dto.getDeviceId());
productionProductMainMapper.insert(productionProductMain);
/*鏂板鎶ュ伐鎶曞叆琛�*/
List<ProductStructureDto> productStructureDtos = productStructureMapper.listBybomAndProcess(productProcessRoute.getBomId(), productProcess.getId());
@@ -162,6 +163,7 @@
productionProductOutput.setProductModelId(productProcessRouteItem.getProductModelId());
productionProductOutput.setQuantity(dto.getQuantity() != null ? dto.getQuantity() : BigDecimal.ZERO);
productionProductOutput.setScrapQty(dto.getScrapQty() != null ? dto.getScrapQty() : BigDecimal.ZERO);
+ productionProductOutput.setOtherData(dto.getOtherData() != null ? dto.getOtherData() : "");
productionProductOutputMapper.insert(productionProductOutput);
//鍚堟牸鏁伴噺=鎶ュ伐鏁伴噺
BigDecimal productQty = productionProductOutput.getQuantity();
diff --git a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
index 14b883e..d51db93 100644
--- a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
@@ -21,6 +21,7 @@
<select id="pageProductWorkOrder" resultType="com.ruoyi.production.dto.ProductWorkOrderDto">
SELECT
pwo.*,
+ pp.id as processId,
pp.NAME as processName,
pm.model,
pm.unit,
diff --git a/src/main/resources/mapper/production/ProductionProductMainMapper.xml b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
index 256a984..0a37f4d 100644
--- a/src/main/resources/mapper/production/ProductionProductMainMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
@@ -20,6 +20,7 @@
u.nick_name as nickName,
p.product_name as productName,
pp.name as process,
+ pp.id as processId,
pm.model as productModelName,
ppo.quantity,
ppo.scrap_qty,
--
Gitblit v1.9.3