From af98af582f145603510261386c46496f1bc598bc Mon Sep 17 00:00:00 2001 From: erzhongxmu Date: Sat, 17 Feb 2024 11:36:16 +0800 Subject: [PATCH] 1 --- .../wave/controller/WaveToDownController.java | 751 +++++++++--------- 1 file changed, 377 insertions(+), 374 deletions(-) diff --git a/src/main/java/com/zzjee/wave/controller/WaveToDownController.java b/src/main/java/com/zzjee/wave/controller/WaveToDownController.java index cdf31d6e..5a7e68e6 100644 --- a/src/main/java/com/zzjee/wave/controller/WaveToDownController.java +++ b/src/main/java/com/zzjee/wave/controller/WaveToDownController.java @@ -1,4 +1,5 @@ package com.zzjee.wave.controller; + import com.zzjee.api.ResultDO; import com.zzjee.md.entity.MdCusEntity; import com.zzjee.md.entity.MdCusOtherEntity; @@ -51,6 +52,7 @@ import java.io.IOException; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; + import java.util.Map; import java.util.HashMap; @@ -62,375 +64,376 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.jeecgframework.core.beanvalidator.BeanValidators; + import java.util.Set; import javax.validation.ConstraintViolation; import javax.validation.Validator; import java.net.URI; + import org.springframework.http.MediaType; import org.springframework.web.util.UriComponentsBuilder; import static com.xiaoleilu.hutool.date.DateTime.now; /** + * @author onlineGenerator + * @version V1.0 * @Title: Controller * @Description: wave_to_down - * @author onlineGenerator * @date 2019-12-11 11:32:25 - * @version V1.0 - * */ @Controller @RequestMapping("/waveToDownController") public class WaveToDownController extends BaseController { - /** - * Logger for this class - */ - private static final Logger logger = Logger.getLogger(WaveToDownController.class); + /** + * Logger for this class + */ + private static final Logger logger = Logger.getLogger(WaveToDownController.class); - @Autowired - private WaveToDownServiceI waveToDownService; - @Autowired - private SystemService systemService; - @Autowired - private Validator validator; + @Autowired + private WaveToDownServiceI waveToDownService; + @Autowired + private SystemService systemService; + /** + * wave_to_down列表 页面跳转 + * + * @return + */ + @RequestMapping(params = "list") + public ModelAndView list(HttpServletRequest request) { + return new ModelAndView("com/zzjee/wave/waveToDownList"); + } - /** - * wave_to_down列表 页面跳转 - * - * @return - */ - @RequestMapping(params = "list") - public ModelAndView list(HttpServletRequest request) { - return new ModelAndView("com/zzjee/wave/waveToDownList"); - } - - /** - * easyui AJAX请求数据 - * - * @param request - */ - @RequestMapping(params = "doPrintpage") - public ModelAndView doPrint(String waveid,HttpServletRequest request) { - String hql = "from WmOmQmIEntity where waveId = ? "; - List wavelist = systemService.findHql(hql,waveid); + /** + * easyui AJAX请求数据 + * + * @param request + */ + @RequestMapping(params = "doPrintpage") + public ModelAndView doPrint(String waveid, HttpServletRequest request) { + String hql = "from WmOmQmIEntity where waveId = ? "; + List wavelist = systemService.findHql(hql, waveid); // for(WmOmQmIEntity t: wavelist ){ // t.setFirstRq("已打印"); // systemService.updateEntitie(t); // } - request.setAttribute("kprq",DateUtils.date2Str(DateUtils.date_sdf)); - request.setAttribute("comname", ResourceUtil.getConfigByName("comname")); - request.setAttribute("waveid",waveid); - String hqlwave = "from WaveToDownEntity where waveId = ?"; - List wmOmQmIEntityList = systemService.findHql(hqlwave,waveid); - request.setAttribute("wmOmQmIList", wmOmQmIEntityList); + request.setAttribute("kprq", DateUtils.date2Str(DateUtils.date_sdf)); + request.setAttribute("comname", ResourceUtil.getConfigByName("comname")); + request.setAttribute("waveid", waveid); + String hqlwave = "from WaveToDownEntity where waveId = ?"; + List wmOmQmIEntityList = systemService.findHql(hqlwave, waveid); + request.setAttribute("wmOmQmIList", wmOmQmIEntityList); - return new ModelAndView("com/zzjee/wm/print/wavejianhuo-print"); - } - @RequestMapping(params = "datagrid") - public void datagrid(WaveToDownEntity waveToDown,HttpServletRequest request, HttpServletResponse response, DataGrid dataGrid) { - CriteriaQuery cq = new CriteriaQuery(WaveToDownEntity.class, dataGrid); - //查询条件组装器 - org.jeecgframework.core.extend.hqlsearch.HqlGenerateUtil.installHql(cq, waveToDown, request.getParameterMap()); - try{ - //自定义追加查询条件 - }catch (Exception e) { - throw new BusinessException(e.getMessage()); - } - cq.add(); - this.waveToDownService.getDataGridReturn(cq, true); - TagUtil.datagrid(response, dataGrid); - } + return new ModelAndView("com/zzjee/wm/print/wavejianhuo-print"); + } - /** - * 删除wave_to_down - * - * @return - */ - @RequestMapping(params = "doDel") - @ResponseBody - public AjaxJson doDel(WaveToDownEntity waveToDown, HttpServletRequest request) { - String message = null; - AjaxJson j = new AjaxJson(); - waveToDown = systemService.getEntity(WaveToDownEntity.class, waveToDown.getId()); - message = "wave_to_down删除成功"; - try{ - waveToDownService.delete(waveToDown); - systemService.addLog(message, Globals.Log_Type_DEL, Globals.Log_Leavel_INFO); - }catch(Exception e){ - e.printStackTrace(); - message = "wave_to_down删除失败"; - throw new BusinessException(e.getMessage()); - } - j.setMsg(message); - return j; - } + @RequestMapping(params = "datagrid") + public void datagrid(WaveToDownEntity waveToDown, HttpServletRequest request, HttpServletResponse response, DataGrid dataGrid) { + CriteriaQuery cq = new CriteriaQuery(WaveToDownEntity.class, dataGrid); + //查询条件组装器 + org.jeecgframework.core.extend.hqlsearch.HqlGenerateUtil.installHql(cq, waveToDown, request.getParameterMap()); + try { + //自定义追加查询条件 + } catch (Exception e) { + throw new BusinessException(e.getMessage()); + } + cq.add(); + this.waveToDownService.getDataGridReturn(cq, true); + TagUtil.datagrid(response, dataGrid); + } - /** - * 批量删除wave_to_down - * - * @return - */ - @RequestMapping(params = "doBatchDel") - @ResponseBody - public AjaxJson doBatchDel(String ids,HttpServletRequest request){ - String message = null; - AjaxJson j = new AjaxJson(); - message = "wave_to_down删除成功"; - try{ - for(String id:ids.split(",")){ - WaveToDownEntity waveToDown = systemService.getEntity(WaveToDownEntity.class, - id - ); - waveToDownService.delete(waveToDown); - systemService.addLog(message, Globals.Log_Type_DEL, Globals.Log_Leavel_INFO); - } - }catch(Exception e){ - e.printStackTrace(); - message = "wave_to_down删除失败"; - throw new BusinessException(e.getMessage()); - } - j.setMsg(message); - return j; - } - - - /** - * 添加wave_to_down - * - * @return - */ - @RequestMapping(params = "doAdd") - @ResponseBody - public AjaxJson doAdd(WaveToDownEntity waveToDown, HttpServletRequest request) { - String message = null; - AjaxJson j = new AjaxJson(); - message = "wave_to_down添加成功"; - try{ - waveToDownService.save(waveToDown); - systemService.addLog(message, Globals.Log_Type_INSERT, Globals.Log_Leavel_INFO); - }catch(Exception e){ - e.printStackTrace(); - message = "wave_to_down添加失败"; - throw new BusinessException(e.getMessage()); - } - j.setMsg(message); - return j; - } - - /** - * 更新wave_to_down - * - * @return - */ - @RequestMapping(params = "doUpdate") - @ResponseBody - public AjaxJson doUpdate(WaveToDownEntity waveToDown, HttpServletRequest request) { - String message = null; - AjaxJson j = new AjaxJson(); - message = "wave_to_down更新成功"; - WaveToDownEntity t = waveToDownService.get(WaveToDownEntity.class, waveToDown.getId()); - try { - MyBeanUtils.copyBeanNotNull2Bean(waveToDown, t); - waveToDownService.saveOrUpdate(t); - systemService.addLog(message, Globals.Log_Type_UPDATE, Globals.Log_Leavel_INFO); - } catch (Exception e) { - e.printStackTrace(); - message = "wave_to_down更新失败"; - throw new BusinessException(e.getMessage()); - } - j.setMsg(message); - return j; - } - - - /** - * wave_to_down新增页面跳转 - * - * @return - */ - @RequestMapping(params = "goAdd") - public ModelAndView goAdd(WaveToDownEntity waveToDown, HttpServletRequest req) { - if (StringUtil.isNotEmpty(waveToDown.getId())) { - waveToDown = waveToDownService.getEntity(WaveToDownEntity.class, waveToDown.getId()); - req.setAttribute("waveToDownPage", waveToDown); - } - return new ModelAndView("com/zzjee/wave/waveToDown-add"); - } - /** - * wave_to_down编辑页面跳转 - * - * @return - */ - @RequestMapping(params = "goUpdate") - public ModelAndView goUpdate(WaveToDownEntity waveToDown, HttpServletRequest req) { - if (StringUtil.isNotEmpty(waveToDown.getId())) { - waveToDown = waveToDownService.getEntity(WaveToDownEntity.class, waveToDown.getId()); - req.setAttribute("waveToDownPage", waveToDown); - } - return new ModelAndView("com/zzjee/wave/waveToDown-update"); - } - - /** - * 导入功能跳转 - * - * @return - */ - @RequestMapping(params = "upload") - public ModelAndView upload(HttpServletRequest req) { - req.setAttribute("controller_name","waveToDownController"); - return new ModelAndView("common/upload/pub_excel_upload"); - } - - /** - * 导出excel - * - * @param request - * @param response - */ - @RequestMapping(params = "exportXls") - public String exportXls(WaveToDownEntity waveToDown,HttpServletRequest request,HttpServletResponse response - , DataGrid dataGrid,ModelMap modelMap) { - CriteriaQuery cq = new CriteriaQuery(WaveToDownEntity.class, dataGrid); - org.jeecgframework.core.extend.hqlsearch.HqlGenerateUtil.installHql(cq, waveToDown, request.getParameterMap()); - List waveToDowns = this.waveToDownService.getListByCriteriaQuery(cq,false); - modelMap.put(NormalExcelConstants.FILE_NAME,"wave_to_down"); - modelMap.put(NormalExcelConstants.CLASS,WaveToDownEntity.class); - modelMap.put(NormalExcelConstants.PARAMS,new ExportParams("wave_to_down列表", "导出人:"+ResourceUtil.getSessionUserName().getRealName(), - "导出信息")); - modelMap.put(NormalExcelConstants.DATA_LIST,waveToDowns); - return NormalExcelConstants.JEECG_EXCEL_VIEW; - } - /** - * 导出excel 使模板 - * - * @param request - * @param response - */ - @RequestMapping(params = "exportXlsByT") - public String exportXlsByT(WaveToDownEntity waveToDown,HttpServletRequest request,HttpServletResponse response - , DataGrid dataGrid,ModelMap modelMap) { - modelMap.put(NormalExcelConstants.FILE_NAME,"wave_to_down"); - modelMap.put(NormalExcelConstants.CLASS,WaveToDownEntity.class); - modelMap.put(NormalExcelConstants.PARAMS,new ExportParams("wave_to_down列表", "导出人:"+ResourceUtil.getSessionUserName().getRealName(), - "导出信息")); - modelMap.put(NormalExcelConstants.DATA_LIST,new ArrayList()); - return NormalExcelConstants.JEECG_EXCEL_VIEW; - } - - @SuppressWarnings("unchecked") - @RequestMapping(params = "importExcel", method = RequestMethod.POST) - @ResponseBody - public AjaxJson importExcel(HttpServletRequest request, HttpServletResponse response) { - AjaxJson j = new AjaxJson(); - - MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; - Map fileMap = multipartRequest.getFileMap(); - for (Map.Entry entity : fileMap.entrySet()) { - MultipartFile file = entity.getValue();// 获取上传文件对象 - ImportParams params = new ImportParams(); - params.setTitleRows(2); - params.setHeadRows(1); - params.setNeedSave(true); - try { - List listWaveToDownEntitys = ExcelImportUtil.importExcel(file.getInputStream(),WaveToDownEntity.class,params); - for (WaveToDownEntity waveToDown : listWaveToDownEntitys) { - waveToDownService.save(waveToDown); - } - j.setMsg("文件导入成功！"); - } catch (Exception e) { - j.setMsg("文件导入失败！"); - logger.error(ExceptionUtil.getExceptionMessage(e)); - }finally{ - try { - file.getInputStream().close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - } - return j; - } - - @RequestMapping(method = RequestMethod.GET) - @ResponseBody - public List list() { - List listWaveToDowns=waveToDownService.getList(WaveToDownEntity.class); - return listWaveToDowns; - } - - @RequestMapping(value = "/list/todown", method = RequestMethod.GET) + /** + * 删除wave_to_down + * + * @return + */ + @RequestMapping(params = "doDel") @ResponseBody - public ResponseEntity list(@RequestParam(value="username", required=false) String username, - @RequestParam(value="searchstr", required=false)String searchstr, - @RequestParam(value="searchstr2", required=false)String searchstr2, - @RequestParam(value="searchstr3", required=false)String searchstr3) { - ResultDO D0 = new ResultDO(); + public AjaxJson doDel(WaveToDownEntity waveToDown, HttpServletRequest request) { + String message = null; + AjaxJson j = new AjaxJson(); + waveToDown = systemService.getEntity(WaveToDownEntity.class, waveToDown.getId()); + message = "wave_to_down删除成功"; + try { + waveToDownService.delete(waveToDown); + systemService.addLog(message, Globals.Log_Type_DEL, Globals.Log_Leavel_INFO); + } catch (Exception e) { + e.printStackTrace(); + message = "wave_to_down删除失败"; + throw new BusinessException(e.getMessage()); + } + j.setMsg(message); + return j; + } + + /** + * 批量删除wave_to_down + * + * @return + */ + @RequestMapping(params = "doBatchDel") + @ResponseBody + public AjaxJson doBatchDel(String ids, HttpServletRequest request) { + String message = null; + AjaxJson j = new AjaxJson(); + message = "wave_to_down删除成功"; + try { + for (String id : ids.split(",")) { + WaveToDownEntity waveToDown = systemService.getEntity(WaveToDownEntity.class, + id + ); + waveToDownService.delete(waveToDown); + systemService.addLog(message, Globals.Log_Type_DEL, Globals.Log_Leavel_INFO); + } + } catch (Exception e) { + e.printStackTrace(); + message = "wave_to_down删除失败"; + throw new BusinessException(e.getMessage()); + } + j.setMsg(message); + return j; + } + + + /** + * 添加wave_to_down + * + * @return + */ + @RequestMapping(params = "doAdd") + @ResponseBody + public AjaxJson doAdd(WaveToDownEntity waveToDown, HttpServletRequest request) { + String message = null; + AjaxJson j = new AjaxJson(); + message = "wave_to_down添加成功"; + try { + waveToDownService.save(waveToDown); + systemService.addLog(message, Globals.Log_Type_INSERT, Globals.Log_Leavel_INFO); + } catch (Exception e) { + e.printStackTrace(); + message = "wave_to_down添加失败"; + throw new BusinessException(e.getMessage()); + } + j.setMsg(message); + return j; + } + + /** + * 更新wave_to_down + * + * @return + */ + @RequestMapping(params = "doUpdate") + @ResponseBody + public AjaxJson doUpdate(WaveToDownEntity waveToDown, HttpServletRequest request) { + String message = null; + AjaxJson j = new AjaxJson(); + message = "wave_to_down更新成功"; + WaveToDownEntity t = waveToDownService.get(WaveToDownEntity.class, waveToDown.getId()); + try { + MyBeanUtils.copyBeanNotNull2Bean(waveToDown, t); + waveToDownService.saveOrUpdate(t); + systemService.addLog(message, Globals.Log_Type_UPDATE, Globals.Log_Leavel_INFO); + } catch (Exception e) { + e.printStackTrace(); + message = "wave_to_down更新失败"; + throw new BusinessException(e.getMessage()); + } + j.setMsg(message); + return j; + } + + + /** + * wave_to_down新增页面跳转 + * + * @return + */ + @RequestMapping(params = "goAdd") + public ModelAndView goAdd(WaveToDownEntity waveToDown, HttpServletRequest req) { + if (StringUtil.isNotEmpty(waveToDown.getId())) { + waveToDown = waveToDownService.getEntity(WaveToDownEntity.class, waveToDown.getId()); + req.setAttribute("waveToDownPage", waveToDown); + } + return new ModelAndView("com/zzjee/wave/waveToDown-add"); + } + + /** + * wave_to_down编辑页面跳转 + * + * @return + */ + @RequestMapping(params = "goUpdate") + public ModelAndView goUpdate(WaveToDownEntity waveToDown, HttpServletRequest req) { + if (StringUtil.isNotEmpty(waveToDown.getId())) { + waveToDown = waveToDownService.getEntity(WaveToDownEntity.class, waveToDown.getId()); + req.setAttribute("waveToDownPage", waveToDown); + } + return new ModelAndView("com/zzjee/wave/waveToDown-update"); + } + + /** + * 导入功能跳转 + * + * @return + */ + @RequestMapping(params = "upload") + public ModelAndView upload(HttpServletRequest req) { + req.setAttribute("controller_name", "waveToDownController"); + return new ModelAndView("common/upload/pub_excel_upload"); + } + + /** + * 导出excel + * + * @param request + * @param response + */ + @RequestMapping(params = "exportXls") + public String exportXls(WaveToDownEntity waveToDown, HttpServletRequest request, HttpServletResponse response + , DataGrid dataGrid, ModelMap modelMap) { + CriteriaQuery cq = new CriteriaQuery(WaveToDownEntity.class, dataGrid); + org.jeecgframework.core.extend.hqlsearch.HqlGenerateUtil.installHql(cq, waveToDown, request.getParameterMap()); + List waveToDowns = this.waveToDownService.getListByCriteriaQuery(cq, false); + modelMap.put(NormalExcelConstants.FILE_NAME, "wave_to_down"); + modelMap.put(NormalExcelConstants.CLASS, WaveToDownEntity.class); + modelMap.put(NormalExcelConstants.PARAMS, new ExportParams("wave_to_down列表", "导出人:" + ResourceUtil.getSessionUserName().getRealName(), + "导出信息")); + modelMap.put(NormalExcelConstants.DATA_LIST, waveToDowns); + return NormalExcelConstants.JEECG_EXCEL_VIEW; + } + + /** + * 导出excel 使模板 + * + * @param request + * @param response + */ + @RequestMapping(params = "exportXlsByT") + public String exportXlsByT(WaveToDownEntity waveToDown, HttpServletRequest request, HttpServletResponse response + , DataGrid dataGrid, ModelMap modelMap) { + modelMap.put(NormalExcelConstants.FILE_NAME, "wave_to_down"); + modelMap.put(NormalExcelConstants.CLASS, WaveToDownEntity.class); + modelMap.put(NormalExcelConstants.PARAMS, new ExportParams("wave_to_down列表", "导出人:" + ResourceUtil.getSessionUserName().getRealName(), + "导出信息")); + modelMap.put(NormalExcelConstants.DATA_LIST, new ArrayList()); + return NormalExcelConstants.JEECG_EXCEL_VIEW; + } + + @SuppressWarnings("unchecked") + @RequestMapping(params = "importExcel", method = RequestMethod.POST) + @ResponseBody + public AjaxJson importExcel(HttpServletRequest request, HttpServletResponse response) { + AjaxJson j = new AjaxJson(); + + MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; + Map fileMap = multipartRequest.getFileMap(); + for (Map.Entry entity : fileMap.entrySet()) { + MultipartFile file = entity.getValue();// 获取上传文件对象 + ImportParams params = new ImportParams(); + params.setTitleRows(2); + params.setHeadRows(1); + params.setNeedSave(true); + try { + List listWaveToDownEntitys = ExcelImportUtil.importExcel(file.getInputStream(), WaveToDownEntity.class, params); + for (WaveToDownEntity waveToDown : listWaveToDownEntitys) { + waveToDownService.save(waveToDown); + } + j.setMsg("文件导入成功！"); + } catch (Exception e) { + j.setMsg("文件导入失败！"); + logger.error(ExceptionUtil.getExceptionMessage(e)); + } finally { + try { + file.getInputStream().close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + return j; + } + + @RequestMapping(method = RequestMethod.GET) + @ResponseBody + public List list() { + List listWaveToDowns = waveToDownService.getList(WaveToDownEntity.class); + return listWaveToDowns; + } + + @RequestMapping(value = "/list/todown", method = RequestMethod.GET) + @ResponseBody + public ResponseEntity list(@RequestParam(value = "username", required = false) String username, + @RequestParam(value = "searchstr", required = false) String searchstr, + @RequestParam(value = "searchstr2", required = false) String searchstr2, + @RequestParam(value = "searchstr3", required = false) String searchstr3) { + ResultDO D0 = new ResultDO(); D0.setOK(true); - String hql="from WaveToDownEntity where waveId = ? "; + String hql = "from WaveToDownEntity where waveId = ? "; - List listWaveToDowns =new ArrayList<>(); - List listWaveToDownsnew =new ArrayList<>(); - if(StringUtil.isEmpty(searchstr)&&StringUtil.isEmpty(searchstr2)){ - hql="from WaveToDownEntity "; + List listWaveToDowns = new ArrayList<>(); + List listWaveToDownsnew = new ArrayList<>(); + if (StringUtil.isEmpty(searchstr) && StringUtil.isEmpty(searchstr2)) { + hql = "from WaveToDownEntity "; listWaveToDowns = waveToDownService.findHql(hql); } - if(StringUtil.isNotEmpty(searchstr)&&StringUtil.isEmpty(searchstr2)){ - hql="from WaveToDownEntity where waveId = ? "; - listWaveToDowns = waveToDownService.findHql(hql,searchstr); - } - if(StringUtil.isEmpty(searchstr)&&StringUtil.isNotEmpty(searchstr2)){ - hql="from WaveToDownEntity where binId = ? "; - listWaveToDowns = waveToDownService.findHql(hql,searchstr2); + if (StringUtil.isNotEmpty(searchstr) && StringUtil.isEmpty(searchstr2)) { + hql = "from WaveToDownEntity where waveId = ? "; + listWaveToDowns = waveToDownService.findHql(hql, searchstr); } - if(StringUtil.isNotEmpty(searchstr)&&StringUtil.isNotEmpty(searchstr2)){ - hql="from WaveToDownEntity where waveId = ? and binId = ?"; - listWaveToDowns = waveToDownService.findHql(hql,searchstr,searchstr2); - } - System.out.println("11111searchstr3="+searchstr3); + if (StringUtil.isEmpty(searchstr) && StringUtil.isNotEmpty(searchstr2)) { + hql = "from WaveToDownEntity where binId = ? "; + listWaveToDowns = waveToDownService.findHql(hql, searchstr2); + } + if (StringUtil.isNotEmpty(searchstr) && StringUtil.isNotEmpty(searchstr2)) { + hql = "from WaveToDownEntity where waveId = ? and binId = ?"; + listWaveToDowns = waveToDownService.findHql(hql, searchstr, searchstr2); + } + System.out.println("11111searchstr3=" + searchstr3); - if(StringUtil.isNotEmpty(searchstr3)){ - for(WaveToDownEntity t: listWaveToDowns ){ - System.out.println("t.getGoodsId()="+t.getGoodsId()); - System.out.println("searchstr3="+searchstr3); - try{ - if(StringUtil.strPos(t.getGoodsId(),searchstr3)||StringUtil.strPos(t.getShpTiaoMa(),searchstr3)){ - listWaveToDownsnew.add(t); + if (StringUtil.isNotEmpty(searchstr3)) { + for (WaveToDownEntity t : listWaveToDowns) { + System.out.println("t.getGoodsId()=" + t.getGoodsId()); + System.out.println("searchstr3=" + searchstr3); + try { + if (StringUtil.strPos(t.getGoodsId(), searchstr3) || StringUtil.strPos(t.getShpTiaoMa(), searchstr3)) { + listWaveToDownsnew.add(t); - } - }catch (Exception e){ + } + } catch (Exception e) { - } + } - } - D0.setObj(listWaveToDownsnew); + } + D0.setObj(listWaveToDownsnew); - }else{ - D0.setObj(listWaveToDowns); + } else { + D0.setObj(listWaveToDowns); - } + } return new ResponseEntity(D0, HttpStatus.OK); } @RequestMapping(method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE) @ResponseBody - public ResponseEntity create(@RequestParam String waveToDownstr ,UriComponentsBuilder uriBuilder) { + public ResponseEntity create(@RequestParam String waveToDownstr, UriComponentsBuilder uriBuilder) { //调用JSR303 Bean Validator进行校验，如果出错返回含400错误码及json格式的错误信息. - ResultDO D0 = new ResultDO(); + ResultDO D0 = new ResultDO(); //调用JSR303 Bean Validator进行校验，如果出错返回含400错误码及json格式的错误信息. - WaveToDownEntity waveToDown = (WaveToDownEntity)JSONHelper.json2Object(waveToDownstr,WaveToDownEntity.class); + WaveToDownEntity waveToDown = (WaveToDownEntity) JSONHelper.json2Object(waveToDownstr, WaveToDownEntity.class); - //保存 - try{ - String hql = "from WmOmQmIEntity where waveId = ? and goodsId = ? and proData = ? and tinId = ? and binId = ? and binSta = ?"; - List listwavedown = systemService.findHql(hql,waveToDown.getWaveId(),waveToDown.getGoodsId(),waveToDown.getProData(),waveToDown.getTinId(),waveToDown.getBinId(),"N"); + //保存 + try { + String hql = "from WmOmQmIEntity where waveId = ? and goodsId = ? and proData = ? and tinId = ? and binId = ? and binSta = ?"; + List listwavedown = systemService.findHql(hql, waveToDown.getWaveId(), waveToDown.getGoodsId(), waveToDown.getProData(), waveToDown.getTinId(), waveToDown.getBinId(), "N"); - for(WmOmQmIEntity wmOmQmI: listwavedown){ + for (WmOmQmIEntity wmOmQmI : listwavedown) { WmToDownGoodsEntity wmToDownGoods = new WmToDownGoodsEntity(); wmToDownGoods.setBinIdFrom(wmOmQmI.getTinId());//下架托盘 wmToDownGoods.setKuWeiBianMa(wmOmQmI.getBinId());//储位 @@ -449,77 +452,77 @@ public class WaveToDownController extends BaseController { wmToDownGoods.setOmBeizhu(wmOmQmI.getOmBeizhu());//备注 wmToDownGoods.setImCusCode(wmOmQmI.getImCusCode());//客户单号 wmToDownGoods.setOrderType("99");//默认为01 - wmToDownGoods.setCreateBy(waveToDown.getCreateBy()); - wmToDownGoods.setCreateDate(now()); + wmToDownGoods.setCreateBy(waveToDown.getCreateBy()); + wmToDownGoods.setCreateDate(now()); systemService.save(wmToDownGoods); wmOmQmI.setBinSta("H"); - wmOmQmI.setUpdateBy(waveToDown.getCreateBy()); - wmOmQmI.setFirstRq(waveToDown.getFirstRq()); + wmOmQmI.setUpdateBy(waveToDown.getCreateBy()); + wmOmQmI.setFirstRq(waveToDown.getFirstRq()); systemService.saveOrUpdate(wmOmQmI); } - } catch (Exception e) { - e.printStackTrace(); - D0.setOK(false); - return new ResponseEntity(D0, HttpStatus.OK); - } - D0.setOK(true); + } catch (Exception e) { + e.printStackTrace(); + D0.setOK(false); + return new ResponseEntity(D0, HttpStatus.OK); + } + D0.setOK(true); - return new ResponseEntity(D0, HttpStatus.OK); + return new ResponseEntity(D0, HttpStatus.OK); - } + } - @RequestMapping(value = "/jsondown", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity update(@RequestBody WaveToDownEntity waveToDown) { - ResultDO D0 = new ResultDO(); + @RequestMapping(value = "/jsondown", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE) + public ResponseEntity update(@RequestBody WaveToDownEntity waveToDown) { + ResultDO D0 = new ResultDO(); - //调用JSR303 Bean Validator进行校验，如果出错返回含400错误码及json格式的错误信息. + //调用JSR303 Bean Validator进行校验，如果出错返回含400错误码及json格式的错误信息. - //保存 - try{ - String hql = "from WmOmQmIEntity where waveId = ? and goodsId = ? and proData = ? and tinId = ? and binId = ? and binSta = ?"; - List listwavedown = systemService.findHql(hql,waveToDown.getWaveId(),waveToDown.getGoodsId(),waveToDown.getProData(),waveToDown.getTinId(),waveToDown.getBinId(),"N"); + //保存 + try { + String hql = "from WmOmQmIEntity where waveId = ? and goodsId = ? and proData = ? and tinId = ? and binId = ? and binSta = ?"; + List listwavedown = systemService.findHql(hql, waveToDown.getWaveId(), waveToDown.getGoodsId(), waveToDown.getProData(), waveToDown.getTinId(), waveToDown.getBinId(), "N"); - for(WmOmQmIEntity wmOmQmI: listwavedown){ - WmToDownGoodsEntity wmToDownGoods = new WmToDownGoodsEntity(); - wmToDownGoods.setBinIdFrom(wmOmQmI.getTinId());//下架托盘 - wmToDownGoods.setKuWeiBianMa(wmOmQmI.getBinId());//储位 - wmToDownGoods.setBinIdTo(wmOmQmI.getOmNoticeId());//到托盘 - wmToDownGoods.setCusCode(wmOmQmI.getCusCode());//货主 - wmToDownGoods.setGoodsId(wmOmQmI.getGoodsId());// - wmToDownGoods.setGoodsProData(wmOmQmI.getProData());//生产日期 - wmToDownGoods.setOrderId(wmOmQmI.getOmNoticeId());//出货通知单 - wmToDownGoods.setOrderIdI(wmOmQmI.getId());//出货通知项目 - wmToDownGoods.setBaseUnit(wmOmQmI.getBaseUnit());//基本单位 - wmToDownGoods.setBaseGoodscount(wmOmQmI.getBaseGoodscount());//基本单位数量 - wmToDownGoods.setGoodsUnit(wmOmQmI.getGoodsUnit());//出货单位 - wmToDownGoods.setGoodsQua(wmOmQmI.getQmOkQuat());//出货数量 - wmToDownGoods.setGoodsQuaok(wmOmQmI.getQmOkQuat());//出货数量 - wmToDownGoods.setGoodsName(wmOmQmI.getGoodsName());//商品名称 - wmToDownGoods.setOmBeizhu(wmOmQmI.getOmBeizhu());//备注 - wmToDownGoods.setImCusCode(wmOmQmI.getImCusCode());//客户单号 - wmToDownGoods.setOrderType("99");//默认为01 - wmToDownGoods.setCreateDate(now()); + for (WmOmQmIEntity wmOmQmI : listwavedown) { + WmToDownGoodsEntity wmToDownGoods = new WmToDownGoodsEntity(); + wmToDownGoods.setBinIdFrom(wmOmQmI.getTinId());//下架托盘 + wmToDownGoods.setKuWeiBianMa(wmOmQmI.getBinId());//储位 + wmToDownGoods.setBinIdTo(wmOmQmI.getOmNoticeId());//到托盘 + wmToDownGoods.setCusCode(wmOmQmI.getCusCode());//货主 + wmToDownGoods.setGoodsId(wmOmQmI.getGoodsId());// + wmToDownGoods.setGoodsProData(wmOmQmI.getProData());//生产日期 + wmToDownGoods.setOrderId(wmOmQmI.getOmNoticeId());//出货通知单 + wmToDownGoods.setOrderIdI(wmOmQmI.getId());//出货通知项目 + wmToDownGoods.setBaseUnit(wmOmQmI.getBaseUnit());//基本单位 + wmToDownGoods.setBaseGoodscount(wmOmQmI.getBaseGoodscount());//基本单位数量 + wmToDownGoods.setGoodsUnit(wmOmQmI.getGoodsUnit());//出货单位 + wmToDownGoods.setGoodsQua(wmOmQmI.getQmOkQuat());//出货数量 + wmToDownGoods.setGoodsQuaok(wmOmQmI.getQmOkQuat());//出货数量 + wmToDownGoods.setGoodsName(wmOmQmI.getGoodsName());//商品名称 + wmToDownGoods.setOmBeizhu(wmOmQmI.getOmBeizhu());//备注 + wmToDownGoods.setImCusCode(wmOmQmI.getImCusCode());//客户单号 + wmToDownGoods.setOrderType("99");//默认为01 + wmToDownGoods.setCreateDate(now()); - systemService.save(wmToDownGoods); - wmOmQmI.setBinSta("H"); - wmOmQmI.setFirstRq(waveToDown.getFirstRq()); - systemService.saveOrUpdate(wmOmQmI); - } - D0.setOK(true); + systemService.save(wmToDownGoods); + wmOmQmI.setBinSta("H"); + wmOmQmI.setFirstRq(waveToDown.getFirstRq()); + systemService.saveOrUpdate(wmOmQmI); + } + D0.setOK(true); - } catch (Exception e) { - e.printStackTrace(); - D0.setOK(false); - return new ResponseEntity(D0, HttpStatus.OK); - } - return new ResponseEntity(D0, HttpStatus.OK); - } + } catch (Exception e) { + e.printStackTrace(); + D0.setOK(false); + return new ResponseEntity(D0, HttpStatus.OK); + } + return new ResponseEntity(D0, HttpStatus.OK); + } - @RequestMapping(value = "/{id}", method = RequestMethod.DELETE) - @ResponseStatus(HttpStatus.NO_CONTENT) - public void delete(@PathVariable("id") String id) { - waveToDownService.deleteEntityById(WaveToDownEntity.class, id); - } + @RequestMapping(value = "/{id}", method = RequestMethod.DELETE) + @ResponseStatus(HttpStatus.NO_CONTENT) + public void delete(@PathVariable("id") String id) { + waveToDownService.deleteEntityById(WaveToDownEntity.class, id); + } }