From 9241057698075ce3cd0b94a7a29eec0ade1a267a Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 11 三月 2026 13:51:53 +0800
Subject: [PATCH] 更新删除生产计划
---
src/main/java/com/ruoyi/productionPlan/controller/ProductionPlanController.java | 14 ++++++++++++++
src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java | 2 +-
src/main/resources/mapper/productionPlan/ProductionPlanMapper.xml | 16 ++++++++++++++--
3 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/productionPlan/controller/ProductionPlanController.java b/src/main/java/com/ruoyi/productionPlan/controller/ProductionPlanController.java
index cb980d3..d07b93b 100644
--- a/src/main/java/com/ruoyi/productionPlan/controller/ProductionPlanController.java
+++ b/src/main/java/com/ruoyi/productionPlan/controller/ProductionPlanController.java
@@ -63,6 +63,20 @@
return AjaxResult.success(productionPlanService.add(productionPlanDto));
}
+ @PutMapping("")
+ @Log(title = "鏇存柊鐢熶骇璁″垝", businessType = BusinessType.UPDATE)
+ @ApiOperation("鏇存柊鐢熶骇璁″垝")
+ public AjaxResult update(@RequestBody ProductionPlanDto productionPlanDto) {
+ return AjaxResult.success(productionPlanService.updateById(productionPlanDto));
+ }
+
+ @DeleteMapping("")
+ @Log(title = "鍒犻櫎鐢熶骇璁″垝", businessType = BusinessType.DELETE)
+ @ApiOperation("鍒犻櫎鐢熶骇璁″垝")
+ public AjaxResult delete(@RequestBody List<Long> ids) {
+ return AjaxResult.success(productionPlanService.removeByIds(ids));
+ }
+
@GetMapping("/summaryByProductType")
@ApiOperation("鎸夌収浜у搧绫诲埆姹囨�荤粺璁￠渶姹傞噺")
@Log(title = "鎸夌収浜у搧绫诲埆姹囨�荤粺璁￠渶姹傞噺", businessType = BusinessType.OTHER)
diff --git a/src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java b/src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java
index a93d311..31fa45c 100644
--- a/src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java
+++ b/src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java
@@ -126,7 +126,7 @@
.reduce(BigDecimal.ZERO, BigDecimal::add);
// 鍒ゆ柇涓嬪彂鏁伴噺鏄惁澶т簬绛変簬鏂规暟
if (productionPlanDto.getTotalAssignedQuantity().compareTo(totalVolume) > 0) {
- log.warn("鍚堝苟澶辫触锛屼笅鍙戞暟閲忎笉鑳藉ぇ浜庢柟鏁�");
+ log.warn("鎿嶄綔澶辫触锛屼笅鍙戞暟閲忎笉鑳藉ぇ浜庢柟鏁�");
return false;
}
diff --git a/src/main/resources/mapper/productionPlan/ProductionPlanMapper.xml b/src/main/resources/mapper/productionPlan/ProductionPlanMapper.xml
index 0b205d6..4bf0e0d 100644
--- a/src/main/resources/mapper/productionPlan/ProductionPlanMapper.xml
+++ b/src/main/resources/mapper/productionPlan/ProductionPlanMapper.xml
@@ -38,10 +38,22 @@
</resultMap>
- <select id="listPage" resultMap="ProductionPlanResultMap">
+ <select id="listPage" resultType="com.ruoyi.productionPlan.dto.ProductionPlanDto">
SELECT *
- FROM production_plan
+ FROM production_plan pp
WHERE 1 = 1
+ <if test="c.customerName != null and c.customerName != '' ">
+ AND pp.customer_name LIKE CONCAT('%',#{c.customerName},'%')
+ </if>
+ <if test="c.productName != null and c.productName != '' ">
+ AND pp.product_name LIKE CONCAT('%',#{c.productName},'%')
+ </if>
+ <if test="c.productSpec != null and c.productSpec != '' ">
+ AND pp.product_spec LIKE CONCAT('%',#{c.productSpec},'%')
+ </if>
+ <if test="c.materialCode != null and c.materialCode != '' ">
+ AND pp.material_code LIKE CONCAT('%',#{c.materialCode},'%')
+ </if>
</select>
<select id="selectSummaryByProductType" resultType="com.ruoyi.productionPlan.dto.ProductionPlanSummaryDto">
--
Gitblit v1.9.3