root/ShangDianKe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev:更新

Browse Source
This commit is contained in:
gengby
2024-08-01 16:55:41 +08:00
parent 92a19721ef
commit 620de5f189
102 changed files with 6053 additions and 1133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java
View File

@@ -123,6 +123,15 @@ public class PdaServiceImpl implements PdaService {
}
// 获取点位
SchBasePoint basePoint = pointService.getById(entity.getPoint_code());
if (ObjectUtil.isEmpty(basePoint)) {
throw new BadRequestException("点位信息不存在!");
}
if (!RegionEnum.ZP.getRegion_code().equals(basePoint.getRegion_code())) {
throw new BadRequestException("该点位不属于组盘区域!");
}
if (ObjectUtil.isNotEmpty(basePoint.getVehicle_code()) && !StrUtil.equals(entity.getVehicle_code(), basePoint.getVehicle_code())) {
throw new BadRequestException("组盘信息中的载具编码和该点位记录的载具编码不一致!");
}
// 获取物料
MdBaseMaterial material = materialService.getById(entity.getMaterial_id());
SchBaseVehiclematerialgroup group = new SchBaseVehiclematerialgroup();

25
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/enums/PointTypeEnum.java Normal file
View File

@@ -0,0 +1,25 @@
package org.nl.wms.sch.task_manage.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* @Author: lyd
* @Description:
* @Date: 2023/5/25
*/
@Getter
@AllArgsConstructor
public enum PointTypeEnum {
/**
* 空托位
*/
EMPTY_POINT("1", "空托位"),
/**
* 满托位
*/
FULL_POINT("2", "满托位");
private final String code;
private final String label;
}

13
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/lmzb/LMZBQKTask.java
View File

@@ -6,6 +6,7 @@ import org.nl.common.exception.BadRequestException;
import org.nl.system.service.notice.ISysNoticeService;
import org.nl.wms.sch.point.service.ISchBasePointService;
import org.nl.wms.sch.point.service.dao.SchBasePoint;
import org.nl.wms.sch.region.service.RegionEnum;
import org.nl.wms.sch.task.service.ISchBaseTaskService;
import org.nl.wms.sch.task.service.ISchBaseTaskconfigService;
import org.nl.wms.sch.task.service.dao.SchBaseTask;
@@ -14,6 +15,7 @@ import org.nl.wms.sch.task_manage.AbstractTask;
import org.nl.wms.sch.task_manage.GeneralDefinition;
import org.nl.wms.sch.task_manage.enums.NoticeTypeEnum;
import org.nl.wms.sch.task_manage.enums.PointStatusEnum;
import org.nl.wms.sch.task_manage.enums.PointTypeEnum;
import org.nl.wms.sch.task_manage.enums.TaskFinishedTypeEnum;
import org.nl.wms.sch.task_manage.task.TaskType;
import org.nl.wms.sch.task_manage.task.core.TaskStatus;
@@ -98,7 +100,16 @@ public class LMZBQKTask extends AbstractTask {
.eq(SchBasePoint::getIng_task_code, ""))
.eq(SchBasePoint::getIs_used, true);
List<SchBasePoint> schBasePoints = pointService.list(lam);
return ObjectUtil.isNotEmpty(schBasePoints) ? schBasePoints.get(0) : null;
SchBasePoint start_point = schBasePoints.stream()
.filter(point -> RegionEnum.BCXKZB.getRegion_code().equals(point.getRegion_code()))
.filter(point -> PointTypeEnum.EMPTY_POINT.getCode().equals(point.getPoint_type()))
.findFirst()
.orElse(null);
if (ObjectUtil.isEmpty(start_point)) {
start_point = schBasePoints.stream().filter(point -> RegionEnum.KTPHC2.getRegion_code().equals(point.getRegion_code()))
.findFirst().orElse(null);
}
return ObjectUtil.isNotEmpty(start_point) ? start_point : null;
}
@Override

6
lms/nladmin-system/nlsso-server/src/main/resources/config/application-prod.yml
View File

@@ -1,5 +1,5 @@
server:
port: 8010
port: 8011
#配置数据源
spring:
autoconfigure:
@@ -10,7 +10,7 @@ spring:
datasource:
mysql:
driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
url: jdbc:log4jdbc:mysql://${DB_HOST:10.93.41.198}:${DB_PORT:3306}/${DB_NAME:rl_mg_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:LMS}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
username: ${DB_USER:root}
password: ${DB_PWD:123456}
# url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:rtmg_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
@@ -121,7 +121,7 @@ file:
avatarMaxSize: 5
logging:
file:
path: /app/jar/logs
path: C:\log\LMS\
config: classpath:logback-spring.xml
# Sa-Token配置

4
lms/nladmin-system/nlsso-server/src/main/resources/config/application.yml
View File

@@ -46,7 +46,7 @@ spring:
freemarker:
check-template-location: false
profiles:
active: dev
active: dev2
jackson:
time-zone: GMT+8
data:
@@ -142,7 +142,7 @@ mybatis-plus:
lucene:
index:
path: D:\lucene\index
path: C:\lms\lucene\index
jetcache:
statIntervalMinutes: 15

2
lms/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml
View File

@@ -18,7 +18,7 @@ https://juejin.cn/post/6844903775631572999
<!--引入默认的一些设置-->
<!--<include resource="log/XrToMes.xml"/>
<include resource="log/MesToErp.xml"/>-->
<include resource="log/XgAgvDeviceDriver.xml"/>
<!-- <include resource="log/XgAgvDeviceDriver.xml"/>-->
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<!--withJansi 参数改为true-->