From 15af2de12a56ddf4886e603c52560d0f9d20c847 Mon Sep 17 00:00:00 2001
From: huangjiayang <5265313@qq.com>
Date: 星期三, 07 五月 2025 11:35:35 +0800
Subject: [PATCH] 【UPDATE】修改标准工艺路线接口
---
aps-modules/aps-core/src/main/resources/mapper/core/ApsStandardProcessRouteLineMapper.xml | 1 +
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsStandardProcessRouteHeader.java | 10 ++++++++++
aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsStandardProcessRouteHeaderController.java | 14 +++++++-------
aps-modules/aps-core/src/main/resources/mapper/core/ApsStandardProcessRouteHeaderMapper.xml | 3 +++
aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsBomHeaderController.java | 12 ++++++------
5 files changed, 27 insertions(+), 13 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsBomHeaderController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsBomHeaderController.java
index 4ada129..1d7c37f 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsBomHeaderController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsBomHeaderController.java
@@ -34,7 +34,7 @@
* 鏌ヨBOM Header 鏁版嵁绠＄悊鍒楄〃
*/
- @RequiresPermissions("ApsBomHeader:ApsBomHeader:list")
+ @RequiresPermissions("aps:ApsBomHeader:list")
@GetMapping("/list")
public TableDataInfo list(ApsBomHeader apsBomHeader)
{
@@ -47,7 +47,7 @@
* 瀵煎嚭BOM Header 鏁版嵁绠＄悊鍒楄〃
*/
- @RequiresPermissions("ApsBomHeader:ApsBomHeader:export")
+ @RequiresPermissions("Aps:ApsBomHeader:export")
@Log(title = "BOM Header 鏁版嵁绠＄悊", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, ApsBomHeader apsBomHeader)
@@ -61,7 +61,7 @@
* 鑾峰彇BOM Header 鏁版嵁绠＄悊璇︾粏淇℃伅
*/
- @RequiresPermissions("ApsBomHeader:ApsBomHeader:query")
+ @RequiresPermissions("Aps:ApsBomHeader:query")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
@@ -72,7 +72,7 @@
* 鏂板BOM Header 鏁版嵁绠＄悊
*/
- @RequiresPermissions("ApsBomHeader:ApsBomHeader:add")
+ @RequiresPermissions("Aps:ApsBomHeader:add")
@Log(title = "BOM Header 鏁版嵁绠＄悊", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody ApsBomHeader apsBomHeader)
@@ -84,7 +84,7 @@
* 淇敼BOM Header 鏁版嵁绠＄悊
*/
- @RequiresPermissions("ApsBomHeader:ApsBomHeader:edit")
+ @RequiresPermissions("Aps:ApsBomHeader:edit")
@Log(title = "BOM Header 鏁版嵁绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody ApsBomHeader apsBomHeader)
@@ -96,7 +96,7 @@
* 鍒犻櫎BOM Header 鏁版嵁绠＄悊
*/
- @RequiresPermissions("ApsBomHeader:ApsBomHeader:remove")
+ @RequiresPermissions("Aps:ApsBomHeader:remove")
@Log(title = "BOM Header 鏁版嵁绠＄悊", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsStandardProcessRouteHeaderController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsStandardProcessRouteHeaderController.java
index ca24dd4..b48cc01 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsStandardProcessRouteHeaderController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsStandardProcessRouteHeaderController.java
@@ -34,11 +34,11 @@
* 鏌ヨ鏍囧噯宸ヨ壓璺嚎Header鍒楄〃
*/
- @RequiresPermissions("ApsStandardProcessRouteHeader:ApsStandardProcessRouteHeader:list")
+ @RequiresPermissions("aps:ApsStandardProcessRouteHeader:list")
@GetMapping("/list")
public TableDataInfo list(ApsStandardProcessRouteHeader apsStandardProcessRouteHeader)
{
- startPage();
+// startPage();
List<ApsStandardProcessRouteHeader> list = apsStandardProcessRouteHeaderService.selectApsStandardProcessRouteHeaderList(apsStandardProcessRouteHeader);
return getDataTable(list);
}
@@ -47,7 +47,7 @@
* 瀵煎嚭鏍囧噯宸ヨ壓璺嚎Header鍒楄〃
*/
- @RequiresPermissions("ApsStandardProcessRouteHeader:ApsStandardProcessRouteHeader:export")
+ @RequiresPermissions("aps:ApsStandardProcessRouteHeader:export")
@Log(title = "鏍囧噯宸ヨ壓璺嚎Header", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, ApsStandardProcessRouteHeader apsStandardProcessRouteHeader)
@@ -60,7 +60,7 @@
/**
* 鑾峰彇鏍囧噯宸ヨ壓璺嚎Header璇︾粏淇℃伅
*/
- @RequiresPermissions("ApsStandardProcessRouteHeader:ApsStandardProcessRouteHeader:query")
+ @RequiresPermissions("aps:ApsStandardProcessRouteHeader:query")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
@@ -70,7 +70,7 @@
/**
* 鏂板鏍囧噯宸ヨ壓璺嚎Header
*/
- @RequiresPermissions("ApsStandardProcessRouteHeader:ApsStandardProcessRouteHeader:add")
+ @RequiresPermissions("aps:ApsStandardProcessRouteHeader:add")
@Log(title = "鏍囧噯宸ヨ壓璺嚎Header", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody ApsStandardProcessRouteHeader apsStandardProcessRouteHeader)
@@ -81,7 +81,7 @@
/**
* 淇敼鏍囧噯宸ヨ壓璺嚎Header
*/
- @RequiresPermissions("ApsStandardProcessRouteHeader:ApsStandardProcessRouteHeader:edit")
+ @RequiresPermissions("aps:ApsStandardProcessRouteHeader:edit")
@Log(title = "鏍囧噯宸ヨ壓璺嚎Header", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody ApsStandardProcessRouteHeader apsStandardProcessRouteHeader)
@@ -92,7 +92,7 @@
/**
* 鍒犻櫎鏍囧噯宸ヨ壓璺嚎Header
*/
- @RequiresPermissions("ApsStandardProcessRouteHeader:ApsStandardProcessRouteHeader:remove")
+ @RequiresPermissions("aps:ApsStandardProcessRouteHeader:remove")
@Log(title = "鏍囧噯宸ヨ壓璺嚎Header", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsStandardProcessRouteHeader.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsStandardProcessRouteHeader.java
index f2df848..1ac7fd8 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsStandardProcessRouteHeader.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsStandardProcessRouteHeader.java
@@ -19,12 +19,22 @@
{
@Serial
private static final long serialVersionUID = 1L;
+
/** 涓婚敭id */
private Long id;
+
/** 宸ヨ壓璺嚎ID */
@Excel(name = "宸ヨ壓璺嚎ID")
private String routeId;
+ /** 鐗╂枡鍙� */
+ @Excel(name = "鐗╂枡鍙�")
+ private String itemCode;
+
+ /** 鍥惧彿 */
+ @Excel(name = "鍥惧彿")
+ private String drawingNumber;
+
/** 宸ヨ壓璺嚎鐗堟湰 */
@Excel(name = "宸ヨ壓璺嚎鐗堟湰")
private String version;
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsStandardProcessRouteHeaderMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsStandardProcessRouteHeaderMapper.xml
index bed11cf..1991337 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsStandardProcessRouteHeaderMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsStandardProcessRouteHeaderMapper.xml
@@ -30,6 +30,9 @@
<if test="startDate != null and startDate != ''"> and start_date = #{startDate}</if>
<if test="endDate != null and endDate != ''"> and end_date = #{endDate}</if>
<if test="orgCode != null and orgCode != ''"> and org_code = #{orgCode}</if>
+ <if test="itemCode != null and itemCode != ''"> and item_code like '%' || #{itemCode} || '%'</if>
+ <if test="orgCode != null and orgCode != ''"> and org_code = #{orgCode}</if>
+ and del_flag = '0'
</where>
</select>
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsStandardProcessRouteLineMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsStandardProcessRouteLineMapper.xml
index 3b6e3b8..4afd715 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsStandardProcessRouteLineMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsStandardProcessRouteLineMapper.xml
@@ -38,6 +38,7 @@
<if test="shopCode != null and shopCode != ''"> and shop_code = #{shopCode}</if>
<if test="productivityModel != null and productivityModel != ''"> and productivity_model = #{productivityModel}</if>
<if test="designCapacity != null and designCapacity != ''"> and design_capacity = #{designCapacity}</if>
+ and del_flag = '0'
</where>
</select>
--
Gitblit v1.9.3