chore: upload current WMS changes
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
package com.ruoyi.api.controller;
|
||||
|
||||
import cn.hutool.json.JSONObject;
|
||||
import cn.hutool.json.JSONUtil;
|
||||
import com.ruoyi.api.domain.ErpProduct;
|
||||
import com.ruoyi.api.domain.ReMaterialParam;
|
||||
@@ -11,6 +12,10 @@ import com.ruoyi.bas.BasProduct.service.IBasProductService;
|
||||
import com.ruoyi.common.annotation.Log;
|
||||
import com.ruoyi.common.core.domain.AjaxResult;
|
||||
import com.ruoyi.common.enums.BusinessType;
|
||||
import com.ruoyi.device.agv.domain.AgvContainerTask;
|
||||
import com.ruoyi.device.agv.service.IAgvContainerTaskService;
|
||||
import com.ruoyi.job.mydojob.domain.MydoJob;
|
||||
import com.ruoyi.job.mydojob.mapper.MydoJobMapper;
|
||||
import com.ruoyi.log.domain.RequestLog;
|
||||
import com.ruoyi.log.service.IRequestLogService;
|
||||
import com.ruoyi.out.outStockout.domain.OutStockoutVo;
|
||||
@@ -19,7 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.Map;
|
||||
import java.util.*;
|
||||
|
||||
/**
|
||||
* 作业统计 Controller
|
||||
@@ -36,6 +41,10 @@ public class ToWmsApiController {
|
||||
private IOutStockoutService outStockoutService;
|
||||
@Autowired
|
||||
private IBasProductService basProductService;
|
||||
@Autowired
|
||||
private MydoJobMapper mapper;
|
||||
@Autowired
|
||||
private IAgvContainerTaskService agvContainerTaskService;
|
||||
|
||||
/**
|
||||
* 入库请求生成作业
|
||||
@@ -43,18 +52,50 @@ public class ToWmsApiController {
|
||||
@PostMapping("/requestEnterByTrayCode")
|
||||
public AjaxResult requestEnterByTrayCode(@RequestBody RequestEnter requestEnter) {
|
||||
AjaxResult ajaxResult = toWmsService.requestEnterByTrayCode(requestEnter);
|
||||
RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(requestEnter), "入库任务创建请求",ajaxResult);
|
||||
RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(requestEnter), "入库任务创建请求", ajaxResult);
|
||||
requestLogService.insertRequestLog(requestLog);
|
||||
return ajaxResult;
|
||||
}
|
||||
|
||||
// 入库分货位
|
||||
@PostMapping("/sendCargoSpace")
|
||||
public AjaxResult sendCargoSpace(@RequestBody RequestEnter requestEnter) {
|
||||
AjaxResult ajaxResult = toWmsService.requestEnterByTaskNo(requestEnter);
|
||||
RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(requestEnter), "入库请求分配货位", ajaxResult);
|
||||
requestLogService.insertRequestLog(requestLog);
|
||||
return ajaxResult;
|
||||
}
|
||||
|
||||
|
||||
// 出库到位更新LED显示屏
|
||||
@PostMapping("/updateLed")
|
||||
public AjaxResult updateLed(@RequestBody RequestEnter requestEnter) {
|
||||
HashMap<String, Object> map = new HashMap<>();
|
||||
map.put("v_task_no", requestEnter.getTaskNo());
|
||||
map.put("v_code", requestEnter.getDeviceCode());
|
||||
mapper.updateLed(map);
|
||||
return AjaxResult.success();
|
||||
}
|
||||
|
||||
|
||||
// 线体报警更新报警信息
|
||||
@PostMapping("/updateLedError")
|
||||
public AjaxResult updateLedError(@RequestBody RequestEnter requestEnter) {
|
||||
HashMap<String, Object> map = new HashMap<>();
|
||||
map.put("v_code", requestEnter.getDeviceCode());
|
||||
map.put("v_error_code", requestEnter.getErrorCode());
|
||||
mapper.updateLedError(map);
|
||||
return AjaxResult.success();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 请求补码作业
|
||||
*/
|
||||
@RequestMapping("/requestByNoTrayCode")
|
||||
public AjaxResult requestByNoTrayCode(@RequestBody RequestEnter requestEnter) {
|
||||
AjaxResult ajaxResult = toWmsService.selectMydoJobByEntranceId(requestEnter);
|
||||
RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(requestEnter), "请求补码作业",ajaxResult);
|
||||
RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(requestEnter), "请求补码作业", ajaxResult);
|
||||
requestLogService.insertRequestLog(requestLog);
|
||||
return ajaxResult;
|
||||
}
|
||||
@@ -65,7 +106,7 @@ public class ToWmsApiController {
|
||||
@RequestMapping("/requestEnterByTrayCodeAndEntranceId")
|
||||
public AjaxResult requestEnterByTrayCodeAndEntranceId(@RequestBody RequestEnter requestEnter) {
|
||||
AjaxResult ajaxResult = toWmsService.requestEnterByTrayCodeAndEntranceId(requestEnter);
|
||||
RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(requestEnter), "获取入库作业",ajaxResult);
|
||||
RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(requestEnter), "获取入库作业", ajaxResult);
|
||||
requestLogService.insertRequestLog(requestLog);
|
||||
return ajaxResult;
|
||||
}
|
||||
@@ -74,18 +115,17 @@ public class ToWmsApiController {
|
||||
/**
|
||||
* 入库、出库 任务完成回传
|
||||
* Map<String, String>
|
||||
* "wmsType": "任务类型" 1-入库 2-出库 3-agv搬运,
|
||||
* taskNo：出库 入库任务号
|
||||
* trayCode:托盘码
|
||||
* positionCode1：起点
|
||||
* positionCode2：终点
|
||||
* containerCode：容器编码
|
||||
*
|
||||
* "wmsType": "任务类型" 1-入库 2-出库 3-agv搬运,
|
||||
* taskNo：出库 入库任务号
|
||||
* trayCode:托盘码
|
||||
* positionCode1：起点
|
||||
* positionCode2：终点
|
||||
* containerCode：容器编码
|
||||
*/
|
||||
@PostMapping("/jobFinish")
|
||||
public AjaxResult jobFinish(@RequestBody WmsJobRequest wmsJobRequest) {
|
||||
AjaxResult ajaxResult = toWmsService.jobFinish(wmsJobRequest);
|
||||
RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(wmsJobRequest), "jobFinish",ajaxResult);
|
||||
RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(wmsJobRequest), "jobFinish", ajaxResult);
|
||||
requestLogService.insertRequestLog(requestLog);
|
||||
return ajaxResult;
|
||||
}
|
||||
@@ -96,7 +136,7 @@ public class ToWmsApiController {
|
||||
@PostMapping("/reAssign")
|
||||
public AjaxResult reAssign(@RequestBody ReMaterialParam reMaterialParam) {
|
||||
AjaxResult ajaxResult = toWmsService.reAssign(reMaterialParam);
|
||||
RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(reMaterialParam), "reAssign",ajaxResult);
|
||||
RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(reMaterialParam), "reAssign", ajaxResult);
|
||||
requestLogService.insertRequestLog(requestLog);
|
||||
return ajaxResult;
|
||||
}
|
||||
@@ -107,13 +147,12 @@ public class ToWmsApiController {
|
||||
@PostMapping("/reMaterial")
|
||||
public AjaxResult reMaterial(@RequestBody ReMaterialParam reMaterialParam) {
|
||||
AjaxResult ajaxResult = toWmsService.reMaterial(reMaterialParam);
|
||||
RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(reMaterialParam), "reMaterial",ajaxResult);
|
||||
RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(reMaterialParam), "reMaterial", ajaxResult);
|
||||
requestLogService.insertRequestLog(requestLog);
|
||||
return ajaxResult;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 出库单据保存
|
||||
*
|
||||
@@ -137,8 +176,7 @@ public class ToWmsApiController {
|
||||
*/
|
||||
@Log(title = "接收物料", businessType = BusinessType.INSERT)
|
||||
@PutMapping("/receiveProduct")
|
||||
public AjaxResult receiveProduct(@RequestBody ErpProduct erpProduct)
|
||||
{
|
||||
public AjaxResult receiveProduct(@RequestBody ErpProduct erpProduct) {
|
||||
AjaxResult ajaxResult = toWmsService.receiveProduct(erpProduct);
|
||||
RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(erpProduct), "接收物料", ajaxResult);
|
||||
requestLogService.insertRequestLog(requestLog);
|
||||
@@ -150,8 +188,7 @@ public class ToWmsApiController {
|
||||
*/
|
||||
@Log(title = "修改物料管理", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/updateProduct")
|
||||
public AjaxResult updateProduct(@RequestBody ErpProduct erpProduct)
|
||||
{
|
||||
public AjaxResult updateProduct(@RequestBody ErpProduct erpProduct) {
|
||||
AjaxResult ajaxResult = toWmsService.updateProduct(erpProduct);
|
||||
RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(erpProduct), "修改物料管理", ajaxResult);
|
||||
requestLogService.insertRequestLog(requestLog);
|
||||
@@ -163,12 +200,76 @@ public class ToWmsApiController {
|
||||
*/
|
||||
@Log(title = "作废物料", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/InvalidProduct")
|
||||
public AjaxResult InvalidProduct(@RequestBody ErpProduct erpProduct)
|
||||
{
|
||||
public AjaxResult InvalidProduct(@RequestBody ErpProduct erpProduct) {
|
||||
AjaxResult ajaxResult = toWmsService.InvalidProduct(erpProduct);
|
||||
RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(erpProduct), "作废物料", ajaxResult);
|
||||
requestLogService.insertRequestLog(requestLog);
|
||||
return ajaxResult;
|
||||
}
|
||||
|
||||
/**
|
||||
* 请求AGV执行队列
|
||||
*/
|
||||
// @Log(title = "请求未下发的AGV执行队列", businessType = BusinessType.OTHER)
|
||||
@RequestMapping("/queryAgvQuene")
|
||||
public AjaxResult queryAgvQuene() {
|
||||
AgvContainerTask agvContainerTask = new AgvContainerTask();
|
||||
agvContainerTask.setStatus("0");
|
||||
List<AgvContainerTask> agvContainerTasks = agvContainerTaskService.selectAgvContainerTaskList(agvContainerTask);
|
||||
RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(""), "请求未下发的AGV执行队列", AjaxResult.success(agvContainerTasks));
|
||||
requestLogService.insertRequestLog(requestLog);
|
||||
if (agvContainerTasks != null && agvContainerTasks.size() > 0) {
|
||||
for (AgvContainerTask containerTask : agvContainerTasks) {
|
||||
containerTask.setStatus("1");
|
||||
agvContainerTaskService.updateAgvContainerTask(containerTask);
|
||||
}
|
||||
return AjaxResult.success(agvContainerTasks.get(0));
|
||||
} else {
|
||||
return AjaxResult.error("无队列");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 请求AGV执行队列
|
||||
*/
|
||||
@Log(title = "完成AGV执行队列", businessType = BusinessType.UPDATE)
|
||||
@RequestMapping("/finishAgvQuene")
|
||||
public AjaxResult finishAgvQuene(@RequestBody JSONObject jsonObject) {
|
||||
String order = (String) jsonObject.get("order");
|
||||
agvContainerTaskService.deleteAgvJobByOrder(order);
|
||||
return AjaxResult.success();
|
||||
|
||||
}
|
||||
|
||||
|
||||
@Log(title = "自动生成Agv搬运队列到线边", businessType = BusinessType.INSERT)
|
||||
@PutMapping("/insertAgvQuene")
|
||||
public AjaxResult insertAgvQuene(@RequestBody WmsJobRequest wmsJobRequest) {
|
||||
String taskNo = wmsJobRequest.getTaskNo();// 到位任务号
|
||||
String code = wmsJobRequest.getCode();// 线体号
|
||||
AgvContainerTask agvContainerTask = new AgvContainerTask();
|
||||
agvContainerTask.setTaskNo(taskNo);
|
||||
List<AgvContainerTask> agvContainerTasks = agvContainerTaskService.selectAgvContainerTaskList(agvContainerTask);
|
||||
if (Objects.isNull(agvContainerTasks)) {
|
||||
MydoJob mydoJob = new MydoJob();
|
||||
mydoJob.setTaskNo(taskNo);
|
||||
List<MydoJob> mydoJobs = mapper.selectMydoJobList(mydoJob);
|
||||
AgvContainerTask agvContainerTask1 = new AgvContainerTask();
|
||||
agvContainerTask1.setContainer(UUID.randomUUID().toString());
|
||||
agvContainerTask1.setTaskNo(taskNo);
|
||||
agvContainerTask1.setStartPoint(code);
|
||||
agvContainerTask1.setEndPoint(mydoJobs.get(0).getEndPoint());//TODO 需要修改
|
||||
agvContainerTask1.setSpare2(mydoJobs.get(0).getTrayCode());
|
||||
// 10缓存区到线边 11立库到线边 12 立库到缓存区 13 缓存到立库
|
||||
agvContainerTask1.setSpare1("11");
|
||||
agvContainerTask1.setStatus("0");
|
||||
agvContainerTaskService.insertAgvContainerTask(agvContainerTask1);
|
||||
}
|
||||
RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(wmsJobRequest), "自动生成Agv搬运队列到线边", AjaxResult.success());
|
||||
requestLogService.insertRequestLog(requestLog);
|
||||
return AjaxResult.success();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user