From dca294f5173ae8c74b368a29f20dff5883de3a73 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期五, 16 五月 2025 17:15:27 +0800
Subject: [PATCH] 任务中心
---
aps-common/aps-common-core/src/main/java/com/aps/common/core/config/MyBatisPlusConfig.java | 9
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java | 4
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateOrderPlanManagerServiceImpl.java | 14 +
aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlanTaskMapper.java | 22 +++
aps-modules/aps-core/src/main/resources/mapper/core/ApsPlanTaskMapper.xml | 26 +++
aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlateStandardRequireService.java | 2
aps-modules/aps-core/src/main/java/com/aps/core/enums/PLAN_TASK_STATUS.java | 37 +++++
aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlateStandardRequireController.java | 13 +
aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlanTaskController.java | 35 +++++
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlanTaskServiceImpl.java | 72 ++++++++++
aps-modules/aps-core/src/main/java/com/aps/core/enums/PLAN_TASK_TYPE.java | 37 +++++
aps-modules/aps-core/src/main/java/com/aps/core/service/ApsPlanTaskService.java | 23 +++
aps-common/aps-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports | 3
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlanTask.java | 87 ++++++++++++
14 files changed, 373 insertions(+), 11 deletions(-)
diff --git a/aps-common/aps-common-core/src/main/java/com/aps/common/core/config/MyBatisPlusConfig.java b/aps-common/aps-common-core/src/main/java/com/aps/common/core/config/MyBatisPlusConfig.java
index 282d753..7f948d1 100644
--- a/aps-common/aps-common-core/src/main/java/com/aps/common/core/config/MyBatisPlusConfig.java
+++ b/aps-common/aps-common-core/src/main/java/com/aps/common/core/config/MyBatisPlusConfig.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.BlockAttackInnerInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
@@ -15,14 +16,16 @@
* 鍒嗛〉鎻掍欢
*/
@Bean
- public PaginationInnerInterceptor paginationInterceptor() {
+ public MybatisPlusInterceptor mybatisPlusInterceptor() {
+ MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
PaginationInnerInterceptor paginationInterceptor = new PaginationInnerInterceptor();
// 璁剧疆璇锋眰鐨勯〉闈㈠ぇ浜庢渶澶ч〉鍚庢槸鍚﹁繘琛屽洖婊�, true鍥炴粴, false缁х画
paginationInterceptor.setOverflow(false);
// 璁剧疆鏈�澶у崟椤甸檺鍒舵暟閲�, 榛樿 500 鏉�, -1 涓嶅彈闄愬埗
- paginationInterceptor.setDbType(DbType.MYSQL);
+ paginationInterceptor.setDbType(DbType.POSTGRE_SQL);
paginationInterceptor.setMaxLimit(-1L);
- return paginationInterceptor;
+ interceptor.addInnerInterceptor(paginationInterceptor);
+ return interceptor;
}
/**
diff --git a/aps-common/aps-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/aps-common/aps-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index b94451f..5f72cf5 100644
--- a/aps-common/aps-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/aps-common/aps-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1,2 +1,3 @@
com.aps.common.core.utils.SpringUtils
-com.aps.common.core.utils.uuid.Sequence
\ No newline at end of file
+com.aps.common.core.utils.uuid.Sequence
+com.aps.common.core.config.MyBatisPlusConfig
\ No newline at end of file
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlanTaskController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlanTaskController.java
new file mode 100644
index 0000000..7aa2adc
--- /dev/null
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlanTaskController.java
@@ -0,0 +1,35 @@
+package com.aps.core.controller.mainPlan;
+
+import com.aps.common.core.domain.R;
+import com.aps.common.core.web.controller.BaseController;
+import com.aps.common.core.web.page.PageDomain;
+import com.aps.common.core.web.page.TableDataInfo;
+import com.aps.common.core.web.page.TableSupport;
+import com.aps.core.domain.ApsPlanTask;
+import com.aps.core.service.ApsPlanTaskService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * 璁″垝浠诲姟绠＄悊
+ * */
+@RestController
+@RequestMapping("/planTask")
+public class ApsPlanTaskController extends BaseController {
+
+ @Autowired
+ private ApsPlanTaskService apsPlanTaskService;
+
+// @RequiresPermissions("planTask:list")
+ @GetMapping("/list")
+ public Page<ApsPlanTask> list(ApsPlanTask task){
+ PageDomain pageDomain = TableSupport.buildPageRequest();
+ Page<ApsPlanTask> page = new Page<>(pageDomain.getPageNum(), pageDomain.getPageSize());
+ return apsPlanTaskService.pagingList(page, task);
+ }
+}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlateStandardRequireController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlateStandardRequireController.java
index e16b755..34371a6 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlateStandardRequireController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlateStandardRequireController.java
@@ -8,7 +8,11 @@
import com.aps.common.log.enums.BusinessType;
import com.aps.common.security.annotation.RequiresPermissions;
import com.aps.core.domain.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 jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -29,6 +33,10 @@
{
@Autowired
private IApsPlateStandardRequireService apsPlateStandardRequireService;
+ @Resource
+ IApsPlateStandardRequireBatchService requireBatchService;
+ @Resource
+ ApsPlanTaskService planTaskService;
/**
* 鏌ヨ閽ｉ噾宸ュ崟鏍囧噯闇�姹傚垪琛�
@@ -133,7 +141,10 @@
@PostMapping("/generatorPlan")
public AjaxResult generatorPlan()
{
- apsPlateStandardRequireService.generatorPlan();
+ String batchNum= requireBatchService.getNewBatchNumber();
+ planTaskService.savePlanTask(batchNum);
+ apsPlateStandardRequireService.generatorPlan(batchNum);
+ planTaskService.updateTaskStatus(batchNum, PLAN_TASK_STATUS.FINISHED);
return success();
}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlanTask.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlanTask.java
new file mode 100644
index 0000000..9c0704e
--- /dev/null
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlanTask.java
@@ -0,0 +1,87 @@
+package com.aps.core.domain;
+
+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;
+import java.io.Serializable;
+import java.util.Date;
+
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+/**
+ * 璁″垝鐢熸垚鏃ュ織琛�
+ * @TableName aps_plan_task
+ */
+@ToString
+@EqualsAndHashCode(callSuper = false)
+@TableName(value ="aps_plan_task")
+@Data
+@Builder
+public class ApsPlanTask extends BaseEntity implements Serializable {
+
+ @TableField(exist = false)
+ private static final long serialVersionUID = 1L;
+ /**
+ * 涓婚敭ID
+ */
+ @TableField(value = "id")
+ @TableId(type = IdType.INPUT)
+ private Long id;
+
+ /**
+ * 浠诲姟鎵规鍙�
+ */
+ @TableField(value = "batch_num")
+ private String batchNum;
+
+ /**
+ * 浠诲姟绫诲瀷
+ */
+ @TableField(value = "task_type")
+ private String taskType;
+
+ /**
+ * 浠诲姟鐘舵��
+ */
+ @TableField(value = "task_status")
+ private String taskStatus;
+
+ /**
+ * 鍒涘缓浜�
+ */
+ @TableField(value = "create_by")
+ private String createBy;
+
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ @TableField(value = "create_time")
+ private Date createTime;
+
+ /**
+ * 鏇存柊浜�
+ */
+ @TableField(value = "update_by")
+ private String updateBy;
+
+ /**
+ * 鏇存柊鏃堕棿
+ */
+ @TableField(value = "update_time")
+ private Date updateTime;
+
+ /**
+ * 鍒犻櫎鏍囪(0,1)
+ */
+ @TableField(value = "del_flag")
+ private Integer delFlag;
+
+
+
+
+}
\ No newline at end of file
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/enums/PLAN_TASK_STATUS.java b/aps-modules/aps-core/src/main/java/com/aps/core/enums/PLAN_TASK_STATUS.java
new file mode 100644
index 0000000..ec1945d
--- /dev/null
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/enums/PLAN_TASK_STATUS.java
@@ -0,0 +1,37 @@
+package com.aps.core.enums;
+
+public enum PLAN_TASK_STATUS {
+ IN_PROCESS("InProgress","杩涜涓�"),
+ FINISHED("Finished","瀹屾垚");
+
+ private String code;
+ private String desc;
+
+ PLAN_TASK_STATUS(String code ,String desc){
+ this.code = code;
+ this.desc=desc;
+ }
+
+ public static PLAN_TASK_TYPE getByCode(String code){
+ for(PLAN_TASK_TYPE type : PLAN_TASK_TYPE.values()){
+ if(type.getCode().equals(code)){
+ return type;
+ }
+ }
+ return null;
+ }
+
+ public String getCode() {
+ return code;
+ }
+ public void setCode(String code) {
+ this.code = code;
+ }
+
+ public String getDesc() {
+ return desc;
+ }
+ public void setDesc(String desc) {
+ this.desc = desc;
+ }
+}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/enums/PLAN_TASK_TYPE.java b/aps-modules/aps-core/src/main/java/com/aps/core/enums/PLAN_TASK_TYPE.java
new file mode 100644
index 0000000..391655d
--- /dev/null
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/enums/PLAN_TASK_TYPE.java
@@ -0,0 +1,37 @@
+package com.aps.core.enums;
+
+public enum PLAN_TASK_TYPE {
+
+ PLATE_PLAN("PlateOrderPlan","鐢熸垚閽ｉ噾宸ュ崟璁″垝");
+
+ private String code;
+ private String desc;
+
+ PLAN_TASK_TYPE(String code ,String desc){
+ this.code = code;
+ this.desc=desc;
+ }
+
+ public static PLAN_TASK_TYPE getByCode(String code){
+ for(PLAN_TASK_TYPE type : PLAN_TASK_TYPE.values()){
+ if(type.code.equals(code)){
+ return type;
+ }
+ }
+ return null;
+ }
+
+ public String getCode() {
+ return code;
+ }
+ public void setCode(String code) {
+ this.code = code;
+ }
+
+ public String getDesc() {
+ return desc;
+ }
+ public void setDesc(String desc) {
+ this.desc = desc;
+ }
+}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlanTaskMapper.java b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlanTaskMapper.java
new file mode 100644
index 0000000..ccd1470
--- /dev/null
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlanTaskMapper.java
@@ -0,0 +1,22 @@
+package com.aps.core.mapper;
+
+import com.aps.core.domain.ApsPlanTask;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @author zhl
+* @description 閽堝琛ㄣ�恆ps_plan_task(璁″垝鐢熸垚鏃ュ織琛�)銆戠殑鏁版嵁搴撴搷浣淢apper
+* @createDate 2025-05-16 14:41:49
+* @Entity com.aps.core.domain.ApsPlanTask
+*/
+@Mapper
+public interface ApsPlanTaskMapper extends BaseMapper<ApsPlanTask> {
+ Page<ApsPlanTask> pagingList(Page<ApsPlanTask> page , ApsPlanTask task);
+
+}
+
+
+
+
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/ApsPlanTaskService.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/ApsPlanTaskService.java
new file mode 100644
index 0000000..217acc1
--- /dev/null
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/ApsPlanTaskService.java
@@ -0,0 +1,23 @@
+package com.aps.core.service;
+
+import com.aps.core.domain.ApsPlanTask;
+import com.aps.core.enums.PLAN_TASK_STATUS;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+* @author zhl
+* @description 閽堝琛ㄣ�恆ps_plan_task(璁″垝鐢熸垚鏃ュ織琛�)銆戠殑鏁版嵁搴撴搷浣淪ervice
+* @createDate 2025-05-16 14:41:49
+*/
+public interface ApsPlanTaskService extends IService<ApsPlanTask> {
+
+ Page<ApsPlanTask> pagingList(Page<ApsPlanTask> page , ApsPlanTask task);
+
+ void savePlanTask(String batchNum);
+
+ void updateTaskStatus(String batchNum, PLAN_TASK_STATUS status);
+}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlateStandardRequireService.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlateStandardRequireService.java
index 5806541..97c4f0d 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlateStandardRequireService.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlateStandardRequireService.java
@@ -69,5 +69,5 @@
public List<ApsPlateStandardRequire> selectPlateSupplyGapList(ApsPlateStandardRequire apsPlateStandardRequire);
- void generatorPlan();
+ void generatorPlan(String batchNum);
}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlanTaskServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlanTaskServiceImpl.java
new file mode 100644
index 0000000..36fd10b
--- /dev/null
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlanTaskServiceImpl.java
@@ -0,0 +1,72 @@
+package com.aps.core.service.impl;
+
+import cn.hutool.core.util.IdUtil;
+import com.aps.common.core.utils.DateUtils;
+import com.aps.common.security.utils.SecurityUtils;
+import com.aps.core.enums.PLAN_TASK_STATUS;
+import com.aps.core.enums.PLAN_TASK_TYPE;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.aps.core.domain.ApsPlanTask;
+import com.aps.core.service.ApsPlanTaskService;
+import com.aps.core.mapper.ApsPlanTaskMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+* @author zhl
+* @description 閽堝琛ㄣ�恆ps_plan_task(璁″垝鐢熸垚鏃ュ織琛�)銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
+* @createDate 2025-05-16 14:41:49
+*/
+@Service
+public class ApsPlanTaskServiceImpl extends ServiceImpl<ApsPlanTaskMapper, ApsPlanTask> implements ApsPlanTaskService{
+
+
+ @Autowired
+ ApsPlanTaskMapper mapper;
+
+ public Page<ApsPlanTask> pagingList(Page<ApsPlanTask> page ,ApsPlanTask task){
+ LambdaQueryWrapper<ApsPlanTask> queryWrapper=new LambdaQueryWrapper<>();
+ queryWrapper.like( !task.getTaskType().isEmpty(), ApsPlanTask::getTaskType,task.getTaskType());
+ return mapper.selectPage(page, queryWrapper);
+ }
+
+ /**
+ * 鍒涘缓鏂扮敓璁″垝浠诲姟
+ */
+ @Override
+ public void savePlanTask(String batchNum){
+ ApsPlanTask task = ApsPlanTask.builder().id(IdUtil.getSnowflakeNextId())
+ .batchNum(batchNum)
+ .taskStatus(PLAN_TASK_STATUS.IN_PROCESS.getCode())
+ .taskType(PLAN_TASK_TYPE.PLATE_PLAN.getCode())
+ .createBy(SecurityUtils.getUsername())
+ .createTime(DateUtils.getNowDate())
+ .delFlag(0)
+ .build();
+ baseMapper.insert(task);
+
+ }
+ /**
+ * 鏍规嵁鎵规鍙� 鏇存柊鐘舵��
+ * */
+ @Override
+ public void updateTaskStatus(String batchNum, PLAN_TASK_STATUS status){
+ LambdaQueryWrapper<ApsPlanTask> queryWrapper=new LambdaQueryWrapper<>();
+ queryWrapper.like(ApsPlanTask::getBatchNum,batchNum);
+ ApsPlanTask task = ApsPlanTask.builder()
+ .taskStatus(status.getCode())
+ .updateBy(SecurityUtils.getUsername())
+ .updateTime(DateUtils.getNowDate())
+ .build();
+ baseMapper.update(task,queryWrapper);
+ }
+}
+
+
+
+
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateOrderPlanManagerServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateOrderPlanManagerServiceImpl.java
index 6d9f374..d2b7f23 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/ApsPlateOrderPlanManagerServiceImpl.java
@@ -5,9 +5,13 @@
import com.aps.core.domain.ApsPlateOrderPlanManager;
import com.aps.core.domain.ApsPlateOrderPlanRequireDate;
import com.aps.core.domain.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 jakarta.annotation.Resource;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -27,7 +31,10 @@
@Autowired
private IApsPlateStandardRequireService apsPlateStandardRequireService;
-
+ @Resource
+ IApsPlateStandardRequireBatchService requireBatchService;
+ @Resource
+ ApsPlanTaskService planTaskService;
/**
* 鏌ヨ閽ｉ噾宸ュ崟璁″垝绠＄悊
*
@@ -68,6 +75,9 @@
apsPlateOrderPlanManagerMapper.updatePlanDateByBatch(planRequireDate);
});
}
- apsPlateStandardRequireService.generatorPlan();
+ String batchNum= requireBatchService.getNewBatchNumber();
+ planTaskService.savePlanTask(batchNum);
+ apsPlateStandardRequireService.generatorPlan(batchNum);
+ planTaskService.updateTaskStatus(batchNum, PLAN_TASK_STATUS.FINISHED);
}
}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java
index e8178ce..9602640 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java
@@ -163,7 +163,7 @@
@Transactional
@Override
- public void generatorPlan(){
+ public void generatorPlan(String batchNum){
/*鍒濆鍖栨暟鎹�*/
requireBatchService.initRequireBatch();
@@ -171,8 +171,6 @@
String plantCode="FORTUNA";
/*瀹氫箟涓诲崟绫诲瀷涓洪挘閲戜富鍗�*/
String mainOrderType = "main";
- /*鐢熸垚鏂版壒娆″彿*/
- String batchNum= requireBatchService.getNewBatchNumber();
/*鑾峰彇閽ｉ噾涓诲崟淇℃伅*/
List<ApsPlatePlan> mainPlans = platePlanMapper.selectPlatePlanByPlantMajor(plantCode,mainOrderType);
Hashtable<String, ApsMaterialStorageManagement> usedStorage = new Hashtable<>();
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlanTaskMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlanTaskMapper.xml
new file mode 100644
index 0000000..1e0b125
--- /dev/null
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlanTaskMapper.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.aps.core.mapper.ApsPlanTaskMapper">
+
+ <resultMap id="BaseResultMap" type="com.aps.core.domain.ApsPlanTask">
+ <result property="id" column="id" />
+ <result property="batchNum" column="batch_num" />
+ <result property="taskType" column="task_type" />
+ <result property="taskStatus" column="task_status" />
+ <result property="createBy" column="create_by" />
+ <result property="createTime" column="create_time" />
+ <result property="updateBy" column="update_by" />
+ <result property="updateTime" column="update_time" />
+ <result property="delFlag" column="del_flag" />
+ </resultMap>
+
+ <sql id="Base_Column_List">
+ id,batch_num,task_type,task_status,create_by,create_time,
+ update_by,update_time,del_flag
+ </sql>
+ <select id="pagingList" resultMap="BaseResultMap">
+ select * from aps_plan_task
+ </select>
+</mapper>
--
Gitblit v1.9.3