From 668eed92806a814d0ea20fbab1caa7d1e6d197ea Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期一, 19 五月 2025 10:34:57 +0800
Subject: [PATCH] 优化钣金相关代码结构
---
aps-modules/aps-core/src/main/resources/mapper/core/ApsPlate/ApsPlatePlanTempMapper.xml | 8
aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlate/ApsPlateStandardRequireController.java | 8
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlate/ApsPlateStandardRequireBomOrderDetail.java | 2
aps-modules/aps-core/src/main/resources/mapper/core/ApsPlate/ApsPlatePlanMapper.xml | 20 +-
aps-modules/aps-core/src/main/java/com/aps/core/service/ApsPlateStandardRequireOrderEndDayService.java | 2
aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlateStandardRequireOrderEndDayMapper.java | 4
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlate/ApsPlatePlanTemp.java | 2
aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlateStandardRequireErrorMapper.java | 2
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlate/ApsPlateStandardRequireBatchServiceImpl.java | 6
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlate/ApsPlateStandardRequireErrorServiceImpl.java | 6
aps-modules/aps-core/src/main/java/com/aps/core/service/ApsPlate/IApsPlateStandardRequireBomStockDetailService.java | 7
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlate/ApsPlateStandardRequireBomStockDetail.java | 2
aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlateStandardRequireBomStockDetailMapper.java | 3
aps-modules/aps-core/src/main/resources/mapper/core/ApsPlate/ApsPlateStandardRequireErrorMapper.xml | 8
aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlate/ApsPlateStandardRequireErrorController.java | 6
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlate/ApsPlateOrderPlanDate.java | 2
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlate/ApsPlateProcessShopPlanStat.java | 2
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlate/ApsPlateProcessShopStatServiceImpl.java | 8
aps-modules/aps-core/src/main/java/com/aps/core/service/ApsPlate/IApsPlateProcessStatService.java | 4
aps-modules/aps-core/src/main/java/com/aps/core/service/ApsPlate/IApsPlatePlanService.java | 6
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlate/ApsPlateOrderPlanManagerServiceImpl.java | 16 +-
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlate/ApsPlatePlanServiceImpl.java | 8
aps-modules/aps-core/src/main/resources/mapper/core/ApsPlate/ApsPlateStandardRequireMapper.xml | 10
aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlate/ApsPlatePlanTempController.java | 8
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlate/ApsPlateStandardRequireServiceImpl.java | 11 +
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlate/ApsPlateProcessShopStat.java | 2
aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlateProcessStatMapper.java | 2
aps-modules/aps-core/src/main/java/com/aps/core/service/ApsPlate/IApsPlateProcessShopStatService.java | 4
aps-modules/aps-core/src/main/java/com/aps/core/service/ApsPlate/IApsPlateStandardRequireErrorService.java | 4
aps-modules/aps-core/src/main/resources/mapper/core/ApsPlate/ApsPlateProcessStatMapper.xml | 10
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlate/ApsPlateOrderPlanManager.java | 2
aps-modules/aps-core/src/main/java/com/aps/core/service/ApsPlate/IApsPlateOrderPlanManagerService.java | 8
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlate/ApsPlateProcessStatServiceImpl.java | 7
aps-modules/aps-core/src/main/resources/mapper/core/ApsPlate/ApsPlateStandardRequireOrderEndDayMapper.xml | 2
aps-modules/aps-core/src/main/resources/mapper/core/ApsPlate/ApsPlatePlanOrderManagerMapper.xml | 12
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlate/ApsPlateOrderPlanRequireDate.java | 3
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlate/ApsPlateStandardRequire.java | 2
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlate/ApsPlatePlan.java | 2
aps-modules/aps-core/src/main/java/com/aps/core/service/IApsStandardProcessRouteLineService.java | 3
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlate/ApsPlateStandardRequireBomOrderDetailServiceImpl.java | 10
aps-modules/aps-core/src/main/java/com/aps/core/service/ApsPlate/IApsPlateStandardRequireService.java | 5
aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlateStandardRequireMapper.java | 2
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlate/ApsPlateStandardRequireBomStockDetailServiceImpl.java | 10
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsStandardProcessRouteLineServiceImpl.java | 4
aps-modules/aps-core/src/main/java/com/aps/core/controller/CoreController.java | 1
aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlate/ApsPlateProcessShopStatController.java | 10 -
aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlate/ApsPlatePlanController.java | 10
aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlate/ApsPlateOrderPlanManagerController.java | 14 +-
aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlatePlanMapper.java | 2
aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlateProcessShopStatMapper.java | 2
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlate/ApsPlateStandardRequireOrderEndDayServiceImpl.java | 4
aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlateStandardRequireBatchMapper.java | 2
aps-modules/aps-core/src/main/resources/mapper/core/ApsPlate/ApsPlateStandardRequireBomStockDetailMapper.xml | 10
aps-modules/aps-core/src/main/resources/mapper/core/ApsPlate/ApsPlateProcessShopStatMapper.xml | 8
aps-modules/aps-core/src/main/java/com/aps/core/service/ApsPlate/IApsPlateStandardRequireBatchService.java | 4
aps-modules/aps-core/src/main/java/com/aps/core/service/ApsPlate/IApsPlateStandardRequireBomOrderDetailService.java | 8
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlate/ApsPlateProcessStat.java | 4
aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlateStandardRequireBomOrderDetailMapper.java | 4
aps-modules/aps-core/src/main/resources/mapper/core/ApsPlate/ApsPlateStandardRequireBomOrderDetailMapper.xml | 12
aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlate/ApsPlateProcessStatController.java | 8
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlate/ApsPlateStandardRequireBatch.java | 2
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlate/ApsPlateStandardRequireOrderEndDay.java | 3
aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlateOrderPlanManagerMapper.java | 8
aps-modules/aps-core/src/main/java/com/aps/core/service/ApsPlate/IApsPlatePlanTempService.java | 4
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlate/ApsPlateStandardRequireError.java | 2
aps-modules/aps-core/src/main/resources/mapper/core/ApsPlate/ApsPlateStandardRequireBatchMapper.xml | 8
aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlatePlanTempMapper.java | 2
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlate/ApsPlatePlanTempServiceImpl.java | 6
68 files changed, 194 insertions(+), 199 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/CoreController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/CoreController.java
index 9300848..764b90a 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/CoreController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/CoreController.java
@@ -4,6 +4,7 @@
import com.aps.common.core.utils.file.FileUtils;
import com.aps.common.core.web.domain.AjaxResult;
import com.aps.core.service.*;
+import com.aps.core.service.ApsPlate.IApsPlatePlanService;
import com.aps.system.api.domain.SysFile;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlateOrderPlanManagerController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlate/ApsPlateOrderPlanManagerController.java
similarity index 84%
rename from aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlateOrderPlanManagerController.java
rename to aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlate/ApsPlateOrderPlanManagerController.java
index 9fe3134..595da19 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlateOrderPlanManagerController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlate/ApsPlateOrderPlanManagerController.java
@@ -1,15 +1,15 @@
-package com.aps.core.controller.mainPlan;
+package com.aps.core.controller.mainPlan.ApsPlate;
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.security.annotation.RequiresPermissions;
-import com.aps.core.domain.ApsPlateOrderPlanDate;
-import com.aps.core.domain.ApsPlateOrderPlanManager;
-import com.aps.core.domain.ApsPlatePlan;
-import com.aps.core.domain.ApsPlateStandardRequire;
-import com.aps.core.service.IApsPlateOrderPlanManagerService;
-import com.aps.core.service.IApsPlateStandardRequireBomOrderDetailService;
+import com.aps.core.domain.ApsPlate.ApsPlateOrderPlanDate;
+import com.aps.core.domain.ApsPlate.ApsPlateOrderPlanManager;
+import com.aps.core.domain.ApsPlate.ApsPlatePlan;
+import com.aps.core.domain.ApsPlate.ApsPlateStandardRequire;
+import com.aps.core.service.ApsPlate.IApsPlateOrderPlanManagerService;
+import com.aps.core.service.ApsPlate.IApsPlateStandardRequireBomOrderDetailService;
import jakarta.annotation.Resource;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPlatePlanController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlate/ApsPlatePlanController.java
similarity index 96%
rename from aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPlatePlanController.java
rename to aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlate/ApsPlatePlanController.java
index 6be84ee..8a6440a 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPlatePlanController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlate/ApsPlatePlanController.java
@@ -1,4 +1,4 @@
-package com.aps.core.controller;
+package com.aps.core.controller.mainPlan.ApsPlate;
import com.aps.common.core.utils.poi.ExcelUtil;
import com.aps.common.core.web.controller.BaseController;
@@ -8,11 +8,11 @@
import com.aps.common.log.enums.BusinessType;
import com.aps.common.security.annotation.RequiresPermissions;
import com.aps.common.security.utils.DictUtils;
-import com.aps.core.domain.ApsPlatePlan;
-import com.aps.core.domain.ApsPlatePlanTemp;
+import com.aps.core.domain.ApsPlate.ApsPlatePlan;
+import com.aps.core.domain.ApsPlate.ApsPlatePlanTemp;
import com.aps.core.domain.export.ApsPlatePlanExport;
-import com.aps.core.service.IApsPlatePlanService;
-import com.aps.core.service.IApsPlatePlanTempService;
+import com.aps.core.service.ApsPlate.IApsPlatePlanService;
+import com.aps.core.service.ApsPlate.IApsPlatePlanTempService;
import com.aps.system.api.domain.SysDictData;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.BeanUtils;
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPlatePlanTempController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlate/ApsPlatePlanTempController.java
similarity index 95%
rename from aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPlatePlanTempController.java
rename to aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlate/ApsPlatePlanTempController.java
index 7ae97dd..4dbeab5 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPlatePlanTempController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlate/ApsPlatePlanTempController.java
@@ -1,7 +1,7 @@
-package com.aps.core.controller;
+package com.aps.core.controller.mainPlan.ApsPlate;
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;
@@ -15,8 +15,8 @@
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.ApsPlatePlanTemp;
-import com.aps.core.service.IApsPlatePlanTempService;
+import com.aps.core.domain.ApsPlate.ApsPlatePlanTemp;
+import com.aps.core.service.ApsPlate.IApsPlatePlanTempService;
import com.aps.common.core.web.controller.BaseController;
import com.aps.common.core.web.domain.AjaxResult;
import com.aps.common.core.utils.poi.ExcelUtil;
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlateProcessShopStatController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlate/ApsPlateProcessShopStatController.java
similarity index 88%
rename from aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlateProcessShopStatController.java
rename to aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlate/ApsPlateProcessShopStatController.java
index d1d0613..ef09bbc 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlateProcessShopStatController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlate/ApsPlateProcessShopStatController.java
@@ -1,21 +1,17 @@
-package com.aps.core.controller.mainPlan;
+package com.aps.core.controller.mainPlan.ApsPlate;
-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.ApsPlateProcessShopStat;
-import com.aps.core.service.IApsPlateProcessShopStatService;
+import com.aps.core.domain.ApsPlate.ApsPlateProcessShopStat;
+import com.aps.core.service.ApsPlate.IApsPlateProcessShopStatService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
/**
* 閽ｉ噾杞﹂棿缁熻Controller
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlateProcessStatController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlate/ApsPlateProcessStatController.java
similarity index 93%
rename from aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlateProcessStatController.java
rename to aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlate/ApsPlateProcessStatController.java
index 56c578d..2b8ae88 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlateProcessStatController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlate/ApsPlateProcessStatController.java
@@ -1,13 +1,11 @@
-package com.aps.core.controller.mainPlan;
+package com.aps.core.controller.mainPlan.ApsPlate;
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;
@@ -16,8 +14,8 @@
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.ApsPlateProcessStat;
-import com.aps.core.service.IApsPlateProcessStatService;
+import com.aps.core.domain.ApsPlate.ApsPlateProcessStat;
+import com.aps.core.service.ApsPlate.IApsPlateProcessStatService;
import com.aps.common.core.web.controller.BaseController;
import com.aps.common.core.web.domain.AjaxResult;
import com.aps.common.core.utils.poi.ExcelUtil;
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/ApsPlate/ApsPlateStandardRequireController.java
similarity index 95%
rename from aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlateStandardRequireController.java
rename to aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlate/ApsPlateStandardRequireController.java
index 34371a6..b9da482 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/ApsPlate/ApsPlateStandardRequireController.java
@@ -1,4 +1,4 @@
-package com.aps.core.controller.mainPlan;
+package com.aps.core.controller.mainPlan.ApsPlate;
import com.aps.common.core.utils.poi.ExcelUtil;
import com.aps.common.core.web.controller.BaseController;
@@ -7,11 +7,11 @@
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.domain.ApsPlate.ApsPlateStandardRequire;
import com.aps.core.enums.PLAN_TASK_STATUS;
import com.aps.core.service.ApsPlanTaskService;
-import com.aps.core.service.IApsPlateStandardRequireBatchService;
-import com.aps.core.service.IApsPlateStandardRequireService;
+import com.aps.core.service.ApsPlate.IApsPlateStandardRequireBatchService;
+import com.aps.core.service.ApsPlate.IApsPlateStandardRequireService;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlateStandardRequireErrorController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlate/ApsPlateStandardRequireErrorController.java
similarity index 95%
rename from aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlateStandardRequireErrorController.java
rename to aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlate/ApsPlateStandardRequireErrorController.java
index 4aae62e..c3ea56c 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlateStandardRequireErrorController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlate/ApsPlateStandardRequireErrorController.java
@@ -1,4 +1,4 @@
-package com.aps.core.controller.mainPlan;
+package com.aps.core.controller.mainPlan.ApsPlate;
import com.aps.common.core.utils.poi.ExcelUtil;
import com.aps.common.core.web.controller.BaseController;
@@ -7,8 +7,8 @@
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.ApsPlateStandardRequireError;
-import com.aps.core.service.IApsPlateStandardRequireErrorService;
+import com.aps.core.domain.ApsPlate.ApsPlateStandardRequireError;
+import com.aps.core.service.ApsPlate.IApsPlateStandardRequireErrorService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateOrderPlanDate.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlate/ApsPlateOrderPlanDate.java
similarity index 94%
rename from aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateOrderPlanDate.java
rename to aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlate/ApsPlateOrderPlanDate.java
index 8ea0b85..74e3439 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateOrderPlanDate.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlate/ApsPlateOrderPlanDate.java
@@ -1,4 +1,4 @@
-package com.aps.core.domain;
+package com.aps.core.domain.ApsPlate;
import com.aps.common.core.web.domain.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
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/ApsPlate/ApsPlateOrderPlanManager.java
similarity index 98%
rename from aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateOrderPlanManager.java
rename to aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlate/ApsPlateOrderPlanManager.java
index 28b0904..0d56817 100644
--- 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/ApsPlate/ApsPlateOrderPlanManager.java
@@ -1,4 +1,4 @@
-package com.aps.core.domain;
+package com.aps.core.domain.ApsPlate;
import com.aps.common.core.annotation.Excel;
import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateOrderPlanRequireDate.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlate/ApsPlateOrderPlanRequireDate.java
similarity index 90%
rename from aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateOrderPlanRequireDate.java
rename to aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlate/ApsPlateOrderPlanRequireDate.java
index 29774df..45bab34 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateOrderPlanRequireDate.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlate/ApsPlateOrderPlanRequireDate.java
@@ -1,11 +1,10 @@
-package com.aps.core.domain;
+package com.aps.core.domain.ApsPlate;
import com.aps.common.core.web.domain.BaseEntity;
import lombok.Data;
import java.io.Serial;
import java.sql.Timestamp;
-import java.util.List;
/**
* 閽ｉ噾宸ュ崟璁″垝闇�姹傛棩鏈�
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlate/ApsPlatePlan.java
similarity index 99%
rename from aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java
rename to aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlate/ApsPlatePlan.java
index b92f664..d75a537 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlate/ApsPlatePlan.java
@@ -1,4 +1,4 @@
-package com.aps.core.domain;
+package com.aps.core.domain.ApsPlate;
import com.aps.common.core.annotation.Excel;
import com.aps.common.core.web.domain.BaseEntity;
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlanTemp.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlate/ApsPlatePlanTemp.java
similarity index 99%
rename from aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlanTemp.java
rename to aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlate/ApsPlatePlanTemp.java
index b928e75..1a08810 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlanTemp.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlate/ApsPlatePlanTemp.java
@@ -1,4 +1,4 @@
-package com.aps.core.domain;
+package com.aps.core.domain.ApsPlate;
import com.aps.common.core.annotation.Excel;
import com.aps.common.core.web.domain.BaseEntity;
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessShopPlanStat.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlate/ApsPlateProcessShopPlanStat.java
similarity index 98%
rename from aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessShopPlanStat.java
rename to aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlate/ApsPlateProcessShopPlanStat.java
index 9dbc55b..eb5d194 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessShopPlanStat.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlate/ApsPlateProcessShopPlanStat.java
@@ -1,4 +1,4 @@
-package com.aps.core.domain;
+package com.aps.core.domain.ApsPlate;
import com.aps.common.core.annotation.Excel;
import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessShopStat.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlate/ApsPlateProcessShopStat.java
similarity index 98%
rename from aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessShopStat.java
rename to aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlate/ApsPlateProcessShopStat.java
index 1507913..6e22037 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessShopStat.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlate/ApsPlateProcessShopStat.java
@@ -1,4 +1,4 @@
-package com.aps.core.domain;
+package com.aps.core.domain.ApsPlate;
import io.swagger.v3.oas.annotations.media.Schema;
import org.apache.commons.lang3.builder.ToStringBuilder;
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessStat.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlate/ApsPlateProcessStat.java
similarity index 97%
rename from aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessStat.java
rename to aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlate/ApsPlateProcessStat.java
index 30c438d..049144b 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessStat.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlate/ApsPlateProcessStat.java
@@ -1,11 +1,9 @@
-package com.aps.core.domain;
+package com.aps.core.domain.ApsPlate;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
-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;
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequire.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlate/ApsPlateStandardRequire.java
similarity index 98%
rename from aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequire.java
rename to aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlate/ApsPlateStandardRequire.java
index 379ccec..002d49b 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequire.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlate/ApsPlateStandardRequire.java
@@ -1,4 +1,4 @@
-package com.aps.core.domain;
+package com.aps.core.domain.ApsPlate;
import com.aps.common.core.annotation.Excel;
import com.aps.common.core.web.domain.BaseEntity;
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequireBatch.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlate/ApsPlateStandardRequireBatch.java
similarity index 93%
rename from aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequireBatch.java
rename to aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlate/ApsPlateStandardRequireBatch.java
index 0074085..7b938ae 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequireBatch.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlate/ApsPlateStandardRequireBatch.java
@@ -1,4 +1,4 @@
-package com.aps.core.domain;
+package com.aps.core.domain.ApsPlate;
import com.aps.common.core.web.domain.BaseEntity;
import lombok.Builder;
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequireBomOrderDetail.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlate/ApsPlateStandardRequireBomOrderDetail.java
similarity index 97%
rename from aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequireBomOrderDetail.java
rename to aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlate/ApsPlateStandardRequireBomOrderDetail.java
index c5a4db9..54c04e7 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequireBomOrderDetail.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlate/ApsPlateStandardRequireBomOrderDetail.java
@@ -1,4 +1,4 @@
-package com.aps.core.domain;
+package com.aps.core.domain.ApsPlate;
import com.aps.common.core.annotation.Excel;
import com.aps.common.core.web.domain.BaseEntity;
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequireBomStockDetail.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlate/ApsPlateStandardRequireBomStockDetail.java
similarity index 97%
rename from aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequireBomStockDetail.java
rename to aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlate/ApsPlateStandardRequireBomStockDetail.java
index 20283c2..36c3852 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequireBomStockDetail.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlate/ApsPlateStandardRequireBomStockDetail.java
@@ -1,4 +1,4 @@
-package com.aps.core.domain;
+package com.aps.core.domain.ApsPlate;
import com.aps.common.core.annotation.Excel;
import com.aps.common.core.web.domain.BaseEntity;
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequireError.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlate/ApsPlateStandardRequireError.java
similarity index 97%
rename from aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequireError.java
rename to aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlate/ApsPlateStandardRequireError.java
index 180f2a1..72b534b 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequireError.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlate/ApsPlateStandardRequireError.java
@@ -1,4 +1,4 @@
-package com.aps.core.domain;
+package com.aps.core.domain.ApsPlate;
import com.aps.common.core.annotation.Excel;
import com.aps.common.core.web.domain.BaseEntity;
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequireOrderEndDay.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlate/ApsPlateStandardRequireOrderEndDay.java
similarity index 95%
rename from aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequireOrderEndDay.java
rename to aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlate/ApsPlateStandardRequireOrderEndDay.java
index 2cd1646..2eb96d4 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequireOrderEndDay.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlate/ApsPlateStandardRequireOrderEndDay.java
@@ -1,7 +1,6 @@
-package com.aps.core.domain;
+package com.aps.core.domain.ApsPlate;
import com.aps.common.core.web.domain.BaseEntity;
-import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
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
index a37dd91..1204dc4 100644
--- 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
@@ -1,9 +1,9 @@
package com.aps.core.mapper;
-import com.aps.core.domain.ApsPlateOrderPlanDate;
-import com.aps.core.domain.ApsPlateOrderPlanManager;
-import com.aps.core.domain.ApsPlateOrderPlanRequireDate;
-import com.aps.core.domain.ApsPlateStandardRequire;
+import com.aps.core.domain.ApsPlate.ApsPlateOrderPlanDate;
+import com.aps.core.domain.ApsPlate.ApsPlateOrderPlanManager;
+import com.aps.core.domain.ApsPlate.ApsPlateOrderPlanRequireDate;
+import com.aps.core.domain.ApsPlate.ApsPlateStandardRequire;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlatePlanMapper.java b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlatePlanMapper.java
index 6590c9e..ad9cd0a 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlatePlanMapper.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlatePlanMapper.java
@@ -1,7 +1,7 @@
package com.aps.core.mapper;
import com.alibaba.fastjson2.JSONObject;
-import com.aps.core.domain.ApsPlatePlan;
+import com.aps.core.domain.ApsPlate.ApsPlatePlan;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlatePlanTempMapper.java b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlatePlanTempMapper.java
index 7d313b8..a4ded08 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlatePlanTempMapper.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlatePlanTempMapper.java
@@ -1,7 +1,7 @@
package com.aps.core.mapper;
import java.util.List;
-import com.aps.core.domain.ApsPlatePlanTemp;
+import com.aps.core.domain.ApsPlate.ApsPlatePlanTemp;
import org.apache.ibatis.annotations.Mapper;
/**
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlateProcessShopStatMapper.java b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlateProcessShopStatMapper.java
index bca065d..ca20fc5 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlateProcessShopStatMapper.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlateProcessShopStatMapper.java
@@ -1,7 +1,7 @@
package com.aps.core.mapper;
import java.util.List;
-import com.aps.core.domain.ApsPlateProcessShopStat;
+import com.aps.core.domain.ApsPlate.ApsPlateProcessShopStat;
import org.apache.ibatis.annotations.Mapper;
/**
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlateProcessStatMapper.java b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlateProcessStatMapper.java
index cc7353a..9e5ab42 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlateProcessStatMapper.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlateProcessStatMapper.java
@@ -1,7 +1,7 @@
package com.aps.core.mapper;
import java.util.List;
-import com.aps.core.domain.ApsPlateProcessStat;
+import com.aps.core.domain.ApsPlate.ApsPlateProcessStat;
import org.apache.ibatis.annotations.Mapper;
/**
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlateStandardRequireBatchMapper.java b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlateStandardRequireBatchMapper.java
index 99c7704..b94e780 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlateStandardRequireBatchMapper.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlateStandardRequireBatchMapper.java
@@ -1,7 +1,7 @@
package com.aps.core.mapper;
import java.util.List;
-import com.aps.core.domain.ApsPlateStandardRequireBatch;
+import com.aps.core.domain.ApsPlate.ApsPlateStandardRequireBatch;
import org.apache.ibatis.annotations.Mapper;
/**
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlateStandardRequireBomOrderDetailMapper.java b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlateStandardRequireBomOrderDetailMapper.java
index a54bd67..6fa39ac 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlateStandardRequireBomOrderDetailMapper.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlateStandardRequireBomOrderDetailMapper.java
@@ -1,7 +1,7 @@
package com.aps.core.mapper;
-import com.aps.core.domain.ApsPlatePlan;
-import com.aps.core.domain.ApsPlateStandardRequireBomOrderDetail;
+import com.aps.core.domain.ApsPlate.ApsPlatePlan;
+import com.aps.core.domain.ApsPlate.ApsPlateStandardRequireBomOrderDetail;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlateStandardRequireBomStockDetailMapper.java b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlateStandardRequireBomStockDetailMapper.java
index fb5fd9e..34244f6 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlateStandardRequireBomStockDetailMapper.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlateStandardRequireBomStockDetailMapper.java
@@ -2,8 +2,7 @@
import java.util.List;
-import com.aps.core.domain.ApsPlateStandardRequireBomOrderDetail;
-import com.aps.core.domain.ApsPlateStandardRequireBomStockDetail;
+import com.aps.core.domain.ApsPlate.ApsPlateStandardRequireBomStockDetail;
import org.apache.ibatis.annotations.Mapper;
/**
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlateStandardRequireErrorMapper.java b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlateStandardRequireErrorMapper.java
index 6d7a2d1..dcc3134 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlateStandardRequireErrorMapper.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlateStandardRequireErrorMapper.java
@@ -1,7 +1,7 @@
package com.aps.core.mapper;
import java.util.List;
-import com.aps.core.domain.ApsPlateStandardRequireError;
+import com.aps.core.domain.ApsPlate.ApsPlateStandardRequireError;
import org.apache.ibatis.annotations.Mapper;
/**
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 a42d1f8..28df148 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,6 +1,6 @@
package com.aps.core.mapper;
-import com.aps.core.domain.ApsPlateStandardRequire;
+import com.aps.core.domain.ApsPlate.ApsPlateStandardRequire;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlateStandardRequireOrderEndDayMapper.java b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlateStandardRequireOrderEndDayMapper.java
index 2f2b4f3..9ce7388 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlateStandardRequireOrderEndDayMapper.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlateStandardRequireOrderEndDayMapper.java
@@ -1,13 +1,13 @@
package com.aps.core.mapper;
-import com.aps.core.domain.ApsPlateStandardRequireOrderEndDay;
+import com.aps.core.domain.ApsPlate.ApsPlateStandardRequireOrderEndDay;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @author zhl
* @description 閽堝琛ㄣ�恆ps_plate_standard_require_order_end_day(闇�姹傝鍒掑畬鎴愭棩鏈熻〃)銆戠殑鏁版嵁搴撴搷浣淢apper
* @createDate 2025-05-19 10:20:50
-* @Entity com.aps.core.domain.ApsPlateStandardRequireOrderEndDay
+* @Entity com.aps.core.domain.ApsPlate.ApsPlateStandardRequireOrderEndDay
*/
public interface ApsPlateStandardRequireOrderEndDayMapper extends BaseMapper<ApsPlateStandardRequireOrderEndDay> {
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/ApsPlate/IApsPlateOrderPlanManagerService.java
similarity index 66%
rename from aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlateOrderPlanManagerService.java
rename to aps-modules/aps-core/src/main/java/com/aps/core/service/ApsPlate/IApsPlateOrderPlanManagerService.java
index afb5460..981c701 100644
--- 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/ApsPlate/IApsPlateOrderPlanManagerService.java
@@ -1,8 +1,8 @@
-package com.aps.core.service;
+package com.aps.core.service.ApsPlate;
-import com.aps.core.domain.ApsPlateOrderPlanDate;
-import com.aps.core.domain.ApsPlateOrderPlanManager;
-import com.aps.core.domain.ApsPlateStandardRequire;
+import com.aps.core.domain.ApsPlate.ApsPlateOrderPlanDate;
+import com.aps.core.domain.ApsPlate.ApsPlateOrderPlanManager;
+import com.aps.core.domain.ApsPlate.ApsPlateStandardRequire;
import java.util.List;
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlatePlanService.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/ApsPlate/IApsPlatePlanService.java
similarity index 93%
rename from aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlatePlanService.java
rename to aps-modules/aps-core/src/main/java/com/aps/core/service/ApsPlate/IApsPlatePlanService.java
index a3c655a..2e57f2d 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlatePlanService.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/ApsPlate/IApsPlatePlanService.java
@@ -1,7 +1,7 @@
-package com.aps.core.service;
+package com.aps.core.service.ApsPlate;
-import com.aps.core.domain.ApsPlatePlan;
-import com.aps.core.domain.ApsPlatePlanTemp;
+import com.aps.core.domain.ApsPlate.ApsPlatePlan;
+import com.aps.core.domain.ApsPlate.ApsPlatePlanTemp;
import java.util.Hashtable;
import java.util.List;
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlatePlanTempService.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/ApsPlate/IApsPlatePlanTempService.java
similarity index 93%
rename from aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlatePlanTempService.java
rename to aps-modules/aps-core/src/main/java/com/aps/core/service/ApsPlate/IApsPlatePlanTempService.java
index 4f620d6..69fecae 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlatePlanTempService.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/ApsPlate/IApsPlatePlanTempService.java
@@ -1,7 +1,7 @@
-package com.aps.core.service;
+package com.aps.core.service.ApsPlate;
import java.util.List;
-import com.aps.core.domain.ApsPlatePlanTemp;
+import com.aps.core.domain.ApsPlate.ApsPlatePlanTemp;
/**
* 閽ｉ噾璁″垝涓存椂琛⊿ervice鎺ュ彛
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlateProcessShopStatService.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/ApsPlate/IApsPlateProcessShopStatService.java
similarity index 94%
rename from aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlateProcessShopStatService.java
rename to aps-modules/aps-core/src/main/java/com/aps/core/service/ApsPlate/IApsPlateProcessShopStatService.java
index 796ff0c..5499fdc 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlateProcessShopStatService.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/ApsPlate/IApsPlateProcessShopStatService.java
@@ -1,9 +1,9 @@
-package com.aps.core.service;
+package com.aps.core.service.ApsPlate;
import java.util.List;
import com.aps.common.core.web.domain.AjaxResult;
-import com.aps.core.domain.ApsPlateProcessShopStat;
+import com.aps.core.domain.ApsPlate.ApsPlateProcessShopStat;
import jakarta.servlet.http.HttpServletResponse;
/**
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlateProcessStatService.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/ApsPlate/IApsPlateProcessStatService.java
similarity index 93%
rename from aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlateProcessStatService.java
rename to aps-modules/aps-core/src/main/java/com/aps/core/service/ApsPlate/IApsPlateProcessStatService.java
index 8552ad9..e8b73bb 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlateProcessStatService.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/ApsPlate/IApsPlateProcessStatService.java
@@ -1,7 +1,7 @@
-package com.aps.core.service;
+package com.aps.core.service.ApsPlate;
import java.util.List;
-import com.aps.core.domain.ApsPlateProcessStat;
+import com.aps.core.domain.ApsPlate.ApsPlateProcessStat;
import org.springframework.transaction.annotation.Transactional;
/**
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlateStandardRequireBatchService.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/ApsPlate/IApsPlateStandardRequireBatchService.java
similarity index 94%
rename from aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlateStandardRequireBatchService.java
rename to aps-modules/aps-core/src/main/java/com/aps/core/service/ApsPlate/IApsPlateStandardRequireBatchService.java
index ac0b987..7e619a5 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlateStandardRequireBatchService.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/ApsPlate/IApsPlateStandardRequireBatchService.java
@@ -1,7 +1,7 @@
-package com.aps.core.service;
+package com.aps.core.service.ApsPlate;
import java.util.List;
-import com.aps.core.domain.ApsPlateStandardRequireBatch;
+import com.aps.core.domain.ApsPlate.ApsPlateStandardRequireBatch;
import org.springframework.transaction.annotation.Transactional;
/**
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlateStandardRequireBomOrderDetailService.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/ApsPlate/IApsPlateStandardRequireBomOrderDetailService.java
similarity index 91%
rename from aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlateStandardRequireBomOrderDetailService.java
rename to aps-modules/aps-core/src/main/java/com/aps/core/service/ApsPlate/IApsPlateStandardRequireBomOrderDetailService.java
index 2c07940..b6a3654 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlateStandardRequireBomOrderDetailService.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/ApsPlate/IApsPlateStandardRequireBomOrderDetailService.java
@@ -1,11 +1,11 @@
-package com.aps.core.service;
+package com.aps.core.service.ApsPlate;
import java.math.BigDecimal;
import java.util.List;
-import com.aps.core.domain.ApsPlatePlan;
-import com.aps.core.domain.ApsPlateStandardRequire;
-import com.aps.core.domain.ApsPlateStandardRequireBomOrderDetail;
+import com.aps.core.domain.ApsPlate.ApsPlatePlan;
+import com.aps.core.domain.ApsPlate.ApsPlateStandardRequire;
+import com.aps.core.domain.ApsPlate.ApsPlateStandardRequireBomOrderDetail;
/**
* ApsPlateStandardRequireBomOrderDetailService鎺ュ彛
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlateStandardRequireBomStockDetailService.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/ApsPlate/IApsPlateStandardRequireBomStockDetailService.java
similarity index 93%
rename from aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlateStandardRequireBomStockDetailService.java
rename to aps-modules/aps-core/src/main/java/com/aps/core/service/ApsPlate/IApsPlateStandardRequireBomStockDetailService.java
index b32fffd..8eeb7bc 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlateStandardRequireBomStockDetailService.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/ApsPlate/IApsPlateStandardRequireBomStockDetailService.java
@@ -1,12 +1,11 @@
-package com.aps.core.service;
+package com.aps.core.service.ApsPlate;
import java.math.BigDecimal;
import java.util.List;
-import com.aps.core.domain.ApsBom;
import com.aps.core.domain.ApsMaterialStorageManagement;
-import com.aps.core.domain.ApsPlatePlan;
-import com.aps.core.domain.ApsPlateStandardRequireBomStockDetail;
+import com.aps.core.domain.ApsPlate.ApsPlatePlan;
+import com.aps.core.domain.ApsPlate.ApsPlateStandardRequireBomStockDetail;
/**
* ApsPlateStandardRequireBomStockDetailService鎺ュ彛
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlateStandardRequireErrorService.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/ApsPlate/IApsPlateStandardRequireErrorService.java
similarity index 94%
rename from aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlateStandardRequireErrorService.java
rename to aps-modules/aps-core/src/main/java/com/aps/core/service/ApsPlate/IApsPlateStandardRequireErrorService.java
index 7919832..25bf22c 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlateStandardRequireErrorService.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/ApsPlate/IApsPlateStandardRequireErrorService.java
@@ -1,7 +1,7 @@
-package com.aps.core.service;
+package com.aps.core.service.ApsPlate;
import java.util.List;
-import com.aps.core.domain.ApsPlateStandardRequireError;
+import com.aps.core.domain.ApsPlate.ApsPlateStandardRequireError;
/**
* 閽ｉ噾鏍囧噯闇�姹傚紓甯镐俊鎭疭ervice鎺ュ彛
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/ApsPlate/IApsPlateStandardRequireService.java
similarity index 92%
rename from aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlateStandardRequireService.java
rename to aps-modules/aps-core/src/main/java/com/aps/core/service/ApsPlate/IApsPlateStandardRequireService.java
index 97c4f0d..862bc21 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/ApsPlate/IApsPlateStandardRequireService.java
@@ -1,7 +1,6 @@
-package com.aps.core.service;
+package com.aps.core.service.ApsPlate;
-import com.aps.core.domain.ApsPlateStandardRequire;
-import org.springframework.transaction.annotation.Transactional;
+import com.aps.core.domain.ApsPlate.ApsPlateStandardRequire;
import java.util.List;
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/ApsPlateStandardRequireOrderEndDayService.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/ApsPlateStandardRequireOrderEndDayService.java
index b1aaf1a..45ec7db 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/ApsPlateStandardRequireOrderEndDayService.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/ApsPlateStandardRequireOrderEndDayService.java
@@ -1,6 +1,6 @@
package com.aps.core.service;
-import com.aps.core.domain.ApsPlateStandardRequireOrderEndDay;
+import com.aps.core.domain.ApsPlate.ApsPlateStandardRequireOrderEndDay;
import com.baomidou.mybatisplus.extension.service.IService;
/**
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsStandardProcessRouteLineService.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsStandardProcessRouteLineService.java
index 9c38bfb..60e2d0d 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsStandardProcessRouteLineService.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsStandardProcessRouteLineService.java
@@ -1,9 +1,8 @@
package com.aps.core.service;
-import java.math.BigDecimal;
import java.util.List;
-import com.aps.core.domain.ApsPlateStandardRequire;
+import com.aps.core.domain.ApsPlate.ApsPlateStandardRequire;
import com.aps.core.domain.ApsStandardProcessRouteLine;
/**
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/ApsPlate/ApsPlateOrderPlanManagerServiceImpl.java
similarity index 84%
rename from aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateOrderPlanManagerServiceImpl.java
rename to aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlate/ApsPlateOrderPlanManagerServiceImpl.java
index d2b7f23..056b72f 100644
--- 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/ApsPlate/ApsPlateOrderPlanManagerServiceImpl.java
@@ -1,16 +1,16 @@
-package com.aps.core.service.impl;
+package com.aps.core.service.impl.ApsPlate;
import com.aps.common.security.utils.SecurityUtils;
-import com.aps.core.domain.ApsPlateOrderPlanDate;
-import com.aps.core.domain.ApsPlateOrderPlanManager;
-import com.aps.core.domain.ApsPlateOrderPlanRequireDate;
-import com.aps.core.domain.ApsPlateStandardRequire;
+import com.aps.core.domain.ApsPlate.ApsPlateOrderPlanDate;
+import com.aps.core.domain.ApsPlate.ApsPlateOrderPlanManager;
+import com.aps.core.domain.ApsPlate.ApsPlateOrderPlanRequireDate;
+import com.aps.core.domain.ApsPlate.ApsPlateStandardRequire;
import com.aps.core.enums.PLAN_TASK_STATUS;
import com.aps.core.mapper.ApsPlateOrderPlanManagerMapper;
import com.aps.core.service.ApsPlanTaskService;
-import com.aps.core.service.IApsPlateOrderPlanManagerService;
-import com.aps.core.service.IApsPlateStandardRequireBatchService;
-import com.aps.core.service.IApsPlateStandardRequireService;
+import com.aps.core.service.ApsPlate.IApsPlateOrderPlanManagerService;
+import com.aps.core.service.ApsPlate.IApsPlateStandardRequireBatchService;
+import com.aps.core.service.ApsPlate.IApsPlateStandardRequireService;
import jakarta.annotation.Resource;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlatePlanServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlate/ApsPlatePlanServiceImpl.java
similarity index 97%
rename from aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlatePlanServiceImpl.java
rename to aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlate/ApsPlatePlanServiceImpl.java
index 51e6618..bb8550a 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlatePlanServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlate/ApsPlatePlanServiceImpl.java
@@ -1,4 +1,4 @@
-package com.aps.core.service.impl;
+package com.aps.core.service.impl.ApsPlate;
import cn.hutool.core.util.IdUtil;
import com.alibaba.fastjson2.JSONArray;
@@ -6,12 +6,12 @@
import com.aps.common.core.utils.DateUtils;
import com.aps.common.core.utils.uuid.IdUtils;
import com.aps.common.security.utils.DictUtils;
-import com.aps.core.domain.ApsPlatePlan;
-import com.aps.core.domain.ApsPlatePlanTemp;
+import com.aps.core.domain.ApsPlate.ApsPlatePlan;
+import com.aps.core.domain.ApsPlate.ApsPlatePlanTemp;
import com.aps.core.mapper.ApsPartPlanTempMapper;
import com.aps.core.mapper.ApsPlatePlanMapper;
import com.aps.core.mapper.ApsPlatePlanTempMapper;
-import com.aps.core.service.IApsPlatePlanService;
+import com.aps.core.service.ApsPlate.IApsPlatePlanService;
import com.aps.system.api.domain.SysDictData;
import org.apache.logging.log4j.util.Strings;
import org.springframework.beans.BeanUtils;
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlatePlanTempServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlate/ApsPlatePlanTempServiceImpl.java
similarity index 93%
rename from aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlatePlanTempServiceImpl.java
rename to aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlate/ApsPlatePlanTempServiceImpl.java
index 10b48df..4df306c 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlatePlanTempServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlate/ApsPlatePlanTempServiceImpl.java
@@ -1,4 +1,4 @@
-package com.aps.core.service.impl;
+package com.aps.core.service.impl.ApsPlate;
import java.util.List;
@@ -6,8 +6,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.aps.core.mapper.ApsPlatePlanTempMapper;
-import com.aps.core.domain.ApsPlatePlanTemp;
-import com.aps.core.service.IApsPlatePlanTempService;
+import com.aps.core.domain.ApsPlate.ApsPlatePlanTemp;
+import com.aps.core.service.ApsPlate.IApsPlatePlanTempService;
/**
* 閽ｉ噾璁″垝涓存椂琛⊿ervice涓氬姟灞傚鐞�
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateProcessShopStatServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlate/ApsPlateProcessShopStatServiceImpl.java
similarity index 98%
rename from aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateProcessShopStatServiceImpl.java
rename to aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlate/ApsPlateProcessShopStatServiceImpl.java
index 10103b4..6da9ad7 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateProcessShopStatServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlate/ApsPlateProcessShopStatServiceImpl.java
@@ -1,4 +1,4 @@
-package com.aps.core.service.impl;
+package com.aps.core.service.impl.ApsPlate;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -11,6 +11,10 @@
import com.aps.common.security.utils.DictUtils;
import com.aps.common.security.utils.SecurityUtils;
import com.aps.core.domain.*;
+import com.aps.core.domain.ApsPlate.ApsPlatePlan;
+import com.aps.core.domain.ApsPlate.ApsPlateProcessShopPlanStat;
+import com.aps.core.domain.ApsPlate.ApsPlateProcessShopStat;
+import com.aps.core.domain.ApsPlate.ApsPlateProcessStat;
import com.aps.core.mapper.*;
import com.aps.system.api.domain.SysDictData;
import jakarta.annotation.Resource;
@@ -24,7 +28,7 @@
import org.apache.poi.xssf.streaming.SXSSFWorkbook;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.aps.core.service.IApsPlateProcessShopStatService;
+import com.aps.core.service.ApsPlate.IApsPlateProcessShopStatService;
import org.springframework.transaction.annotation.Transactional;
/**
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateProcessStatServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlate/ApsPlateProcessStatServiceImpl.java
similarity index 97%
rename from aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateProcessStatServiceImpl.java
rename to aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlate/ApsPlateProcessStatServiceImpl.java
index 4770828..6544ed3 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateProcessStatServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlate/ApsPlateProcessStatServiceImpl.java
@@ -1,4 +1,4 @@
-package com.aps.core.service.impl;
+package com.aps.core.service.impl.ApsPlate;
import java.math.BigDecimal;
import java.time.*;
@@ -8,12 +8,11 @@
import com.aps.common.core.utils.uuid.IdUtils;
import com.aps.common.security.utils.SecurityUtils;
-import org.apache.commons.lang3.SystemUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.aps.core.mapper.ApsPlateProcessStatMapper;
-import com.aps.core.domain.ApsPlateProcessStat;
-import com.aps.core.service.IApsPlateProcessStatService;
+import com.aps.core.domain.ApsPlate.ApsPlateProcessStat;
+import com.aps.core.service.ApsPlate.IApsPlateProcessStatService;
import org.springframework.transaction.annotation.Transactional;
import static java.util.stream.Collectors.groupingBy;
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireBatchServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlate/ApsPlateStandardRequireBatchServiceImpl.java
similarity index 96%
rename from aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireBatchServiceImpl.java
rename to aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlate/ApsPlateStandardRequireBatchServiceImpl.java
index 47f26f1..e765fc6 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireBatchServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlate/ApsPlateStandardRequireBatchServiceImpl.java
@@ -1,4 +1,4 @@
-package com.aps.core.service.impl;
+package com.aps.core.service.impl.ApsPlate;
import java.util.List;
@@ -9,8 +9,8 @@
import jakarta.annotation.Resource;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.aps.core.domain.ApsPlateStandardRequireBatch;
-import com.aps.core.service.IApsPlateStandardRequireBatchService;
+import com.aps.core.domain.ApsPlate.ApsPlateStandardRequireBatch;
+import com.aps.core.service.ApsPlate.IApsPlateStandardRequireBatchService;
import org.springframework.transaction.annotation.Transactional;
/**
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireBomOrderDetailServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlate/ApsPlateStandardRequireBomOrderDetailServiceImpl.java
similarity index 94%
rename from aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireBomOrderDetailServiceImpl.java
rename to aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlate/ApsPlateStandardRequireBomOrderDetailServiceImpl.java
index b9e3551..dec8d80 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireBomOrderDetailServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlate/ApsPlateStandardRequireBomOrderDetailServiceImpl.java
@@ -1,4 +1,4 @@
-package com.aps.core.service.impl;
+package com.aps.core.service.impl.ApsPlate;
import java.math.BigDecimal;
import java.util.List;
@@ -6,14 +6,14 @@
import cn.hutool.core.util.IdUtil;
import com.aps.common.core.utils.DateUtils;
import com.aps.common.security.utils.SecurityUtils;
-import com.aps.core.domain.ApsPlatePlan;
-import com.aps.core.domain.ApsPlateStandardRequire;
+import com.aps.core.domain.ApsPlate.ApsPlatePlan;
+import com.aps.core.domain.ApsPlate.ApsPlateStandardRequire;
import com.aps.core.mapper.ApsPlatePlanMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.aps.core.mapper.ApsPlateStandardRequireBomOrderDetailMapper;
-import com.aps.core.domain.ApsPlateStandardRequireBomOrderDetail;
-import com.aps.core.service.IApsPlateStandardRequireBomOrderDetailService;
+import com.aps.core.domain.ApsPlate.ApsPlateStandardRequireBomOrderDetail;
+import com.aps.core.service.ApsPlate.IApsPlateStandardRequireBomOrderDetailService;
import org.springframework.transaction.annotation.Transactional;
/**
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireBomStockDetailServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlate/ApsPlateStandardRequireBomStockDetailServiceImpl.java
similarity index 94%
rename from aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireBomStockDetailServiceImpl.java
rename to aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlate/ApsPlateStandardRequireBomStockDetailServiceImpl.java
index 3517059..8245274 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireBomStockDetailServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlate/ApsPlateStandardRequireBomStockDetailServiceImpl.java
@@ -1,4 +1,4 @@
-package com.aps.core.service.impl;
+package com.aps.core.service.impl.ApsPlate;
import java.math.BigDecimal;
import java.util.List;
@@ -7,12 +7,14 @@
import com.aps.common.core.utils.DateUtils;
import com.aps.common.security.utils.SecurityUtils;
import com.aps.core.domain.*;
+import com.aps.core.domain.ApsPlate.ApsPlatePlan;
+import com.aps.core.domain.ApsPlate.ApsPlateStandardRequireBomStockDetail;
import com.aps.core.mapper.ApsMaterialStorageManagementMapper;
import jakarta.annotation.Resource;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.aps.core.mapper.ApsPlateStandardRequireBomStockDetailMapper;
-import com.aps.core.service.IApsPlateStandardRequireBomStockDetailService;
+import com.aps.core.service.ApsPlate.IApsPlateStandardRequireBomStockDetailService;
import org.springframework.transaction.annotation.Transactional;
/**
@@ -113,8 +115,8 @@
@Override
public void saveStorageAndDetail(ApsMaterialStorageManagement itemStorage, ApsPlatePlan plan, String bomLineId,
String itemCode, String batchNum, BigDecimal deductionAmount,
- BigDecimal afterStockAmount,Long requireId
- ,List<ApsPlateStandardRequireBomStockDetail> stockDetailsList){
+ BigDecimal afterStockAmount, Long requireId
+ , List<ApsPlateStandardRequireBomStockDetail> stockDetailsList){
//itemStorageMapper.updateMaterialStorageByVersion(itemStorage.getId(), afterStockAmount,itemStorage.getVersion());
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireErrorServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlate/ApsPlateStandardRequireErrorServiceImpl.java
similarity index 94%
rename from aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireErrorServiceImpl.java
rename to aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlate/ApsPlateStandardRequireErrorServiceImpl.java
index 930cfe5..606a101 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireErrorServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlate/ApsPlateStandardRequireErrorServiceImpl.java
@@ -1,12 +1,12 @@
-package com.aps.core.service.impl;
+package com.aps.core.service.impl.ApsPlate;
import java.util.List;
import com.aps.common.core.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.aps.core.mapper.ApsPlateStandardRequireErrorMapper;
-import com.aps.core.domain.ApsPlateStandardRequireError;
-import com.aps.core.service.IApsPlateStandardRequireErrorService;
+import com.aps.core.domain.ApsPlate.ApsPlateStandardRequireError;
+import com.aps.core.service.ApsPlate.IApsPlateStandardRequireErrorService;
/**
* 閽ｉ噾鏍囧噯闇�姹傚紓甯镐俊鎭疭ervice涓氬姟灞傚鐞�
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireOrderEndDayServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlate/ApsPlateStandardRequireOrderEndDayServiceImpl.java
similarity index 85%
rename from aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireOrderEndDayServiceImpl.java
rename to aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlate/ApsPlateStandardRequireOrderEndDayServiceImpl.java
index ab438f8..b128161 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireOrderEndDayServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlate/ApsPlateStandardRequireOrderEndDayServiceImpl.java
@@ -1,7 +1,7 @@
-package com.aps.core.service.impl;
+package com.aps.core.service.impl.ApsPlate;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.aps.core.domain.ApsPlateStandardRequireOrderEndDay;
+import com.aps.core.domain.ApsPlate.ApsPlateStandardRequireOrderEndDay;
import com.aps.core.service.ApsPlateStandardRequireOrderEndDayService;
import com.aps.core.mapper.ApsPlateStandardRequireOrderEndDayMapper;
import org.springframework.stereotype.Service;
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/ApsPlate/ApsPlateStandardRequireServiceImpl.java
similarity index 97%
rename from aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java
rename to aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlate/ApsPlateStandardRequireServiceImpl.java
index 9602640..07c1f47 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/ApsPlate/ApsPlateStandardRequireServiceImpl.java
@@ -1,4 +1,4 @@
-package com.aps.core.service.impl;
+package com.aps.core.service.impl.ApsPlate;
import java.math.BigDecimal;
import java.util.*;
@@ -8,16 +8,19 @@
import com.aps.common.security.utils.DictUtils;
import com.aps.common.security.utils.SecurityUtils;
import com.aps.core.domain.*;
+import com.aps.core.domain.ApsPlate.ApsPlatePlan;
+import com.aps.core.domain.ApsPlate.ApsPlateStandardRequireBomOrderDetail;
+import com.aps.core.domain.ApsPlate.ApsPlateStandardRequireBomStockDetail;
import com.aps.core.mapper.*;
import com.aps.core.service.*;
+import com.aps.core.service.ApsPlate.*;
import com.aps.system.api.domain.SysDictData;
import jakarta.annotation.Resource;
-import com.aps.core.domain.ApsPlateStandardRequire;
+import com.aps.core.domain.ApsPlate.ApsPlateStandardRequire;
import com.aps.core.mapper.ApsPlateStandardRequireMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.aps.core.service.IApsPlateStandardRequireService;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
@@ -415,7 +418,7 @@
* 浣跨敤瀛愪欢宸ュ崟鍖归厤闇�姹備腑鐨勫噣闇�姹�
* */
- private void matchRequireAndSubPlan(ApsPlateStandardRequire require, List<ApsPlateStandardRequireBomOrderDetail> orderDetailsList,Hashtable<String, List<ApsPlatePlan>> subPlans) {
+ private void matchRequireAndSubPlan(ApsPlateStandardRequire require, List<ApsPlateStandardRequireBomOrderDetail> orderDetailsList, Hashtable<String, List<ApsPlatePlan>> subPlans) {
BigDecimal netRequirement = require.getNetRequirement();
require.setMatchMode("宸ュ崟鍖归厤");
require.setMatchState("宸插尮閰�");
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsStandardProcessRouteLineServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsStandardProcessRouteLineServiceImpl.java
index 46e4606..b9b2ac3 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsStandardProcessRouteLineServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsStandardProcessRouteLineServiceImpl.java
@@ -7,8 +7,8 @@
import cn.hutool.core.util.IdUtil;
import com.aps.common.core.utils.DateUtils;
import com.aps.common.security.utils.SecurityUtils;
-import com.aps.core.domain.ApsPlateStandardRequire;
-import com.aps.core.domain.ApsPlateStandardRequireError;
+import com.aps.core.domain.ApsPlate.ApsPlateStandardRequire;
+import com.aps.core.domain.ApsPlate.ApsPlateStandardRequireError;
import com.aps.core.domain.ApsStandardProcessRouteHeader;
import com.aps.core.mapper.ApsPlateStandardRequireErrorMapper;
import com.aps.core.mapper.ApsStandardProcessRouteHeaderMapper;
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlate/ApsPlatePlanMapper.xml
similarity index 97%
rename from aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanMapper.xml
rename to aps-modules/aps-core/src/main/resources/mapper/core/ApsPlate/ApsPlatePlanMapper.xml
index 028dff5..3a38efa 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlate/ApsPlatePlanMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsPlatePlanMapper">
- <resultMap type="com.aps.core.domain.ApsPlatePlan" id="ApsPlatePlanResult">
+ <resultMap type="com.aps.core.domain.ApsPlate.ApsPlatePlan" id="ApsPlatePlanResult">
<result property="id" column="id" />
<result property="masterPlanner" column="master_planner" />
<result property="weekDay" column="week_day" />
@@ -66,7 +66,7 @@
from aps_plate_plan
</sql>
- <select id="selectApsPlatePlanList" parameterType="com.aps.core.domain.ApsPlatePlan" resultMap="ApsPlatePlanResult">
+ <select id="selectApsPlatePlanList" parameterType="com.aps.core.domain.ApsPlate.ApsPlatePlan" resultMap="ApsPlatePlanResult">
<include refid="selectApsPlatePlanVo"/>
<where>
<if test="masterPlanner != null and masterPlanner != ''"> and master_planner like '%'|| #{masterPlanner}|| '%'</if>
@@ -117,7 +117,7 @@
where id = #{id}
</select>
- <insert id="insertApsPlatePlan" parameterType="com.aps.core.domain.ApsPlatePlan">
+ <insert id="insertApsPlatePlan" parameterType="com.aps.core.domain.ApsPlate.ApsPlatePlan">
insert into aps_plate_plan
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null and id != ''">id,</if>
@@ -207,7 +207,7 @@
</trim>
</insert>
- <update id="updateApsPlatePlan" parameterType="com.aps.core.domain.ApsPlatePlan">
+ <update id="updateApsPlatePlan" parameterType="com.aps.core.domain.ApsPlate.ApsPlatePlan">
update aps_plate_plan
<trim prefix="SET" suffixOverrides=",">
<if test="masterPlanner != null">master_planner = #{masterPlanner},</if>
@@ -276,7 +276,7 @@
update aps_plate_plan set del_flag='1' where del_flag ='0'
</update>
- <select id="selectPlatePlanByPlantMajor" parameterType="com.aps.core.domain.ApsPlatePlan" resultMap="ApsPlatePlanResult">
+ <select id="selectPlatePlanByPlantMajor" parameterType="com.aps.core.domain.ApsPlate.ApsPlatePlan" resultMap="ApsPlatePlanResult">
select id,document_number,main_part_number,item_number,plant,professional_affiliation,production_quantity,require_id,
unmatched_quantity,version, production_base,plan_end_day,order_create_time,low_order_code
from aps_plate_plan
@@ -288,7 +288,7 @@
order by document_number asc,id asc
</select>
- <select id="selectUnMatchPlateSubPlan" parameterType="com.aps.core.domain.ApsPlatePlan" resultMap="ApsPlatePlanResult">
+ <select id="selectUnMatchPlateSubPlan" parameterType="com.aps.core.domain.ApsPlate.ApsPlatePlan" resultMap="ApsPlatePlanResult">
select id,document_number,main_part_number,item_number,plant,professional_affiliation,production_quantity,
unmatched_quantity,version
from aps_plate_plan
@@ -298,7 +298,7 @@
order by document_number asc,id asc
limit 1
</select>
- <select id="selectUnMatchPlateSubPlanList" parameterType="com.aps.core.domain.ApsPlatePlan" resultMap="ApsPlatePlanResult">
+ <select id="selectUnMatchPlateSubPlanList" parameterType="com.aps.core.domain.ApsPlate.ApsPlatePlan" resultMap="ApsPlatePlanResult">
select id,document_number,main_part_number,item_number,plant,professional_affiliation,production_quantity,
unmatched_quantity,version
from aps_plate_plan
@@ -308,12 +308,12 @@
order by document_number asc,id asc
</select>
- <update id="updatePlanUnMatchQtyByVersion" parameterType="com.aps.core.domain.ApsPlatePlan">
+ <update id="updatePlanUnMatchQtyByVersion" parameterType="com.aps.core.domain.ApsPlate.ApsPlatePlan">
update aps_plate_plan
set unmatched_quantity=#{unmatchedQuantity},version=version+1
where id=#{id} and version=#{version}
</update>
- <select id="selectPlateRedundantOrderList" parameterType="com.aps.core.domain.ApsPlatePlan" resultMap="ApsPlatePlanResult">
+ <select id="selectPlateRedundantOrderList" parameterType="com.aps.core.domain.ApsPlate.ApsPlatePlan" resultMap="ApsPlatePlanResult">
select document_number, item_number, production_quantity, unmatched_quantity, plant, production_base, plan_start_day, plan_end_day, order_create_time
from aps_plate_plan where unmatched_quantity>0 and professional_affiliation='sub' and del_flag='0'
<if test="documentNumber != null and documentNumber != ''">
@@ -329,7 +329,7 @@
set unmatched_quantity=production_quantity, version=0,require_id=id
where del_flag='0' and professional_affiliation !='0'
</update>
- <update id="updatePlanUnMatchQtyAndVersion" parameterType="com.aps.core.domain.ApsPlatePlan">
+ <update id="updatePlanUnMatchQtyAndVersion" parameterType="com.aps.core.domain.ApsPlate.ApsPlatePlan">
update aps_plate_plan
set unmatched_quantity=#{unmatchedQuantity},version=#{version},update_time=now()
where id=#{id}
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanOrderManagerMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlate/ApsPlatePlanOrderManagerMapper.xml
similarity index 93%
rename from aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanOrderManagerMapper.xml
rename to aps-modules/aps-core/src/main/resources/mapper/core/ApsPlate/ApsPlatePlanOrderManagerMapper.xml
index 6f64152..9420d6b 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanOrderManagerMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlate/ApsPlatePlanOrderManagerMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsPlateOrderPlanManagerMapper">
- <resultMap type="com.aps.core.domain.ApsPlateOrderPlanManager" id="ApsPlateOrderPlanManagerResult">
+ <resultMap type="com.aps.core.domain.ApsPlate.ApsPlateOrderPlanManager" id="ApsPlateOrderPlanManagerResult">
<result property="id" column="id" />
<result property="requireId" column="require_id" />
<result property="requireTrackId" column="require_track_id" />
@@ -26,7 +26,7 @@
<result property="orderCreateTime" column="order_create_time" />
</resultMap>
- <select id="selectApsPlanOrderManager" parameterType="com.aps.core.domain.ApsPlateOrderPlanManager" resultMap="ApsPlateOrderPlanManagerResult">
+ <select id="selectApsPlanOrderManager" parameterType="com.aps.core.domain.ApsPlate.ApsPlateOrderPlanManager" resultMap="ApsPlateOrderPlanManagerResult">
select
detail.require_id,
detail.require_track_id,
@@ -58,7 +58,7 @@
</select>
- <resultMap type="com.aps.core.domain.ApsPlateStandardRequire" id="ApsPlateStandardRequireResult">
+ <resultMap type="com.aps.core.domain.ApsPlate.ApsPlateStandardRequire" id="ApsPlateStandardRequireResult">
<result property="id" column="id" />
<result property="requireTrackId" column="require_track_id" />
<result property="bomLineId" column="bom_line_id" />
@@ -125,7 +125,7 @@
<if test="workOrderNo != null and workOrderNo != ''"> and detail.doc_no = #{workOrderNo}</if>
</select>
- <resultMap type="com.aps.core.domain.ApsPlateOrderPlanRequireDate" id="selectPlanRequireIdsResult">
+ <resultMap type="com.aps.core.domain.ApsPlate.ApsPlateOrderPlanRequireDate" id="selectPlanRequireIdsResult">
<result property="id" column="id" />
<result property="start" column="start_date" />
<result property="end" column="end_date" />
@@ -148,7 +148,7 @@
group by plan.id
</select>
- <update id="updatePlanDateByBatch" parameterType="com.aps.core.domain.ApsPlateOrderPlanRequireDate">
+ <update id="updatePlanDateByBatch" parameterType="com.aps.core.domain.ApsPlate.ApsPlateOrderPlanRequireDate">
update aps_plate_plan set
plan_start_day = #{start},
plan_end_day = #{end},
@@ -157,7 +157,7 @@
where id = #{id}
</update>
- <update id="updatePlanDateByCustom" parameterType="com.aps.core.domain.ApsPlateOrderPlanDate">
+ <update id="updatePlanDateByCustom" parameterType="com.aps.core.domain.ApsPlate.ApsPlateOrderPlanDate">
update aps_plate_plan set
plan_end_day = #{customDate},
update_by = #{updateBy},
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanTempMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlate/ApsPlatePlanTempMapper.xml
similarity index 97%
rename from aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanTempMapper.xml
rename to aps-modules/aps-core/src/main/resources/mapper/core/ApsPlate/ApsPlatePlanTempMapper.xml
index 1a7b8de..d0df165 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanTempMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlate/ApsPlatePlanTempMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsPlatePlanTempMapper">
- <resultMap type="com.aps.core.domain.ApsPlatePlanTemp" id="ApsPlatePlanTempResult">
+ <resultMap type="com.aps.core.domain.ApsPlate.ApsPlatePlanTemp" id="ApsPlatePlanTempResult">
<result property="id" column="id" />
<result property="masterPlanner" column="master_planner" />
<result property="weekDay" column="week_day" />
@@ -47,7 +47,7 @@
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, batch_number from aps_plate_plan_temp
</sql>
- <select id="selectApsPlatePlanTempList" parameterType="com.aps.core.domain.ApsPlatePlanTemp" resultMap="ApsPlatePlanTempResult">
+ <select id="selectApsPlatePlanTempList" parameterType="com.aps.core.domain.ApsPlate.ApsPlatePlanTemp" resultMap="ApsPlatePlanTempResult">
<include refid="selectApsPlatePlanTempVo"/>
<where>
<if test="nextProcessDeparment != null and nextProcessDeparment != ''"> and next_process_deparment = #{nextProcessDeparment}</if>
@@ -70,7 +70,7 @@
where id = #{id}
</select>
- <insert id="insertApsPlatePlanTemp" parameterType="com.aps.core.domain.ApsPlatePlanTemp">
+ <insert id="insertApsPlatePlanTemp" parameterType="com.aps.core.domain.ApsPlate.ApsPlatePlanTemp">
insert into aps_plate_plan_temp
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null and id != ''">id,</if>
@@ -150,7 +150,7 @@
</trim>
</insert>
- <update id="updateApsPlatePlanTemp" parameterType="com.aps.core.domain.ApsPlatePlanTemp">
+ <update id="updateApsPlatePlanTemp" parameterType="com.aps.core.domain.ApsPlate.ApsPlatePlanTemp">
update aps_plate_plan_temp
<trim prefix="SET" suffixOverrides=",">
<if test="masterPlanner != null">master_planner = #{masterPlanner},</if>
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateProcessShopStatMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlate/ApsPlateProcessShopStatMapper.xml
similarity index 94%
rename from aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateProcessShopStatMapper.xml
rename to aps-modules/aps-core/src/main/resources/mapper/core/ApsPlate/ApsPlateProcessShopStatMapper.xml
index 8951097..149a884 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateProcessShopStatMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlate/ApsPlateProcessShopStatMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsPlateProcessShopStatMapper">
- <resultMap type="com.aps.core.domain.ApsPlateProcessShopStat" id="ApsPlateProcessShopStatResult">
+ <resultMap type="com.aps.core.domain.ApsPlate.ApsPlateProcessShopStat" id="ApsPlateProcessShopStatResult">
<result property="id" column="id" />
<result property="docNo" column="doc_no" />
<result property="shopCode" column="shop_code" />
@@ -27,7 +27,7 @@
from aps_plate_process_shop_stat
</sql>
- <select id="selectApsPlateProcessShopStatList" parameterType="com.aps.core.domain.ApsPlateProcessShopStat" resultMap="ApsPlateProcessShopStatResult">
+ <select id="selectApsPlateProcessShopStatList" parameterType="com.aps.core.domain.ApsPlate.ApsPlateProcessShopStat" resultMap="ApsPlateProcessShopStatResult">
<include refid="selectApsPlateProcessShopStatVo"/>
<where>
<if test="docNo != null and docNo != ''"> and doc_no = #{docNo}</if>
@@ -47,7 +47,7 @@
where id = #{id}
</select>
- <insert id="insertApsPlateProcessShopStat" parameterType="com.aps.core.domain.ApsPlateProcessShopStat" useGeneratedKeys="true" keyProperty="id">
+ <insert id="insertApsPlateProcessShopStat" parameterType="com.aps.core.domain.ApsPlate.ApsPlateProcessShopStat" useGeneratedKeys="true" keyProperty="id">
insert into aps_plate_process_shop_stat
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="docNo != null">doc_no,</if>
@@ -79,7 +79,7 @@
</trim>
</insert>
- <update id="updateApsPlateProcessShopStat" parameterType="com.aps.core.domain.ApsPlateProcessShopStat">
+ <update id="updateApsPlateProcessShopStat" parameterType="com.aps.core.domain.ApsPlate.ApsPlateProcessShopStat">
update aps_plate_process_shop_stat
<trim prefix="SET" suffixOverrides=",">
<if test="docNo != null">doc_no = #{docNo},</if>
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateProcessStatMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlate/ApsPlateProcessStatMapper.xml
similarity index 96%
rename from aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateProcessStatMapper.xml
rename to aps-modules/aps-core/src/main/resources/mapper/core/ApsPlate/ApsPlateProcessStatMapper.xml
index 97d1d08..ece5968 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateProcessStatMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlate/ApsPlateProcessStatMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsPlateProcessStatMapper">
- <resultMap type="com.aps.core.domain.ApsPlateProcessStat" id="ApsPlateProcessStatResult">
+ <resultMap type="com.aps.core.domain.ApsPlate.ApsPlateProcessStat" id="ApsPlateProcessStatResult">
<result property="id" column="id" />
<result property="workOrderNo" column="work_order_no" />
<result property="processName" column="process_name" />
@@ -34,7 +34,7 @@
from aps_plate_process_stat
</sql>
- <select id="selectApsPlateProcessStatList" parameterType="com.aps.core.domain.ApsPlateProcessStat" resultMap="ApsPlateProcessStatResult">
+ <select id="selectApsPlateProcessStatList" parameterType="com.aps.core.domain.ApsPlate.ApsPlateProcessStat" resultMap="ApsPlateProcessStatResult">
<include refid="selectApsPlateProcessStatVo"/>
<where>
<if test="workOrderNo != null and workOrderNo != ''"> and work_order_no = #{workOrderNo}</if>
@@ -58,7 +58,7 @@
where id = #{id}
</select>
- <insert id="insertApsPlateProcessStat" parameterType="com.aps.core.domain.ApsPlateProcessStat">
+ <insert id="insertApsPlateProcessStat" parameterType="com.aps.core.domain.ApsPlate.ApsPlateProcessStat">
insert into aps_plate_process_stat
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
@@ -100,7 +100,7 @@
</trim>
</insert>
- <update id="updateApsPlateProcessStat" parameterType="com.aps.core.domain.ApsPlateProcessStat">
+ <update id="updateApsPlateProcessStat" parameterType="com.aps.core.domain.ApsPlate.ApsPlateProcessStat">
update aps_plate_process_stat
<trim prefix="SET" suffixOverrides=",">
<if test="workOrderNo != null">work_order_no = #{workOrderNo},</if>
@@ -153,7 +153,7 @@
delete from aps_plate_process_stat where batch_number != #{batchNumber}
</update>
- <insert id="batchInsertPlateStat" parameterType="com.aps.core.domain.ApsPlateProcessStat">
+ <insert id="batchInsertPlateStat" parameterType="com.aps.core.domain.ApsPlate.ApsPlateProcessStat">
insert into aps_plate_process_stat
(
id,
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateStandardRequireBatchMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlate/ApsPlateStandardRequireBatchMapper.xml
similarity index 91%
rename from aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateStandardRequireBatchMapper.xml
rename to aps-modules/aps-core/src/main/resources/mapper/core/ApsPlate/ApsPlateStandardRequireBatchMapper.xml
index d96af89..8e7c54c 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateStandardRequireBatchMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlate/ApsPlateStandardRequireBatchMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsPlateStandardRequireBatchMapper">
- <resultMap type="com.aps.core.domain.ApsPlateStandardRequireBatch" id="ApsPlateStandardRequireBatchResult">
+ <resultMap type="com.aps.core.domain.ApsPlate.ApsPlateStandardRequireBatch" id="ApsPlateStandardRequireBatchResult">
<result property="id" column="id" />
<result property="batchNumber" column="batch_number" />
<result property="delFlag" column="del_flag" />
@@ -18,7 +18,7 @@
select id, batch_number, del_flag, create_time, create_by, update_by, update_time from aps_plate_standard_require_batch
</sql>
- <select id="selectApsPlateStandardRequireBatchList" parameterType="com.aps.core.domain.ApsPlateStandardRequireBatch" resultMap="ApsPlateStandardRequireBatchResult">
+ <select id="selectApsPlateStandardRequireBatchList" parameterType="com.aps.core.domain.ApsPlate.ApsPlateStandardRequireBatch" resultMap="ApsPlateStandardRequireBatchResult">
<include refid="selectApsPlateStandardRequireBatchVo"/>
<where>
<if test="batchNumber != null and batchNumber != ''"> and batch_number = #{batchNumber}</if>
@@ -30,7 +30,7 @@
where id = #{id}
</select>
- <insert id="insertApsPlateStandardRequireBatch" parameterType="com.aps.core.domain.ApsPlateStandardRequireBatch">
+ <insert id="insertApsPlateStandardRequireBatch" parameterType="com.aps.core.domain.ApsPlate.ApsPlateStandardRequireBatch">
insert into aps_plate_standard_require_batch
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
@@ -52,7 +52,7 @@
</trim>
</insert>
- <update id="updateApsPlateStandardRequireBatch" parameterType="com.aps.core.domain.ApsPlateStandardRequireBatch">
+ <update id="updateApsPlateStandardRequireBatch" parameterType="com.aps.core.domain.ApsPlate.ApsPlateStandardRequireBatch">
update aps_plate_standard_require_batch
<trim prefix="SET" suffixOverrides=",">
<if test="batchNumber != null">batch_number = #{batchNumber},</if>
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateStandardRequireBomOrderDetailMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlate/ApsPlateStandardRequireBomOrderDetailMapper.xml
similarity index 94%
rename from aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateStandardRequireBomOrderDetailMapper.xml
rename to aps-modules/aps-core/src/main/resources/mapper/core/ApsPlate/ApsPlateStandardRequireBomOrderDetailMapper.xml
index 0454793..69ff69f 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateStandardRequireBomOrderDetailMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlate/ApsPlateStandardRequireBomOrderDetailMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsPlateStandardRequireBomOrderDetailMapper">
- <resultMap type="com.aps.core.domain.ApsPlateStandardRequireBomOrderDetail" id="ApsPlateStandardRequireBomOrderDetailResult">
+ <resultMap type="com.aps.core.domain.ApsPlate.ApsPlateStandardRequireBomOrderDetail" id="ApsPlateStandardRequireBomOrderDetailResult">
<result property="id" column="id" />
<result property="requireId" column="require_id" />
<result property="requireTrackId" column="require_track_id" />
@@ -30,7 +30,7 @@
from aps_plate_standard_require_bom_order_detail
</sql>
- <select id="selectApsPlateStandardRequireBomOrderDetailList" parameterType="com.aps.core.domain.ApsPlateStandardRequireBomOrderDetail" resultMap="ApsPlateStandardRequireBomOrderDetailResult">
+ <select id="selectApsPlateStandardRequireBomOrderDetailList" parameterType="com.aps.core.domain.ApsPlate.ApsPlateStandardRequireBomOrderDetail" resultMap="ApsPlateStandardRequireBomOrderDetailResult">
<include refid="selectApsPlateStandardRequireBomOrderDetailVo"/>
<where>
<if test="requireId != null and requireId != ''"> and require_id = #{requireId}</if>
@@ -51,7 +51,7 @@
where id = #{id}
</select>
- <insert id="insertApsPlateStandardRequireBomOrderDetail" parameterType="com.aps.core.domain.ApsPlateStandardRequireBomOrderDetail">
+ <insert id="insertApsPlateStandardRequireBomOrderDetail" parameterType="com.aps.core.domain.ApsPlate.ApsPlateStandardRequireBomOrderDetail">
insert into aps_plate_standard_require_bom_order_detail
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
@@ -93,7 +93,7 @@
</trim>
</insert>
- <update id="updateApsPlateStandardRequireBomOrderDetail" parameterType="com.aps.core.domain.ApsPlateStandardRequireBomOrderDetail">
+ <update id="updateApsPlateStandardRequireBomOrderDetail" parameterType="com.aps.core.domain.ApsPlate.ApsPlateStandardRequireBomOrderDetail">
update aps_plate_standard_require_bom_order_detail
<trim prefix="SET" suffixOverrides=",">
<if test="requireId != null">require_id = #{requireId},</if>
@@ -130,7 +130,7 @@
update aps_plate_standard_require_bom_order_detail set del_flag = '1' where batch_number = #{batchNumber}
</update>
- <insert id="batchInsert" parameterType="com.aps.core.domain.ApsPlateStandardRequireBomOrderDetail">
+ <insert id="batchInsert" parameterType="com.aps.core.domain.ApsPlate.ApsPlateStandardRequireBomOrderDetail">
insert into aps_plate_standard_require_bom_order_detail
(id, require_id,require_track_id, bom_line_id, bom_line_code, doc_no,
before_prod_amount, deduction_amount, after_prod_amount,
@@ -145,7 +145,7 @@
</insert>
- <select id="selectRequireUpAndDownLevel" parameterType="Long" resultType="com.aps.core.domain.ApsPlatePlan">
+ <select id="selectRequireUpAndDownLevel" parameterType="Long" resultType="com.aps.core.domain.ApsPlate.ApsPlatePlan">
with bs as (
select id, bom_header_code,bom_line_code, require_track_id
from aps_plate_standard_require
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateStandardRequireBomStockDetailMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlate/ApsPlateStandardRequireBomStockDetailMapper.xml
similarity index 94%
rename from aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateStandardRequireBomStockDetailMapper.xml
rename to aps-modules/aps-core/src/main/resources/mapper/core/ApsPlate/ApsPlateStandardRequireBomStockDetailMapper.xml
index ab44a47..4ede8e3 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateStandardRequireBomStockDetailMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlate/ApsPlateStandardRequireBomStockDetailMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsPlateStandardRequireBomStockDetailMapper">
- <resultMap type="com.aps.core.domain.ApsPlateStandardRequireBomStockDetail" id="ApsPlateStandardRequireBomStockDetailResult">
+ <resultMap type="com.aps.core.domain.ApsPlate.ApsPlateStandardRequireBomStockDetail" id="ApsPlateStandardRequireBomStockDetailResult">
<result property="id" column="id" />
<result property="requireId" column="require_id" />
<result property="requireTrackId" column="require_track_id" />
@@ -29,7 +29,7 @@
from aps_plate_standard_require_bom_stock_detail
</sql>
- <select id="selectApsPlateStandardRequireBomStockDetailList" parameterType="com.aps.core.domain.ApsPlateStandardRequireBomStockDetail" resultMap="ApsPlateStandardRequireBomStockDetailResult">
+ <select id="selectApsPlateStandardRequireBomStockDetailList" parameterType="com.aps.core.domain.ApsPlate.ApsPlateStandardRequireBomStockDetail" resultMap="ApsPlateStandardRequireBomStockDetailResult">
<include refid="selectApsPlateStandardRequireBomStockDetailVo"/>
<where>
<if test="requireId != null and requireId != ''"> and require_id = #{requireId}</if>
@@ -49,7 +49,7 @@
where id = #{id}
</select>
- <insert id="insertApsPlateStandardRequireBomStockDetail" parameterType="com.aps.core.domain.ApsPlateStandardRequireBomStockDetail">
+ <insert id="insertApsPlateStandardRequireBomStockDetail" parameterType="com.aps.core.domain.ApsPlate.ApsPlateStandardRequireBomStockDetail">
insert into aps_plate_standard_require_bom_stock_detail
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
@@ -87,7 +87,7 @@
</trim>
</insert>
- <update id="updateApsPlateStandardRequireBomStockDetail" parameterType="com.aps.core.domain.ApsPlateStandardRequireBomStockDetail">
+ <update id="updateApsPlateStandardRequireBomStockDetail" parameterType="com.aps.core.domain.ApsPlate.ApsPlateStandardRequireBomStockDetail">
update aps_plate_standard_require_bom_stock_detail
<trim prefix="SET" suffixOverrides=",">
<if test="requireId != null">require_id = #{requireId},</if>
@@ -123,7 +123,7 @@
update aps_plate_standard_require_bom_stock_detail set del_flag = '1' where batch_number = #{batchNumber}
</update>
- <insert id="batchInsert" parameterType="com.aps.core.domain.ApsPlateStandardRequireBomStockDetail">
+ <insert id="batchInsert" parameterType="com.aps.core.domain.ApsPlate.ApsPlateStandardRequireBomStockDetail">
insert into aps_plate_standard_require_bom_stock_detail
(id,require_id, require_track_id, bom_line_id, bom_line_code, before_stock_amount, deduction_amount
, after_stock_amount, org_code, batch_number, del_flag, create_time, create_by)
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateStandardRequireErrorMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlate/ApsPlateStandardRequireErrorMapper.xml
similarity index 93%
rename from aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateStandardRequireErrorMapper.xml
rename to aps-modules/aps-core/src/main/resources/mapper/core/ApsPlate/ApsPlateStandardRequireErrorMapper.xml
index 7b5f031..bba08bb 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateStandardRequireErrorMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlate/ApsPlateStandardRequireErrorMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsPlateStandardRequireErrorMapper">
- <resultMap type="com.aps.core.domain.ApsPlateStandardRequireError" id="ApsPlateStandardRequireErrorResult">
+ <resultMap type="com.aps.core.domain.ApsPlate.ApsPlateStandardRequireError" id="ApsPlateStandardRequireErrorResult">
<result property="id" column="id" />
<result property="batchNumber" column="batch_number" />
<result property="requireId" column="require_id" />
@@ -23,7 +23,7 @@
select id, batch_number, require_id, doc_num, item_num, org_code, message, del_flag, create_by, create_time, update_by, update_time from aps_plate_standard_require_error
</sql>
- <select id="selectApsPlateStandardRequireErrorList" parameterType="com.aps.core.domain.ApsPlateStandardRequireError" resultMap="ApsPlateStandardRequireErrorResult">
+ <select id="selectApsPlateStandardRequireErrorList" parameterType="com.aps.core.domain.ApsPlate.ApsPlateStandardRequireError" resultMap="ApsPlateStandardRequireErrorResult">
<include refid="selectApsPlateStandardRequireErrorVo"/>
<where>
<if test="batchNumber != null and batchNumber != ''"> and batch_number = #{batchNumber}</if>
@@ -42,7 +42,7 @@
where id = #{id}
</select>
- <insert id="insertApsPlateStandardRequireError" parameterType="com.aps.core.domain.ApsPlateStandardRequireError">
+ <insert id="insertApsPlateStandardRequireError" parameterType="com.aps.core.domain.ApsPlate.ApsPlateStandardRequireError">
insert into aps_plate_standard_require_error
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
@@ -74,7 +74,7 @@
</trim>
</insert>
- <update id="updateApsPlateStandardRequireError" parameterType="com.aps.core.domain.ApsPlateStandardRequireError">
+ <update id="updateApsPlateStandardRequireError" parameterType="com.aps.core.domain.ApsPlate.ApsPlateStandardRequireError">
update aps_plate_standard_require_error
<trim prefix="SET" suffixOverrides=",">
<if test="batchNumber != null">batch_number = #{batchNumber},</if>
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateStandardRequireMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlate/ApsPlateStandardRequireMapper.xml
similarity index 97%
rename from aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateStandardRequireMapper.xml
rename to aps-modules/aps-core/src/main/resources/mapper/core/ApsPlate/ApsPlateStandardRequireMapper.xml
index a162699..1e16f2c 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateStandardRequireMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlate/ApsPlateStandardRequireMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsPlateStandardRequireMapper">
- <resultMap type="com.aps.core.domain.ApsPlateStandardRequire" id="ApsPlateStandardRequireResult">
+ <resultMap type="com.aps.core.domain.ApsPlate.ApsPlateStandardRequire" id="ApsPlateStandardRequireResult">
<result property="id" column="id" />
<result property="requireTrackId" column="require_track_id" />
<result property="bomLineId" column="bom_line_id" />
@@ -43,7 +43,7 @@
from aps_plate_standard_require
</sql>
- <select id="selectApsPlateStandardRequireList" parameterType="com.aps.core.domain.ApsPlateStandardRequire" resultMap="ApsPlateStandardRequireResult">
+ <select id="selectApsPlateStandardRequireList" parameterType="com.aps.core.domain.ApsPlate.ApsPlateStandardRequire" resultMap="ApsPlateStandardRequireResult">
<include refid="selectApsPlateStandardRequireVo"/>
<where>
<if test="requireTrackId != null and requireTrackId != ''"> and require_track_id = #{requireTrackId}</if>
@@ -74,7 +74,7 @@
where id = #{id}
</select>
- <insert id="insertApsPlateStandardRequire" parameterType="com.aps.core.domain.ApsPlateStandardRequire">
+ <insert id="insertApsPlateStandardRequire" parameterType="com.aps.core.domain.ApsPlate.ApsPlateStandardRequire">
insert into aps_plate_standard_require
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
@@ -134,7 +134,7 @@
</trim>
</insert>
- <update id="updateApsPlateStandardRequire" parameterType="com.aps.core.domain.ApsPlateStandardRequire">
+ <update id="updateApsPlateStandardRequire" parameterType="com.aps.core.domain.ApsPlate.ApsPlateStandardRequire">
update aps_plate_standard_require
<trim prefix="SET" suffixOverrides=",">
<if test="requireTrackId != null">require_track_id = #{requireTrackId},</if>
@@ -177,7 +177,7 @@
</foreach>
</delete>
- <select id="selectPlateSupplyGapList" parameterType="com.aps.core.domain.ApsPlateStandardRequire" resultMap="ApsPlateStandardRequireResult">
+ <select id="selectPlateSupplyGapList" parameterType="com.aps.core.domain.ApsPlate.ApsPlateStandardRequire" resultMap="ApsPlateStandardRequireResult">
select id, require_track_id, bom_line_code, bom_line_level,
match_state, match_mode, unmatched_demand_amount, start_date,
complete_date, demand_date, org_code, production_base
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateStandardRequireOrderEndDayMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlate/ApsPlateStandardRequireOrderEndDayMapper.xml
similarity index 96%
rename from aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateStandardRequireOrderEndDayMapper.xml
rename to aps-modules/aps-core/src/main/resources/mapper/core/ApsPlate/ApsPlateStandardRequireOrderEndDayMapper.xml
index bb116e7..4005b20 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateStandardRequireOrderEndDayMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlate/ApsPlateStandardRequireOrderEndDayMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsPlateStandardRequireOrderEndDayMapper">
- <resultMap id="BaseResultMap" type="com.aps.core.domain.ApsPlateStandardRequireOrderEndDay">
+ <resultMap id="BaseResultMap" type="com.aps.core.domain.ApsPlate.ApsPlateStandardRequireOrderEndDay">
<id property="id" column="id" />
<result property="bomOrderId" column="bom_order_id" />
<result property="requireId" column="require_id" />
--
Gitblit v1.9.3