From c07f8d17beb4b8bb8a576926aa161b6858ac7340 Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Wed, 13 Dec 2023 18:29:03 +0800
Subject: [PATCH] =?UTF-8?q?opt:=20=E4=BB=A3=E7=A0=81=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../org/nl/common/domain/query/LConsumer.java | 7 ++-
.../java/org/nl/common/domain/vo/DeptVo.java | 4 +-
.../nl/common/logging/aspect/LogAspect.java | 8 +--
.../security/satoken/SaTokenConfigure.java | 14 +++--
.../java/org/nl/common/utils/FileUtil.java | 1 -
.../org/nl/config/ElPermissionConfig.java | 3 -
.../java/org/nl/config/lucene/Indexer.java | 30 ++++------
.../nl/config/lucene/LuceneIndexWriter.java | 6 +-
.../java/org/nl/config/lucene/Searcher.java | 28 ---------
.../org/nl/config/mybatis/CodeGenerator.java | 11 +---
.../org/nl/config/redis/RedisConvert.java | 7 +++
.../controller/dept/DeptController.java | 3 -
.../nl/system/service/dept/dto/DeptTree.java | 4 +-
.../dao/mapper/CodeColumnConfigMapper.java | 13 ++--
.../system/service/menu/ISysMenuService.java | 43 +++++++-------
.../service/menu/impl/SysMenuServiceImpl.java | 3 +-
.../notice/impl/SysNoticeServiceImpl.java | 2 -
.../permission/ISysDataPermissionService.java | 23 +++++---
.../impl/SysDataPermissionServiceImpl.java | 6 +-
.../service/redis/impl/RedisServiceImpl.java | 16 ++---
.../system/service/role/ISysRoleService.java | 27 +++++----
.../secutiry/impl/OnlineUserService.java | 8 +--
.../service/dao/MonthlyWorkOrderVo.java | 2 +-
.../DasDeviceCheckRecordController.java | 4 --
.../DasDeviceOperationRecordController.java | 4 --
.../DasQualityInspectionController.java | 4 --
.../service/IMdBaseBrickInfoService.java | 11 ++--
.../MdBaseClassstandardController.java | 6 --
.../service/IMdBaseClassstandardService.java | 10 ++--
.../wms/ext/acs/service/dto/SignalData.java | 10 +++-
.../acs/service/impl/WmsToAcsServiceImpl.java | 2 +-
.../mes/controller/MesToWmsController.java | 9 ---
.../wms/ext/mes/service/MesToWmsService.java | 7 ---
.../mes/service/impl/MesToWmsServiceImpl.java | 9 +--
.../mes/service/impl/WmsToMesServiceImpl.java | 7 ++-
.../service/ISysInteractRecordService.java | 18 +++---
.../pda/service/dao/dto/ForcedRestingDto.java | 10 +++-
.../pda/service/dao/dto/ManualGroupDto.java | 5 +-
.../pda/service/dao/dto/ManualSortingDto.java | 2 +-
.../wms/pda/service/dao/vo/PdaResponseVo.java | 4 +-
.../pda/service/dao/vo/StandTimeShowVo.java | 9 ++-
.../wms/pda/service/impl/PdaServiceImpl.java | 4 +-
.../service/IPdmBdWorkorderService.java | 59 ++++++++++---------
.../impl/PdmBdWorkorderServiceImpl.java | 30 +++++++---
.../report/controller/ReportController.java | 2 -
.../region/service/ISchBaseRegionService.java | 11 ++--
.../sch/task/service/ISchBaseTaskService.java | 17 +++---
.../service/impl/SchBaseTaskServiceImpl.java | 6 +-
.../nl/wms/sch/task_manage/AbstractTask.java | 8 +--
.../task/tasks/auto/RYKQLTask.java | 2 +-
.../task_manage/task/tasks/fj/FJQLTask.java | 4 +-
.../task_manage/task/tasks/fj/FJRKTask.java | 7 ++-
.../task_manage/task/tasks/fj/FJSKTask.java | 10 ++--
.../task_manage/task/tasks/fj/FJSLTask.java | 14 ++---
.../task_manage/task/tasks/hn/HNMLTask.java | 4 +-
.../task_manage/task/tasks/hn/HNQKTask.java | 4 +-
.../task_manage/task/tasks/yao/GZYQLTask.java | 6 +-
.../task_manage/task/tasks/yz/YZQKTask.java | 19 +++---
.../task_manage/task/tasks/yz/YZSKTask.java | 14 ++---
.../task_manage/task/tasks/yz/YZSLTask.java | 25 ++++----
.../org/nl/wms/util/OracleJDBCExample.java | 15 +++--
.../main/java/org/nl/wms/util/PointUtils.java | 3 +-
.../main/java/org/nl/wms/util/TaskUtils.java | 12 ++--
.../src/views/wms/pdm/workerorder/index.vue | 9 ++-
64 files changed, 346 insertions(+), 339 deletions(-)
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/LConsumer.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/LConsumer.java
index 4ba340a..9e303ba 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/LConsumer.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/LConsumer.java
@@ -8,7 +8,12 @@ import java.util.Objects;
*/
@FunctionalInterface
public interface LConsumer<X, Y, Z> {
-
+ /**
+ * 接受
+ * @param x /
+ * @param y /
+ * @param z /
+ */
void accept(X x, Y y, Z z);
}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/vo/DeptVo.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/vo/DeptVo.java
index 62d400b..5acaa4a 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/vo/DeptVo.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/vo/DeptVo.java
@@ -58,7 +58,9 @@ public class DeptVo extends BaseDTO implements Serializable {
@ApiModelProperty(value = "子节点数目", hidden = true)
private Integer sub_count = 0;
- //前端显示
+ /**
+ * 前端显示
+ */
private Boolean has_children =Boolean.FALSE;
private List<DeptVo> children;
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/logging/aspect/LogAspect.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/logging/aspect/LogAspect.java
index 9b25100..d6d1298 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/logging/aspect/LogAspect.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/logging/aspect/LogAspect.java
@@ -80,13 +80,11 @@ public class LogAspect {
*
* @param joinPoint join point for advice
*/
-
@Around("logPointcut()")
public Object logAround(ProceedingJoinPoint joinPoint) throws Throwable {
ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
HttpServletRequest request = attributes.getRequest();
HttpServletResponse response = attributes.getResponse();
-// HttpServletRequest request = RequestHolder.getHttpServletRequest();
MethodSignature signature = (MethodSignature) joinPoint.getSignature();
@@ -108,17 +106,16 @@ public class LogAspect {
/**
* 根据方法和传入的参数获取请求参数
*/
-
private String getParameter(Method method, Object[] args) {
List<Object> argList = new ArrayList<>();
Parameter[] parameters = method.getParameters();
for (int i = 0; i < parameters.length; i++) {
- //将RequestBody注解修饰的参数作为请求参数
+ // 将RequestBody注解修饰的参数作为请求参数
RequestBody requestBody = parameters[i].getAnnotation(RequestBody.class);
if (requestBody != null) {
argList.add(args[i]);
}
- //将RequestParam注解修饰的参数作为请求参数
+ // 将RequestParam注解修饰的参数作为请求参数
RequestParam requestParam = parameters[i].getAnnotation(RequestParam.class);
if (requestParam != null) {
Map<String, Object> map = new HashMap<>();
@@ -143,7 +140,6 @@ public class LogAspect {
* @param joinPoint join point for advice
* @param e exception
*/
-
@AfterThrowing(pointcut = "logPointcut()", throwing = "e")
public void logAfterThrowing(JoinPoint joinPoint, Throwable e) {
SysLog log = new SysLog("ERROR", System.currentTimeMillis() - currentTime.get());
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/security/satoken/SaTokenConfigure.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/security/satoken/SaTokenConfigure.java
index ab83e17..dd0b80f 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/security/satoken/SaTokenConfigure.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/security/satoken/SaTokenConfigure.java
@@ -21,23 +21,29 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@Configuration
public class SaTokenConfigure implements WebMvcConfigurer {
- // 白名单
@Autowired
private SecurityProperties securityProperties;
- // Sa-Token 整合 jwt (Simple 简单模式)
+ /**
+ * Sa-Token 整合 jwt (Simple 简单模式)
+ * @return
+ */
@Bean
public StpLogic getStpLogicJwt() {
return new StpLogicJwtForSimple();
}
- // 注册 Sa-Token 拦截器，打开注解式鉴权功能
+ /**
+ * 注册 Sa-Token 拦截器，打开注解式鉴权功能
+ * @param registry /
+ */
@Override
public void addInterceptors(InterceptorRegistry registry) {
// 注册 Sa-Token 拦截器，打开注解式鉴权功能
registry.addInterceptor(new SaInterceptor(handle -> StpUtil.checkLogin()))
.addPathPatterns("/**")
- .excludePathPatterns(securityProperties.getExcludes()); // 白名单
+ // 白名单
+ .excludePathPatterns(securityProperties.getExcludes());
}
}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/FileUtil.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/FileUtil.java
index a3d9b0a..1ecd740 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/FileUtil.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/FileUtil.java
@@ -96,7 +96,6 @@ public class FileUtil extends cn.hutool.core.io.FileUtil {
File file = null;
try {
// 用uuid作为文件名，防止生成的临时文件重复
- //file = File.createTempFile(IdUtil.simpleUUID(), prefix);
file = new File(SYS_TEM_DIR + IdUtil.simpleUUID() + prefix);
// MultipartFile to File
multipartFile.transferTo(file);
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/ElPermissionConfig.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/ElPermissionConfig.java
index 4abc37f..cba016f 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/ElPermissionConfig.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/ElPermissionConfig.java
@@ -25,9 +25,6 @@ public class ElPermissionConfig {
public Boolean check(String ...permissions){
// 获取当前用户的所有权限
-// List<String> elPermissions = SecurityUtils.getCurrentUser().getAuthorities().stream().map(GrantedAuthority::getAuthority).collect(Collectors.toList());
- // 判断当前用户的所有权限是否包含接口上定义的权限
-// return elPermissions.contains("admin") || Arrays.stream(permissions).anyMatch(elPermissions::contains);
return true;
}
}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/Indexer.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/Indexer.java
index fa22002..89537c0 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/Indexer.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/Indexer.java
@@ -36,13 +36,12 @@ public class Indexer {
/**
* 构造方法，实例化IndexWriter
*
- * @param indexDir
- * @throws Exception
+ * @param indexDir 索引下表
+ * @throws Exception 异常
*/
public Indexer(String indexDir) throws Exception {
Directory dir = FSDirectory.open(Paths.get(indexDir));
//标准分词器，会自动去掉空格啊，is a the等单词
-// Analyzer analyzer = new StandardAnalyzer();
Analyzer analyzer = new IKAnalyzer();
//将标准分词器配到写索引的配置中
IndexWriterConfig config = new IndexWriterConfig(analyzer);
@@ -67,24 +66,20 @@ public class Indexer {
}
}
//返回索引的文件数
-// return writer.numDocs();
return writer.numRamDocs();
}
/**
* 索引指定的文件
*
- * @param file
- * @throws Exception
+ * @param file 文件
+ * @throws Exception 异常
*/
private void indexFile(File file) throws Exception {
System.out.println("索引文件的路径：" + file.getCanonicalPath());
//调用下面的getDocument方法，获取该文件的document
Document doc = getDocument(file);
//添加索引文档
- //Document doc = json2Doc(jsonDoc);
-// Document doc = new Document();
-// doc.add(new TextField("content", jsonDoc, Field.Store.YES));
Field fieldContent = new TextField("fieldContent", FileUtils.readFileToString(null, "UTF-8"), Field.Store.YES);
//将doc添加到索引中
@@ -94,9 +89,9 @@ public class Indexer {
/**
* 获取文档，文档里再设置每个字段，就类似于数据库中的一行记录
*
- * @param file
- * @return
- * @throws Exception
+ * @param file 文件
+ * @return 文本
+ * @throws Exception 异常
*/
private Document getDocument(File file) throws Exception {
Document doc = new Document();
@@ -124,15 +119,11 @@ public class Indexer {
//步骤一：创建Directory对象，用于指定索引库的位置 RAMDirectory内存
Directory directory = FSDirectory.open(new File("D:\\lucene\\index").toPath());
//步骤二：创建一个IndexWriter对象，用于写索引
-// Analyzer analyzer = new StandardAnalyzer();
IndexWriter indexWriter = new IndexWriter(directory, new IndexWriterConfig(new IKAnalyzer(false)));
-// indexWriter.deleteAll();//清理所有索引库
-// IndexWriter indexWriter=new IndexWriter(directory,new IndexWriterConfig(new StandardAnalyzer()));
//记录索引开始时间
long startTime = System.currentTimeMillis();
//步骤三：读取磁盘中文件，对应每一个文件创建一个文档对象
Document document = new Document();
-// document.add(new TextField("fieldContent", device_id, Field.Store.YES));
document.add(new TextField("fieldContent", msg, Field.Store.YES));
indexWriter.addDocument(document);
//记录索引结束时间
@@ -144,7 +135,9 @@ public class Indexer {
System.out.println("建立索引成功-----关闭资源");
}
- //系统的日志文件路径
+ /**
+ * 系统的日志文件路径
+ */
@Value("${logging.file.path}")
private String logUrl;
@@ -152,11 +145,9 @@ public class Indexer {
//步骤一：创建Directory对象，用于指定索引库的位置 RAMDirectory内存
Directory directory = FSDirectory.open(new File("D:\\lucene\\index").toPath());
//步骤二：创建一个IndexWriter对象，用于写索引
-// Analyzer analyzer = new StandardAnalyzer();
IndexWriter indexWriter = new IndexWriter(directory, new IndexWriterConfig(new IKAnalyzer(false)));
indexWriter.deleteAll();//清理所有索引库
-// indexWriter=new IndexWriter(directory,new IndexWriterConfig(new StandardAnalyzer()));
//记录索引开始时间
long startTime = System.currentTimeMillis();
//步骤三：读取磁盘中文件，对应每一个文件创建一个文档对象
@@ -168,7 +159,6 @@ public class Indexer {
String strLine = null;
while (null != (strLine = bufferedReader.readLine())) {
Document document = new Document();
-// document.add(new Field());
document.add(new TextField("fieldContent", strLine, Field.Store.YES));
indexWriter.addDocument(document);
}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/LuceneIndexWriter.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/LuceneIndexWriter.java
index fb739ce..1aba134 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/LuceneIndexWriter.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/LuceneIndexWriter.java
@@ -52,9 +52,11 @@ public class LuceneIndexWriter {
}
public static String getDate(String timeString) throws ParseException {
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSX");//时间格式
+ //时间格式
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSX");
Date date = sdf.parse(timeString);
- timeString = DateUtil.format(date, "yyyy-MM-dd HH:mm:ss.SSS");//格式化后的时间
+ //格式化后的时间
+ timeString = DateUtil.format(date, "yyyy-MM-dd HH:mm:ss.SSS");
return timeString;
}
}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/Searcher.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/Searcher.java
index 0a8e307..0ec18c1 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/Searcher.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/Searcher.java
@@ -140,34 +140,6 @@ public class Searcher {
}
public static void main(String[] args) throws IOException, ParseException {
-// String indexDir = "D:\\lucene\\index";
-// //查询这个字符串
-// JSONObject whereJson = new JSONObject();
-// whereJson.put("size", "500");
-// whereJson.put("page", "1");
-// whereJson.put("message", "请求方法参数");
-//// whereJson.put(LogMessageConstant.FIELD_TRACEID, "13244183367577216");
-//
-// try {
-// search(indexDir, whereJson);
-// } catch (Exception e) {
-// e.printStackTrace();
-// }
- // 删除
-// Directory directory = FSDirectory.open(Paths.get("D:\\lucene\\index"));
-// IndexWriterConfig config = new IndexWriterConfig();
-// IndexWriter writer = new IndexWriter(directory, config);
-//
-// String timestampAsString = "2023-10-25 14:36:12";
-// SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-// Date date = dateFormat.parse(timestampAsString);
-// long unixTimestamp = date.getTime(); // 获取Unix时间戳
-//
-// Query query = LongPoint.newRangeQuery("time", 0L, unixTimestamp);
-// writer.deleteDocuments(query);
-//
-// writer.commit();
-// writer.close();
// 获取当前时间
LocalDateTime now = LocalDateTime.now();
// 减去七天
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/CodeGenerator.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/CodeGenerator.java
index f0d310a..e89ac1b 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/CodeGenerator.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/CodeGenerator.java
@@ -53,7 +53,6 @@ public class CodeGenerator {
gc.setOutputDir(projectPath + "/src/main/java/");
gc.setAuthor("generator");
gc.setOpen(false);
-// gc.setSwagger2(true);
gc.setEntityName("%s");
gc.setServiceName("I%sService");
gc.setServiceImplName("%sServiceImpl");
@@ -67,7 +66,6 @@ public class CodeGenerator {
mpg.setDataSource(dsc);
// 包配置
PackageConfig pc = new PackageConfig();
-// pc.setModuleName("");
pc.setParent("org.nl."+menusName);
pc.setController("controller." + moduleName);
pc.setMapper("service."+moduleName+".dao.mapper");
@@ -76,7 +74,7 @@ public class CodeGenerator {
pc.setEntity("service." + moduleName + ".dao");
pc.setXml("service." + moduleName + ".dao.mapper");
mpg.setPackageInfo(pc);
-// // 自定义配置
+ // 自定义配置
InjectionConfig cfg = new InjectionConfig() {
@Override
public void initMap() {
@@ -87,18 +85,11 @@ public class CodeGenerator {
StrategyConfig strategy = new StrategyConfig();
strategy.setNaming(NamingStrategy.underline_to_camel);
strategy.setColumnNaming(NamingStrategy.underline_to_camel);
-// strategy.setSuperEntityClass("你自己的父类实体,没有就不用设置!");
strategy.setEntityLombokModel(true);
strategy.setRestControllerStyle(true);
- // 公共父类
-// strategy.setSuperControllerClass("你自己的父类控制器,没有就不用设置!");
- // 写于父类中的公共字段
-// strategy.setSuperEntityColumns("id");
strategy.setInclude(scanner("表名，多个英文逗号分割").split(","));
strategy.setControllerMappingHyphenStyle(false);
-// strategy.setTablePrefix("sys_");
mpg.setStrategy(strategy);
-// mpg.setTemplateEngine(new FreemarkerTemplateEngine());
mpg.execute();
}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/redis/RedisConvert.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/redis/RedisConvert.java
index caea9b9..8079179 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/redis/RedisConvert.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/redis/RedisConvert.java
@@ -18,6 +18,13 @@ public interface RedisConvert {
RedisConvert INSTANCE = Mappers.getMapper(RedisConvert.class);
+ /**
+ * 构建 RedisMonitorRespVO
+ * @param info /
+ * @param dbSize /
+ * @param commandStats /
+ * @return /
+ */
default RedisMonitorRespVO build(Properties info, Long dbSize, Properties commandStats) {
RedisMonitorRespVO respVO = RedisMonitorRespVO.builder().info(info).dbSize(dbSize)
.commandStats(new ArrayList<>(commandStats.size())).build();
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dept/DeptController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dept/DeptController.java
index a576223..75bc5d3 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dept/DeptController.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dept/DeptController.java
@@ -84,7 +84,6 @@ public class DeptController {
@Log("新增部门")
@ApiOperation("新增部门")
@PostMapping
-// @SaCheckPermission("dept:add")
public ResponseEntity<Object> create(@Validated @RequestBody SysDept resources){
deptService.createDept(resources);
return new ResponseEntity<>(HttpStatus.CREATED);
@@ -93,7 +92,6 @@ public class DeptController {
@Log("修改部门")
@ApiOperation("修改部门")
@PutMapping
-// @SaCheckPermission("dept:edit")
public ResponseEntity<Object> update(@Validated @RequestBody SysDept dept){
if (dept.getPid() != null && dept.getDept_id().equals(dept.getPid())) {
throw new BadRequestException("上级不能为自己");
@@ -105,7 +103,6 @@ public class DeptController {
@Log("删除部门")
@ApiOperation("删除部门")
@DeleteMapping
-// @SaCheckPermission("dept:del")
public ResponseEntity<Object> delete(@RequestBody Set<String> deptIds){
if (CollectionUtils.isEmpty(deptIds)){
return ResponseEntity.noContent().build();
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dto/DeptTree.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dto/DeptTree.java
index 0aaf8b8..db34413 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dto/DeptTree.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dto/DeptTree.java
@@ -16,6 +16,7 @@
package org.nl.system.service.dept.dto;
import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Data;
import lombok.Getter;
import lombok.Setter;
@@ -26,8 +27,7 @@ import java.util.List;
* @author Zheng Jie
* @date 2019-03-25
*/
-@Getter
-@Setter
+@Data
public class DeptTree implements Serializable {
private String dept_id;
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/mapper/CodeColumnConfigMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/mapper/CodeColumnConfigMapper.java
index c1306b6..e902654 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/mapper/CodeColumnConfigMapper.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/mapper/CodeColumnConfigMapper.java
@@ -19,17 +19,22 @@ public interface CodeColumnConfigMapper extends BaseMapper<CodeColumnConfig> {
/**
* 分页查找
- * @param name
- * @return
+ * @param name 表名
+ * @return 表信息
*/
List<TablesInfo> getTables(String name, int pageSize, int offset);
/**
* 分页查询的总数
- * @param name
- * @return
+ * @param name 表名
+ * @return 表信息
*/
long getTablesTotal(String name);
+ /**
+ * 获取
+ * @param tableName 表名
+ * @return 列数据
+ */
List<ColumnInfo> getTablesByTableName(String tableName);
}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/ISysMenuService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/ISysMenuService.java
index f8d912e..f169a41 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/ISysMenuService.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/ISysMenuService.java
@@ -24,15 +24,15 @@ public interface ISysMenuService extends IService<SysMenu> {
* 查询全部数据,菜单不使用分页
*
* @param param 查询条件
- * @return
+ * @return /
*/
List<MenuDto> queryAll(Map<String, Object> param);
/**
* 条件查询
- * @param query
- * @param page
- * @return
+ * @param query /
+ * @param page /
+ * @return /
*/
List query(MenuQuery query, PageQuery page);
@@ -40,7 +40,7 @@ public interface ISysMenuService extends IService<SysMenu> {
* 根据ID获取同级与上级数据
*
* @param menuDto 菜单对象
- * @param menus
+ * @param menus /
* @return /
*/
List<MenuDto> getSuperior(MenuDto menuDto, List<SysMenu> menus);
@@ -56,7 +56,7 @@ public interface ISysMenuService extends IService<SysMenu> {
/**
* 根据菜单父节点标识查询菜单列表
*
- * @param pid
+ * @param pid /
* @return 菜单列表
*/
List<SysMenu> findByPid(String pid);
@@ -71,8 +71,8 @@ public interface ISysMenuService extends IService<SysMenu> {
/**
* 获取所有子节点，包含自身ID
*
- * @param menuList
- * @param menuSet
+ * @param menuList /
+ * @param menuSet /
* @return /
*/
Set<SysMenu> getChildMenus(List<SysMenu> menuList, Set<SysMenu> menuSet);
@@ -80,51 +80,51 @@ public interface ISysMenuService extends IService<SysMenu> {
/**
* 创建
*
- * @param menu
+ * @param menu 菜单
*/
void create(SysMenu menu);
/**
* 删除
*
- * @param menuSet
+ * @param menuSet /
*/
void delete(Set<SysMenu> menuSet);
/**
* 编辑
*
- * @param menu
+ * @param menu 菜单
*/
void update(SysMenu menu);
/**
* 获取菜单数据
* @param userId 用户列表
- * @return
+ * @return /
*/
List<MenuDto> findByUser(String userId);
/**
* 构建菜单树
*
- * @param menuDtos
+ * @param menuDtos /
* @return /
*/
List<MenuVo> buildMenus(List<MenuDto> menuDtos);
/**
* 构建菜单
- * @param menuDtos
- * @param pid
- * @return
+ * @param menuDtos 菜单
+ * @param pid 父id
+ * @return /
*/
List<MenuVo> buildMenus(List<MenuDto> menuDtos,String pid);
/**
* 构建菜单
- * @param systemType
- * @return
+ * @param systemType 菜单类型
+ * @return /
*/
List<MenuVo> buildMenus(String systemType);
@@ -145,8 +145,9 @@ public interface ISysMenuService extends IService<SysMenu> {
List<SysMenu> getMenus(String pid);
/**
- * @param sysMenu
- * @return
+ * 实体转换
+ * @param sysMenu 菜单
+ * @return /
*/
MenuDto doToDto(SysMenu sysMenu);
@@ -155,7 +156,7 @@ public interface ISysMenuService extends IService<SysMenu> {
* @param roleId 角色标识
* @param systemType 系统类型
* @param category 目录
- * @return
+ * @return /
*/
List<Map> getMenusByRole(String roleId, String systemType, String category);
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java
index 9806376..d0a7d1a 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java
@@ -190,7 +190,8 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
public void update(SysMenu resources) {
String menuId = resources.getMenu_id();
SysMenu menu = baseMapper.selectById(menuId);
- String allChild = baseMapper.findAllChild(menuId); // 获取当前菜单的所有子菜单
+ // 获取当前菜单的所有子菜单
+ String allChild = baseMapper.findAllChild(menuId);
List<String> allChildIds = ObjectUtil.isNotEmpty(allChild)?Arrays.asList(allChild.split(",")):null;
if (ObjectUtil.isNotEmpty(allChildIds) && allChildIds.contains(resources.getPid())){
throw new BadRequestException("上级不能为自己或自己的下级");
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/impl/SysNoticeServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/impl/SysNoticeServiceImpl.java
index e87fc1d..3f7bfee 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/impl/SysNoticeServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/impl/SysNoticeServiceImpl.java
@@ -162,8 +162,6 @@ public class SysNoticeServiceImpl extends ServiceImpl<SysNoticeMapper, SysNotice
@Override
public void createNotice(String msg, String title, String type) {
-// log.info("创建消息通知-信息：{}, 标题：{}, 类型：{}", msg, title, type);
- // 获取标题相同的信息
List<SysNotice> sysNotices = sysNoticeMapper.selectList(new LambdaQueryWrapper<SysNotice>()
.eq(SysNotice::getNotice_title, title)
.eq(SysNotice::getHave_read, NoticeEnum.HAVE_READ_OFF.getValue()));
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/ISysDataPermissionService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/ISysDataPermissionService.java
index 58bf417..5b05226 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/ISysDataPermissionService.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/ISysDataPermissionService.java
@@ -33,46 +33,51 @@ public interface ISysDataPermissionService extends IService<SysDataPermission> {
/**
* 新增数据权限
- * @param dto
+ * @param permission /
*/
void create(SysDataPermission permission);
/**
* 修改
- * @param permission
+ * @param permission /
*/
void update(SysDataPermission permission);
/**
* 批量删除
- * @param ids
+ * @param ids /
*/
void deleteAll(Set<String> ids);
/**
- *
- * @return
+ * 数据范围类型
+ * @return Dict
*/
List<Dict> getDataScopeType();
/**
* 获取数据权限下拉框
- * @return
+ * @return /
*/
List<SysDataPermission> getDataPermissionOption();
+ /**
+ * 获取数据显示
+ * @param id /
+ * @return /
+ */
List<UserDataPermissionDto> getDataShow(String id);
/**
* 保存数据权限
- * @param datas
+ * @param datas /
*/
void savePermission(JSONObject datas);
/**
* 数据展示
- * @param data
- * @return
+ * @param data /
+ * @return /
*/
List<SysDataScope> getDataDetail(JSONObject data);
}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/impl/SysDataPermissionServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/impl/SysDataPermissionServiceImpl.java
index b29850c..925bc6d 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/impl/SysDataPermissionServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/impl/SysDataPermissionServiceImpl.java
@@ -155,7 +155,8 @@ public class SysDataPermissionServiceImpl extends ServiceImpl<SysDataPermissionM
// 保存用户数据权限
userService.insertDataPermission(userDataPermissionDto);
JSONArray users = scopeObj.getJSONArray("users");
- if (ObjectUtil.isNotEmpty(users)) { // 如果是用户直接将用户的id绑定进去
+ // 如果是用户直接将用户的id绑定进去
+ if (ObjectUtil.isNotEmpty(users)) {
for (int j = 0; j < users.size(); j++) {
JSONObject user = users.getJSONObject(j);
String userId = user.getString("user_id");
@@ -167,7 +168,8 @@ public class SysDataPermissionServiceImpl extends ServiceImpl<SysDataPermissionM
}
}
JSONArray depts = scopeObj.getJSONArray("depts");
- if (ObjectUtil.isNotEmpty(depts)) { // 如果是部门，先根据部门id求出所有的用户id
+ // 如果是部门，先根据部门id求出所有的用户id
+ if (ObjectUtil.isNotEmpty(depts)) {
for (int j = 0; j < depts.size(); j++) {
JSONObject dept = depts.getJSONObject(j);
String dept_id = dept.getString("dept_id");
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/impl/RedisServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/impl/RedisServiceImpl.java
index 3f681ef..5335b45 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/impl/RedisServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/impl/RedisServiceImpl.java
@@ -35,7 +35,7 @@ public class RedisServiceImpl implements RedisService {
Long dbSize = stringRedisTemplate.execute(RedisServerCommands::dbSize);
Properties commandStats = stringRedisTemplate.execute((
RedisCallback<Properties>) connection -> connection.info("commandstats"));
- assert commandStats != null; // 断言，避免警告
+ assert commandStats != null;
// 拼接结果返回
// 转成实体
JSONObject json = new JSONObject();
@@ -45,10 +45,7 @@ public class RedisServiceImpl implements RedisService {
@Override
public JSONObject getKeyDefineList() {
-// List<RedisKeyDefine> keyDefines = RedisKeyRegistry.list();
- JSONObject json = new JSONObject();
-// json.put("info", RedisConvert.INSTANCE.convertList(keyDefines));
- return json;
+ return new JSONObject();
}
@Override
@@ -60,9 +57,12 @@ public class RedisServiceImpl implements RedisService {
while ( it.hasNext() ) {
String key = it.next();
JSONObject redis = new JSONObject();
- DataType dataType = stringRedisTemplate.type(key); // 数据类型
- String s = stringRedisTemplate.opsForValue().get(key); // 获取值
- Long expire = stringRedisTemplate.getExpire(key); // 获取剩余时间
+ // 数据类型
+ DataType dataType = stringRedisTemplate.type(key);
+ // 获取值
+ String s = stringRedisTemplate.opsForValue().get(key);
+ // 获取剩余时间
+ Long expire = stringRedisTemplate.getExpire(key);
redis.put("dataType", dataType);
redis.put("key", key);
redis.put("value", s);
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/ISysRoleService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/ISysRoleService.java
index 04019a2..401e6ab 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/ISysRoleService.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/ISysRoleService.java
@@ -22,49 +22,54 @@ public interface ISysRoleService extends IService<SysRole> {
/**
* 查询
- * @param param
- * @param page
- * @return
+ * @param param /
+ * @param page /
+ * @return /
*/
IPage<SysRole> query(Map param, PageQuery page);
/**
* 创建角色
- * @param param
+ * @param param /
*/
void create(JSONObject param);
/**
* 更新角色
- * @param param
+ * @param param /
*/
void update(JSONObject param);
/**
* 删除角色
- * @param ids
+ * @param ids /
*/
void deleteBatchByIds(Set<String> ids);
/**
* 更新角色菜单
- * @param form
+ * @param form /
*/
void updateMenu(JSONObject form);
/**
* 通过id获取用户的权限
- * @param userDto
- * @return
+ * @param userDto /
+ * @return /
*/
List<String> getPermissionList(JSONObject userDto);
/**
* 保存用户角色关系
- * @param UserId
- * @param deptIds
+ * @param UserId /
+ * @param deptIds /
*/
void saveUserRoleRelation(String UserId, List<String> deptIds);
+
+ /**
+ * 删除用户-角色关系
+ * @param UserId 用户标识
+ */
void delUserRoleRelation(String UserId);
}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/impl/OnlineUserService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/impl/OnlineUserService.java
index 2579c20..d155507 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/impl/OnlineUserService.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/impl/OnlineUserService.java
@@ -140,8 +140,8 @@ public class OnlineUserService {
if (ObjectUtil.isNotEmpty(one)) {
redisUtils.del("oline-" + one.getUsername());
}
- // 下线
- StpUtil.logoutByTokenValue(key.getKey()); // 通过token强退
+ // 下线 通过token强退
+ StpUtil.logoutByTokenValue(key.getKey());
}
/**
@@ -150,8 +150,8 @@ public class OnlineUserService {
*/
public void kickOut(String key) {
redisUtils.del(key);
- // 下线
- StpUtil.logoutByTokenValue(key); // 通过token强退
+ // 下线 通过token强退
+ StpUtil.logoutByTokenValue(key);
}
/**
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/dao/MonthlyWorkOrderVo.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/dao/MonthlyWorkOrderVo.java
index a1e87eb..1136d7e 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/dao/MonthlyWorkOrderVo.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/dao/MonthlyWorkOrderVo.java
@@ -12,6 +12,6 @@ public class MonthlyWorkOrderVo {
private String name;
private Long order_num;
private Long guada_num;
- private Long residue_num; // 剩余
+ private Long residue_num;
}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/controller/DasDeviceCheckRecordController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/controller/DasDeviceCheckRecordController.java
index f7530a8..77af655 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/controller/DasDeviceCheckRecordController.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/controller/DasDeviceCheckRecordController.java
@@ -32,7 +32,6 @@ public class DasDeviceCheckRecordController {
@GetMapping
@Log("查询设备点检功能")
@ApiOperation("查询设备点检功能")
- //@SaCheckPermission("@el.check('dasDeviceCheckRecord:list')")
public ResponseEntity<Object> query(@RequestParam Map whereJson, PageQuery page){
return new ResponseEntity<>(TableDataInfo.build(dasDeviceCheckRecordService.queryAll(whereJson,page)),HttpStatus.OK);
}
@@ -40,7 +39,6 @@ public class DasDeviceCheckRecordController {
@PostMapping
@Log("新增设备点检功能")
@ApiOperation("新增设备点检功能")
- //@SaCheckPermission("@el.check('dasDeviceCheckRecord:add')")
public ResponseEntity<Object> create(@Validated @RequestBody DasDeviceCheckRecord entity){
dasDeviceCheckRecordService.create(entity);
return new ResponseEntity<>(HttpStatus.CREATED);
@@ -49,7 +47,6 @@ public class DasDeviceCheckRecordController {
@PutMapping
@Log("修改设备点检功能")
@ApiOperation("修改设备点检功能")
- //@SaCheckPermission("@el.check('dasDeviceCheckRecord:edit')")
public ResponseEntity<Object> update(@Validated @RequestBody DasDeviceCheckRecord entity){
dasDeviceCheckRecordService.update(entity);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
@@ -57,7 +54,6 @@ public class DasDeviceCheckRecordController {
@Log("删除设备点检功能")
@ApiOperation("删除设备点检功能")
- //@SaCheckPermission("@el.check('dasDeviceCheckRecord:del')")
@DeleteMapping
public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {
dasDeviceCheckRecordService.deleteAll(ids);
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/controller/DasDeviceOperationRecordController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/controller/DasDeviceOperationRecordController.java
index 3a9e918..83f1834 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/controller/DasDeviceOperationRecordController.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/controller/DasDeviceOperationRecordController.java
@@ -32,7 +32,6 @@ public class DasDeviceOperationRecordController {
@GetMapping
@Log("查询设备动作操作记录")
@ApiOperation("查询设备动作操作记录")
- //@SaCheckPermission("@el.check('dasDeviceOperationRecord:list')")
public ResponseEntity<Object> query(@RequestParam Map whereJson, PageQuery page){
return new ResponseEntity<>(TableDataInfo.build(dasDeviceOperationRecordService.queryAll(whereJson,page)),HttpStatus.OK);
}
@@ -40,7 +39,6 @@ public class DasDeviceOperationRecordController {
@PostMapping
@Log("新增设备动作操作记录")
@ApiOperation("新增设备动作操作记录")
- //@SaCheckPermission("@el.check('dasDeviceOperationRecord:add')")
public ResponseEntity<Object> create(@Validated @RequestBody DasDeviceOperationRecord entity){
dasDeviceOperationRecordService.create(entity);
return new ResponseEntity<>(HttpStatus.CREATED);
@@ -49,7 +47,6 @@ public class DasDeviceOperationRecordController {
@PutMapping
@Log("修改设备动作操作记录")
@ApiOperation("修改设备动作操作记录")
- //@SaCheckPermission("@el.check('dasDeviceOperationRecord:edit')")
public ResponseEntity<Object> update(@Validated @RequestBody DasDeviceOperationRecord entity){
dasDeviceOperationRecordService.update(entity);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
@@ -57,7 +54,6 @@ public class DasDeviceOperationRecordController {
@Log("删除设备动作操作记录")
@ApiOperation("删除设备动作操作记录")
- //@SaCheckPermission("@el.check('dasDeviceOperationRecord:del')")
@DeleteMapping
public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {
dasDeviceOperationRecordService.deleteAll(ids);
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/controller/DasQualityInspectionController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/controller/DasQualityInspectionController.java
index d24082c..907ddc2 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/controller/DasQualityInspectionController.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/controller/DasQualityInspectionController.java
@@ -32,7 +32,6 @@ public class DasQualityInspectionController {
@GetMapping
@Log("查询质检记录")
@ApiOperation("查询质检记录")
- //@SaCheckPermission("@el.check('dasQualityInspection:list')")
public ResponseEntity<Object> query(@RequestParam Map whereJson, PageQuery page){
return new ResponseEntity<>(TableDataInfo.build(dasQualityInspectionService.queryAll(whereJson,page)),HttpStatus.OK);
}
@@ -40,7 +39,6 @@ public class DasQualityInspectionController {
@PostMapping
@Log("新增质检记录")
@ApiOperation("新增质检记录")
- //@SaCheckPermission("@el.check('dasQualityInspection:add')")
public ResponseEntity<Object> create(@Validated @RequestBody DasQualityInspection entity){
dasQualityInspectionService.create(entity);
return new ResponseEntity<>(HttpStatus.CREATED);
@@ -49,7 +47,6 @@ public class DasQualityInspectionController {
@PutMapping
@Log("修改质检记录")
@ApiOperation("修改质检记录")
- //@SaCheckPermission("@el.check('dasQualityInspection:edit')")
public ResponseEntity<Object> update(@Validated @RequestBody DasQualityInspection entity){
dasQualityInspectionService.update(entity);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
@@ -57,7 +54,6 @@ public class DasQualityInspectionController {
@Log("删除质检记录")
@ApiOperation("删除质检记录")
- //@SaCheckPermission("@el.check('dasQualityInspection:del')")
@DeleteMapping
public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {
dasQualityInspectionService.deleteAll(ids);
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/brick/service/IMdBaseBrickInfoService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/brick/service/IMdBaseBrickInfoService.java
index aaedcef..0ebbc47 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/brick/service/IMdBaseBrickInfoService.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/brick/service/IMdBaseBrickInfoService.java
@@ -44,27 +44,28 @@ public interface IMdBaseBrickInfoService extends IService<MdBaseBrickInfo> {
/**
* 添加每块砖信息记录
- * @param dto
+ * @param dto 砖块
*/
void addBrickInfo(BrickInfoDto dto);
/**
* 将所有当前位置的砖块设置组盘标识
* @param deviceCode : 放砖位置-压制对接位
+ * @param groupId 组盘标识
*/
void setGroupByCurrentAllBrick(String deviceCode, String groupId);
/**
* 工单合格数量
- * @param workorderCode
- * @return
+ * @param workorderCode /
+ * @return /
*/
int getCountQualifiedQty(String workorderCode);
/**
* 工单不合格数量
- * @param workorderCode
- * @return
+ * @param workorderCode /
+ * @return /
*/
int getCountUnqualifiedQty(String workorderCode);
}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/controller/MdBaseClassstandardController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/controller/MdBaseClassstandardController.java
index 10e16ac..68a1e92 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/controller/MdBaseClassstandardController.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/controller/MdBaseClassstandardController.java
@@ -34,7 +34,6 @@ public class MdBaseClassstandardController {
@GetMapping
@Log("查询基础分类")
@ApiOperation("查询基础分类")
- //@SaCheckPermission("@el.check('mdBaseClassstandard:list')")
public ResponseEntity<Object> query(@RequestParam Map whereJson, PageQuery page){
return new ResponseEntity<>(TableDataInfo.build(mdBaseClassstandardService.queryAll(whereJson,page)),HttpStatus.OK);
}
@@ -42,7 +41,6 @@ public class MdBaseClassstandardController {
@PostMapping
@Log("新增基础分类")
@ApiOperation("新增基础分类")
- //@SaCheckPermission("@el.check('mdBaseClassstandard:add')")
public ResponseEntity<Object> create(@Validated @RequestBody MdBaseClassstandard entity){
mdBaseClassstandardService.create(entity);
return new ResponseEntity<>(HttpStatus.CREATED);
@@ -51,7 +49,6 @@ public class MdBaseClassstandardController {
@PutMapping
@Log("修改基础分类")
@ApiOperation("修改基础分类")
- //@SaCheckPermission("@el.check('mdBaseClassstandard:edit')")
public ResponseEntity<Object> update(@Validated @RequestBody MdBaseClassstandard entity){
mdBaseClassstandardService.update(entity);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
@@ -59,7 +56,6 @@ public class MdBaseClassstandardController {
@Log("删除基础分类")
@ApiOperation("删除基础分类")
- //@SaCheckPermission("@el.check('mdBaseClassstandard:del')")
@DeleteMapping
public ResponseEntity<Object> delete(@RequestBody List<String> ids) {
mdBaseClassstandardService.deleteAll(ids);
@@ -76,14 +72,12 @@ public class MdBaseClassstandardController {
@GetMapping("/loadClass")
@Log("查询基础类型")
@ApiOperation("查询基础类型")
- //@PreAuthorize("@el.check('materialtype:list')")
public ResponseEntity<Object> query(@RequestParam Map whereJson) {
return new ResponseEntity<>(mdBaseClassstandardService.loadClass(whereJson), HttpStatus.OK);
}
@ApiOperation("查询类别:根据ID获取同级与上级数据")
@PostMapping("/superior")
- //@PreAuthorize("@el.check('user:list','dept:list')")
public ResponseEntity<Object> getSuperior(@RequestBody String id) {
MdBaseClassstandard classstandard = mdBaseClassstandardService.getById(id);
ArrayList<MdBaseClassstandard> list = mdBaseClassstandardService.getSuperior(classstandard, new ArrayList<>());
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/IMdBaseClassstandardService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/IMdBaseClassstandardService.java
index 0e1a3f9..5a010af 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/IMdBaseClassstandardService.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/IMdBaseClassstandardService.java
@@ -56,7 +56,7 @@ public interface IMdBaseClassstandardService extends IService<MdBaseClassstandar
List<MdBaseClassstandard> loadClass(Map whereJson);
/**
- *
+ * 根据ID获取同级与上级数据
* @param classstandard
* @param objects
* @return
@@ -65,15 +65,15 @@ public interface IMdBaseClassstandardService extends IService<MdBaseClassstandar
/**
* 构建树形
- * @param list
- * @return
+ * @param list 分类数组
+ * @return 分类数组
*/
List<MdBaseClassstandard> buildTree(ArrayList<MdBaseClassstandard> list);
/**
* 根据编码获取分类名称下拉框
- * @param code
- * @return
+ * @param code /
+ * @return /
*/
List<MdBaseClassstandard> getClassByCode(String code);
}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/SignalData.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/SignalData.java
index 86c0776..240d4cb 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/SignalData.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/SignalData.java
@@ -10,9 +10,15 @@ import lombok.Data;
@Data
public class SignalData {
- private String code; // to_command
+ /**
+ * to_command
+ */
+ private String code;
- private String value; // 1
+ /**
+ * 值
+ */
+ private String value;
public static SignalData buildSignalData(String code, String value) {
SignalData signalData = new SignalData();
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java
index d2f529b..d125721 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java
@@ -58,7 +58,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
@Override
public AcsResponse getDeviceStatusByCode(List<DeviceInfoDto> list) {
- String api = "/api/wms/querydevice"; // todo: 地址未确认
+ String api = "/api/wms/querydevice";
AcsResponse resultForAcs = AcsUtil.notifyAcs2(api, list);
// 记录日志
interactRecordService.saveRecord("获取设备信息", list, resultForAcs, GeneralDefinition.LMS_ACS);
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/controller/MesToWmsController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/controller/MesToWmsController.java
index 29ca035..c4bf793 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/controller/MesToWmsController.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/controller/MesToWmsController.java
@@ -26,14 +26,5 @@ import org.springframework.web.bind.annotation.RestController;
@Slf4j
@SaIgnore
public class MesToWmsController {
- @Autowired
- private MesToWmsService mesToWmsService;
- @PostMapping("/downOrder")
- @Log("下发工单")
- @ApiOperation("下发工单")
- @SaIgnore
- public ResponseEntity<Object> downOrderForMes(@RequestBody JSONObject param) {
- return new ResponseEntity<>(mesToWmsService.downOrderForMes(param), HttpStatus.OK);
- }
}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/MesToWmsService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/MesToWmsService.java
index e623796..4b67424 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/MesToWmsService.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/MesToWmsService.java
@@ -8,11 +8,4 @@ import com.alibaba.fastjson.JSONObject;
* @Date: 2023/8/3
*/
public interface MesToWmsService {
- /**
- * mes下发工单
- * @param param
- * @return
- */
- @Deprecated
- JSONObject downOrderForMes(JSONObject param);
}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/impl/MesToWmsServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/impl/MesToWmsServiceImpl.java
index 5b1031d..dcb5e62 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/impl/MesToWmsServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/impl/MesToWmsServiceImpl.java
@@ -13,12 +13,5 @@ import org.springframework.stereotype.Service;
@Slf4j
@Service
public class MesToWmsServiceImpl implements MesToWmsService {
- @Override
- public JSONObject downOrderForMes(JSONObject param) {
- log.info("mes传来工单信息：" + param);
- JSONObject res = new JSONObject();
- res.put("code", 200);
- res.put("message", "请求成功");
- return res;
- }
+
}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/impl/WmsToMesServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/impl/WmsToMesServiceImpl.java
index 416d317..0177c19 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/impl/WmsToMesServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/impl/WmsToMesServiceImpl.java
@@ -140,7 +140,7 @@ public class WmsToMesServiceImpl implements WmsToMesService {
mesProductDataDto.setPRESSUNIT(basePoint.getExt_point_code());
mesProductDataDto.setFTEAM(workorder.getTeam());
mesProductDataDto.setTRAY_NO(vehiclematerialgroup.getVehicle_code());
- mesProductDataDto.setPRO_SUBNUM(BigDecimal.valueOf(vehiclematerialgroup.getMaterial_qty()));// 数量
+ mesProductDataDto.setPRO_SUBNUM(BigDecimal.valueOf(vehiclematerialgroup.getMaterial_qty()));
mesProductDataDto.setPRO_SUBUNIT("块");
mesProductDataDto.setCHECKERIN_TIM(DateUtil.now());
mesProductDataDto.setPRODATE(ObjectUtil.isNotEmpty(workorder.getProduce_date())
@@ -186,7 +186,7 @@ public class WmsToMesServiceImpl implements WmsToMesService {
semiProductionInfoInDto.setBATCHNO(mesWorkOrderDto.getBATCHNO());
semiProductionInfoInDto.setFTEAM(workorder.getTeam());
semiProductionInfoInDto.setTRAY_NO(vehiclematerialgroup.getVehicle_code());
- semiProductionInfoInDto.setPRO_SUBNUM(BigDecimal.valueOf(vehiclematerialgroup.getMaterial_qty()));// 数量
+ semiProductionInfoInDto.setPRO_SUBNUM(BigDecimal.valueOf(vehiclematerialgroup.getMaterial_qty()));
semiProductionInfoInDto.setPRO_SUBUNIT("块");
semiProductionInfoInDto.setCHECKERIN_TIM(DateUtil.now());
semiProductionInfoInDto.setPRODATE(workorder.getProduce_date());
@@ -304,7 +304,8 @@ public class WmsToMesServiceImpl implements WmsToMesService {
gdyMaterialOutDto.setFPRODUCT_MATERIAL_ID(mesWorkOrderDto.getFPRODUCT_MATERIAL_ID());
gdyMaterialOutDto.setFPRODUCT_MATERIAL_NAME(mesWorkOrderDto.getFPRODUCT_MATERIAL_NAME());
gdyMaterialOutDto.setFMATSPEC(mesWorkOrderDto.getFMATSPEC());
- gdyMaterialOutDto.setFMATMODEL(mesWorkOrderDto.getFMATMODEL()); // 型号，mes给的工单都有
+ // 型号，mes给的工单都有
+ gdyMaterialOutDto.setFMATMODEL(mesWorkOrderDto.getFMATMODEL());
gdyMaterialOutDto.setBATCHNO(mesWorkOrderDto.getBATCHNO());
gdyMaterialOutDto.setPRESSUNIT(mesWorkOrderDto.getPRESSUNIT());
gdyMaterialOutDto.setPRO_SUBNUM(String.valueOf(vehiclematerialgroup.getMaterial_qty()));
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/ISysInteractRecordService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/ISysInteractRecordService.java
index 33aacc6..d1fea31 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/ISysInteractRecordService.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/ISysInteractRecordService.java
@@ -50,17 +50,17 @@ public interface ISysInteractRecordService extends IService<SysInteractRecord> {
/**
* 创建记录
- * @param request
- * @param response
- * @param direction
+ * @param request 请求
+ * @param response 响应
+ * @param direction 方向
*/
void saveRecord(Object request, BaseResponse response, String direction);
/**
* 记录对接日志
- * @param workorder
- * @param resultForAcs
- * @param direction
+ * @param workorder 工单
+ * @param resultForAcs 结果
+ * @param direction 方向
*/
void saveRecord(AcsWorkOrderVo workorder, ResultForAcs resultForAcs, String direction);
@@ -73,6 +73,10 @@ public interface ISysInteractRecordService extends IService<SysInteractRecord> {
*/
<K, V> void saveRecord(String name, K request, V response, String direction);
+ /**
+ * 根据天数删除
+ * @param day 天数
+ */
void deleteByDay(String day);
/**
@@ -84,7 +88,7 @@ public interface ISysInteractRecordService extends IService<SysInteractRecord> {
/**
* 获取所有标题
- * @return
+ * @return /
*/
List<String> getAllInteractName();
}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/dto/ForcedRestingDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/dto/ForcedRestingDto.java
index 987a165..653aafd 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/dto/ForcedRestingDto.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/dto/ForcedRestingDto.java
@@ -9,6 +9,12 @@ import lombok.Data;
*/
@Data
public class ForcedRestingDto {
- private Integer stand_time; // 静置时间
- private String group_id; // 组盘标识
+ /**
+ * 静置时间
+ */
+ private Integer stand_time;
+ /**
+ * 组盘标识
+ */
+ private String group_id;
}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/dto/ManualGroupDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/dto/ManualGroupDto.java
index 22d7f0d..6737c7f 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/dto/ManualGroupDto.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/dto/ManualGroupDto.java
@@ -14,6 +14,9 @@ public class ManualGroupDto {
private String vehicle_code;
private String vehicle_type;
private String point_code;
- private String order_code; // 不需要
+ /**
+ * 不需要的参数
+ */
+ private String order_code;
private BigDecimal material_weight;
}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/dto/ManualSortingDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/dto/ManualSortingDto.java
index 50d07ae..fc20b1a 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/dto/ManualSortingDto.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/dto/ManualSortingDto.java
@@ -10,5 +10,5 @@ import lombok.Data;
@Data
public class ManualSortingDto {
private String workorder_code;
- private String username; // 用户
+ private String username;
}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/vo/PdaResponseVo.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/vo/PdaResponseVo.java
index c2757e9..af5eb70 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/vo/PdaResponseVo.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/vo/PdaResponseVo.java
@@ -9,7 +9,9 @@ import lombok.Data;
*/
@Data
public class PdaResponseVo {
- // 先提供一个message
+ /**
+ * 先提供一个message
+ */
private String message;
public static PdaResponseVo pdaResultOk(String message) {
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/vo/StandTimeShowVo.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/vo/StandTimeShowVo.java
index 7f96a4c..c7dba31 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/vo/StandTimeShowVo.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/vo/StandTimeShowVo.java
@@ -13,7 +13,12 @@ public class StandTimeShowVo {
private String point_code;
private String device_code;
private Integer standing_time;
- private double timeDifferenceMinutes; // 剩余时间
- // 格式化预计完成时间为字符串
+ /**
+ * 剩余时间
+ */
+ private double timeDifferenceMinutes;
+ /**
+ * 格式化预计完成时间为字符串
+ */
private String estimatedCompletionTimeString;
}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java
index ac1ae90..ee8710c 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java
@@ -384,7 +384,7 @@ public class PdaServiceImpl implements PdaService {
return PdaResponseVo.pdaResultOk("货位清空成功");
} else if (shelfSaveDto.getPoint_status().equals(PointStatusEnum.FULL_POINT.getCode())){
// 设置物料
- toSaveGroupMaterial(shelfSaveDto);// 保存组盘
+ toSaveGroupMaterial(shelfSaveDto);
basePoint.setVehicle_code(shelfSaveDto.getVehicle_code());
basePoint.setVehicle_type(GeneralDefinition.STEEL_TRAY);
basePoint.setVehicle_qty(1);
@@ -432,7 +432,7 @@ public class PdaServiceImpl implements PdaService {
group.setGroup_bind_material_status(GroupBindMaterialStatusEnum.BOUND.getValue());
group.setVehicle_code(shelfSaveDto.getVehicle_code());
group.setVehicle_type(GeneralDefinition.STEEL_TRAY);
- group.setPoint_code(basePoint.getPoint_code()); // 对接位
+ group.setPoint_code(basePoint.getPoint_code());
group.setPoint_name(basePoint.getPoint_name());
group.setSource_vehicle_code(basePoint.getPoint_code());
group.setMove_way(basePoint.getPoint_code());
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/IPdmBdWorkorderService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/IPdmBdWorkorderService.java
index 6c54bc4..356896d 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/IPdmBdWorkorderService.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/IPdmBdWorkorderService.java
@@ -47,116 +47,121 @@ public interface IPdmBdWorkorderService extends IService<PdmBdWorkorder> {
/**
* 获取设备生产中的工单
- * @param deviceCode
- * @return
+ * @param deviceCode 设备
+ * @return /
*/
PdmBdWorkorder getDeviceProductionTask(String deviceCode);
/**
* 根据工单编码获取工单信息
- * @param orderCode
- * @return
+ * @param orderCode 工单号
+ * @return /
*/
PdmBdWorkorder getByCode(String orderCode);
/**
* 用锁-根据工单编码获取工单信息
- * @param orderCode
- * @return
+ * @param orderCode 工单号
+ * @return /
*/
PdmBdWorkorder getByCodeLock(String orderCode);
/**
* 工单下发
- * @param entity
+ * @param entity 工单
*/
void submits(PdmBdWorkorder entity);
/**
* 根据对接位获取工单
- * @param deviceCode
- * @return
+ * @param deviceCode 对接位
+ * @return /
*/
PdmBdWorkorder getDeviceDockingProductionTask(String deviceCode);
/**
* 获取mes订单信息
- * @param query
- * @param page
- * @return
+ * @param query /
+ * @param page /
+ * @return /
*/
IPage<MesOrderInfo> queryMesOrder(PdmBdWorkorderQuery query, PageQuery page);
/**
* 根据对接位获取是否可以叫空盘
* @param deviceCode
- * @return
+ * @return /
*/
boolean isEnoughCallEmpty(String deviceCode);
/**
* 获取当天未生产的工单
- * @return
+ * @return /
*/
List<PdmBdWorkorder> getTheDayUnProducedWorkOrder();
/**
* 获取当天需要下发的工单
- * @return
+ * @return /
*/
List<PdmBdWorkorder> getTheDayIssueWorkOrderList();
/**
* 获取未生产的设备
- * @return
+ * @return /
*/
List<String> getTheDayUnProducedDevice();
/**
* 获取当前设备、未生产的工单
- * @param s
- * @return
+ * @param s /
+ * @return /
*/
List<AcsWorkOrderVo> getAcsWorkOrderVos(String s);
+ /**
+ * 按设备获取当天生产的工单
+ * @param s /
+ * @return /
+ */
List<PdmBdWorkorder> getTheDayProducedWorkOrderByDevice(String s);
/**
* 强制报工完成
- * @param entity
+ * @param entity 工单
*/
void forceFinish(PdmBdWorkorder entity);
/**
* 获取叫料工单，没有则获取第一条
- * @return
+ * @return 工单数组
*/
List<PdmBdWorkorder> getNeedCallMaterial();
/**
* 根据id获取给acs的工单
- * @param workorderId
- * @return
+ * @param workorderId 工单id
+ * @return AcsWorkOrderVo
*/
AcsWorkOrderVo toAcsWorkOrderById(String workorderId);
/**
* 获取未生产
- * @return
+ * @return /
*/
List<PdmBdWorkorder> getNotIssueOrder();
/**
* 判断对应分拣设备是否需要呼叫满料
- * @param deviceCode
- * @return
+ * @param deviceCode 设备
+ * @return /
*/
boolean isEnoughCallMaterial(String deviceCode);
/**
* 悲观锁查找工单数据
- * @param id
- * @return
+ * @param id 标识
+ * @return /
*/
PdmBdWorkorder selectByIdLock(String id);
}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/impl/PdmBdWorkorderServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/impl/PdmBdWorkorderServiceImpl.java
index b9b5341..d5188f6 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/impl/PdmBdWorkorderServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/impl/PdmBdWorkorderServiceImpl.java
@@ -118,9 +118,12 @@ public class PdmBdWorkorderServiceImpl extends ServiceImpl<PdmBdWorkorderMapper,
if (ObjectUtil.isEmpty(material.getPack_method()) || ObjectUtil.isEmpty(material.getPack_palletspec())) {
throw new BadRequestException("创建工单失败，物料[" + entity.getMaterial_id() + "]包装规格为空，请维护！");
}
- int orderSubnum = entity.getOrder_subnum(); // 计划量
- int guadansum = entity.getGuadansum(); // 已经包装数
- int residueNum = orderSubnum - guadansum; // 剩余数
+ // 计划量
+ int orderSubnum = entity.getOrder_subnum();
+ // 已经包装数
+ int guadansum = entity.getGuadansum();
+ // 剩余数
+ int residueNum = orderSubnum - guadansum;
int multiply = TaskUtils.convertMultiply(entity.getPack_method());
// 计算需要多少木托
int ceil = (int) Math.ceil(residueNum / multiply);
@@ -319,11 +322,9 @@ public class PdmBdWorkorderServiceImpl extends ServiceImpl<PdmBdWorkorderMapper,
if (bdWorkorder == null) {
throw new BadRequestException("未找到工单号[" + workorderCode + "]的记录!");
}
-// if ((bdWorkorder.getWorkorder_status().equals(WorkOrderStatusEnum.ISSUED.getCode())
-// || bdWorkorder.getWorkorder_status().equals(WorkOrderStatusEnum.UNPRODUCED.getCode()))
-// && (ObjectUtil.isNotEmpty(entity.getProduce_date()) && entity.getProduce_date().equals(today))) {
-// throw new BadRequestException("工单号[" + workorderCode + "]未生产不能完成工!");
-// }
+ if (isWorkOrderIssuedAndProduceDateToday(bdWorkorder)) {
+ throw new BadRequestException("工单号[" + workorderCode + "]未生产不能完成工!");
+ }
if (bdWorkorder.getWorkorder_status().equals(WorkOrderStatusEnum.COMPLETE.getCode())) {
throw new BadRequestException("工单号[" + workorderCode + "]已完工，不能重复完工!");
}
@@ -344,6 +345,19 @@ public class PdmBdWorkorderServiceImpl extends ServiceImpl<PdmBdWorkorderMapper,
}
}
+ /**
+ * 判断工单是否下发、当天工单
+ * 判断逻辑不能过于复杂，因此提取出来
+ * @param bdWorkorder 工单参数
+ * @return 结果
+ */
+ private boolean isWorkOrderIssuedAndProduceDateToday(PdmBdWorkorder bdWorkorder) {
+ String today = DateUtil.format(DateUtil.date(), "yyyyMMdd");
+ boolean isWorkOrderIssued = bdWorkorder.getWorkorder_status().equals(WorkOrderStatusEnum.ISSUED.getCode());
+ boolean isProduceDateToday = ObjectUtil.isNotEmpty(bdWorkorder.getProduce_date()) && bdWorkorder.getProduce_date().equals(today);
+ return isWorkOrderIssued && isProduceDateToday;
+ }
+
@Override
public List<PdmBdWorkorder> getNeedCallMaterial() {
return pdmBdWorkorderMapper.getNeedCallMaterial();
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/controller/ReportController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/controller/ReportController.java
index f956540..662f715 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/controller/ReportController.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/controller/ReportController.java
@@ -36,7 +36,6 @@ public class ReportController {
@Log("泥料转运记录表")
@ApiOperation("泥料转运记录表")
public ResponseEntity<Object> mudTransfer(JSONObject json, PageQuery page){
-// return new ResponseEntity<>(TableDataInfo.build(reportService.mudTransfer(json,page)), HttpStatus.OK);
return null;
}
@@ -44,7 +43,6 @@ public class ReportController {
@Log("库存物料提示记录表")
@ApiOperation("库存物料提示记录表")
public ResponseEntity<Object> inventoryAlert(JSONObject json, PageQuery page){
-// return new ResponseEntity<>(TableDataInfo.build(reportService.inventoryAlert(json,page)), HttpStatus.OK);
return null;
}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/service/ISchBaseRegionService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/service/ISchBaseRegionService.java
index 382259e..3168b26 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/service/ISchBaseRegionService.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/service/ISchBaseRegionService.java
@@ -45,21 +45,22 @@ public interface ISchBaseRegionService extends IService<SchBaseRegion> {
/**
* 区域下拉框
- * @return
+ * @param region 区域
+ * @return /
*/
List<SchBaseRegion> getRegionList(SchBaseRegion region);
/**
* 获取点位状态下拉框
- * @param regionId
- * @return
+ * @param regionId /
+ * @return /
*/
JSONArray getPointStatusSelectById(String regionId);
/**
* 获取点位类型下拉框
- * @param regionId
- * @return
+ * @param regionId /
+ * @return /
*/
JSONArray getPointTypeSelectById(String regionId);
}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/ISchBaseTaskService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/ISchBaseTaskService.java
index 7636dad..3362e06 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/ISchBaseTaskService.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/ISchBaseTaskService.java
@@ -75,7 +75,8 @@ public interface ISchBaseTaskService extends IService<SchBaseTask> {
*
* @param config_code 任务配置
* @param device_code 设备
- * @return
+ * @param direction 方向
+ * @return /
*/
List<SchBaseTask> findUnFinishTasksByTaskConfig(String config_code, String device_code, String direction);
@@ -96,34 +97,34 @@ public interface ISchBaseTaskService extends IService<SchBaseTask> {
/**
* 获取任务状态下拉框
- * @return
+ * @return /
*/
JSONArray getTaskStatusList();
/**
* 任务操作
*
- * @param param
+ * @param param 参数
*/
void operation(Map<String, Object> param);
/**
* 获取任务数据
* @param taskCode 任务编码
- * @return
+ * @return /
*/
SchBaseTask getByCode(String taskCode);
/**
* 返回当前设备搬运木控盘的任务数量
- * @param deviceCode
- * @return
+ * @param deviceCode 设备
+ * @return /
*/
int getEmptyVehicleCarryingByDevice(String deviceCode);
/**
* 返回当前设备搬运满料的任务数量
- * @param deviceCode
- * @return
+ * @param deviceCode 设备
+ * @return /
*/
BigDecimal getCallMaterialCarryingByDevice(String deviceCode);
}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java
index 354d435..9c01f6b 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java
@@ -127,7 +127,8 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
LambdaQueryWrapper<SchBaseTask> lam = new LambdaQueryWrapper<>();
lam.eq(SchBaseTask::getConfig_code, config_code)
.lt(SchBaseTask::getTask_status, TaskStatus.FINISHED.getCode())
- .ne(SchBaseTask::getTask_code, task_code) // 不是当前任务
+ // 不是当前任务
+ .ne(SchBaseTask::getTask_code, task_code)
.eq(SchBaseTask::getIs_delete, false);
List<SchBaseTask> schBaseTasks = schBaseTaskMapper.selectList(lam);
return schBaseTasks;
@@ -228,7 +229,8 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
case "immediateNotifyAcs":
//
break;
- case "forceFinish": // 强制完成
+ // 强制完成
+ case "forceFinish":
abstractTask.forceFinish(task_code);
break;
case "cancel":
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java
index 210d05c..1ad09af 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java
@@ -147,9 +147,9 @@ public abstract class AbstractTask {
return resultForAcs;
}
- private AcsTaskDto setTask(String config_code, AcsTaskDto taskDto) {
+ private AcsTaskDto setTask(String configCode, AcsTaskDto taskDto) {
SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>()
- .eq(SchBaseTaskconfig::getConfig_code, config_code));
+ .eq(SchBaseTaskconfig::getConfig_code, configCode));
taskDto.setPriority(taskConfig.getPriority());
taskDto.setTask_type(taskConfig.getAcs_task_type());
taskDto.setRoute_plan_code(taskConfig.getRoute_plan_code());
@@ -177,8 +177,8 @@ public abstract class AbstractTask {
this.renotifyAcs(list);
}
- public void updateTaskStatus(String task_code, TaskStatus status) {
- this.updateStatus(task_code, status);
+ public void updateTaskStatus(String taskCode, TaskStatus status) {
+ this.updateStatus(taskCode, status);
}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/RYKQLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/RYKQLTask.java
index 1c2617f..347da59 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/RYKQLTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/RYKQLTask.java
@@ -123,7 +123,7 @@
// throw new BadRequestException("该任务已取消!");
// }
// // 获取参数
-// String startPoint = taskObj.getPoint_code1(); // 获取起点
+// String startPoint = taskObj.getPoint_code1();
// SchBasePoint startPointObj = pointService.getById(startPoint);
// // 根据传来的类型去对任务进行操作
// if (status.equals(TaskStatus.EXECUTING)) {
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQLTask.java
index bc79834..6105012 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQLTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQLTask.java
@@ -215,8 +215,8 @@ public class FJQLTask extends AbstractTask {
}
public void finishTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
- String startPoint = taskObj.getPoint_code1(); // 获取起点
- String endPoint = taskObj.getPoint_code2(); // 获取起点
+ String startPoint = taskObj.getPoint_code1();
+ String endPoint = taskObj.getPoint_code2();
SchBasePoint startPointObj = pointService.getById(startPoint);
SchBasePoint endPointObj = pointService.getById(endPoint);
String requestParam = taskObj.getRequest_param();
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJRKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJRKTask.java
index 7eee5cd..c8c7fae 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJRKTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJRKTask.java
@@ -295,9 +295,10 @@ public class FJRKTask extends AbstractTask {
String workorderCode = jsonObject.getString("workorder_code");
PdmBdWorkorder workorder = workorderService.getByCode(workorderCode);
// 获取参数
- String endPoint = taskObj.getPoint_code2(); // 获取终点
- String fjcPoint = taskObj.getPoint_code4(); // 获取起点
- String fmPoint = taskObj.getPoint_code3(); // 获取覆膜机
+ String endPoint = taskObj.getPoint_code2();
+ String fjcPoint = taskObj.getPoint_code4();
+ // 覆膜机
+ String fmPoint = taskObj.getPoint_code3();
SchBasePoint fjcPointObj = pointService.getById(fjcPoint);
SchBasePoint endPointObj = pointService.getById(endPoint);
SchBasePoint fmPointObj = pointService.getById(fmPoint);
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJSKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJSKTask.java
index 7ddacf6..5de40a4 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJSKTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJSKTask.java
@@ -150,16 +150,16 @@ public class FJSKTask extends AbstractTask {
throw new BadRequestException("该任务已取消!");
}
// 根据传来的类型去对任务进行操作
- if (status.equals(TaskStatus.EXECUTING)) { // 执行中
+ if (status.equals(TaskStatus.EXECUTING)) {
taskObj.setTask_status(TaskStatus.EXECUTING.getCode());
taskObj.setRemark("执行中");
TaskUtils.setUpdateByAcs(taskObj);
taskService.updateById(taskObj);
}
- if (status.equals(TaskStatus.FINISHED)) { // 完成
+ if (status.equals(TaskStatus.FINISHED)) {
this.finishTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS);
}
- if (status.equals(TaskStatus.CANCELED)) { // 取消
+ if (status.equals(TaskStatus.CANCELED)) {
this.cancelTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS);
}
}
@@ -203,7 +203,7 @@ public class FJSKTask extends AbstractTask {
if (ObjectUtil.isNotEmpty(endPoint)) {
endPointObj.setIng_task_code("");
endPointObj.setVehicle_type(vehicleType);
- endPointObj.setVehicle_qty(endPointObj.getVehicle_qty() + 1); // 设置载具数量
+ endPointObj.setVehicle_qty(endPointObj.getVehicle_qty() + 1);
endPointObj.setPoint_status(PointStatusEnum.EMPTY_VEHICLE.getCode());
PointUtils.setUpdateByType(endPointObj, taskFinishedType);
pointService.updateById(endPointObj);
@@ -213,7 +213,7 @@ public class FJSKTask extends AbstractTask {
vehicleMaterialGroupObj.setGroup_bind_material_status(GroupBindMaterialStatusEnum.UNBOUND.getValue());
TaskUtils.setGroupUpdateByType(vehicleMaterialGroupObj, taskFinishedType);
vehiclematerialgroupService.updateById(vehicleMaterialGroupObj);
- // todo: 上报mes, 物料出库
+ // hint: 上报mes, 物料出库
try {
wmsToMesService.reportSemiProductionInfoOut(taskObj.getGroup_id());
} catch (Exception e) {
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJSLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJSLTask.java
index aa7b00e..81f258e 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJSLTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJSLTask.java
@@ -63,7 +63,7 @@ public class FJSLTask extends AbstractTask {
SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>()
.eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE));
for (SchBaseTask task : tasks) {
- TaskUtils.setUpdateByAcs(task); // 修改修改者
+ TaskUtils.setUpdateByAcs(task);
List<String> nextRegionStr = Arrays.stream(taskConfig.getNext_region_str().split(","))
.collect(Collectors.toList());
// 找终点
@@ -88,9 +88,6 @@ public class FJSLTask extends AbstractTask {
point.setIng_task_code(task.getTask_code());
PointUtils.setUpdateByAcs(point);
pointService.updateById(point);
-
- //下发
- //this.renotifyAcs(task);
}
}
@@ -100,7 +97,7 @@ public class FJSLTask extends AbstractTask {
// 配置信息
SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>()
.eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE));
- TaskUtils.setUpdateByAcs(task); // 修改修改者
+ TaskUtils.setUpdateByAcs(task);
List<String> nextRegionStr = Arrays.stream(taskConfig.getNext_region_str().split(","))
.collect(Collectors.toList());
// 找终点
@@ -132,7 +129,8 @@ public class FJSLTask extends AbstractTask {
LambdaQueryWrapper<SchBasePoint> lam = new QueryWrapper<SchBasePoint>().lambda();
lam.in(SchBasePoint::getRegion_code, nextRegionStr)
.eq(SchBasePoint::getPoint_status, PointStatusEnum.EMPTY_POINT.getCode())
- .and(la -> la.isNull(SchBasePoint::getIng_task_code) // 当前执行的任务为空或者NULL，有数据表示锁住
+ // 当前执行的任务为空或者NULL，有数据表示锁住
+ .and(la -> la.isNull(SchBasePoint::getIng_task_code)
.or()
.eq(SchBasePoint::getIng_task_code, ""))
.eq(SchBasePoint::getIs_used, true)
@@ -152,7 +150,7 @@ public class FJSLTask extends AbstractTask {
throw new BadRequestException("载具编码不能为空");
}
String vehicleType = param.getString("vehicle_type");
- JSONObject stackParameters = param.getJSONObject("palletize"); // 参数
+ JSONObject stackParameters = param.getJSONObject("palletize");
if (vehicleType == null || vehicleType.equals(GeneralDefinition.NO)) {
vehicleType = GeneralDefinition.STEEL_TRAY;
}
@@ -216,7 +214,7 @@ public class FJSLTask extends AbstractTask {
public void finishTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
String vehicleCode = taskObj.getVehicle_code();
String vehicleType = taskObj.getVehicle_type();
- String startPoint = taskObj.getPoint_code1(); // 获取起点
+ String startPoint = taskObj.getPoint_code1();
String endPoint = taskObj.getPoint_code2();
SchBasePoint startPointObj = pointService.getById(startPoint);
SchBasePoint endPointObj = pointService.getById(endPoint);
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNMLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNMLTask.java
index fa63828..8af28ba 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNMLTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNMLTask.java
@@ -251,7 +251,7 @@ public class HNMLTask extends AbstractTask {
groupEntity.setPoint_name(endPointObj.getPoint_name());
groupEntity.setMove_way(groupEntity.getMove_way() + " -> " + endPointObj.getPoint_code());
groupEntity.setMaterial_id(one.getMaterial_id());
- // *根据压机的工单物料标识查找静置时间
+ // mark: *根据压机的工单物料标识查找静置时间
MdBaseMaterial mdBaseMaterial = materialService.getById(one.getMaterial_id());
groupEntity.setStanding_time(mdBaseMaterial.getStanding_time());
}
@@ -350,7 +350,7 @@ public class HNMLTask extends AbstractTask {
groupEntity.setIs_delete(false);
// 对于混碾的组盘 暂时存吨袋号
groupEntity.setExt_data(packNo);
- vehiclematerialgroupService.saveOrUpdate(groupEntity);
+ vehiclematerialgroupService.save(groupEntity);
return groupEntity.getGroup_id();
}
}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNQKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNQKTask.java
index 0fe76de..109e38b 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNQKTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNQKTask.java
@@ -117,8 +117,8 @@
// throw new BadRequestException("该任务已取消!");
// }
// // 获取参数
-// String startPoint = taskObj.getPoint_code1(); // 获取起点
-// String endPoint = taskObj.getPoint_code2(); // 获取起点
+// String startPoint = taskObj.getPoint_code1();
+// String endPoint = taskObj.getPoint_code2();
// SchBasePoint startPointObj = pointService.getById(startPoint);
// SchBasePoint endPointObj = pointService.getById(endPoint);
// // 根据传来的类型去对任务进行操作
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yao/GZYQLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yao/GZYQLTask.java
index 0cd452a..7e68486 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yao/GZYQLTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yao/GZYQLTask.java
@@ -99,7 +99,7 @@ public class GZYQLTask extends AbstractTask {
// 配置信息
SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>()
.eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE));
- TaskUtils.setUpdateByAcs(task); // 修改修改者
+ TaskUtils.setUpdateByAcs(task);
List<String> startRegionStr = Arrays.stream(taskConfig.getStart_region_str().split(","))
.collect(Collectors.toList());
// 找起点
@@ -200,7 +200,7 @@ public class GZYQLTask extends AbstractTask {
public void finishTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
// 获取参数
- String startPoint = taskObj.getPoint_code1(); // 获取起点
+ String startPoint = taskObj.getPoint_code1();
SchBasePoint startPointObj = pointService.getById(startPoint);
// 起点解锁
if (ObjectUtil.isNotEmpty(startPointObj)) {
@@ -218,7 +218,7 @@ public class GZYQLTask extends AbstractTask {
}
public void cancelTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
// 获取参数
- String startPoint = taskObj.getPoint_code1(); // 获取起点
+ String startPoint = taskObj.getPoint_code1();
SchBasePoint startPointObj = pointService.getById(startPoint);
// 起点解锁
if (ObjectUtil.isNotEmpty(startPointObj)) {
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZQKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZQKTask.java
index 91c010f..daca434 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZQKTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZQKTask.java
@@ -54,7 +54,7 @@ public class YZQKTask extends AbstractTask {
// 配置信息
SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>()
.eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE));
- TaskUtils.setUpdateByAcs(task); // 修改修改者
+ TaskUtils.setUpdateByAcs(task);
List<String> startRegionStr = Arrays.stream(taskConfig.getStart_region_str().split(","))
.collect(Collectors.toList());
// 找起点
@@ -87,7 +87,7 @@ public class YZQKTask extends AbstractTask {
SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>()
.eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE));
for (SchBaseTask task : tasks) {
- TaskUtils.setUpdateByAcs(task); // 修改修改者
+ TaskUtils.setUpdateByAcs(task);
List<String> startRegionStr = Arrays.stream(taskConfig.getStart_region_str().split(","))
.collect(Collectors.toList());
// 找起点
@@ -125,9 +125,12 @@ public class YZQKTask extends AbstractTask {
*/
private SchBasePoint findStartPoint(List<String> startRegionStr, JSONObject requestParam) {
LambdaQueryWrapper<SchBasePoint> lam = new LambdaQueryWrapper<>();
- lam.in(SchBasePoint::getRegion_code, startRegionStr) // 默认一直都有载具
- .eq(SchBasePoint::getPoint_type, GeneralDefinition.EXIT) // 点位类型是拆盘机出口
- .and(la -> la.isNull(SchBasePoint::getIng_task_code) // 当前执行的任务为空或者NULL，有数据表示锁住
+ // 默认一直都有载具
+ lam.in(SchBasePoint::getRegion_code, startRegionStr)
+ // 点位类型是拆盘机出口
+ .eq(SchBasePoint::getPoint_type, GeneralDefinition.EXIT)
+ // 当前执行的任务为空或者NULL，有数据表示锁住
+ .and(la -> la.isNull(SchBasePoint::getIng_task_code)
.or()
.eq(SchBasePoint::getIng_task_code, ""))
.eq(SchBasePoint::getIs_used, true);
@@ -181,8 +184,8 @@ public class YZQKTask extends AbstractTask {
public void finishTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
// 获取参数
- String startPoint = taskObj.getPoint_code1(); // 获取起点
- String endPoint = taskObj.getPoint_code2(); // 获取起点
+ String startPoint = taskObj.getPoint_code1();
+ String endPoint = taskObj.getPoint_code2();
SchBasePoint startPointObj = pointService.selectByIdLock(startPoint);
SchBasePoint endPointObj = pointService.selectByIdLock(endPoint);
// 起点清空
@@ -206,7 +209,7 @@ public class YZQKTask extends AbstractTask {
public void cancelTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
// 获取参数
- String startPoint = taskObj.getPoint_code1(); // 获取起点
+ String startPoint = taskObj.getPoint_code1();
SchBasePoint startPointObj = pointService.getById(startPoint);
// 起点解锁
if (ObjectUtil.isNotEmpty(startPointObj)) {
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSKTask.java
index 328c00b..7e854f4 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSKTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSKTask.java
@@ -57,7 +57,7 @@ public class YZSKTask extends AbstractTask {
// 配置信息
SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>()
.eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE));
- TaskUtils.setUpdateByAcs(task); // 修改修改者
+ TaskUtils.setUpdateByAcs(task);
List<String> nextRegionStr = Arrays.stream(taskConfig.getNext_region_str().split(","))
.collect(Collectors.toList());
// 找终点
@@ -94,7 +94,7 @@ public class YZSKTask extends AbstractTask {
SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>()
.eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE));
for (SchBaseTask task : tasks) {
- TaskUtils.setUpdateByAcs(task); // 修改修改者
+ TaskUtils.setUpdateByAcs(task);
List<String> nextRegionStr = Arrays.stream(taskConfig.getNext_region_str().split(","))
.collect(Collectors.toList());
// 找终点
@@ -121,9 +121,6 @@ public class YZSKTask extends AbstractTask {
point.setIng_task_code(task.getTask_code());
PointUtils.setUpdateByAcs(point);
pointService.updateById(point);
-
- //下发
- //this.renotifyAcs(task);
}
}
@@ -143,8 +140,9 @@ public class YZSKTask extends AbstractTask {
lam.in(SchBasePoint::getRegion_code, nextRegionStr)
.eq(SchBasePoint::getPoint_status, PointStatusEnum.EMPTY_POINT.getCode())
.like(SchBasePoint::getCan_vehicle_type, vehicleType)
- .eq(SchBasePoint::getPoint_type, GeneralDefinition.DOCKING_POINT) // 对接位
- .and(la -> la.isNull(SchBasePoint::getIng_task_code) // 当前执行的任务为空或者NULL，有数据表示锁住
+ .eq(SchBasePoint::getPoint_type, GeneralDefinition.DOCKING_POINT)
+ // 当前执行的任务为空或者NULL，有数据表示锁住
+ .and(la -> la.isNull(SchBasePoint::getIng_task_code)
.or()
.eq(SchBasePoint::getIng_task_code, ""))
.eq(SchBasePoint::getIs_used, true)
@@ -218,7 +216,7 @@ public class YZSKTask extends AbstractTask {
taskObj.setTask_status(TaskStatus.FINISHED.getCode());
taskObj.setRemark(GeneralDefinition.TASK_FINISH);
taskObj.setFinished_type(taskFinishedType.getCode());
- TaskUtils.setUpdateByType(taskObj, taskFinishedType); // 区分完成者
+ TaskUtils.setUpdateByType(taskObj, taskFinishedType);
taskService.updateById(taskObj);
}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSLTask.java
index e932757..044c333 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSLTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSLTask.java
@@ -80,7 +80,7 @@ public class YZSLTask extends AbstractTask {
SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>()
.eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE));
for (SchBaseTask task : tasks) {
- TaskUtils.setUpdateByAcs(task); // 修改修改者
+ TaskUtils.setUpdateByAcs(task);
List<String> nextRegionStr = Arrays.stream(taskConfig.getNext_region_str().split(","))
.collect(Collectors.toList());
// 找终点
@@ -117,7 +117,7 @@ public class YZSLTask extends AbstractTask {
// 配置信息
SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>()
.eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE));
- TaskUtils.setUpdateByAcs(task); // 修改修改者
+ TaskUtils.setUpdateByAcs(task);
List<String> nextRegionStr = Arrays.stream(taskConfig.getNext_region_str().split(","))
.collect(Collectors.toList());
// 找终点
@@ -168,7 +168,7 @@ public class YZSLTask extends AbstractTask {
}
// 判断是否加急，加急则去窑口，不加急就是去双层缓存输送线
if (one.getIs_urgent()) {
- regionCode = nextRegionStr.get(1); // 去窑区
+ regionCode = nextRegionStr.get(1);
// 判断窑区是否可用
SchBasePoint basePoint = pointService.getOne(new LambdaQueryWrapper<SchBasePoint>()
.eq(SchBasePoint::getRegion_code, regionCode)
@@ -183,15 +183,17 @@ public class YZSLTask extends AbstractTask {
LambdaQueryWrapper<SchBasePoint> lam = new QueryWrapper<SchBasePoint>().lambda();
lam.eq(SchBasePoint::getRegion_code, regionCode)
.eq(SchBasePoint::getPoint_status, PointStatusEnum.EMPTY_POINT.getCode())
- .eq(SchBasePoint::getPoint_type, GeneralDefinition.ENTRANCE) // 对接位
- .and(la -> la.isNull(SchBasePoint::getIng_task_code) // 当前执行的任务为空或者NULL，有数据表示锁住
+ .eq(SchBasePoint::getPoint_type, GeneralDefinition.ENTRANCE)
+ .and(la -> la.isNull(SchBasePoint::getIng_task_code)
.or()
.eq(SchBasePoint::getIng_task_code, ""))
.eq(SchBasePoint::getIs_used, true);
// 如果一个有货一个没货，但是载具数量又是5的时候，就要不需要检测不能为5
List<SchBasePoint> list = pointService.list(lam);
- boolean doDetection = list.size() != 1; // 如果只有一条符合的数据就不需要检验不符合5个托
- lam.ne(doDetection, SchBasePoint::getVehicle_qty, 5) // 载具数量不能等于5
+ // 如果只有一条符合的数据就不需要检验不符合5个托
+ boolean doDetection = list.size() != 1;
+ // 载具数量不能等于5
+ lam.ne(doDetection, SchBasePoint::getVehicle_qty, 5)
.orderByDesc(SchBasePoint::getVehicle_qty);
List<SchBasePoint> schBasePoints = pointService.list(lam);
return ObjectUtil.isNotEmpty(schBasePoints) ? schBasePoints.get(0) : null;
@@ -271,12 +273,11 @@ public class YZSLTask extends AbstractTask {
groupEntity.setVehicle_code(vehicleCode);
groupEntity.setVehicle_type(vehicleType);
groupEntity.setMaterial_qty(qty);
- groupEntity.setExt_data(JSONObject.toJSONString(stackParameters)); // 垛型参数
- groupEntity.setPoint_code(basePoint.getPoint_code()); // 对接位
+ groupEntity.setExt_data(JSONObject.toJSONString(stackParameters));
+ groupEntity.setPoint_code(basePoint.getPoint_code());
groupEntity.setPoint_name(basePoint.getPoint_name());
groupEntity.setSource_vehicle_code(basePoint.getPoint_code());
groupEntity.setMove_way(basePoint.getPoint_code());
-// groupEntity.setPcsn(DateUtil.format(DateUtil.date(), "yyyyMMdd")); // 批次号使用自己定义的、暂时没用压机工单
groupEntity.setPcsn(ObjectUtil.isNotEmpty(workorderObject)
? workorderObject.getBatch_no()
: DateUtil.format(DateUtil.date(), "yyyyMMdd"));
@@ -324,8 +325,8 @@ public class YZSLTask extends AbstractTask {
// 组盘表数据改成已绑定
SchBaseVehiclematerialgroup vehiclematerialgroup = vehiclematerialgroupService.getById(taskObj.getGroup_id());
TaskUtils.setGroupUpdateByType(vehiclematerialgroup, taskFinishedType);
- vehiclematerialgroup.setTask_code(taskObj.getTask_code()); // 当前任务
- vehiclematerialgroup.setBuss_move_id(taskObj.getTask_code()); // 设置链路id，使用任务编码
+ vehiclematerialgroup.setTask_code(taskObj.getTask_code());
+ vehiclematerialgroup.setBuss_move_id(taskObj.getTask_code());
vehiclematerialgroup.setGroup_bind_material_status(GroupBindMaterialStatusEnum.BOUND.getValue());
vehiclematerialgroup.setPoint_code(endPointObj.getPoint_code());
vehiclematerialgroup.setPoint_name(endPointObj.getPoint_name());
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/OracleJDBCExample.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/OracleJDBCExample.java
index 52604dc..0e502fe 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/OracleJDBCExample.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/OracleJDBCExample.java
@@ -8,9 +8,12 @@ import java.sql.Statement;
public class OracleJDBCExample {
public static void main(String[] args) {
- String jdbcUrl = "jdbc:oracle:thin:@172.27.37.66:1521:RTMES"; // 根据您的数据库配置修改连接字符串
- String username = "LMSTELCOM"; // 您的数据库用户名
- String password = "LMSTELCOM_6463"; // 您的数据库密码
+ // 根据数据库配置修改连接字符串
+ String jdbcUrl = "jdbc:oracle:thin:@172.27.37.66:1521:RTMES";
+ // 数据库用户名
+ String username = "LMSTELCOM";
+ // 数据库密码
+ String password = "LMSTELCOM_6463";
Connection connection = null;
Statement statement = null;
@@ -27,13 +30,15 @@ public class OracleJDBCExample {
statement = connection.createStatement();
// 4. 执行 SQL 查询
- String sqlQuery = "SELECT * FROM RTMG.VIEW_MATERIAL_LMS"; // 根据您的查询修改表名
+ // 根据您的查询修改表名
+ String sqlQuery = "SELECT * FROM RTMG.VIEW_MATERIAL_LMS";
resultSet = statement.executeQuery(sqlQuery);
// 5. 处理查询结果
while (resultSet.next()) {
// 从结果集中获取数据
- String id = resultSet.getString("MATNR"); // 根据表的列名修改
+ // 根据表的列名修改
+ String id = resultSet.getString("MATNR");
// 打印查询结果
System.out.println("ID: " + id);
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/PointUtils.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/PointUtils.java
index 24dd769..497bc7b 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/PointUtils.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/PointUtils.java
@@ -74,7 +74,8 @@ public class PointUtils {
point.setVehicle_code("");
point.setIng_task_code("");
point.setVehicle_qty(point.getVehicle_qty() == 5 ? point.getVehicle_qty() : point.getVehicle_qty() + 1);
- if (basePoint.getVehicle_qty() == 5) { // 等到新的点执行第一托的时候，才判断另一个点满足5个托盘的时候就清空
+ // 等到新的点执行第一托的时候，才判断另一个点满足5个托盘的时候就清空
+ if (basePoint.getVehicle_qty() == 5) {
basePoint.setVehicle_qty(0);
basePoint.setUpdate_time(DateUtil.now());
pointService.updateById(basePoint);
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/TaskUtils.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/TaskUtils.java
index 286d697..5f5a53a 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/TaskUtils.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/TaskUtils.java
@@ -201,11 +201,15 @@ public class TaskUtils {
* @return
*/
public static int convertMultiply(String needFullNumberStr) {
- String[] parts = needFullNumberStr.split("\\*"); // 使用 "*" 来分割字符串
- int result = 1; // 初始化结果为1
+ // 使用 "*" 来分割字符串
+ String[] parts = needFullNumberStr.split("\\*");
+ // 初始化结果为1
+ int result = 1;
for (String part : parts) {
- int number = Integer.parseInt(part); // 将字符串部分解析为整数
- result *= number; // 将解析的整数与结果相乘
+ // 将字符串部分解析为整数
+ int number = Integer.parseInt(part);
+ // 将解析的整数与结果相乘
+ result *= number;
}
return result;
}
diff --git a/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue b/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue
index ce2203c..c2911a1 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue
@@ -511,7 +511,14 @@ export default {
url: 'api/pdmBdWorkorder',
idField: 'workorder_id',
sort: 'workorder_id,desc',
- crudMethod: { ...crudPdmBdWorkorder }
+ crudMethod: { ...crudPdmBdWorkorder },
+ optShow: {
+ add: true,
+ edit: true,
+ del: false,
+ download: false,
+ reset: true
+ }
})
},
data() {