| | |
| | | package org.jeecg.modules.mes.controller; |
| | | |
| | | import cn.hutool.core.collection.CollectionUtil; |
| | | import com.alibaba.fastjson.JSONArray; |
| | | import com.alibaba.fastjson.JSONObject; |
| | | import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
| | | import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
| | | import com.baomidou.mybatisplus.core.metadata.IPage; |
| | | import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
| | | import com.fasterxml.jackson.core.JsonProcessingException; |
| | | import com.fasterxml.jackson.databind.ObjectMapper; |
| | | import io.swagger.annotations.Api; |
| | | import io.swagger.annotations.ApiOperation; |
| | | import lombok.extern.slf4j.Slf4j; |
| | |
| | | import org.jeecg.common.system.base.controller.JeecgController; |
| | | import org.jeecg.common.system.query.QueryGenerator; |
| | | import org.jeecg.common.system.vo.LoginUser; |
| | | import org.jeecg.common.util.TranslateDictTextUtils; |
| | | import org.jeecg.modules.mes.dto.MesProductionWorkOrderRepublishRequest; |
| | | import org.jeecg.modules.mes.dto.MesProductionWorkScheduleRequest; |
| | | import org.jeecg.modules.mes.entity.MesProductionWorkOrder; |
| | |
| | | public class MesProductionWorkOrderController extends JeecgController<MesProductionWorkOrder, IMesProductionWorkOrderService> { |
| | | @Autowired |
| | | private IMesProductionWorkOrderService mesProductionWorkOrderService; |
| | | @Autowired |
| | | private ObjectMapper objectMapper; |
| | | @Autowired |
| | | private TranslateDictTextUtils translateDictTextUtils; |
| | | |
| | | /** |
| | | * 分页列表查询 |
| | |
| | | //@AutoLog(value = "排产工单-分页列表查询") |
| | | @ApiOperation(value = "排产工单-分页列表查询", notes = "排产工单-分页列表查询") |
| | | @GetMapping(value = "/list") |
| | | public Result<IPage<MesProductionWorkOrder>> queryPageList(MesProductionWorkOrder mesProductionWorkOrder, |
| | | public Result<IPage<?>> queryPageList(MesProductionWorkOrder mesProductionWorkOrder, |
| | | @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, |
| | | @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, |
| | | HttpServletRequest req) { |
| | | Map<String, String[]> parameterMap = req.getParameterMap(); |
| | | QueryWrapper<MesProductionWorkOrder> queryWrapper = QueryGenerator.initQueryWrapper(mesProductionWorkOrder, parameterMap); |
| | | String[] startDates = parameterMap.get("startDate"); |
| | | String[] endDates = parameterMap.get("endDate"); |
| | | if (startDates != null && startDates.length > 0) { |
| | | queryWrapper.ge("work_order_date", startDates[0]); |
| | | } |
| | | if (endDates != null && endDates.length > 0) { |
| | | queryWrapper.le("work_order_date", endDates[0]); |
| | | } |
| | | Page<MesProductionWorkOrder> page = new Page<MesProductionWorkOrder>(pageNo, pageSize); |
| | | IPage<MesProductionWorkOrder> pageList = mesProductionWorkOrderService.page(page, queryWrapper); |
| | | IPage<MesProductionWorkOrder> pageList = mesProductionWorkOrderService.queryPageList(page, parameterMap); |
| | | return Result.OK(pageList); |
| | | } |
| | | |
| | |
| | | if (!validatePlan(mesProductionWorkOrderList)) { |
| | | return Result.error("排产计划不合理,保存失败!"); |
| | | } |
| | | mesProductionWorkOrderList.forEach(item -> item.setWorkOrderStatus(ProductionWorkOrderStatus.NEW.name())); |
| | | mesProductionWorkOrderService.saveBatch(mesProductionWorkOrderList); |
| | | mesProductionWorkOrderList.forEach(item -> { |
| | | if (Objects.isNull(item.getId())) { |
| | | item.setWorkOrderStatus(ProductionWorkOrderStatus.NEW.name()); |
| | | } |
| | | }); |
| | | mesProductionWorkOrderService.saveOrUpdateBatch(mesProductionWorkOrderList); |
| | | return Result.OK("添加成功!"); |
| | | } |
| | | |