diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToWmsApiController.java b/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToWmsApiController.java index c0c06a3..be1c869 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToWmsApiController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToWmsApiController.java @@ -125,38 +125,50 @@ public class ToWmsApiController { @ResponseBody public AjaxResult saveBill(@RequestBody OutStockoutVo outStockoutVo) { String stockOutId = outStockoutService.saveBill(outStockoutVo); - return AjaxResult.success(stockOutId); + AjaxResult ajaxResult = AjaxResult.success(stockOutId); + RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(outStockoutVo), "出库单据保存", ajaxResult); + requestLogService.insertRequestLog(requestLog); + return ajaxResult; } /** * 接收物料 */ - @Log(title = "物料管理", businessType = BusinessType.INSERT) + @Log(title = "接收物料", businessType = BusinessType.INSERT) @PutMapping("/receiveProduct") public AjaxResult receiveProduct(@RequestBody ErpProduct erpProduct) { - return toWmsService.receiveProduct(erpProduct); + AjaxResult ajaxResult = toWmsService.receiveProduct(erpProduct); + RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(erpProduct), "接收物料", ajaxResult); + requestLogService.insertRequestLog(requestLog); + return ajaxResult; } /** * 修改物料管理 */ - @Log(title = "物料管理", businessType = BusinessType.UPDATE) + @Log(title = "修改物料管理", businessType = BusinessType.UPDATE) @PutMapping("/updateProduct") public AjaxResult updateProduct(@RequestBody ErpProduct erpProduct) { - return toWmsService.updateProduct(erpProduct); + AjaxResult ajaxResult = toWmsService.updateProduct(erpProduct); + RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(erpProduct), "修改物料管理", ajaxResult); + requestLogService.insertRequestLog(requestLog); + return ajaxResult; } /** * 作废物料 */ - @Log(title = "物料管理", businessType = BusinessType.UPDATE) + @Log(title = "作废物料", businessType = BusinessType.UPDATE) @PutMapping("/InvalidProduct") public AjaxResult InvalidProduct(@RequestBody ErpProduct erpProduct) { - return toWmsService.InvalidProduct(erpProduct); + AjaxResult ajaxResult = toWmsService.InvalidProduct(erpProduct); + RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(erpProduct), "作废物料", ajaxResult); + requestLogService.insertRequestLog(requestLog); + return ajaxResult; } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java index f1ebd1a..e2e4de3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java @@ -5,6 +5,7 @@ import cn.hutool.core.convert.Convert; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjUtil; import cn.hutool.core.util.StrUtil; +import cn.hutool.json.JSONUtil; import com.ruoyi.api.domain.*; import com.ruoyi.api.service.IToErpService; import com.ruoyi.api.service.IToWmsService; @@ -32,6 +33,7 @@ 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.log.service.IRequestLogService; import com.ruoyi.out.outStockout.service.IOutStockoutService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -81,6 +83,8 @@ public class ToWmsServiceImpl implements IToWmsService { private IInStockinDetailService inStockinDetailService; @Autowired private IBasRoadwayService basRoadwayService; + @Autowired + private IRequestLogService requestLogService; @Override