|
|
|
|
@ -16,6 +16,7 @@ import org.jeecg.modules.productplan.entity.ZyPlanProcess; |
|
|
|
|
import org.jeecg.modules.productplan.entity.vo.ProcessDataVo; |
|
|
|
|
import org.jeecg.modules.productplan.service.IZyPlanProcessService; |
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
|
import org.springframework.util.ObjectUtils; |
|
|
|
|
import org.springframework.web.bind.annotation.*; |
|
|
|
|
import org.springframework.web.servlet.ModelAndView; |
|
|
|
|
|
|
|
|
|
@ -48,7 +49,7 @@ public class ZyPlanProcessController extends JeecgController<ZyPlanProcess, IZyP |
|
|
|
|
* @param req |
|
|
|
|
* @return |
|
|
|
|
*/ |
|
|
|
|
@AutoLog(value = "生产计划工序-分页列表查询") |
|
|
|
|
// @AutoLog(value = "生产计划工序-分页列表查询")
|
|
|
|
|
@ApiOperation(value = "生产计划工序-分页列表查询", notes = "生产计划工序-分页列表查询") |
|
|
|
|
@GetMapping(value = "/list") |
|
|
|
|
public Result<?> queryPageList(ZyPlanProcess zyPlanProcess, |
|
|
|
|
@ -61,12 +62,47 @@ public class ZyPlanProcessController extends JeecgController<ZyPlanProcess, IZyP |
|
|
|
|
return Result.OK(pageList); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// @AutoLog(value = "生产计划工序-分页列表查询")
|
|
|
|
|
@ApiOperation(value = "生产计划工序-分页列表查询", notes = "生产计划工序-分页列表查询") |
|
|
|
|
@GetMapping(value = "/list2") |
|
|
|
|
public Result<?> queryPageList2(ZyPlanProcess zyPlanProcess, |
|
|
|
|
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, |
|
|
|
|
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, |
|
|
|
|
HttpServletRequest req) { |
|
|
|
|
QueryWrapper<ZyPlanProcess> queryWrapper = QueryGenerator.initQueryWrapper(zyPlanProcess, req.getParameterMap()); |
|
|
|
|
Page<ZyPlanProcess> page = new Page<ZyPlanProcess>(pageNo, pageSize); |
|
|
|
|
IPage<ZyPlanProcess> pageList = zyPlanProcessService.page(page, queryWrapper); |
|
|
|
|
if (!ObjectUtils.isEmpty(pageList)) { |
|
|
|
|
String processIdList = ""; |
|
|
|
|
String stationIdList = ""; |
|
|
|
|
String machineIdList = ""; |
|
|
|
|
String toolsIdList = ""; |
|
|
|
|
String userIdList = ""; |
|
|
|
|
List<ZyPlanProcess> records = pageList.getRecords(); |
|
|
|
|
for (ZyPlanProcess e : records) { |
|
|
|
|
processIdList += e.getProcessId(); |
|
|
|
|
stationIdList += e.getStationId(); |
|
|
|
|
machineIdList += e.getMachineIds(); |
|
|
|
|
toolsIdList += e.getToolsIds(); |
|
|
|
|
userIdList += e.getUserIds(); |
|
|
|
|
} |
|
|
|
|
for (ZyPlanProcess e : records) { |
|
|
|
|
e.setProcessId(processIdList); |
|
|
|
|
e.setStationId(stationIdList); |
|
|
|
|
e.setMachineIds(machineIdList); |
|
|
|
|
e.setToolsIds(toolsIdList); |
|
|
|
|
e.setUserIds(userIdList); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
return Result.OK(pageList); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@ApiOperation(value = "生产计划工序-查询产品工序&计划", notes = "生产计划工序-查询产品工序&计划") |
|
|
|
|
@GetMapping(value = "/getProcessDatalist") |
|
|
|
|
public Result<?> getProcessDatalist(ZyPlanProcess zyPlanProcess, |
|
|
|
|
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, |
|
|
|
|
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, |
|
|
|
|
HttpServletRequest req) { |
|
|
|
|
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, |
|
|
|
|
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, |
|
|
|
|
HttpServletRequest req) { |
|
|
|
|
QueryWrapper<ZyPlanProcess> queryWrapper = QueryGenerator.initQueryWrapper(zyPlanProcess, req.getParameterMap()); |
|
|
|
|
Page<ZyPlanProcess> page = new Page<ZyPlanProcess>(pageNo, pageSize); |
|
|
|
|
List<ProcessDataVo> processDatalist = zyPlanProcessService.getProcessDatalist(zyPlanProcess); |
|
|
|
|
|
zhc077
2 years ago