From 7dac4deb10374dc33ca562eb1d7b7c9cc67dc04c Mon Sep 17 00:00:00 2001
From: wenwj <‘1106994300@qq.com>
Date: 星期二, 08 四月 2025 14:10:11 +0800
Subject: [PATCH] 零件计划管理基础代码和部分代码调整
---
aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPartPlanController.java | 106 +++++
aps-modules/aps-core/pom.xml | 50 +-
aps-modules/aps-upload/src/main/java/com/aps/upload/service/impl/CoreServiceImpl.java | 2
aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPartPlanService.java | 61 +++
aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPartPlanMapper.java | 63 +++
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartPlanServiceImpl.java | 93 ++++
aps-modules/aps-core/src/main/resources/mapper/core/ApsPartPlanMapper.xml | 223 +++++++++++
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartPlan.java | 553 +++++++++++++++++++++++++++
8 files changed, 1,130 insertions(+), 21 deletions(-)
diff --git a/aps-modules/aps-core/pom.xml b/aps-modules/aps-core/pom.xml
index 4139244..92e3490 100644
--- a/aps-modules/aps-core/pom.xml
+++ b/aps-modules/aps-core/pom.xml
@@ -16,50 +16,60 @@
</description>
<dependencies>
-
- <!-- SpringCloud Alibaba Nacos -->
+
+ <!-- SpringCloud Alibaba Nacos -->
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
</dependency>
-
+
<!-- SpringCloud Alibaba Nacos Config -->
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
</dependency>
-
+
<!-- SpringCloud Alibaba Sentinel -->
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
</dependency>
-
+
<!-- SpringBoot Actuator -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
</dependency>
-
- <!-- SpringBoot Web -->
+
+ <!-- Mysql Connector -->
<dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
+ <groupId>com.mysql</groupId>
+ <artifactId>mysql-connector-j</artifactId>
</dependency>
-
- <!-- Minio -->
- <dependency>
- <groupId>io.minio</groupId>
- <artifactId>minio</artifactId>
- <version>${minio.version}</version>
- </dependency>
-
- <!-- RuoYi Api System -->
+
+ <!-- RuoYi Common DataSource -->
<dependency>
<groupId>com.aps</groupId>
- <artifactId>aps-api-system</artifactId>
+ <artifactId>aps-common-datasource</artifactId>
</dependency>
-
+
+ <!-- RuoYi Common DataScope -->
+ <dependency>
+ <groupId>com.aps</groupId>
+ <artifactId>aps-common-datascope</artifactId>
+ </dependency>
+
+ <!-- RuoYi Common Log -->
+ <dependency>
+ <groupId>com.aps</groupId>
+ <artifactId>aps-common-log</artifactId>
+ </dependency>
+
+ <!-- RuoYi Common Swagger -->
+ <dependency>
+ <groupId>com.aps</groupId>
+ <artifactId>aps-common-swagger</artifactId>
+ </dependency>
</dependencies>
<build>
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPartPlanController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPartPlanController.java
new file mode 100644
index 0000000..e1b0a65
--- /dev/null
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPartPlanController.java
@@ -0,0 +1,106 @@
+package com.aps.core.controller;
+
+import java.util.List;
+import java.io.IOException;
+
+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.log.annotation.Log;
+import com.aps.common.log.enums.BusinessType;
+import com.aps.common.security.annotation.RequiresPermissions;
+import com.aps.core.domain.ApsPartPlan;
+import com.aps.core.service.IApsPartPlanService;
+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;
+
+/**
+ * 闆朵欢璁″垝绠＄悊Controller
+ *
+ * @author wwj
+ * @date 2025-04-08
+ */
+@RestController
+@RequestMapping("/plan")
+public class ApsPartPlanController extends BaseController
+{
+ @Autowired
+ private IApsPartPlanService apsPartPlanService;
+
+ /**
+ * 鏌ヨ闆朵欢璁″垝绠＄悊鍒楄〃
+ */
+ @RequiresPermissions("partPlan:plan:list")
+ @GetMapping("/list")
+ public TableDataInfo list(ApsPartPlan apsPartPlan)
+ {
+ startPage();
+ List<ApsPartPlan> list = apsPartPlanService.selectApsPartPlanList(apsPartPlan);
+ return getDataTable(list);
+ }
+
+ /**
+ * 瀵煎嚭闆朵欢璁″垝绠＄悊鍒楄〃
+ */
+ @RequiresPermissions("partPlan:plan:export")
+ @Log(title = "闆朵欢璁″垝绠＄悊", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, ApsPartPlan apsPartPlan)
+ {
+ List<ApsPartPlan> list = apsPartPlanService.selectApsPartPlanList(apsPartPlan);
+ ExcelUtil<ApsPartPlan> util = new ExcelUtil<ApsPartPlan>(ApsPartPlan.class);
+ util.exportExcel(response, list, "闆朵欢璁″垝绠＄悊鏁版嵁");
+ }
+
+ /**
+ * 鑾峰彇闆朵欢璁″垝绠＄悊璇︾粏淇℃伅
+ */
+ @RequiresPermissions("partPlan:plan:query")
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") String id)
+ {
+ return success(apsPartPlanService.selectApsPartPlanById(id));
+ }
+
+ /**
+ * 鏂板闆朵欢璁″垝绠＄悊
+ */
+ @RequiresPermissions("partPlan:plan:add")
+ @Log(title = "闆朵欢璁″垝绠＄悊", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody ApsPartPlan apsPartPlan)
+ {
+ return toAjax(apsPartPlanService.insertApsPartPlan(apsPartPlan));
+ }
+
+ /**
+ * 淇敼闆朵欢璁″垝绠＄悊
+ */
+ @RequiresPermissions("partPlan:plan:edit")
+ @Log(title = "闆朵欢璁″垝绠＄悊", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody ApsPartPlan apsPartPlan)
+ {
+ return toAjax(apsPartPlanService.updateApsPartPlan(apsPartPlan));
+ }
+
+ /**
+ * 鍒犻櫎闆朵欢璁″垝绠＄悊
+ */
+ @RequiresPermissions("partPlan:plan:remove")
+ @Log(title = "闆朵欢璁″垝绠＄悊", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable String[] ids)
+ {
+ return toAjax(apsPartPlanService.deleteApsPartPlanByIds(ids));
+ }
+}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartPlan.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartPlan.java
new file mode 100644
index 0000000..61dea35
--- /dev/null
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartPlan.java
@@ -0,0 +1,553 @@
+package com.aps.core.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.aps.common.core.annotation.Excel;
+import com.aps.common.core.web.domain.BaseEntity;
+
+/**
+ * 闆朵欢璁″垝绠＄悊瀵硅薄 aps_part_plan
+ *
+ * @author wwj
+ * @date 2025-04-08
+ */
+public class ApsPartPlan extends BaseEntity
+{
+ private static final long serialVersionUID = 1L;
+
+ /** 涓婚敭id */
+ private String id;
+
+ /** 涓昏鍒掑憳 */
+ @Excel(name = "涓昏鍒掑憳")
+ private String masterPlanner;
+
+ /** 鍛ㄦ棩 */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "鍛ㄦ棩", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date weekDay;
+
+ /** 鍛ㄥ害 */
+ @Excel(name = "鍛ㄥ害")
+ private String weekCycle;
+
+ /** 涓讳欢鏂欏彿 */
+ @Excel(name = "涓讳欢鏂欏彿")
+ private String mainPartNumber;
+
+ /** 涓讳欢鍥惧彿 */
+ @Excel(name = "涓讳欢鍥惧彿")
+ private String mainPartDrawingNumber;
+
+ /** 瀹㈡埛鍚嶇О */
+ @Excel(name = "瀹㈡埛鍚嶇О")
+ private String customer;
+
+ /** 涓氬姟绫诲瀷 */
+ @Excel(name = "涓氬姟绫诲瀷")
+ private String businessType;
+
+ /** 鍗曟嵁鍙� */
+ @Excel(name = "鍗曟嵁鍙�")
+ private String documentNumber;
+
+ /** 闇�姹傚垎绫� */
+ @Excel(name = "闇�姹傚垎绫�")
+ private String requirementType;
+
+ /** 鍗曟嵁鐘舵�� */
+ @Excel(name = "鍗曟嵁鐘舵��")
+ private String documentStatus;
+
+ /** 鏂欏彿 */
+ @Excel(name = "鏂欏彿")
+ private String itemNumber;
+
+ /** 鍥惧彿 */
+ @Excel(name = "鍥惧彿")
+ private String drawingNo;
+
+ /** 鐗堟湰鍙� */
+ @Excel(name = "鐗堟湰鍙�")
+ private String versionNumber;
+
+ /** 鐢熶骇鏁伴噺 */
+ @Excel(name = "鐢熶骇鏁伴噺")
+ private Long productionQuantity;
+
+ /** 鑹搧鏁伴噺 */
+ @Excel(name = "鑹搧鏁伴噺")
+ private Long goodProductsQuantity;
+
+ /** 宸ュ簭鍙� */
+ @Excel(name = "宸ュ簭鍙�")
+ private String processNumber;
+
+ /** 宸ヤ綔涓績 */
+ @Excel(name = "宸ヤ綔涓績")
+ private String workCenter;
+
+ /** 鎵�灞為儴闂� */
+ @Excel(name = "鎵�灞為儴闂�")
+ private String department;
+
+ /** 璁″垝寮�宸ユ棩 */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "璁″垝寮�宸ユ棩", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date planStartDay;
+
+ /** 璁″垝瀹屽伐鏃� */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "璁″垝瀹屽伐鏃�", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date planEndDay;
+
+ /** 澶囨枡鏂欏彿 */
+ @Excel(name = "澶囨枡鏂欏彿")
+ private String standbyNumber;
+
+ /** 澶囨枡鍚嶇О */
+ @Excel(name = "澶囨枡鍚嶇О")
+ private String standbyName;
+
+ /** 澶囨枡搴撳瓨 */
+ @Excel(name = "澶囨枡搴撳瓨")
+ private Long standbyStock;
+
+ /** 涓嬮亾宸ュ簭鎵�灞為儴闂� */
+ @Excel(name = "涓嬮亾宸ュ簭鎵�灞為儴闂�")
+ private String nextProcessDeparment;
+
+ /** 鏄惁鎸傝捣 */
+ @Excel(name = "鏄惁鎸傝捣")
+ private Integer isSuspended;
+
+ /** 澶栧崗鏍囪瘑 */
+ @Excel(name = "澶栧崗鏍囪瘑")
+ private Integer isOutsourcing;
+
+ /** 璐﹀ */
+ @Excel(name = "璐﹀")
+ private String account;
+
+ /** 涓婇樁鐗╂枡 */
+ @Excel(name = "涓婇樁鐗╂枡")
+ private String advancedMaterials;
+
+ /** 涓婇樁鍗曟嵁鍙� */
+ @Excel(name = "涓婇樁鍗曟嵁鍙�")
+ private String advancedDocumentNumber;
+
+ /** 涓婇樁闇�姹傛棩鏈� */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "涓婇樁闇�姹傛棩鏈�", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date advancedRequirementDay;
+
+ /** 璁″垝榻愬 */
+ @Excel(name = "璁″垝榻愬")
+ private Integer isPlanComplete;
+
+ /** 搴撳瓨榻愬 */
+ @Excel(name = "搴撳瓨榻愬")
+ private Integer isStockComplete;
+
+ /** 鏄惁鏈夋姌杩斿伐搴� */
+ @Excel(name = "鏄惁鏈夋姌杩斿伐搴�")
+ private Integer hasTurnback;
+
+ /** 椋庨櫓鏍囪瘑 */
+ @Excel(name = "椋庨櫓鏍囪瘑")
+ private Integer hasRisk;
+
+ public void setId(String id)
+ {
+ this.id = id;
+ }
+
+ public String getId()
+ {
+ return id;
+ }
+
+ public void setMasterPlanner(String masterPlanner)
+ {
+ this.masterPlanner = masterPlanner;
+ }
+
+ public String getMasterPlanner()
+ {
+ return masterPlanner;
+ }
+
+ public void setWeekDay(Date weekDay)
+ {
+ this.weekDay = weekDay;
+ }
+
+ public Date getWeekDay()
+ {
+ return weekDay;
+ }
+
+ public void setWeekCycle(String weekCycle)
+ {
+ this.weekCycle = weekCycle;
+ }
+
+ public String getWeekCycle()
+ {
+ return weekCycle;
+ }
+
+ public void setMainPartNumber(String mainPartNumber)
+ {
+ this.mainPartNumber = mainPartNumber;
+ }
+
+ public String getMainPartNumber()
+ {
+ return mainPartNumber;
+ }
+
+ public void setMainPartDrawingNumber(String mainPartDrawingNumber)
+ {
+ this.mainPartDrawingNumber = mainPartDrawingNumber;
+ }
+
+ public String getMainPartDrawingNumber()
+ {
+ return mainPartDrawingNumber;
+ }
+
+ public void setCustomer(String customer)
+ {
+ this.customer = customer;
+ }
+
+ public String getCustomer()
+ {
+ return customer;
+ }
+
+ public void setBusinessType(String businessType)
+ {
+ this.businessType = businessType;
+ }
+
+ public String getBusinessType()
+ {
+ return businessType;
+ }
+
+ public void setDocumentNumber(String documentNumber)
+ {
+ this.documentNumber = documentNumber;
+ }
+
+ public String getDocumentNumber()
+ {
+ return documentNumber;
+ }
+
+ public void setRequirementType(String requirementType)
+ {
+ this.requirementType = requirementType;
+ }
+
+ public String getRequirementType()
+ {
+ return requirementType;
+ }
+
+ public void setDocumentStatus(String documentStatus)
+ {
+ this.documentStatus = documentStatus;
+ }
+
+ public String getDocumentStatus()
+ {
+ return documentStatus;
+ }
+
+ public void setItemNumber(String itemNumber)
+ {
+ this.itemNumber = itemNumber;
+ }
+
+ public String getItemNumber()
+ {
+ return itemNumber;
+ }
+
+ public void setDrawingNo(String drawingNo)
+ {
+ this.drawingNo = drawingNo;
+ }
+
+ public String getDrawingNo()
+ {
+ return drawingNo;
+ }
+
+ public void setVersionNumber(String versionNumber)
+ {
+ this.versionNumber = versionNumber;
+ }
+
+ public String getVersionNumber()
+ {
+ return versionNumber;
+ }
+
+ public void setProductionQuantity(Long productionQuantity)
+ {
+ this.productionQuantity = productionQuantity;
+ }
+
+ public Long getProductionQuantity()
+ {
+ return productionQuantity;
+ }
+
+ public void setGoodProductsQuantity(Long goodProductsQuantity)
+ {
+ this.goodProductsQuantity = goodProductsQuantity;
+ }
+
+ public Long getGoodProductsQuantity()
+ {
+ return goodProductsQuantity;
+ }
+
+ public void setProcessNumber(String processNumber)
+ {
+ this.processNumber = processNumber;
+ }
+
+ public String getProcessNumber()
+ {
+ return processNumber;
+ }
+
+ public void setWorkCenter(String workCenter)
+ {
+ this.workCenter = workCenter;
+ }
+
+ public String getWorkCenter()
+ {
+ return workCenter;
+ }
+
+ public void setDepartment(String department)
+ {
+ this.department = department;
+ }
+
+ public String getDepartment()
+ {
+ return department;
+ }
+
+ public void setPlanStartDay(Date planStartDay)
+ {
+ this.planStartDay = planStartDay;
+ }
+
+ public Date getPlanStartDay()
+ {
+ return planStartDay;
+ }
+
+ public void setPlanEndDay(Date planEndDay)
+ {
+ this.planEndDay = planEndDay;
+ }
+
+ public Date getPlanEndDay()
+ {
+ return planEndDay;
+ }
+
+ public void setStandbyNumber(String standbyNumber)
+ {
+ this.standbyNumber = standbyNumber;
+ }
+
+ public String getStandbyNumber()
+ {
+ return standbyNumber;
+ }
+
+ public void setStandbyName(String standbyName)
+ {
+ this.standbyName = standbyName;
+ }
+
+ public String getStandbyName()
+ {
+ return standbyName;
+ }
+
+ public void setStandbyStock(Long standbyStock)
+ {
+ this.standbyStock = standbyStock;
+ }
+
+ public Long getStandbyStock()
+ {
+ return standbyStock;
+ }
+
+ public void setNextProcessDeparment(String nextProcessDeparment)
+ {
+ this.nextProcessDeparment = nextProcessDeparment;
+ }
+
+ public String getNextProcessDeparment()
+ {
+ return nextProcessDeparment;
+ }
+
+ public void setIsSuspended(Integer isSuspended)
+ {
+ this.isSuspended = isSuspended;
+ }
+
+ public Integer getIsSuspended()
+ {
+ return isSuspended;
+ }
+
+ public void setIsOutsourcing(Integer isOutsourcing)
+ {
+ this.isOutsourcing = isOutsourcing;
+ }
+
+ public Integer getIsOutsourcing()
+ {
+ return isOutsourcing;
+ }
+
+ public void setAccount(String account)
+ {
+ this.account = account;
+ }
+
+ public String getAccount()
+ {
+ return account;
+ }
+
+ public void setAdvancedMaterials(String advancedMaterials)
+ {
+ this.advancedMaterials = advancedMaterials;
+ }
+
+ public String getAdvancedMaterials()
+ {
+ return advancedMaterials;
+ }
+
+ public void setAdvancedDocumentNumber(String advancedDocumentNumber)
+ {
+ this.advancedDocumentNumber = advancedDocumentNumber;
+ }
+
+ public String getAdvancedDocumentNumber()
+ {
+ return advancedDocumentNumber;
+ }
+
+ public void setAdvancedRequirementDay(Date advancedRequirementDay)
+ {
+ this.advancedRequirementDay = advancedRequirementDay;
+ }
+
+ public Date getAdvancedRequirementDay()
+ {
+ return advancedRequirementDay;
+ }
+
+ public void setIsPlanComplete(Integer isPlanComplete)
+ {
+ this.isPlanComplete = isPlanComplete;
+ }
+
+ public Integer getIsPlanComplete()
+ {
+ return isPlanComplete;
+ }
+
+ public void setIsStockComplete(Integer isStockComplete)
+ {
+ this.isStockComplete = isStockComplete;
+ }
+
+ public Integer getIsStockComplete()
+ {
+ return isStockComplete;
+ }
+
+ public void setHasTurnback(Integer hasTurnback)
+ {
+ this.hasTurnback = hasTurnback;
+ }
+
+ public Integer getHasTurnback()
+ {
+ return hasTurnback;
+ }
+
+ public void setHasRisk(Integer hasRisk)
+ {
+ this.hasRisk = hasRisk;
+ }
+
+ public Integer getHasRisk()
+ {
+ return hasRisk;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+ .append("id", getId())
+ .append("masterPlanner", getMasterPlanner())
+ .append("weekDay", getWeekDay())
+ .append("weekCycle", getWeekCycle())
+ .append("mainPartNumber", getMainPartNumber())
+ .append("mainPartDrawingNumber", getMainPartDrawingNumber())
+ .append("customer", getCustomer())
+ .append("businessType", getBusinessType())
+ .append("documentNumber", getDocumentNumber())
+ .append("requirementType", getRequirementType())
+ .append("documentStatus", getDocumentStatus())
+ .append("itemNumber", getItemNumber())
+ .append("drawingNo", getDrawingNo())
+ .append("versionNumber", getVersionNumber())
+ .append("productionQuantity", getProductionQuantity())
+ .append("goodProductsQuantity", getGoodProductsQuantity())
+ .append("processNumber", getProcessNumber())
+ .append("workCenter", getWorkCenter())
+ .append("department", getDepartment())
+ .append("planStartDay", getPlanStartDay())
+ .append("planEndDay", getPlanEndDay())
+ .append("standbyNumber", getStandbyNumber())
+ .append("standbyName", getStandbyName())
+ .append("standbyStock", getStandbyStock())
+ .append("nextProcessDeparment", getNextProcessDeparment())
+ .append("isSuspended", getIsSuspended())
+ .append("isOutsourcing", getIsOutsourcing())
+ .append("account", getAccount())
+ .append("advancedMaterials", getAdvancedMaterials())
+ .append("advancedDocumentNumber", getAdvancedDocumentNumber())
+ .append("advancedRequirementDay", getAdvancedRequirementDay())
+ .append("isPlanComplete", getIsPlanComplete())
+ .append("isStockComplete", getIsStockComplete())
+ .append("hasTurnback", getHasTurnback())
+ .append("hasRisk", getHasRisk())
+ .toString();
+ }
+}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPartPlanMapper.java b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPartPlanMapper.java
new file mode 100644
index 0000000..8c7c4e0
--- /dev/null
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPartPlanMapper.java
@@ -0,0 +1,63 @@
+package com.aps.core.mapper;
+
+import java.util.List;
+import com.aps.core.domain.ApsPartPlan;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 闆朵欢璁″垝绠＄悊Mapper鎺ュ彛
+ *
+ * @author wwj
+ * @date 2025-04-08
+ */
+@Mapper
+public interface ApsPartPlanMapper
+{
+ /**
+ * 鏌ヨ闆朵欢璁″垝绠＄悊
+ *
+ * @param id 闆朵欢璁″垝绠＄悊涓婚敭
+ * @return 闆朵欢璁″垝绠＄悊
+ */
+ public ApsPartPlan selectApsPartPlanById(String id);
+
+ /**
+ * 鏌ヨ闆朵欢璁″垝绠＄悊鍒楄〃
+ *
+ * @param apsPartPlan 闆朵欢璁″垝绠＄悊
+ * @return 闆朵欢璁″垝绠＄悊闆嗗悎
+ */
+ public List<ApsPartPlan> selectApsPartPlanList(ApsPartPlan apsPartPlan);
+
+ /**
+ * 鏂板闆朵欢璁″垝绠＄悊
+ *
+ * @param apsPartPlan 闆朵欢璁″垝绠＄悊
+ * @return 缁撴灉
+ */
+ public int insertApsPartPlan(ApsPartPlan apsPartPlan);
+
+ /**
+ * 淇敼闆朵欢璁″垝绠＄悊
+ *
+ * @param apsPartPlan 闆朵欢璁″垝绠＄悊
+ * @return 缁撴灉
+ */
+ public int updateApsPartPlan(ApsPartPlan apsPartPlan);
+
+ /**
+ * 鍒犻櫎闆朵欢璁″垝绠＄悊
+ *
+ * @param id 闆朵欢璁″垝绠＄悊涓婚敭
+ * @return 缁撴灉
+ */
+ public int deleteApsPartPlanById(String id);
+
+ /**
+ * 鎵归噺鍒犻櫎闆朵欢璁″垝绠＄悊
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteApsPartPlanByIds(String[] ids);
+}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPartPlanService.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPartPlanService.java
new file mode 100644
index 0000000..8dd27bd
--- /dev/null
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPartPlanService.java
@@ -0,0 +1,61 @@
+package com.aps.core.service;
+
+import java.util.List;
+import com.aps.core.domain.ApsPartPlan;
+
+/**
+ * 闆朵欢璁″垝绠＄悊Service鎺ュ彛
+ *
+ * @author wwj
+ * @date 2025-04-08
+ */
+public interface IApsPartPlanService
+{
+ /**
+ * 鏌ヨ闆朵欢璁″垝绠＄悊
+ *
+ * @param id 闆朵欢璁″垝绠＄悊涓婚敭
+ * @return 闆朵欢璁″垝绠＄悊
+ */
+ public ApsPartPlan selectApsPartPlanById(String id);
+
+ /**
+ * 鏌ヨ闆朵欢璁″垝绠＄悊鍒楄〃
+ *
+ * @param apsPartPlan 闆朵欢璁″垝绠＄悊
+ * @return 闆朵欢璁″垝绠＄悊闆嗗悎
+ */
+ public List<ApsPartPlan> selectApsPartPlanList(ApsPartPlan apsPartPlan);
+
+ /**
+ * 鏂板闆朵欢璁″垝绠＄悊
+ *
+ * @param apsPartPlan 闆朵欢璁″垝绠＄悊
+ * @return 缁撴灉
+ */
+ public int insertApsPartPlan(ApsPartPlan apsPartPlan);
+
+ /**
+ * 淇敼闆朵欢璁″垝绠＄悊
+ *
+ * @param apsPartPlan 闆朵欢璁″垝绠＄悊
+ * @return 缁撴灉
+ */
+ public int updateApsPartPlan(ApsPartPlan apsPartPlan);
+
+ /**
+ * 鎵归噺鍒犻櫎闆朵欢璁″垝绠＄悊
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑闆朵欢璁″垝绠＄悊涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteApsPartPlanByIds(String[] ids);
+
+ /**
+ * 鍒犻櫎闆朵欢璁″垝绠＄悊淇℃伅
+ *
+ * @param id 闆朵欢璁″垝绠＄悊涓婚敭
+ * @return 缁撴灉
+ */
+ public int deleteApsPartPlanById(String id);
+}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartPlanServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartPlanServiceImpl.java
new file mode 100644
index 0000000..7739139
--- /dev/null
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartPlanServiceImpl.java
@@ -0,0 +1,93 @@
+package com.aps.core.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.aps.core.mapper.ApsPartPlanMapper;
+import com.aps.core.domain.ApsPartPlan;
+import com.aps.core.service.IApsPartPlanService;
+
+/**
+ * 闆朵欢璁″垝绠＄悊Service涓氬姟灞傚鐞�
+ *
+ * @author wwj
+ * @date 2025-04-08
+ */
+@Service
+public class ApsPartPlanServiceImpl implements IApsPartPlanService
+{
+ @Autowired
+ private ApsPartPlanMapper apsPartPlanMapper;
+
+ /**
+ * 鏌ヨ闆朵欢璁″垝绠＄悊
+ *
+ * @param id 闆朵欢璁″垝绠＄悊涓婚敭
+ * @return 闆朵欢璁″垝绠＄悊
+ */
+ @Override
+ public ApsPartPlan selectApsPartPlanById(String id)
+ {
+ return apsPartPlanMapper.selectApsPartPlanById(id);
+ }
+
+ /**
+ * 鏌ヨ闆朵欢璁″垝绠＄悊鍒楄〃
+ *
+ * @param apsPartPlan 闆朵欢璁″垝绠＄悊
+ * @return 闆朵欢璁″垝绠＄悊
+ */
+ @Override
+ public List<ApsPartPlan> selectApsPartPlanList(ApsPartPlan apsPartPlan)
+ {
+ return apsPartPlanMapper.selectApsPartPlanList(apsPartPlan);
+ }
+
+ /**
+ * 鏂板闆朵欢璁″垝绠＄悊
+ *
+ * @param apsPartPlan 闆朵欢璁″垝绠＄悊
+ * @return 缁撴灉
+ */
+ @Override
+ public int insertApsPartPlan(ApsPartPlan apsPartPlan)
+ {
+ return apsPartPlanMapper.insertApsPartPlan(apsPartPlan);
+ }
+
+ /**
+ * 淇敼闆朵欢璁″垝绠＄悊
+ *
+ * @param apsPartPlan 闆朵欢璁″垝绠＄悊
+ * @return 缁撴灉
+ */
+ @Override
+ public int updateApsPartPlan(ApsPartPlan apsPartPlan)
+ {
+ return apsPartPlanMapper.updateApsPartPlan(apsPartPlan);
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎闆朵欢璁″垝绠＄悊
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑闆朵欢璁″垝绠＄悊涓婚敭
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteApsPartPlanByIds(String[] ids)
+ {
+ return apsPartPlanMapper.deleteApsPartPlanByIds(ids);
+ }
+
+ /**
+ * 鍒犻櫎闆朵欢璁″垝绠＄悊淇℃伅
+ *
+ * @param id 闆朵欢璁″垝绠＄悊涓婚敭
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteApsPartPlanById(String id)
+ {
+ return apsPartPlanMapper.deleteApsPartPlanById(id);
+ }
+}
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPartPlanMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPartPlanMapper.xml
new file mode 100644
index 0000000..3fa4b0e
--- /dev/null
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPartPlanMapper.xml
@@ -0,0 +1,223 @@
+<?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.ApsPartPlanMapper">
+
+ <resultMap type="com.aps.core.domain.ApsPartPlan" id="ApsPartPlanResult">
+ <result property="id" column="id" />
+ <result property="masterPlanner" column="master_planner" />
+ <result property="weekDay" column="week_day" />
+ <result property="weekCycle" column="week_cycle" />
+ <result property="mainPartNumber" column="main_part_number" />
+ <result property="mainPartDrawingNumber" column="main_part_drawing_number" />
+ <result property="customer" column="customer" />
+ <result property="businessType" column="business_type" />
+ <result property="documentNumber" column="document_number" />
+ <result property="requirementType" column="requirement_type" />
+ <result property="documentStatus" column="document_status" />
+ <result property="itemNumber" column="item_number" />
+ <result property="drawingNo" column="drawing_no" />
+ <result property="versionNumber" column="version_number" />
+ <result property="productionQuantity" column="production_quantity" />
+ <result property="goodProductsQuantity" column="good_products_quantity" />
+ <result property="processNumber" column="process_number" />
+ <result property="workCenter" column="work_center" />
+ <result property="department" column="department" />
+ <result property="planStartDay" column="plan_start_day" />
+ <result property="planEndDay" column="plan_end_day" />
+ <result property="standbyNumber" column="standby_number" />
+ <result property="standbyName" column="standby_name" />
+ <result property="standbyStock" column="standby_stock" />
+ <result property="nextProcessDeparment" column="next_process_deparment" />
+ <result property="isSuspended" column="is_suspended" />
+ <result property="isOutsourcing" column="is_outsourcing" />
+ <result property="account" column="account" />
+ <result property="advancedMaterials" column="advanced_materials" />
+ <result property="advancedDocumentNumber" column="advanced_document_number" />
+ <result property="advancedRequirementDay" column="advanced_requirement_day" />
+ <result property="isPlanComplete" column="is_plan_complete" />
+ <result property="isStockComplete" column="is_stock_complete" />
+ <result property="hasTurnback" column="has_turnback" />
+ <result property="hasRisk" column="has_risk" />
+ </resultMap>
+
+ <sql id="selectApsPartPlanVo">
+ select id, master_planner, week_day, week_cycle, main_part_number, main_part_drawing_number, customer, business_type, document_number, requirement_type, document_status, item_number, drawing_no, version_number, production_quantity, good_products_quantity, process_number, work_center, department, plan_start_day, plan_end_day, standby_number, standby_name, standby_stock, next_process_deparment, is_suspended, is_outsourcing, account, advanced_materials, advanced_document_number, advanced_requirement_day, is_plan_complete, is_stock_complete, has_turnback, has_risk from aps_part_plan
+ </sql>
+
+ <select id="selectApsPartPlanList" parameterType="com.aps.core.domain.ApsPartPlan" resultMap="ApsPartPlanResult">
+ <include refid="selectApsPartPlanVo"/>
+ <where>
+ <if test="masterPlanner != null and masterPlanner != ''"> and master_planner like concat('%', #{masterPlanner}, '%')</if>
+ <if test="weekDay != null "> and week_day = #{weekDay}</if>
+ <if test="weekCycle != null and weekCycle != ''"> and week_cycle = #{weekCycle}</if>
+ <if test="mainPartNumber != null and mainPartNumber != ''"> and main_part_number = #{mainPartNumber}</if>
+ <if test="mainPartDrawingNumber != null and mainPartDrawingNumber != ''"> and main_part_drawing_number = #{mainPartDrawingNumber}</if>
+ <if test="customer != null and customer != ''"> and customer like concat('%', #{customer}, '%')</if>
+ <if test="businessType != null and businessType != ''"> and business_type = #{businessType}</if>
+ <if test="documentNumber != null and documentNumber != ''"> and document_number = #{documentNumber}</if>
+ <if test="requirementType != null and requirementType != ''"> and requirement_type = #{requirementType}</if>
+ <if test="documentStatus != null and documentStatus != ''"> and document_status = #{documentStatus}</if>
+ <if test="itemNumber != null and itemNumber != ''"> and item_number = #{itemNumber}</if>
+ <if test="drawingNo != null and drawingNo != ''"> and drawing_no = #{drawingNo}</if>
+ <if test="versionNumber != null and versionNumber != ''"> and version_number = #{versionNumber}</if>
+ <if test="productionQuantity != null "> and production_quantity = #{productionQuantity}</if>
+ <if test="goodProductsQuantity != null "> and good_products_quantity = #{goodProductsQuantity}</if>
+ <if test="processNumber != null and processNumber != ''"> and process_number = #{processNumber}</if>
+ <if test="workCenter != null and workCenter != ''"> and work_center = #{workCenter}</if>
+ <if test="department != null and department != ''"> and department = #{department}</if>
+ <if test="params.beginPlanStartDay != null and params.beginPlanStartDay != '' and params.endPlanStartDay != null and params.endPlanStartDay != ''"> and plan_start_day between #{params.beginPlanStartDay} and #{params.endPlanStartDay}</if>
+ <if test="params.beginPlanEndDay != null and params.beginPlanEndDay != '' and params.endPlanEndDay != null and params.endPlanEndDay != ''"> and plan_end_day between #{params.beginPlanEndDay} and #{params.endPlanEndDay}</if>
+ <if test="standbyNumber != null and standbyNumber != ''"> and standby_number = #{standbyNumber}</if>
+ <if test="standbyName != null and standbyName != ''"> and standby_name like concat('%', #{standbyName}, '%')</if>
+ <if test="standbyStock != null "> and standby_stock = #{standbyStock}</if>
+ <if test="nextProcessDeparment != null and nextProcessDeparment != ''"> and next_process_deparment = #{nextProcessDeparment}</if>
+ <if test="isSuspended != null "> and is_suspended = #{isSuspended}</if>
+ <if test="isOutsourcing != null "> and is_outsourcing = #{isOutsourcing}</if>
+ <if test="account != null and account != ''"> and account = #{account}</if>
+ <if test="advancedMaterials != null and advancedMaterials != ''"> and advanced_materials = #{advancedMaterials}</if>
+ <if test="advancedDocumentNumber != null and advancedDocumentNumber != ''"> and advanced_document_number = #{advancedDocumentNumber}</if>
+ <if test="advancedRequirementDay != null "> and advanced_requirement_day = #{advancedRequirementDay}</if>
+ <if test="isPlanComplete != null "> and is_plan_complete = #{isPlanComplete}</if>
+ <if test="isStockComplete != null "> and is_stock_complete = #{isStockComplete}</if>
+ <if test="hasTurnback != null "> and has_turnback = #{hasTurnback}</if>
+ <if test="hasRisk != null "> and has_risk = #{hasRisk}</if>
+ </where>
+ </select>
+
+ <select id="selectApsPartPlanById" parameterType="String" resultMap="ApsPartPlanResult">
+ <include refid="selectApsPartPlanVo"/>
+ where id = #{id}
+ </select>
+
+ <insert id="insertApsPartPlan" parameterType="com.aps.core.domain.ApsPartPlan">
+ insert into aps_part_plan
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="id != null and id != ''">id,</if>
+ <if test="masterPlanner != null">master_planner,</if>
+ <if test="weekDay != null">week_day,</if>
+ <if test="weekCycle != null">week_cycle,</if>
+ <if test="mainPartNumber != null">main_part_number,</if>
+ <if test="mainPartDrawingNumber != null">main_part_drawing_number,</if>
+ <if test="customer != null">customer,</if>
+ <if test="businessType != null">business_type,</if>
+ <if test="documentNumber != null">document_number,</if>
+ <if test="requirementType != null">requirement_type,</if>
+ <if test="documentStatus != null">document_status,</if>
+ <if test="itemNumber != null">item_number,</if>
+ <if test="drawingNo != null">drawing_no,</if>
+ <if test="versionNumber != null">version_number,</if>
+ <if test="productionQuantity != null">production_quantity,</if>
+ <if test="goodProductsQuantity != null">good_products_quantity,</if>
+ <if test="processNumber != null">process_number,</if>
+ <if test="workCenter != null">work_center,</if>
+ <if test="department != null">department,</if>
+ <if test="planStartDay != null">plan_start_day,</if>
+ <if test="planEndDay != null">plan_end_day,</if>
+ <if test="standbyNumber != null">standby_number,</if>
+ <if test="standbyName != null">standby_name,</if>
+ <if test="standbyStock != null">standby_stock,</if>
+ <if test="nextProcessDeparment != null">next_process_deparment,</if>
+ <if test="isSuspended != null">is_suspended,</if>
+ <if test="isOutsourcing != null">is_outsourcing,</if>
+ <if test="account != null">account,</if>
+ <if test="advancedMaterials != null">advanced_materials,</if>
+ <if test="advancedDocumentNumber != null">advanced_document_number,</if>
+ <if test="advancedRequirementDay != null">advanced_requirement_day,</if>
+ <if test="isPlanComplete != null">is_plan_complete,</if>
+ <if test="isStockComplete != null">is_stock_complete,</if>
+ <if test="hasTurnback != null">has_turnback,</if>
+ <if test="hasRisk != null">has_risk,</if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="id != null and id != ''">#{id},</if>
+ <if test="masterPlanner != null">#{masterPlanner},</if>
+ <if test="weekDay != null">#{weekDay},</if>
+ <if test="weekCycle != null">#{weekCycle},</if>
+ <if test="mainPartNumber != null">#{mainPartNumber},</if>
+ <if test="mainPartDrawingNumber != null">#{mainPartDrawingNumber},</if>
+ <if test="customer != null">#{customer},</if>
+ <if test="businessType != null">#{businessType},</if>
+ <if test="documentNumber != null">#{documentNumber},</if>
+ <if test="requirementType != null">#{requirementType},</if>
+ <if test="documentStatus != null">#{documentStatus},</if>
+ <if test="itemNumber != null">#{itemNumber},</if>
+ <if test="drawingNo != null">#{drawingNo},</if>
+ <if test="versionNumber != null">#{versionNumber},</if>
+ <if test="productionQuantity != null">#{productionQuantity},</if>
+ <if test="goodProductsQuantity != null">#{goodProductsQuantity},</if>
+ <if test="processNumber != null">#{processNumber},</if>
+ <if test="workCenter != null">#{workCenter},</if>
+ <if test="department != null">#{department},</if>
+ <if test="planStartDay != null">#{planStartDay},</if>
+ <if test="planEndDay != null">#{planEndDay},</if>
+ <if test="standbyNumber != null">#{standbyNumber},</if>
+ <if test="standbyName != null">#{standbyName},</if>
+ <if test="standbyStock != null">#{standbyStock},</if>
+ <if test="nextProcessDeparment != null">#{nextProcessDeparment},</if>
+ <if test="isSuspended != null">#{isSuspended},</if>
+ <if test="isOutsourcing != null">#{isOutsourcing},</if>
+ <if test="account != null">#{account},</if>
+ <if test="advancedMaterials != null">#{advancedMaterials},</if>
+ <if test="advancedDocumentNumber != null">#{advancedDocumentNumber},</if>
+ <if test="advancedRequirementDay != null">#{advancedRequirementDay},</if>
+ <if test="isPlanComplete != null">#{isPlanComplete},</if>
+ <if test="isStockComplete != null">#{isStockComplete},</if>
+ <if test="hasTurnback != null">#{hasTurnback},</if>
+ <if test="hasRisk != null">#{hasRisk},</if>
+ </trim>
+ </insert>
+
+ <update id="updateApsPartPlan" parameterType="com.aps.core.domain.ApsPartPlan">
+ update aps_part_plan
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="masterPlanner != null">master_planner = #{masterPlanner},</if>
+ <if test="weekDay != null">week_day = #{weekDay},</if>
+ <if test="weekCycle != null">week_cycle = #{weekCycle},</if>
+ <if test="mainPartNumber != null">main_part_number = #{mainPartNumber},</if>
+ <if test="mainPartDrawingNumber != null">main_part_drawing_number = #{mainPartDrawingNumber},</if>
+ <if test="customer != null">customer = #{customer},</if>
+ <if test="businessType != null">business_type = #{businessType},</if>
+ <if test="documentNumber != null">document_number = #{documentNumber},</if>
+ <if test="requirementType != null">requirement_type = #{requirementType},</if>
+ <if test="documentStatus != null">document_status = #{documentStatus},</if>
+ <if test="itemNumber != null">item_number = #{itemNumber},</if>
+ <if test="drawingNo != null">drawing_no = #{drawingNo},</if>
+ <if test="versionNumber != null">version_number = #{versionNumber},</if>
+ <if test="productionQuantity != null">production_quantity = #{productionQuantity},</if>
+ <if test="goodProductsQuantity != null">good_products_quantity = #{goodProductsQuantity},</if>
+ <if test="processNumber != null">process_number = #{processNumber},</if>
+ <if test="workCenter != null">work_center = #{workCenter},</if>
+ <if test="department != null">department = #{department},</if>
+ <if test="planStartDay != null">plan_start_day = #{planStartDay},</if>
+ <if test="planEndDay != null">plan_end_day = #{planEndDay},</if>
+ <if test="standbyNumber != null">standby_number = #{standbyNumber},</if>
+ <if test="standbyName != null">standby_name = #{standbyName},</if>
+ <if test="standbyStock != null">standby_stock = #{standbyStock},</if>
+ <if test="nextProcessDeparment != null">next_process_deparment = #{nextProcessDeparment},</if>
+ <if test="isSuspended != null">is_suspended = #{isSuspended},</if>
+ <if test="isOutsourcing != null">is_outsourcing = #{isOutsourcing},</if>
+ <if test="account != null">account = #{account},</if>
+ <if test="advancedMaterials != null">advanced_materials = #{advancedMaterials},</if>
+ <if test="advancedDocumentNumber != null">advanced_document_number = #{advancedDocumentNumber},</if>
+ <if test="advancedRequirementDay != null">advanced_requirement_day = #{advancedRequirementDay},</if>
+ <if test="isPlanComplete != null">is_plan_complete = #{isPlanComplete},</if>
+ <if test="isStockComplete != null">is_stock_complete = #{isStockComplete},</if>
+ <if test="hasTurnback != null">has_turnback = #{hasTurnback},</if>
+ <if test="hasRisk != null">has_risk = #{hasRisk},</if>
+ </trim>
+ where id = #{id}
+ </update>
+
+ <delete id="deleteApsPartPlanById" parameterType="String">
+ delete from aps_part_plan where id = #{id}
+ </delete>
+
+ <delete id="deleteApsPartPlanByIds" parameterType="String">
+ delete from aps_part_plan where id in
+ <foreach item="id" collection="array" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </delete>
+</mapper>
\ No newline at end of file
diff --git a/aps-modules/aps-upload/src/main/java/com/aps/upload/service/impl/CoreServiceImpl.java b/aps-modules/aps-upload/src/main/java/com/aps/upload/service/impl/CoreServiceImpl.java
index 53dda10..d263001 100644
--- a/aps-modules/aps-upload/src/main/java/com/aps/upload/service/impl/CoreServiceImpl.java
+++ b/aps-modules/aps-upload/src/main/java/com/aps/upload/service/impl/CoreServiceImpl.java
@@ -1,6 +1,6 @@
package com.aps.upload.service.impl;
-import com.aps.core.service.ICoreService;
+import com.aps.upload.service.ICoreService;
import org.springframework.context.annotation.Primary;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
--
Gitblit v1.9.3