lhq/FT541-WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: 现场代码修改

Browse Source
This commit is contained in:
刘汗青
2026-06-02 08:50:12 +08:00
parent 37bcc00df4
commit 4562dbaab0
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToWcsApiController.java
View File

@@ -10,6 +10,7 @@ import com.ruoyi.api.service.IToWmsService;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.log.domain.RequestLog; import com.ruoyi.log.domain.RequestLog;
import com.ruoyi.log.service.IRequestLogService; import com.ruoyi.log.service.IRequestLogService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
@@ -21,6 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
*/ */
@RestController @RestController
@RequestMapping("/api2wcs") @RequestMapping("/api2wcs")
@Slf4j
public class ToWcsApiController { public class ToWcsApiController {
@@ -38,6 +40,7 @@ public class ToWcsApiController {
@RequestMapping("/requestEnterByTrayCodeAndEntranceId") @RequestMapping("/requestEnterByTrayCodeAndEntranceId")
public AjaxResult requestEnterByTrayCodeAndEntranceId(@RequestBody RequestEnter requestEnter) { public AjaxResult requestEnterByTrayCodeAndEntranceId(@RequestBody RequestEnter requestEnter) {
AjaxResult ajaxResult = toWcsService.requestEnterByTrayCodeAndEntranceId(requestEnter); AjaxResult ajaxResult = toWcsService.requestEnterByTrayCodeAndEntranceId(requestEnter);
log.info("获取作业详情：{}",ajaxResult);
RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(requestEnter), "获取入库作业",ajaxResult,"WCS"); RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(requestEnter), "获取入库作业",ajaxResult,"WCS");
requestLogService.insertRequestLog(requestLog); requestLogService.insertRequestLog(requestLog);
return ajaxResult; return ajaxResult;

13
ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java
View File

@@ -49,20 +49,9 @@ public class ToWcsServiceImpl implements IToWcsService {
@Autowired @Autowired
private IMydoJobService mydoJobService; private IMydoJobService mydoJobService;
@Autowired @Autowired
private IMydoJobDetailService mydoJobDetailService;
@Autowired
private IBasCargoSpaceService basCargoSpaceService; private IBasCargoSpaceService basCargoSpaceService;
@Autowired @Autowired
private IOutStockoutService outStockoutService;
@Autowired
private PdaService pdaService;
@Autowired
private PdaMapper pdaMapper; private PdaMapper pdaMapper;
@Autowired
private IBasStockService basStockService;
@Autowired
private IOutStockoutDetailService outStockoutDetailService;
@Autowired @Autowired
private IBasCargoSpaceWeightRuleService basCargoSpaceWeightRuleService; private IBasCargoSpaceWeightRuleService basCargoSpaceWeightRuleService;
@@ -184,7 +173,7 @@ public class ToWcsServiceImpl implements IToWcsService {
return AjaxResult.error("托盘参数不能为空"); return AjaxResult.error("托盘参数不能为空");
} }
log.info("扫码内容{}，入库高度{}", requestEnter.getTrayCode(), requestEnter.getHeight()); log.info("仓库[{}],巷道[{}],扫码内容[{}],入库高度[{}],入库重量[{}]",requestEnter.getWarehouseId(),requestEnter.getRoadwayId(), requestEnter.getTrayCode(), requestEnter.getHeight(),requestEnter.getWeight());
MydoJob param = new MydoJob(); MydoJob param = new MydoJob();
param.setStatus("1"); param.setStatus("1");