From fb40c4dfec5954c321f38bb86e9d07eb87b97bfd Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期三, 18 三月 2026 08:21:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_衡阳_鹏创电子' into dev_衡阳_鹏创电子
---
src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java | 4 +-
doc/20260317_鹏创电子.sql | 3 +
src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java | 11 ++++-
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/quality/QualityUnqualifiedMapper.xml | 2 +
src/main/java/com/ruoyi/quality/pojo/QualityInspect.java | 20 ++++++++--
src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java | 10 +---
src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java | 4 +
src/main/java/com/ruoyi/quality/controller/QualityInspectController.java | 2
src/main/java/com/ruoyi/quality/pojo/QualityTestStandard.java | 2
src/main/resources/mapper/production/ProductionProductOutputMapper.xml | 1
src/main/resources/mapper/production/ProductionProductMainMapper.xml | 1
13 files changed, 46 insertions(+), 19 deletions(-)
diff --git "a/doc/20260317_\351\271\217\345\210\233\347\224\265\345\255\220.sql" "b/doc/20260317_\351\271\217\345\210\233\347\224\265\345\255\220.sql"
new file mode 100644
index 0000000..1d7b12e
--- /dev/null
+++ "b/doc/20260317_\351\271\217\345\210\233\347\224\265\345\255\220.sql"
@@ -0,0 +1,3 @@
+alter table quality_inspect
+ add defective_quantity decimal(18, 2) null comment '涓嶈壇鏁伴噺',
+ add defective_reason varchar(255) default '' not null comment '涓嶈壇鍘熷洜';
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java b/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java
index e4a0813..57348e6 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java
@@ -3,21 +3,17 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.web.domain.R;
-import com.ruoyi.production.dto.ProductProcessRouteItemDto;
import com.ruoyi.production.dto.ProductionProductMainDto;
-import com.ruoyi.production.dto.SalesLedgerProductionAccountingDto;
import com.ruoyi.production.service.ProductionProductMainService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
-import java.util.Arrays;
import java.util.List;
-@RequestMapping("productionProductMain")
+@RequestMapping("/productionProductMain")
@RestController
@Api(value = "鐢熶骇鎶ュ伐")
public class ProductionProductMainController {
@@ -31,7 +27,7 @@
* @param productionProductMainDto
* @return
*/
- @GetMapping("listPage")
+ @GetMapping("/listPage")
public R page(Page<ProductionProductMainDto> page, ProductionProductMainDto productionProductMainDto) {
return R.ok(productionProductMainService.listPageProductionProductMainDto(page, productionProductMainDto));
}
@@ -41,7 +37,7 @@
* @param productionProductMainDto
* @return
*/
- @PostMapping("addProductMain")
+ @PostMapping("/addProductMain")
public R addProductMain(@RequestBody ProductionProductMainDto productionProductMainDto) {
return R.ok(productionProductMainService.addProductMain(productionProductMainDto));
}
diff --git a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
index 9e5e121..65e93c2 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
@@ -10,7 +10,6 @@
import java.math.BigDecimal;
import java.time.LocalDate;
-import java.time.LocalDateTime;
@Data
@ExcelIgnoreUnannotated
@@ -61,5 +60,8 @@
private BigDecimal workHours;
private BigDecimal wages;
+ // 鍏朵粬鏁版嵁
+ private String otherData;
+
}
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 b3f75b0..2f943e2 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
@@ -163,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().subtract(productionProductOutput.getScrapQty());
@@ -189,6 +190,7 @@
qualityInspect.setProcess(process);
qualityInspect.setInspectState(0);
qualityInspect.setInspectType(inspectType);
+ qualityInspect.setDefectiveQuantity(productionProductOutput.getScrapQty());
qualityInspect.setProductMainId(productionProductMain.getId());
qualityInspect.setProductModelId(productModel.getId());
qualityInspectMapper.insert(qualityInspect);
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java b/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java
index dec3d1c..fccf1f7 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java
@@ -23,7 +23,7 @@
import java.util.List;
/**
- * 鍘熸潗鏂欐楠�/杩囩▼妫�楠�/鍑哄巶妫�楠�
+ * 鍘熸潗鏂欐楠�/杩囩▼妫�楠�/鎴愬搧妫�楠�
*/
@RestController
@RequestMapping("/quality/qualityInspect")
diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java b/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
index 9d23429..e06c236 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
@@ -14,7 +14,7 @@
import java.util.Date;
/**
- * 璐ㄩ噺绠＄悊--鍘熸潗鏂�/杩囩▼/鍑哄巶妫�楠�
+ * 璐ㄩ噺绠＄悊--鍘熸潗鏂�/杩囩▼/鎴愬搧妫�楠�
* quality_inspect
*/
@TableName(value = "quality_inspect")
@@ -29,9 +29,9 @@
private Long id;
/**
- * 绫诲埆(0:鍘熸潗鏂欐楠�;1:杩囩▼妫�楠�;2:鍑哄巶妫�楠�)
+ * 绫诲埆(0:鍘熸潗鏂欐楠�;1:杩囩▼妫�楠�;2:鎴愬搧妫�楠�)
*/
- @Excel(name = "绫诲埆",readConverterExp = "0=鍘熸潗鏂欐楠�,1=杩囩▼妫�楠�,2=鍑哄巶妫�楠�")
+ @Excel(name = "绫诲埆",readConverterExp = "0=鍘熸潗鏂欐楠�,1=杩囩▼妫�楠�,2=鎴愬搧妫�楠�")
@NotBlank(message = "绫诲埆涓嶈兘涓虹┖!!")
private Integer inspectType;
@@ -52,7 +52,7 @@
private String supplier;
/**
- * 瀹㈡埛鍚嶇О(杩囩▼妫�楠�/鍑哄巶妫�楠�)
+ * 瀹㈡埛鍚嶇О(杩囩▼妫�楠�/鎴愬搧妫�楠�)
*/
@Excel(name = "瀹㈡埛鍚嶇О")
private String customer;
@@ -100,6 +100,18 @@
private BigDecimal quantity;
/**
+ * 涓嶈壇鏁伴噺
+ */
+ @Excel(name = "涓嶈壇鏁伴噺")
+ private BigDecimal defectiveQuantity;
+
+ /**
+ * 涓嶈壇鍘熷洜
+ */
+ @Excel(name = "涓嶈壇鍘熷洜")
+ private String defectiveReason;
+
+ /**
* 妫�娴嬪崟浣�
*/
@Excel(name = "妫�娴嬪崟浣�")
diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityTestStandard.java b/src/main/java/com/ruoyi/quality/pojo/QualityTestStandard.java
index d2fb853..a19c824 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityTestStandard.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityTestStandard.java
@@ -64,7 +64,7 @@
@ApiModelProperty("鐘舵��")
private String state;
- @ApiModelProperty("绫诲埆(0:鍘熸潗鏂欐楠�;1:杩囩▼妫�楠�;2:鍑哄巶妫�楠�)")
+ @ApiModelProperty("绫诲埆(0:鍘熸潗鏂欐楠�;1:杩囩▼妫�楠�;2:鎴愬搧妫�楠�)")
private Integer inspectType;
@ApiModelProperty("宸ュ簭id")
diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java b/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java
index d2f8e88..f847294 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java
@@ -31,10 +31,10 @@
/**
- * 绫诲埆(0:鍘熸潗鏂欐楠�;1:杩囩▼妫�楠�;2:鍑哄巶妫�楠�)
+ * 绫诲埆(0:鍘熸潗鏂欐楠�;1:杩囩▼妫�楠�;2:鎴愬搧妫�楠�)
*/
@NotBlank(message = "绫诲埆涓嶈兘涓虹┖!!!")
- @Excel(name = "绫诲埆",readConverterExp = "0=鍘熸潗鏂欐楠�,1=杩囩▼妫�楠�,2=鍑哄巶妫�楠�")
+ @Excel(name = "绫诲埆",readConverterExp = "0=鍘熸潗鏂欐楠�,1=杩囩▼妫�楠�,2=鎴愬搧妫�楠�")
private Integer inspectType;
/**
@@ -111,7 +111,8 @@
@Excel(name = "澶勭悊鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
private Date dealTime;
-
+ @Excel(name = "澶囨敞")
+ private String remark;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
@@ -140,4 +141,8 @@
@ApiModelProperty("鏄惁涓嶅悎鏍煎鐞嗚嚜宸辨柊澧�")
@TableField(exist = false)
private Boolean method;
+
+ @ApiModelProperty("宸ュ簭")
+ @TableField(exist = false)
+ private String process;
}
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 5bccd00..d56bc10 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
@@ -124,7 +124,7 @@
inspectType = "杩囩▼妫�楠�";
break;
case 2:
- inspectType = "鍑哄巶妫�楠�";
+ inspectType = "鎴愬搧妫�楠�";
break;
}
List<QualityInspectParam> paramList = qualityInspectParamService.list(Wrappers.<QualityInspectParam>lambdaQuery().eq(QualityInspectParam::getInspectId, inspect.getId()));
@@ -194,7 +194,7 @@
util.exportExcel(response, qualityInspects, "杩囩▼妫�楠屽鍑�");
break;
case 2:
- util.exportExcel(response, qualityInspects, "鍑哄巶妫�楠屽鍑�");
+ util.exportExcel(response, qualityInspects, "鎴愬搧妫�楠屽鍑�");
break;
}
diff --git a/src/main/resources/mapper/production/ProductionProductMainMapper.xml b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
index a122e90..11301ad 100644
--- a/src/main/resources/mapper/production/ProductionProductMainMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
@@ -22,6 +22,7 @@
pm.model as productModelName,
ppo.quantity,
ppo.scrap_qty,
+ ppo.other_data,
pm.unit,
sl.sales_contract_no salesContractNo
from
diff --git a/src/main/resources/mapper/production/ProductionProductOutputMapper.xml b/src/main/resources/mapper/production/ProductionProductOutputMapper.xml
index 3b44135..fad5b62 100644
--- a/src/main/resources/mapper/production/ProductionProductOutputMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductOutputMapper.xml
@@ -9,6 +9,7 @@
<result property="quantity" column="quantity"/>
<result property="tenantId" column="tenant_id"/>
<result property="createTime" column="create_time"/>
+ <result property="otherData" column="other_data"/>
</resultMap>
<select id="listPageProductionProductOutputDto" resultType="com.ruoyi.production.dto.ProductionProductOutputDto">
diff --git a/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml b/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
index 5bda4f6..b5b0ee1 100644
--- a/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
+++ b/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
@@ -75,6 +75,7 @@
qu.deal_result,
qu.deal_name,
qu.deal_time,
+ qi.process,
CASE
WHEN qu.model = pm.id THEN pm.model
ELSE qu.model
@@ -85,6 +86,7 @@
END AS method
FROM quality_unqualified qu
LEFT JOIN product_model pm ON qu.model = pm.id
+ LEFT JOIN quality_inspect qi ON qu.inspect_id = qi.id
where
1=1
and qu.id = #{id}
--
Gitblit v1.9.3