|
|
|
@ -1,46 +1,35 @@ |
|
|
|
package org.jeecg.modules.demo.pro.controller; |
|
|
|
package org.jeecg.modules.demo.pro.controller; |
|
|
|
|
|
|
|
|
|
|
|
import java.util.ArrayList; |
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
|
import java.util.Arrays; |
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
|
import java.util.List; |
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|
|
|
import java.util.Map; |
|
|
|
import io.swagger.annotations.Api; |
|
|
|
import java.util.stream.Collectors; |
|
|
|
import io.swagger.annotations.ApiOperation; |
|
|
|
import java.io.IOException; |
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
import java.io.UnsupportedEncodingException; |
|
|
|
|
|
|
|
import java.net.URLDecoder; |
|
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest; |
|
|
|
|
|
|
|
import javax.servlet.http.HttpServletResponse; |
|
|
|
|
|
|
|
import org.jeecg.common.api.vo.Result; |
|
|
|
import org.jeecg.common.api.vo.Result; |
|
|
|
|
|
|
|
import org.jeecg.common.aspect.annotation.AutoLog; |
|
|
|
|
|
|
|
import org.jeecg.common.system.base.controller.JeecgController; |
|
|
|
import org.jeecg.common.system.query.QueryGenerator; |
|
|
|
import org.jeecg.common.system.query.QueryGenerator; |
|
|
|
import org.jeecg.common.util.oConvertUtils; |
|
|
|
|
|
|
|
import org.jeecg.modules.demo.base.entity.ZyClothsComponent; |
|
|
|
import org.jeecg.modules.demo.base.entity.ZyClothsComponent; |
|
|
|
import org.jeecg.modules.demo.base.entity.ZyProcess; |
|
|
|
import org.jeecg.modules.demo.base.entity.ZyProcess; |
|
|
|
|
|
|
|
import org.jeecg.modules.demo.base.mapper.ZyClothsComponentMapper; |
|
|
|
|
|
|
|
import org.jeecg.modules.demo.base.mapper.ZyProcessMapper; |
|
|
|
import org.jeecg.modules.demo.base.service.IZyClothsComponentService; |
|
|
|
import org.jeecg.modules.demo.base.service.IZyClothsComponentService; |
|
|
|
import org.jeecg.modules.demo.base.service.IZyProcessService; |
|
|
|
import org.jeecg.modules.demo.base.service.IZyProcessService; |
|
|
|
import org.jeecg.modules.demo.pro.entity.NewZyProcessComponent; |
|
|
|
import org.jeecg.modules.demo.pro.entity.NewZyProcessComponent; |
|
|
|
import org.jeecg.modules.demo.pro.entity.ZyProcessComponent; |
|
|
|
import org.jeecg.modules.demo.pro.entity.ZyProcessComponent; |
|
|
|
|
|
|
|
import org.jeecg.modules.demo.pro.mapper.ZyProcessComponentMapper; |
|
|
|
import org.jeecg.modules.demo.pro.service.IZyProcessComponentService; |
|
|
|
import org.jeecg.modules.demo.pro.service.IZyProcessComponentService; |
|
|
|
|
|
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
|
|
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|
|
|
|
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import org.jeecgframework.poi.excel.ExcelImportUtil; |
|
|
|
|
|
|
|
import org.jeecgframework.poi.excel.def.NormalExcelConstants; |
|
|
|
|
|
|
|
import org.jeecgframework.poi.excel.entity.ExportParams; |
|
|
|
|
|
|
|
import org.jeecgframework.poi.excel.entity.ImportParams; |
|
|
|
|
|
|
|
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; |
|
|
|
|
|
|
|
import org.jeecg.common.system.base.controller.JeecgController; |
|
|
|
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.web.bind.annotation.*; |
|
|
|
import org.springframework.web.bind.annotation.*; |
|
|
|
import org.springframework.web.multipart.MultipartFile; |
|
|
|
|
|
|
|
import org.springframework.web.multipart.MultipartHttpServletRequest; |
|
|
|
|
|
|
|
import org.springframework.web.servlet.ModelAndView; |
|
|
|
import org.springframework.web.servlet.ModelAndView; |
|
|
|
import com.alibaba.fastjson.JSON; |
|
|
|
|
|
|
|
import io.swagger.annotations.Api; |
|
|
|
import javax.annotation.Resource; |
|
|
|
import io.swagger.annotations.ApiOperation; |
|
|
|
import javax.servlet.http.HttpServletRequest; |
|
|
|
import org.jeecg.common.aspect.annotation.AutoLog; |
|
|
|
import javax.servlet.http.HttpServletResponse; |
|
|
|
|
|
|
|
import java.util.ArrayList; |
|
|
|
|
|
|
|
import java.util.Arrays; |
|
|
|
|
|
|
|
import java.util.List; |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* @Description: zy_process_component |
|
|
|
* @Description: zy_process_component |
|
|
|
@ -59,6 +48,10 @@ public class ZyProcessComponentController extends JeecgController<ZyProcessCompo |
|
|
|
private IZyProcessService zyProcessService; |
|
|
|
private IZyProcessService zyProcessService; |
|
|
|
@Autowired |
|
|
|
@Autowired |
|
|
|
private IZyClothsComponentService zyClothsComponentService; |
|
|
|
private IZyClothsComponentService zyClothsComponentService; |
|
|
|
|
|
|
|
@Resource |
|
|
|
|
|
|
|
private ZyClothsComponentMapper zyClothsComponentMapper; |
|
|
|
|
|
|
|
@Resource |
|
|
|
|
|
|
|
private ZyProcessMapper zyProcessMapper; |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* 分页列表查询 |
|
|
|
* 分页列表查询 |
|
|
|
@ -127,6 +120,7 @@ public class ZyProcessComponentController extends JeecgController<ZyProcessCompo |
|
|
|
} |
|
|
|
} |
|
|
|
return Result.OK(list1); |
|
|
|
return Result.OK(list1); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* 添加 |
|
|
|
* 添加 |
|
|
|
* |
|
|
|
* |
|
|
|
@ -194,9 +188,27 @@ public class ZyProcessComponentController extends JeecgController<ZyProcessCompo |
|
|
|
@GetMapping(value = "/queryById") |
|
|
|
@GetMapping(value = "/queryById") |
|
|
|
public Result<?> queryById(@RequestParam(name = "id", required = true) String id) { |
|
|
|
public Result<?> queryById(@RequestParam(name = "id", required = true) String id) { |
|
|
|
ZyProcessComponent zyProcessComponent = zyProcessComponentService.getById(id); |
|
|
|
ZyProcessComponent zyProcessComponent = zyProcessComponentService.getById(id); |
|
|
|
|
|
|
|
|
|
|
|
if (zyProcessComponent == null) { |
|
|
|
if (zyProcessComponent == null) { |
|
|
|
return Result.error("未找到对应数据"); |
|
|
|
return Result.error("未找到对应数据"); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
//部件名称
|
|
|
|
|
|
|
|
String componentId = zyProcessComponent.getComponentId(); |
|
|
|
|
|
|
|
String componentNameById = zyClothsComponentMapper.getComponentNameById(componentId); |
|
|
|
|
|
|
|
zyProcessComponent.setComponentId(componentNameById); |
|
|
|
|
|
|
|
//工序名称
|
|
|
|
|
|
|
|
String processId = zyProcessComponent.getProcessId(); |
|
|
|
|
|
|
|
String processNameById = zyProcessMapper.getProcessNameById(processId); |
|
|
|
|
|
|
|
zyProcessComponent.setProcessId(processNameById); |
|
|
|
|
|
|
|
//瓶颈工序
|
|
|
|
|
|
|
|
String bottleneck = zyProcessComponent.getBottleneck(); |
|
|
|
|
|
|
|
if (bottleneck.equals("1")) { |
|
|
|
|
|
|
|
zyProcessComponent.setBottleneck("是"); |
|
|
|
|
|
|
|
} else if (bottleneck.equals("2")) { |
|
|
|
|
|
|
|
zyProcessComponent.setBottleneck("否"); |
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
zyProcessComponent.setBottleneck("可能为空或出错了"); |
|
|
|
|
|
|
|
} |
|
|
|
return Result.OK(zyProcessComponent); |
|
|
|
return Result.OK(zyProcessComponent); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
