From a76ff02b1bf5fbcf1d74f54e5d22a6ff6825642e Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期四, 08 五月 2025 15:46:08 +0800
Subject: [PATCH] 添加钣金工单管理查询
---
aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlatOrderPlanManagerController.java | 40 ++++++++
aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanOrderManagerMapper.xml | 52 ++++++++++
aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlateOrderPlanManagerMapper.java | 25 +++++
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateOrderPlanManagerServiceImpl.java | 39 +++++++
aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlateOrderPlanManagerService.java | 17 +++
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateOrderPlanManager.java | 88 +++++++++++++++++
6 files changed, 261 insertions(+), 0 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlatOrderPlanManagerController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlatOrderPlanManagerController.java
new file mode 100644
index 0000000..1d1fa17
--- /dev/null
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlatOrderPlanManagerController.java
@@ -0,0 +1,40 @@
+package com.aps.core.controller.mainPlan;
+
+import com.aps.common.core.web.controller.BaseController;
+import com.aps.common.core.web.page.TableDataInfo;
+import com.aps.common.security.annotation.RequiresPermissions;
+import com.aps.core.domain.ApsPlateOrderPlanManager;
+import com.aps.core.service.IApsPlateOrderPlanManagerService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 閽ｉ噾宸ュ崟璁″垝绠＄悊LineController
+ *
+ * @author sfd
+ * @date 2025-05-08
+ */
+@RestController
+@RequestMapping("/ApsPlatOrderPlanManager")
+public class ApsPlatOrderPlanManagerController extends BaseController
+{
+ @Autowired
+ private IApsPlateOrderPlanManagerService iapPlateOrderPlanManagerService;
+
+ /**
+ * 鏌ヨ閽ｉ噾宸ュ崟璁″垝
+ */
+ @RequiresPermissions("ApsPlatOrderPlanManager:list")
+ @GetMapping("/list")
+ public TableDataInfo list(ApsPlateOrderPlanManager apsPlateOrderPlanManager)
+ {
+ startPage();
+ List<ApsPlateOrderPlanManager> list = iapPlateOrderPlanManagerService.selectApsPlanOrderManager(apsPlateOrderPlanManager);
+ return getDataTable(list);
+ }
+
+}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateOrderPlanManager.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateOrderPlanManager.java
new file mode 100644
index 0000000..e391b63
--- /dev/null
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateOrderPlanManager.java
@@ -0,0 +1,88 @@
+package com.aps.core.domain;
+
+import com.aps.common.core.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serial;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 鏍囧噯宸ヨ壓璺嚎Header瀵硅薄 aps_standard_process_route_header
+ *
+ * @author zhl
+ * @date 2025-05-06
+ */
+@Data
+public class ApsPlateOrderPlanManager
+{
+ @Serial
+ private static final long serialVersionUID = 1L;
+
+ /** 闇�姹侷D */
+ @Excel(name = "闇�姹侷D")
+ private String requireId;
+
+ /** 闇�姹傝拷婧疘D */
+ @Excel(name = "闇�姹傝拷婧疘D")
+ private String requireTraceId;
+
+ /** 宸ュ崟鍙� */
+ @Excel(name = "宸ュ崟鍙�")
+ private String workOrderNo;
+
+ /** 鍖归厤鏁伴噺 */
+ @Excel(name = "鍖归厤鏁伴噺")
+ private BigDecimal deductionAmount;
+
+ /** 宸ュ崟绫诲瀷 */
+ @Excel(name = "宸ュ崟绫诲瀷")
+ private String workOrderType;
+
+ /** 鏂欏彿 */
+ @Excel(name = "鏂欏彿")
+ private String mainPartNumber;
+
+ /** 涓讳欢鍥惧彿 */
+ @Excel(name = "涓讳欢鍥惧彿")
+ private String mainPartDrawingNumber;
+
+ /** 涓讳欢瀹㈡埛 */
+ @Excel(name = "涓讳欢瀹㈡埛")
+ private String customer;
+
+ /** 鐢熶骇鏁伴噺 */
+ @Excel(name = "鐢熶骇鏁伴噺")
+ private BigDecimal productionQuantity;
+
+ /** 閫傜敤宸ュ巶 */
+ @Excel(name = "閫傜敤宸ュ巶")
+ private String applicableFactories;
+
+ /** 寤惰繜椋庨櫓鏍囪瘑 */
+ @Excel(name = "寤惰繜椋庨櫓鏍囪瘑")
+ private String hasDelayRisk;
+
+ /** 鐢熶骇鍩哄湴 */
+ @Excel(name = "鐢熶骇鍩哄湴")
+ private String productionBase;
+
+ /** 璁″垝寮�宸ユ棩 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "璁″垝寮�宸ユ棩", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date planStartDay;
+
+ /** 璁″垝瀹屽伐鏃� */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "璁″垝瀹屽伐鏃�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date planEndDay;
+
+ /** 鏈尮閰嶇殑鐢熶骇鏁伴噺*/
+ private BigDecimal unmatchedQuantity;
+
+ /** 宸ュ崟鍒涘缓鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "宸ュ崟鍒涘缓鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date orderCreateTime;
+}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlateOrderPlanManagerMapper.java b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlateOrderPlanManagerMapper.java
new file mode 100644
index 0000000..b46fc96
--- /dev/null
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlateOrderPlanManagerMapper.java
@@ -0,0 +1,25 @@
+package com.aps.core.mapper;
+
+import com.aps.core.domain.ApsPlateOrderPlanManager;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 閽ｉ噾宸ュ崟璁″垝绠＄悊鎺ュ彛
+ *
+ * @author sfd
+ * @date 2025-05-08
+ */
+@Mapper
+public interface ApsPlateOrderPlanManagerMapper
+{
+
+ /**
+ * 閽ｉ噾宸ュ崟璁″垝绠＄悊
+ *
+ * @param apsPlateOrderPlanManager 閽ｉ噾宸ュ崟璁″垝绠＄悊
+ * @return 閽ｉ噾宸ュ崟璁″垝绠＄悊
+ */
+ List<ApsPlateOrderPlanManager> selectApsPlanOrderManager(ApsPlateOrderPlanManager apsPlateOrderPlanManager);
+}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlateOrderPlanManagerService.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlateOrderPlanManagerService.java
new file mode 100644
index 0000000..05da025
--- /dev/null
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlateOrderPlanManagerService.java
@@ -0,0 +1,17 @@
+package com.aps.core.service;
+
+import com.aps.core.domain.ApsPlateOrderPlanManager;
+
+import java.util.List;
+
+/**
+ * 閽ｉ噾宸ュ崟璁″垝绠＄悊Service鎺ュ彛
+ *
+ * @author sfd
+ * @date 2025-05-08
+ */
+public interface IApsPlateOrderPlanManagerService
+{
+
+ List<ApsPlateOrderPlanManager> selectApsPlanOrderManager(ApsPlateOrderPlanManager apsPlateOrderPlanManager);
+}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateOrderPlanManagerServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateOrderPlanManagerServiceImpl.java
new file mode 100644
index 0000000..001c0d9
--- /dev/null
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateOrderPlanManagerServiceImpl.java
@@ -0,0 +1,39 @@
+package com.aps.core.service.impl;
+
+import com.aps.common.core.utils.DateUtils;
+import com.aps.common.core.utils.uuid.IdUtils;
+import com.aps.common.security.utils.SecurityUtils;
+import com.aps.core.domain.ApsPlant;
+import com.aps.core.domain.ApsPlateOrderPlanManager;
+import com.aps.core.mapper.ApsPlantMapper;
+import com.aps.core.mapper.ApsPlateOrderPlanManagerMapper;
+import com.aps.core.service.IApsPlantService;
+import com.aps.core.service.IApsPlateOrderPlanManagerService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 閽ｉ噾宸ュ崟璁″垝绠＄悊鎺ュ彛 Service涓氬姟灞傚鐞�
+ *
+ * @author ruoyi
+ * @date 2025-04-14
+ */
+@Service
+public class ApsPlateOrderPlanManagerServiceImpl implements IApsPlateOrderPlanManagerService
+{
+ @Autowired
+ private ApsPlateOrderPlanManagerMapper apsPlateOrderPlanManagerMapper;
+
+ /**
+ * 鏌ヨ閽ｉ噾宸ュ崟璁″垝绠＄悊
+ *
+ * @param apsPlateOrderPlanManager 閽ｉ噾宸ュ崟璁″垝绠＄悊
+ * @return 閽ｉ噾宸ュ崟璁″垝绠＄悊
+ */
+ @Override
+ public List<ApsPlateOrderPlanManager> selectApsPlanOrderManager(ApsPlateOrderPlanManager apsPlateOrderPlanManager) {
+ return apsPlateOrderPlanManagerMapper.selectApsPlanOrderManager(apsPlateOrderPlanManager);
+ }
+}
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanOrderManagerMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanOrderManagerMapper.xml
new file mode 100644
index 0000000..506010d
--- /dev/null
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanOrderManagerMapper.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.aps.core.mapper.ApsPlateOrderPlanManagerMapper">
+
+ <resultMap type="ApsPlateOrderPlanManager" id="ApsPlateOrderPlanManagerResult">
+ <result property="require_id" column="requireId" />
+ <result property="requireTrackId" column="require_track_id" />
+ <result property="docNo" column="doc_no" />
+ <result property="deductionAmount" column="deduction_amount" />
+ <result property="workOrderType" column="work_order_type" />
+ <result property="mainPartNumber" column="main_part_number" />
+ <result property="mainPartDrawingNumber" column="main_part_drawing_number" />
+ <result property="customer" column="customer" />
+ <result property="productionQuantity" column="production_quantity" />
+ <result property="applicableFactories" column="applicable_factories" />
+ <result property="productionBase" column="production_base" />
+ <result property="planStartDay" column="plan_start_day" />
+ <result property="planEndDay" column="plan_end_day" />
+ <result property="unmatchedQuantity" column="unmatched_quantity" />
+ <result property="hasDelayRisk" column="has_delay_risk" />
+ </resultMap>
+
+ <select id="selectApsPlanOrderManager" parameterType="ApsPlateOrderPlanManager" resultMap="ApsPlateOrderPlanManagerResult">
+ select
+ detail.require_id,
+ detail.require_track_id,
+ detail.doc_no,
+ detail.deduction_amount,
+ plan.professional_affiliation as workOrderType,
+ plan.main_part_number as item_number,
+ plan.main_part_drawing_number,
+ plan.customer,
+ plan.production_quantity,
+ plan.plant as applicable_factories,
+ plan.production_base,
+ plan.plan_start_day,
+ plan.plan_end_day,
+ plan.unmatched_quantity,
+ plan.has_risk as has_delay_risk
+ from aps_plate_standard_require_bom_order_detail detail
+ left join aps_plate_plan plan on detail.doc_no = plan.document_number
+ <where>
+ <if test="workOrderNo != null and workOrderNo != ''"> and detail.doc_no = #{workOrderNo}</if>
+ <if test="requireId != null and requireId != ''"> and detail.require_id = #{requireId}</if>
+ <if test="mainPartNumber != null and mainPartNumber != ''"> and plan.main_part_number = #{mainPartNumber}</if>
+ <if test="hasDelayRisk != null and hasDelayRisk != ''"> and plan.has_risk = #{hasDelayRisk}</if>
+ </where>
+ </select>
+
+</mapper>
\ No newline at end of file
--
Gitblit v1.9.3