diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsController.java index 9e4c4c4e..b59caa40 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsController.java @@ -1,6 +1,7 @@ package com.ruoyi.web.controller.app; import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import com.ruoyi.app.domain.*; import com.ruoyi.app.domain.DTO.PmsStockInCompleteReq; import com.ruoyi.app.service.*; @@ -58,7 +59,7 @@ public class AppPmsController extends BaseController { @Log(title = "手动入库单请求", skipAuth = true) @PostMapping("/orderInList") public AjaxResult manualOrderIn(@RequestBody List orderInRequestList) { - logger.info("手动入库单请求:{}", orderInRequestList); + logger.info("手动入库单请求:{}", JSONObject.toJSONString(orderInRequestList)); // TODO // 判断数据是否缺失 String orderId= OrderCodeFactory.getOrderCode("RK", ""); @@ -73,15 +74,16 @@ public class AppPmsController extends BaseController { BeanUtils.copyProperties(orderInRequest, appPmsOrderIn); appPmsOrderIn.setId(OrderCodeFactory.getOrderCode("","")); appPmsOrderIn.setListId(orderId); - appPmsOrderIn.setOrderType(9); + appPmsOrderIn.setOrderType(orderInRequest.getOrderType()); appPmsOrderIn.setGoodsNum(BigDecimal.valueOf(orderInRequest.getGoodsNum())); appPmsOrderIn.setUsedNum(BigDecimal.ZERO); appPmsOrderIn.setRemainingNum(BigDecimal.valueOf(orderInRequest.getGoodsNum())); appPmsOrderIn.setOrderStatus(0); + appPmsOrderIn.setGoodsCode(orderInRequest.getGoodsCode()); appPmsOrderIn.setCreateTime(new Date()); appPmsOrderIn.setUpdateTime(new Date()); appPmsOrderIn.setCreateBy(getUsername()); - + appPmsOrderIn.setRemark("手动入库通知"); appPmsOrderInService.insertAppPmsOrderIn(appPmsOrderIn); }