diff --git a/youchain-common/src/main/java/com/youchain/aspect/LimitAspect.java b/youchain-common/src/main/java/com/youchain/aspect/LimitAspect.java index ca21871..61c8597 100644 --- a/youchain-common/src/main/java/com/youchain/aspect/LimitAspect.java +++ b/youchain-common/src/main/java/com/youchain/aspect/LimitAspect.java @@ -16,10 +16,10 @@ package com.youchain.aspect; import com.google.common.collect.ImmutableList; -import com.youchain.utils.RequestHolder; -import com.youchain.utils.StringUtils; import com.youchain.annotation.Limit; import com.youchain.exception.BadRequestException; +import com.youchain.utils.RequestHolder; +import com.youchain.utils.StringUtils; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; @@ -31,6 +31,7 @@ import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.script.DefaultRedisScript; import org.springframework.data.redis.core.script.RedisScript; import org.springframework.stereotype.Component; + import javax.servlet.http.HttpServletRequest; import java.lang.reflect.Method; diff --git a/youchain-system/pom.xml b/youchain-system/pom.xml index 04503fa..8c0bb02 100644 --- a/youchain-system/pom.xml +++ b/youchain-system/pom.xml @@ -133,6 +133,14 @@ true + + org.apache.maven.plugins + maven-compiler-plugin + + 8 + 8 + + diff --git a/youchain-system/src/main/java/com/youchain/AppRun.java b/youchain-system/src/main/java/com/youchain/AppRun.java index 8cd5b27..04a239f 100644 --- a/youchain-system/src/main/java/com/youchain/AppRun.java +++ b/youchain-system/src/main/java/com/youchain/AppRun.java @@ -1,5 +1,5 @@ /* - * Copyright 2019-2020 Zheng Jie + * Copyright 2019-2020 Jie * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,24 +15,17 @@ */ package com.youchain; -import cn.hutool.json.JSONUtil; import com.youchain.annotation.rest.AnonymousGetMapping; -import com.youchain.modules.license.LicenseValidate; -import com.youchain.modules.system.service.ApiDictService; import com.youchain.utils.SpringContextHolder; import io.swagger.annotations.Api; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.domain.EntityScan; -import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration; import org.springframework.boot.context.ApplicationPidFileWriter; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.ComponentScan; import org.springframework.data.jpa.repository.config.EnableJpaAuditing; -import org.springframework.data.jpa.repository.config.EnableJpaRepositories; import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.transaction.annotation.EnableTransactionManagement; import org.springframework.web.bind.annotation.RestController; @@ -55,8 +48,6 @@ public class AppRun { public static void main(String[] args) { SpringApplication springApplication = new SpringApplication(AppRun.class); - // 监控应用的PID，启动时可指定PID路径：--spring.pid.file=/home/eladmin/app.pid - // 或者在 application.yml 添加文件路径，方便 kill，kill `cat /home/eladmin/app.pid` springApplication.addListeners(new ApplicationPidFileWriter()); springApplication.addListeners(new MyApiDictListener()); springApplication.run(args); diff --git a/youchain-system/src/main/java/com/youchain/appupdate/inputJson/BindStock.java b/youchain-system/src/main/java/com/youchain/appupdate/inputJson/BindStock.java index 39d327c..fa4a969 100644 --- a/youchain-system/src/main/java/com/youchain/appupdate/inputJson/BindStock.java +++ b/youchain-system/src/main/java/com/youchain/appupdate/inputJson/BindStock.java @@ -20,6 +20,6 @@ public class BindStock { String pointCode; @ApiModelProperty(value = "箱号") - List boxNumbers; + List boxNumbers; } diff --git a/youchain-system/src/main/java/com/youchain/appupdate/rest/BydAppController.java b/youchain-system/src/main/java/com/youchain/appupdate/rest/BydAppController.java index 946e888..9fccb79 100644 --- a/youchain-system/src/main/java/com/youchain/appupdate/rest/BydAppController.java +++ b/youchain-system/src/main/java/com/youchain/appupdate/rest/BydAppController.java @@ -31,7 +31,7 @@ public class BydAppController { @AnonymousAccess public ResponseEntity materialIn(@RequestBody BindStock bindStock) { try { - //P:A17A;V:148795;M:10441666-00/PCS;B:240512JFET;Lot:20240427;S:124051200181132;PO:5913490946/00020;Q:36/20/32;D:2024-04-27;SN:;YX:2025-04-26;DN:D12405120005031AS + //P:A17A;V:148795;M:10441666-00/PCS;B:240512;Lot:20240427;S:124051200181132;PO:5913490946/00020;Q:36/20/32;D:2024-04-27;SN:;YX:2025-04-26;DN:D12405120005031AS String stockCode = bindStock.getStockCode();//容器编号 List boxNumbers = bindStock.getBoxNumbers();//箱号集合 String pointCode = bindStock.getPointCode();//点位编号 diff --git a/youchain-system/src/main/java/com/youchain/basicdata/service/StockService.java b/youchain-system/src/main/java/com/youchain/basicdata/service/StockService.java index 7389f75..3fc1ad3 100644 --- a/youchain-system/src/main/java/com/youchain/basicdata/service/StockService.java +++ b/youchain-system/src/main/java/com/youchain/basicdata/service/StockService.java @@ -1,5 +1,5 @@ /* - * Copyright 2019-2020 Zheng Jie + * Copyright 2019-2020 Jie * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -97,25 +97,20 @@ public interface StockService { /** * dto转实体 * - * @param stockDto - * @return */ Stock toEntity(StockDto stockDto); /** * 查询所有数据不分页 * - * @param code 条件参数 - * @return List + * @param code 编号 */ List findByKyStockList(String code); /** - * 根据code查找容器 * - * @param code - * @param status - * @return + * @param code 容器 + * @param status 状态 */ Stock findByCode(String code, String status); @@ -124,89 +119,94 @@ public interface StockService { /** * 容器入场JSON * - * @param containerCode - * @param position - * @return + * @param containerCode 容器 + * @param position 点位 */ String containerInJson(String containerCode, String position); /** * 容器出场JSON * - * @param containerCode-容器编号 - * @return + * @param containerCode 容器 */ String containerOutJson(String containerCode); /** * 容器入场 * - * @param containerCode - * @param position + * @param containerCode 容器 + * @param position 点位 */ void containerIn(String containerCode, String position); /** * 容器出场 * - * @param containerCode + * @param containerCode 容器 */ void containerOut(String containerCode); /** * 任务放行 * - * @param Code + * @param Code 编号 */ void operationFeedback(String Code); - Map findByCodes(Set stockCodes); + /** + * 批量查询箱号 + * @param stockCodes 箱号集合 + */ + Map findByCodes(Set stockCodes); /** * 原材料入库 * - * @param stockCode - * @param boxNumbers - * @param pointCode + * @param stockCode 托盘 + * @param boxNumbers 箱号 + * @param pointCode 点位 */ - void materialIn(String stockCode, List boxNumbers, String pointCode); + void materialIn(String stockCode, List boxNumbers, String pointCode); /** * 扫描托盘 * - * @param stockCode + * @param stockCode 托盘 */ ReturnTaskVo scanStock(String stockCode); /** * 翻包拣货 * - * @param taskId - * @param orderNumber - * @param dstStockCode + * @param taskId 任务ID + * @param orderNumber 箱号 + * @param dstStockCode 目标托盘 */ void fbPicking(Long taskId, String orderNumber, String dstStockCode); /** * 搬运任务 * - * @param transTask + * @param transTask 搬运任务 */ void moveStock(TransTask transTask); /** * 解绑容器 - * @param stockCode + * @param stockCode 容器 */ void unBindContainer(String stockCode); /** * 下发叫料任务 - * @param pick + * @param pick 出库单 */ void callJlTask(Pick pick); + /** + * 消息推送 + */ String stockMsg(); } diff --git a/youchain-system/src/main/java/com/youchain/basicdata/service/impl/StockServiceImpl.java b/youchain-system/src/main/java/com/youchain/basicdata/service/impl/StockServiceImpl.java index 554b6e2..b25e993 100644 --- a/youchain-system/src/main/java/com/youchain/basicdata/service/impl/StockServiceImpl.java +++ b/youchain-system/src/main/java/com/youchain/basicdata/service/impl/StockServiceImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2019-2020 Zheng Jie + * Copyright 2019-2020 Jie * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -60,7 +60,7 @@ import javax.servlet.http.HttpServletResponse; /** * @author liuxue - * @website https://eladmin.vip + * @website ... * @description 服务实现 * @date 2023-07-28 **/ @@ -261,7 +261,7 @@ public class StockServiceImpl implements StockService { @Override @Transactional(rollbackFor = Exception.class) - public void materialIn(String stockCode, List boxNumbers, String pointCode) { + public void materialIn(String stockCode, List boxNumbers, String pointCode) { /**验证容器*/ Stock stock = validateStock(stockCode); @@ -840,7 +840,7 @@ public class StockServiceImpl implements StockService { private void updateStockAndPoints(Stock stock, Point srcPoint, Point endPoint) { stock.setStatus(BaseStatus.USED); stock.setPoint(srcPoint); - update(stock); + stockRepository.save(stock); endPoint.setStatus(BaseStatus.USED); pointRepository.save(endPoint); diff --git a/youchain-system/src/main/java/com/youchain/businessdata/domain/Pick.java b/youchain-system/src/main/java/com/youchain/businessdata/domain/Pick.java index daff6be..1ffaa9c 100644 --- a/youchain-system/src/main/java/com/youchain/businessdata/domain/Pick.java +++ b/youchain-system/src/main/java/com/youchain/businessdata/domain/Pick.java @@ -30,7 +30,7 @@ import java.io.Serializable; /** * @author huojin - * @website https://eladmin.vip + * @website ... * @description / * @date 2024-06-11 **/ diff --git a/youchain-system/youchain-system.iml b/youchain-system/youchain-system.iml new file mode 100644 index 0000000..99a49d3 --- /dev/null +++ b/youchain-system/youchain-system.iml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file