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

opt:MES接口回调修改

Browse Source
This commit is contained in:
zhengxuming
2025-10-30 20:24:36 +08:00
parent d033f3ce9b
commit b21062b1c5
6 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -301,9 +301,9 @@ public class MesToWmsServiceImpl implements MesToWmsService {
taskParam.put("task_code", dto.getTask_code()); taskParam.put("task_code", dto.getTask_code());
taskParam.put("ext_task_code", dto.getTask_code()); taskParam.put("ext_task_code", dto.getTask_code());
if (dto.getIsManual() != null && dto.getIsManual()) { if (dto.getIsManual() != null && dto.getIsManual()) {
taskParam.put("create_mode", "手动"); taskParam.put("create_mode", IOSEnum.CREATE_MODE.code("手动"));
} else { } else {
taskParam.put("create_mode", "自动"); taskParam.put("create_mode", IOSEnum.CREATE_MODE.code("外部接口产生"));
} }
outBillService.allSetPoint(taskParam); outBillService.allSetPoint(taskParam);
return MesResponse.requestOk(); return MesResponse.requestOk();
@@ -427,9 +427,9 @@ public class MesToWmsServiceImpl implements MesToWmsService {
taskParam.put("task_code", dto.getTask_code()); taskParam.put("task_code", dto.getTask_code());
taskParam.put("ext_task_code", dto.getTask_code()); taskParam.put("ext_task_code", dto.getTask_code());
if (dto.getIsManual() != null && dto.getIsManual()) { if (dto.getIsManual() != null && dto.getIsManual()) {
taskParam.put("create_mode", "手动"); taskParam.put("create_mode", IOSEnum.CREATE_MODE.code("手动"));
} else { } else {
taskParam.put("create_mode", "自动"); taskParam.put("create_mode", IOSEnum.CREATE_MODE.code("外部接口产生"));
} }
outBillService.allSetPoint(taskParam); outBillService.allSetPoint(taskParam);
return MesResponse.requestOk(); return MesResponse.requestOk();
@@ -500,10 +500,10 @@ public class MesToWmsServiceImpl implements MesToWmsService {
JSONObject param = new JSONObject(); JSONObject param = new JSONObject();
if (dto.getIsManual() != null && dto.getIsManual()) { if (dto.getIsManual() != null && dto.getIsManual()) {
param.put("create_mode", "手动"); param.put("create_mode", IOSEnum.CREATE_MODE.code("手动"));
param.put("is_manual", true); param.put("is_manual", true);
} else { } else {
param.put("create_mode", "自动"); param.put("create_mode", IOSEnum.CREATE_MODE.code("外部接口产生"));
} }
//退料 //退料
param.put("ext_task_code", dto.getTask_code()); param.put("ext_task_code", dto.getTask_code());

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

@@ -187,7 +187,7 @@ public class BackInTask extends AbstractTask {
taskService.updateById(taskObj); taskService.updateById(taskObj);
//如果是自动的，回调MES接口，将task_code传给mes //如果是自动的，回调MES接口，将task_code传给mes
if ("自动".equals(taskObj.getCreate_mode())) { if (IOSEnum.CREATE_MODE.code("外部接口产生").equals(taskObj.getCreate_mode())) {
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
jsonObject.put("status", 200); jsonObject.put("status", 200);
jsonObject.put("message", "成功"); jsonObject.put("message", "成功");
@@ -215,7 +215,7 @@ public class BackInTask extends AbstractTask {
taskService.updateById(taskObj); taskService.updateById(taskObj);
//反馈到MES系统 //反馈到MES系统
if ("自动".equals(taskObj.getCreate_mode())) { if (IOSEnum.CREATE_MODE.code("外部接口产生").equals(taskObj.getCreate_mode())) {
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
jsonObject.put("status", 400); jsonObject.put("status", 400);
jsonObject.put("message", "任务被取消"); jsonObject.put("message", "任务被取消");

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

@@ -195,7 +195,7 @@ public class VehicleInTask extends AbstractTask {
taskService.updateById(taskObj); taskService.updateById(taskObj);
//如果是自动的，回调MES接口，将task_code传给mes //如果是自动的，回调MES接口，将task_code传给mes
if("自动".equals(taskObj.getCreate_mode())){ if(IOSEnum.CREATE_MODE.code("外部接口产生").equals(taskObj.getCreate_mode())){
JSONObject jsonObject=new JSONObject(); JSONObject jsonObject=new JSONObject();
jsonObject.put("status",200); jsonObject.put("status",200);
jsonObject.put("message","成功"); jsonObject.put("message","成功");
@@ -228,7 +228,7 @@ public class VehicleInTask extends AbstractTask {
iStructattrService.updateStatusByCode("2",unlock_map); iStructattrService.updateStatusByCode("2",unlock_map);
//反馈到MES系统 //反馈到MES系统
if("自动".equals(taskObj.getCreate_mode())){ if(IOSEnum.CREATE_MODE.code("外部接口产生").equals(taskObj.getCreate_mode())){
JSONObject jsonObject=new JSONObject(); JSONObject jsonObject=new JSONObject();
jsonObject.put("status",400); jsonObject.put("status",400);
jsonObject.put("message","任务被取消"); jsonObject.put("message","任务被取消");

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

@@ -269,7 +269,7 @@ public class DownEmptyUpFullTask extends AbstractTask {
// iMdPbGroupplateService.delete(Collections.singleton(taskObj.getGroup_id())); // iMdPbGroupplateService.delete(Collections.singleton(taskObj.getGroup_id()));
//反馈到MES系统 //反馈到MES系统
if("自动".equals(taskObj.getCreate_mode())){ if(IOSEnum.CREATE_MODE.code("外部接口产生").equals(taskObj.getCreate_mode())){
JSONObject jsonObject=new JSONObject(); JSONObject jsonObject=new JSONObject();
jsonObject.put("status",200); jsonObject.put("status",200);
jsonObject.put("message","成功"); jsonObject.put("message","成功");
@@ -342,7 +342,7 @@ public class DownEmptyUpFullTask extends AbstractTask {
taskService.updateById(taskObj); taskService.updateById(taskObj);
//反馈到MES系统 //反馈到MES系统
if("自动".equals(taskObj.getCreate_mode())){ if(IOSEnum.CREATE_MODE.code("外部接口产生").equals(taskObj.getCreate_mode())){
JSONObject jsonObject=new JSONObject(); JSONObject jsonObject=new JSONObject();
jsonObject.put("status",400); jsonObject.put("status",400);
jsonObject.put("message","任务被取消"); jsonObject.put("message","任务被取消");

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

@@ -195,7 +195,7 @@ public class SeparateMaterialTask extends AbstractTask {
// iMdPbGroupplateService.delete(Collections.singleton(taskObj.getGroup_id())); // iMdPbGroupplateService.delete(Collections.singleton(taskObj.getGroup_id()));
//反馈到MES系统 //反馈到MES系统
if("自动".equals(taskObj.getCreate_mode())){ if(IOSEnum.CREATE_MODE.code("外部接口产生").equals(taskObj.getCreate_mode())){
JSONObject jsonObject=new JSONObject(); JSONObject jsonObject=new JSONObject();
jsonObject.put("status",200); jsonObject.put("status",200);
jsonObject.put("message","成功"); jsonObject.put("message","成功");
@@ -268,7 +268,7 @@ public class SeparateMaterialTask extends AbstractTask {
taskService.updateById(taskObj); taskService.updateById(taskObj);
//反馈到MES系统 //反馈到MES系统
if("自动".equals(taskObj.getCreate_mode())){ if(IOSEnum.CREATE_MODE.code("外部接口产生").equals(taskObj.getCreate_mode())){
JSONObject jsonObject=new JSONObject(); JSONObject jsonObject=new JSONObject();
jsonObject.put("status",400); jsonObject.put("status",400);
jsonObject.put("message","任务被取消"); jsonObject.put("message","任务被取消");

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

@@ -45,7 +45,7 @@ public enum IOSEnum {
POINT_STATUS(MapOf.of("无货", "1", "空载具", "2" , "有货", "3" )), POINT_STATUS(MapOf.of("无货", "1", "空载具", "2" , "有货", "3" )),
// 单据创建类型 // 单据创建类型
CREATE_MODE(MapOf.of("PC产生", "1", "终端产生", "2", "外部接口产生", "3")), CREATE_MODE(MapOf.of("PC产生", "1", "终端产生", "2", "外部接口产生", "3", "手动", "4")),
// 移库单状态 // 移库单状态
MOVE_MST_STATUS(MapOf.of("生成", "10", "提交", "20", "执行中", "30", "完成", "99")), MOVE_MST_STATUS(MapOf.of("生成", "10", "提交", "20", "执行中", "30", "完成", "99")),