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

现场调试更改

Browse Source
This commit is contained in:
lsymicc
2026-09-08 22:20:47 +08:00
parent 5353351520
commit 7c3ee78d41
140 changed files with 4488 additions and 4311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
ruoyi-admin/src/main/java/com/ruoyi/api/controller/WcsServiceController.java
View File

@@ -2,10 +2,9 @@ package com.ruoyi.api.controller;
import cn.hutool.json.JSONUtil;
import com.ruoyi.api.service.ApiWcsService;
import com.ruoyi.apiService.domain.ReMaterialParam;
import com.ruoyi.apiService.domain.WmsJobRequest;
import com.ruoyi.apiService.domain.wcs.WcsStockinReceive;
import com.ruoyi.api.domain.wcsJobHandle.WmsJobHandler;
import com.ruoyi.api.domain.wcsStockin.WcsStockinReceive;
import com.ruoyi.api.service.impl.ApiWcsService;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.log.domain.RequestLog;
@@ -33,7 +32,7 @@ public class WcsServiceController extends BaseController {
@PostMapping("/requestMydoJobByTrayCode")
public AjaxResult requestEnterByTrayCode(@RequestBody WcsStockinReceive wcsStockinReiceive) {
AjaxResult ajaxResult = apiWcsService.requestMydoJobByTrayCode(wcsStockinReiceive);
RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(wcsStockinReiceive), "入库任务创建请求",ajaxResult);
RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(wcsStockinReiceive), "创建入库任务请求", ajaxResult);
requestLogService.insertRequestLog(requestLog);
return ajaxResult;
}
@@ -61,9 +60,9 @@ public class WcsServiceController extends BaseController {
*
*/
@PostMapping("/jobFinish")
public AjaxResult jobFinish(@RequestBody WmsJobRequest wmsJobRequest) {
AjaxResult ajaxResult = apiWcsService.jobFinish(wmsJobRequest);
RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(wmsJobRequest), "wcs任务回传",ajaxResult);
public AjaxResult jobFinish(@RequestBody WmsJobHandler wmsJobHandler) {
AjaxResult ajaxResult = apiWcsService.jobFinish(wmsJobHandler);
RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(wmsJobHandler), "wcs任务回传",ajaxResult);
requestLogService.insertRequestLog(requestLog);
return ajaxResult;
}
@@ -72,9 +71,9 @@ public class WcsServiceController extends BaseController {
* 放货有货，重新分配货位
*/
@PostMapping("/reAssign")
public AjaxResult reAssign(@RequestBody ReMaterialParam reMaterialParam) {
AjaxResult ajaxResult = apiWcsService.reAssign(reMaterialParam);
RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(reMaterialParam), "入库重分货位",ajaxResult);
public AjaxResult reAssign(@RequestBody WmsJobHandler wmsJobHandler) {
AjaxResult ajaxResult = apiWcsService.reAssign(wmsJobHandler);
RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(wmsJobHandler), "入库重分货位",ajaxResult);
requestLogService.insertRequestLog(requestLog);
return ajaxResult;
}
@@ -83,9 +82,9 @@ public class WcsServiceController extends BaseController {
* 取货无货，重新分配物料
*/
@PostMapping("/reMaterial")
public AjaxResult reMaterial(@RequestBody ReMaterialParam reMaterialParam) {
AjaxResult ajaxResult = apiWcsService.reMaterial(reMaterialParam);
RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(reMaterialParam), "取货无货重分物料",ajaxResult);
public AjaxResult reMaterial(@RequestBody WmsJobHandler wmsJobHandler) {
AjaxResult ajaxResult = apiWcsService.reMaterial(wmsJobHandler);
RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(wmsJobHandler), "取货无货重分物料",ajaxResult);
requestLogService.insertRequestLog(requestLog);
return ajaxResult;
}