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

opt:提取mes请求url为系统参数，可配置

Browse Source
This commit is contained in:
DESKTOP-5DIJMF9\admin
2024-09-09 17:53:19 +08:00
parent c3c0bec050
commit 16c5db066d
4 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java
View File

@@ -202,9 +202,7 @@ public abstract class AbstractTask {
}
//判断是否校验mes组盘记录
Param isConnectAcs = paramService.findByCode(GeneralDefinition.IS_RETURN_MES);
if (ObjectUtil.isEmpty(isConnectAcs)) {
Assert.notNull(taskConfig, "找不到配置文件，请确认系统参数[is_return_mes]配置是否存在！");
}
Assert.notNull(isConnectAcs, "找不到配置文件，请确认系统参数[is_return_mes]配置是否存在！");
String isReturn = isConnectAcs.getValue();
if("1".equals(isReturn)){
//若不是缓存区托盘，校验mes接口组盘记录

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

@@ -87,9 +87,7 @@ public class POINTTask extends AbstractTask {
if(task.getPoint_code2().startsWith("DKT")){
//判断叠盘机最大叠盘数量
Param max_dkt_qty = paramService.findByCode(GeneralDefinition.MAX_DKT_QTY);
if (ObjectUtil.isEmpty(max_dkt_qty)) {
Assert.notNull(taskConfig, "找不到配置文件，请确认系统参数[max_dkt_qty]配置是否存在！");
}
Assert.notNull(max_dkt_qty, "找不到配置文件，请确认系统参数[max_dkt_qty]配置是否存在！");
Integer max_qty = Integer.valueOf(max_dkt_qty.getValue());
//如果是叠盘位，根据当前数量+1为目标地址
int qty=nextSchBasePoint.getVehicle_qty()+1;

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

@@ -3,6 +3,7 @@ package org.nl.wms.sch.task_manage.task.tasks;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.http.HttpRequest;
@@ -12,6 +13,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import lombok.extern.slf4j.Slf4j;
import org.nl.common.exception.BadRequestException;
import org.nl.system.service.param.ISysParamService;
import org.nl.system.service.param.dao.Param;
import org.nl.wms.ext.service.dto.to.BaseResponse;
import org.nl.wms.mes.domain.Head;
import org.nl.wms.mes.domain.QPMES065Request;
@@ -77,6 +80,8 @@ public class YCLCKTask extends AbstractTask {
private MaterialMapper materialMapper;
@Autowired
private MaterialDataMapper materialDataMapper;
@Autowired
private ISysParamService paramService;
@Override
@@ -294,7 +299,10 @@ public class YCLCKTask extends AbstractTask {
try {
if (ObjectUtil.isNotEmpty(materialList)) {
//自动化领料出库后经由AGV将出库信息同步至MES，从原材料库到回温库完成后自动调用
String url = "http://192.168.9.124/sitAppWebApi/PDSToWMS/Api/QPMES065";
//String url = "http://192.168.9.124/sitAppWebApi/PDSToWMS/Api/QPMES065";
Param mes_url = paramService.findByCode(GeneralDefinition.MES_URL);
Assert.notNull(mes_url, "找不到配置文件，请确认系统参数[mes_url]配置是否存在！");
String url = mes_url.getValue()+"QPMES065";
QPMES065Request qpmes065Request = new QPMES065Request();
List<QPMES065RequestBody> qpmes065RequestBodyList=new ArrayList<>();
Head head=new Head();

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

@@ -3,6 +3,7 @@ package org.nl.wms.sch.task_manage.task.tasks;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.http.HttpRequest;
@@ -13,6 +14,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import lombok.extern.slf4j.Slf4j;
import org.nl.common.exception.BadRequestException;
import org.nl.system.service.param.dao.Param;
import org.nl.wms.ext.service.dto.to.BaseResponse;
import org.nl.wms.mes.domain.Head;
import org.nl.wms.mes.domain.QPMES062Request;
@@ -32,6 +34,7 @@ import org.nl.wms.sch.task.service.ISchBaseTaskconfigService;
import org.nl.wms.sch.task.service.dao.SchBaseTask;
import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig;
import org.nl.wms.sch.task_manage.AbstractTask;
import org.nl.wms.sch.task_manage.GeneralDefinition;
import org.nl.wms.sch.task_manage.enums.GroupBindMaterialStatusEnum;
import org.nl.wms.sch.task_manage.enums.GroupStatusEnum;
import org.nl.wms.sch.task_manage.task.TaskType;