From dfa0c439d2d7626d56c37dbee2f72f5e5cd0f553 Mon Sep 17 00:00:00 2001
From: huangjiayang <5265313@qq.com>
Date: 星期三, 07 五月 2025 15:42:56 +0800
Subject: [PATCH] 【UPDATE】钣金供应缺口报表接口
---
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java | 19 +++++++--
aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlateStandardRequireMapper.java | 11 +++++
aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateStandardRequireMapper.xml | 7 +++
aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlateStandardRequireService.java | 10 ++++
aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlateStandardRequireController.java | 37 ++++++++++--------
5 files changed, 62 insertions(+), 22 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlateStandardRequireController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlateStandardRequireController.java
index 0200092..094c478 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlateStandardRequireController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlateStandardRequireController.java
@@ -1,26 +1,19 @@
package com.aps.core.controller.mainPlan;
-import java.util.List;
-
-import jakarta.servlet.http.HttpServletResponse;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.aps.common.core.utils.poi.ExcelUtil;
+import com.aps.common.core.web.controller.BaseController;
+import com.aps.common.core.web.domain.AjaxResult;
+import com.aps.common.core.web.page.TableDataInfo;
import com.aps.common.log.annotation.Log;
import com.aps.common.log.enums.BusinessType;
import com.aps.common.security.annotation.RequiresPermissions;
import com.aps.core.domain.ApsPlateStandardRequire;
import com.aps.core.service.IApsPlateStandardRequireService;
-import com.aps.common.core.web.controller.BaseController;
-import com.aps.common.core.web.domain.AjaxResult;
-import com.aps.common.core.utils.poi.ExcelUtil;
-import com.aps.common.core.web.page.TableDataInfo;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
/**
* 閽ｉ噾宸ュ崟鏍囧噯闇�姹侰ontroller
@@ -110,4 +103,16 @@
{
return toAjax(apsPlateStandardRequireService.deleteApsPlateStandardRequireByIds(ids));
}
+
+ /**
+ * 閽ｉ噾渚涘簲缂哄彛鎶ヨ〃
+ */
+// @RequiresPermissions("ApsPlateStandardRequire:ApsPlateStandardRequire:supplyGapList")
+ @GetMapping("/supplyGapList")
+ public TableDataInfo selectPlateSupplyGapList(ApsPlateStandardRequire apsPlateStandardRequire)
+ {
+ startPage();
+ List<ApsPlateStandardRequire> list = apsPlateStandardRequireService.selectPlateSupplyGapList(apsPlateStandardRequire);
+ return getDataTable(list);
+ }
}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlateStandardRequireMapper.java b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlateStandardRequireMapper.java
index 6c96a74..32e8244 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlateStandardRequireMapper.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlateStandardRequireMapper.java
@@ -1,8 +1,9 @@
package com.aps.core.mapper;
-import java.util.List;
import com.aps.core.domain.ApsPlateStandardRequire;
import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
/**
* 閽ｉ噾宸ュ崟鏍囧噯闇�姹侻apper鎺ュ彛
@@ -60,4 +61,12 @@
* @return 缁撴灉
*/
public int deleteApsPlateStandardRequireByIds(Long[] ids);
+
+
+ /**
+ * 閽ｉ噾渚涘簲缂哄彛鎶ヨ〃
+ * @param apsPlateStandardRequire
+ * @return
+ */
+ public List<ApsPlateStandardRequire> selectPlateSupplyGapList(ApsPlateStandardRequire apsPlateStandardRequire);
}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlateStandardRequireService.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlateStandardRequireService.java
index 4e8e031..4691aaf 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlateStandardRequireService.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlateStandardRequireService.java
@@ -1,7 +1,8 @@
package com.aps.core.service;
-import java.util.List;
import com.aps.core.domain.ApsPlateStandardRequire;
+
+import java.util.List;
/**
* 閽ｉ噾宸ュ崟鏍囧噯闇�姹係ervice鎺ュ彛
@@ -58,4 +59,11 @@
* @return 缁撴灉
*/
public int deleteApsPlateStandardRequireById(Long id);
+
+ /**
+ * 閽ｉ噾渚涘簲缂哄彛鎶ヨ〃
+ * @param apsPlateStandardRequire
+ * @return
+ */
+ public List<ApsPlateStandardRequire> selectPlateSupplyGapList(ApsPlateStandardRequire apsPlateStandardRequire);
}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java
index b6da4b1..120b272 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java
@@ -1,12 +1,13 @@
package com.aps.core.service.impl;
-import java.util.List;
import com.aps.common.core.utils.DateUtils;
+import com.aps.core.domain.ApsPlateStandardRequire;
+import com.aps.core.mapper.ApsPlateStandardRequireMapper;
+import com.aps.core.service.IApsPlateStandardRequireService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.aps.core.mapper.ApsPlateStandardRequireMapper;
-import com.aps.core.domain.ApsPlateStandardRequire;
-import com.aps.core.service.IApsPlateStandardRequireService;
+
+import java.util.List;
/**
* 閽ｉ噾宸ュ崟鏍囧噯闇�姹係ervice涓氬姟灞傚鐞�
@@ -93,4 +94,14 @@
{
return apsPlateStandardRequireMapper.deleteApsPlateStandardRequireById(id);
}
+
+ /**
+ * 閽ｉ噾渚涘簲缂哄彛鎶ヨ〃
+ * @param apsPlateStandardRequire
+ * @return
+ */
+ @Override
+ public List<ApsPlateStandardRequire> selectPlateSupplyGapList(ApsPlateStandardRequire apsPlateStandardRequire) {
+ return apsPlateStandardRequireMapper.selectPlateSupplyGapList(apsPlateStandardRequire);
+ }
}
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateStandardRequireMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateStandardRequireMapper.xml
index 51725b7..5c2ae08 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateStandardRequireMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateStandardRequireMapper.xml
@@ -170,4 +170,11 @@
#{id}
</foreach>
</delete>
+
+ <select id="selectPlateSupplyGapList" parameterType="ApsPlateStandardRequire" resultMap="ApsPlateStandardRequireResult">
+ select id, require_id, bom_line_code, bom_line_level, match_state, match_mode, unmatched_demand_amount, start_date, complete_date, demand_date, org_code, production_base
+ from aps_plate_standard_require where unmatched_demand_amount>0
+ <if test="requireId != null and requireId != ''"> and require_id like '%' || #{requireId} || '%'</if>
+ <if test="bomLineCode != null and bomLineCode != ''"> and bom_line_code like '%' || #{bomLineCode} || '%'</if>
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3