From e80b425a12f6c69738a37b60d899f3eb51c440c5 Mon Sep 17 00:00:00 2001 From: wangziyangyang <707231019@qq.com> Date: Wed, 1 Jul 2020 17:47:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8F=91=E7=94=9F=E4=BA=A7=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/controller/SpOrderController.java | 112 +++++++++++++++++- 1 file changed, 107 insertions(+), 5 deletions(-) diff --git a/mes/src/main/java/com/wangziyang/mes/order/controller/SpOrderController.java b/mes/src/main/java/com/wangziyang/mes/order/controller/SpOrderController.java index 06a0f60..aca7b4e 100644 --- a/mes/src/main/java/com/wangziyang/mes/order/controller/SpOrderController.java +++ b/mes/src/main/java/com/wangziyang/mes/order/controller/SpOrderController.java @@ -1,21 +1,123 @@ package com.wangziyang.mes.order.controller; -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.stereotype.Controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.wangziyang.mes.basedata.entity.SpMaterile; +import com.wangziyang.mes.basedata.entity.SpTableManager; +import com.wangziyang.mes.basedata.request.spMaterileReq; import com.wangziyang.mes.common.BaseController; +import com.wangziyang.mes.common.Result; +import com.wangziyang.mes.order.entity.SpOrder; +import com.wangziyang.mes.order.service.ISpOrderService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; /** *

- * 前端控制器 + * 前端控制器 *

* * @author WangZiYang * @since 2020-07-01 */ @Controller -@RequestMapping("/order/sp-order") +@RequestMapping("/order/release") public class SpOrderController extends BaseController { + @Autowired + private ISpOrderService iSpOrderService; + + /** + * 生产订单管理界面 + * + * @param model 模型 + * @return 生产订单管理界面 + */ + @ApiOperation("生产订单管理界面界面UI") + @ApiImplicitParams({@ApiImplicitParam(name = "model", value = "模型", defaultValue = "模型")}) + @GetMapping("/list-ui") + public String listUI(Model model) { + return "/order/production/list"; + } + + /** + * 生产订单修改界面 + * + * @param model 模型 + * @param record 平台表对象 + * @return 更改界面 + */ + @ApiOperation("生产订单修改界面") + @GetMapping("/add-or-update-ui") + public String addOrUpdateUI(Model model, SpTableManager record) { + if (StringUtils.isNotEmpty(record.getId())) { + SpOrder spOrder = iSpOrderService.getById(record.getId()); + model.addAttribute("result", spOrder); + } + return "/order/production/addOrUpdate"; + } + + + /** + * 生产订单界面分页查询 + * + * @param req 请求参数 + * @return Result 执行结果 + */ + @ApiOperation("生产订单界界面分页查询") + @ApiImplicitParams({@ApiImplicitParam(name = "req", value = "请求参数", defaultValue = "请求参数")}) + @PostMapping("/page") + @ResponseBody + public Result page(spMaterileReq req) { + QueryWrapper queryWrapper = new QueryWrapper(); + if (StringUtils.isNotEmpty(req.getMaterielLike())) { + queryWrapper.like("materiel", req.getMaterielLike()); + } + if (StringUtils.isNotEmpty(req.getMaterielDescLike())) { + queryWrapper.like("materiel_desc", req.getMaterielDescLike()); + } + IPage result = iSpOrderService.page(req, queryWrapper); + return Result.success(result); + } + + /** + * 生产订单界修改、新增 + * + * @param record 物料实体类 + * @return 执行结果 + */ + @ApiOperation("生产订单界修改、新增") + @PostMapping("/add-or-update") + @ResponseBody + public Result addOrUpdate(SpMaterile record) { + SpOrder spOrder = iSpOrderService.getById(record.getFlowId()); + iSpOrderService.saveOrUpdate(spOrder); + return Result.success(); + } + + + /** + * 删除生产订单界 + * + * @param req 请求参数 + * @return Result 执行结果 + */ + @ApiOperation("删除生产订单界") + @ApiImplicitParams({@ApiImplicitParam(name = "req", value = "物料实体", defaultValue = "物料实体")}) + @PostMapping("/delete") + @ResponseBody + public Result deleteByTableNameId(SpMaterile req) throws Exception { + iSpOrderService.removeById(req.getId()); + return Result.success(); + } }