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

opt: 实际修改

Browse Source
This commit is contained in:
liyongde
2025-10-30 11:25:33 +08:00
parent c8a25ac6a9
commit 6d6874b116
15 changed files with 91 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/enums/EXTConstant.java
View File

@@ -30,7 +30,7 @@ public class EXTConstant {
/**
* 回传MES接口地址
*/
public final static String UPLOAD_MES_API = "";
public final static String UPLOAD_MES_API = "mom/lms";
/**
* MES获取物料详情请求地址

7
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/MesToWmsServiceImpl.java
View File

@@ -146,7 +146,7 @@ public class MesToWmsServiceImpl implements MesToWmsService {
if (tryLock) {
String pointCode = dto.getDevice_code();
SchBasePoint outPoint = pointService.getById(pointCode);
SchBasePoint outPoint = pointService.getPointByExtCode(dto.getDevice_code());
if (null == outPoint) {
throw new BadRequestException("设备【" + pointCode + "】不存在！");
}
@@ -465,7 +465,10 @@ public class MesToWmsServiceImpl implements MesToWmsService {
log.info("MES下发设备退料信息输入参数：--------------------------------------" + MesResponse.requestOk());
//根据点位去查找对应的料桶号信息
SchBasePoint point = pointService.getById(dto.getDevice_code());
SchBasePoint point = pointService.getPointByExtCode(dto.getDevice_code());
if (ObjectUtil.isEmpty(point)) {
throw new BadRequestException("设备" + dto.getDevice_code() + "不存在,轻检验编码与LMS是否一致！");
}
//根据料桶号去载具表匹配料桶类型
MdPbStoragevehicleinfo mdPbStoragevehicleinfo = iMdPbStoragevehicleinfoService.getByCode(point.getVehicle_code());

19
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/WmsToMesServiceImpl.java
View File

@@ -1,5 +1,6 @@
package org.nl.wms.ext_manage.service.impl;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.http.HttpRequest;
import com.alibaba.fastjson.JSONObject;
import lombok.extern.slf4j.Slf4j;
@@ -10,7 +11,10 @@ import org.nl.wms.ext_manage.service.WmsToMesService;
import org.nl.wms.ext_manage.service.util.AcsResponse;
import org.nl.wms.sch_manage.service.util.AcsTaskDto;
import org.nl.wms.system_manage.enums.SysParamConstant;
import org.nl.wms.system_manage.service.param.ISysParamService;
import org.nl.wms.system_manage.service.param.dao.Param;
import org.nl.wms.system_manage.service.param.impl.SysParamServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Service;
@@ -28,12 +32,25 @@ import java.util.List;
@Service
public class WmsToMesServiceImpl implements WmsToMesService {
public final static String IS_CONNECT_MES = "is_connect_mes";
@Autowired
private ISysParamService sysParamService;
@Override
public JSONObject uploadMes(JSONObject whereJson) {
log.info("uploadMes回传接口输入参数为：-------------------" + whereJson.toString());
JSONObject result = new JSONObject();
String url = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode(SysParamConstant.ERP_URL).getValue();
Param isConnect = sysParamService.findByCode(IS_CONNECT_MES);
if (ObjectUtil.isEmpty(isConnect)) {
throw new BadRequestException("未配置连接参数：is_connect_mes");
}
if ("1".equals(isConnect.getValue())) {
log.info("系统设置无需回传！");
return null;
}
String url = sysParamService.findByCode(SysParamConstant.ERP_URL).getValue();
url = url + EXTConstant.UPLOAD_MES_API;
try {

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/ISchBasePointService.java
View File

@@ -146,4 +146,6 @@ public interface ISchBasePointService extends IService<SchBasePoint> {
List<SchBasePoint> getPointsByCode(String regions);
SchBasePoint getPointByCode(String pointCode);
SchBasePoint getPointByExtCode(String deviceCode);
}

10
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/impl/SchBasePointServiceImpl.java
View File

@@ -370,4 +370,14 @@ public class SchBasePointServiceImpl extends ServiceImpl<SchBasePointMapper, Sch
return schBasePointList.get(0);
}
@Override
public SchBasePoint getPointByExtCode(String deviceCode) {
List<SchBasePoint> schBasePointList = pointMapper.selectList(new LambdaQueryWrapper<SchBasePoint>()
.eq(SchBasePoint::getExt_point_code, deviceCode));
if(schBasePointList.isEmpty()){
return null;
}
return schBasePointList.get(0);
}
}

6
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/GetMaterialFromMesTask.java
View File

@@ -59,7 +59,7 @@ public class GetMaterialFromMesTask {
@SneakyThrows
public void run(String params) {
MDC.put(TagNameEnum.TAG_NAME.getTag(), TagNameEnum.AUTO_TASK_SEND.getTag());
MDC.put(TagNameEnum.TAG_NAME.getTag(), TagNameEnum.TO_MES_MATERIAL.getTag());
log.info("定时器正在执行【从MES获取物料】任务调度...");
getMaterial(params);
log.info("定时器执行【从MES获取物料】任务调度结束...");
@@ -124,7 +124,11 @@ public class GetMaterialFromMesTask {
material.setMaterial_code(materialCode);
material.setMaterial_name(mesRecord.getMaterial_description());
material.setMaterial_id(mesRecord.getId());
material.setExt_id(mesRecord.getCode());
material.setMaterial_type_id(mesRecord.getMaterial_classify());
// material.setMaterial_spec(mesRecord.getMaterialModel());
material.setMaterial_spec(mesRecord.getMaterial_mark());
material.setUpdate_time(mesRecord.getUpdate_time());
material.setMaterial_model(mesRecord.getMaterial_type());

44
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/BackInTask.java
View File

@@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import org.nl.common.exception.BadRequestException;
import org.nl.common.utils.CodeUtil;
import org.nl.common.utils.IdUtil;
import org.nl.common.utils.SecurityUtils;
import org.nl.common.utils.IdUtil;;
import org.nl.wms.basedata_manage.service.IStructattrService;
import org.nl.wms.basedata_manage.service.dao.Structattr;
import org.nl.wms.ext_manage.service.WmsToMesService;
@@ -29,6 +29,8 @@ import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
;
/**
* @Author: Liuxy
* @Description: 余料回库类
@@ -70,7 +72,7 @@ public class BackInTask extends AbstractTask {
public String create(JSONObject json) {
SchBaseTask task = new SchBaseTask();
task.setTask_id(IdUtil.getStringId());
if(json.containsKey("task_code")){
if (json.containsKey("task_code")) {
task.setExt_task_code(json.getString("task_code"));
}
task.setTask_code(CodeUtil.getNewCode("TASK_CODE"));
@@ -147,7 +149,7 @@ public class BackInTask extends AbstractTask {
if (Integer.parseInt(taskObj.getTask_status()) > Integer.parseInt(TaskStatus.CREATE.getCode())) {
throw new BadRequestException("只能取消生成中的任务!");
}
this.cancelTask(taskObj);
this.cancelTask(taskObj);
}
@Override
@@ -159,18 +161,18 @@ public class BackInTask extends AbstractTask {
// 更新终点
iStructattrService.update(
new UpdateWrapper<Structattr>().lambda()
.eq(Structattr::getStruct_code, taskObj.getPoint_code2())
.set(Structattr::getStoragevehicle_code, taskObj.getVehicle_code())
.set(Structattr::getTask_code, null)
.set(Structattr::getOccupancy_state,"3")
.set(Structattr::getLock_type, IOSEnum.LOCK_TYPE.code("未锁定"))
.eq(Structattr::getStruct_code, taskObj.getPoint_code2())
.set(Structattr::getStoragevehicle_code, taskObj.getVehicle_code())
.set(Structattr::getTask_code, null)
.set(Structattr::getOccupancy_state, "3")
.set(Structattr::getLock_type, IOSEnum.LOCK_TYPE.code("未锁定"))
);
// 更新起点
iSchBasePointService.update(
new UpdateWrapper<SchBasePoint>().lambda()
.eq(SchBasePoint::getPoint_code, taskObj.getPoint_code1())
.set(SchBasePoint::getIng_task_code, null)
.set(SchBasePoint::getPoint_status,"1")
.set(SchBasePoint::getPoint_status, "1")
.set(SchBasePoint::getVehicle_code, null)
.set(SchBasePoint::getIos_id, null)
);
@@ -187,12 +189,12 @@ public class BackInTask extends AbstractTask {
taskService.updateById(taskObj);
//如果是自动的，回调MES接口，将task_code传给mes
if("自动".equals(taskObj.getCreate_mode())){
JSONObject jsonObject=new JSONObject();
jsonObject.put("status",200);
jsonObject.put("message","成功");
jsonObject.put("task_code",taskObj.getExt_task_code());
// wmsToMesService.uploadMes(jsonObject);
if ("自动".equals(taskObj.getCreate_mode())) {
JSONObject jsonObject = new JSONObject();
jsonObject.put("status", 200);
jsonObject.put("message", "成功");
jsonObject.put("task_code", taskObj.getExt_task_code());
wmsToMesService.uploadMes(jsonObject);
}
}
@@ -211,12 +213,12 @@ public class BackInTask extends AbstractTask {
taskService.updateById(taskObj);
//反馈到MES系统
if("自动".equals(taskObj.getCreate_mode())){
JSONObject jsonObject=new JSONObject();
jsonObject.put("status",400);
jsonObject.put("message","任务被取消");
jsonObject.put("task_code",taskObj.getExt_task_code());
// wmsToMesService.uploadMes(jsonObject);
if ("自动".equals(taskObj.getCreate_mode())) {
JSONObject jsonObject = new JSONObject();
jsonObject.put("status", 400);
jsonObject.put("message", "任务被取消");
jsonObject.put("task_code", taskObj.getExt_task_code());
wmsToMesService.uploadMes(jsonObject);
}
}
}

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleInTask.java
View File

@@ -203,7 +203,7 @@ public class VehicleInTask extends AbstractTask {
jsonObject.put("status",200);
jsonObject.put("message","成功");
jsonObject.put("task_code",taskObj.getExt_task_code());
// wmsToMesService.uploadMes(jsonObject);
wmsToMesService.uploadMes(jsonObject);
}
}
@@ -236,7 +236,7 @@ public class VehicleInTask extends AbstractTask {
jsonObject.put("status",400);
jsonObject.put("message","任务被取消");
jsonObject.put("task_code",taskObj.getExt_task_code());
// wmsToMesService.uploadMes(jsonObject);
wmsToMesService.uploadMes(jsonObject);
}
}
}

7
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/DownEmptyUpFullTask.java
View File

@@ -165,9 +165,6 @@ public class DownEmptyUpFullTask extends AbstractTask {
if (ObjectUtil.isEmpty(taskObj)) {
throw new BadRequestException("该任务不存在");
}
if (!TaskStatus.CREATE.getCode().equals(taskObj.getTask_status())) {
throw new BadRequestException("任务状态必须为生成才能取消任务");
}
this.cancelTask(taskObj);
}
@@ -279,7 +276,7 @@ public class DownEmptyUpFullTask extends AbstractTask {
jsonObject.put("status",200);
jsonObject.put("message","成功");
jsonObject.put("task_code",taskObj.getExt_task_code());
// wmsToMesService.uploadMes(jsonObject);
wmsToMesService.uploadMes(jsonObject);
}
}
}
@@ -352,7 +349,7 @@ public class DownEmptyUpFullTask extends AbstractTask {
jsonObject.put("status",400);
jsonObject.put("message","任务被取消");
jsonObject.put("task_code",taskObj.getExt_task_code());
// wmsToMesService.uploadMes(jsonObject);
wmsToMesService.uploadMes(jsonObject);
}
}
}

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/InBillTask.java
View File

@@ -164,9 +164,6 @@ public class InBillTask extends AbstractTask {
if (ObjectUtil.isEmpty(taskObj)) {
throw new BadRequestException("该任务不存在");
}
if (!TaskStatus.CREATE.getCode().equals(taskObj.getTask_status())) {
throw new BadRequestException("任务状态必须为生成才能取消任务");
}
this.cancelTask(taskObj);
}

7
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/SeparateMaterialTask.java
View File

@@ -157,9 +157,6 @@ public class SeparateMaterialTask extends AbstractTask {
if (ObjectUtil.isEmpty(taskObj)) {
throw new BadRequestException("该任务不存在");
}
if (!TaskStatus.CREATE.getCode().equals(taskObj.getTask_status())) {
throw new BadRequestException("任务状态必须为生成才能取消任务");
}
this.cancelTask(taskObj);
}
@@ -205,7 +202,7 @@ public class SeparateMaterialTask extends AbstractTask {
jsonObject.put("status",200);
jsonObject.put("message","成功");
jsonObject.put("task_code",taskObj.getExt_task_code());
// wmsToMesService.uploadMes(jsonObject);
wmsToMesService.uploadMes(jsonObject);
}
}
@@ -278,7 +275,7 @@ public class SeparateMaterialTask extends AbstractTask {
jsonObject.put("status",400);
jsonObject.put("message","任务被取消");
jsonObject.put("task_code",taskObj.getExt_task_code());
// wmsToMesService.uploadMes(jsonObject);
wmsToMesService.uploadMes(jsonObject);
}
}
}

1
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/enums/TagNameEnum.java
View File

@@ -31,6 +31,7 @@ public enum TagNameEnum {
* 解包手持退料
*/
PDA_JB_BACK_MATERIAL("解包手持退料"),
TO_MES_MATERIAL("同步MES物料"),
/**
* 标记符号
*/

4
lms/nladmin-ui/public/config.js
View File

@@ -1,9 +1,9 @@
window.g = {
dev: {
VUE_APP_BASE_API: 'http://127.0.0.1:8011'
VUE_APP_BASE_API: 'http://10.37.84.130:8011'
},
prod: {
VUE_APP_BASE_API: 'http://127.0.0.1:8011'
VUE_APP_BASE_API: 'http://10.37.84.130:8011'
}
}

2
lms/nladmin-ui/src/i18n/langs/zh-CN.js
View File

@@ -2,7 +2,7 @@ export default {
'lang': 'zh',
// 平台
'platform': {
'title': '株硬公司LMS系统',
'title': '株硬粉末LMS系统',
'tip1': '用户名不能为空',
'tip2': '密码不能为空',
'tip3': '验证码不能为空'

33
lms/nladmin-ui/src/views/wms/basedata/material/index.vue
View File

@@ -104,22 +104,23 @@
<el-table-column prop="material_code" label="物料编码" width="160" />
<el-table-column prop="material_name" label="物料名称" width="180" show-overflow-tooltip />
<el-table-column prop="material_spec" label="物料规格" width="140" />
<el-table-column prop="material_model" label="物料型号" />
<el-table-column prop="class_name" label="物料分类" width="140" />
<el-table-column label="启用" align="center" prop="is_used">
<template slot-scope="scope">
<el-switch
v-model="scope.row.is_used"
active-color="#409EFF"
inactive-color="#F56C6C"
active-value="1"
inactive-value="0"
@change="changeEnabled(scope.row, scope.row.is_used)"
/>
</template>
</el-table-column>
<el-table-column prop="update_optname" label="修改人" />
<el-table-column prop="update_time" label="修改时间" width="135" />
<el-table-column prop="material_model" label="物料型号" width="140"/>
<el-table-column prop="material_type_id" label="物料分类" width="140" />
<!-- <el-table-column label="启用" align="center" prop="is_used">-->
<!-- <template slot-scope="scope">-->
<!-- <el-switch-->
<!-- v-model="scope.row.is_used"-->
<!-- active-color="#409EFF"-->
<!-- inactive-color="#F56C6C"-->
<!-- active-value="1"-->
<!-- inactive-value="0"-->
<!-- @change="changeEnabled(scope.row, scope.row.is_used)"-->
<!-- />-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column prop="update_optname" label="修改人" />-->
<el-table-column prop="create_time" label="创建时间" />
<el-table-column prop="update_time" label="修改时间" />
<el-table-column
v-permission="['admin','Materialbase:edit','Materialbase:del']"
fixed="right"