From e1af3bea78f84ce82d28f576a23dd006491b363f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9A=B4=E7=82=B3=E6=9E=97?= <15237758276@163.com> Date: Thu, 30 May 2024 10:28:44 +0800 Subject: [PATCH] no message --- .../com/youchain/utils/HttpPostUtil.class | Bin 3595 -> 3612 bytes .../basicdata/repository/PointRepository.java | 3 ++- .../basicdata/rest/StockController.java | 12 +++++++++ .../service/impl/StockServiceImpl.java | 25 ++++++------------ .../repository/AgvTaskRepository.java | 2 ++ .../businessdata/rest/KMReSController.java | 17 ++++++------ .../security/service/UserCacheManager.java | 2 +- .../main/resources/config/application-dev.yml | 8 +++--- 8 files changed, 37 insertions(+), 32 deletions(-) diff --git a/youchain-common/target/classes/com/youchain/utils/HttpPostUtil.class b/youchain-common/target/classes/com/youchain/utils/HttpPostUtil.class index d0df3f19dac21929875a70f7d873e03899213133..c876a88213440922c01d51a3f60422d48fc0b3ca 100644 GIT binary patch delta 123 zcmeB{nIp5okDIfRfrWvafq_wJ@=Fe*$(`KiB^9h#H!*1LW?+uo&cLFzje$)FL~LVV zpPaxmkx_o~Cmv5@X$E%&4+d6{J_b()HwGX8vb=ySMldS^$YNsfWw^@V&EUhp%n-RCn!Hoe3fGjT{ixJF<0J4}Ed>M`~cr*AgFf#-)9GG0s8^Fjt`2w#G07;1x AasU7T diff --git a/youchain-system/src/main/java/com/youchain/basicdata/repository/PointRepository.java b/youchain-system/src/main/java/com/youchain/basicdata/repository/PointRepository.java index bc839d9..8600aeb 100644 --- a/youchain-system/src/main/java/com/youchain/basicdata/repository/PointRepository.java +++ b/youchain-system/src/main/java/com/youchain/basicdata/repository/PointRepository.java @@ -31,6 +31,7 @@ import java.util.Map; public interface PointRepository extends JpaRepository, JpaSpecificationExecutor { @Query(value = "SELECT u.id,u.code FROM base_point p WHERE p.enabled=1 and p.status='FREE'", nativeQuery = true) public List> getKyPointList(); - + @Query(value = "SELECT p FROM Point p WHERE p.code=?1", nativeQuery = false) + Point findByCode(String code); } \ No newline at end of file diff --git a/youchain-system/src/main/java/com/youchain/basicdata/rest/StockController.java b/youchain-system/src/main/java/com/youchain/basicdata/rest/StockController.java index 82f4729..0b6bcff 100644 --- a/youchain-system/src/main/java/com/youchain/basicdata/rest/StockController.java +++ b/youchain-system/src/main/java/com/youchain/basicdata/rest/StockController.java @@ -23,6 +23,7 @@ import com.youchain.basicdata.domain.Area; import com.youchain.basicdata.domain.Point; import com.youchain.basicdata.domain.Stock; import com.youchain.basicdata.domain.StockType; +import com.youchain.basicdata.repository.PointRepository; import com.youchain.basicdata.service.StockService; import com.youchain.basicdata.service.StockTypeService; import com.youchain.basicdata.service.dto.StockQueryCriteria; @@ -30,6 +31,7 @@ import com.youchain.config.FileProperties; import com.youchain.exception.handler.ApiError; import com.youchain.utils.BaseStatus; import com.youchain.utils.FileUtil; +import com.youchain.utils.ImportEntityUtils; import com.youchain.utils.UserUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.data.domain.Pageable; @@ -63,6 +65,7 @@ import static org.springframework.http.HttpStatus.BAD_REQUEST; public class StockController { private final StockService stockService; + private final PointRepository pointRepository; private final FileProperties properties; @@ -94,6 +97,7 @@ public class StockController { int j=0; String code=readAll.get(i).get("代码").toString().trim(); String stockTypeCode=readAll.get(i).get("类型").toString().trim(); + String pointCode=readAll.get(i).get("点位").toString().trim(); StockType st=stockTypeService.findByCode(stockTypeCode); if(code==null || code.length()<=0){ break; @@ -108,11 +112,19 @@ public class StockController { stock.setCode(code); stock.setName(code); stock.setStatus(BaseStatus.FREE); + if (ImportEntityUtils.stringFlag(pointCode)){ + Point point=pointRepository.findByCode(pointCode); + stock.setPoint(point); + } stock.setEnabled(true); stock.setStockType(st); stock.setDept(UserUtils.getDept()); stockService.create(stock); }else{ + if (ImportEntityUtils.stringFlag(pointCode)){ + Point point=pointRepository.findByCode(pointCode); + stock.setPoint(point); + } stock.setCode(code); stock.setName(code); stock.setStockType(st); 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 59d5773..5f10777 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 @@ -114,23 +114,14 @@ public class StockServiceImpl implements StockService { List> list = new ArrayList<>(); for (StockDto stock : all) { Map map = new LinkedHashMap<>(); - map.put("容器代码", stock.getCode()); - map.put("上级容器ID", stock.getPid()); - map.put("仓库ID", stock.getDept().getName()); - map.put("地标ID", stock.getPoint().getName()); - map.put("子容器数量", stock.getSubCount()); - map.put("容器名称", stock.getName()); - map.put("类型名称", stock.getStockType().getName()); - map.put("容器使用重量", stock.getUseWeight()); - map.put("容器使用体积", stock.getUseSize()); - map.put("容器重量占用率", stock.getUsageWeight()); - map.put("容器体积占用率", stock.getUsageSize()); - map.put("状态", stock.getEnabled()); - map.put("创建人", stock.getCreateBy()); - map.put("修改人", stock.getUpdateBy()); - map.put("创建时间", stock.getCreateTime()); - map.put("修改时间", stock.getUpdateTime()); - map.put("顶级容器ID", stock.getTopId()); + map.put("代码", stock.getCode()); + map.put("类型", stock.getStockType().getCode()); + if (stock.getPoint()!=null){ + map.put("点位", stock.getPoint().getCode()); + }else { + map.put("点位", ""); + } + map.put("是否启用", stock.getEnabled()); list.add(map); } diff --git a/youchain-system/src/main/java/com/youchain/businessdata/repository/AgvTaskRepository.java b/youchain-system/src/main/java/com/youchain/businessdata/repository/AgvTaskRepository.java index e48a867..a530fe5 100644 --- a/youchain-system/src/main/java/com/youchain/businessdata/repository/AgvTaskRepository.java +++ b/youchain-system/src/main/java/com/youchain/businessdata/repository/AgvTaskRepository.java @@ -37,4 +37,6 @@ public interface AgvTaskRepository extends JpaRepository, JpaS @Query(value = "select * FROM data_agv_task a where a.`status` in ('ATCALL','UP_CONTAINER','OPEN') AND a.end_slot_code like 'MA1151-QH%'" + " UNION select * FROM data_agv_task a where a.`status` in ('ATCALL','UP_CONTAINER','OPEN') AND a.start_slot_code like 'MA1151-QH%' ", nativeQuery = true) List queryAgvTaskPerformedQH(); + @Query(value = "select agv from AgvTask agv where agv.jobForce=?1") + AgvTask findByJobForce(String jobForce); } diff --git a/youchain-system/src/main/java/com/youchain/businessdata/rest/KMReSController.java b/youchain-system/src/main/java/com/youchain/businessdata/rest/KMReSController.java index 33f98b8..7564256 100644 --- a/youchain-system/src/main/java/com/youchain/businessdata/rest/KMReSController.java +++ b/youchain-system/src/main/java/com/youchain/businessdata/rest/KMReSController.java @@ -10,6 +10,7 @@ import com.youchain.businessdata.inputJson.ReturnIssueInfo; import com.youchain.businessdata.inputJson.ReturnIssueInfoParams; import com.youchain.businessdata.inputJson.ReturnMoInfo; import com.youchain.businessdata.inputJson.ReturnMoParams; +import com.youchain.businessdata.repository.AgvTaskRepository; import com.youchain.businessdata.repository.TaskRepository; import com.youchain.businessdata.service.AgvTaskService; import com.youchain.businessdata.service.MlsService; @@ -45,6 +46,7 @@ import java.util.concurrent.CompletableFuture; public class KMReSController { private final AgvTaskService agvTaskService; + private final AgvTaskRepository agvTaskRepository; private final TaskRepository taskRepository; private final TaskService taskService; private final OrderService orderService; @@ -56,24 +58,21 @@ public class KMReSController { @ApiOperation("KMReS接口回调") @AnonymousAccess public ResponseEntity missionStateCallback(@RequestBody MissionStateCallback missionStateCallback) { + System.out.println("接口任务回调:"+missionStateCallback.toString()); String id = missionStateCallback.getMissionCode(); // 作业 id String containerCode = missionStateCallback.getContainerCode(); // 容器编号 String missionStatus = missionStateCallback.getMissionStatus(); // 作业当前状态 - - try { - if (id.contains("LX")) { + AgvTask agvTask = agvTaskRepository.findByJobForce(id); + if (agvTask!=null) { + if (agvTask.getType().equals(BizStatus.PICK)) { //出库 pickTask(id, containerCode, missionStatus); - } else { + } else if (agvTask.getType().equals(BizStatus.ASN)) { //入库 asnTask(id, missionStatus); } - - return ResponseEntity.ok(ApiResult.success(HttpStatus.OK.value(), "", "")); - } catch (Exception e) { - return new ResponseEntity<>(ApiResult.fail(HttpStatus.BAD_REQUEST.value(), "KMReS接口回调异常", e.getMessage()), HttpStatus.BAD_REQUEST); } - + return ResponseEntity.ok(ApiResult.success(HttpStatus.OK.value(), "", "")); } public void asnTask(String id, String missionStatus) { diff --git a/youchain-system/src/main/java/com/youchain/modules/security/service/UserCacheManager.java b/youchain-system/src/main/java/com/youchain/modules/security/service/UserCacheManager.java index 56147a6..36bf4fe 100644 --- a/youchain-system/src/main/java/com/youchain/modules/security/service/UserCacheManager.java +++ b/youchain-system/src/main/java/com/youchain/modules/security/service/UserCacheManager.java @@ -76,7 +76,7 @@ public class UserCacheManager { public void cleanUserCache(String userName) { if (StringUtils.isNotEmpty(userName)) { // 清除数据 - redisUtils.hdel(LoginProperties.cacheKey, userName); +// redisUtils.hdel(LoginProperties.cacheKey, userName); } } } \ No newline at end of file diff --git a/youchain-system/src/main/resources/config/application-dev.yml b/youchain-system/src/main/resources/config/application-dev.yml index 79aa6dc..8dc94a7 100644 --- a/youchain-system/src/main/resources/config/application-dev.yml +++ b/youchain-system/src/main/resources/config/application-dev.yml @@ -3,10 +3,10 @@ spring: redis: #数据库索引 database: ${REDIS_DB:0} - host: ${REDIS_HOST:115.159.67.99} - password: ${REDIS_PWD:123456} - #host: ${REDIS_HOST:127.0.0.1} - #password: ${REDIS_PWD:} +# host: ${REDIS_HOST:115.159.67.99} +# password: ${REDIS_PWD:123456} + host: ${REDIS_HOST:127.0.0.1} + password: ${REDIS_PWD:} port: ${REDIS_PORT:6379} #连接超时时间 timeout: 5000