feat(api): 重构WCS和WMS接口服务并添加货位重量查询功能
- 新增BasCargoSpaceWeight实体类用于货位重量统计 - 在BasCargoSpaceMapper中添加selectPlatByWeight方法查询每排重量 - 实现selectPlatByWeight方法的SQL查询逻辑 - 在IBasCargoSpaceService中添加selectPlatByWeight接口 - 实现selectPlatByWeight服务方法用于分配重量平衡的货位 - 更新RequestLogService接口添加sourceSystem参数 - 在ToErpApiController中添加接口调用日志记录功能 - 在ToMesApiController中添加接口调用日志记录功能 - 重构ToWcsApiController添加任务完成、重新分配等接口 - 移除IToWmsService中已废弃的接口方法 - 移除PdaController中已废弃的addInJob方法 - 在ToWcsServiceImpl中实现货位分配和任务处理逻辑 - 添加RequestEnterResponse用于返回货位分配结果
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
package com.ruoyi.api.controller;
|
||||
|
||||
import cn.hutool.json.JSONUtil;
|
||||
import com.ruoyi.api.service.IToErpService;
|
||||
import com.ruoyi.api.service.IToMesService;
|
||||
import com.ruoyi.bas.BasCustomer.domain.BasCustomer;
|
||||
@@ -7,6 +8,8 @@ import com.ruoyi.bas.BasProduct.domain.BasProduct;
|
||||
import com.ruoyi.bas.BasSupplier.domain.BasSupplier;
|
||||
import com.ruoyi.common.core.domain.AjaxResult;
|
||||
import com.ruoyi.in.stockin.domain.vo.InstockInVo;
|
||||
import com.ruoyi.log.domain.RequestLog;
|
||||
import com.ruoyi.log.service.IRequestLogService;
|
||||
import com.ruoyi.out.outStockout.domain.OutStockoutVo;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
@@ -20,13 +23,18 @@ public class ToMesApiController {
|
||||
|
||||
@Autowired
|
||||
private IToMesService toMesService;
|
||||
@Autowired
|
||||
private IRequestLogService requestLogService;
|
||||
|
||||
/**
|
||||
* 接收物料信息
|
||||
*/
|
||||
@PostMapping("/receiveMaterial")
|
||||
public AjaxResult receiveMaterial(@RequestBody BasProduct basProduct) {
|
||||
return toMesService.receiveMaterial(basProduct);
|
||||
AjaxResult ajaxResult = toMesService.receiveMaterial(basProduct);
|
||||
RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(basProduct), "接收MES物料信息",ajaxResult,"MES");
|
||||
requestLogService.insertRequestLog(requestLog);
|
||||
return ajaxResult;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -34,7 +42,10 @@ public class ToMesApiController {
|
||||
*/
|
||||
@PostMapping("/receiveInBill")
|
||||
public AjaxResult receiveInBill(@RequestBody InstockInVo inStockinVo) {
|
||||
return toMesService.receiveInBill(inStockinVo);
|
||||
AjaxResult ajaxResult = toMesService.receiveInBill(inStockinVo);
|
||||
RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(inStockinVo), "接收MES入库单据信息",ajaxResult,"MES");
|
||||
requestLogService.insertRequestLog(requestLog);
|
||||
return ajaxResult;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -42,7 +53,10 @@ public class ToMesApiController {
|
||||
*/
|
||||
@PostMapping("/receiveOutBill")
|
||||
public AjaxResult receiveOutBill(@RequestBody OutStockoutVo outStockoutVo) {
|
||||
return toMesService.receiveOutBill(outStockoutVo);
|
||||
AjaxResult ajaxResult = toMesService.receiveOutBill(outStockoutVo);
|
||||
RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(outStockoutVo), "接收MES出库单据信息",ajaxResult,"MES");
|
||||
requestLogService.insertRequestLog(requestLog);
|
||||
return ajaxResult;
|
||||
}
|
||||
/**
|
||||
* 单据信息回传
|
||||
|
||||
Reference in New Issue
Block a user