lsy/FT568-WCS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化调整

Browse Source
This commit is contained in:
lsymicc
2026-04-14 13:36:17 +08:00
parent a490dd0d9a
commit fe52fb7cd7
28 changed files with 401 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/java/com/ruoyi/api/domain/wcs2wms/taskFinish/taskFinishReceive.java → ruoyi-admin/src/main/java/com/ruoyi/api/domain/wcs2wms/taskFinish/TaskFinishReceive.java
View File

@@ -16,7 +16,7 @@ import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@NoArgsConstructor
public class taskFinishReceive {
public class TaskFinishReceive {
/**
* 任务类型（必填）

40
ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java
View File

@@ -19,7 +19,6 @@ import com.ruoyi.api.domain.agv.genAgvSchedulingTask.PositionCodeData;
import com.ruoyi.api.domain.wcs2wms.JobParam;
import com.ruoyi.api.domain.wcs2wms.ReceiveJob;
import com.ruoyi.api.domain.wcs2wms.ResponseResult;
import com.ruoyi.api.domain.wcs2wms.exception.TaskExceptionReceive;
import com.ruoyi.api.domain.wcs2wms.exception.TaskExceptionRequest;
import com.ruoyi.api.domain.wcs2wms.stockout.StockoutReceive;
import com.ruoyi.api.service.IApiService;
@@ -45,7 +44,6 @@ import java.util.Map;
import static com.ruoyi.common.Constant.*;
import static com.ruoyi.common.TaskStatusCode.TASK_EP_CREATE;
import static com.ruoyi.common.TaskStatusCode.TASK_EP_ROADWAY_SSJ;
/**
* 接口记录Service业务层处理
@@ -65,8 +63,6 @@ public class ApiServiceImpl implements IApiService {
private IMydoJobService mydoJobService;
@Autowired
private IWcsPortService wcsPortService;
@Autowired
private IBasCargoSpaceService basCargoSpaceService;
@@ -448,6 +444,7 @@ public class ApiServiceImpl implements IApiService {
}
}
/**
* @@@ FT568 请求wms获取入库任务参数 - 适应wms的自定义请求响应格式
* @param param
@@ -607,38 +604,21 @@ public class ApiServiceImpl implements IApiService {
@Override
public AjaxResult updateWcsPort(WcsPort wcsPort) {
int i = wcsPortService.updateWcsPort(wcsPort);
if(i>0){
if(i > 0){
return AjaxResult.success();
}else{
return AjaxResult.error();
}
}
//// @PostConstruct
// void qwe() {
// HashMap<String, Object> map = new HashMap<>();
// map.put("v_param", "RK");
// mydoJobService.getJobId(map);
// String s = map.get("v_serial").toString();
// System.out.println(s);
//
//
// map.put("v_param", "CK");
// mydoJobService.getJobId(map);
// s = map.get("v_serial").toString();
// System.out.println(s);
//
// map.put("v_param", "2");
// mydoJobService.getTaskNo(map);
// s = map.get("v_serial").toString();
// System.out.println(s);
//
// map.put("v_param", "3");
// mydoJobService.getTaskNo(map);
// s = map.get("v_serial").toString();
// System.out.println(s);
//
// }
@PostConstruct
void qwe() {
// LambdaQueryWrapper<MydoJob> queryWrapper = new LambdaQueryWrapper<>();
// queryWrapper.eq(MydoJob::getTaskNo,"6666");
// MydoJob mydoJob = mydoJobMapper.selectOne(queryWrapper);
}
}