From 7c4a152594703bcd1aa023a68cc546996a2757d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9A=B4=E7=82=B3=E6=9E=97?= <15237758276@163.com> Date: Mon, 14 Jul 2025 14:28:26 +0800 Subject: [PATCH] no message --- .../basicdata/repository/LampLogRepository.java | 4 +++- .../basicdata/service/impl/LampLogServiceImpl.java | 2 +- .../businessdata/service/impl/TaskServiceImpl.java | 12 ++++++++++-- .../src/main/resources/config/application-dock.yml | 2 +- .../src/main/resources/config/application.yml | 2 +- 5 files changed, 16 insertions(+), 6 deletions(-) diff --git a/youchain-system/src/main/java/com/youchain/basicdata/repository/LampLogRepository.java b/youchain-system/src/main/java/com/youchain/basicdata/repository/LampLogRepository.java index 9e4dfa6..4ba35c3 100644 --- a/youchain-system/src/main/java/com/youchain/basicdata/repository/LampLogRepository.java +++ b/youchain-system/src/main/java/com/youchain/basicdata/repository/LampLogRepository.java @@ -15,6 +15,7 @@ */ package com.youchain.basicdata.repository; +import com.youchain.basicdata.domain.Item; import com.youchain.basicdata.domain.LampLog; import io.lettuce.core.dynamic.annotation.Param; import org.springframework.data.jpa.repository.JpaRepository; @@ -29,5 +30,6 @@ import java.util.List; * @date 2023-11-14 **/ public interface LampLogRepository extends JpaRepository, JpaSpecificationExecutor { - + @Query(value = "SELECT l FROM LampLog l WHERE l.id=?1") + LampLog findId(Long id); } \ No newline at end of file diff --git a/youchain-system/src/main/java/com/youchain/basicdata/service/impl/LampLogServiceImpl.java b/youchain-system/src/main/java/com/youchain/basicdata/service/impl/LampLogServiceImpl.java index d440c01..a34f6c3 100644 --- a/youchain-system/src/main/java/com/youchain/basicdata/service/impl/LampLogServiceImpl.java +++ b/youchain-system/src/main/java/com/youchain/basicdata/service/impl/LampLogServiceImpl.java @@ -104,7 +104,7 @@ public class LampLogServiceImpl implements LampLogService { lampLog.setOperationType("入库门"); lampLog.setRequestContent(rc); lampLogRepository.save(lampLog); -// LampLog lampLog=lampLogRepository.getById(41739l); +// LampLog lampLog=lampLogRepository.findId(41913l); return lampLog; } diff --git a/youchain-system/src/main/java/com/youchain/businessdata/service/impl/TaskServiceImpl.java b/youchain-system/src/main/java/com/youchain/businessdata/service/impl/TaskServiceImpl.java index b44c469..b43e499 100644 --- a/youchain-system/src/main/java/com/youchain/businessdata/service/impl/TaskServiceImpl.java +++ b/youchain-system/src/main/java/com/youchain/businessdata/service/impl/TaskServiceImpl.java @@ -127,7 +127,7 @@ public class TaskServiceImpl implements TaskService { public void deleteAll(Long[] ids) { for (Long id : ids) { Task task=taskRepository.getById(id); - if (task.getAgvTask()!=null){ + if (task.getAgvTask()!=null&&!task.getAgvTask().getStatus().equals(BizStatus.UNUSUAL)){ throw new BadRequestException(HttpStatus.NOT_IMPLEMENTED, "ID:"+id+"已生成任务,请先取消入库"); } if (task.getAsnDetail()!=null){ @@ -336,7 +336,7 @@ public class TaskServiceImpl implements TaskService { } String propC1=rfid.substring(9, 11); String propC2=rfid.substring(11, 13); - String propC3=rfid.substring(13, 19);// 系统单号 + String propC3=rfid.substring(13, 19);// 计划单号 List asnDetailList=asnDetailRepository.findByItem(itemCode); if(asnDetailList.size()<1){ return ApiResult.fail(500,"收货单中没有对应物料或入库单未激活",null); @@ -535,6 +535,14 @@ public class TaskServiceImpl implements TaskService { pointEnd.setStorageType(storageType); } pointRepository.save(pointEnd); + /* 如果為成品區入库，先绑定容器*/ + if (billTypeCode.equals(BizStatus.FC_RK)) { + AgvTask agvTask = addAgvTask(BizStatus.AGV_R, storageType, null, pointStart.getCode(), BizStatus.OPEN, BizStatus.ASN); + JSONObject resultJson = JSONObject.parseObject(sendAgvTaskImpl(agvTask)); + if (!resultJson.getString("code").equals("0")) { + throw new BadRequestException("容器入场失败" + resultJson); + } + } /*更新入库单状态*/ asnDetailService.receivingAsnDetail(asnDetail); diff --git a/youchain-system/src/main/resources/config/application-dock.yml b/youchain-system/src/main/resources/config/application-dock.yml index bac7468..c14fb57 100644 --- a/youchain-system/src/main/resources/config/application-dock.yml +++ b/youchain-system/src/main/resources/config/application-dock.yml @@ -15,7 +15,7 @@ spring: driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy url: jdbc:log4jdbc:mysql://${DB_HOST:youchain-mysql}:${DB_PORT:3306}/${DB_NAME:wms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false username: ${DB_USER:root} - password: ${DB_PWD:123456} + password: ${DB_PWD:Zncc@668108} # password: ${DB_PWD:Youchain@56} # 初始连接数 initial-size: 5 diff --git a/youchain-system/src/main/resources/config/application.yml b/youchain-system/src/main/resources/config/application.yml index 37f08bf..6661064 100644 --- a/youchain-system/src/main/resources/config/application.yml +++ b/youchain-system/src/main/resources/config/application.yml @@ -6,7 +6,7 @@ spring: freemarker: check-template-location: false profiles: - active: dev + active: dock jackson: time-zone: GMT+8 data: