754f55b883
- 新增BasCargoSpaceWeight实体类用于货位重量统计 - 在BasCargoSpaceMapper中添加selectPlatByWeight方法查询每排重量 - 实现selectPlatByWeight方法的SQL查询逻辑 - 在IBasCargoSpaceService中添加selectPlatByWeight接口 - 实现selectPlatByWeight服务方法用于分配重量平衡的货位 - 更新RequestLogService接口添加sourceSystem参数 - 在ToErpApiController中添加接口调用日志记录功能 - 在ToMesApiController中添加接口调用日志记录功能 - 重构ToWcsApiController添加任务完成、重新分配等接口 - 移除IToWmsService中已废弃的接口方法 - 移除PdaController中已废弃的addInJob方法 - 在ToWcsServiceImpl中实现货位分配和任务处理逻辑 - 添加RequestEnterResponse用于返回货位分配结果
147 lines
4.7 KiB
Java
147 lines
4.7 KiB
Java
package com.ruoyi.pda.controller;
|
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
import com.ruoyi.api.domain.RequestEnter;
|
|
import com.ruoyi.bas.cargoSpace.domain.BasCargoSpace;
|
|
import com.ruoyi.bas.cargoSpace.service.IBasCargoSpaceService;
|
|
import com.ruoyi.bas.container.domain.BasContainer;
|
|
import com.ruoyi.bas.warehouse.domain.BasWarehouse;
|
|
import com.ruoyi.bas.warehouse.service.IBasWarehouseService;
|
|
import com.ruoyi.common.annotation.Log;
|
|
import com.ruoyi.common.core.controller.BaseController;
|
|
import com.ruoyi.common.core.domain.AjaxResult;
|
|
import com.ruoyi.common.core.domain.entity.SysDictData;
|
|
import com.ruoyi.common.enums.BusinessType;
|
|
import com.ruoyi.common.utils.MessageUtils;
|
|
import com.ruoyi.in.stockin.domain.InStockin;
|
|
import com.ruoyi.in.stockin.service.IInStockinService;
|
|
import com.ruoyi.in.stockindetail.domain.InStockinDetail;
|
|
import com.ruoyi.in.stockindetail.service.IInStockinDetailService;
|
|
import com.ruoyi.job.mydojob.domain.MydoJob;
|
|
import com.ruoyi.job.mydojob.service.IMydoJobService;
|
|
import com.ruoyi.job.mydojobdetail.domain.MydoJobDetail;
|
|
import com.ruoyi.job.mydojobdetail.service.IMydoJobDetailService;
|
|
import com.ruoyi.out.outStockout.domain.OutStockout;
|
|
import com.ruoyi.out.outStockout.service.IOutStockoutService;
|
|
import com.ruoyi.pda.domain.TrayCodeMakeSure;
|
|
import com.ruoyi.pda.domain.TrayCodeMsg;
|
|
import com.ruoyi.pda.service.PdaService;
|
|
import com.ruoyi.pda.trayMsg.domain.TrayMsg;
|
|
import com.ruoyi.pda.trayMsg.service.ITrayMsgService;
|
|
import com.ruoyi.stock.stock.domain.BasStock;
|
|
import com.ruoyi.stock.stock.service.IBasStockService;
|
|
import com.ruoyi.system.service.ISysDictTypeService;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.security.access.prepost.PreAuthorize;
|
|
import org.springframework.stereotype.Controller;
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
import java.util.ArrayList;
|
|
import java.util.Arrays;
|
|
import java.util.List;
|
|
|
|
@Controller
|
|
@RequestMapping("/pda")
|
|
@Slf4j
|
|
public class PdaController extends BaseController {
|
|
|
|
@Autowired
|
|
private PdaService pdaService;
|
|
|
|
|
|
|
|
@RequestMapping("/selectDetailByTray")
|
|
@ResponseBody
|
|
public AjaxResult selectDetailByTray(@RequestBody TrayCodeMakeSure trayCodeMakeSure) {
|
|
return pdaService.selectDetailByTray(trayCodeMakeSure);
|
|
}
|
|
|
|
@RequestMapping("/selectDetailByPDTray")
|
|
@ResponseBody
|
|
public AjaxResult selectDetailByPDTray(@RequestBody TrayCodeMakeSure trayCodeMakeSure) {
|
|
return pdaService.selectDetailByPDTray(trayCodeMakeSure);
|
|
}
|
|
|
|
|
|
/**
|
|
* 出库确认
|
|
*
|
|
* @param trayCodeMakeSure 托盘信息
|
|
* @return
|
|
*/
|
|
@PreAuthorize("@ss.hasPermi('pda:out:outMakeSure')")
|
|
@PostMapping("/outMakeSure")
|
|
@Log(title = "手持机出库确认", businessType = BusinessType.INSERT)
|
|
@ResponseBody
|
|
public AjaxResult outMakeSure(@RequestBody TrayCodeMakeSure trayCodeMakeSure) {
|
|
return pdaService.outMakeSure(trayCodeMakeSure);
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
* 盘点出库确认
|
|
* @param trayCodeMakeSure 托盘信息
|
|
* @return
|
|
*/
|
|
@PreAuthorize("@ss.hasPermi('pda:check:checkMakeSure')")
|
|
@PostMapping("/checkMakeSure")
|
|
@Log(title = "手持机盘点出库确认", businessType = BusinessType.INSERT)
|
|
@ResponseBody
|
|
public AjaxResult checkMakeSure(@RequestBody TrayCodeMakeSure trayCodeMakeSure) {
|
|
return pdaService.checkMakeSure(trayCodeMakeSure);
|
|
}
|
|
|
|
/**
|
|
* 入库绑盘
|
|
*/
|
|
@RequestMapping("/bindTrayMsg")
|
|
@Log(title = "手持机物料绑定", businessType = BusinessType.INSERT)
|
|
@ResponseBody
|
|
public AjaxResult bindMsg(@RequestBody TrayCodeMsg trayCodeMsg) {
|
|
return pdaService.bindMsg(trayCodeMsg);
|
|
}
|
|
|
|
@RequestMapping("/trayMsg")
|
|
@ResponseBody
|
|
public AjaxResult trayMsg(TrayMsg trayMsg) {
|
|
return pdaService.selectBindTrayMsg(trayMsg);
|
|
}
|
|
|
|
@RequestMapping("/selectStockinDetail")
|
|
@ResponseBody
|
|
public AjaxResult selectStockinDetail(String stockinDetailId) {
|
|
return pdaService.selectStockinDetail(stockinDetailId);
|
|
}
|
|
/**
|
|
* 确认入库
|
|
*/
|
|
@RequestMapping("/rkSure")
|
|
@ResponseBody
|
|
public AjaxResult rkSure(@RequestBody TrayCodeMsg trayCodeMsg) {
|
|
return pdaService.rkSure(trayCodeMsg);
|
|
}
|
|
|
|
@RequestMapping("/rkSurepk")
|
|
@ResponseBody
|
|
public AjaxResult rkSurepk(@RequestBody TrayCodeMsg trayCodeMsg) {
|
|
return pdaService.rkSurepk(trayCodeMsg);
|
|
}
|
|
|
|
@RequestMapping("/ktpout")
|
|
@ResponseBody
|
|
public AjaxResult ktpout(@RequestBody TrayCodeMsg trayCodeMsg) {
|
|
return pdaService.ktpout(trayCodeMsg);
|
|
}
|
|
|
|
|
|
@RequestMapping("/ktpin")
|
|
@ResponseBody
|
|
public AjaxResult ktpin(@RequestBody TrayCodeMsg trayCodeMsg) {
|
|
return pdaService.ktpin(trayCodeMsg);
|
|
}
|
|
|
|
}
|
|
|