diff --git a/src/main/java/com/zzjee/wz/controller/TWzLocationController.java b/src/main/java/com/zzjee/wz/controller/TWzLocationController.java deleted file mode 100644 index aad2c834..00000000 --- a/src/main/java/com/zzjee/wz/controller/TWzLocationController.java +++ /dev/null @@ -1,400 +0,0 @@ -package com.zzjee.wz.controller; - -import com.alibaba.fastjson.JSONArray; -import com.zzjee.wz.entity.TWzLocationEntity; -import com.zzjee.wz.service.TWzLocationServiceI; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import org.apache.commons.lang3.StringUtils; -import org.apache.log4j.Logger; -import org.jeecgframework.core.beanvalidator.BeanValidators; -import org.jeecgframework.core.common.controller.BaseController; -import org.jeecgframework.core.common.exception.BusinessException; -import org.jeecgframework.core.common.hibernate.qbc.CriteriaQuery; -import org.jeecgframework.core.common.model.json.AjaxJson; -import org.jeecgframework.core.common.model.json.DataGrid; -import org.jeecgframework.core.constant.Globals; -import org.jeecgframework.core.util.ExceptionUtil; -import org.jeecgframework.core.util.MyBeanUtils; -import org.jeecgframework.core.util.ResourceUtil; -import org.jeecgframework.core.util.StringUtil; -import org.jeecgframework.jwt.util.ResponseMessage; -import org.jeecgframework.jwt.util.Result; -import org.jeecgframework.poi.excel.ExcelImportUtil; -import org.jeecgframework.poi.excel.entity.ExportParams; -import org.jeecgframework.poi.excel.entity.ImportParams; -import org.jeecgframework.poi.excel.entity.vo.NormalExcelConstants; -import org.jeecgframework.tag.core.easyui.TagUtil; -import org.jeecgframework.web.system.service.SystemService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -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.util.UriComponentsBuilder; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.validation.ConstraintViolation; -import javax.validation.Validator; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Set; - -/** - * @Title: Controller - * @Description: 仓库 - * @author onlineGenerator - * @date 2018-05-20 21:41:04 - * @version V1.0 - * - */ -@Api(value="TWzLocation",description="库存地点",tags="tWzLocationController") -@Controller -@RequestMapping("/tWzLocationController") -public class TWzLocationController extends BaseController { - /** - * Logger for this class - */ - private static final Logger logger = Logger.getLogger(TWzLocationController.class); - - @Autowired - private TWzLocationServiceI tWzLocationService; - @Autowired - private SystemService systemService; - @Autowired - private Validator validator; - - - - /** - * 仓库列表 页面跳转 - * - * @return - */ - @RequestMapping(params = "list") - public ModelAndView list(HttpServletRequest request) { - return new ModelAndView("com/zzjee/wz/tWzLocationList"); - } - - /** - * easyui AJAX请求数据 - * - * @param request - * @param response - * @param dataGrid - * @param user - */ - - @RequestMapping(params = "datagrid") - public void datagrid(TWzLocationEntity tWzLocation,HttpServletRequest request, HttpServletResponse response, DataGrid dataGrid) { - CriteriaQuery cq = new CriteriaQuery(TWzLocationEntity.class, dataGrid); - //查询条件组装器 - org.jeecgframework.core.extend.hqlsearch.HqlGenerateUtil.installHql(cq, tWzLocation, request.getParameterMap()); - try{ - //自定义追加查询条件 - }catch (Exception e) { - throw new BusinessException(e.getMessage()); - } - cq.add(); - this.tWzLocationService.getDataGridReturn(cq, true); - TagUtil.datagrid(response, dataGrid); - } - - /** - * 删除仓库 - * - * @return - */ - @RequestMapping(params = "doDel") - @ResponseBody - public AjaxJson doDel(TWzLocationEntity tWzLocation, HttpServletRequest request) { - String message = null; - AjaxJson j = new AjaxJson(); - tWzLocation = systemService.getEntity(TWzLocationEntity.class, tWzLocation.getId()); - message = "仓库删除成功"; - try{ - tWzLocationService.delete(tWzLocation); - systemService.addLog(message, Globals.Log_Type_DEL, Globals.Log_Leavel_INFO); - }catch(Exception e){ - e.printStackTrace(); - message = "仓库删除失败"; - throw new BusinessException(e.getMessage()); - } - j.setMsg(message); - return j; - } - - /** - * 批量删除仓库 - * - * @return - */ - @RequestMapping(params = "doBatchDel") - @ResponseBody - public AjaxJson doBatchDel(String ids, HttpServletRequest request){ - String message = null; - AjaxJson j = new AjaxJson(); - message = "仓库删除成功"; - try{ - for(String id:ids.split(",")){ - TWzLocationEntity tWzLocation = systemService.getEntity(TWzLocationEntity.class, - Integer.parseInt(id) - ); - tWzLocationService.delete(tWzLocation); - systemService.addLog(message, Globals.Log_Type_DEL, Globals.Log_Leavel_INFO); - } - }catch(Exception e){ - e.printStackTrace(); - message = "仓库删除失败"; - throw new BusinessException(e.getMessage()); - } - j.setMsg(message); - return j; - } - - - /** - * 添加仓库 - * - * @return - */ - @RequestMapping(params = "doAdd") - @ResponseBody - public AjaxJson doAdd(TWzLocationEntity tWzLocation, HttpServletRequest request) { - String message = null; - AjaxJson j = new AjaxJson(); - message = "仓库添加成功"; - try{ - tWzLocationService.save(tWzLocation); - systemService.addLog(message, Globals.Log_Type_INSERT, Globals.Log_Leavel_INFO); - }catch(Exception e){ - e.printStackTrace(); - message = "仓库添加失败"; - throw new BusinessException(e.getMessage()); - } - j.setMsg(message); - return j; - } - - /** - * 更新仓库 - * - * @return - */ - @RequestMapping(params = "doUpdate") - @ResponseBody - public AjaxJson doUpdate(TWzLocationEntity tWzLocation, HttpServletRequest request) { - String message = null; - AjaxJson j = new AjaxJson(); - message = "仓库更新成功"; - TWzLocationEntity t = tWzLocationService.get(TWzLocationEntity.class, tWzLocation.getId()); - try { - MyBeanUtils.copyBeanNotNull2Bean(tWzLocation, t); - tWzLocationService.saveOrUpdate(t); - systemService.addLog(message, Globals.Log_Type_UPDATE, Globals.Log_Leavel_INFO); - } catch (Exception e) { - e.printStackTrace(); - message = "仓库更新失败"; - throw new BusinessException(e.getMessage()); - } - j.setMsg(message); - return j; - } - - - /** - * 仓库新增页面跳转 - * - * @return - */ - @RequestMapping(params = "goAdd") - public ModelAndView goAdd(TWzLocationEntity tWzLocation, HttpServletRequest req) { - if (StringUtil.isNotEmpty(tWzLocation.getId())) { - tWzLocation = tWzLocationService.getEntity(TWzLocationEntity.class, tWzLocation.getId()); - req.setAttribute("tWzLocationPage", tWzLocation); - } - return new ModelAndView("com/zzjee/wz/tWzLocation-add"); - } - /** - * 仓库编辑页面跳转 - * - * @return - */ - @RequestMapping(params = "goUpdate") - public ModelAndView goUpdate(TWzLocationEntity tWzLocation, HttpServletRequest req) { - if (StringUtil.isNotEmpty(tWzLocation.getId())) { - tWzLocation = tWzLocationService.getEntity(TWzLocationEntity.class, tWzLocation.getId()); - req.setAttribute("tWzLocationPage", tWzLocation); - } - return new ModelAndView("com/zzjee/wz/tWzLocation-update"); - } - - /** - * 导入功能跳转 - * - * @return - */ - @RequestMapping(params = "upload") - public ModelAndView upload(HttpServletRequest req) { - req.setAttribute("controller_name","tWzLocationController"); - return new ModelAndView("common/upload/pub_excel_upload"); - } - - /** - * 导出excel - * - * @param request - * @param response - */ - @RequestMapping(params = "exportXls") - public String exportXls(TWzLocationEntity tWzLocation, HttpServletRequest request, HttpServletResponse response - , DataGrid dataGrid, ModelMap modelMap) { - CriteriaQuery cq = new CriteriaQuery(TWzLocationEntity.class, dataGrid); - org.jeecgframework.core.extend.hqlsearch.HqlGenerateUtil.installHql(cq, tWzLocation, request.getParameterMap()); - List tWzLocations = this.tWzLocationService.getListByCriteriaQuery(cq,false); - modelMap.put(NormalExcelConstants.FILE_NAME,"仓库"); - modelMap.put(NormalExcelConstants.CLASS,TWzLocationEntity.class); - modelMap.put(NormalExcelConstants.PARAMS,new ExportParams("仓库列表", "导出人:"+ ResourceUtil.getSessionUser().getRealName(), - "导出信息")); - modelMap.put(NormalExcelConstants.DATA_LIST,tWzLocations); - return NormalExcelConstants.JEECG_EXCEL_VIEW; - } - /** - * 导出excel 使模板 - * - * @param request - * @param response - */ - @RequestMapping(params = "exportXlsByT") - public String exportXlsByT(TWzLocationEntity tWzLocation, HttpServletRequest request, HttpServletResponse response - , DataGrid dataGrid, ModelMap modelMap) { - modelMap.put(NormalExcelConstants.FILE_NAME,"仓库"); - modelMap.put(NormalExcelConstants.CLASS,TWzLocationEntity.class); - modelMap.put(NormalExcelConstants.PARAMS,new ExportParams("仓库列表", "导出人:"+ ResourceUtil.getSessionUser().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 listTWzLocationEntitys = ExcelImportUtil.importExcel(file.getInputStream(),TWzLocationEntity.class,params); - for (TWzLocationEntity tWzLocation : listTWzLocationEntitys) { - tWzLocationService.save(tWzLocation); - } - 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 - @ApiOperation(value="仓库列表信息",produces="application/json",httpMethod="GET") - public ResponseMessage> list() { - List listTWzLocations=tWzLocationService.getList(TWzLocationEntity.class); - return Result.success(listTWzLocations); - } - - @RequestMapping(value = "/{id}", method = RequestMethod.GET) - @ResponseBody - @ApiOperation(value="根据ID获取仓库信息",notes="根据ID获取仓库信息",httpMethod="GET",produces="application/json") - public ResponseMessage get(@ApiParam(required=true,name="id",value="ID")@PathVariable("id") String id) { - TWzLocationEntity task = tWzLocationService.get(TWzLocationEntity.class, id); - if (task == null) { - return Result.error("根据ID获取仓库信息为空"); - } - return Result.success(task); - } - - @RequestMapping(method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE) - @ResponseBody - @ApiOperation(value="创建仓库") - public ResponseMessage create(@ApiParam(name="仓库对象")@RequestBody TWzLocationEntity tWzLocation, UriComponentsBuilder uriBuilder) { - //调用JSR303 Bean Validator进行校验，如果出错返回含400错误码及json格式的错误信息. - Set> failures = validator.validate(tWzLocation); - if (!failures.isEmpty()) { - return Result.error(JSONArray.toJSONString(BeanValidators.extractPropertyAndMessage(failures))); - } - - //保存 - try{ - tWzLocationService.save(tWzLocation); - } catch (Exception e) { - e.printStackTrace(); - return Result.error("仓库信息保存失败"); - } - return Result.success(tWzLocation); - } - - @RequestMapping(value = "/{id}", method = RequestMethod.PUT, consumes = MediaType.APPLICATION_JSON_VALUE) - @ResponseBody - @ApiOperation(value="更新仓库",notes="更新仓库") - public ResponseMessage update(@ApiParam(name="仓库对象")@RequestBody TWzLocationEntity tWzLocation) { - //调用JSR303 Bean Validator进行校验，如果出错返回含400错误码及json格式的错误信息. - Set> failures = validator.validate(tWzLocation); - if (!failures.isEmpty()) { - return Result.error(JSONArray.toJSONString(BeanValidators.extractPropertyAndMessage(failures))); - } - - //保存 - try{ - tWzLocationService.saveOrUpdate(tWzLocation); - } catch (Exception e) { - e.printStackTrace(); - return Result.error("更新仓库信息失败"); - } - - //按Restful约定，返回204状态码, 无内容. 也可以返回200状态码. - return Result.success("更新仓库信息成功"); - } - - @RequestMapping(value = "/{id}", method = RequestMethod.DELETE) - @ResponseStatus(HttpStatus.NO_CONTENT) - @ApiOperation(value="删除仓库") - public ResponseMessage delete(@ApiParam(name="id",value="ID",required=true)@PathVariable("id") String id) { - logger.info("delete[{}]" + id); - // 验证 - if (StringUtils.isEmpty(id)) { - return Result.error("ID不能为空"); - } - try { - tWzLocationService.deleteEntityById(TWzLocationEntity.class, id); - } catch (Exception e) { - e.printStackTrace(); - return Result.error("仓库删除失败"); - } - - return Result.success(); - } -} diff --git a/src/main/java/com/zzjee/wz/controller/TWzMaterialController.java b/src/main/java/com/zzjee/wz/controller/TWzMaterialController.java deleted file mode 100644 index c1aad653..00000000 --- a/src/main/java/com/zzjee/wz/controller/TWzMaterialController.java +++ /dev/null @@ -1,435 +0,0 @@ -package com.zzjee.wz.controller; - -import com.alibaba.fastjson.JSONArray; -import com.zzjee.md.entity.MdGoodsEntity; -import com.zzjee.md.service.MdGoodsServiceI; -import com.zzjee.wz.entity.TWzMaterialEntity; -import com.zzjee.wz.service.TWzMaterialServiceI; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import org.apache.commons.lang3.StringUtils; -import org.apache.log4j.Logger; -import org.jeecgframework.core.beanvalidator.BeanValidators; -import org.jeecgframework.core.common.controller.BaseController; -import org.jeecgframework.core.common.exception.BusinessException; -import org.jeecgframework.core.common.hibernate.qbc.CriteriaQuery; -import org.jeecgframework.core.common.model.json.AjaxJson; -import org.jeecgframework.core.common.model.json.DataGrid; -import org.jeecgframework.core.constant.Globals; -import org.jeecgframework.core.util.ExceptionUtil; -import org.jeecgframework.core.util.MyBeanUtils; -import org.jeecgframework.core.util.ResourceUtil; -import org.jeecgframework.core.util.StringUtil; -import org.jeecgframework.jwt.util.ResponseMessage; -import org.jeecgframework.jwt.util.Result; -import org.jeecgframework.poi.excel.ExcelImportUtil; -import org.jeecgframework.poi.excel.entity.ExportParams; -import org.jeecgframework.poi.excel.entity.ImportParams; -import org.jeecgframework.poi.excel.entity.vo.NormalExcelConstants; -import org.jeecgframework.tag.core.easyui.TagUtil; -import org.jeecgframework.web.system.service.SystemService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -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.util.UriComponentsBuilder; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.validation.ConstraintViolation; -import javax.validation.Validator; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Set; - -/** - * @Title: Controller - * @Description: 物料 - * @author onlineGenerator - * @date 2018-05-20 21:40:03 - * @version V1.0 - * - */ -@Api(value="TWzMaterial",description="物料",tags="tWzMaterialController") -@Controller -@RequestMapping("/tWzMaterialController") -public class TWzMaterialController extends BaseController { - /** - * Logger for this class - */ - private static final Logger logger = Logger.getLogger(TWzMaterialController.class); - - @Autowired - private TWzMaterialServiceI tWzMaterialService; - @Autowired - private SystemService systemService; - @Autowired - private Validator validator; - - @Autowired - private MdGoodsServiceI mdGoodsService; - - /** - * 物料列表 页面跳转 - * - * @return - */ - @RequestMapping(params = "list") - public ModelAndView list(HttpServletRequest request) { - return new ModelAndView("com/zzjee/wz/tWzMaterialList"); - } - - /** - * easyui AJAX请求数据 - * - * @param request - * @param response - * @param dataGrid - * @param user - */ - - @RequestMapping(params = "datagrid") - public void datagrid(TWzMaterialEntity tWzMaterial,HttpServletRequest request, HttpServletResponse response, DataGrid dataGrid) { - CriteriaQuery cq = new CriteriaQuery(TWzMaterialEntity.class, dataGrid); - //查询条件组装器 - org.jeecgframework.core.extend.hqlsearch.HqlGenerateUtil.installHql(cq, tWzMaterial, request.getParameterMap()); - try{ - //自定义追加查询条件 - }catch (Exception e) { - throw new BusinessException(e.getMessage()); - } - cq.add(); - this.tWzMaterialService.getDataGridReturn(cq, true); - TagUtil.datagrid(response, dataGrid); - } - - /** - * 删除物料 - * - * @return - */ - @RequestMapping(params = "doDel") - @ResponseBody - public AjaxJson doDel(TWzMaterialEntity tWzMaterial, HttpServletRequest request) { - String message = null; - AjaxJson j = new AjaxJson(); - tWzMaterial = systemService.getEntity(TWzMaterialEntity.class, tWzMaterial.getId()); - message = "物料删除成功"; - try{ - tWzMaterialService.delete(tWzMaterial); - systemService.addLog(message, Globals.Log_Type_DEL, Globals.Log_Leavel_INFO); - }catch(Exception e){ - e.printStackTrace(); - message = "物料删除失败"; - throw new BusinessException(e.getMessage()); - } - j.setMsg(message); - return j; - } - - /** - * 批量删除物料 - * - * @return - */ - @RequestMapping(params = "doBatchDel") - @ResponseBody - public AjaxJson doBatchDel(String ids, HttpServletRequest request){ - String message = null; - AjaxJson j = new AjaxJson(); - message = "物料删除成功"; - try{ - for(String id:ids.split(",")){ - TWzMaterialEntity tWzMaterial = systemService.getEntity(TWzMaterialEntity.class, - Integer.parseInt(id) - ); - tWzMaterialService.delete(tWzMaterial); - systemService.addLog(message, Globals.Log_Type_DEL, Globals.Log_Leavel_INFO); - } - }catch(Exception e){ - e.printStackTrace(); - message = "物料删除失败"; - throw new BusinessException(e.getMessage()); - } - j.setMsg(message); - return j; - } - - - /** - * 添加物料 - * - * @return - */ - @RequestMapping(params = "doAdd") - @ResponseBody - public AjaxJson doAdd(TWzMaterialEntity tWzMaterial, HttpServletRequest request) { - String message = null; - AjaxJson j = new AjaxJson(); - message = "物料添加成功"; - try{ - tWzMaterialService.save(tWzMaterial); - - MdGoodsEntity mdn = mdGoodsService.findUniqueByProperty(MdGoodsEntity.class,"shpBianMa",tWzMaterial.getMatCode()); - if(mdn==null){ - mdn = new MdGoodsEntity(); - mdn.setShpBianMa(tWzMaterial.getMatCode()); - mdn.setSuoShuKeHu(ResourceUtil.getConfigByName("default.cuscode")); - mdn.setChlShl("1"); - mdn.setShpMingCheng(tWzMaterial.getMatName()); - mdn.setBzhiQi("999"); - mdn.setChpShuXing(tWzMaterial.getBy3()); - mdn.setJshDanWei(tWzMaterial.getMatUnit()); - mdn.setShlDanWei(tWzMaterial.getMatUnit()); - mdn.setShpTiaoMa(tWzMaterial.getBy1()); - mdn.setCfWenCeng(tWzMaterial.getBy2()); - mdn.setJiZhunwendu("1"); - mdn.setTiJiCm("1"); - mdn.setZhlKg("1"); - mdn.setChlKongZhi("N"); - mdn.setJfShpLei("10"); - mdn.setMpCengGao("99"); - mdn.setMpDanCeng("99"); - - mdGoodsService.save(mdn); - } - - systemService.addLog(message, Globals.Log_Type_INSERT, Globals.Log_Leavel_INFO); - }catch(Exception e){ - e.printStackTrace(); - message = "物料添加失败"; - throw new BusinessException(e.getMessage()); - } - j.setMsg(message); - return j; - } - - /** - * 更新物料 - * - * @return - */ - @RequestMapping(params = "doUpdate") - @ResponseBody - public AjaxJson doUpdate(TWzMaterialEntity tWzMaterial, HttpServletRequest request) { - String message = null; - AjaxJson j = new AjaxJson(); - message = "物料更新成功"; - TWzMaterialEntity t = tWzMaterialService.get(TWzMaterialEntity.class, tWzMaterial.getId()); - try { - MyBeanUtils.copyBeanNotNull2Bean(tWzMaterial, t); - tWzMaterialService.saveOrUpdate(t); - systemService.addLog(message, Globals.Log_Type_UPDATE, Globals.Log_Leavel_INFO); - } catch (Exception e) { - e.printStackTrace(); - message = "物料更新失败"; - throw new BusinessException(e.getMessage()); - } - j.setMsg(message); - return j; - } - - - /** - * 物料新增页面跳转 - * - * @return - */ - @RequestMapping(params = "goAdd") - public ModelAndView goAdd(TWzMaterialEntity tWzMaterial, HttpServletRequest req) { - if (StringUtil.isNotEmpty(tWzMaterial.getId())) { - tWzMaterial = tWzMaterialService.getEntity(TWzMaterialEntity.class, tWzMaterial.getId()); - req.setAttribute("tWzMaterialPage", tWzMaterial); - } - return new ModelAndView("com/zzjee/wz/tWzMaterial-add"); - } - /** - * 物料编辑页面跳转 - * - * @return - */ - @RequestMapping(params = "goUpdate") - public ModelAndView goUpdate(TWzMaterialEntity tWzMaterial, HttpServletRequest req) { - if (StringUtil.isNotEmpty(tWzMaterial.getId())) { - tWzMaterial = tWzMaterialService.getEntity(TWzMaterialEntity.class, tWzMaterial.getId()); - req.setAttribute("tWzMaterialPage", tWzMaterial); - } - return new ModelAndView("com/zzjee/wz/tWzMaterial-update"); - } - - /** - * 导入功能跳转 - * - * @return - */ - @RequestMapping(params = "upload") - public ModelAndView upload(HttpServletRequest req) { - req.setAttribute("controller_name","tWzMaterialController"); - return new ModelAndView("common/upload/pub_excel_upload"); - } - - /** - * 导出excel - * - * @param request - * @param response - */ - @RequestMapping(params = "exportXls") - public String exportXls(TWzMaterialEntity tWzMaterial, HttpServletRequest request, HttpServletResponse response - , DataGrid dataGrid, ModelMap modelMap) { - CriteriaQuery cq = new CriteriaQuery(TWzMaterialEntity.class, dataGrid); - org.jeecgframework.core.extend.hqlsearch.HqlGenerateUtil.installHql(cq, tWzMaterial, request.getParameterMap()); - List tWzMaterials = this.tWzMaterialService.getListByCriteriaQuery(cq,false); - modelMap.put(NormalExcelConstants.FILE_NAME,"物料"); - modelMap.put(NormalExcelConstants.CLASS,TWzMaterialEntity.class); - modelMap.put(NormalExcelConstants.PARAMS,new ExportParams("物料列表", "导出人:"+ ResourceUtil.getSessionUser().getRealName(), - "导出信息")); - modelMap.put(NormalExcelConstants.DATA_LIST,tWzMaterials); - return NormalExcelConstants.JEECG_EXCEL_VIEW; - } - /** - * 导出excel 使模板 - * - * @param request - * @param response - */ - @RequestMapping(params = "exportXlsByT") - public String exportXlsByT(TWzMaterialEntity tWzMaterial, HttpServletRequest request, HttpServletResponse response - , DataGrid dataGrid, ModelMap modelMap) { - modelMap.put(NormalExcelConstants.FILE_NAME,"物料"); - modelMap.put(NormalExcelConstants.CLASS,TWzMaterialEntity.class); - modelMap.put(NormalExcelConstants.PARAMS,new ExportParams("物料列表", "导出人:"+ ResourceUtil.getSessionUser().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 listTWzMaterialEntitys = ExcelImportUtil.importExcel(file.getInputStream(),TWzMaterialEntity.class,params); - for (TWzMaterialEntity tWzMaterial : listTWzMaterialEntitys) { - TWzMaterialEntity t = systemService.findUniqueByProperty(TWzMaterialEntity.class,"matCode",tWzMaterial.getMatClass()); - if(t!=null){ - MyBeanUtils.copyBeanNotNull2Bean(tWzMaterial, t); - tWzMaterialService.updateEntitie(t); - }else{ - tWzMaterialService.save(tWzMaterial); - - } - } - 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 - @ApiOperation(value="物料列表信息",produces="application/json",httpMethod="GET") - public ResponseMessage> list() { - List listTWzMaterials=tWzMaterialService.getList(TWzMaterialEntity.class); - return Result.success(listTWzMaterials); - } - - @RequestMapping(value = "/{id}", method = RequestMethod.GET) - @ResponseBody - @ApiOperation(value="根据ID获取物料信息",notes="根据ID获取物料信息",httpMethod="GET",produces="application/json") - public ResponseMessage get(@ApiParam(required=true,name="id",value="ID")@PathVariable("id") String id) { - TWzMaterialEntity task = tWzMaterialService.get(TWzMaterialEntity.class, id); - if (task == null) { - return Result.error("根据ID获取物料信息为空"); - } - return Result.success(task); - } - - @RequestMapping(method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE) - @ResponseBody - @ApiOperation(value="创建物料") - public ResponseMessage create(@ApiParam(name="物料对象")@RequestBody TWzMaterialEntity tWzMaterial, UriComponentsBuilder uriBuilder) { - //调用JSR303 Bean Validator进行校验，如果出错返回含400错误码及json格式的错误信息. - Set> failures = validator.validate(tWzMaterial); - if (!failures.isEmpty()) { - return Result.error(JSONArray.toJSONString(BeanValidators.extractPropertyAndMessage(failures))); - } - - //保存 - try{ - tWzMaterialService.save(tWzMaterial); - } catch (Exception e) { - e.printStackTrace(); - return Result.error("物料信息保存失败"); - } - return Result.success(tWzMaterial); - } - - @RequestMapping(value = "/{id}", method = RequestMethod.PUT, consumes = MediaType.APPLICATION_JSON_VALUE) - @ResponseBody - @ApiOperation(value="更新物料",notes="更新物料") - public ResponseMessage update(@ApiParam(name="物料对象")@RequestBody TWzMaterialEntity tWzMaterial) { - //调用JSR303 Bean Validator进行校验，如果出错返回含400错误码及json格式的错误信息. - Set> failures = validator.validate(tWzMaterial); - if (!failures.isEmpty()) { - return Result.error(JSONArray.toJSONString(BeanValidators.extractPropertyAndMessage(failures))); - } - - //保存 - try{ - tWzMaterialService.saveOrUpdate(tWzMaterial); - } catch (Exception e) { - e.printStackTrace(); - return Result.error("更新物料信息失败"); - } - - //按Restful约定，返回204状态码, 无内容. 也可以返回200状态码. - return Result.success("更新物料信息成功"); - } - - @RequestMapping(value = "/{id}", method = RequestMethod.DELETE) - @ResponseStatus(HttpStatus.NO_CONTENT) - @ApiOperation(value="删除物料") - public ResponseMessage delete(@ApiParam(name="id",value="ID",required=true)@PathVariable("id") String id) { - logger.info("delete[{}]" + id); - // 验证 - if (StringUtils.isEmpty(id)) { - return Result.error("ID不能为空"); - } - try { - tWzMaterialService.deleteEntityById(TWzMaterialEntity.class, id); - } catch (Exception e) { - e.printStackTrace(); - return Result.error("物料删除失败"); - } - - return Result.success(); - } -} diff --git a/src/main/java/com/zzjee/wz/controller/TWzSpConfController.java b/src/main/java/com/zzjee/wz/controller/TWzSpConfController.java deleted file mode 100644 index ca5fd1f0..00000000 --- a/src/main/java/com/zzjee/wz/controller/TWzSpConfController.java +++ /dev/null @@ -1,422 +0,0 @@ -package com.zzjee.wz.controller; - -import com.alibaba.fastjson.JSONArray; -import com.zzjee.wz.entity.TWzSpConfEntity; -import com.zzjee.wz.service.TWzSpConfServiceI; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import org.apache.commons.lang3.StringUtils; -import org.apache.log4j.Logger; -import org.jeecgframework.core.beanvalidator.BeanValidators; -import org.jeecgframework.core.common.controller.BaseController; -import org.jeecgframework.core.common.exception.BusinessException; -import org.jeecgframework.core.common.hibernate.qbc.CriteriaQuery; -import org.jeecgframework.core.common.model.json.AjaxJson; -import org.jeecgframework.core.common.model.json.DataGrid; -import org.jeecgframework.core.constant.Globals; -import org.jeecgframework.core.util.ExceptionUtil; -import org.jeecgframework.core.util.MyBeanUtils; -import org.jeecgframework.core.util.ResourceUtil; -import org.jeecgframework.core.util.StringUtil; -import org.jeecgframework.jwt.util.ResponseMessage; -import org.jeecgframework.jwt.util.Result; -import org.jeecgframework.poi.excel.ExcelImportUtil; -import org.jeecgframework.poi.excel.entity.ExportParams; -import org.jeecgframework.poi.excel.entity.ImportParams; -import org.jeecgframework.poi.excel.entity.vo.NormalExcelConstants; -import org.jeecgframework.tag.core.easyui.TagUtil; -import org.jeecgframework.web.system.pojo.base.TSUser; -import org.jeecgframework.web.system.service.SystemService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -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.util.UriComponentsBuilder; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.validation.ConstraintViolation; -import javax.validation.Validator; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Set; - -/** - * @Title: Controller - * @Description: 审批配置 - * @author onlineGenerator - * @date 2018-05-20 21:40:51 - * @version V1.0 - * - */ -@Api(value="TWzSpConf",description="审批配置",tags="tWzSpConfController") -@Controller -@RequestMapping("/tWzSpConfController") -public class TWzSpConfController extends BaseController { - /** - * Logger for this class - */ - private static final Logger logger = Logger.getLogger(TWzSpConfController.class); - - @Autowired - private TWzSpConfServiceI tWzSpConfService; - @Autowired - private SystemService systemService; - @Autowired - private Validator validator; - - - - /** - * 审批配置列表 页面跳转 - * - * @return - */ - @RequestMapping(params = "list") - public ModelAndView list(HttpServletRequest request) { - return new ModelAndView("com/zzjee/wz/tWzSpConfList"); - } - - /** - * easyui AJAX请求数据 - * - * @param request - * @param response - * @param dataGrid - * @param user - */ - - @RequestMapping(params = "datagrid") - public void datagrid(TWzSpConfEntity tWzSpConf,HttpServletRequest request, HttpServletResponse response, DataGrid dataGrid) { - CriteriaQuery cq = new CriteriaQuery(TWzSpConfEntity.class, dataGrid); - //查询条件组装器 - org.jeecgframework.core.extend.hqlsearch.HqlGenerateUtil.installHql(cq, tWzSpConf, request.getParameterMap()); - try{ - //自定义追加查询条件 - }catch (Exception e) { - throw new BusinessException(e.getMessage()); - } - cq.add(); - this.tWzSpConfService.getDataGridReturn(cq, true); - TagUtil.datagrid(response, dataGrid); - } - - /** - * 删除审批配置 - * - * @return - */ - @RequestMapping(params = "doDel") - @ResponseBody - public AjaxJson doDel(TWzSpConfEntity tWzSpConf, HttpServletRequest request) { - String message = null; - AjaxJson j = new AjaxJson(); - tWzSpConf = systemService.getEntity(TWzSpConfEntity.class, tWzSpConf.getId()); - message = "审批配置删除成功"; - try{ - tWzSpConfService.delete(tWzSpConf); - systemService.addLog(message, Globals.Log_Type_DEL, Globals.Log_Leavel_INFO); - }catch(Exception e){ - e.printStackTrace(); - message = "审批配置删除失败"; - throw new BusinessException(e.getMessage()); - } - j.setMsg(message); - return j; - } - - /** - * 批量删除审批配置 - * - * @return - */ - @RequestMapping(params = "doBatchDel") - @ResponseBody - public AjaxJson doBatchDel(String ids, HttpServletRequest request){ - String message = null; - AjaxJson j = new AjaxJson(); - message = "审批配置删除成功"; - try{ - for(String id:ids.split(",")){ - TWzSpConfEntity tWzSpConf = systemService.getEntity(TWzSpConfEntity.class, - Integer.parseInt(id) - ); - tWzSpConfService.delete(tWzSpConf); - systemService.addLog(message, Globals.Log_Type_DEL, Globals.Log_Leavel_INFO); - } - }catch(Exception e){ - e.printStackTrace(); - message = "审批配置删除失败"; - throw new BusinessException(e.getMessage()); - } - j.setMsg(message); - return j; - } - - - /** - * 添加审批配置 - * - * @param ids - * @return - */ - @RequestMapping(params = "doAdd") - @ResponseBody - public AjaxJson doAdd(TWzSpConfEntity tWzSpConf, HttpServletRequest request) { - String message = null; - AjaxJson j = new AjaxJson(); - message = "审批配置添加成功"; - try{ - try{ - String[] strs = tWzSpConf.getSpUsername().split(","); - //第一个分号之前的字符串自然就是数组里的第一个 - String userid = strs[0]; - TSUser user = systemService.get(TSUser.class,userid); - tWzSpConf.setSpUsername(user.getUserName()); - }catch (Exception e){ - - } - tWzSpConfService.save(tWzSpConf); - systemService.addLog(message, Globals.Log_Type_INSERT, Globals.Log_Leavel_INFO); - }catch(Exception e){ - e.printStackTrace(); - message = "审批配置添加失败"; - throw new BusinessException(e.getMessage()); - } - j.setMsg(message); - return j; - } - - /** - * 更新审批配置 - * - * @param ids - * @return - */ - @RequestMapping(params = "doUpdate") - @ResponseBody - public AjaxJson doUpdate(TWzSpConfEntity tWzSpConf, HttpServletRequest request) { - String message = null; - AjaxJson j = new AjaxJson(); - message = "审批配置更新成功"; - TWzSpConfEntity t = tWzSpConfService.get(TWzSpConfEntity.class, tWzSpConf.getId()); - try { - try{ - String[] strs = tWzSpConf.getSpUsername().split(","); - //第一个分号之前的字符串自然就是数组里的第一个 - String userid = strs[0]; - TSUser user = systemService.get(TSUser.class,userid); - tWzSpConf.setSpUsername(user.getUserName()); - }catch (Exception e){ - - } - - MyBeanUtils.copyBeanNotNull2Bean(tWzSpConf, t); - tWzSpConfService.saveOrUpdate(t); - systemService.addLog(message, Globals.Log_Type_UPDATE, Globals.Log_Leavel_INFO); - } catch (Exception e) { - e.printStackTrace(); - message = "审批配置更新失败"; - throw new BusinessException(e.getMessage()); - } - j.setMsg(message); - return j; - } - - - /** - * 审批配置新增页面跳转 - * - * @return - */ - @RequestMapping(params = "goAdd") - public ModelAndView goAdd(TWzSpConfEntity tWzSpConf, HttpServletRequest req) { - if (StringUtil.isNotEmpty(tWzSpConf.getId())) { - tWzSpConf = tWzSpConfService.getEntity(TWzSpConfEntity.class, tWzSpConf.getId()); - req.setAttribute("tWzSpConfPage", tWzSpConf); - } - return new ModelAndView("com/zzjee/wz/tWzSpConf-add"); - } - /** - * 审批配置编辑页面跳转 - * - * @return - */ - @RequestMapping(params = "goUpdate") - public ModelAndView goUpdate(TWzSpConfEntity tWzSpConf, HttpServletRequest req) { - if (StringUtil.isNotEmpty(tWzSpConf.getId())) { - tWzSpConf = tWzSpConfService.getEntity(TWzSpConfEntity.class, tWzSpConf.getId()); - req.setAttribute("tWzSpConfPage", tWzSpConf); - } - return new ModelAndView("com/zzjee/wz/tWzSpConf-update"); - } - - /** - * 导入功能跳转 - * - * @return - */ - @RequestMapping(params = "upload") - public ModelAndView upload(HttpServletRequest req) { - req.setAttribute("controller_name","tWzSpConfController"); - return new ModelAndView("common/upload/pub_excel_upload"); - } - - /** - * 导出excel - * - * @param request - * @param response - */ - @RequestMapping(params = "exportXls") - public String exportXls(TWzSpConfEntity tWzSpConf, HttpServletRequest request, HttpServletResponse response - , DataGrid dataGrid, ModelMap modelMap) { - CriteriaQuery cq = new CriteriaQuery(TWzSpConfEntity.class, dataGrid); - org.jeecgframework.core.extend.hqlsearch.HqlGenerateUtil.installHql(cq, tWzSpConf, request.getParameterMap()); - List tWzSpConfs = this.tWzSpConfService.getListByCriteriaQuery(cq,false); - modelMap.put(NormalExcelConstants.FILE_NAME,"审批配置"); - modelMap.put(NormalExcelConstants.CLASS,TWzSpConfEntity.class); - modelMap.put(NormalExcelConstants.PARAMS,new ExportParams("审批配置列表", "导出人:"+ ResourceUtil.getSessionUser().getRealName(), - "导出信息")); - modelMap.put(NormalExcelConstants.DATA_LIST,tWzSpConfs); - return NormalExcelConstants.JEECG_EXCEL_VIEW; - } - /** - * 导出excel 使模板 - * - * @param request - * @param response - */ - @RequestMapping(params = "exportXlsByT") - public String exportXlsByT(TWzSpConfEntity tWzSpConf, HttpServletRequest request, HttpServletResponse response - , DataGrid dataGrid, ModelMap modelMap) { - modelMap.put(NormalExcelConstants.FILE_NAME,"审批配置"); - modelMap.put(NormalExcelConstants.CLASS,TWzSpConfEntity.class); - modelMap.put(NormalExcelConstants.PARAMS,new ExportParams("审批配置列表", "导出人:"+ ResourceUtil.getSessionUser().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 listTWzSpConfEntitys = ExcelImportUtil.importExcel(file.getInputStream(),TWzSpConfEntity.class,params); - for (TWzSpConfEntity tWzSpConf : listTWzSpConfEntitys) { - tWzSpConfService.save(tWzSpConf); - } - 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 - @ApiOperation(value="审批配置列表信息",produces="application/json",httpMethod="GET") - public ResponseMessage> list() { - List listTWzSpConfs=tWzSpConfService.getList(TWzSpConfEntity.class); - return Result.success(listTWzSpConfs); - } - - @RequestMapping(value = "/{id}", method = RequestMethod.GET) - @ResponseBody - @ApiOperation(value="根据ID获取审批配置信息",notes="根据ID获取审批配置信息",httpMethod="GET",produces="application/json") - public ResponseMessage get(@ApiParam(required=true,name="id",value="ID")@PathVariable("id") String id) { - TWzSpConfEntity task = tWzSpConfService.get(TWzSpConfEntity.class, id); - if (task == null) { - return Result.error("根据ID获取审批配置信息为空"); - } - return Result.success(task); - } - - @RequestMapping(method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE) - @ResponseBody - @ApiOperation(value="创建审批配置") - public ResponseMessage create(@ApiParam(name="审批配置对象")@RequestBody TWzSpConfEntity tWzSpConf, UriComponentsBuilder uriBuilder) { - //调用JSR303 Bean Validator进行校验，如果出错返回含400错误码及json格式的错误信息. - Set> failures = validator.validate(tWzSpConf); - if (!failures.isEmpty()) { - return Result.error(JSONArray.toJSONString(BeanValidators.extractPropertyAndMessage(failures))); - } - - //保存 - try{ - tWzSpConfService.save(tWzSpConf); - } catch (Exception e) { - e.printStackTrace(); - return Result.error("审批配置信息保存失败"); - } - return Result.success(tWzSpConf); - } - - @RequestMapping(value = "/{id}", method = RequestMethod.PUT, consumes = MediaType.APPLICATION_JSON_VALUE) - @ResponseBody - @ApiOperation(value="更新审批配置",notes="更新审批配置") - public ResponseMessage update(@ApiParam(name="审批配置对象")@RequestBody TWzSpConfEntity tWzSpConf) { - //调用JSR303 Bean Validator进行校验，如果出错返回含400错误码及json格式的错误信息. - Set> failures = validator.validate(tWzSpConf); - if (!failures.isEmpty()) { - return Result.error(JSONArray.toJSONString(BeanValidators.extractPropertyAndMessage(failures))); - } - - //保存 - try{ - tWzSpConfService.saveOrUpdate(tWzSpConf); - } catch (Exception e) { - e.printStackTrace(); - return Result.error("更新审批配置信息失败"); - } - - //按Restful约定，返回204状态码, 无内容. 也可以返回200状态码. - return Result.success("更新审批配置信息成功"); - } - - @RequestMapping(value = "/{id}", method = RequestMethod.DELETE) - @ResponseStatus(HttpStatus.NO_CONTENT) - @ApiOperation(value="删除审批配置") - public ResponseMessage delete(@ApiParam(name="id",value="ID",required=true)@PathVariable("id") String id) { - logger.info("delete[{}]" + id); - // 验证 - if (StringUtils.isEmpty(id)) { - return Result.error("ID不能为空"); - } - try { - tWzSpConfService.deleteEntityById(TWzSpConfEntity.class, id); - } catch (Exception e) { - e.printStackTrace(); - return Result.error("审批配置删除失败"); - } - - return Result.success(); - } -} diff --git a/src/main/java/com/zzjee/wz/entity/TWzLocationEntity.java b/src/main/java/com/zzjee/wz/entity/TWzLocationEntity.java deleted file mode 100644 index a21dee83..00000000 --- a/src/main/java/com/zzjee/wz/entity/TWzLocationEntity.java +++ /dev/null @@ -1,233 +0,0 @@ -package com.zzjee.wz.entity; - -import org.jeecgframework.poi.excel.annotation.Excel; - -import javax.persistence.*; -import java.util.Date; - -/** - * @Title: Entity - * @Description: 仓库 - * @author onlineGenerator - * @date 2018-05-20 21:41:04 - * @version V1.0 - * - */ -@Entity -@Table(name = "t_wz_location", schema = "") -@SuppressWarnings("serial") -public class TWzLocationEntity implements java.io.Serializable { - /**主键*/ - private Integer id; - /**创建人名称*/ - private String createName; - /**创建人登录名称*/ - private String createBy; - /**创建日期*/ - private Date createDate; - /**更新人名称*/ - private String updateName; - /**更新人登录名称*/ - private String updateBy; - /**更新日期*/ - private Date updateDate; - /**所属部门*/ - private String sysOrgCode; - /**所属公司*/ - private String sysCompanyCode; - /**流程状态*/ - private String bpmStatus; - /**仓库*/ - @Excel(name="仓库",width=15) - private String matLocation; - - /** - *方法: 取得java.lang.Integer - *@return: java.lang.Integer 主键 - */ - @Id - @GeneratedValue(strategy = GenerationType.AUTO) - - @Column(name ="ID",nullable=false,length=20) - public Integer getId(){ - return this.id; - } - - /** - *方法: 设置java.lang.Integer - *@param: java.lang.Integer 主键 - */ - public void setId(Integer id){ - this.id = id; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 创建人名称 - */ - - @Column(name ="CREATE_NAME",nullable=true,length=50) - public String getCreateName(){ - return this.createName; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 创建人名称 - */ - public void setCreateName(String createName){ - this.createName = createName; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 创建人登录名称 - */ - - @Column(name ="CREATE_BY",nullable=true,length=50) - public String getCreateBy(){ - return this.createBy; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 创建人登录名称 - */ - public void setCreateBy(String createBy){ - this.createBy = createBy; - } - /** - *方法: 取得java.util.Date - *@return: java.util.Date 创建日期 - */ - - @Column(name ="CREATE_DATE",nullable=true,length=20) - public Date getCreateDate(){ - return this.createDate; - } - - /** - *方法: 设置java.util.Date - *@param: java.util.Date 创建日期 - */ - public void setCreateDate(Date createDate){ - this.createDate = createDate; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 更新人名称 - */ - - @Column(name ="UPDATE_NAME",nullable=true,length=50) - public String getUpdateName(){ - return this.updateName; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 更新人名称 - */ - public void setUpdateName(String updateName){ - this.updateName = updateName; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 更新人登录名称 - */ - - @Column(name ="UPDATE_BY",nullable=true,length=50) - public String getUpdateBy(){ - return this.updateBy; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 更新人登录名称 - */ - public void setUpdateBy(String updateBy){ - this.updateBy = updateBy; - } - /** - *方法: 取得java.util.Date - *@return: java.util.Date 更新日期 - */ - - @Column(name ="UPDATE_DATE",nullable=true,length=20) - public Date getUpdateDate(){ - return this.updateDate; - } - - /** - *方法: 设置java.util.Date - *@param: java.util.Date 更新日期 - */ - public void setUpdateDate(Date updateDate){ - this.updateDate = updateDate; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 所属部门 - */ - - @Column(name ="SYS_ORG_CODE",nullable=true,length=50) - public String getSysOrgCode(){ - return this.sysOrgCode; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 所属部门 - */ - public void setSysOrgCode(String sysOrgCode){ - this.sysOrgCode = sysOrgCode; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 所属公司 - */ - - @Column(name ="SYS_COMPANY_CODE",nullable=true,length=50) - public String getSysCompanyCode(){ - return this.sysCompanyCode; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 所属公司 - */ - public void setSysCompanyCode(String sysCompanyCode){ - this.sysCompanyCode = sysCompanyCode; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 流程状态 - */ - - @Column(name ="BPM_STATUS",nullable=true,length=32) - public String getBpmStatus(){ - return this.bpmStatus; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 流程状态 - */ - public void setBpmStatus(String bpmStatus){ - this.bpmStatus = bpmStatus; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 仓库 - */ - - @Column(name ="MAT_LOCATION",nullable=true,length=32) - public String getMatLocation(){ - return this.matLocation; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 仓库 - */ - public void setMatLocation(String matLocation){ - this.matLocation = matLocation; - } -} diff --git a/src/main/java/com/zzjee/wz/entity/TWzMaterialEntity.java b/src/main/java/com/zzjee/wz/entity/TWzMaterialEntity.java deleted file mode 100644 index 049715c7..00000000 --- a/src/main/java/com/zzjee/wz/entity/TWzMaterialEntity.java +++ /dev/null @@ -1,509 +0,0 @@ -package com.zzjee.wz.entity; - -import org.jeecgframework.poi.excel.annotation.Excel; - -import javax.persistence.*; -import java.math.BigDecimal; -import java.util.Date; - -/** - * @Title: Entity - * @Description: 物料 - * @author onlineGenerator - * @date 2018-05-20 21:40:03 - * @version V1.0 - * - */ -@Entity -@Table(name = "t_wz_material", schema = "") -@SuppressWarnings("serial") -public class TWzMaterialEntity implements java.io.Serializable { - /**主键*/ - private Integer id; - /**创建人名称*/ - private String createName; - /**创建人登录名称*/ - private String createBy; - /**创建日期*/ - private Date createDate; - /**更新人名称*/ - private String updateName; - /**更新人登录名称*/ - private String updateBy; - /**更新日期*/ - private Date updateDate; - /**所属部门*/ - private String sysOrgCode; - /**所属公司*/ - private String sysCompanyCode; - /**流程状态*/ - private String bpmStatus; - /**物料编码*/ - @Excel(name="物料编码",width=15) - private String matCode; - /**物料名称*/ - @Excel(name="物料名称",width=15) - private String matName; - /**单位*/ - @Excel(name="单位",width=15,dictTable ="ba_unit",dicCode ="UNIT_CODE",dicText ="UNIT_ZH_NAME") - private String matUnit; - /**规格*/ - @Excel(name="规格",width=15) - private String matGuige; - /**等级*/ - @Excel(name="等级",width=15) - private String matClass; - /**标准价元*/ - @Excel(name="标准价元",width=15) - private BigDecimal matPrice; - /**安全库存*/ - @Excel(name="安全库存",width=15) - private Integer matAqkc; - /**仓库*/ - @Excel(name="仓库",width=15,dictTable ="t_wz_location",dicCode ="mat_location",dicText ="mat_location") - private String matLocation; - /**备用1*/ - private String by1; - /**备用2*/ - private String by2; - /**备用3*/ - private String by3; - /**备用4*/ - private String by4; - /**备用5*/ - private String by5; - private String by6; - private String by7; - private String by8; - private String by9; - - /** - *方法: 取得java.lang.Integer - *@return: java.lang.Integer 主键 - */ - @Id - @GeneratedValue(strategy = GenerationType.AUTO) - - @Column(name ="ID",nullable=false,length=20) - public Integer getId(){ - return this.id; - } - - /** - *方法: 设置java.lang.Integer - *@param: java.lang.Integer 主键 - */ - public void setId(Integer id){ - this.id = id; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 创建人名称 - */ - - @Column(name ="CREATE_NAME",nullable=true,length=50) - public String getCreateName(){ - return this.createName; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 创建人名称 - */ - public void setCreateName(String createName){ - this.createName = createName; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 创建人登录名称 - */ - - @Column(name ="CREATE_BY",nullable=true,length=50) - public String getCreateBy(){ - return this.createBy; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 创建人登录名称 - */ - public void setCreateBy(String createBy){ - this.createBy = createBy; - } - /** - *方法: 取得java.util.Date - *@return: java.util.Date 创建日期 - */ - - @Column(name ="CREATE_DATE",nullable=true,length=20) - public Date getCreateDate(){ - return this.createDate; - } - - /** - *方法: 设置java.util.Date - *@param: java.util.Date 创建日期 - */ - public void setCreateDate(Date createDate){ - this.createDate = createDate; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 更新人名称 - */ - - @Column(name ="UPDATE_NAME",nullable=true,length=50) - public String getUpdateName(){ - return this.updateName; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 更新人名称 - */ - public void setUpdateName(String updateName){ - this.updateName = updateName; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 更新人登录名称 - */ - - @Column(name ="UPDATE_BY",nullable=true,length=50) - public String getUpdateBy(){ - return this.updateBy; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 更新人登录名称 - */ - public void setUpdateBy(String updateBy){ - this.updateBy = updateBy; - } - /** - *方法: 取得java.util.Date - *@return: java.util.Date 更新日期 - */ - - @Column(name ="UPDATE_DATE",nullable=true,length=20) - public Date getUpdateDate(){ - return this.updateDate; - } - - /** - *方法: 设置java.util.Date - *@param: java.util.Date 更新日期 - */ - public void setUpdateDate(Date updateDate){ - this.updateDate = updateDate; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 所属部门 - */ - - @Column(name ="SYS_ORG_CODE",nullable=true,length=50) - public String getSysOrgCode(){ - return this.sysOrgCode; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 所属部门 - */ - public void setSysOrgCode(String sysOrgCode){ - this.sysOrgCode = sysOrgCode; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 所属公司 - */ - - @Column(name ="SYS_COMPANY_CODE",nullable=true,length=50) - public String getSysCompanyCode(){ - return this.sysCompanyCode; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 所属公司 - */ - public void setSysCompanyCode(String sysCompanyCode){ - this.sysCompanyCode = sysCompanyCode; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 流程状态 - */ - - @Column(name ="BPM_STATUS",nullable=true,length=32) - public String getBpmStatus(){ - return this.bpmStatus; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 流程状态 - */ - public void setBpmStatus(String bpmStatus){ - this.bpmStatus = bpmStatus; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 物料编码 - */ - - @Column(name ="MAT_CODE",nullable=true,length=32) - public String getMatCode(){ - return this.matCode; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 物料编码 - */ - public void setMatCode(String matCode){ - this.matCode = matCode; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 物料名称 - */ - - @Column(name ="MAT_NAME",nullable=true,length=132) - public String getMatName(){ - return this.matName; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 物料名称 - */ - public void setMatName(String matName){ - this.matName = matName; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 单位 - */ - - @Column(name ="MAT_UNIT",nullable=true,length=32) - public String getMatUnit(){ - return this.matUnit; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 单位 - */ - public void setMatUnit(String matUnit){ - this.matUnit = matUnit; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 规格 - */ - - @Column(name ="MAT_GUIGE",nullable=true,length=32) - public String getMatGuige(){ - return this.matGuige; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 规格 - */ - public void setMatGuige(String matGuige){ - this.matGuige = matGuige; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 等级 - */ - - @Column(name ="MAT_CLASS",nullable=true,length=32) - public String getMatClass(){ - return this.matClass; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 等级 - */ - public void setMatClass(String matClass){ - this.matClass = matClass; - } - /** - *方法: 取得java.math.BigDecimal - *@return: java.math.BigDecimal 标准价元 - */ - - @Column(name ="MAT_PRICE",nullable=true,length=32) - public BigDecimal getMatPrice(){ - return this.matPrice; - } - - /** - *方法: 设置java.math.BigDecimal - *@param: java.math.BigDecimal 标准价元 - */ - public void setMatPrice(BigDecimal matPrice){ - this.matPrice = matPrice; - } - /** - *方法: 取得java.lang.Integer - *@return: java.lang.Integer 安全库存 - */ - - @Column(name ="MAT_AQKC",nullable=true,length=32) - public Integer getMatAqkc(){ - return this.matAqkc; - } - - /** - *方法: 设置java.lang.Integer - *@param: java.lang.Integer 安全库存 - */ - public void setMatAqkc(Integer matAqkc){ - this.matAqkc = matAqkc; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 仓库 - */ - - @Column(name ="MAT_LOCATION",nullable=true,length=32) - public String getMatLocation(){ - return this.matLocation; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 仓库 - */ - public void setMatLocation(String matLocation){ - this.matLocation = matLocation; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 备用1 - */ - - @Column(name ="BY1",nullable=true,length=32) - public String getBy1(){ - return this.by1; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 备用1 - */ - public void setBy1(String by1){ - this.by1 = by1; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 备用2 - */ - - @Column(name ="BY2",nullable=true,length=32) - public String getBy2(){ - return this.by2; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 备用2 - */ - public void setBy2(String by2){ - this.by2 = by2; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 备用3 - */ - - @Column(name ="BY3",nullable=true,length=32) - public String getBy3(){ - return this.by3; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 备用3 - */ - public void setBy3(String by3){ - this.by3 = by3; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 备用4 - */ - - @Column(name ="BY4",nullable=true,length=32) - public String getBy4(){ - return this.by4; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 备用4 - */ - public void setBy4(String by4){ - this.by4 = by4; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 备用5 - */ - - @Column(name ="BY5",nullable=true,length=32) - public String getBy5(){ - return this.by5; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 备用5 - */ - public void setBy5(String by5){ - this.by5 = by5; - } - - @Column(name ="BY6",nullable=true,length=32) - public String getBy6() { - return by6; - } - - public void setBy6(String by6) { - this.by6 = by6; - } - - @Column(name ="BY7",nullable=true,length=32) - public String getBy7() { - return by7; - } - - public void setBy7(String by7) { - this.by7 = by7; - } - - @Column(name ="BY8",nullable=true,length=32) - public String getBy8() { - return by8; - } - - public void setBy8(String by8) { - this.by8 = by8; - } - - @Column(name ="BY9",nullable=true,length=32) - public String getBy9() { - return by9; - } - - public void setBy9(String by9) { - this.by9 = by9; - } -} diff --git a/src/main/java/com/zzjee/wz/entity/TWzSpConfEntity.java b/src/main/java/com/zzjee/wz/entity/TWzSpConfEntity.java deleted file mode 100644 index a96a38d5..00000000 --- a/src/main/java/com/zzjee/wz/entity/TWzSpConfEntity.java +++ /dev/null @@ -1,293 +0,0 @@ -package com.zzjee.wz.entity; - -import org.jeecgframework.poi.excel.annotation.Excel; - -import javax.persistence.*; -import java.util.Date; - -/** - * @Title: Entity - * @Description: 审批配置 - * @author onlineGenerator - * @date 2018-05-20 21:40:51 - * @version V1.0 - * - */ -@Entity -@Table(name = "t_wz_sp_conf", schema = "") -@SuppressWarnings("serial") -public class TWzSpConfEntity implements java.io.Serializable { - /**主键*/ - private Integer id; - /**创建人名称*/ - private String createName; - /**创建人登录名称*/ - private String createBy; - /**创建日期*/ - private Date createDate; - /**更新人名称*/ - private String updateName; - /**更新人登录名称*/ - private String updateBy; - /**更新日期*/ - private Date updateDate; - /**所属部门*/ - private String sysOrgCode; - /**所属公司*/ - private String sysCompanyCode; - /**流程状态*/ - private String bpmStatus; - /**审批类型*/ - @Excel(name="审批类型",width=15) - private String spType; - /**最低金额*/ - @Excel(name="最低金额",width=15) - private String spJine; - /**审批人*/ - @Excel(name="审批人",width=15) - private String spUsername; - /**备注*/ - @Excel(name="备注",width=15) - private String spRemark; - - /** - *方法: 取得java.lang.Integer - *@return: java.lang.Integer 主键 - */ - @Id - @GeneratedValue(strategy = GenerationType.AUTO) - - @Column(name ="ID",nullable=false,length=20) - public Integer getId(){ - return this.id; - } - - /** - *方法: 设置java.lang.Integer - *@param: java.lang.Integer 主键 - */ - public void setId(Integer id){ - this.id = id; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 创建人名称 - */ - - @Column(name ="CREATE_NAME",nullable=true,length=50) - public String getCreateName(){ - return this.createName; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 创建人名称 - */ - public void setCreateName(String createName){ - this.createName = createName; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 创建人登录名称 - */ - - @Column(name ="CREATE_BY",nullable=true,length=50) - public String getCreateBy(){ - return this.createBy; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 创建人登录名称 - */ - public void setCreateBy(String createBy){ - this.createBy = createBy; - } - /** - *方法: 取得java.util.Date - *@return: java.util.Date 创建日期 - */ - - @Column(name ="CREATE_DATE",nullable=true,length=20) - public Date getCreateDate(){ - return this.createDate; - } - - /** - *方法: 设置java.util.Date - *@param: java.util.Date 创建日期 - */ - public void setCreateDate(Date createDate){ - this.createDate = createDate; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 更新人名称 - */ - - @Column(name ="UPDATE_NAME",nullable=true,length=50) - public String getUpdateName(){ - return this.updateName; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 更新人名称 - */ - public void setUpdateName(String updateName){ - this.updateName = updateName; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 更新人登录名称 - */ - - @Column(name ="UPDATE_BY",nullable=true,length=50) - public String getUpdateBy(){ - return this.updateBy; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 更新人登录名称 - */ - public void setUpdateBy(String updateBy){ - this.updateBy = updateBy; - } - /** - *方法: 取得java.util.Date - *@return: java.util.Date 更新日期 - */ - - @Column(name ="UPDATE_DATE",nullable=true,length=20) - public Date getUpdateDate(){ - return this.updateDate; - } - - /** - *方法: 设置java.util.Date - *@param: java.util.Date 更新日期 - */ - public void setUpdateDate(Date updateDate){ - this.updateDate = updateDate; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 所属部门 - */ - - @Column(name ="SYS_ORG_CODE",nullable=true,length=50) - public String getSysOrgCode(){ - return this.sysOrgCode; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 所属部门 - */ - public void setSysOrgCode(String sysOrgCode){ - this.sysOrgCode = sysOrgCode; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 所属公司 - */ - - @Column(name ="SYS_COMPANY_CODE",nullable=true,length=50) - public String getSysCompanyCode(){ - return this.sysCompanyCode; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 所属公司 - */ - public void setSysCompanyCode(String sysCompanyCode){ - this.sysCompanyCode = sysCompanyCode; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 流程状态 - */ - - @Column(name ="BPM_STATUS",nullable=true,length=32) - public String getBpmStatus(){ - return this.bpmStatus; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 流程状态 - */ - public void setBpmStatus(String bpmStatus){ - this.bpmStatus = bpmStatus; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 审批类型 - */ - - @Column(name ="SP_TYPE",nullable=true,length=32) - public String getSpType(){ - return this.spType; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 审批类型 - */ - public void setSpType(String spType){ - this.spType = spType; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 最低金额 - */ - - @Column(name ="SP_JINE",nullable=true,length=32) - public String getSpJine(){ - return this.spJine; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 最低金额 - */ - public void setSpJine(String spJine){ - this.spJine = spJine; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 审批人 - */ - - @Column(name ="SP_USERNAME",nullable=true,length=32) - public String getSpUsername(){ - return this.spUsername; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 审批人 - */ - public void setSpUsername(String spUsername){ - this.spUsername = spUsername; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 备注 - */ - - @Column(name ="SP_REMARK",nullable=true,length=132) - public String getSpRemark(){ - return this.spRemark; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 备注 - */ - public void setSpRemark(String spRemark){ - this.spRemark = spRemark; - } -} diff --git a/src/main/java/com/zzjee/wz/service/TWzLocationServiceI.java b/src/main/java/com/zzjee/wz/service/TWzLocationServiceI.java deleted file mode 100644 index 55538005..00000000 --- a/src/main/java/com/zzjee/wz/service/TWzLocationServiceI.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.zzjee.wz.service; -import com.zzjee.wz.entity.TWzLocationEntity; -import org.jeecgframework.core.common.service.CommonService; - -import java.io.Serializable; - -public interface TWzLocationServiceI extends CommonService { - - public void delete(TWzLocationEntity entity) throws Exception; - - public Serializable save(TWzLocationEntity entity) throws Exception; - - public void saveOrUpdate(TWzLocationEntity entity) throws Exception; - -} diff --git a/src/main/java/com/zzjee/wz/service/TWzMaterialServiceI.java b/src/main/java/com/zzjee/wz/service/TWzMaterialServiceI.java deleted file mode 100644 index 2a57f091..00000000 --- a/src/main/java/com/zzjee/wz/service/TWzMaterialServiceI.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.zzjee.wz.service; -import com.zzjee.wz.entity.TWzMaterialEntity; -import org.jeecgframework.core.common.service.CommonService; - -import java.io.Serializable; - -public interface TWzMaterialServiceI extends CommonService { - - public void delete(TWzMaterialEntity entity) throws Exception; - - public Serializable save(TWzMaterialEntity entity) throws Exception; - - public void saveOrUpdate(TWzMaterialEntity entity) throws Exception; - -} diff --git a/src/main/java/com/zzjee/wz/service/TWzSpConfServiceI.java b/src/main/java/com/zzjee/wz/service/TWzSpConfServiceI.java deleted file mode 100644 index b56e5581..00000000 --- a/src/main/java/com/zzjee/wz/service/TWzSpConfServiceI.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.zzjee.wz.service; -import com.zzjee.wz.entity.TWzSpConfEntity; -import org.jeecgframework.core.common.service.CommonService; - -import java.io.Serializable; - -public interface TWzSpConfServiceI extends CommonService { - - public void delete(TWzSpConfEntity entity) throws Exception; - - public Serializable save(TWzSpConfEntity entity) throws Exception; - - public void saveOrUpdate(TWzSpConfEntity entity) throws Exception; - -} diff --git a/src/main/java/com/zzjee/wz/service/impl/TWzLocationServiceImpl.java b/src/main/java/com/zzjee/wz/service/impl/TWzLocationServiceImpl.java deleted file mode 100644 index fa372cfd..00000000 --- a/src/main/java/com/zzjee/wz/service/impl/TWzLocationServiceImpl.java +++ /dev/null @@ -1,144 +0,0 @@ -package com.zzjee.wz.service.impl; - - -import com.zzjee.wz.entity.TWzLocationEntity; -import com.zzjee.wz.service.TWzLocationServiceI; -import org.jeecgframework.core.common.service.impl.CommonServiceImpl; -import org.jeecgframework.core.util.ApplicationContextUtil; -import org.jeecgframework.core.util.MyClassLoader; -import org.jeecgframework.core.util.StringUtil; -import org.jeecgframework.web.cgform.enhance.CgformEnhanceJavaInter; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.io.Serializable; -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; - -@Service("tWzLocationService") -@Transactional -public class TWzLocationServiceImpl extends CommonServiceImpl implements TWzLocationServiceI { - - - @Override - public void delete(TWzLocationEntity entity) throws Exception{ - super.delete(entity); - //执行删除操作增强业务 - this.doDelBus(entity); - } - - @Override - public Serializable save(TWzLocationEntity entity) throws Exception{ - Serializable t = super.save(entity); - //执行新增操作增强业务 - this.doAddBus(entity); - return t; - } - - @Override - public void saveOrUpdate(TWzLocationEntity entity) throws Exception{ - super.saveOrUpdate(entity); - //执行更新操作增强业务 - this.doUpdateBus(entity); - } - - /** - * 新增操作增强业务 - * @param t - * @return - */ - private void doAddBus(TWzLocationEntity t) throws Exception{ - //-----------------sql增强 start---------------------------- - //-----------------sql增强 end------------------------------ - - //-----------------java增强 start--------------------------- - //-----------------java增强 end----------------------------- - } - /** - * 更新操作增强业务 - * @param t - * @return - */ - private void doUpdateBus(TWzLocationEntity t) throws Exception{ - //-----------------sql增强 start---------------------------- - //-----------------sql增强 end------------------------------ - - //-----------------java增强 start--------------------------- - //-----------------java增强 end----------------------------- - } - /** - * 删除操作增强业务 - * @param t - * @return - */ - private void doDelBus(TWzLocationEntity t) throws Exception{ - //-----------------sql增强 start---------------------------- - //-----------------sql增强 end------------------------------ - - //-----------------java增强 start--------------------------- - //-----------------java增强 end----------------------------- - } - - private Map populationMap(TWzLocationEntity t){ - Map map = new HashMap(); - map.put("id", t.getId()); - map.put("create_name", t.getCreateName()); - map.put("create_by", t.getCreateBy()); - map.put("create_date", t.getCreateDate()); - map.put("update_name", t.getUpdateName()); - map.put("update_by", t.getUpdateBy()); - map.put("update_date", t.getUpdateDate()); - map.put("sys_org_code", t.getSysOrgCode()); - map.put("sys_company_code", t.getSysCompanyCode()); - map.put("bpm_status", t.getBpmStatus()); - map.put("mat_location", t.getMatLocation()); - return map; - } - - /** - * 替换sql中的变量 - * @param sql - * @param t - * @return - */ - public String replaceVal(String sql,TWzLocationEntity t){ - sql = sql.replace("#{id}",String.valueOf(t.getId())); - sql = sql.replace("#{create_name}",String.valueOf(t.getCreateName())); - sql = sql.replace("#{create_by}",String.valueOf(t.getCreateBy())); - sql = sql.replace("#{create_date}",String.valueOf(t.getCreateDate())); - sql = sql.replace("#{update_name}",String.valueOf(t.getUpdateName())); - sql = sql.replace("#{update_by}",String.valueOf(t.getUpdateBy())); - sql = sql.replace("#{update_date}",String.valueOf(t.getUpdateDate())); - sql = sql.replace("#{sys_org_code}",String.valueOf(t.getSysOrgCode())); - sql = sql.replace("#{sys_company_code}",String.valueOf(t.getSysCompanyCode())); - sql = sql.replace("#{bpm_status}",String.valueOf(t.getBpmStatus())); - sql = sql.replace("#{mat_location}",String.valueOf(t.getMatLocation())); - sql = sql.replace("#{UUID}",UUID.randomUUID().toString()); - return sql; - } - - /** - * 执行JAVA增强 - */ - private void executeJavaExtend(String cgJavaType,String cgJavaValue,Map data) throws Exception { - if(StringUtil.isNotEmpty(cgJavaValue)){ - Object obj = null; - try { - if("class".equals(cgJavaType)){ - //因新增时已经校验了实例化是否可以成功，所以这块就不需要再做一次判断 - obj = MyClassLoader.getClassByScn(cgJavaValue).newInstance(); - }else if("spring".equals(cgJavaType)){ - obj = ApplicationContextUtil.getContext().getBean(cgJavaValue); - } - if(obj instanceof CgformEnhanceJavaInter){ - CgformEnhanceJavaInter javaInter = (CgformEnhanceJavaInter) obj; - javaInter.execute("t_wz_location",data); - } - } catch (Exception e) { - e.printStackTrace(); - throw new Exception("执行JAVA增强出现异常！"); - } - } - } -} \ No newline at end of file diff --git a/src/main/java/com/zzjee/wz/service/impl/TWzMaterialServiceImpl.java b/src/main/java/com/zzjee/wz/service/impl/TWzMaterialServiceImpl.java deleted file mode 100644 index e7cd2396..00000000 --- a/src/main/java/com/zzjee/wz/service/impl/TWzMaterialServiceImpl.java +++ /dev/null @@ -1,168 +0,0 @@ -package com.zzjee.wz.service.impl; - - -import com.zzjee.wz.entity.TWzMaterialEntity; -import com.zzjee.wz.service.TWzMaterialServiceI; -import org.jeecgframework.core.common.service.impl.CommonServiceImpl; -import org.jeecgframework.core.util.ApplicationContextUtil; -import org.jeecgframework.core.util.MyClassLoader; -import org.jeecgframework.core.util.StringUtil; -import org.jeecgframework.web.cgform.enhance.CgformEnhanceJavaInter; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.io.Serializable; -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; - -@Service("tWzMaterialService") -@Transactional -public class TWzMaterialServiceImpl extends CommonServiceImpl implements TWzMaterialServiceI { - - - @Override - public void delete(TWzMaterialEntity entity) throws Exception{ - super.delete(entity); - //执行删除操作增强业务 - this.doDelBus(entity); - } - - @Override - public Serializable save(TWzMaterialEntity entity) throws Exception{ - Serializable t = super.save(entity); - //执行新增操作增强业务 - this.doAddBus(entity); - return t; - } - - @Override - public void saveOrUpdate(TWzMaterialEntity entity) throws Exception{ - super.saveOrUpdate(entity); - //执行更新操作增强业务 - this.doUpdateBus(entity); - } - - /** - * 新增操作增强业务 - * @param t - * @return - */ - private void doAddBus(TWzMaterialEntity t) throws Exception{ - //-----------------sql增强 start---------------------------- - //-----------------sql增强 end------------------------------ - - //-----------------java增强 start--------------------------- - //-----------------java增强 end----------------------------- - } - /** - * 更新操作增强业务 - * @param t - * @return - */ - private void doUpdateBus(TWzMaterialEntity t) throws Exception{ - //-----------------sql增强 start---------------------------- - //-----------------sql增强 end------------------------------ - - //-----------------java增强 start--------------------------- - //-----------------java增强 end----------------------------- - } - /** - * 删除操作增强业务 - * @param t - * @return - */ - private void doDelBus(TWzMaterialEntity t) throws Exception{ - //-----------------sql增强 start---------------------------- - //-----------------sql增强 end------------------------------ - - //-----------------java增强 start--------------------------- - //-----------------java增强 end----------------------------- - } - - private Map populationMap(TWzMaterialEntity t){ - Map map = new HashMap(); - map.put("id", t.getId()); - map.put("create_name", t.getCreateName()); - map.put("create_by", t.getCreateBy()); - map.put("create_date", t.getCreateDate()); - map.put("update_name", t.getUpdateName()); - map.put("update_by", t.getUpdateBy()); - map.put("update_date", t.getUpdateDate()); - map.put("sys_org_code", t.getSysOrgCode()); - map.put("sys_company_code", t.getSysCompanyCode()); - map.put("bpm_status", t.getBpmStatus()); - map.put("mat_code", t.getMatCode()); - map.put("mat_name", t.getMatName()); - map.put("mat_unit", t.getMatUnit()); - map.put("mat_guige", t.getMatGuige()); - map.put("mat_class", t.getMatClass()); - map.put("mat_price", t.getMatPrice()); - map.put("mat_aqkc", t.getMatAqkc()); - map.put("mat_location", t.getMatLocation()); - map.put("by1", t.getBy1()); - map.put("by2", t.getBy2()); - map.put("by3", t.getBy3()); - map.put("by4", t.getBy4()); - map.put("by5", t.getBy5()); - return map; - } - - /** - * 替换sql中的变量 - * @param sql - * @param t - * @return - */ - public String replaceVal(String sql, TWzMaterialEntity t){ - sql = sql.replace("#{id}",String.valueOf(t.getId())); - sql = sql.replace("#{create_name}",String.valueOf(t.getCreateName())); - sql = sql.replace("#{create_by}",String.valueOf(t.getCreateBy())); - sql = sql.replace("#{create_date}",String.valueOf(t.getCreateDate())); - sql = sql.replace("#{update_name}",String.valueOf(t.getUpdateName())); - sql = sql.replace("#{update_by}",String.valueOf(t.getUpdateBy())); - sql = sql.replace("#{update_date}",String.valueOf(t.getUpdateDate())); - sql = sql.replace("#{sys_org_code}",String.valueOf(t.getSysOrgCode())); - sql = sql.replace("#{sys_company_code}",String.valueOf(t.getSysCompanyCode())); - sql = sql.replace("#{bpm_status}",String.valueOf(t.getBpmStatus())); - sql = sql.replace("#{mat_code}",String.valueOf(t.getMatCode())); - sql = sql.replace("#{mat_name}",String.valueOf(t.getMatName())); - sql = sql.replace("#{mat_unit}",String.valueOf(t.getMatUnit())); - sql = sql.replace("#{mat_guige}",String.valueOf(t.getMatGuige())); - sql = sql.replace("#{mat_class}",String.valueOf(t.getMatClass())); - sql = sql.replace("#{mat_price}",String.valueOf(t.getMatPrice())); - sql = sql.replace("#{mat_aqkc}",String.valueOf(t.getMatAqkc())); - sql = sql.replace("#{mat_location}",String.valueOf(t.getMatLocation())); - sql = sql.replace("#{by1}",String.valueOf(t.getBy1())); - sql = sql.replace("#{by2}",String.valueOf(t.getBy2())); - sql = sql.replace("#{by3}",String.valueOf(t.getBy3())); - sql = sql.replace("#{by4}",String.valueOf(t.getBy4())); - sql = sql.replace("#{by5}",String.valueOf(t.getBy5())); - sql = sql.replace("#{UUID}",UUID.randomUUID().toString()); - return sql; - } - - /** - * 执行JAVA增强 - */ - private void executeJavaExtend(String cgJavaType,String cgJavaValue,Map data) throws Exception { - if(StringUtil.isNotEmpty(cgJavaValue)){ - Object obj = null; - try { - if("class".equals(cgJavaType)){ - //因新增时已经校验了实例化是否可以成功，所以这块就不需要再做一次判断 - obj = MyClassLoader.getClassByScn(cgJavaValue).newInstance(); - }else if("spring".equals(cgJavaType)){ - obj = ApplicationContextUtil.getContext().getBean(cgJavaValue); - } - if(obj instanceof CgformEnhanceJavaInter){ - CgformEnhanceJavaInter javaInter = (CgformEnhanceJavaInter) obj; - javaInter.execute("t_wz_material",data); - } - } catch (Exception e) { - e.printStackTrace(); - throw new Exception("执行JAVA增强出现异常！"); - } - } - } -} diff --git a/src/main/java/com/zzjee/wz/service/impl/TWzSpConfServiceImpl.java b/src/main/java/com/zzjee/wz/service/impl/TWzSpConfServiceImpl.java deleted file mode 100644 index da42af69..00000000 --- a/src/main/java/com/zzjee/wz/service/impl/TWzSpConfServiceImpl.java +++ /dev/null @@ -1,150 +0,0 @@ -package com.zzjee.wz.service.impl; - - -import com.zzjee.wz.entity.TWzSpConfEntity; -import com.zzjee.wz.service.TWzSpConfServiceI; -import org.jeecgframework.core.common.service.impl.CommonServiceImpl; -import org.jeecgframework.core.util.ApplicationContextUtil; -import org.jeecgframework.core.util.MyClassLoader; -import org.jeecgframework.core.util.StringUtil; -import org.jeecgframework.web.cgform.enhance.CgformEnhanceJavaInter; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.io.Serializable; -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; - -@Service("tWzSpConfService") -@Transactional -public class TWzSpConfServiceImpl extends CommonServiceImpl implements TWzSpConfServiceI { - - - @Override - public void delete(TWzSpConfEntity entity) throws Exception{ - super.delete(entity); - //执行删除操作增强业务 - this.doDelBus(entity); - } - - @Override - public Serializable save(TWzSpConfEntity entity) throws Exception{ - Serializable t = super.save(entity); - //执行新增操作增强业务 - this.doAddBus(entity); - return t; - } - - @Override - public void saveOrUpdate(TWzSpConfEntity entity) throws Exception{ - super.saveOrUpdate(entity); - //执行更新操作增强业务 - this.doUpdateBus(entity); - } - - /** - * 新增操作增强业务 - * @param t - * @return - */ - private void doAddBus(TWzSpConfEntity t) throws Exception{ - //-----------------sql增强 start---------------------------- - //-----------------sql增强 end------------------------------ - - //-----------------java增强 start--------------------------- - //-----------------java增强 end----------------------------- - } - /** - * 更新操作增强业务 - * @param t - * @return - */ - private void doUpdateBus(TWzSpConfEntity t) throws Exception{ - //-----------------sql增强 start---------------------------- - //-----------------sql增强 end------------------------------ - - //-----------------java增强 start--------------------------- - //-----------------java增强 end----------------------------- - } - /** - * 删除操作增强业务 - * @param t - * @return - */ - private void doDelBus(TWzSpConfEntity t) throws Exception{ - //-----------------sql增强 start---------------------------- - //-----------------sql增强 end------------------------------ - - //-----------------java增强 start--------------------------- - //-----------------java增强 end----------------------------- - } - - private Map populationMap(TWzSpConfEntity t){ - Map map = new HashMap(); - map.put("id", t.getId()); - map.put("create_name", t.getCreateName()); - map.put("create_by", t.getCreateBy()); - map.put("create_date", t.getCreateDate()); - map.put("update_name", t.getUpdateName()); - map.put("update_by", t.getUpdateBy()); - map.put("update_date", t.getUpdateDate()); - map.put("sys_org_code", t.getSysOrgCode()); - map.put("sys_company_code", t.getSysCompanyCode()); - map.put("bpm_status", t.getBpmStatus()); - map.put("sp_type", t.getSpType()); - map.put("sp_jine", t.getSpJine()); - map.put("sp_username", t.getSpUsername()); - map.put("sp_remark", t.getSpRemark()); - return map; - } - - /** - * 替换sql中的变量 - * @param sql - * @param t - * @return - */ - public String replaceVal(String sql,TWzSpConfEntity t){ - sql = sql.replace("#{id}",String.valueOf(t.getId())); - sql = sql.replace("#{create_name}",String.valueOf(t.getCreateName())); - sql = sql.replace("#{create_by}",String.valueOf(t.getCreateBy())); - sql = sql.replace("#{create_date}",String.valueOf(t.getCreateDate())); - sql = sql.replace("#{update_name}",String.valueOf(t.getUpdateName())); - sql = sql.replace("#{update_by}",String.valueOf(t.getUpdateBy())); - sql = sql.replace("#{update_date}",String.valueOf(t.getUpdateDate())); - sql = sql.replace("#{sys_org_code}",String.valueOf(t.getSysOrgCode())); - sql = sql.replace("#{sys_company_code}",String.valueOf(t.getSysCompanyCode())); - sql = sql.replace("#{bpm_status}",String.valueOf(t.getBpmStatus())); - sql = sql.replace("#{sp_type}",String.valueOf(t.getSpType())); - sql = sql.replace("#{sp_jine}",String.valueOf(t.getSpJine())); - sql = sql.replace("#{sp_username}",String.valueOf(t.getSpUsername())); - sql = sql.replace("#{sp_remark}",String.valueOf(t.getSpRemark())); - sql = sql.replace("#{UUID}",UUID.randomUUID().toString()); - return sql; - } - - /** - * 执行JAVA增强 - */ - private void executeJavaExtend(String cgJavaType,String cgJavaValue,Map data) throws Exception { - if(StringUtil.isNotEmpty(cgJavaValue)){ - Object obj = null; - try { - if("class".equals(cgJavaType)){ - //因新增时已经校验了实例化是否可以成功，所以这块就不需要再做一次判断 - obj = MyClassLoader.getClassByScn(cgJavaValue).newInstance(); - }else if("spring".equals(cgJavaType)){ - obj = ApplicationContextUtil.getContext().getBean(cgJavaValue); - } - if(obj instanceof CgformEnhanceJavaInter){ - CgformEnhanceJavaInter javaInter = (CgformEnhanceJavaInter) obj; - javaInter.execute("t_wz_sp_conf",data); - } - } catch (Exception e) { - e.printStackTrace(); - throw new Exception("执行JAVA增强出现异常！"); - } - } - } -} \ No newline at end of file diff --git a/src/main/java/com/zzjee/wzpo/controller/VWzPoWqController.java b/src/main/java/com/zzjee/wzpo/controller/VWzPoWqController.java deleted file mode 100644 index eda950f9..00000000 --- a/src/main/java/com/zzjee/wzpo/controller/VWzPoWqController.java +++ /dev/null @@ -1,485 +0,0 @@ -package com.zzjee.wzpo.controller; - -import com.alibaba.fastjson.JSONArray; -import com.zzjee.wmutil.erpUtil; -import com.zzjee.wzpo.entity.PowzPage; -import com.zzjee.wzpo.entity.VWzPoWqEntity; -import com.zzjee.wzpo.service.VWzPoWqServiceI; -import com.zzjee.wzyw.entity.TWzRkHeadEntity; -import com.zzjee.wzyw.entity.TWzRkItemEntity; -import com.zzjee.wzyw.service.TWzRkHeadServiceI; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.log4j.Logger; -import org.jeecgframework.core.beanvalidator.BeanValidators; -import org.jeecgframework.core.common.controller.BaseController; -import org.jeecgframework.core.common.exception.BusinessException; -import org.jeecgframework.core.common.hibernate.qbc.CriteriaQuery; -import org.jeecgframework.core.common.model.json.AjaxJson; -import org.jeecgframework.core.common.model.json.DataGrid; -import org.jeecgframework.core.constant.Globals; -import org.jeecgframework.core.util.*; -import org.jeecgframework.jwt.util.ResponseMessage; -import org.jeecgframework.jwt.util.Result; -import org.jeecgframework.poi.excel.ExcelImportUtil; -import org.jeecgframework.poi.excel.entity.ExportParams; -import org.jeecgframework.poi.excel.entity.ImportParams; -import org.jeecgframework.poi.excel.entity.vo.NormalExcelConstants; -import org.jeecgframework.tag.core.easyui.TagUtil; -import org.jeecgframework.web.system.service.SystemService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -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.util.UriComponentsBuilder; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.validation.ConstraintViolation; -import javax.validation.Validator; -import java.io.IOException; -import java.util.*; - -/** - * @Title: Controller - * @Description: v_wz_po_wq - * @author onlineGenerator - * @date 2018-05-21 15:57:04 - * @version V1.0 - * - */ -@Api(value="VWzPoWq",description="v_wz_po_wq",tags="vWzPoWqController") -@Controller -@RequestMapping("/vWzPoWqController") -public class VWzPoWqController extends BaseController { - /** - * Logger for this class - */ - private static final Logger logger = Logger.getLogger(VWzPoWqController.class); - - @Autowired - private VWzPoWqServiceI vWzPoWqService; - @Autowired - private SystemService systemService; - @Autowired - private Validator validator; - - @Autowired - private TWzRkHeadServiceI tWzRkHeadService; - - /** - * v_wz_po_wq列表 页面跳转 - * - * @return - */ - @RequestMapping(params = "list") - public ModelAndView list(HttpServletRequest request) { - return new ModelAndView("com/zzjee/wzpo/vWzPoWqList"); - } - - /** - * easyui AJAX请求数据 - * - * @param request - * @param response - * @param dataGrid - */ - - @RequestMapping(params = "datagrid") - public void datagrid(VWzPoWqEntity vWzPoWq, HttpServletRequest request, HttpServletResponse response, DataGrid dataGrid) { - CriteriaQuery cq = new CriteriaQuery(VWzPoWqEntity.class, dataGrid); - //查询条件组装器 - org.jeecgframework.core.extend.hqlsearch.HqlGenerateUtil.installHql(cq, vWzPoWq, request.getParameterMap()); - try{ - //自定义追加查询条件 - }catch (Exception e) { - throw new BusinessException(e.getMessage()); - } - cq.add(); - this.vWzPoWqService.getDataGridReturn(cq, true); - TagUtil.datagrid(response, dataGrid); - } - - - - /** - * 保存新增/更新的行数据 - * @param page - * @return - */ - @RequestMapping(params = "saveRows") - @ResponseBody - public AjaxJson saveRows(PowzPage page){ - - String message = null; - List demos=page.getDemos(); - AjaxJson j = new AjaxJson(); - if(CollectionUtils.isNotEmpty(demos)){ - TWzRkHeadEntity tWzRkHead = new TWzRkHeadEntity(); - List tWzRkItemList = new ArrayList() ; - - Map mapvendor = new HashMap<>(); - - for(VWzPoWqEntity jeecgDemo:demos) { - if (StringUtil.isNotEmpty(jeecgDemo.getId())) { - VWzPoWqEntity t = vWzPoWqService.get(VWzPoWqEntity.class, jeecgDemo.getId()); - try { - mapvendor.put(t.getVendorCode(),t.getVendorName()); - } catch (Exception e) { - } - } - } - if(mapvendor.size()>1){ - j.setMsg("不同供应商不允许入库到同一个订单"); - j.setSuccess(false); - return j; - - } - for(VWzPoWqEntity jeecgDemo:demos){ - if (StringUtil.isNotEmpty(jeecgDemo.getId())) { - VWzPoWqEntity t =vWzPoWqService.get(VWzPoWqEntity.class, jeecgDemo.getId()); - try { - MyBeanUtils.copyBeanNotNull2Bean(demos, t); - tWzRkHead.setDocDate(DateUtils.getDate()); - tWzRkHead.setRkRemark("采购订单入库："+t.getPoRemark()); - tWzRkHead.setVendorCode(t.getVendorCode()); - tWzRkHead.setVendorName(t.getVendorName()); - } catch (Exception e) { - e.printStackTrace(); - } - try { - TWzRkItemEntity pogri = new TWzRkItemEntity(); - pogri.setBy1(jeecgDemo.getId().toString()); - pogri.setMatCode(jeecgDemo.getMatCode()); - pogri.setMatName(jeecgDemo.getMatName()); - pogri.setMatLocation(jeecgDemo.getMatLocation()); - pogri.setMatPrice(jeecgDemo.getMatPrice()); - pogri.setMatQty(jeecgDemo.getMatQtyWq().toString()); - pogri.setMatBatch(jeecgDemo.getMatBatch()); - pogri.setMatUnit(jeecgDemo.getMatUnit()); - String res = erpUtil.geterpys(pogri.getBy1(),pogri.getMatCode(),pogri.getMatQty()); - if(StringUtil.isNotEmpty(res)){ - j.setMsg(res); - j.setSuccess(false); - return j; - - } - - tWzRkItemList.add(pogri); - - } catch (Exception e) { - e.printStackTrace(); - } - } - } - - try { - tWzRkHeadService.addMain(tWzRkHead, tWzRkItemList); - }catch (Exception e) { - - } - } - return j; - } - - - - - /** - * 删除v_wz_po_wq - * - * @return - */ - @RequestMapping(params = "doDel") - @ResponseBody - public AjaxJson doDel(VWzPoWqEntity vWzPoWq, HttpServletRequest request) { - String message = null; - AjaxJson j = new AjaxJson(); - vWzPoWq = systemService.getEntity(VWzPoWqEntity.class, vWzPoWq.getId()); - message = "v_wz_po_wq删除成功"; - try{ - vWzPoWqService.delete(vWzPoWq); - systemService.addLog(message, Globals.Log_Type_DEL, Globals.Log_Leavel_INFO); - }catch(Exception e){ - e.printStackTrace(); - message = "v_wz_po_wq删除失败"; - throw new BusinessException(e.getMessage()); - } - j.setMsg(message); - return j; - } - - /** - * 批量删除v_wz_po_wq - * - * @return - */ - @RequestMapping(params = "doBatchDel") - @ResponseBody - public AjaxJson doBatchDel(String ids, HttpServletRequest request){ - String message = null; - AjaxJson j = new AjaxJson(); - message = "v_wz_po_wq删除成功"; - try{ - for(String id:ids.split(",")){ - VWzPoWqEntity vWzPoWq = systemService.getEntity(VWzPoWqEntity.class, - id - ); - vWzPoWqService.delete(vWzPoWq); - systemService.addLog(message, Globals.Log_Type_DEL, Globals.Log_Leavel_INFO); - } - }catch(Exception e){ - e.printStackTrace(); - message = "v_wz_po_wq删除失败"; - throw new BusinessException(e.getMessage()); - } - j.setMsg(message); - return j; - } - - - /** - * 添加v_wz_po_wq - * - * @return - */ - @RequestMapping(params = "doAdd") - @ResponseBody - public AjaxJson doAdd(VWzPoWqEntity vWzPoWq, HttpServletRequest request) { - String message = null; - AjaxJson j = new AjaxJson(); - message = "v_wz_po_wq添加成功"; - try{ - vWzPoWqService.save(vWzPoWq); - systemService.addLog(message, Globals.Log_Type_INSERT, Globals.Log_Leavel_INFO); - }catch(Exception e){ - e.printStackTrace(); - message = "v_wz_po_wq添加失败"; - throw new BusinessException(e.getMessage()); - } - j.setMsg(message); - return j; - } - - /** - * 更新v_wz_po_wq - * - * @return - */ - @RequestMapping(params = "doUpdate") - @ResponseBody - public AjaxJson doUpdate(VWzPoWqEntity vWzPoWq, HttpServletRequest request) { - String message = null; - AjaxJson j = new AjaxJson(); - message = "v_wz_po_wq更新成功"; - VWzPoWqEntity t = vWzPoWqService.get(VWzPoWqEntity.class, vWzPoWq.getId()); - try { - MyBeanUtils.copyBeanNotNull2Bean(vWzPoWq, t); - vWzPoWqService.saveOrUpdate(t); - systemService.addLog(message, Globals.Log_Type_UPDATE, Globals.Log_Leavel_INFO); - } catch (Exception e) { - e.printStackTrace(); - message = "v_wz_po_wq更新失败"; - throw new BusinessException(e.getMessage()); - } - j.setMsg(message); - return j; - } - - - /** - * v_wz_po_wq新增页面跳转 - * - * @return - */ - @RequestMapping(params = "goAdd") - public ModelAndView goAdd(VWzPoWqEntity vWzPoWq, HttpServletRequest req) { - if (StringUtil.isNotEmpty(vWzPoWq.getId())) { - vWzPoWq = vWzPoWqService.getEntity(VWzPoWqEntity.class, vWzPoWq.getId()); - req.setAttribute("vWzPoWqPage", vWzPoWq); - } - return new ModelAndView("com/zzjee/wzpo/vWzPoWq-add"); - } - /** - * v_wz_po_wq编辑页面跳转 - * - * @return - */ - @RequestMapping(params = "goUpdate") - public ModelAndView goUpdate(VWzPoWqEntity vWzPoWq, HttpServletRequest req) { - if (StringUtil.isNotEmpty(vWzPoWq.getId())) { - vWzPoWq = vWzPoWqService.getEntity(VWzPoWqEntity.class, vWzPoWq.getId()); - req.setAttribute("vWzPoWqPage", vWzPoWq); - } - return new ModelAndView("com/zzjee/wzpo/vWzPoWq-update"); - } - - /** - * 导入功能跳转 - * - * @return - */ - @RequestMapping(params = "upload") - public ModelAndView upload(HttpServletRequest req) { - req.setAttribute("controller_name","vWzPoWqController"); - return new ModelAndView("common/upload/pub_excel_upload"); - } - - /** - * 导出excel - * - * @param request - * @param response - */ - @RequestMapping(params = "exportXls") - public String exportXls(VWzPoWqEntity vWzPoWq, HttpServletRequest request, HttpServletResponse response - , DataGrid dataGrid, ModelMap modelMap) { - CriteriaQuery cq = new CriteriaQuery(VWzPoWqEntity.class, dataGrid); - org.jeecgframework.core.extend.hqlsearch.HqlGenerateUtil.installHql(cq, vWzPoWq, request.getParameterMap()); - List vWzPoWqs = this.vWzPoWqService.getListByCriteriaQuery(cq,false); - modelMap.put(NormalExcelConstants.FILE_NAME,"v_wz_po_wq"); - modelMap.put(NormalExcelConstants.CLASS, VWzPoWqEntity.class); - modelMap.put(NormalExcelConstants.PARAMS,new ExportParams("v_wz_po_wq列表", "导出人:"+ ResourceUtil.getSessionUser().getRealName(), - "导出信息")); - modelMap.put(NormalExcelConstants.DATA_LIST,vWzPoWqs); - return NormalExcelConstants.JEECG_EXCEL_VIEW; - } - /** - * 导出excel 使模板 - * - * @param request - * @param response - */ - @RequestMapping(params = "exportXlsByT") - public String exportXlsByT(VWzPoWqEntity vWzPoWq, HttpServletRequest request, HttpServletResponse response - , DataGrid dataGrid, ModelMap modelMap) { - modelMap.put(NormalExcelConstants.FILE_NAME,"v_wz_po_wq"); - modelMap.put(NormalExcelConstants.CLASS, VWzPoWqEntity.class); - modelMap.put(NormalExcelConstants.PARAMS,new ExportParams("v_wz_po_wq列表", "导出人:"+ ResourceUtil.getSessionUser().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 listVWzPoWqEntitys = ExcelImportUtil.importExcel(file.getInputStream(), VWzPoWqEntity.class,params); - for (VWzPoWqEntity vWzPoWq : listVWzPoWqEntitys) { - vWzPoWqService.save(vWzPoWq); - } - 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 - @ApiOperation(value="v_wz_po_wq列表信息",produces="application/json",httpMethod="GET") - public ResponseMessage> list() { - List listVWzPoWqs=vWzPoWqService.getList(VWzPoWqEntity.class); - return Result.success(listVWzPoWqs); - } - - @RequestMapping(value = "/{id}", method = RequestMethod.GET) - @ResponseBody - @ApiOperation(value="根据ID获取v_wz_po_wq信息",notes="根据ID获取v_wz_po_wq信息",httpMethod="GET",produces="application/json") - public ResponseMessage get(@ApiParam(required=true,name="id",value="ID")@PathVariable("id") String id) { - VWzPoWqEntity task = vWzPoWqService.get(VWzPoWqEntity.class, id); - if (task == null) { - return Result.error("根据ID获取v_wz_po_wq信息为空"); - } - return Result.success(task); - } - - @RequestMapping(method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE) - @ResponseBody - @ApiOperation(value="创建v_wz_po_wq") - public ResponseMessage create(@ApiParam(name="v_wz_po_wq对象")@RequestBody VWzPoWqEntity vWzPoWq, UriComponentsBuilder uriBuilder) { - //调用JSR303 Bean Validator进行校验，如果出错返回含400错误码及json格式的错误信息. - Set> failures = validator.validate(vWzPoWq); - if (!failures.isEmpty()) { - return Result.error(JSONArray.toJSONString(BeanValidators.extractPropertyAndMessage(failures))); - } - - //保存 - try{ - vWzPoWqService.save(vWzPoWq); - } catch (Exception e) { - e.printStackTrace(); - return Result.error("v_wz_po_wq信息保存失败"); - } - return Result.success(vWzPoWq); - } - - @RequestMapping(value = "/{id}", method = RequestMethod.PUT, consumes = MediaType.APPLICATION_JSON_VALUE) - @ResponseBody - @ApiOperation(value="更新v_wz_po_wq",notes="更新v_wz_po_wq") - public ResponseMessage update(@ApiParam(name="v_wz_po_wq对象")@RequestBody VWzPoWqEntity vWzPoWq) { - //调用JSR303 Bean Validator进行校验，如果出错返回含400错误码及json格式的错误信息. - Set> failures = validator.validate(vWzPoWq); - if (!failures.isEmpty()) { - return Result.error(JSONArray.toJSONString(BeanValidators.extractPropertyAndMessage(failures))); - } - - //保存 - try{ - vWzPoWqService.saveOrUpdate(vWzPoWq); - } catch (Exception e) { - e.printStackTrace(); - return Result.error("更新v_wz_po_wq信息失败"); - } - - //按Restful约定，返回204状态码, 无内容. 也可以返回200状态码. - return Result.success("更新v_wz_po_wq信息成功"); - } - - @RequestMapping(value = "/{id}", method = RequestMethod.DELETE) - @ResponseStatus(HttpStatus.NO_CONTENT) - @ApiOperation(value="删除v_wz_po_wq") - public ResponseMessage delete(@ApiParam(name="id",value="ID",required=true)@PathVariable("id") String id) { - logger.info("delete[{}]" + id); - // 验证 - if (StringUtils.isEmpty(id)) { - return Result.error("ID不能为空"); - } - try { - vWzPoWqService.deleteEntityById(VWzPoWqEntity.class, id); - } catch (Exception e) { - e.printStackTrace(); - return Result.error("v_wz_po_wq删除失败"); - } - - return Result.success(); - } -} diff --git a/src/main/java/com/zzjee/wzpo/entity/PowzPage.java b/src/main/java/com/zzjee/wzpo/entity/PowzPage.java deleted file mode 100644 index 0ef5a899..00000000 --- a/src/main/java/com/zzjee/wzpo/entity/PowzPage.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.zzjee.wzpo.entity; - - -import java.util.List; - -/** - */ -public class PowzPage { - private List demos; - - public List getDemos() { - return demos; - } - - public void setDemos(List demos) { - this.demos = demos; - } -} diff --git a/src/main/java/com/zzjee/wzpo/entity/VWzPoWqEntity.java b/src/main/java/com/zzjee/wzpo/entity/VWzPoWqEntity.java deleted file mode 100644 index 8e15acb3..00000000 --- a/src/main/java/com/zzjee/wzpo/entity/VWzPoWqEntity.java +++ /dev/null @@ -1,308 +0,0 @@ -package com.zzjee.wzpo.entity; - -import org.hibernate.annotations.GenericGenerator; -import org.jeecgframework.poi.excel.annotation.Excel; - -import javax.persistence.*; -import java.util.Date; - -/** - * @Title: Entity - * @Description: v_wz_po_wq - * @author onlineGenerator - * @date 2018-05-21 15:57:04 - * @version V1.0 - * - */ -@Entity -@Table(name = "v_wz_po_wq", schema = "") -@SuppressWarnings("serial") -public class VWzPoWqEntity implements java.io.Serializable { - /**id*/ - private String id; - /**供应商编码*/ - @Excel(name="供应商编码",width=15) - private String vendorCode; - /**供应商名称*/ - @Excel(name="供应商名称",width=15) - private String vendorName; - /**采购订单日期*/ - @Excel(name="采购订单日期",width=15,format = "yyyy-MM-dd") - private Date docDate; - /**采购订单备注*/ - @Excel(name="采购订单备注",width=15) - private String poRemark; - /**物料编码*/ - @Excel(name="物料编码",width=15) - private String matCode; - /**物料名称*/ - @Excel(name="物料名称",width=15) - private String matName; - /**单位*/ - @Excel(name="单位",width=15) - private String matUnit; - /**仓库*/ - @Excel(name="仓库",width=15) - private String matLocation; - /**批次*/ - @Excel(name="批次",width=15) - private String matBatch; - /**标准价*/ - @Excel(name="标准价",width=15) - private String matPrice; - /**数量*/ - @Excel(name="数量",width=15) - private String matQty; - /**matQtyWq*/ -// @Excel(name="matQtyWq",width=15) - private Double matQtyWq; - @Excel(name="未清数量",width=15) - private Double matQtyWq1; - /** - *方法: 取得java.lang.String - *@return: java.lang.String id - */ - @Id - @GeneratedValue(generator = "paymentableGenerator") - @GenericGenerator(name = "paymentableGenerator", strategy = "uuid") - - @Column(name ="ID",nullable=false,length=36) - public String getId(){ - return this.id; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String id - */ - public void setId(String id){ - this.id = id; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 物料编码 - */ - - @Column(name ="MAT_CODE",nullable=true,length=32) - public String getMatCode(){ - return this.matCode; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 物料编码 - */ - public void setMatCode(String matCode){ - this.matCode = matCode; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 物料名称 - */ - - @Column(name ="MAT_NAME",nullable=true,length=32) - public String getMatName(){ - return this.matName; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 物料名称 - */ - public void setMatName(String matName){ - this.matName = matName; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 单位 - */ - - @Column(name ="MAT_UNIT",nullable=true,length=32) - public String getMatUnit(){ - return this.matUnit; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 单位 - */ - public void setMatUnit(String matUnit){ - this.matUnit = matUnit; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 仓库 - */ - - @Column(name ="MAT_LOCATION",nullable=true,length=32) - public String getMatLocation(){ - return this.matLocation; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 仓库 - */ - public void setMatLocation(String matLocation){ - this.matLocation = matLocation; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 批次 - */ - - @Column(name ="MAT_BATCH",nullable=true,length=32) - public String getMatBatch(){ - return this.matBatch; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 批次 - */ - public void setMatBatch(String matBatch){ - this.matBatch = matBatch; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 标准价 - */ - - @Column(name ="MAT_PRICE",nullable=true,length=32) - public String getMatPrice(){ - return this.matPrice; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 标准价 - */ - public void setMatPrice(String matPrice){ - this.matPrice = matPrice; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 数量 - */ - - @Column(name ="MAT_QTY",nullable=true,length=32) - public String getMatQty(){ - return this.matQty; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 数量 - */ - public void setMatQty(String matQty){ - this.matQty = matQty; - } - /** - *方法: 取得java.lang.Double - *@return: java.lang.Double matQtyWq - */ - - @Column(name ="MAT_QTY_WQ",nullable=true,length=23) - public Double getMatQtyWq(){ - return this.matQtyWq; - } - - /** - *方法: 设置java.lang.Double - *@param: java.lang.Double matQtyWq - */ - public void setMatQtyWq(Double matQtyWq){ - this.matQtyWq = matQtyWq; - } - - @Column(name ="MAT_QTY_WQ1",nullable=true,length=23) - public Double getMatQtyWq1(){ - return this.matQtyWq1; - } - - /** - *方法: 设置java.lang.Double - *@param: java.lang.Double matQtyWq - */ - public void setMatQtyWq1(Double matQtyWq1){ - this.matQtyWq1 = matQtyWq1; - } - - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 供应商编码 - */ - - @Column(name ="VENDOR_CODE",nullable=true,length=32) - public String getVendorCode(){ - return this.vendorCode; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 供应商编码 - */ - public void setVendorCode(String vendorCode){ - this.vendorCode = vendorCode; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 供应商名称 - */ - - @Column(name ="VENDOR_NAME",nullable=true,length=32) - public String getVendorName(){ - return this.vendorName; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 供应商名称 - */ - public void setVendorName(String vendorName){ - this.vendorName = vendorName; - } - - /** - *方法: 取得java.util.Date - *@return: java.util.Date 采购订单日期 - */ - - @Column(name ="DOC_DATE",nullable=true,length=32) - public Date getDocDate(){ - return this.docDate; - } - - /** - *方法: 设置java.util.Date - *@param: java.util.Date 采购订单日期 - */ - public void setDocDate(Date docDate){ - this.docDate = docDate; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 采购订单备注 - */ - - @Column(name ="PO_REMARK",nullable=true,length=232) - public String getPoRemark(){ - return this.poRemark; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 采购订单备注 - */ - public void setPoRemark(String poRemark){ - this.poRemark = poRemark; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 备用1 - */ -} diff --git a/src/main/java/com/zzjee/wzpo/service/VWzPoWqServiceI.java b/src/main/java/com/zzjee/wzpo/service/VWzPoWqServiceI.java deleted file mode 100644 index 819f1e8e..00000000 --- a/src/main/java/com/zzjee/wzpo/service/VWzPoWqServiceI.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.zzjee.wzpo.service; -import com.zzjee.wzpo.entity.VWzPoWqEntity; -import org.jeecgframework.core.common.service.CommonService; - -import java.io.Serializable; - -public interface VWzPoWqServiceI extends CommonService { - - public void delete(VWzPoWqEntity entity) throws Exception; - - public Serializable save(VWzPoWqEntity entity) throws Exception; - - public void saveOrUpdate(VWzPoWqEntity entity) throws Exception; - -} diff --git a/src/main/java/com/zzjee/wzpo/service/impl/VWzPoWqServiceImpl.java b/src/main/java/com/zzjee/wzpo/service/impl/VWzPoWqServiceImpl.java deleted file mode 100644 index 0a5bc1af..00000000 --- a/src/main/java/com/zzjee/wzpo/service/impl/VWzPoWqServiceImpl.java +++ /dev/null @@ -1,139 +0,0 @@ -package com.zzjee.wzpo.service.impl; - -import com.zzjee.wzpo.entity.VWzPoWqEntity; -import com.zzjee.wzpo.service.VWzPoWqServiceI; -import org.jeecgframework.core.common.service.impl.CommonServiceImpl; -import org.jeecgframework.core.util.ApplicationContextUtil; -import org.jeecgframework.core.util.MyClassLoader; -import org.jeecgframework.core.util.StringUtil; -import org.jeecgframework.web.cgform.enhance.CgformEnhanceJavaInter; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.io.Serializable; -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; - -@Service("vWzPoWqService") -@Transactional -public class VWzPoWqServiceImpl extends CommonServiceImpl implements VWzPoWqServiceI { - - - @Override - public void delete(VWzPoWqEntity entity) throws Exception{ - super.delete(entity); - //执行删除操作增强业务 - this.doDelBus(entity); - } - - @Override - public Serializable save(VWzPoWqEntity entity) throws Exception{ - Serializable t = super.save(entity); - //执行新增操作增强业务 - this.doAddBus(entity); - return t; - } - - @Override - public void saveOrUpdate(VWzPoWqEntity entity) throws Exception{ - super.saveOrUpdate(entity); - //执行更新操作增强业务 - this.doUpdateBus(entity); - } - - /** - * 新增操作增强业务 - * @param t - * @return - */ - private void doAddBus(VWzPoWqEntity t) throws Exception{ - //-----------------sql增强 start---------------------------- - //-----------------sql增强 end------------------------------ - - //-----------------java增强 start--------------------------- - //-----------------java增强 end----------------------------- - } - /** - * 更新操作增强业务 - * @param t - * @return - */ - private void doUpdateBus(VWzPoWqEntity t) throws Exception{ - //-----------------sql增强 start---------------------------- - //-----------------sql增强 end------------------------------ - - //-----------------java增强 start--------------------------- - //-----------------java增强 end----------------------------- - } - /** - * 删除操作增强业务 - * @param t - * @return - */ - private void doDelBus(VWzPoWqEntity t) throws Exception{ - //-----------------sql增强 start---------------------------- - //-----------------sql增强 end------------------------------ - - //-----------------java增强 start--------------------------- - //-----------------java增强 end----------------------------- - } - - private Map populationMap(VWzPoWqEntity t){ - Map map = new HashMap(); - map.put("id", t.getId()); - map.put("mat_code", t.getMatCode()); - map.put("mat_name", t.getMatName()); - map.put("mat_unit", t.getMatUnit()); - map.put("mat_location", t.getMatLocation()); - map.put("mat_batch", t.getMatBatch()); - map.put("mat_price", t.getMatPrice()); - map.put("mat_qty", t.getMatQty()); - map.put("mat_qty_wq", t.getMatQtyWq()); - return map; - } - - /** - * 替换sql中的变量 - * @param sql - * @param t - * @return - */ - public String replaceVal(String sql,VWzPoWqEntity t){ - sql = sql.replace("#{id}",String.valueOf(t.getId())); - sql = sql.replace("#{mat_code}",String.valueOf(t.getMatCode())); - sql = sql.replace("#{mat_name}",String.valueOf(t.getMatName())); - sql = sql.replace("#{mat_unit}",String.valueOf(t.getMatUnit())); - sql = sql.replace("#{mat_location}",String.valueOf(t.getMatLocation())); - sql = sql.replace("#{mat_batch}",String.valueOf(t.getMatBatch())); - sql = sql.replace("#{mat_price}",String.valueOf(t.getMatPrice())); - sql = sql.replace("#{mat_qty}",String.valueOf(t.getMatQty())); - sql = sql.replace("#{mat_qty_wq}",String.valueOf(t.getMatQtyWq())); - sql = sql.replace("#{UUID}",UUID.randomUUID().toString()); - return sql; - } - - /** - * 执行JAVA增强 - */ - private void executeJavaExtend(String cgJavaType,String cgJavaValue,Map data) throws Exception { - if(StringUtil.isNotEmpty(cgJavaValue)){ - Object obj = null; - try { - if("class".equals(cgJavaType)){ - //因新增时已经校验了实例化是否可以成功，所以这块就不需要再做一次判断 - obj = MyClassLoader.getClassByScn(cgJavaValue).newInstance(); - }else if("spring".equals(cgJavaType)){ - obj = ApplicationContextUtil.getContext().getBean(cgJavaValue); - } - if(obj instanceof CgformEnhanceJavaInter){ - CgformEnhanceJavaInter javaInter = (CgformEnhanceJavaInter) obj; - javaInter.execute("v_wz_po_wq",data); - } - } catch (Exception e) { - e.printStackTrace(); - throw new Exception("执行JAVA增强出现异常！"); - } - } - } -} diff --git a/src/main/java/com/zzjee/wzrepair/controller/TWzRepairController.java b/src/main/java/com/zzjee/wzrepair/controller/TWzRepairController.java deleted file mode 100644 index 0d8391b6..00000000 --- a/src/main/java/com/zzjee/wzrepair/controller/TWzRepairController.java +++ /dev/null @@ -1,385 +0,0 @@ -package com.zzjee.wzrepair.controller; - -import com.zzjee.wzrepair.entity.TWzRepairEntity; -import com.zzjee.wzrepair.service.TWzRepairServiceI; -import org.apache.log4j.Logger; -import org.jeecgframework.core.beanvalidator.BeanValidators; -import org.jeecgframework.core.common.controller.BaseController; -import org.jeecgframework.core.common.exception.BusinessException; -import org.jeecgframework.core.common.hibernate.qbc.CriteriaQuery; -import org.jeecgframework.core.common.model.json.AjaxJson; -import org.jeecgframework.core.common.model.json.DataGrid; -import org.jeecgframework.core.constant.Globals; -import org.jeecgframework.core.util.ExceptionUtil; -import org.jeecgframework.core.util.MyBeanUtils; -import org.jeecgframework.core.util.ResourceUtil; -import org.jeecgframework.core.util.StringUtil; -import org.jeecgframework.poi.excel.ExcelImportUtil; -import org.jeecgframework.poi.excel.entity.ExportParams; -import org.jeecgframework.poi.excel.entity.ImportParams; -import org.jeecgframework.poi.excel.entity.vo.NormalExcelConstants; -import org.jeecgframework.tag.core.easyui.TagUtil; -import org.jeecgframework.web.system.service.SystemService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -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.util.UriComponentsBuilder; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.validation.ConstraintViolation; -import javax.validation.Validator; -import java.io.IOException; -import java.net.URI; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Set; - -/** - * @Title: Controller - * @Description: 交旧领新登记表 - * @author onlineGenerator - * @date 2020-02-24 11:36:29 - * @version V1.0 - * - */ -@Controller -@RequestMapping("/tWzRepairController") -public class TWzRepairController extends BaseController { - /** - * Logger for this class - */ - private static final Logger logger = Logger.getLogger(com.zzjee.wzrepair.controller.TWzRepairController.class); - - @Autowired - private TWzRepairServiceI tWzRepairService; - @Autowired - private SystemService systemService; - @Autowired - private Validator validator; - - - - /** - * 交旧领新登记表列表 页面跳转 - * - * @return - */ - @RequestMapping(params = "list") - public ModelAndView list(HttpServletRequest request) { - return new ModelAndView("com/zzjee/wzrepair/tWzRepairList"); - } - - /** - * easyui AJAX请求数据 - * - * @param request - * @param response - * @param dataGrid - * @param user - */ - - @RequestMapping(params = "datagrid") - public void datagrid(TWzRepairEntity tWzRepair,HttpServletRequest request, HttpServletResponse response, DataGrid dataGrid) { - CriteriaQuery cq = new CriteriaQuery(TWzRepairEntity.class, dataGrid); - //查询条件组装器 - org.jeecgframework.core.extend.hqlsearch.HqlGenerateUtil.installHql(cq, tWzRepair, request.getParameterMap()); - try{ - //自定义追加查询条件 - }catch (Exception e) { - throw new BusinessException(e.getMessage()); - } - cq.add(); - this.tWzRepairService.getDataGridReturn(cq, true); - TagUtil.datagrid(response, dataGrid); - } - - /** - * 删除交旧领新登记表 - * - * @return - */ - @RequestMapping(params = "doDel") - @ResponseBody - public AjaxJson doDel(TWzRepairEntity tWzRepair, HttpServletRequest request) { - String message = null; - AjaxJson j = new AjaxJson(); - tWzRepair = systemService.getEntity(TWzRepairEntity.class, tWzRepair.getId()); - message = "交旧领新登记表删除成功"; - try{ - tWzRepairService.delete(tWzRepair); - systemService.addLog(message, Globals.Log_Type_DEL, Globals.Log_Leavel_INFO); - }catch(Exception e){ - e.printStackTrace(); - message = "交旧领新登记表删除失败"; - throw new BusinessException(e.getMessage()); - } - j.setMsg(message); - return j; - } - - /** - * 批量删除交旧领新登记表 - * - * @return - */ - @RequestMapping(params = "doBatchDel") - @ResponseBody - public AjaxJson doBatchDel(String ids, HttpServletRequest request){ - String message = null; - AjaxJson j = new AjaxJson(); - message = "交旧领新登记表删除成功"; - try{ - for(String id:ids.split(",")){ - TWzRepairEntity tWzRepair = systemService.getEntity(TWzRepairEntity.class, - id - ); - tWzRepairService.delete(tWzRepair); - systemService.addLog(message, Globals.Log_Type_DEL, Globals.Log_Leavel_INFO); - } - }catch(Exception e){ - e.printStackTrace(); - message = "交旧领新登记表删除失败"; - throw new BusinessException(e.getMessage()); - } - j.setMsg(message); - return j; - } - - - /** - * 添加交旧领新登记表 - * - * @param ids - * @return - */ - @RequestMapping(params = "doAdd") - @ResponseBody - public AjaxJson doAdd(TWzRepairEntity tWzRepair, HttpServletRequest request) { - String message = null; - AjaxJson j = new AjaxJson(); - message = "交旧领新登记表添加成功"; - try{ - tWzRepairService.save(tWzRepair); - systemService.addLog(message, Globals.Log_Type_INSERT, Globals.Log_Leavel_INFO); - }catch(Exception e){ - e.printStackTrace(); - message = "交旧领新登记表添加失败"; - throw new BusinessException(e.getMessage()); - } - j.setMsg(message); - return j; - } - - /** - * 更新交旧领新登记表 - * - * @param ids - * @return - */ - @RequestMapping(params = "doUpdate") - @ResponseBody - public AjaxJson doUpdate(TWzRepairEntity tWzRepair, HttpServletRequest request) { - String message = null; - AjaxJson j = new AjaxJson(); - message = "交旧领新登记表更新成功"; - TWzRepairEntity t = tWzRepairService.get(TWzRepairEntity.class, tWzRepair.getId()); - try { - MyBeanUtils.copyBeanNotNull2Bean(tWzRepair, t); - tWzRepairService.saveOrUpdate(t); - systemService.addLog(message, Globals.Log_Type_UPDATE, Globals.Log_Leavel_INFO); - } catch (Exception e) { - e.printStackTrace(); - message = "交旧领新登记表更新失败"; - throw new BusinessException(e.getMessage()); - } - j.setMsg(message); - return j; - } - - - /** - * 交旧领新登记表新增页面跳转 - * - * @return - */ - @RequestMapping(params = "goAdd") - public ModelAndView goAdd(TWzRepairEntity tWzRepair, HttpServletRequest req) { - if (StringUtil.isNotEmpty(tWzRepair.getId())) { - tWzRepair = tWzRepairService.getEntity(TWzRepairEntity.class, tWzRepair.getId()); - req.setAttribute("tWzRepairPage", tWzRepair); - } - return new ModelAndView("com/zzjee/wzrepair/tWzRepair-add"); - } - /** - * 交旧领新登记表编辑页面跳转 - * - * @return - */ - @RequestMapping(params = "goUpdate") - public ModelAndView goUpdate(TWzRepairEntity tWzRepair, HttpServletRequest req) { - if (StringUtil.isNotEmpty(tWzRepair.getId())) { - tWzRepair = tWzRepairService.getEntity(TWzRepairEntity.class, tWzRepair.getId()); - req.setAttribute("tWzRepairPage", tWzRepair); - } - return new ModelAndView("com/zzjee/wzrepair/tWzRepair-update"); - } - - /** - * 导入功能跳转 - * - * @return - */ - @RequestMapping(params = "upload") - public ModelAndView upload(HttpServletRequest req) { - req.setAttribute("controller_name","tWzRepairController"); - return new ModelAndView("common/upload/pub_excel_upload"); - } - - /** - * 导出excel - * - * @param request - * @param response - */ - @RequestMapping(params = "exportXls") - public String exportXls(TWzRepairEntity tWzRepair, HttpServletRequest request, HttpServletResponse response - , DataGrid dataGrid, ModelMap modelMap) { - CriteriaQuery cq = new CriteriaQuery(TWzRepairEntity.class, dataGrid); - org.jeecgframework.core.extend.hqlsearch.HqlGenerateUtil.installHql(cq, tWzRepair, request.getParameterMap()); - List tWzRepairs = this.tWzRepairService.getListByCriteriaQuery(cq,false); - modelMap.put(NormalExcelConstants.FILE_NAME,"交旧领新登记表"); - modelMap.put(NormalExcelConstants.CLASS,TWzRepairEntity.class); - modelMap.put(NormalExcelConstants.PARAMS,new ExportParams("交旧领新登记表列表", "导出人:"+ ResourceUtil.getSessionUserName().getRealName(), - "导出信息")); - modelMap.put(NormalExcelConstants.DATA_LIST,tWzRepairs); - return NormalExcelConstants.JEECG_EXCEL_VIEW; - } - /** - * 导出excel 使模板 - * - * @param request - * @param response - */ - @RequestMapping(params = "exportXlsByT") - public String exportXlsByT(TWzRepairEntity tWzRepair, HttpServletRequest request, HttpServletResponse response - , DataGrid dataGrid, ModelMap modelMap) { - modelMap.put(NormalExcelConstants.FILE_NAME,"交旧领新登记表"); - modelMap.put(NormalExcelConstants.CLASS,TWzRepairEntity.class); - modelMap.put(NormalExcelConstants.PARAMS,new ExportParams("交旧领新登记表列表", "导出人:"+ 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 listTWzRepairEntitys = ExcelImportUtil.importExcel(file.getInputStream(),TWzRepairEntity.class,params); - for (TWzRepairEntity tWzRepair : listTWzRepairEntitys) { - tWzRepairService.save(tWzRepair); - } - 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 listTWzRepairs=tWzRepairService.getList(TWzRepairEntity.class); - return listTWzRepairs; - } - - @RequestMapping(value = "/{id}", method = RequestMethod.GET) - @ResponseBody - public ResponseEntity get(@PathVariable("id") String id) { - TWzRepairEntity task = tWzRepairService.get(TWzRepairEntity.class, id); - if (task == null) { - return new ResponseEntity(HttpStatus.NOT_FOUND); - } - return new ResponseEntity(task, HttpStatus.OK); - } - - @RequestMapping(method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE) - @ResponseBody - public ResponseEntity create(@RequestBody TWzRepairEntity tWzRepair, UriComponentsBuilder uriBuilder) { - //调用JSR303 Bean Validator进行校验，如果出错返回含400错误码及json格式的错误信息. - Set> failures = validator.validate(tWzRepair); - if (!failures.isEmpty()) { - return new ResponseEntity(BeanValidators.extractPropertyAndMessage(failures), HttpStatus.BAD_REQUEST); - } - - //保存 - try{ - tWzRepairService.save(tWzRepair); - } catch (Exception e) { - e.printStackTrace(); - return new ResponseEntity(HttpStatus.NO_CONTENT); - } - //按照Restful风格约定，创建指向新任务的url, 也可以直接返回id或对象. - String id = tWzRepair.getId(); - URI uri = uriBuilder.path("/rest/tWzRepairController/" + id).build().toUri(); - HttpHeaders headers = new HttpHeaders(); - headers.setLocation(uri); - - return new ResponseEntity(headers, HttpStatus.CREATED); - } - - @RequestMapping(value = "/{id}", method = RequestMethod.PUT, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity update(@RequestBody TWzRepairEntity tWzRepair) { - //调用JSR303 Bean Validator进行校验，如果出错返回含400错误码及json格式的错误信息. - Set> failures = validator.validate(tWzRepair); - if (!failures.isEmpty()) { - return new ResponseEntity(BeanValidators.extractPropertyAndMessage(failures), HttpStatus.BAD_REQUEST); - } - - //保存 - try{ - tWzRepairService.saveOrUpdate(tWzRepair); - } catch (Exception e) { - e.printStackTrace(); - return new ResponseEntity(HttpStatus.NO_CONTENT); - } - - //按Restful约定，返回204状态码, 无内容. 也可以返回200状态码. - return new ResponseEntity(HttpStatus.NO_CONTENT); - } - - @RequestMapping(value = "/{id}", method = RequestMethod.DELETE) - @ResponseStatus(HttpStatus.NO_CONTENT) - public void delete(@PathVariable("id") String id) { - tWzRepairService.deleteEntityById(TWzRepairEntity.class, id); - } -} diff --git a/src/main/java/com/zzjee/wzrepair/entity/TWzRepairEntity.java b/src/main/java/com/zzjee/wzrepair/entity/TWzRepairEntity.java deleted file mode 100644 index 644206c7..00000000 --- a/src/main/java/com/zzjee/wzrepair/entity/TWzRepairEntity.java +++ /dev/null @@ -1,474 +0,0 @@ -package com.zzjee.wzrepair.entity; - -import org.hibernate.annotations.GenericGenerator; -import org.jeecgframework.poi.excel.annotation.Excel; - -import javax.persistence.*; -import java.util.Date; - -/** - * @Title: Entity - * @Description: 交旧领新登记表 - * @author onlineGenerator - * @date 2020-02-24 11:36:29 - * @version V1.0 - * - */ -@Entity -@Table(name = "t_wz_repair", schema = "") -@SuppressWarnings("serial") -public class TWzRepairEntity implements java.io.Serializable { - /**主键*/ - private String id; - /**创建人名称*/ - @Excel(name="创建人名称") - private String createName; - /**创建人登录名称*/ - @Excel(name="创建人登录名称") - private String createBy; - /**创建日期*/ - @Excel(name="创建日期",format = "yyyy-MM-dd") - private Date createDate; - /**更新人名称*/ - private String updateName; - /**更新人登录名称*/ - private String updateBy; - /**更新日期*/ - private Date updateDate; - /**所属部门*/ - private String sysOrgCode; - /**所属公司*/ - private String sysCompanyCode; - /**流程状态*/ - private String bpmStatus; - /**物料编码*/ - @Excel(name="物料编码") - private String matCode; - /**物料名称*/ - @Excel(name="物料名称") - private String matName; - /**库存地点*/ - @Excel(name="库存地点") - private String matLocation; - /**数量*/ - @Excel(name="数量") - private String matQty; - /**规格*/ - @Excel(name="规格") - private String matGuige; - /**单位*/ - @Excel(name="单位") - private String matUnit; - /**原价值*/ - @Excel(name="原价值") - private String matOriamount; - /**现价值*/ - @Excel(name="现价值") - private String matNowamount; - /**修复时间*/ - @Excel(name="修复时间") - private String repairDate; - /**修复人*/ - @Excel(name="修复人") - private String repairUser; - /**验收人*/ - @Excel(name="验收人") - private String qmUser; - /**修复备注*/ - @Excel(name="修复备注") - private String repairRemark; - /**出库单号*/ - @Excel(name="出库单号") - private String ckId; - /**出库项目*/ - @Excel(name="出库项目") - private String ckItmeId; - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 主键 - */ - @Id - @GeneratedValue(generator = "paymentableGenerator") - @GenericGenerator(name = "paymentableGenerator", strategy = "uuid") - @Column(name ="ID",nullable=false,length=36) - public String getId(){ - return this.id; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 主键 - */ - public void setId(String id){ - this.id = id; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 创建人名称 - */ - @Column(name ="CREATE_NAME",nullable=true,length=50) - public String getCreateName(){ - return this.createName; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 创建人名称 - */ - public void setCreateName(String createName){ - this.createName = createName; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 创建人登录名称 - */ - @Column(name ="CREATE_BY",nullable=true,length=50) - public String getCreateBy(){ - return this.createBy; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 创建人登录名称 - */ - public void setCreateBy(String createBy){ - this.createBy = createBy; - } - /** - *方法: 取得java.util.Date - *@return: java.util.Date 创建日期 - */ - @Column(name ="CREATE_DATE",nullable=true,length=20) - public Date getCreateDate(){ - return this.createDate; - } - - /** - *方法: 设置java.util.Date - *@param: java.util.Date 创建日期 - */ - public void setCreateDate(Date createDate){ - this.createDate = createDate; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 更新人名称 - */ - @Column(name ="UPDATE_NAME",nullable=true,length=50) - public String getUpdateName(){ - return this.updateName; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 更新人名称 - */ - public void setUpdateName(String updateName){ - this.updateName = updateName; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 更新人登录名称 - */ - @Column(name ="UPDATE_BY",nullable=true,length=50) - public String getUpdateBy(){ - return this.updateBy; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 更新人登录名称 - */ - public void setUpdateBy(String updateBy){ - this.updateBy = updateBy; - } - /** - *方法: 取得java.util.Date - *@return: java.util.Date 更新日期 - */ - @Column(name ="UPDATE_DATE",nullable=true,length=20) - public Date getUpdateDate(){ - return this.updateDate; - } - - /** - *方法: 设置java.util.Date - *@param: java.util.Date 更新日期 - */ - public void setUpdateDate(Date updateDate){ - this.updateDate = updateDate; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 所属部门 - */ - @Column(name ="SYS_ORG_CODE",nullable=true,length=50) - public String getSysOrgCode(){ - return this.sysOrgCode; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 所属部门 - */ - public void setSysOrgCode(String sysOrgCode){ - this.sysOrgCode = sysOrgCode; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 所属公司 - */ - @Column(name ="SYS_COMPANY_CODE",nullable=true,length=50) - public String getSysCompanyCode(){ - return this.sysCompanyCode; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 所属公司 - */ - public void setSysCompanyCode(String sysCompanyCode){ - this.sysCompanyCode = sysCompanyCode; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 流程状态 - */ - @Column(name ="BPM_STATUS",nullable=true,length=32) - public String getBpmStatus(){ - return this.bpmStatus; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 流程状态 - */ - public void setBpmStatus(String bpmStatus){ - this.bpmStatus = bpmStatus; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 物料编码 - */ - @Column(name ="MAT_CODE",nullable=true,length=32) - public String getMatCode(){ - return this.matCode; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 物料编码 - */ - public void setMatCode(String matCode){ - this.matCode = matCode; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 物料名称 - */ - @Column(name ="MAT_NAME",nullable=true,length=64) - public String getMatName(){ - return this.matName; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 物料名称 - */ - public void setMatName(String matName){ - this.matName = matName; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 库存地点 - */ - @Column(name ="MAT_LOCATION",nullable=true,length=32) - public String getMatLocation(){ - return this.matLocation; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 库存地点 - */ - public void setMatLocation(String matLocation){ - this.matLocation = matLocation; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 数量 - */ - @Column(name ="MAT_QTY",nullable=true,length=32) - public String getMatQty(){ - return this.matQty; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 数量 - */ - public void setMatQty(String matQty){ - this.matQty = matQty; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 规格 - */ - @Column(name ="MAT_GUIGE",nullable=true,length=32) - public String getMatGuige(){ - return this.matGuige; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 规格 - */ - public void setMatGuige(String matGuige){ - this.matGuige = matGuige; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 单位 - */ - @Column(name ="MAT_UNIT",nullable=true,length=32) - public String getMatUnit(){ - return this.matUnit; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 单位 - */ - public void setMatUnit(String matUnit){ - this.matUnit = matUnit; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 原价值 - */ - @Column(name ="MAT_ORIAMOUNT",nullable=true,length=32) - public String getMatOriamount(){ - return this.matOriamount; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 原价值 - */ - public void setMatOriamount(String matOriamount){ - this.matOriamount = matOriamount; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 现价值 - */ - @Column(name ="MAT_NOWAMOUNT",nullable=true,length=32) - public String getMatNowamount(){ - return this.matNowamount; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 现价值 - */ - public void setMatNowamount(String matNowamount){ - this.matNowamount = matNowamount; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 修复时间 - */ - @Column(name ="REPAIR_DATE",nullable=true,length=32) - public String getRepairDate(){ - return this.repairDate; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 修复时间 - */ - public void setRepairDate(String repairDate){ - this.repairDate = repairDate; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 修复人 - */ - @Column(name ="REPAIR_USER",nullable=true,length=32) - public String getRepairUser(){ - return this.repairUser; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 修复人 - */ - public void setRepairUser(String repairUser){ - this.repairUser = repairUser; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 验收人 - */ - @Column(name ="QM_USER",nullable=true,length=32) - public String getQmUser(){ - return this.qmUser; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 验收人 - */ - public void setQmUser(String qmUser){ - this.qmUser = qmUser; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 修复备注 - */ - @Column(name ="REPAIR_REMARK",nullable=true,length=320) - public String getRepairRemark(){ - return this.repairRemark; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 修复备注 - */ - public void setRepairRemark(String repairRemark){ - this.repairRemark = repairRemark; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 出库单号 - */ - @Column(name ="CK_ID",nullable=true,length=32) - public String getCkId(){ - return this.ckId; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 出库单号 - */ - public void setCkId(String ckId){ - this.ckId = ckId; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 出库项目 - */ - @Column(name ="CK_ITME_ID",nullable=true,length=32) - public String getCkItmeId(){ - return this.ckItmeId; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 出库项目 - */ - public void setCkItmeId(String ckItmeId){ - this.ckItmeId = ckItmeId; - } -} diff --git a/src/main/java/com/zzjee/wzrepair/service/TWzRepairServiceI.java b/src/main/java/com/zzjee/wzrepair/service/TWzRepairServiceI.java deleted file mode 100644 index 51736461..00000000 --- a/src/main/java/com/zzjee/wzrepair/service/TWzRepairServiceI.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.zzjee.wzrepair.service; -import com.zzjee.wzrepair.entity.TWzRepairEntity; -import org.jeecgframework.core.common.service.CommonService; - -import java.io.Serializable; - -public interface TWzRepairServiceI extends CommonService { - - public void delete(TWzRepairEntity entity) throws Exception; - - public Serializable save(TWzRepairEntity entity) throws Exception; - - public void saveOrUpdate(TWzRepairEntity entity) throws Exception; - -} diff --git a/src/main/java/com/zzjee/wzrepair/service/impl/TWzRepairServiceImpl.java b/src/main/java/com/zzjee/wzrepair/service/impl/TWzRepairServiceImpl.java deleted file mode 100644 index cc12dda6..00000000 --- a/src/main/java/com/zzjee/wzrepair/service/impl/TWzRepairServiceImpl.java +++ /dev/null @@ -1,169 +0,0 @@ -package com.zzjee.wzrepair.service.impl; - -import com.zzjee.wzrepair.entity.TWzRepairEntity; -import com.zzjee.wzrepair.service.TWzRepairServiceI; -import org.jeecgframework.core.common.service.impl.CommonServiceImpl; -import org.jeecgframework.core.util.ApplicationContextUtil; -import org.jeecgframework.core.util.MyClassLoader; -import org.jeecgframework.core.util.StringUtil; -import org.jeecgframework.web.cgform.enhance.CgformEnhanceJavaInter; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.io.Serializable; -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; - -@Service("tWzRepairService") -@Transactional -public class TWzRepairServiceImpl extends CommonServiceImpl implements TWzRepairServiceI { - - - @Override - public void delete(TWzRepairEntity entity) throws Exception{ - super.delete(entity); - //执行删除操作增强业务 - this.doDelBus(entity); - } - - @Override - public Serializable save(TWzRepairEntity entity) throws Exception{ - Serializable t = super.save(entity); - //执行新增操作增强业务 - this.doAddBus(entity); - return t; - } - - @Override - public void saveOrUpdate(TWzRepairEntity entity) throws Exception{ - super.saveOrUpdate(entity); - //执行更新操作增强业务 - this.doUpdateBus(entity); - } - - /** - * 新增操作增强业务 - * @param t - * @return - */ - private void doAddBus(TWzRepairEntity t) throws Exception{ - //-----------------sql增强 start---------------------------- - //-----------------sql增强 end------------------------------ - - //-----------------java增强 start--------------------------- - //-----------------java增强 end----------------------------- - } - /** - * 更新操作增强业务 - * @param t - * @return - */ - private void doUpdateBus(TWzRepairEntity t) throws Exception{ - //-----------------sql增强 start---------------------------- - //-----------------sql增强 end------------------------------ - - //-----------------java增强 start--------------------------- - //-----------------java增强 end----------------------------- - } - /** - * 删除操作增强业务 - * @param t - * @return - */ - private void doDelBus(TWzRepairEntity t) throws Exception{ - //-----------------sql增强 start---------------------------- - //-----------------sql增强 end------------------------------ - - //-----------------java增强 start--------------------------- - //-----------------java增强 end----------------------------- - } - - private Map populationMap(TWzRepairEntity t){ - Map map = new HashMap(); - map.put("id", t.getId()); - map.put("create_name", t.getCreateName()); - map.put("create_by", t.getCreateBy()); - map.put("create_date", t.getCreateDate()); - map.put("update_name", t.getUpdateName()); - map.put("update_by", t.getUpdateBy()); - map.put("update_date", t.getUpdateDate()); - map.put("sys_org_code", t.getSysOrgCode()); - map.put("sys_company_code", t.getSysCompanyCode()); - map.put("bpm_status", t.getBpmStatus()); - map.put("mat_code", t.getMatCode()); - map.put("mat_name", t.getMatName()); - map.put("mat_location", t.getMatLocation()); - map.put("mat_qty", t.getMatQty()); - map.put("mat_guige", t.getMatGuige()); - map.put("mat_unit", t.getMatUnit()); - map.put("mat_oriamount", t.getMatOriamount()); - map.put("mat_nowamount", t.getMatNowamount()); - map.put("repair_date", t.getRepairDate()); - map.put("repair_user", t.getRepairUser()); - map.put("qm_user", t.getQmUser()); - map.put("repair_remark", t.getRepairRemark()); - map.put("ck_id", t.getCkId()); - map.put("ck_itme_id", t.getCkItmeId()); - return map; - } - - /** - * 替换sql中的变量 - * @param sql - * @param t - * @return - */ - public String replaceVal(String sql,TWzRepairEntity t){ - sql = sql.replace("#{id}",String.valueOf(t.getId())); - sql = sql.replace("#{create_name}",String.valueOf(t.getCreateName())); - sql = sql.replace("#{create_by}",String.valueOf(t.getCreateBy())); - sql = sql.replace("#{create_date}",String.valueOf(t.getCreateDate())); - sql = sql.replace("#{update_name}",String.valueOf(t.getUpdateName())); - sql = sql.replace("#{update_by}",String.valueOf(t.getUpdateBy())); - sql = sql.replace("#{update_date}",String.valueOf(t.getUpdateDate())); - sql = sql.replace("#{sys_org_code}",String.valueOf(t.getSysOrgCode())); - sql = sql.replace("#{sys_company_code}",String.valueOf(t.getSysCompanyCode())); - sql = sql.replace("#{bpm_status}",String.valueOf(t.getBpmStatus())); - sql = sql.replace("#{mat_code}",String.valueOf(t.getMatCode())); - sql = sql.replace("#{mat_name}",String.valueOf(t.getMatName())); - sql = sql.replace("#{mat_location}",String.valueOf(t.getMatLocation())); - sql = sql.replace("#{mat_qty}",String.valueOf(t.getMatQty())); - sql = sql.replace("#{mat_guige}",String.valueOf(t.getMatGuige())); - sql = sql.replace("#{mat_unit}",String.valueOf(t.getMatUnit())); - sql = sql.replace("#{mat_oriamount}",String.valueOf(t.getMatOriamount())); - sql = sql.replace("#{mat_nowamount}",String.valueOf(t.getMatNowamount())); - sql = sql.replace("#{repair_date}",String.valueOf(t.getRepairDate())); - sql = sql.replace("#{repair_user}",String.valueOf(t.getRepairUser())); - sql = sql.replace("#{qm_user}",String.valueOf(t.getQmUser())); - sql = sql.replace("#{repair_remark}",String.valueOf(t.getRepairRemark())); - sql = sql.replace("#{ck_id}",String.valueOf(t.getCkId())); - sql = sql.replace("#{ck_itme_id}",String.valueOf(t.getCkItmeId())); - sql = sql.replace("#{UUID}",UUID.randomUUID().toString()); - return sql; - } - - /** - * 执行JAVA增强 - */ - private void executeJavaExtend(String cgJavaType,String cgJavaValue,Map data) throws Exception { - if(StringUtil.isNotEmpty(cgJavaValue)){ - Object obj = null; - try { - if("class".equals(cgJavaType)){ - //因新增时已经校验了实例化是否可以成功，所以这块就不需要再做一次判断 - obj = MyClassLoader.getClassByScn(cgJavaValue).newInstance(); - }else if("spring".equals(cgJavaType)){ - obj = ApplicationContextUtil.getContext().getBean(cgJavaValue); - } - if(obj instanceof CgformEnhanceJavaInter){ - CgformEnhanceJavaInter javaInter = (CgformEnhanceJavaInter) obj; - javaInter.execute("t_wz_repair",data); - } - } catch (Exception e) { - e.printStackTrace(); - throw new Exception("执行JAVA增强出现异常！"); - } - } - } -} diff --git a/src/main/java/com/zzjee/wzrepair/util/constant.java b/src/main/java/com/zzjee/wzrepair/util/constant.java deleted file mode 100644 index ccd0c671..00000000 --- a/src/main/java/com/zzjee/wzrepair/util/constant.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.zzjee.wzrepair.util; - -public class constant { - public static final String WZ_YWLX_JJLX="交旧领新"; -// 再利用程度 wz_zlycd -// 业务类型 wz_ywlx -// 出库类别 wz_cklb - - -} diff --git a/src/main/java/com/zzjee/wzyw/controller/TWzCkHeadController.java b/src/main/java/com/zzjee/wzyw/controller/TWzCkHeadController.java deleted file mode 100644 index b7e0a5d6..00000000 --- a/src/main/java/com/zzjee/wzyw/controller/TWzCkHeadController.java +++ /dev/null @@ -1,1039 +0,0 @@ -package com.zzjee.wzyw.controller; - -import com.alibaba.fastjson.JSONArray; -import com.zzjee.md.entity.MvGoodsEntity; -import com.zzjee.util.ReportUtils; -import com.zzjee.wm.entity.WmOmNoticeHEntity; -import com.zzjee.wm.entity.WmOmNoticeIEntity; -import com.zzjee.wm.service.WmOmNoticeHServiceI; -import com.zzjee.wmutil.wmUtil; -import com.zzjee.wz.entity.TWzMaterialEntity; -import com.zzjee.wzrepair.entity.TWzRepairEntity; -import com.zzjee.wzrepair.service.TWzRepairServiceI; -import com.zzjee.wzyw.entity.TWzCkHeadEntity; -import com.zzjee.wzyw.entity.TWzCkItemDto; -import com.zzjee.wzyw.entity.TWzCkItemEntity; -import com.zzjee.wzyw.page.TWzCkHeadPage; -import com.zzjee.wzyw.service.TWzCkHeadServiceI; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import org.apache.commons.lang3.StringUtils; -import org.apache.log4j.Logger; -import org.apache.poi.hssf.usermodel.HSSFCellStyle; -import org.apache.poi.hssf.usermodel.HSSFPrintSetup; -import org.apache.poi.hssf.usermodel.HSSFSheet; -import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.apache.poi.ss.usermodel.*; -import org.apache.poi.ss.util.CellRangeAddress; -import org.jeecgframework.core.beanvalidator.BeanValidators; -import org.jeecgframework.core.common.controller.BaseController; -import org.jeecgframework.core.common.dao.jdbc.JdbcDao; -import org.jeecgframework.core.common.exception.BusinessException; -import org.jeecgframework.core.common.hibernate.qbc.CriteriaQuery; -import org.jeecgframework.core.common.model.json.AjaxJson; -import org.jeecgframework.core.common.model.json.DataGrid; -import org.jeecgframework.core.constant.Globals; -import org.jeecgframework.core.util.*; -import org.jeecgframework.jwt.util.ResponseMessage; -import org.jeecgframework.jwt.util.Result; -import org.jeecgframework.poi.excel.ExcelImportUtil; -import org.jeecgframework.poi.excel.entity.ExportParams; -import org.jeecgframework.poi.excel.entity.ImportParams; -import org.jeecgframework.poi.excel.entity.vo.NormalExcelConstants; -import org.jeecgframework.tag.core.easyui.TagUtil; -import org.jeecgframework.web.system.pojo.base.TSUser; -import org.jeecgframework.web.system.service.SystemService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -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.util.UriComponentsBuilder; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.validation.ConstraintViolation; -import javax.validation.Validator; -import java.awt.image.BufferedImage; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.OutputStream; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Set; - -/** - * @Title: Controller - * @Description: 物料出库 - * @author onlineGenerator - * @date 2018-05-20 21:43:29 - * @version V1.0 - * - */ -@Api(value="TWzCkHead",description="物料出库",tags="tWzCkHeadController") -@Controller -@RequestMapping("/tWzCkHeadController") -public class TWzCkHeadController extends BaseController { - /** - * Logger for this class - */ - private static final Logger logger = Logger.getLogger(TWzCkHeadController.class); - - @Autowired - private TWzCkHeadServiceI tWzCkHeadService; - @Autowired - private SystemService systemService; - @Autowired - private Validator validator; - - @Autowired - JdbcDao jdbcDao; - @Autowired - private WmOmNoticeHServiceI wmOmNoticeHService; - @Autowired - private TWzRepairServiceI tWzRepairService; - /** - * 物料出库列表 页面跳转 - * - * @return - */ - @RequestMapping(params = "list") - public ModelAndView list(HttpServletRequest request) { - return new ModelAndView("com/zzjee/wzyw/tWzCkHeadList"); - } - @RequestMapping(params = "listsp") - public ModelAndView listsp(HttpServletRequest request) { - return new ModelAndView("com/zzjee/wzyw/tWzCkHeadspList"); - } - /** - * easyui AJAX请求数据 - * - * @param request - * @param response - * @param dataGrid - */ - - @RequestMapping(params = "datagrid") - public void datagrid(TWzCkHeadEntity tWzCkHead,HttpServletRequest request, HttpServletResponse response, DataGrid dataGrid) { - CriteriaQuery cq = new CriteriaQuery(TWzCkHeadEntity.class, dataGrid); - //查询条件组装器 - org.jeecgframework.core.extend.hqlsearch.HqlGenerateUtil.installHql(cq, tWzCkHead); - try{ - //自定义追加查询条件 - String query_docDate_begin = request.getParameter("docDate_begin"); - String query_docDate_end = request.getParameter("docDate_end"); - if(StringUtil.isNotEmpty(query_docDate_begin)){ - cq.ge("docDate", Integer.parseInt(query_docDate_begin)); - } - if(StringUtil.isNotEmpty(query_docDate_end)){ - cq.le("docDate", Integer.parseInt(query_docDate_end)); - } - }catch (Exception e) { - throw new BusinessException(e.getMessage()); - } - cq.add(); - this.tWzCkHeadService.getDataGridReturn(cq, true); - TagUtil.datagrid(response, dataGrid); - } - - @RequestMapping(params = "datagridsp") - public void datagridsp(TWzCkHeadEntity tWzCkHead,HttpServletRequest request, HttpServletResponse response, DataGrid dataGrid) { - CriteriaQuery cq = new CriteriaQuery(TWzCkHeadEntity.class, dataGrid); - //查询条件组装器 - org.jeecgframework.core.extend.hqlsearch.HqlGenerateUtil.installHql(cq, tWzCkHead); - try{ - //自定义追加查询条件 - String query_docDate_begin = request.getParameter("docDate_begin"); - String query_docDate_end = request.getParameter("docDate_end"); - if(StringUtil.isNotEmpty(query_docDate_begin)){ - cq.ge("docDate", Integer.parseInt(query_docDate_begin)); - } - if(StringUtil.isNotEmpty(query_docDate_end)){ - cq.le("docDate", Integer.parseInt(query_docDate_end)); - } - String[] ina = new String[2]; - ina[0]="2"; - ina[1]="3"; - cq.in("bpmStatus",ina); -// cq.eq("updateBy",ResourceUtil.getSessionUser().getUserName()); - }catch (Exception e) { - throw new BusinessException(e.getMessage()); - } - cq.add(); - this.tWzCkHeadService.getDataGridReturn(cq, true); - TagUtil.datagrid(response, dataGrid); - } - - - - /** - * 删除物料出库 - * - * @return - */ - @RequestMapping(params = "doDel") - @ResponseBody - public AjaxJson doDel(TWzCkHeadEntity tWzCkHead, HttpServletRequest request) { - AjaxJson j = new AjaxJson(); - tWzCkHead = systemService.getEntity(TWzCkHeadEntity.class, tWzCkHead.getId()); - String message = "物料出库删除成功"; - try{ - tWzCkHeadService.delMain(tWzCkHead); - systemService.addLog(message, Globals.Log_Type_DEL, Globals.Log_Leavel_INFO); - }catch(Exception e){ - e.printStackTrace(); - message = "物料出库删除失败"; - throw new BusinessException(e.getMessage()); - } - j.setMsg(message); - return j; - } - - /** - * 批量删除物料出库 - * - * @return - */ - @RequestMapping(params = "doBatchDel") - @ResponseBody - public AjaxJson doBatchDel(String ids, HttpServletRequest request){ - AjaxJson j = new AjaxJson(); - String message = "物料出库删除成功"; - try{ - for(String id:ids.split(",")){ - TWzCkHeadEntity tWzCkHead = systemService.getEntity(TWzCkHeadEntity.class, - Integer.parseInt(id) - ); -// tWzCkHead.setBpmStatus("已删除"); -// systemService.updateEntitie(tWzCkHead); - tWzCkHeadService.delMain(tWzCkHead); - systemService.addLog(message, Globals.Log_Type_DEL, Globals.Log_Leavel_INFO); - } - }catch(Exception e){ - e.printStackTrace(); - message = "物料出库删除失败"; - throw new BusinessException(e.getMessage()); - } - j.setMsg(message); - return j; - } - - - /** - * 添加物料出库 - * - * @return - */ - @RequestMapping(params = "doAddcheck") - @ResponseBody - public AjaxJson doAddcheck(String mat_code , String mat_location, String mat_qty, HttpServletRequest request) { - AjaxJson j = new AjaxJson(); - String message = "库存充足"; - try{ - String sql = "select mat_qty as qua from v_wz_stock_a t where t.mat_code = '" - + mat_code + "'" + " and t.mat_location = '" - + mat_location + "'" ; - Map binMap = systemService.findOneForJdbc(sql); - Double stock = Double.parseDouble(binMap.get("qua").toString()); - Double mty = Double.parseDouble(request.getParameter("mat_qty").toString()); - if(binMap!=null){ - if( stock < mty){ - j.setSuccess(false); - message = request.getParameter("mat_code").toString() +"库存为"+binMap.get("qua").toString(); - j.setMsg(message); - return j; - } - } - -// tWzCkHeadService.addMain(tWzCkHead, tWzCkItemList); -// systemService.addLog(message, Globals.Log_Type_INSERT, Globals.Log_Leavel_INFO); - }catch(Exception e){ - - } - j.setMsg(message); - return j; - } - - - - - /** - * 添加物料出库 - * - * @return - */ - @RequestMapping(params = "doAdd") - @ResponseBody - public AjaxJson doAdd(TWzCkHeadEntity tWzCkHead, TWzCkHeadPage tWzCkHeadPage, HttpServletRequest request) { - List tWzCkItemList = tWzCkHeadPage.getTWzCkItemList(); - AjaxJson j = new AjaxJson(); - String message = "添加成功"; - try{ - if(tWzCkHead.getCkSgsp().equals("Y")){ - tWzCkHead.setBpmStatus("2"); - }else{ - tWzCkHead.setBpmStatus("3"); - } - - try{ -// String[] strs = tWzCkHead.getCkUsername() .split(","); - //第一个分号之前的字符串自然就是数组里的第一个 - String username = tWzCkHead.getCkUsername(); - TSUser user = systemService.findUniqueByProperty(TSUser.class,"userName",username); - tWzCkHead.setCkName(user.getRealName()); - tWzCkHead.setCkUsername(user.getUserName()); - tWzCkHead.setOrgCode(user.getUserOrgList().get(0).getTsDepart().getOrgCode()); - tWzCkHead.setOrgName(user.getUserOrgList().get(0).getTsDepart().getDepartname()); - }catch (Exception e){ - - } - - - tWzCkHeadService.addMain(tWzCkHead, tWzCkItemList); - systemService.addLog(message, Globals.Log_Type_INSERT, Globals.Log_Leavel_INFO); - }catch(Exception e){ - e.printStackTrace(); - message = "物料出库添加失败"; - throw new BusinessException(e.getMessage()); - } - j.setMsg(message); - return j; - } - - - - @RequestMapping(params = "doPrint") - @ResponseBody - public void downReceiveExcel(String id, - HttpServletRequest request, HttpServletResponse response) { - OutputStream fileOut = null; - BufferedImage bufferImg = null; - String codedFileName = null; - TWzCkHeadEntity tWzCkHead = systemService.getEntity(TWzCkHeadEntity.class, - Integer.parseInt(id));// 获取抬头 - String hql0 = "from TWzCkItemEntity where 1 = 1 AND wZCK_HID = ? "; - String sql = "select c.mat_code,c.mat_name,c.mat_location,h.ck_name,c.mat_qty,c.mat_unit,c.mat_price,(c.mat_qty*c.mat_price) as mat_amount,c.create_date\n" + - " from t_wz_ck_item c LEFT JOIN t_wz_ck_head h ON c.wzck_hid = h.id where c.wzck_hid = " + id; - List tWzCkItemOldList = jdbcDao.find(sql, TWzCkItemDto.class,null); - try { - StringBuffer sber = new StringBuffer(); - - ByteArrayOutputStream byteArrayOut = new ByteArrayOutputStream(); - - // 进行转码，使其支持中文文件名 - codedFileName = java.net.URLEncoder.encode("中文", "UTF-8"); - response.setHeader("content-disposition", "attachment;filename=" - + id + ".xls"); - - HSSFWorkbook wb = new HSSFWorkbook(); - HSSFSheet sheet = wb.createSheet("领料出库"); - sheet.setMargin(HSSFSheet.TopMargin,0.2);// 页边距（上） - sheet.setMargin(HSSFSheet.BottomMargin,0.1);// 页边距（下） - sheet.setMargin(HSSFSheet.LeftMargin,0.8);// 页边距（左） - sheet.setMargin(HSSFSheet.RightMargin,0.0);// 页边距（右 - sheet.setColumnWidth(0, 5 * 256); - sheet.setColumnWidth(1, 10 * 256); - sheet.setColumnWidth(2, 15 * 200); - sheet.setColumnWidth(3, 10 * 256); - sheet.setColumnWidth(4, 10 * 256); - sheet.setColumnWidth(5, 10 * 256); - sheet.setColumnWidth(6, 5 * 256); - sheet.setColumnWidth(7, 5 * 256); - sheet.setColumnWidth(8, 10 * 256); - //{ "序号", "物料编码", "物料名称", "仓库", "领用人", "数量", "单位", "单价","金额" } - // sheet.setColumnWidth(7, 8 * 256); - // sheet.setColumnWidth(8, 8 * 256); - // 创建第一行 - Row row = sheet.createRow((short) 0); // 第一行空白 - - // 创建两种单元格格式 - CellStyle cs = wb.createCellStyle(); - CellStyle cs2 = wb.createCellStyle(); - CellStyle cs3 = wb.createCellStyle(); - CellStyle cs4 = wb.createCellStyle(); - CellStyle cs5 = wb.createCellStyle(); - // 创建两种字体 - Font f = wb.createFont(); - Font f2 = wb.createFont(); - - // 创建第一种字体样式（用于列名） - f.setFontHeightInPoints((short) 12); - f.setColor(IndexedColors.BLACK.getIndex()); - f.setBoldweight(Font.BOLDWEIGHT_BOLD); - - // 创建第二种字体样式（用于值） - f2.setFontHeightInPoints((short) 8); - f2.setColor(IndexedColors.BLACK.getIndex()); - - // Font f3=wb.createFont(); - // f3.setFontHeightInPoints((short) 10); - // f3.setColor(IndexedColors.RED.getIndex()); - - // 设置第一种单元格的样式（用于列名） - cs.setFont(f); - cs.setBorderLeft(CellStyle.BORDER_NONE); - cs.setBorderRight(CellStyle.BORDER_NONE); - cs.setBorderTop(CellStyle.BORDER_NONE); - cs.setBorderBottom(CellStyle.BORDER_NONE); - cs.setAlignment(HSSFCellStyle.ALIGN_CENTER); - // 设置第二种单元格的样式（用于值） - cs2.setFont(f2); - cs2.setBorderLeft(CellStyle.BORDER_NONE); - cs2.setBorderRight(CellStyle.BORDER_NONE); - cs2.setBorderTop(CellStyle.BORDER_NONE); - cs2.setBorderBottom(CellStyle.BORDER_NONE); - cs2.setWrapText(true); - - - cs3.setFont(f2); - cs3.setBorderLeft(CellStyle.BORDER_THIN); - cs3.setBorderRight(CellStyle.BORDER_THIN); - cs3.setBorderTop(CellStyle.BORDER_THIN); - cs3.setBorderBottom(CellStyle.BORDER_THIN); - cs3.setAlignment(CellStyle.ALIGN_CENTER); - - - cs4.setFont(f2); - cs4.setBorderLeft(CellStyle.BORDER_THIN); - cs4.setBorderRight(CellStyle.BORDER_THIN); - cs4.setBorderTop(CellStyle.BORDER_THIN); - cs4.setBorderBottom(CellStyle.BORDER_THIN); - - - cs5.setFont(f2); - cs5.setBorderLeft(CellStyle.BORDER_NONE); - cs5.setBorderRight(CellStyle.BORDER_NONE); - cs5.setBorderTop(CellStyle.BORDER_NONE); - cs5.setBorderBottom(CellStyle.BORDER_NONE); -// cs5.setWrapText(true); - - Row row1 = sheet.createRow((short) 1); // 第二行标题 - row1.setHeight((short) 700); - Cell cellTitle = row1.createCell(0); - cellTitle.setCellValue(ResourceUtil.getConfigByName("comname")+"出库单"); - cellTitle.setCellStyle(cs); - Row rowHead1 = sheet.createRow((short) 2); // 头部第一行 - rowHead1.setHeight((short) 500); - Cell cellHead11 = rowHead1.createCell(0); - cellHead11.setCellValue("出库单号：" + id+" 类型：" + tWzCkHead.getBy2()); - cellHead11.setCellStyle(cs2); - Cell cellHead12 = rowHead1.createCell(6); - - cellHead12.setCellValue("出库日期：" + DateUtils.date2Str(tWzCkHead.getCreateDate(), DateUtils.date_sdf)); - cellHead12.setCellStyle(cs2); - - - // 合并单元格 - CellRangeAddress c = new CellRangeAddress(0, 0, 0, 8); // 第一行空白 - CellRangeAddress c0 = new CellRangeAddress(1, 1, 0, 8);// 第二行标题 - CellRangeAddress c11 = new CellRangeAddress(2, 2, 0, 5);// 第三行供应商 - CellRangeAddress c12 = new CellRangeAddress(2, 2, 6, 8);// 第三行单据日期 - - sheet.addMergedRegion(c); - sheet.addMergedRegion(c0); - sheet.addMergedRegion(c11); - sheet.addMergedRegion(c12); - // sheet.addMergedRegion(c7); - - Row rowColumnName = sheet.createRow((short) 4); // 列名 - rowColumnName.setHeight((short) 500); - String[] columnNames = { "序号", "物料编码", "物料名称", "仓库", "领用人", "数量", "单位", "单价", - "金额" }; - - Double totalAmount = 0d; - Double totalNumber = 0d; - - for (int i = 0; i < columnNames.length; i++) { - Cell cell = rowColumnName.createCell(i); - cell.setCellValue(columnNames[i]); - cell.setCellStyle(cs3); - } - int cellsNum = 4; - int cerconNo = 1; - for (int i = 0; i < tWzCkItemOldList.size(); i++) { - TWzCkItemDto entity = tWzCkItemOldList.get(i); - cellsNum++; - Row rowColumnValue = sheet.createRow((short) cellsNum); // 列名 - rowColumnValue.setHeight((short) 500); - Cell cell1 = rowColumnValue.createCell(0); - cell1.setCellValue(cerconNo); - cell1.setCellStyle(cs3); - Cell cell2 = rowColumnValue.createCell(1); - - - try { - cell2.setCellStyle(cs3); - cell2.setCellValue(entity.getMatCode()); - }catch (Exception e){ - - } - try { - Cell cell3 = rowColumnValue.createCell(2); - cell3.setCellValue(entity.getMatName()); - cell3.setCellStyle(cs3); - }catch (Exception e){ - - } - try { - Cell cell4 = rowColumnValue.createCell(3); - cell4.setCellValue(entity.getMatLocation()); - cell4.setCellStyle(cs3); - }catch (Exception e){ - - } - try { - Cell cell5 = rowColumnValue.createCell(4); - cell5.setCellValue(entity.getCkName()); - cell5.setCellStyle(cs3); - }catch (Exception e){ - - } - try { - - - Cell cell6 = rowColumnValue.createCell(5); - cell6.setCellValue(StringUtil.moneyToString(entity.getMatQty(),"#.0000")); - cell6.setCellStyle(cs3); - totalNumber = totalNumber + Double.parseDouble(entity.getMatQty()); - }catch (Exception e){ - - } - try { - Cell cell7 = rowColumnValue.createCell(6); - cell7.setCellValue(entity.getMatUnit()); - cell7.setCellStyle(cs3); - }catch (Exception e){ - - } - try { - Cell cell8 = rowColumnValue.createCell(7); - cell8.setCellValue(StringUtil.moneyToString(entity.getMatPrice(),"#.00")); - cell8.setCellStyle(cs3); - }catch (Exception e){ - - } - try { - Cell cell9 = rowColumnValue.createCell(8); - cell9.setCellValue(StringUtil.moneyToString(entity.getMatAmount(),"#.00")); - cell9.setCellStyle(cs3); - totalAmount = totalAmount + Double.parseDouble(entity.getMatAmount()); - }catch (Exception e){ - - } - cerconNo++; - } - - //底部合计金额与数量 - Row rowColumnInfo = sheet.createRow((short) 1 + cellsNum); // 列名 - Cell cellrow = rowColumnInfo.createCell(0); - cellrow.setCellValue("合计"); - cellrow.setCellStyle(cs4); - Cell cellTotatl2 = rowColumnInfo.createCell(5); - cellTotatl2.setCellValue(StringUtil.moneyToString(totalNumber,"#.0000")); - cellTotatl2.setCellStyle(cs3); - Cell cellTotatl3 = rowColumnInfo.createCell(6); - cellTotatl3.setCellValue(""); - cellTotatl3.setCellStyle(cs3); - Cell cellTotatl4 = rowColumnInfo.createCell(7); - cellTotatl4.setCellValue(""); - cellTotatl4.setCellStyle(cs3); - Cell cellTotatl5 = rowColumnInfo.createCell(8); - cellTotatl5.setCellValue(StringUtil.moneyToString(totalAmount,"#.00")); - cellTotatl5.setCellStyle(cs3); - //合并单元格 - CellRangeAddress cellTotal = new CellRangeAddress(1 + cellsNum, 1 + cellsNum, 0, 4); - sheet.addMergedRegion(cellTotal); - ReportUtils.setBorderStyle(HSSFCellStyle.BORDER_THIN, cellTotal, sheet, wb); - - //底部合计金额大写转为汉字 - Row rowColumnInfo2 = sheet.createRow((short) 2 + cellsNum); // 列名 - Cell cellrow2 = rowColumnInfo2.createCell(0); - cellrow2.setCellValue("合计金额大写：" + ReportUtils.number2CNMontrayUnit(new BigDecimal(StringUtil.moneyToString(totalAmount,"#.00")))); - cellrow2.setCellStyle(cs4); - //合并单元格 - CellRangeAddress cellAmount = new CellRangeAddress(2 + cellsNum, 2 + cellsNum, 0, 8); - sheet.addMergedRegion(cellAmount); - ReportUtils.setBorderStyle(HSSFCellStyle.BORDER_THIN, cellAmount, sheet, wb); - - //底部签字 - Row rowColumnInfo3 = sheet.createRow((short) 5 + cellsNum); // 列名 - Cell cellrow3 = rowColumnInfo3.createCell(0); - cellrow3.setCellValue("制单人： 领货人： 审核人："); - cellrow3.setCellStyle(cs5); - - fileOut = response.getOutputStream(); - HSSFPrintSetup printSetup = sheet.getPrintSetup(); - printSetup.setPaperSize(HSSFPrintSetup.A5_PAPERSIZE); - printSetup.setLandscape(true); - wb.write(fileOut); - } catch (Exception e) { - e.printStackTrace(); - } finally { - if (fileOut != null) { - try { - fileOut.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - } - } - - - - - - - /** - * 更新物料出库 - * - * @return - */ - @RequestMapping(params = "doUpdatesp") - @ResponseBody - public AjaxJson doUpdatesp(String id, HttpServletRequest request) { - AjaxJson j = new AjaxJson(); - String message = "审批成功"; - try{ - TWzCkHeadEntity tWzCkHead = systemService.get(TWzCkHeadEntity.class,Integer.parseInt(id)); - tWzCkHead.setBpmStatus("1"); - String hql0 = "from TWzCkItemEntity where 1 = 1 AND wzck_hid = ? "; - List tWzCkItemList = systemService.findHql(hql0,id); - for (TWzCkItemEntity tWzCkItemEntity : tWzCkItemList) { - tWzCkItemEntity.setBpmStatus("1"); - systemService.saveOrUpdate(tWzCkItemEntity); - TWzRepairEntity tWzRepairEntity = new TWzRepairEntity(); - tWzRepairEntity.setCkId(tWzCkHead.getId().toString()); - tWzRepairEntity.setCkItmeId(tWzCkItemEntity.getId()); - tWzRepairEntity.setMatCode(tWzCkItemEntity.getMatCode()); - tWzRepairEntity.setMatName(tWzCkItemEntity.getMatName()); - tWzRepairEntity.setMatLocation(tWzCkItemEntity.getMatLocation()); - tWzRepairEntity.setMatQty(tWzCkItemEntity.getMatQty()); - TWzMaterialEntity wz = systemService.findUniqueByProperty(TWzMaterialEntity.class, "matCode", tWzCkItemEntity.getMatCode()); - tWzRepairEntity.setMatGuige(wz.getMatGuige()); - tWzRepairService.save(tWzRepairEntity); - } - systemService.saveOrUpdate(tWzCkHead); - String cuscosde = ""; - String ckid = tWzCkHead.getId().toString(); - List wmomh = systemService.findByProperty(WmOmNoticeHEntity.class, "imCusCode", ckid); - if(wmomh!=null&&wmomh.size()>0){ - message="出库通知已生成"; - j.setMsg(message); - return j; - } - - List wmomNoticeIListnew = new ArrayList(); - for (TWzCkItemEntity page : tWzCkItemList) { - WmOmNoticeIEntity wmi = new WmOmNoticeIEntity(); - wmi.setGoodsId(page.getMatCode()); - MvGoodsEntity mvgoods = systemService.findUniqueByProperty( - MvGoodsEntity.class, "goodsCode", wmi.getGoodsId()); - if (mvgoods != null) { - wmi.setGoodsName(mvgoods.getGoodsName()); - wmi.setGoodsUnit(mvgoods.getShlDanWei()); - } - try{ - wmi.setGoodsQua(page.getMatQty()); - String[] args=page.getMatQty().split("\\."); - wmi.setGoodsQua(args[0]); - }catch (Exception e){ - - } - -// wmi.setGoodsPrdData(billResult.getData().get(s).getDetail().get(k).getPdProdmadedate2User()); - wmi.setOtherId(page.getId()); -// wmi.setBinId(page.getBinId()); -// wmi.setBinOm(page.getBinOm()); - if(StringUtil.isNotEmpty(page.getMatBatch())){ - try{ - wmi.setGoodsProData(DateUtils.str2Date(page.getMatBatch(), DateUtils.date_sdf)); - - }catch (Exception e){ - - } - } - wmomNoticeIListnew.add(wmi); - } - WmOmNoticeHEntity wmOmNoticeH = new WmOmNoticeHEntity(); -// wmOmNoticeH.setReMember(pageheader.getReMember()); -// wmOmNoticeH.setReCarno(pageheader.getReCarno()); -// wmOmNoticeH.setDelvMember(pageheader.getDelvMember()); -// wmOmNoticeH.setDelvMobile(pageheader.getDelvMobile()); -// wmOmNoticeH.setDelvData(DateUtils.date2Str()tWzCkHead.getDocDate()); - wmOmNoticeH.setOrderTypeCode("11"); - wmOmNoticeH.setCusCode(cuscosde); - String noticeid = wmUtil.getNextomNoticeId(wmOmNoticeH.getOrderTypeCode()); - wmOmNoticeH.setOmNoticeId(noticeid); - wmOmNoticeH.setOmBeizhu(tWzCkHead.getCkRemark()); - - wmOmNoticeH.setImCusCode(ckid); - wmOmNoticeHService.addMain(wmOmNoticeH, wmomNoticeIListnew); - - - - - - - - - - - - - systemService.addLog(message, Globals.Log_Type_UPDATE, Globals.Log_Leavel_INFO); - }catch(Exception e){ - e.printStackTrace(); - message = "审批失败"; - throw new BusinessException(e.getMessage()); - } - j.setMsg(message); - return j; - } - - - - /** - * 更新物料出库 - * - * @return - */ - @RequestMapping(params = "doUpdate") - @ResponseBody - public AjaxJson doUpdate(TWzCkHeadEntity tWzCkHead, TWzCkHeadPage tWzCkHeadPage, HttpServletRequest request) { - List tWzCkItemList = tWzCkHeadPage.getTWzCkItemList(); - AjaxJson j = new AjaxJson(); - String message = "更新成功"; - try{ - - try{ - String[] strs = tWzCkHead.getCkUsername() .split(","); - //第一个分号之前的字符串自然就是数组里的第一个 - String userid = strs[0]; - TSUser user = systemService.get(TSUser.class,userid); - tWzCkHead.setCkName(user.getRealName()); - tWzCkHead.setCkUsername(user.getUserName()); - - }catch (Exception e){ - - } - - tWzCkHeadService.updateMain(tWzCkHead, tWzCkItemList); - systemService.addLog(message, Globals.Log_Type_UPDATE, Globals.Log_Leavel_INFO); - }catch(Exception e){ - e.printStackTrace(); - message = "更新物料出库失败"; - throw new BusinessException(e.getMessage()); - } - j.setMsg(message); - return j; - } - - /** - * 物料出库新增页面跳转 - * - * @return - */ - @RequestMapping(params = "goAdd") - public ModelAndView goAdd(TWzCkHeadEntity tWzCkHead, HttpServletRequest req) { - if (StringUtil.isNotEmpty(tWzCkHead.getId())) { - tWzCkHead = tWzCkHeadService.getEntity(TWzCkHeadEntity.class, tWzCkHead.getId()); - req.setAttribute("tWzCkHeadPage", tWzCkHead); - } - - req.setAttribute("username", ResourceUtil.getSessionUser().getUserName()); - req.setAttribute("usernametext", ResourceUtil.getSessionUser().getRealName()); - - return new ModelAndView("com/zzjee/wzyw/tWzCkHead-add"); - } - - /** - * 物料出库编辑页面跳转 - * - * @return - */ - @RequestMapping(params = "goUpdate") - public ModelAndView goUpdate(TWzCkHeadEntity tWzCkHead, HttpServletRequest req) { - if (StringUtil.isNotEmpty(tWzCkHead.getId())) { - tWzCkHead = tWzCkHeadService.getEntity(TWzCkHeadEntity.class, tWzCkHead.getId()); - req.setAttribute("tWzCkHeadPage", tWzCkHead); - } - return new ModelAndView("com/zzjee/wzyw/tWzCkHead-update"); - } - - - /** - * 加载明细列表[出库商品] - * - * @return - */ - @RequestMapping(params = "tWzCkItemList") - public ModelAndView tWzCkItemList(TWzCkHeadEntity tWzCkHead, HttpServletRequest req) { - - //=================================================================================== - //获取参数 - Object id0 = tWzCkHead.getId(); - //=================================================================================== - //查询-出库商品 - String hql0 = "from TWzCkItemEntity where 1 = 1 AND wZCK_HID = ? "; - try{ - List tWzCkItemEntityList = systemService.findHql(hql0,id0); - req.setAttribute("tWzCkItemList", tWzCkItemEntityList); - }catch(Exception e){ - logger.info(e.getMessage()); - } - return new ModelAndView("com/zzjee/wzyw/tWzCkItemList"); - } - - /** - * 加载明细列表[出库商品]不可编辑 - * - * @return - */ - @RequestMapping(params = "tWzCkItemListUnEdit") - public ModelAndView tWzCkItemListUnEdit(TWzCkHeadEntity tWzCkHead, HttpServletRequest req) { - - //=================================================================================== - //获取参数 - Object id0 = tWzCkHead.getId(); - //=================================================================================== - //查询-出库商品 - String hql0 = "from TWzCkItemEntity where 1 = 1 AND wZCK_HID = ? "; - try{ - List tWzCkItemEntityList = systemService.findHql(hql0,id0); - req.setAttribute("tWzCkItemList", tWzCkItemEntityList); - }catch(Exception e){ - logger.info(e.getMessage()); - } - return new ModelAndView("com/zzjee/wzyw/tWzCkItemListUnEdit"); - } - - /** - * 导出excel - * - * @param request - * @param response - */ - @RequestMapping(params = "exportXls") - public String exportXls(TWzCkHeadEntity tWzCkHead, HttpServletRequest request, HttpServletResponse response, DataGrid dataGrid, ModelMap map) { - CriteriaQuery cq = new CriteriaQuery(TWzCkHeadEntity.class, dataGrid); - //查询条件组装器 - org.jeecgframework.core.extend.hqlsearch.HqlGenerateUtil.installHql(cq, tWzCkHead); - try{ - //自定义追加查询条件 - }catch (Exception e) { - throw new BusinessException(e.getMessage()); - } - cq.add(); - List list=this.tWzCkHeadService.getListByCriteriaQuery(cq, false); - List pageList=new ArrayList(); - if(list!=null&&list.size()>0){ - for(TWzCkHeadEntity entity:list){ - try{ - TWzCkHeadPage page=new TWzCkHeadPage(); - MyBeanUtils.copyBeanNotNull2Bean(entity,page); - Object id0 = entity.getId(); - String hql0 = "from TWzCkItemEntity where 1 = 1 AND wZCK_HID = ? "; - List tWzCkItemEntityList = systemService.findHql(hql0,id0.toString()); - page.setTWzCkItemList(tWzCkItemEntityList); - pageList.add(page); - }catch(Exception e){ - logger.info(e.getMessage()); - } - } - } - map.put(NormalExcelConstants.FILE_NAME,"物料出库"); - map.put(NormalExcelConstants.CLASS,TWzCkHeadPage.class); - map.put(NormalExcelConstants.PARAMS,new ExportParams("物料出库列表", "导出人:"+ ResourceUtil.getSessionUser().getRealName(), - "导出信息")); - map.put(NormalExcelConstants.DATA_LIST,pageList); - return NormalExcelConstants.JEECG_EXCEL_VIEW; - } - - /** - * 通过excel导入数据 - * @param request - * @param - * @return - */ - @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(2); - params.setNeedSave(true); - try { - List list = ExcelImportUtil.importExcel(file.getInputStream(), TWzCkHeadPage.class, params); - TWzCkHeadEntity entity1=null; - for (TWzCkHeadPage page : list) { - entity1=new TWzCkHeadEntity(); - MyBeanUtils.copyBeanNotNull2Bean(page,entity1); - tWzCkHeadService.addMain(entity1, page.getTWzCkItemList()); - } - j.setMsg("文件导入成功！"); - } catch (Exception e) { - j.setMsg("文件导入失败！"); - logger.error(ExceptionUtil.getExceptionMessage(e)); - }finally{ - try { - file.getInputStream().close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - } - return j; - } - /** - * 导出excel 使模板 - */ - @RequestMapping(params = "exportXlsByT") - public String exportXlsByT(ModelMap map) { - map.put(NormalExcelConstants.FILE_NAME,"物料出库"); - map.put(NormalExcelConstants.CLASS,TWzCkHeadPage.class); - map.put(NormalExcelConstants.PARAMS,new ExportParams("物料出库列表", "导出人:"+ ResourceUtil.getSessionUser().getRealName(), - "导出信息")); - map.put(NormalExcelConstants.DATA_LIST,new ArrayList()); - return NormalExcelConstants.JEECG_EXCEL_VIEW; - } - /** - * 导入功能跳转 - * - * @return - */ - @RequestMapping(params = "upload") - public ModelAndView upload(HttpServletRequest req) { - req.setAttribute("controller_name", "tWzCkHeadController"); - return new ModelAndView("common/upload/pub_excel_upload"); - } - - - @RequestMapping(method = RequestMethod.GET) - @ResponseBody - @ApiOperation(value="物料出库列表信息",produces="application/json",httpMethod="GET") - public ResponseMessage> list() { - List list= tWzCkHeadService.getList(TWzCkHeadEntity.class); - List pageList=new ArrayList(); - if(list!=null&&list.size()>0){ - for(TWzCkHeadEntity entity:list){ - try{ - TWzCkHeadPage page=new TWzCkHeadPage(); - MyBeanUtils.copyBeanNotNull2Bean(entity,page); - Object id0 = entity.getId(); - String hql0 = "from TWzCkItemEntity where 1 = 1 AND wZCK_HID = ? "; - List tWzCkItemOldList = this.tWzCkHeadService.findHql(hql0,id0); - page.setTWzCkItemList(tWzCkItemOldList); - pageList.add(page); - }catch(Exception e){ - logger.info(e.getMessage()); - } - } - } - return Result.success(pageList); - } - - @RequestMapping(value = "/{id}", method = RequestMethod.GET) - @ResponseBody - @ApiOperation(value="根据ID获取物料出库信息",notes="根据ID获取物料出库信息",httpMethod="GET",produces="application/json") - public ResponseMessage get(@ApiParam(required=true,name="id",value="ID")@PathVariable("id") String id) { - TWzCkHeadEntity task = tWzCkHeadService.get(TWzCkHeadEntity.class, id); - if (task == null) { - return Result.error("根据ID获取物料出库信息为空"); - } - TWzCkHeadPage page = new TWzCkHeadPage(); - try { - MyBeanUtils.copyBeanNotNull2Bean(task, page); - Object id0 = task.getId(); - String hql0 = "from TWzCkItemEntity where 1 = 1 AND wZCK_HID = ? "; - List tWzCkItemOldList = this.tWzCkHeadService.findHql(hql0,id0); - page.setTWzCkItemList(tWzCkItemOldList); - } catch (Exception e) { - e.printStackTrace(); - } - return Result.success(page); - } - - @RequestMapping(method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE) - @ResponseBody - @ApiOperation(value="创建物料出库") - public ResponseMessage create(@ApiParam(name="物料出库对象")@RequestBody TWzCkHeadPage tWzCkHeadPage, UriComponentsBuilder uriBuilder) { - //调用JSR303 Bean Validator进行校验，如果出错返回含400错误码及json格式的错误信息. - Set> failures = validator.validate(tWzCkHeadPage); - if (!failures.isEmpty()) { - return Result.error(JSONArray.toJSONString(BeanValidators.extractPropertyAndMessage(failures))); - } - - //保存 - List tWzCkItemList = tWzCkHeadPage.getTWzCkItemList(); - - TWzCkHeadEntity tWzCkHead = new TWzCkHeadEntity(); - try{ - MyBeanUtils.copyBeanNotNull2Bean(tWzCkHeadPage,tWzCkHead); - }catch(Exception e){ - logger.info(e.getMessage()); - return Result.error("保存物料出库失败"); - } - tWzCkHeadService.addMain(tWzCkHead, tWzCkItemList); - - return Result.success(tWzCkHead); - } - - @RequestMapping(value = "/{id}", method = RequestMethod.PUT, consumes = MediaType.APPLICATION_JSON_VALUE) - @ResponseBody - @ApiOperation(value="更新物料出库",notes="更新物料出库") - public ResponseMessage update(@RequestBody TWzCkHeadPage tWzCkHeadPage) { - //调用JSR303 Bean Validator进行校验，如果出错返回含400错误码及json格式的错误信息. - Set> failures = validator.validate(tWzCkHeadPage); - if (!failures.isEmpty()) { - return Result.error(JSONArray.toJSONString(BeanValidators.extractPropertyAndMessage(failures))); - } - - //保存 - List tWzCkItemList = tWzCkHeadPage.getTWzCkItemList(); - - TWzCkHeadEntity tWzCkHead = new TWzCkHeadEntity(); - try{ - MyBeanUtils.copyBeanNotNull2Bean(tWzCkHeadPage,tWzCkHead); - }catch(Exception e){ - logger.info(e.getMessage()); - return Result.error("物料出库更新失败"); - } - tWzCkHeadService.updateMain(tWzCkHead, tWzCkItemList); - - //按Restful约定，返回204状态码, 无内容. 也可以返回200状态码. - return Result.success(); - } - - @RequestMapping(value = "/{id}", method = RequestMethod.DELETE) - @ResponseStatus(HttpStatus.NO_CONTENT) - @ApiOperation(value="删除物料出库") - public ResponseMessage delete(@ApiParam(name="id",value="ID",required=true)@PathVariable("id") String id) { - logger.info("delete[{}]" + id); - // 验证 - if (StringUtils.isEmpty(id)) { - return Result.error("ID不能为空"); - } - try { - TWzCkHeadEntity tWzCkHead = tWzCkHeadService.get(TWzCkHeadEntity.class, id); - tWzCkHeadService.delMain(tWzCkHead); - } catch (Exception e) { - e.printStackTrace(); - return Result.error("物料出库删除失败"); - } - - return Result.success(); - } -} diff --git a/src/main/java/com/zzjee/wzyw/controller/TWzPoHeadController.java b/src/main/java/com/zzjee/wzyw/controller/TWzPoHeadController.java deleted file mode 100644 index b58582b8..00000000 --- a/src/main/java/com/zzjee/wzyw/controller/TWzPoHeadController.java +++ /dev/null @@ -1,892 +0,0 @@ -package com.zzjee.wzyw.controller; - -import com.alibaba.fastjson.JSONArray; -import com.zzjee.md.entity.MdSupEntity; -import com.zzjee.md.entity.MvGoodsEntity; -import com.zzjee.wm.entity.WmImNoticeHEntity; -import com.zzjee.wm.entity.WmImNoticeIEntity; -import com.zzjee.wm.service.WmImNoticeHServiceI; -import com.zzjee.wmutil.wmUtil; -import com.zzjee.wz.entity.TWzMaterialEntity; -import com.zzjee.wzyw.entity.TWzPoHeadEntity; -import com.zzjee.wzyw.entity.TWzPoItemEntity; -import com.zzjee.wzyw.page.TWzPoHeadPage; -import com.zzjee.wzyw.service.TWzPoHeadServiceI; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import org.apache.commons.lang3.StringUtils; -import org.apache.log4j.Logger; -import org.apache.poi.hssf.usermodel.HSSFCellStyle; -import org.apache.poi.hssf.usermodel.HSSFPrintSetup; -import org.apache.poi.hssf.usermodel.HSSFSheet; -import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.apache.poi.ss.usermodel.*; -import org.apache.poi.ss.util.CellRangeAddress; -import org.jeecgframework.core.beanvalidator.BeanValidators; -import org.jeecgframework.core.common.controller.BaseController; -import org.jeecgframework.core.common.exception.BusinessException; -import org.jeecgframework.core.common.hibernate.qbc.CriteriaQuery; -import org.jeecgframework.core.common.model.json.AjaxJson; -import org.jeecgframework.core.common.model.json.DataGrid; -import org.jeecgframework.core.constant.Globals; -import org.jeecgframework.core.util.*; -import org.jeecgframework.jwt.util.ResponseMessage; -import org.jeecgframework.jwt.util.Result; -import org.jeecgframework.poi.excel.ExcelImportUtil; -import org.jeecgframework.poi.excel.entity.ExportParams; -import org.jeecgframework.poi.excel.entity.ImportParams; -import org.jeecgframework.poi.excel.entity.vo.NormalExcelConstants; -import org.jeecgframework.tag.core.easyui.TagUtil; -import org.jeecgframework.web.system.service.SystemService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -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.util.UriComponentsBuilder; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.validation.ConstraintViolation; -import javax.validation.Validator; -import java.awt.image.BufferedImage; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.OutputStream; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Set; - -/** - * @author onlineGenerator - * @version V1.0 - * @Title: Controller - * @Description: 物料采购订单 - * @date 2018-05-21 13:23:13 - */ -@Api(value = "TWzPoHead", description = "物料采购订单", tags = "tWzPoHeadController") -@Controller -@RequestMapping("/tWzPoHeadController") -public class TWzPoHeadController extends BaseController { - /** - * Logger for this class - */ - private static final Logger logger = Logger.getLogger(TWzPoHeadController.class); - - @Autowired - private TWzPoHeadServiceI tWzPoHeadService; - @Autowired - private SystemService systemService; - @Autowired - private Validator validator; - @Autowired - private WmImNoticeHServiceI wmImNoticeHService; - - /** - * 物料采购订单列表 页面跳转 - * - * @return - */ - @RequestMapping(params = "list") - public ModelAndView list(HttpServletRequest request) { - return new ModelAndView("com/zzjee/wzyw/tWzPoHeadList"); - } - - @RequestMapping(params = "listsp") - public ModelAndView listsp(HttpServletRequest request) { - return new ModelAndView("com/zzjee/wzyw/tWzPoHeadspList"); - } - - /** - * easyui AJAX请求数据 - * - * @param request - * @param response - * @param dataGrid - */ - - @RequestMapping(params = "datagrid") - public void datagrid(TWzPoHeadEntity tWzPoHead, HttpServletRequest request, HttpServletResponse response, DataGrid dataGrid) { - CriteriaQuery cq = new CriteriaQuery(TWzPoHeadEntity.class, dataGrid); - //查询条件组装器 - org.jeecgframework.core.extend.hqlsearch.HqlGenerateUtil.installHql(cq, tWzPoHead); - try { - //自定义追加查询条件 - } catch (Exception e) { - throw new BusinessException(e.getMessage()); - } - cq.add(); - this.tWzPoHeadService.getDataGridReturn(cq, true); - TagUtil.datagrid(response, dataGrid); - } - - @RequestMapping(params = "datagridsp") - public void datagridsp(TWzPoHeadEntity tWzPoHead, HttpServletRequest request, HttpServletResponse response, DataGrid dataGrid) { - CriteriaQuery cq = new CriteriaQuery(TWzPoHeadEntity.class, dataGrid); - //查询条件组装器 - org.jeecgframework.core.extend.hqlsearch.HqlGenerateUtil.installHql(cq, tWzPoHead); - try { - //自定义追加查询条件 - cq.eq("bpmStatus", "1"); - } catch (Exception e) { - throw new BusinessException(e.getMessage()); - } - cq.add(); - this.tWzPoHeadService.getDataGridReturn(cq, true); - TagUtil.datagrid(response, dataGrid); - } - - /** - * 删除物料采购订单 - * - * @return - */ - @RequestMapping(params = "doDel") - @ResponseBody - public AjaxJson doDel(TWzPoHeadEntity tWzPoHead, HttpServletRequest request) { - AjaxJson j = new AjaxJson(); - tWzPoHead = systemService.getEntity(TWzPoHeadEntity.class, tWzPoHead.getId()); - String message = "物料采购订单删除成功"; - try { - tWzPoHead.setBpmStatus("9"); - systemService.saveOrUpdate(tWzPoHead); -// tWzPoHeadService.delMain(tWzPoHead); - systemService.addLog(message, Globals.Log_Type_DEL, Globals.Log_Leavel_INFO); - } catch (Exception e) { - e.printStackTrace(); - message = "物料采购订单删除失败"; - throw new BusinessException(e.getMessage()); - } - j.setMsg(message); - return j; - } - - /** - * 批量删除物料采购订单 - * - * @return - */ - @RequestMapping(params = "doBatchDel") - @ResponseBody - public AjaxJson doBatchDel(String ids, HttpServletRequest request) { - AjaxJson j = new AjaxJson(); - String message = "物料采购订单删除成功"; - try { - for (String id : ids.split(",")) { - TWzPoHeadEntity tWzPoHead = systemService.getEntity(TWzPoHeadEntity.class, - Integer.parseInt(id) - ); - tWzPoHeadService.delMain(tWzPoHead); - systemService.addLog(message, Globals.Log_Type_DEL, Globals.Log_Leavel_INFO); - } - } catch (Exception e) { - e.printStackTrace(); - message = "物料采购订单删除失败"; - throw new BusinessException(e.getMessage()); - } - j.setMsg(message); - return j; - } - - - @RequestMapping(params = "doPrint") - @ResponseBody - public void downReceiveExcel(String id, - HttpServletRequest request, HttpServletResponse response) { - OutputStream fileOut = null; - BufferedImage bufferImg = null; - String codedFileName = null; - TWzPoHeadEntity tWzPoHead = systemService.getEntity(TWzPoHeadEntity.class, - Integer.parseInt(id));// 获取抬头 - String hql0 = "from TWzPoItemEntity where 1 = 1 AND pO_ID = ? "; - List tWzPoItemEntityList = systemService.findHql(hql0, id); - try { - StringBuffer sber = new StringBuffer(); - - ByteArrayOutputStream byteArrayOut = new ByteArrayOutputStream(); - - // 进行转码，使其支持中文文件名 - codedFileName = java.net.URLEncoder.encode("中文", "UTF-8"); - response.setHeader("content-disposition", "attachment;filename=" - + id + ".xls"); - - HSSFWorkbook wb = new HSSFWorkbook(); - HSSFSheet sheet = wb.createSheet("采购单"); - sheet.setMargin(HSSFSheet.TopMargin, 0.2);// 页边距（上） - sheet.setMargin(HSSFSheet.BottomMargin, 0.1);// 页边距（下） - sheet.setMargin(HSSFSheet.LeftMargin, 0.8);// 页边距（左） - sheet.setMargin(HSSFSheet.RightMargin, 0.0);// 页边距（右 - sheet.setColumnWidth(0, 10 * 256); - sheet.setColumnWidth(1, 35 * 256); - sheet.setColumnWidth(2, 35 * 200); - sheet.setColumnWidth(3, 35 * 256); - sheet.setColumnWidth(4, 10 * 256); - sheet.setColumnWidth(5, 10 * 256); - // sheet.setColumnWidth(6, 8 * 256); - // sheet.setColumnWidth(7, 8 * 256); - // sheet.setColumnWidth(8, 8 * 256); - // 创建第一行 - Row row = sheet.createRow((short) 0); // 第一行空白 - - // 创建两种单元格格式 - CellStyle cs = wb.createCellStyle(); - CellStyle cs2 = wb.createCellStyle(); - CellStyle cs3 = wb.createCellStyle(); - CellStyle cs4 = wb.createCellStyle(); - CellStyle cs5 = wb.createCellStyle(); - // 创建两种字体 - Font f = wb.createFont(); - Font f2 = wb.createFont(); - - // 创建第一种字体样式（用于列名） - f.setFontHeightInPoints((short) 22); - f.setColor(IndexedColors.BLACK.getIndex()); - f.setBoldweight(Font.BOLDWEIGHT_BOLD); - - // 创建第二种字体样式（用于值） - f2.setFontHeightInPoints((short) 16); - f2.setColor(IndexedColors.BLACK.getIndex()); - - // Font f3=wb.createFont(); - // f3.setFontHeightInPoints((short) 10); - // f3.setColor(IndexedColors.RED.getIndex()); - - // 设置第一种单元格的样式（用于列名） - cs.setFont(f); - cs.setBorderLeft(CellStyle.BORDER_NONE); - cs.setBorderRight(CellStyle.BORDER_NONE); - cs.setBorderTop(CellStyle.BORDER_NONE); - cs.setBorderBottom(CellStyle.BORDER_NONE); - cs.setAlignment(HSSFCellStyle.ALIGN_CENTER); - // 设置第二种单元格的样式（用于值） - cs2.setFont(f2); - cs2.setBorderLeft(CellStyle.BORDER_NONE); - cs2.setBorderRight(CellStyle.BORDER_NONE); - cs2.setBorderTop(CellStyle.BORDER_NONE); - cs2.setBorderBottom(CellStyle.BORDER_NONE); - cs2.setWrapText(true); - - // cs2.setAlignment(CellStyle.BORDER_NONE); - - cs3.setFont(f2); - cs3.setBorderLeft(CellStyle.BORDER_MEDIUM); - cs3.setBorderRight(CellStyle.BORDER_MEDIUM); - cs3.setBorderTop(CellStyle.BORDER_MEDIUM); - cs3.setBorderBottom(CellStyle.BORDER_MEDIUM); - // cs3.setAlignment(CellStyle.BORDER_HAIR); - cs4.setFont(f2); - cs4.setBorderTop(CellStyle.BORDER_MEDIUM); - cs4.setBorderBottom(CellStyle.BORDER_MEDIUM); - - cs5.setFont(f2); - cs5.setBorderLeft(CellStyle.BORDER_NONE); - cs5.setBorderRight(CellStyle.BORDER_NONE); - cs5.setBorderTop(CellStyle.BORDER_NONE); - cs5.setBorderBottom(CellStyle.BORDER_NONE); -// cs5.setWrapText(true); - - Row row1 = sheet.createRow((short) 1); // 第二行标题 - row1.setHeight((short) 700); - Cell cellTitle = row1.createCell(0); - cellTitle.setCellValue(ResourceUtil.getConfigByName("comname") + "采购单"); - cellTitle.setCellStyle(cs); - Row rowHead1 = sheet.createRow((short) 2); // 头部第一行 - rowHead1.setHeight((short) 800); - Cell cellHead11 = rowHead1.createCell(0); - cellHead11.setCellValue("采购单号：" + id ); - cellHead11.setCellStyle(cs2); - Cell cellHead12 = rowHead1.createCell(2); - - cellHead12.setCellValue("采购日期：" + DateUtils.date2Str(tWzPoHead.getCreateDate(), DateUtils.date_sdf)); - cellHead12.setCellStyle(cs2); - - Row rowHead2 = sheet.createRow((short) 3); // 头部第二行 - rowHead2.setHeight((short) 500); - Cell cellHead21 = rowHead2.createCell(0); - cellHead21.setCellValue("供应商编码：" + tWzPoHead.getVendorCode()); - cellHead21.setCellStyle(cs2); - - Cell cellHead23 = rowHead2.createCell(2); - cellHead23.setCellValue("供应商名称：" + tWzPoHead.getVendorName()); - cellHead23.setCellStyle(cs2); - - Row rowHead3 = sheet.createRow((short) 4); // 头部第三行 - rowHead3.setHeight((short) 500); - Cell cellHead31 = rowHead3.createCell(0); - cellHead31.setCellValue("备注：" + tWzPoHead.getPoRemark() - ); - cellHead31.setCellStyle(cs2); - - Cell cellHead35 = rowHead3.createCell(2); - cellHead35.setCellValue("采购人：" + tWzPoHead.getCreateName()); - cellHead35.setCellStyle(cs2); - Row rowHead4 = sheet.createRow((short) 5); // 头部第三行 - Cell cellHead41 = rowHead4.createCell(0); - cellHead41.setCellValue("类型：" + tWzPoHead.getPoBy1()); - cellHead41.setCellStyle(cs2); - // 合并单元格 - CellRangeAddress c = new CellRangeAddress(0, 0, 0, 5); // 第一行空白 - CellRangeAddress c0 = new CellRangeAddress(1, 1, 0, 5);// 第二行标题 - - CellRangeAddress c1 = new CellRangeAddress(2, 2, 0, 1);// 第三行通知单号 - CellRangeAddress c11 = new CellRangeAddress(2, 2, 2, 5);// 第三行通知单号 - CellRangeAddress c2 = new CellRangeAddress(3, 3, 0, 1);// 第四行客户 - CellRangeAddress c3 = new CellRangeAddress(3, 3, 2, 5);// 第四行客户送货时间 - CellRangeAddress c4 = new CellRangeAddress(4, 4, 0, 1);// 第五行客户 - CellRangeAddress c5 = new CellRangeAddress(4, 4, 2, 5);// 第五行客户送货时间 - CellRangeAddress c6 = new CellRangeAddress(5, 5, 0, 5); // 第一行空白 - - // CellRangeAddress c4 = new CellRangeAddress(4, 4, 0, 1); - // CellRangeAddress c5 = new CellRangeAddress(4, 4, 2, 3); - // CellRangeAddress c6 = new CellRangeAddress(4, 4, 4, 5); - // CellRangeAddress c7 = new CellRangeAddress(4, 4, 6, 6); - - sheet.addMergedRegion(c); - sheet.addMergedRegion(c0); - sheet.addMergedRegion(c1); - sheet.addMergedRegion(c2); - sheet.addMergedRegion(c3); - sheet.addMergedRegion(c4); - sheet.addMergedRegion(c5); - sheet.addMergedRegion(c11); - sheet.addMergedRegion(c6); - - Row rowColumnName = sheet.createRow((short) 7); // 列名 - rowColumnName.setHeight((short) 500); - String[] columnNames = {"序号", "物料编码", "物料名称", "数量", "单位", - "备注"}; - - for (int i = 0; i < columnNames.length; i++) { - Cell cell = rowColumnName.createCell(i); - cell.setCellValue(columnNames[i]); - cell.setCellStyle(cs3); - } - int cellsNum = 7; - int cerconNo = 1; - for (int i = 0; i < tWzPoItemEntityList.size(); i++) { - TWzPoItemEntity entity = tWzPoItemEntityList.get(i); - cellsNum++; - Row rowColumnValue = sheet.createRow((short) cellsNum); // 列名 - rowColumnValue.setHeight((short) 500); - Cell cell1 = rowColumnValue.createCell(0); - cell1.setCellValue(cerconNo); - cell1.setCellStyle(cs3); - Cell cell2 = rowColumnValue.createCell(1); - - - try { - cell2.setCellStyle(cs3); - cell2.setCellValue(entity.getMatCode()); - } catch (Exception e) { - - } - try { - Cell cell3 = rowColumnValue.createCell(2); - cell3.setCellValue(entity.getMatName()); - cell3.setCellStyle(cs3); - } catch (Exception e) { - - } - try { - Cell cell4 = rowColumnValue.createCell(3); - cell4.setCellValue(StringUtil.moneyToString(entity.getMatQty(),"#.0000")); - cell4.setCellStyle(cs3); - } catch (Exception e) { - - } - try { - Cell cell5 = rowColumnValue.createCell(4); - cell5.setCellValue(entity.getMatUnit()); - cell5.setCellStyle(cs3); - } catch (Exception e) { - - } - ; - try { - - - Cell cell6 = rowColumnValue.createCell(5); - cell6.setCellValue(entity.getItemRemark()); - cell6.setCellStyle(cs3); - } catch (Exception e) { - - } - cerconNo++; - } - Row rowColumnInfo = sheet.createRow((short) 2 + cellsNum); // 列名 - Cell cellrow = rowColumnInfo.createCell(0); - cellrow.setCellValue("采购人： 审批人： 主管："); - cellrow.setCellStyle(cs5); -// rowColumnInfo.createCell(0).setCellValue( -// "领用人： 仓管： 主管： "); -// CellRangeAddress c15 = new CellRangeAddress(10 + cellsNum, -// 10 + cellsNum, 0, 5); -// sheet.addMergedRegion(c15); - fileOut = response.getOutputStream(); - HSSFPrintSetup printSetup = sheet.getPrintSetup(); - printSetup.setPaperSize(HSSFPrintSetup.A5_PAPERSIZE); - printSetup.setLandscape(true); - wb.write(fileOut); - } catch (Exception e) { - e.printStackTrace(); - } finally { - if (fileOut != null) { - try { - fileOut.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - } - } - - - /** - * 添加物料采购订单 - * - * @return - */ - @RequestMapping(params = "doAdd") - @ResponseBody - public AjaxJson doAdd(TWzPoHeadEntity tWzPoHead, TWzPoHeadPage tWzPoHeadPage, HttpServletRequest request) { - List tWzPoItemList = tWzPoHeadPage.getTWzPoItemList(); - AjaxJson j = new AjaxJson(); - String message = "添加成功"; - try { - tWzPoHead.setBpmStatus("1"); - tWzPoHeadService.addMain(tWzPoHead, tWzPoItemList); - - String poid = tWzPoHead.getId().toString(); - String cusCode = ""; - List wmimh = systemService.findByProperty(WmImNoticeHEntity.class, "imCusCode", poid); - if (wmimh != null && wmimh.size() > 0) { - message = "生成入库通知失败，请手工录入入库通知"; - j.setMsg(message); - return j; - } - List wmImNoticeIListnew = new ArrayList(); - for (TWzPoItemEntity page : tWzPoItemList) { - WmImNoticeIEntity wmi = new WmImNoticeIEntity(); - wmi.setGoodsCode(page.getMatCode()); - MvGoodsEntity mvgoods = systemService.findUniqueByProperty( - MvGoodsEntity.class, "goodsCode", wmi.getGoodsCode()); - if (mvgoods != null) { - cusCode = mvgoods.getCusCode(); - wmi.setGoodsName(mvgoods.getGoodsName()); - wmi.setGoodsUnit(mvgoods.getShlDanWei()); - } - try { - wmi.setGoodsCount(page.getMatQty()); - String[] args = page.getMatQty().split("\\."); - wmi.setGoodsCount(args[0]); - } catch (Exception e) { - - } - - wmi.setOtherId(page.getId()); - wmImNoticeIListnew.add(wmi); - - } - - WmImNoticeHEntity wmImNoticeH = new WmImNoticeHEntity(); - wmImNoticeH.setOrderTypeCode("01"); - String noticeid = wmUtil.getNextNoticeid(wmImNoticeH.getOrderTypeCode()); - wmImNoticeH.setCusCode(cusCode); - wmImNoticeH.setNoticeId(noticeid); - wmImNoticeH.setImData(tWzPoHead.getDocDate()); -// wmImNoticeH.setPlatformCode(pageheader.getCusCode()); - wmImNoticeH.setImBeizhu(tWzPoHead.getPoRemark()); - wmImNoticeH.setSupCode(tWzPoHead.getVendorCode()); - MdSupEntity mdsup = systemService.findUniqueByProperty(MdSupEntity.class, "gysBianMa", wmImNoticeH.getSupCode()); - if (mdsup != null) { - wmImNoticeH.setSupName(mdsup.getZhongWenQch()); - } - wmImNoticeH.setImCusCode(poid); - - wmImNoticeHService.addMain(wmImNoticeH, wmImNoticeIListnew); - - - systemService.addLog(message, Globals.Log_Type_INSERT, Globals.Log_Leavel_INFO); - } catch (Exception e) { - e.printStackTrace(); - message = "物料采购订单添加失败"; - throw new BusinessException(e.getMessage()); - } - j.setMsg(message); - return j; - } - - - /** - * 更新物料出库 - * - * @return - */ - @RequestMapping(params = "doUpdatesp") - @ResponseBody - public AjaxJson doUpdatesp(String id, HttpServletRequest request) { - AjaxJson j = new AjaxJson(); - String message = "审批成功"; - try { - TWzPoHeadEntity tWzPoHead = systemService.get(TWzPoHeadEntity.class, Integer.parseInt(id)); - tWzPoHead.setBpmStatus("2"); - //=================================================================================== - //查询-采购订单行项目 - String hql0 = "from TWzPoItemEntity where 1 = 1 AND pO_ID = ? "; - try { - List tWzPoItemEntityList = systemService.findHql(hql0, id.toString()); - for (TWzPoItemEntity page : tWzPoItemEntityList) { - TWzMaterialEntity wz = systemService.findUniqueByProperty(TWzMaterialEntity.class, "matCode", page.getMatCode()); - try { - if (!StringUtil.isEmpty(page.getMatPrice())) { - wz.setMatPrice(new BigDecimal(page.getMatPrice())); - systemService.updateEntitie(wz); - } - } catch (Exception e) { - } - } - } catch (Exception e) { - } - systemService.saveOrUpdate(tWzPoHead); - systemService.addLog(message, Globals.Log_Type_UPDATE, Globals.Log_Leavel_INFO); - } catch (Exception e) { - e.printStackTrace(); - message = "审批失败"; - throw new BusinessException(e.getMessage()); - } - j.setMsg(message); - return j; - } - - /** - * 更新物料出库 - * - * @return - */ - @RequestMapping(params = "doUpdatecom") - @ResponseBody - public AjaxJson doUpdatecom(String id, HttpServletRequest request) { - AjaxJson j = new AjaxJson(); - String message = "完成成功"; - try { - TWzPoHeadEntity tWzPoHead = systemService.get(TWzPoHeadEntity.class, Integer.parseInt(id)); - tWzPoHead.setBpmStatus("3"); - systemService.saveOrUpdate(tWzPoHead); - systemService.addLog(message, Globals.Log_Type_UPDATE, Globals.Log_Leavel_INFO); - } catch (Exception e) { - e.printStackTrace(); - message = "完成失败"; - throw new BusinessException(e.getMessage()); - } - j.setMsg(message); - return j; - } - - - /** - * 更新物料采购订单 - * - * @return - */ - @RequestMapping(params = "doUpdate") - @ResponseBody - public AjaxJson doUpdate(TWzPoHeadEntity tWzPoHead, TWzPoHeadPage tWzPoHeadPage, HttpServletRequest request) { - List tWzPoItemList = tWzPoHeadPage.getTWzPoItemList(); - AjaxJson j = new AjaxJson(); - String message = "更新成功"; - try { - tWzPoHeadService.updateMain(tWzPoHead, tWzPoItemList); - systemService.addLog(message, Globals.Log_Type_UPDATE, Globals.Log_Leavel_INFO); - } catch (Exception e) { - e.printStackTrace(); - message = "更新物料采购订单失败"; - throw new BusinessException(e.getMessage()); - } - j.setMsg(message); - return j; - } - - /** - * 物料采购订单新增页面跳转 - * - * @return - */ - @RequestMapping(params = "goAdd") - public ModelAndView goAdd(TWzPoHeadEntity tWzPoHead, HttpServletRequest req) { - if (StringUtil.isNotEmpty(tWzPoHead.getId())) { - tWzPoHead = tWzPoHeadService.getEntity(TWzPoHeadEntity.class, tWzPoHead.getId()); - req.setAttribute("tWzPoHeadPage", tWzPoHead); - } - return new ModelAndView("com/zzjee/wzyw/tWzPoHead-add"); - } - - /** - * 物料采购订单编辑页面跳转 - * - * @return - */ - @RequestMapping(params = "goUpdate") - public ModelAndView goUpdate(TWzPoHeadEntity tWzPoHead, HttpServletRequest req) { - if (StringUtil.isNotEmpty(tWzPoHead.getId())) { - tWzPoHead = tWzPoHeadService.getEntity(TWzPoHeadEntity.class, tWzPoHead.getId()); - req.setAttribute("tWzPoHeadPage", tWzPoHead); - } - return new ModelAndView("com/zzjee/wzyw/tWzPoHead-update"); - } - - - /** - * 加载明细列表[采购订单行项目] - * - * @return - */ - @RequestMapping(params = "tWzPoItemList") - public ModelAndView tWzPoItemList(TWzPoHeadEntity tWzPoHead, HttpServletRequest req) { - - //=================================================================================== - //获取参数 - Object id0 = tWzPoHead.getId(); - //=================================================================================== - //查询-采购订单行项目 - String hql0 = "from TWzPoItemEntity where 1 = 1 AND pO_ID = ? "; - try { - List tWzPoItemEntityList = systemService.findHql(hql0, id0); - req.setAttribute("tWzPoItemList", tWzPoItemEntityList); - } catch (Exception e) { - logger.info(e.getMessage()); - } - return new ModelAndView("com/zzjee/wzyw/tWzPoItemList"); - } - - /** - * 导出excel - * - * @param request - * @param response - */ - @RequestMapping(params = "exportXls") - public String exportXls(TWzPoHeadEntity tWzPoHead, HttpServletRequest request, HttpServletResponse response, DataGrid dataGrid, ModelMap map) { - CriteriaQuery cq = new CriteriaQuery(TWzPoHeadEntity.class, dataGrid); - //查询条件组装器 - org.jeecgframework.core.extend.hqlsearch.HqlGenerateUtil.installHql(cq, tWzPoHead); - try { - //自定义追加查询条件 - } catch (Exception e) { - throw new BusinessException(e.getMessage()); - } - cq.add(); - List list = this.tWzPoHeadService.getListByCriteriaQuery(cq, false); - List pageList = new ArrayList(); - if (list != null && list.size() > 0) { - for (TWzPoHeadEntity entity : list) { - try { - TWzPoHeadPage page = new TWzPoHeadPage(); - MyBeanUtils.copyBeanNotNull2Bean(entity, page); - Object id0 = entity.getId(); - String hql0 = "from TWzPoItemEntity where 1 = 1 AND pO_ID = ? "; - List tWzPoItemEntityList = systemService.findHql(hql0, id0.toString()); - page.setTWzPoItemList(tWzPoItemEntityList); - pageList.add(page); - } catch (Exception e) { - logger.info(e.getMessage()); - } - } - } - map.put(NormalExcelConstants.FILE_NAME, "采购订单"); - map.put(NormalExcelConstants.CLASS, TWzPoHeadPage.class); - map.put(NormalExcelConstants.PARAMS, new ExportParams("采购订单列表", "导出人:" + ResourceUtil.getSessionUser().getRealName(), - "导出信息")); - map.put(NormalExcelConstants.DATA_LIST, pageList); - return NormalExcelConstants.JEECG_EXCEL_VIEW; - } - - /** - * 通过excel导入数据 - * - * @param request - * @param - * @return - */ - @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(2); - params.setNeedSave(true); - try { - List list = ExcelImportUtil.importExcel(file.getInputStream(), TWzPoHeadPage.class, params); - TWzPoHeadEntity entity1 = null; - for (TWzPoHeadPage page : list) { - entity1 = new TWzPoHeadEntity(); - MyBeanUtils.copyBeanNotNull2Bean(page, entity1); - tWzPoHeadService.addMain(entity1, page.getTWzPoItemList()); - } - j.setMsg("文件导入成功！"); - } catch (Exception e) { - j.setMsg("文件导入失败！"); - logger.error(ExceptionUtil.getExceptionMessage(e)); - } finally { - try { - file.getInputStream().close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - } - return j; - } - - /** - * 导出excel 使模板 - */ - @RequestMapping(params = "exportXlsByT") - public String exportXlsByT(ModelMap map) { - map.put(NormalExcelConstants.FILE_NAME, "物料采购订单"); - map.put(NormalExcelConstants.CLASS, TWzPoHeadPage.class); - map.put(NormalExcelConstants.PARAMS, new ExportParams("物料采购订单列表", "导出人:" + ResourceUtil.getSessionUser().getRealName(), - "导出信息")); - map.put(NormalExcelConstants.DATA_LIST, new ArrayList()); - return NormalExcelConstants.JEECG_EXCEL_VIEW; - } - - /** - * 导入功能跳转 - * - * @return - */ - @RequestMapping(params = "upload") - public ModelAndView upload(HttpServletRequest req) { - req.setAttribute("controller_name", "tWzPoHeadController"); - return new ModelAndView("common/upload/pub_excel_upload"); - } - - - @RequestMapping(method = RequestMethod.GET) - @ResponseBody - @ApiOperation(value = "物料采购订单列表信息", produces = "application/json", httpMethod = "GET") - public ResponseMessage> list() { - List list = tWzPoHeadService.getList(TWzPoHeadEntity.class); - List pageList = new ArrayList(); - if (list != null && list.size() > 0) { - for (TWzPoHeadEntity entity : list) { - try { - TWzPoHeadPage page = new TWzPoHeadPage(); - MyBeanUtils.copyBeanNotNull2Bean(entity, page); - Object id0 = entity.getId(); - String hql0 = "from TWzPoItemEntity where 1 = 1 AND pO_ID = ? "; - List tWzPoItemOldList = this.tWzPoHeadService.findHql(hql0, id0); - page.setTWzPoItemList(tWzPoItemOldList); - pageList.add(page); - } catch (Exception e) { - logger.info(e.getMessage()); - } - } - } - return Result.success(pageList); - } - - @RequestMapping(value = "/{id}", method = RequestMethod.GET) - @ResponseBody - @ApiOperation(value = "根据ID获取物料采购订单信息", notes = "根据ID获取物料采购订单信息", httpMethod = "GET", produces = "application/json") - public ResponseMessage get(@ApiParam(required = true, name = "id", value = "ID") @PathVariable("id") String id) { - TWzPoHeadEntity task = tWzPoHeadService.get(TWzPoHeadEntity.class, id); - if (task == null) { - return Result.error("根据ID获取物料采购订单信息为空"); - } - TWzPoHeadPage page = new TWzPoHeadPage(); - try { - MyBeanUtils.copyBeanNotNull2Bean(task, page); - Object id0 = task.getId(); - String hql0 = "from TWzPoItemEntity where 1 = 1 AND pO_ID = ? "; - List tWzPoItemOldList = this.tWzPoHeadService.findHql(hql0, id0); - page.setTWzPoItemList(tWzPoItemOldList); - } catch (Exception e) { - e.printStackTrace(); - } - return Result.success(page); - } - - @RequestMapping(method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE) - @ResponseBody - @ApiOperation(value = "创建物料采购订单") - public ResponseMessage create(@ApiParam(name = "物料采购订单对象") @RequestBody TWzPoHeadPage tWzPoHeadPage, UriComponentsBuilder uriBuilder) { - //调用JSR303 Bean Validator进行校验，如果出错返回含400错误码及json格式的错误信息. - Set> failures = validator.validate(tWzPoHeadPage); - if (!failures.isEmpty()) { - return Result.error(JSONArray.toJSONString(BeanValidators.extractPropertyAndMessage(failures))); - } - - //保存 - List tWzPoItemList = tWzPoHeadPage.getTWzPoItemList(); - - TWzPoHeadEntity tWzPoHead = new TWzPoHeadEntity(); - try { - MyBeanUtils.copyBeanNotNull2Bean(tWzPoHeadPage, tWzPoHead); - } catch (Exception e) { - logger.info(e.getMessage()); - return Result.error("保存物料采购订单失败"); - } - tWzPoHeadService.addMain(tWzPoHead, tWzPoItemList); - - return Result.success(tWzPoHead); - } - - @RequestMapping(value = "/{id}", method = RequestMethod.PUT, consumes = MediaType.APPLICATION_JSON_VALUE) - @ResponseBody - @ApiOperation(value = "更新物料采购订单", notes = "更新物料采购订单") - public ResponseMessage update(@RequestBody TWzPoHeadPage tWzPoHeadPage) { - //调用JSR303 Bean Validator进行校验，如果出错返回含400错误码及json格式的错误信息. - Set> failures = validator.validate(tWzPoHeadPage); - if (!failures.isEmpty()) { - return Result.error(JSONArray.toJSONString(BeanValidators.extractPropertyAndMessage(failures))); - } - - //保存 - List tWzPoItemList = tWzPoHeadPage.getTWzPoItemList(); - - TWzPoHeadEntity tWzPoHead = new TWzPoHeadEntity(); - try { - MyBeanUtils.copyBeanNotNull2Bean(tWzPoHeadPage, tWzPoHead); - } catch (Exception e) { - logger.info(e.getMessage()); - return Result.error("物料采购订单更新失败"); - } - tWzPoHeadService.updateMain(tWzPoHead, tWzPoItemList); - - //按Restful约定，返回204状态码, 无内容. 也可以返回200状态码. - return Result.success(); - } - - @RequestMapping(value = "/{id}", method = RequestMethod.DELETE) - @ResponseStatus(HttpStatus.NO_CONTENT) - @ApiOperation(value = "删除物料采购订单") - public ResponseMessage delete(@ApiParam(name = "id", value = "ID", required = true) @PathVariable("id") String id) { - logger.info("delete[{}]" + id); - // 验证 - if (StringUtils.isEmpty(id)) { - return Result.error("ID不能为空"); - } - try { - TWzPoHeadEntity tWzPoHead = tWzPoHeadService.get(TWzPoHeadEntity.class, id); - tWzPoHeadService.delMain(tWzPoHead); - } catch (Exception e) { - e.printStackTrace(); - return Result.error("物料采购订单删除失败"); - } - - return Result.success(); - } -} diff --git a/src/main/java/com/zzjee/wzyw/controller/TWzRkHeadController.java b/src/main/java/com/zzjee/wzyw/controller/TWzRkHeadController.java deleted file mode 100644 index 9388112c..00000000 --- a/src/main/java/com/zzjee/wzyw/controller/TWzRkHeadController.java +++ /dev/null @@ -1,882 +0,0 @@ -package com.zzjee.wzyw.controller; - -import com.alibaba.fastjson.JSONArray; -import com.zzjee.util.ReportUtils; -import com.zzjee.wz.entity.TWzMaterialEntity; -import com.zzjee.wzyw.entity.TWzRkHeadEntity; -import com.zzjee.wzyw.entity.TWzRkItemDto; -import com.zzjee.wzyw.entity.TWzRkItemEntity; -import com.zzjee.wzyw.page.TWzRkHeadPage; -import com.zzjee.wzyw.service.TWzRkHeadServiceI; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import org.apache.commons.lang3.StringUtils; -import org.apache.log4j.Logger; -import org.apache.poi.hssf.usermodel.HSSFCellStyle; -import org.apache.poi.hssf.usermodel.HSSFPrintSetup; -import org.apache.poi.hssf.usermodel.HSSFSheet; -import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.apache.poi.ss.usermodel.*; -import org.apache.poi.ss.util.CellRangeAddress; -import org.jeecgframework.core.beanvalidator.BeanValidators; -import org.jeecgframework.core.common.controller.BaseController; -import org.jeecgframework.core.common.dao.jdbc.JdbcDao; -import org.jeecgframework.core.common.exception.BusinessException; -import org.jeecgframework.core.common.hibernate.qbc.CriteriaQuery; -import org.jeecgframework.core.common.model.json.AjaxJson; -import org.jeecgframework.core.common.model.json.DataGrid; -import org.jeecgframework.core.constant.Globals; -import org.jeecgframework.core.util.*; -import org.jeecgframework.jwt.util.ResponseMessage; -import org.jeecgframework.jwt.util.Result; -import org.jeecgframework.poi.excel.ExcelImportUtil; -import org.jeecgframework.poi.excel.entity.ExportParams; -import org.jeecgframework.poi.excel.entity.ImportParams; -import org.jeecgframework.poi.excel.entity.vo.NormalExcelConstants; -import org.jeecgframework.tag.core.easyui.TagUtil; -import org.jeecgframework.web.system.service.SystemService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -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.util.UriComponentsBuilder; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.validation.ConstraintViolation; -import javax.validation.Validator; -import java.awt.image.BufferedImage; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.OutputStream; -import java.math.BigDecimal; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Set; - -/** - * @Title: Controller - * @Description: 入库抬头 - * @author onlineGenerator - * @date 2018-05-20 21:43:08 - * @version V1.0 - * - */ -@Api(value="TWzRkHead",description="入库抬头",tags="tWzRkHeadController") -@Controller -@RequestMapping("/tWzRkHeadController") -public class TWzRkHeadController extends BaseController { - /** - * Logger for this class - */ - private static final Logger logger = Logger.getLogger(TWzRkHeadController.class); - - @Autowired - private TWzRkHeadServiceI tWzRkHeadService; - @Autowired - private SystemService systemService; - @Autowired - private Validator validator; - - @Autowired - JdbcDao jdbcDao; - - /** - * 入库抬头列表 页面跳转 - * - * @return - */ - @RequestMapping(params = "list") - public ModelAndView list(HttpServletRequest request) { - return new ModelAndView("com/zzjee/wzyw/tWzRkHeadList"); - } - - /** - * easyui AJAX请求数据 - * - * @param request - * @param response - * @param dataGrid - * @param user - */ - - @RequestMapping(params = "datagrid") - public void datagrid(TWzRkHeadEntity tWzRkHead,HttpServletRequest request, HttpServletResponse response, DataGrid dataGrid) { - CriteriaQuery cq = new CriteriaQuery(TWzRkHeadEntity.class, dataGrid); - //查询条件组装器 - org.jeecgframework.core.extend.hqlsearch.HqlGenerateUtil.installHql(cq, tWzRkHead); - try{ - //自定义追加查询条件 - String query_docDate_begin = request.getParameter("docDate_begin"); - String query_docDate_end = request.getParameter("docDate_end"); - String status = request.getParameter("status"); - if(StringUtil.isNotEmpty(status)){ - cq.ge("bpmStatus",status); - } - if(StringUtil.isNotEmpty(query_docDate_begin)){ - cq.ge("docDate", new SimpleDateFormat("yyyy-MM-dd").parse(query_docDate_begin)); - } - if(StringUtil.isNotEmpty(query_docDate_end)){ - cq.le("docDate", new SimpleDateFormat("yyyy-MM-dd").parse(query_docDate_end)); - } - }catch (Exception e) { - throw new BusinessException(e.getMessage()); - } - cq.add(); - this.tWzRkHeadService.getDataGridReturn(cq, true); - TagUtil.datagrid(response, dataGrid); - } - - /** - * 删除入库抬头 - * - * @return - */ - @RequestMapping(params = "doDel") - @ResponseBody - public AjaxJson doDel(TWzRkHeadEntity tWzRkHead, HttpServletRequest request) { - AjaxJson j = new AjaxJson(); - tWzRkHead = systemService.getEntity(TWzRkHeadEntity.class, tWzRkHead.getId()); - String message = "入库抬头删除成功"; - try{ - tWzRkHeadService.delMain(tWzRkHead); - systemService.addLog(message, Globals.Log_Type_DEL, Globals.Log_Leavel_INFO); - }catch(Exception e){ - e.printStackTrace(); - message = "入库抬头删除失败"; - throw new BusinessException(e.getMessage()); - } - j.setMsg(message); - return j; - } - - /** - * 批量删除入库抬头 - * - * @return - */ - @RequestMapping(params = "doBatchDel") - @ResponseBody - public AjaxJson doBatchDel(String ids, HttpServletRequest request){ - AjaxJson j = new AjaxJson(); - String message = "入库抬头删除成功"; - try{ - for(String id:ids.split(",")){ - TWzRkHeadEntity tWzRkHead = systemService.getEntity(TWzRkHeadEntity.class, - Integer.parseInt(id) - ); - tWzRkHeadService.delMain(tWzRkHead); - systemService.addLog(message, Globals.Log_Type_DEL, Globals.Log_Leavel_INFO); - } - }catch(Exception e){ - e.printStackTrace(); - message = "入库抬头删除失败"; - throw new BusinessException(e.getMessage()); - } - j.setMsg(message); - return j; - } - - /** - * 添加入库抬头 - * - * @param ids - * @return - */ - @RequestMapping(params = "doAdd") - @ResponseBody - public AjaxJson doAdd(TWzRkHeadEntity tWzRkHead, TWzRkHeadPage tWzRkHeadPage, HttpServletRequest request) { - List tWzRkItemList = tWzRkHeadPage.getTWzRkItemList(); - AjaxJson j = new AjaxJson(); - String message = "添加成功"; - try{ -// try{ -// -// for (TWzRkItemEntity page : tWzRkItemList) { -// TWzMaterialEntity wz = systemService.findUniqueByProperty(TWzMaterialEntity.class,"matCode",page.getMatCode()); -// try{ -// if(!StringUtil.isEmpty(page.getMatPrice())){ -// wz.setMatPrice(new BigDecimal(page.getMatPrice())); -// systemService.updateEntitie(wz); -// } -// }catch (Exception e){ -// } -// } -// }catch (Exception e){ -// -// } - - - tWzRkHeadService.addMain(tWzRkHead, tWzRkItemList); - systemService.addLog(message, Globals.Log_Type_INSERT, Globals.Log_Leavel_INFO); - }catch(Exception e){ - e.printStackTrace(); - message = "入库抬头添加失败"; - throw new BusinessException(e.getMessage()); - } - j.setMsg(message); - return j; - } - /** - * 更新入库抬头 - * - * @param ids - * @return - */ - @RequestMapping(params = "doUpdate") - @ResponseBody - public AjaxJson doUpdate(TWzRkHeadEntity tWzRkHead, TWzRkHeadPage tWzRkHeadPage, HttpServletRequest request) { - List tWzRkItemList = tWzRkHeadPage.getTWzRkItemList(); - AjaxJson j = new AjaxJson(); - String message = "更新成功"; - try{ - tWzRkHeadService.updateMain(tWzRkHead, tWzRkItemList); - systemService.addLog(message, Globals.Log_Type_UPDATE, Globals.Log_Leavel_INFO); - }catch(Exception e){ - e.printStackTrace(); - message = "更新入库抬头失败"; - throw new BusinessException(e.getMessage()); - } - j.setMsg(message); - return j; - } - - /** - * 入库抬头新增页面跳转 - * - * @return - */ - @RequestMapping(params = "goAdd") - public ModelAndView goAdd(TWzRkHeadEntity tWzRkHead, HttpServletRequest req) { - if (StringUtil.isNotEmpty(tWzRkHead.getId())) { - tWzRkHead = tWzRkHeadService.getEntity(TWzRkHeadEntity.class, tWzRkHead.getId()); - req.setAttribute("tWzRkHeadPage", tWzRkHead); - } - return new ModelAndView("com/zzjee/wzyw/tWzRkHead-add"); - } - - /** - * 入库抬头编辑页面跳转 - * - * @return - */ - @RequestMapping(params = "goUpdate") - public ModelAndView goUpdate(TWzRkHeadEntity tWzRkHead, HttpServletRequest req) { - if (StringUtil.isNotEmpty(tWzRkHead.getId())) { - tWzRkHead = tWzRkHeadService.getEntity(TWzRkHeadEntity.class, tWzRkHead.getId()); - req.setAttribute("tWzRkHeadPage", tWzRkHead); - } - return new ModelAndView("com/zzjee/wzyw/tWzRkHead-update"); - } - - - /** - * 加载明细列表[入库商品] - * - * @return - */ - @RequestMapping(params = "tWzRkItemList") - public ModelAndView tWzRkItemList(TWzRkHeadEntity tWzRkHead, HttpServletRequest req) { - - //=================================================================================== - //获取参数 - Object id0 = tWzRkHead.getId(); - //=================================================================================== - //查询-入库商品 - String hql0 = "from TWzRkItemEntity where 1 = 1 AND wZRK_HID = ? "; - try{ - List tWzRkItemEntityList = systemService.findHql(hql0,id0); - req.setAttribute("tWzRkItemList", tWzRkItemEntityList); - }catch(Exception e){ - logger.info(e.getMessage()); - } - return new ModelAndView("com/zzjee/wzyw/tWzRkItemList"); - } - - /** - * 加载明细列表[入库商品]不可编辑 - * - * @return - */ - @RequestMapping(params = "tWzRkItemListUnEdit") - public ModelAndView tWzRkItemListUnEdit(TWzRkHeadEntity tWzRkHead, HttpServletRequest req) { - - //=================================================================================== - //获取参数 - Object id0 = tWzRkHead.getId(); - //=================================================================================== - //查询-入库商品 - String hql0 = "from TWzRkItemEntity where 1 = 1 AND wZRK_HID = ? "; - try{ - List tWzRkItemEntityList = systemService.findHql(hql0,id0); - req.setAttribute("tWzRkItemList", tWzRkItemEntityList); - }catch(Exception e){ - logger.info(e.getMessage()); - } - return new ModelAndView("com/zzjee/wzyw/tWzRkItemListUnEdit"); - } - /** - * 导出excel - * - * @param request - * @param response - */ - @RequestMapping(params = "exportXls") - public String exportXls(TWzRkHeadEntity tWzRkHead, HttpServletRequest request, HttpServletResponse response, DataGrid dataGrid, ModelMap map) { - CriteriaQuery cq = new CriteriaQuery(TWzRkHeadEntity.class, dataGrid); - //查询条件组装器 - org.jeecgframework.core.extend.hqlsearch.HqlGenerateUtil.installHql(cq, tWzRkHead); - try{ - //自定义追加查询条件 - }catch (Exception e) { - throw new BusinessException(e.getMessage()); - } - cq.add(); - List list=this.tWzRkHeadService.getListByCriteriaQuery(cq, false); - List pageList=new ArrayList(); - if(list!=null&&list.size()>0){ - for(TWzRkHeadEntity entity:list){ - try{ - TWzRkHeadPage page=new TWzRkHeadPage(); - MyBeanUtils.copyBeanNotNull2Bean(entity,page); - Object id0 = entity.getId(); - String hql0 = "from TWzRkItemEntity where 1 = 1 AND wZRK_HID = ? "; - List tWzRkItemEntityList = systemService.findHql(hql0,id0.toString()); - page.setTWzRkItemList(tWzRkItemEntityList); - pageList.add(page); - }catch(Exception e){ - logger.info(e.getMessage()); - } - } - } - map.put(NormalExcelConstants.FILE_NAME,"入库抬头"); - map.put(NormalExcelConstants.CLASS, TWzRkHeadPage.class); - map.put(NormalExcelConstants.PARAMS,new ExportParams("入库抬头列表", "导出人:"+ ResourceUtil.getSessionUser().getRealName(), - "导出信息")); - map.put(NormalExcelConstants.DATA_LIST,pageList); - return NormalExcelConstants.JEECG_EXCEL_VIEW; - } - - /** - * 通过excel导入数据 - * @param request - * @param - * @return - */ - @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(2); - params.setNeedSave(true); - try { - List list = ExcelImportUtil.importExcel(file.getInputStream(), TWzRkHeadPage.class, params); - TWzRkHeadEntity entity1=null; - for (TWzRkHeadPage page : list) { - entity1=new TWzRkHeadEntity(); - MyBeanUtils.copyBeanNotNull2Bean(page,entity1); - tWzRkHeadService.addMain(entity1, page.getTWzRkItemList()); - } - j.setMsg("文件导入成功！"); - } catch (Exception e) { - j.setMsg("文件导入失败！"); - logger.error(ExceptionUtil.getExceptionMessage(e)); - }finally{ - try { - file.getInputStream().close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - } - return j; - } - /** - * 导出excel 使模板 - */ - @RequestMapping(params = "exportXlsByT") - public String exportXlsByT(ModelMap map) { - map.put(NormalExcelConstants.FILE_NAME,"入库抬头"); - map.put(NormalExcelConstants.CLASS, TWzRkHeadPage.class); - map.put(NormalExcelConstants.PARAMS,new ExportParams("入库抬头列表", "导出人:"+ ResourceUtil.getSessionUser().getRealName(), - "导出信息")); - map.put(NormalExcelConstants.DATA_LIST,new ArrayList()); - return NormalExcelConstants.JEECG_EXCEL_VIEW; - } - /** - * 导入功能跳转 - * - * @return - */ - @RequestMapping(params = "upload") - public ModelAndView upload(HttpServletRequest req) { - req.setAttribute("controller_name", "tWzRkHeadController"); - return new ModelAndView("common/upload/pub_excel_upload"); - } - - - @RequestMapping(method = RequestMethod.GET) - @ResponseBody - @ApiOperation(value="入库抬头列表信息",produces="application/json",httpMethod="GET") - public ResponseMessage> list() { - List list= tWzRkHeadService.getList(TWzRkHeadEntity.class); - List pageList=new ArrayList(); - if(list!=null&&list.size()>0){ - for(TWzRkHeadEntity entity:list){ - try{ - TWzRkHeadPage page=new TWzRkHeadPage(); - MyBeanUtils.copyBeanNotNull2Bean(entity,page); - Object id0 = entity.getId(); - String hql0 = "from TWzRkItemEntity where 1 = 1 AND wZRK_HID = ? "; - List tWzRkItemOldList = this.tWzRkHeadService.findHql(hql0,id0); - page.setTWzRkItemList(tWzRkItemOldList); - pageList.add(page); - }catch(Exception e){ - logger.info(e.getMessage()); - } - } - } - return Result.success(pageList); - } - - @RequestMapping(value = "/{id}", method = RequestMethod.GET) - @ResponseBody - @ApiOperation(value="根据ID获取入库抬头信息",notes="根据ID获取入库抬头信息",httpMethod="GET",produces="application/json") - public ResponseMessage get(@ApiParam(required=true,name="id",value="ID")@PathVariable("id") String id) { - TWzRkHeadEntity task = tWzRkHeadService.get(TWzRkHeadEntity.class, id); - if (task == null) { - return Result.error("根据ID获取入库抬头信息为空"); - } - TWzRkHeadPage page = new TWzRkHeadPage(); - try { - MyBeanUtils.copyBeanNotNull2Bean(task, page); - Object id0 = task.getId(); - String hql0 = "from TWzRkItemEntity where 1 = 1 AND wZRK_HID = ? "; - List tWzRkItemOldList = this.tWzRkHeadService.findHql(hql0,id0); - page.setTWzRkItemList(tWzRkItemOldList); - } catch (Exception e) { - e.printStackTrace(); - } - return Result.success(page); - } - - @RequestMapping(method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE) - @ResponseBody - @ApiOperation(value="创建入库抬头") - public ResponseMessage create(@ApiParam(name="入库抬头对象")@RequestBody TWzRkHeadPage tWzRkHeadPage, UriComponentsBuilder uriBuilder) { - //调用JSR303 Bean Validator进行校验，如果出错返回含400错误码及json格式的错误信息. - Set> failures = validator.validate(tWzRkHeadPage); - if (!failures.isEmpty()) { - return Result.error(JSONArray.toJSONString(BeanValidators.extractPropertyAndMessage(failures))); - } - - //保存 - List tWzRkItemList = tWzRkHeadPage.getTWzRkItemList(); - - TWzRkHeadEntity tWzRkHead = new TWzRkHeadEntity(); - try{ - MyBeanUtils.copyBeanNotNull2Bean(tWzRkHeadPage,tWzRkHead); - }catch(Exception e){ - logger.info(e.getMessage()); - return Result.error("保存入库抬头失败"); - } - tWzRkHeadService.addMain(tWzRkHead, tWzRkItemList); - - return Result.success(tWzRkHead); - } - - @RequestMapping(value = "/{id}", method = RequestMethod.PUT, consumes = MediaType.APPLICATION_JSON_VALUE) - @ResponseBody - @ApiOperation(value="更新入库抬头",notes="更新入库抬头") - public ResponseMessage update(@RequestBody TWzRkHeadPage tWzRkHeadPage) { - //调用JSR303 Bean Validator进行校验，如果出错返回含400错误码及json格式的错误信息. - Set> failures = validator.validate(tWzRkHeadPage); - if (!failures.isEmpty()) { - return Result.error(JSONArray.toJSONString(BeanValidators.extractPropertyAndMessage(failures))); - } - - //保存 - List tWzRkItemList = tWzRkHeadPage.getTWzRkItemList(); - - TWzRkHeadEntity tWzRkHead = new TWzRkHeadEntity(); - try{ - MyBeanUtils.copyBeanNotNull2Bean(tWzRkHeadPage,tWzRkHead); - }catch(Exception e){ - logger.info(e.getMessage()); - return Result.error("入库抬头更新失败"); - } - tWzRkHeadService.updateMain(tWzRkHead, tWzRkItemList); - - //按Restful约定，返回204状态码, 无内容. 也可以返回200状态码. - return Result.success(); - } - - @RequestMapping(value = "/{id}", method = RequestMethod.DELETE) - @ResponseStatus(HttpStatus.NO_CONTENT) - @ApiOperation(value="删除入库抬头") - public ResponseMessage delete(@ApiParam(name="id",value="ID",required=true)@PathVariable("id") String id) { - logger.info("delete[{}]" + id); - // 验证 - if (StringUtils.isEmpty(id)) { - return Result.error("ID不能为空"); - } - try { - TWzRkHeadEntity tWzRkHead = tWzRkHeadService.get(TWzRkHeadEntity.class, id); - tWzRkHeadService.delMain(tWzRkHead); - } catch (Exception e) { - e.printStackTrace(); - return Result.error("入库抬头删除失败"); - } - - return Result.success(); - } - - - @RequestMapping(params = "doPrint") - @ResponseBody - public void downReceiveExcel(String id, - HttpServletRequest request, HttpServletResponse response){ - OutputStream fileOut = null; - BufferedImage bufferImg = null; - String codedFileName = null; - TWzRkHeadEntity tWzRkHead = systemService.getEntity(TWzRkHeadEntity.class, - Integer.parseInt(id));// 获取抬头 - String sql = "select r.id,CONCAT(r.mat_code,'/',r.mat_name) AS mat_name,(SELECT m.mat_guige FROM t_wz_material m WHERE m.mat_location = r.mat_location AND m.mat_code = r.mat_code) spec," + - "r.mat_unit,r.mat_location,r.mat_qty,r.mat_price,(r.mat_price * r.mat_qty) AS mat_amount from t_wz_rk_item r WHERE r.wzrk_hid = " + id; - List tWzRkItemOldList = jdbcDao.find(sql,TWzRkItemDto.class,null); - try { - StringBuffer sber = new StringBuffer(); - - ByteArrayOutputStream byteArrayOut = new ByteArrayOutputStream(); - - // 进行转码，使其支持中文文件名 - codedFileName = java.net.URLEncoder.encode("中文", "UTF-8"); - response.setHeader("content-disposition", "attachment;filename=" - + id + ".xls"); - - HSSFWorkbook wb = new HSSFWorkbook(); - HSSFSheet sheet = wb.createSheet("入库单"); - sheet.setMargin(HSSFSheet.TopMargin,0.5);// 页边距（上） - sheet.setMargin(HSSFSheet.BottomMargin,0.5);// 页边距（下） - sheet.setMargin(HSSFSheet.LeftMargin,0.8);// 页边距（左） - sheet.setMargin(HSSFSheet.RightMargin,0.5);// 页边距（右 - sheet.setColumnWidth(0, 5 * 256); - sheet.setColumnWidth(1, 15 * 256); - sheet.setColumnWidth(2, 10 * 200); - sheet.setColumnWidth(3, 5 * 256); - sheet.setColumnWidth(4, 10 * 256); - sheet.setColumnWidth(5, 10 * 256); - sheet.setColumnWidth(6, 10 * 256); - sheet.setColumnWidth(7, 10 * 256); - sheet.setColumnWidth(8, 15 * 256); - // { "序号", "编码/商品名称", "规格", "单位", "仓库","数量","单价","金额","备注" } - // sheet.setColumnWidth(6, 8 * 256); - // sheet.setColumnWidth(7, 8 * 256); - // sheet.setColumnWidth(8, 8 * 256); - // 创建第一行 - Row row = sheet.createRow((short) 0); // 第一行空白 - - // 创建两种单元格格式 - CellStyle cs = wb.createCellStyle(); - CellStyle cs2 = wb.createCellStyle(); - CellStyle cs3 = wb.createCellStyle(); - CellStyle cs4 = wb.createCellStyle(); - CellStyle cs5 = wb.createCellStyle(); - // 创建两种字体 - Font f = wb.createFont(); - Font f2 = wb.createFont(); - - // 创建第一种字体样式（用于列名） - f.setFontHeightInPoints((short) 12); - f.setColor(IndexedColors.BLACK.getIndex()); - f.setBoldweight(Font.BOLDWEIGHT_BOLD); - - // 创建第二种字体样式（用于值） - f2.setFontHeightInPoints((short) 8); - f2.setColor(IndexedColors.BLACK.getIndex()); - - - - // 设置第一种单元格的样式（用于列名） - cs.setFont(f); - cs.setBorderLeft(CellStyle.BORDER_NONE); - cs.setBorderRight(CellStyle.BORDER_NONE); - cs.setBorderTop(CellStyle.BORDER_NONE); - cs.setBorderBottom(CellStyle.BORDER_NONE); - cs.setAlignment(HSSFCellStyle.ALIGN_CENTER); - - // 设置第二种单元格的样式（用于值） - cs2.setFont(f2); - cs2.setBorderLeft(CellStyle.BORDER_NONE); - cs2.setBorderRight(CellStyle.BORDER_NONE); - cs2.setBorderTop(CellStyle.BORDER_NONE); - cs2.setBorderBottom(CellStyle.BORDER_NONE); - cs2.setWrapText(true); - - // 设置第三种单元格的样式 - cs3.setFont(f2); - cs3.setBorderLeft(CellStyle.BORDER_THIN); - cs3.setBorderRight(CellStyle.BORDER_THIN); - cs3.setBorderTop(CellStyle.BORDER_THIN); - cs3.setBorderBottom(CellStyle.BORDER_THIN); - cs3.setAlignment(HSSFCellStyle.ALIGN_CENTER); // 居中 - - - // 设置第四种单元格的样式 - cs4.setFont(f2); - cs4.setBorderLeft(CellStyle.BORDER_THIN); - cs4.setBorderRight(CellStyle.BORDER_THIN); - cs4.setBorderTop(CellStyle.BORDER_THIN); - cs4.setBorderBottom(CellStyle.BORDER_THIN); - - - // 设置第五种单元格的样式 - cs5.setFont(f2); - cs5.setBorderLeft(CellStyle.BORDER_NONE); - cs5.setBorderRight(CellStyle.BORDER_NONE); - cs5.setBorderTop(CellStyle.BORDER_NONE); - cs5.setBorderBottom(CellStyle.BORDER_NONE); - - - Row row1 = sheet.createRow((short) 1); // 第二行标题 - row1.setHeight((short) 700); - Cell cellTitle = row1.createCell(0); - cellTitle.setCellValue(ResourceUtil.getConfigByName("comname")+"采购入库单"); - cellTitle.setCellStyle(cs); - Row row2 = sheet.createRow((short) 2); // 第三行 - row2.setHeight((short) 500); - Cell cell21 = row2.createCell(0); - cell21.setCellValue("供应商：" + tWzRkHead.getVendorName()); - cell21.setCellStyle(cs2); - Cell cell22 = row2.createCell(3); - - cell22.setCellValue("单据日期：" + DateUtils.date2Str(tWzRkHead.getDocDate(), DateUtils.date_sdf)); - cell22.setCellStyle(cs2); - Cell cell23 = row2.createCell(6); - - cell23.setCellValue("入库单号：" + tWzRkHead.getId()); - cell23.setCellStyle(cs2); - - // 合并单元格 - CellRangeAddress c = new CellRangeAddress(0, 0, 0, 8); // 第一行空白 - CellRangeAddress c0 = new CellRangeAddress(1, 1, 0, 8);// 第二行标题 - CellRangeAddress c11 = new CellRangeAddress(2, 2, 0, 2);// 第三行供应商 - CellRangeAddress c12 = new CellRangeAddress(2, 2, 3, 5);// 第三行单据日期 - CellRangeAddress c13 = new CellRangeAddress(2, 2, 6, 8);// 第三行单据编号 - - sheet.addMergedRegion(c); - sheet.addMergedRegion(c0); - sheet.addMergedRegion(c11); - sheet.addMergedRegion(c12); - sheet.addMergedRegion(c13); - - - Row rowColumnName = sheet.createRow((short) 3); // 列名 - rowColumnName.setHeight((short) 500); - String[] columnNames = { "序号", "编码/商品名称", "规格", "单位", "仓库","数量","单价", - "金额","备注" }; - Double totalAmount = 0.00; - Double totalNumber = 0.00; - for (int i = 0; i < columnNames.length; i++) { - Cell cell = rowColumnName.createCell(i); - cell.setCellValue(columnNames[i]); - cell.setCellStyle(cs3); - } - int cellsNum = 3; - int cerconNo = 1; - for (int i = 0; i < tWzRkItemOldList.size(); i++) { - TWzRkItemDto entity = tWzRkItemOldList.get(i); - cellsNum++; - Row rowColumnValue = sheet.createRow((short) cellsNum); // 列名 - rowColumnValue.setHeight((short) 500); - Cell cell1 = rowColumnValue.createCell(0); - cell1.setCellValue(cerconNo); - cell1.setCellStyle(cs3); - Cell cell2 = rowColumnValue.createCell(1); - - - try { - - cell2.setCellStyle(cs3); - cell2.setCellValue(entity.getMatName()); - }catch (Exception e){ - - } - try { - - Cell cell3 = rowColumnValue.createCell(2); - cell3.setCellValue(entity.getSpec()); - cell3.setCellStyle(cs3); - }catch (Exception e){ - - } - try { - - Cell cell4 = rowColumnValue.createCell(3); - cell4.setCellValue(entity.getMatUnit()); - cell4.setCellStyle(cs3); - }catch (Exception e){ - - } - try { - - Cell cell5 = rowColumnValue.createCell(4); - cell5.setCellValue(entity.getMatLocation()); - cell5.setCellStyle(cs3); - }catch (Exception e){ - - } - try { - - Cell cell6 = rowColumnValue.createCell(5); -// cell6.setCellValue(entity.getMatQty()); - cell6.setCellValue(StringUtil.moneyToString(entity.getMatQty(),"#.0000")); - cell6.setCellStyle(cs3); - totalNumber = totalNumber + Double.parseDouble(entity.getMatQty()); - }catch (Exception e){ - - } - try { - - Cell cell7 = rowColumnValue.createCell(6); -// cell7.setCellValue(entity.getMatPrice()); - cell7.setCellValue(StringUtil.moneyToString(entity.getMatPrice(),"#.00")); - - cell7.setCellStyle(cs3); - }catch (Exception e){ - - } - try { - - Cell cell8 = rowColumnValue.createCell(7); -// cell8.setCellValue(entity.getMatAmount()); - cell8.setCellValue(StringUtil.moneyToString(entity.getMatAmount(),"#.00")); - - cell8.setCellStyle(cs3); - totalAmount = totalAmount + Double.parseDouble(entity.getMatAmount()); - }catch (Exception e){ - - } - try { - - Cell cell9 = rowColumnValue.createCell(8); - cell9.setCellValue(""); - cell9.setCellStyle(cs3); - }catch (Exception e){ - - } - cerconNo++; - } - - //底部合计金额与数量 - Row rowColumnInfo = sheet.createRow((short) 1 + cellsNum); // 列名 - Cell cellrow = rowColumnInfo.createCell(0); - cellrow.setCellValue("合计"); - cellrow.setCellStyle(cs4); - Cell cellTotatl2 = rowColumnInfo.createCell(5); - cellTotatl2.setCellValue(StringUtil.moneyToString(totalNumber,"#.0000")); - cellTotatl2.setCellStyle(cs3); - Cell cellTotatl3 = rowColumnInfo.createCell(6); - cellTotatl3.setCellValue(""); - cellTotatl3.setCellStyle(cs3); - Cell cellTotatl4 = rowColumnInfo.createCell(7); - cellTotatl4.setCellValue(StringUtil.moneyToString(totalAmount,"#.00")); - cellTotatl4.setCellStyle(cs3); - Cell cellTotatl5 = rowColumnInfo.createCell(8); - cellTotatl5.setCellValue(""); - cellTotatl5.setCellStyle(cs3); - //合并单元格 - CellRangeAddress cellTotal = new CellRangeAddress(1 + cellsNum, 1 + cellsNum, 0, 4); - sheet.addMergedRegion(cellTotal); - ReportUtils.setBorderStyle(HSSFCellStyle.BORDER_THIN, cellTotal, sheet, wb); - - //底部合计金额大写转为汉字 - Row rowColumnInfo2 = sheet.createRow((short) 2 + cellsNum); // 列名 - Cell cellrow2 = rowColumnInfo2.createCell(0); - cellrow2.setCellValue("合计金额大写：" + ReportUtils.number2CNMontrayUnit(new BigDecimal(StringUtil.moneyToString(totalAmount,"#.00")))); - cellrow2.setCellStyle(cs4); - //合并单元格 - CellRangeAddress cellAmount = new CellRangeAddress(2 + cellsNum, 2 + cellsNum, 0, 8); - sheet.addMergedRegion(cellAmount); - ReportUtils.setBorderStyle(HSSFCellStyle.BORDER_THIN, cellAmount, sheet, wb); - - //底部签字 - Row rowColumnInfo3 = sheet.createRow((short) 5 + cellsNum); // 列名 - Cell cellrow3 = rowColumnInfo3.createCell(0); - cellrow3.setCellValue("制单人： 审核人： 收货人："); - cellrow3.setCellStyle(cs5); - - //输出文件 - fileOut = response.getOutputStream(); - HSSFPrintSetup printSetup = sheet.getPrintSetup(); - printSetup.setPaperSize(HSSFPrintSetup.A5_PAPERSIZE); - printSetup.setLandscape(true); - wb.write(fileOut); - } catch (Exception e) { - e.printStackTrace(); - } finally { - if (fileOut != null) { - try { - fileOut.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - } - } - - - @RequestMapping(params = "doUpdatesp") - @ResponseBody - public AjaxJson doUpdatesp(String id, HttpServletRequest request) { - AjaxJson j = new AjaxJson(); - String message = "审批成功"; - try{ - TWzRkHeadEntity tWzRkHead = systemService.get(TWzRkHeadEntity.class,Integer.parseInt(id)); - tWzRkHead.setBpmStatus("1"); - String hql0 = "from TWzRkItemEntity where 1 = 1 AND wzrk_hid = ? "; - List tWzRkItemList = systemService.findHql(hql0,id); - //=================================================================================== - //查询-采购订单行项目 - try{ - - for (TWzRkItemEntity page : tWzRkItemList) { - page.setBpmStatus("1"); - systemService.saveOrUpdate(page); - TWzMaterialEntity wz = systemService.findUniqueByProperty(TWzMaterialEntity.class,"matCode",page.getMatCode()); - try{ - if(!StringUtil.isEmpty(page.getMatPrice())){ - wz.setMatPrice(new BigDecimal(page.getMatPrice())); - systemService.updateEntitie(wz); - } - }catch (Exception e){ - } - } - }catch (Exception e){ - - } - systemService.saveOrUpdate(tWzRkHead); - systemService.addLog(message, Globals.Log_Type_UPDATE, Globals.Log_Leavel_INFO); - }catch(Exception e){ - e.printStackTrace(); - message = "审批失败"; - throw new BusinessException(e.getMessage()); - } - j.setMsg(message); - return j; - } -} diff --git a/src/main/java/com/zzjee/wzyw/entity/TWzCkHeadEntity.java b/src/main/java/com/zzjee/wzyw/entity/TWzCkHeadEntity.java deleted file mode 100644 index 4fbcc52d..00000000 --- a/src/main/java/com/zzjee/wzyw/entity/TWzCkHeadEntity.java +++ /dev/null @@ -1,514 +0,0 @@ -package com.zzjee.wzyw.entity; - -import org.jeecgframework.poi.excel.annotation.Excel; - -import javax.persistence.*; -import java.util.Date; - -/** - * @Title: Entity - * @Description: 物料出库 - * @author onlineGenerator - * @date 2018-05-20 21:43:29 - * @version V1.0 - * - */ -@Entity -@Table(name = "t_wz_ck_head", schema = "") -@SuppressWarnings("serial") -public class TWzCkHeadEntity implements java.io.Serializable { - /**主键*/ - private Integer id; - /**创建人名称*/ - private String createName; - /**创建人登录名称*/ - private String createBy; - /**创建日期*/ - private Date createDate; - /**更新人名称*/ - private String updateName; - /**更新人登录名称*/ - private String updateBy; - /**更新日期*/ - private Date updateDate; - /**所属部门*/ - private String sysOrgCode; - /**所属公司*/ - private String sysCompanyCode; - /**流程状态*/ - private String bpmStatus; - /**领用部门*/ - @Excel(name="领用部门",width=15) - private String orgCode; - /**领用部门名称*/ - @Excel(name="领用部门名称",width=15) - private String orgName; - /**领用人*/ - @Excel(name="领用人",width=15) - private String ckUsername; - /**领用人名字*/ - @Excel(name="领用人名字",width=15) - private String ckName; - /**单据日期*/ - @Excel(name="单据日期",width=15) - private String docDate; - /**整单价值*/ - private String ckValue; - /**出库备注*/ - @Excel(name="出库备注",width=15) - private String ckRemark; - /**手工审批*/ - @Excel(name="手工审批",width=15,dicCode="sf_yn") - private String ckSgsp; - /**附件*/ - @Excel(name="附件",width=15) - private String ckFujian; - /**备用1*/ - @Excel(name="业务类型",width=15) - private String by1; - /**备用2*/ - @Excel(name="出库类别",width=15) - private String by2; - /**备用3*/ - @Excel(name="再利用程度",width=15) - private String by3; - /**备用4*/ - private String by4; - /**备用5*/ - private String by5; - - /** - *方法: 取得java.lang.Integer - *@return: java.lang.Integer 主键 - */ - @Id - @GeneratedValue(strategy = GenerationType.AUTO) - - @Column(name ="ID",nullable=false,length=20) - public Integer getId(){ - return this.id; - } - - /** - *方法: 设置java.lang.Integer - *@param: java.lang.Integer 主键 - */ - public void setId(Integer id){ - this.id = id; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 创建人名称 - */ - - @Column(name ="CREATE_NAME",nullable=true,length=50) - public String getCreateName(){ - return this.createName; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 创建人名称 - */ - public void setCreateName(String createName){ - this.createName = createName; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 创建人登录名称 - */ - - @Column(name ="CREATE_BY",nullable=true,length=50) - public String getCreateBy(){ - return this.createBy; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 创建人登录名称 - */ - public void setCreateBy(String createBy){ - this.createBy = createBy; - } - - /** - *方法: 取得java.util.Date - *@return: java.util.Date 创建日期 - */ - - @Column(name ="CREATE_DATE",nullable=true,length=20) - public Date getCreateDate(){ - return this.createDate; - } - - /** - *方法: 设置java.util.Date - *@param: java.util.Date 创建日期 - */ - public void setCreateDate(Date createDate){ - this.createDate = createDate; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 更新人名称 - */ - - @Column(name ="UPDATE_NAME",nullable=true,length=50) - public String getUpdateName(){ - return this.updateName; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 更新人名称 - */ - public void setUpdateName(String updateName){ - this.updateName = updateName; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 更新人登录名称 - */ - - @Column(name ="UPDATE_BY",nullable=true,length=50) - public String getUpdateBy(){ - return this.updateBy; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 更新人登录名称 - */ - public void setUpdateBy(String updateBy){ - this.updateBy = updateBy; - } - - /** - *方法: 取得java.util.Date - *@return: java.util.Date 更新日期 - */ - - @Column(name ="UPDATE_DATE",nullable=true,length=20) - public Date getUpdateDate(){ - return this.updateDate; - } - - /** - *方法: 设置java.util.Date - *@param: java.util.Date 更新日期 - */ - public void setUpdateDate(Date updateDate){ - this.updateDate = updateDate; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 所属部门 - */ - - @Column(name ="SYS_ORG_CODE",nullable=true,length=50) - public String getSysOrgCode(){ - return this.sysOrgCode; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 所属部门 - */ - public void setSysOrgCode(String sysOrgCode){ - this.sysOrgCode = sysOrgCode; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 所属公司 - */ - - @Column(name ="SYS_COMPANY_CODE",nullable=true,length=50) - public String getSysCompanyCode(){ - return this.sysCompanyCode; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 所属公司 - */ - public void setSysCompanyCode(String sysCompanyCode){ - this.sysCompanyCode = sysCompanyCode; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 流程状态 - */ - - @Column(name ="BPM_STATUS",nullable=true,length=32) - public String getBpmStatus(){ - return this.bpmStatus; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 流程状态 - */ - public void setBpmStatus(String bpmStatus){ - this.bpmStatus = bpmStatus; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 领用部门 - */ - - @Column(name ="ORG_CODE",nullable=true,length=32) - public String getOrgCode(){ - return this.orgCode; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 领用部门 - */ - public void setOrgCode(String orgCode){ - this.orgCode = orgCode; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 领用部门名称 - */ - - @Column(name ="ORG_NAME",nullable=true,length=32) - public String getOrgName(){ - return this.orgName; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 领用部门名称 - */ - public void setOrgName(String orgName){ - this.orgName = orgName; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 领用人 - */ - - @Column(name ="CK_USERNAME",nullable=true,length=32) - public String getCkUsername(){ - return this.ckUsername; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 领用人 - */ - public void setCkUsername(String ckUsername){ - this.ckUsername = ckUsername; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 领用人名字 - */ - - @Column(name ="CK_NAME",nullable=true,length=32) - public String getCkName(){ - return this.ckName; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 领用人名字 - */ - public void setCkName(String ckName){ - this.ckName = ckName; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 单据日期 - */ - - @Column(name ="DOC_DATE",nullable=true,length=32) - public String getDocDate(){ - return this.docDate; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 单据日期 - */ - public void setDocDate(String docDate){ - this.docDate = docDate; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 整单价值 - */ - - @Column(name ="CK_VALUE",nullable=true,length=32) - public String getCkValue(){ - return this.ckValue; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 整单价值 - */ - public void setCkValue(String ckValue){ - this.ckValue = ckValue; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 出库备注 - */ - - @Column(name ="CK_REMARK",nullable=true,length=232) - public String getCkRemark(){ - return this.ckRemark; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 出库备注 - */ - public void setCkRemark(String ckRemark){ - this.ckRemark = ckRemark; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 手工审批 - */ - - @Column(name ="CK_SGSP",nullable=true,length=32) - public String getCkSgsp(){ - return this.ckSgsp; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 手工审批 - */ - public void setCkSgsp(String ckSgsp){ - this.ckSgsp = ckSgsp; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 附件 - */ - - @Column(name ="CK_FUJIAN",nullable=true,length=232) - public String getCkFujian(){ - return this.ckFujian; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 附件 - */ - public void setCkFujian(String ckFujian){ - this.ckFujian = ckFujian; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 备用1 - */ - - @Column(name ="BY1",nullable=true,length=32) - public String getBy1(){ - return this.by1; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 备用1 - */ - public void setBy1(String by1){ - this.by1 = by1; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 备用2 - */ - - @Column(name ="BY2",nullable=true,length=32) - public String getBy2(){ - return this.by2; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 备用2 - */ - public void setBy2(String by2){ - this.by2 = by2; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 备用3 - */ - - @Column(name ="BY3",nullable=true,length=32) - public String getBy3(){ - return this.by3; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 备用3 - */ - public void setBy3(String by3){ - this.by3 = by3; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 备用4 - */ - - @Column(name ="BY4",nullable=true,length=32) - public String getBy4(){ - return this.by4; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 备用4 - */ - public void setBy4(String by4){ - this.by4 = by4; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 备用5 - */ - - @Column(name ="BY5",nullable=true,length=32) - public String getBy5(){ - return this.by5; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 备用5 - */ - public void setBy5(String by5){ - this.by5 = by5; - } - -} diff --git a/src/main/java/com/zzjee/wzyw/entity/TWzCkItemDto.java b/src/main/java/com/zzjee/wzyw/entity/TWzCkItemDto.java deleted file mode 100644 index 74ec89ad..00000000 --- a/src/main/java/com/zzjee/wzyw/entity/TWzCkItemDto.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.zzjee.wzyw.entity; - -import org.jeecgframework.poi.excel.annotation.Excel; - -public class TWzCkItemDto { - - /**物料名称*/ - @Excel(name="商品编号",width=15) - private String matCode; - /**物料名称*/ - @Excel(name="商品名称",width=15) - private String matName; - /**仓库*/ - @Excel(name="仓库",width=15) - private String matLocation; - /**领用人*/ - @Excel(name="领用人",width=15) - private String ckName; - /**出库数量*/ - @Excel(name="出库数量",width=15) - private String matQty; - /**单价*/ - @Excel(name="单价",width=15) - private String matPrice; - /**物料单位*/ - @Excel(name="单位",width=15) - private String matUnit; - /**总价*/ - @Excel(name="总价",width=15) - private String matAmount; - - public String getMatCode() { - return matCode; - } - - public void setMatCode(String matCode) { - this.matCode = matCode; - } - - public String getMatName() { - return matName; - } - - public void setMatName(String matName) { - this.matName = matName; - } - - public String getMatLocation() { - return matLocation; - } - - public void setMatLocation(String matLocation) { - this.matLocation = matLocation; - } - - public String getCkName() { - return ckName; - } - - public void setCkName(String ckName) { - this.ckName = ckName; - } - - public String getMatQty() { - return matQty; - } - - public void setMatQty(String matQty) { - this.matQty = matQty; - } - - public String getMatPrice() { - return matPrice; - } - - public void setMatPrice(String matPrice) { - this.matPrice = matPrice; - } - - public String getMatUnit() { - return matUnit; - } - - public void setMatUnit(String matUnit) { - this.matUnit = matUnit; - } - - public String getMatAmount() { - return matAmount; - } - - public void setMatAmount(String matAmount) { - this.matAmount = matAmount; - } -} diff --git a/src/main/java/com/zzjee/wzyw/entity/TWzCkItemEntity.java b/src/main/java/com/zzjee/wzyw/entity/TWzCkItemEntity.java deleted file mode 100644 index bb27e8be..00000000 --- a/src/main/java/com/zzjee/wzyw/entity/TWzCkItemEntity.java +++ /dev/null @@ -1,533 +0,0 @@ -package com.zzjee.wzyw.entity; - -import org.hibernate.annotations.GenericGenerator; -import org.jeecgframework.poi.excel.annotation.Excel; - -import javax.persistence.*; -import java.util.Date; - -/** - * @Title: Entity - * @Description: 出库商品 - * @author onlineGenerator - * @date 2018-05-20 21:43:28 - * @version V1.0 - * - */ -@Entity -@Table(name = "t_wz_ck_item", schema = "") -@SuppressWarnings("serial") -public class TWzCkItemEntity implements java.io.Serializable { - /**主键*/ - private String id; - /**创建人名称*/ - private String createName; - /**创建人登录名称*/ - private String createBy; - /**创建日期*/ - private Date createDate; - /**更新人名称*/ - private String updateName; - /**更新人登录名称*/ - private String updateBy; - /**更新日期*/ - private Date updateDate; - /**所属部门*/ - private String sysOrgCode; - /**所属公司*/ - private String sysCompanyCode; - /**流程状态*/ - private String bpmStatus; - /**外键*/ - private String wzckHid; - /**物料编码*/ - @Excel(name="物料编码",width=15) - private String matCode; - /**物料名称*/ - @Excel(name="物料名称",width=15) - private String matName; - /**数量*/ - @Excel(name="数量",width=15) - private String matQty; - /**单位*/ - @Excel(name="单位",width=15) - private String matUnit; - /**仓库*/ - @Excel(name="仓库",width=15) - private String matLocation; - /**批次*/ - @Excel(name="批次",width=15) - private String matBatch; - /**单价*/ - @Excel(name="单价",width=15) - private String matPrice; - /**总价值*/ - private String matAmount; - /**备注*/ - @Excel(name="备注",width=15) - private String itemRemark; - /**备用1*/ - private String by1; - /**备用2*/ - private String by2; - /**备用3*/ - private String by3; - /**备用4*/ - private String by4; - /**备用5*/ - private String by5; - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 主键 - */ - @Id - @GeneratedValue(generator = "paymentableGenerator") - @GenericGenerator(name = "paymentableGenerator", strategy = "uuid") - - @Column(name ="ID",nullable=false,length=36) - public String getId(){ - return this.id; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 主键 - */ - public void setId(String id){ - this.id = id; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 创建人名称 - */ - - @Column(name ="CREATE_NAME",nullable=true,length=50) - public String getCreateName(){ - return this.createName; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 创建人名称 - */ - public void setCreateName(String createName){ - this.createName = createName; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 创建人登录名称 - */ - - @Column(name ="CREATE_BY",nullable=true,length=50) - public String getCreateBy(){ - return this.createBy; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 创建人登录名称 - */ - public void setCreateBy(String createBy){ - this.createBy = createBy; - } - - /** - *方法: 取得java.util.Date - *@return: java.util.Date 创建日期 - */ - - @Column(name ="CREATE_DATE",nullable=true,length=20) - public Date getCreateDate(){ - return this.createDate; - } - - /** - *方法: 设置java.util.Date - *@param: java.util.Date 创建日期 - */ - public void setCreateDate(Date createDate){ - this.createDate = createDate; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 更新人名称 - */ - - @Column(name ="UPDATE_NAME",nullable=true,length=50) - public String getUpdateName(){ - return this.updateName; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 更新人名称 - */ - public void setUpdateName(String updateName){ - this.updateName = updateName; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 更新人登录名称 - */ - - @Column(name ="UPDATE_BY",nullable=true,length=50) - public String getUpdateBy(){ - return this.updateBy; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 更新人登录名称 - */ - public void setUpdateBy(String updateBy){ - this.updateBy = updateBy; - } - - /** - *方法: 取得java.util.Date - *@return: java.util.Date 更新日期 - */ - - @Column(name ="UPDATE_DATE",nullable=true,length=20) - public Date getUpdateDate(){ - return this.updateDate; - } - - /** - *方法: 设置java.util.Date - *@param: java.util.Date 更新日期 - */ - public void setUpdateDate(Date updateDate){ - this.updateDate = updateDate; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 所属部门 - */ - - @Column(name ="SYS_ORG_CODE",nullable=true,length=50) - public String getSysOrgCode(){ - return this.sysOrgCode; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 所属部门 - */ - public void setSysOrgCode(String sysOrgCode){ - this.sysOrgCode = sysOrgCode; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 所属公司 - */ - - @Column(name ="SYS_COMPANY_CODE",nullable=true,length=50) - public String getSysCompanyCode(){ - return this.sysCompanyCode; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 所属公司 - */ - public void setSysCompanyCode(String sysCompanyCode){ - this.sysCompanyCode = sysCompanyCode; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 流程状态 - */ - - @Column(name ="BPM_STATUS",nullable=true,length=32) - public String getBpmStatus(){ - return this.bpmStatus; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 流程状态 - */ - public void setBpmStatus(String bpmStatus){ - this.bpmStatus = bpmStatus; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 外键 - */ - - @Column(name ="WZCK_HID",nullable=true,length=32) - public String getWzckHid(){ - return this.wzckHid; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 外键 - */ - public void setWzckHid(String wzckHid){ - this.wzckHid = wzckHid; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 物料编码 - */ - - @Column(name ="MAT_CODE",nullable=true,length=32) - public String getMatCode(){ - return this.matCode; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 物料编码 - */ - public void setMatCode(String matCode){ - this.matCode = matCode; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 物料名称 - */ - - @Column(name ="MAT_NAME",nullable=true,length=32) - public String getMatName(){ - return this.matName; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 物料名称 - */ - public void setMatName(String matName){ - this.matName = matName; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 数量 - */ - - @Column(name ="MAT_QTY",nullable=true,length=32) - public String getMatQty(){ - return this.matQty; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 数量 - */ - public void setMatQty(String matQty){ - this.matQty = matQty; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 单位 - */ - - @Column(name ="MAT_UNIT",nullable=true,length=32) - public String getMatUnit(){ - return this.matUnit; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 单位 - */ - public void setMatUnit(String matUnit){ - this.matUnit = matUnit; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 仓库 - */ - - @Column(name ="MAT_LOCATION",nullable=true,length=32) - public String getMatLocation(){ - return this.matLocation; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 仓库 - */ - public void setMatLocation(String matLocation){ - this.matLocation = matLocation; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 批次 - */ - - @Column(name ="MAT_BATCH",nullable=true,length=32) - public String getMatBatch(){ - return this.matBatch; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 批次 - */ - public void setMatBatch(String matBatch){ - this.matBatch = matBatch; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 单价 - */ - - @Column(name ="MAT_PRICE",nullable=true,length=32) - public String getMatPrice(){ - return this.matPrice; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 单价 - */ - public void setMatPrice(String matPrice){ - this.matPrice = matPrice; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 总价值 - */ - - @Column(name ="MAT_AMOUNT",nullable=true,length=32) - public String getMatAmount(){ - return this.matAmount; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 总价值 - */ - public void setMatAmount(String matAmount){ - this.matAmount = matAmount; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 备注 - */ - - @Column(name ="ITEM_REMARK",nullable=true,length=232) - public String getItemRemark(){ - return this.itemRemark; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 备注 - */ - public void setItemRemark(String itemRemark){ - this.itemRemark = itemRemark; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 备用1 - */ - - @Column(name ="BY1",nullable=true,length=32) - public String getBy1(){ - return this.by1; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 备用1 - */ - public void setBy1(String by1){ - this.by1 = by1; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 备用2 - */ - - @Column(name ="BY2",nullable=true,length=32) - public String getBy2(){ - return this.by2; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 备用2 - */ - public void setBy2(String by2){ - this.by2 = by2; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 备用3 - */ - - @Column(name ="BY3",nullable=true,length=32) - public String getBy3(){ - return this.by3; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 备用3 - */ - public void setBy3(String by3){ - this.by3 = by3; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 备用4 - */ - - @Column(name ="BY4",nullable=true,length=32) - public String getBy4(){ - return this.by4; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 备用4 - */ - public void setBy4(String by4){ - this.by4 = by4; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 备用5 - */ - - @Column(name ="BY5",nullable=true,length=32) - public String getBy5(){ - return this.by5; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 备用5 - */ - public void setBy5(String by5){ - this.by5 = by5; - } - -} diff --git a/src/main/java/com/zzjee/wzyw/entity/TWzPoHeadEntity.java b/src/main/java/com/zzjee/wzyw/entity/TWzPoHeadEntity.java deleted file mode 100644 index 22e6078a..00000000 --- a/src/main/java/com/zzjee/wzyw/entity/TWzPoHeadEntity.java +++ /dev/null @@ -1,387 +0,0 @@ -package com.zzjee.wzyw.entity; - -import org.jeecgframework.poi.excel.annotation.Excel; - -import javax.persistence.*; -import java.util.Date; - -/** - * @Title: Entity - * @Description: 物料采购订单 - * @author onlineGenerator - * @date 2018-05-21 13:23:13 - * @version V1.0 - * - */ -@Entity -@Table(name = "t_wz_po_head", schema = "") -@SuppressWarnings("serial") -public class TWzPoHeadEntity implements java.io.Serializable { - /**主键*/ - private Integer id; - /**创建人名称*/ - private String createName; - /**创建人登录名称*/ - private String createBy; - /**创建日期*/ - private Date createDate; - /**更新人名称*/ - private String updateName; - /**更新人登录名称*/ - private String updateBy; - /**更新日期*/ - private Date updateDate; - /**所属部门*/ - private String sysOrgCode; - /**所属公司*/ - private String sysCompanyCode; - /**流程状态*/ - private String bpmStatus; - /**供应商编码*/ - @Excel(name="供应商编码",width=15) - private String vendorCode; - /**供应商名称*/ - @Excel(name="供应商名称",width=15) - private String vendorName; - /**采购订单日期*/ - @Excel(name="采购订单日期",width=15,format = "yyyy-MM-dd") - private Date docDate; - /**采购订单备注*/ - @Excel(name="采购订单备注",width=15) - private String poRemark; - /**备用1*/ - private String poBy1; - /**备用2*/ - private String poBy2; - /**备用3*/ - private String poBy3; - /**备用4*/ - private String poBy4; - - /** - *方法: 取得java.lang.Integer - *@return: java.lang.Integer 主键 - */ - @Id - @GeneratedValue(strategy = GenerationType.AUTO) - - @Column(name ="ID",nullable=false,length=20) - public Integer getId(){ - return this.id; - } - - /** - *方法: 设置java.lang.Integer - *@param: java.lang.Integer 主键 - */ - public void setId(Integer id){ - this.id = id; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 创建人名称 - */ - - @Column(name ="CREATE_NAME",nullable=true,length=50) - public String getCreateName(){ - return this.createName; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 创建人名称 - */ - public void setCreateName(String createName){ - this.createName = createName; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 创建人登录名称 - */ - - @Column(name ="CREATE_BY",nullable=true,length=50) - public String getCreateBy(){ - return this.createBy; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 创建人登录名称 - */ - public void setCreateBy(String createBy){ - this.createBy = createBy; - } - - /** - *方法: 取得java.util.Date - *@return: java.util.Date 创建日期 - */ - - @Column(name ="CREATE_DATE",nullable=true,length=20) - public Date getCreateDate(){ - return this.createDate; - } - - /** - *方法: 设置java.util.Date - *@param: java.util.Date 创建日期 - */ - public void setCreateDate(Date createDate){ - this.createDate = createDate; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 更新人名称 - */ - - @Column(name ="UPDATE_NAME",nullable=true,length=50) - public String getUpdateName(){ - return this.updateName; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 更新人名称 - */ - public void setUpdateName(String updateName){ - this.updateName = updateName; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 更新人登录名称 - */ - - @Column(name ="UPDATE_BY",nullable=true,length=50) - public String getUpdateBy(){ - return this.updateBy; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 更新人登录名称 - */ - public void setUpdateBy(String updateBy){ - this.updateBy = updateBy; - } - - /** - *方法: 取得java.util.Date - *@return: java.util.Date 更新日期 - */ - - @Column(name ="UPDATE_DATE",nullable=true,length=20) - public Date getUpdateDate(){ - return this.updateDate; - } - - /** - *方法: 设置java.util.Date - *@param: java.util.Date 更新日期 - */ - public void setUpdateDate(Date updateDate){ - this.updateDate = updateDate; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 所属部门 - */ - - @Column(name ="SYS_ORG_CODE",nullable=true,length=50) - public String getSysOrgCode(){ - return this.sysOrgCode; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 所属部门 - */ - public void setSysOrgCode(String sysOrgCode){ - this.sysOrgCode = sysOrgCode; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 所属公司 - */ - - @Column(name ="SYS_COMPANY_CODE",nullable=true,length=50) - public String getSysCompanyCode(){ - return this.sysCompanyCode; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 所属公司 - */ - public void setSysCompanyCode(String sysCompanyCode){ - this.sysCompanyCode = sysCompanyCode; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 流程状态 - */ - - @Column(name ="BPM_STATUS",nullable=true,length=32) - public String getBpmStatus(){ - return this.bpmStatus; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 流程状态 - */ - public void setBpmStatus(String bpmStatus){ - this.bpmStatus = bpmStatus; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 供应商编码 - */ - - @Column(name ="VENDOR_CODE",nullable=true,length=32) - public String getVendorCode(){ - return this.vendorCode; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 供应商编码 - */ - public void setVendorCode(String vendorCode){ - this.vendorCode = vendorCode; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 供应商名称 - */ - - @Column(name ="VENDOR_NAME",nullable=true,length=32) - public String getVendorName(){ - return this.vendorName; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 供应商名称 - */ - public void setVendorName(String vendorName){ - this.vendorName = vendorName; - } - - /** - *方法: 取得java.util.Date - *@return: java.util.Date 采购订单日期 - */ - - @Column(name ="DOC_DATE",nullable=true,length=32) - public Date getDocDate(){ - return this.docDate; - } - - /** - *方法: 设置java.util.Date - *@param: java.util.Date 采购订单日期 - */ - public void setDocDate(Date docDate){ - this.docDate = docDate; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 采购订单备注 - */ - - @Column(name ="PO_REMARK",nullable=true,length=232) - public String getPoRemark(){ - return this.poRemark; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 采购订单备注 - */ - public void setPoRemark(String poRemark){ - this.poRemark = poRemark; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 备用1 - */ - - @Column(name ="PO_BY1",nullable=true,length=32) - public String getPoBy1(){ - return this.poBy1; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 备用1 - */ - public void setPoBy1(String poBy1){ - this.poBy1 = poBy1; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 备用2 - */ - - @Column(name ="PO_BY2",nullable=true,length=32) - public String getPoBy2(){ - return this.poBy2; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 备用2 - */ - public void setPoBy2(String poBy2){ - this.poBy2 = poBy2; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 备用3 - */ - - @Column(name ="PO_BY3",nullable=true,length=32) - public String getPoBy3(){ - return this.poBy3; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 备用3 - */ - public void setPoBy3(String poBy3){ - this.poBy3 = poBy3; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 备用4 - */ - - @Column(name ="PO_BY4",nullable=true,length=32) - public String getPoBy4(){ - return this.poBy4; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 备用4 - */ - public void setPoBy4(String poBy4){ - this.poBy4 = poBy4; - } - -} diff --git a/src/main/java/com/zzjee/wzyw/entity/TWzPoItemEntity.java b/src/main/java/com/zzjee/wzyw/entity/TWzPoItemEntity.java deleted file mode 100644 index 11b5b69b..00000000 --- a/src/main/java/com/zzjee/wzyw/entity/TWzPoItemEntity.java +++ /dev/null @@ -1,513 +0,0 @@ -package com.zzjee.wzyw.entity; - -import org.hibernate.annotations.GenericGenerator; -import org.jeecgframework.poi.excel.annotation.Excel; - -import javax.persistence.*; -import java.util.Date; - -/** - * @Title: Entity - * @Description: 采购订单行项目 - * @author onlineGenerator - * @date 2018-05-21 13:23:13 - * @version V1.0 - * - */ -@Entity -@Table(name = "t_wz_po_item", schema = "") -@SuppressWarnings("serial") -public class TWzPoItemEntity implements java.io.Serializable { - /**主键*/ - private String id; - /**创建人名称*/ - private String createName; - /**创建人登录名称*/ - private String createBy; - /**创建日期*/ - private Date createDate; - /**更新人名称*/ - private String updateName; - /**更新人登录名称*/ - private String updateBy; - /**更新日期*/ - private Date updateDate; - /**所属部门*/ - private String sysOrgCode; - /**所属公司*/ - private String sysCompanyCode; - /**流程状态*/ - private String bpmStatus; - /**外键*/ - private String poId; - /**物料编码*/ - @Excel(name="物料编码",width=15) - private String matCode; - /**物料名称*/ - @Excel(name="物料名称",width=15) - private String matName; - /**数量*/ - @Excel(name="数量",width=15) - private String matQty; - /**单位*/ - @Excel(name="单位",width=15) - private String matUnit; - /**仓库*/ - @Excel(name="仓库",width=15) - private String matLocation; - /**批次*/ - @Excel(name="批次",width=15) - private String matBatch; - /**标准价*/ - @Excel(name="标准价",width=15) - private String matPrice; - /**总价值*/ - private String matAmount; - /**备注*/ - @Excel(name="备注",width=15) - private String itemRemark; - /**备用1*/ - private String by1; - /**备用2*/ - private String by2; - /**备用3*/ - private String by3; - /**未清数量*/ - private String matQtyWq; - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 主键 - */ - @Id - @GeneratedValue(generator = "paymentableGenerator") - @GenericGenerator(name = "paymentableGenerator", strategy = "uuid") - - @Column(name ="ID",nullable=false,length=36) - public String getId(){ - return this.id; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 主键 - */ - public void setId(String id){ - this.id = id; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 创建人名称 - */ - - @Column(name ="CREATE_NAME",nullable=true,length=50) - public String getCreateName(){ - return this.createName; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 创建人名称 - */ - public void setCreateName(String createName){ - this.createName = createName; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 创建人登录名称 - */ - - @Column(name ="CREATE_BY",nullable=true,length=50) - public String getCreateBy(){ - return this.createBy; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 创建人登录名称 - */ - public void setCreateBy(String createBy){ - this.createBy = createBy; - } - - /** - *方法: 取得java.util.Date - *@return: java.util.Date 创建日期 - */ - - @Column(name ="CREATE_DATE",nullable=true,length=20) - public Date getCreateDate(){ - return this.createDate; - } - - /** - *方法: 设置java.util.Date - *@param: java.util.Date 创建日期 - */ - public void setCreateDate(Date createDate){ - this.createDate = createDate; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 更新人名称 - */ - - @Column(name ="UPDATE_NAME",nullable=true,length=50) - public String getUpdateName(){ - return this.updateName; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 更新人名称 - */ - public void setUpdateName(String updateName){ - this.updateName = updateName; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 更新人登录名称 - */ - - @Column(name ="UPDATE_BY",nullable=true,length=50) - public String getUpdateBy(){ - return this.updateBy; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 更新人登录名称 - */ - public void setUpdateBy(String updateBy){ - this.updateBy = updateBy; - } - - /** - *方法: 取得java.util.Date - *@return: java.util.Date 更新日期 - */ - - @Column(name ="UPDATE_DATE",nullable=true,length=20) - public Date getUpdateDate(){ - return this.updateDate; - } - - /** - *方法: 设置java.util.Date - *@param: java.util.Date 更新日期 - */ - public void setUpdateDate(Date updateDate){ - this.updateDate = updateDate; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 所属部门 - */ - - @Column(name ="SYS_ORG_CODE",nullable=true,length=50) - public String getSysOrgCode(){ - return this.sysOrgCode; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 所属部门 - */ - public void setSysOrgCode(String sysOrgCode){ - this.sysOrgCode = sysOrgCode; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 所属公司 - */ - - @Column(name ="SYS_COMPANY_CODE",nullable=true,length=50) - public String getSysCompanyCode(){ - return this.sysCompanyCode; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 所属公司 - */ - public void setSysCompanyCode(String sysCompanyCode){ - this.sysCompanyCode = sysCompanyCode; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 流程状态 - */ - - @Column(name ="BPM_STATUS",nullable=true,length=32) - public String getBpmStatus(){ - return this.bpmStatus; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 流程状态 - */ - public void setBpmStatus(String bpmStatus){ - this.bpmStatus = bpmStatus; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 外键 - */ - - @Column(name ="PO_ID",nullable=true,length=32) - public String getPoId(){ - return this.poId; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 外键 - */ - public void setPoId(String poId){ - this.poId = poId; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 物料编码 - */ - - @Column(name ="MAT_CODE",nullable=true,length=32) - public String getMatCode(){ - return this.matCode; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 物料编码 - */ - public void setMatCode(String matCode){ - this.matCode = matCode; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 物料名称 - */ - - @Column(name ="MAT_NAME",nullable=true,length=32) - public String getMatName(){ - return this.matName; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 物料名称 - */ - public void setMatName(String matName){ - this.matName = matName; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 数量 - */ - - @Column(name ="MAT_QTY",nullable=true,length=32) - public String getMatQty(){ - return this.matQty; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 数量 - */ - public void setMatQty(String matQty){ - this.matQty = matQty; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 单位 - */ - - @Column(name ="MAT_UNIT",nullable=true,length=32) - public String getMatUnit(){ - return this.matUnit; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 单位 - */ - public void setMatUnit(String matUnit){ - this.matUnit = matUnit; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 仓库 - */ - - @Column(name ="MAT_LOCATION",nullable=true,length=32) - public String getMatLocation(){ - return this.matLocation; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 仓库 - */ - public void setMatLocation(String matLocation){ - this.matLocation = matLocation; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 批次 - */ - - @Column(name ="MAT_BATCH",nullable=true,length=32) - public String getMatBatch(){ - return this.matBatch; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 批次 - */ - public void setMatBatch(String matBatch){ - this.matBatch = matBatch; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 标准价 - */ - - @Column(name ="MAT_PRICE",nullable=true,length=32) - public String getMatPrice(){ - return this.matPrice; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 标准价 - */ - public void setMatPrice(String matPrice){ - this.matPrice = matPrice; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 总价值 - */ - - @Column(name ="MAT_AMOUNT",nullable=true,length=32) - public String getMatAmount(){ - return this.matAmount; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 总价值 - */ - public void setMatAmount(String matAmount){ - this.matAmount = matAmount; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 备注 - */ - - @Column(name ="ITEM_REMARK",nullable=true,length=32) - public String getItemRemark(){ - return this.itemRemark; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 备注 - */ - public void setItemRemark(String itemRemark){ - this.itemRemark = itemRemark; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 备用1 - */ - - @Column(name ="BY1",nullable=true,length=32) - public String getBy1(){ - return this.by1; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 备用1 - */ - public void setBy1(String by1){ - this.by1 = by1; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 备用2 - */ - - @Column(name ="BY2",nullable=true,length=32) - public String getBy2(){ - return this.by2; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 备用2 - */ - public void setBy2(String by2){ - this.by2 = by2; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 备用3 - */ - - @Column(name ="BY3",nullable=true,length=32) - public String getBy3(){ - return this.by3; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 备用3 - */ - public void setBy3(String by3){ - this.by3 = by3; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 未清数量 - */ - - @Column(name ="MAT_QTY_WQ",nullable=true,length=32) - public String getMatQtyWq(){ - return this.matQtyWq; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 未清数量 - */ - public void setMatQtyWq(String matQtyWq){ - this.matQtyWq = matQtyWq; - } - -} diff --git a/src/main/java/com/zzjee/wzyw/entity/TWzRkHeadEntity.java b/src/main/java/com/zzjee/wzyw/entity/TWzRkHeadEntity.java deleted file mode 100644 index 1d8a7407..00000000 --- a/src/main/java/com/zzjee/wzyw/entity/TWzRkHeadEntity.java +++ /dev/null @@ -1,428 +0,0 @@ -package com.zzjee.wzyw.entity; - -import org.jeecgframework.poi.excel.annotation.Excel; - -import javax.persistence.*; -import java.util.Date; - -/** - * @Title: Entity - * @Description: 入库抬头 - * @author onlineGenerator - * @date 2018-05-20 21:43:08 - * @version V1.0 - * - */ -@Entity -@Table(name = "t_wz_rk_head", schema = "") -@SuppressWarnings("serial") -public class TWzRkHeadEntity implements java.io.Serializable { - /**主键*/ - private Integer id; - /**创建人名称*/ - private String createName; - /**创建人登录名称*/ - private String createBy; - /**创建日期*/ - private Date createDate; - /**更新人名称*/ - private String updateName; - /**更新人登录名称*/ - private String updateBy; - /**更新日期*/ - private Date updateDate; - /**所属部门*/ - private String sysOrgCode; - /**所属公司*/ - private String sysCompanyCode; - /**流程状态*/ - private String bpmStatus; - /**供应商编码*/ - @Excel(name="供应商编码",width=15) - private String vendorCode; - /**供应商名称*/ - @Excel(name="供应商名称",width=15) - private String vendorName; - /**入库日期*/ - @Excel(name="入库日期",width=15,format = "yyyy-MM-dd") - private Date docDate; - /**入库备注*/ - @Excel(name="入库备注",width=15) - private String rkRemark; - /**附件*/ - @Excel(name="附件",width=15) - private String rkFujian; - /**备用1*/ - private String by1; - /**备用2*/ - private String by2; - /**备用3*/ - private String by3; - /**备用4*/ - private String by4; - /**备用5*/ - private String by5; - - /** - *方法: 取得java.lang.Integer - *@return: java.lang.Integer 主键 - */ - @Id - @GeneratedValue(strategy = GenerationType.AUTO) - - @Column(name ="ID",nullable=false,length=20) - public Integer getId(){ - return this.id; - } - - /** - *方法: 设置java.lang.Integer - *@param: java.lang.Integer 主键 - */ - public void setId(Integer id){ - this.id = id; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 创建人名称 - */ - - @Column(name ="CREATE_NAME",nullable=true,length=50) - public String getCreateName(){ - return this.createName; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 创建人名称 - */ - public void setCreateName(String createName){ - this.createName = createName; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 创建人登录名称 - */ - - @Column(name ="CREATE_BY",nullable=true,length=50) - public String getCreateBy(){ - return this.createBy; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 创建人登录名称 - */ - public void setCreateBy(String createBy){ - this.createBy = createBy; - } - - /** - *方法: 取得java.util.Date - *@return: java.util.Date 创建日期 - */ - - @Column(name ="CREATE_DATE",nullable=true,length=20) - public Date getCreateDate(){ - return this.createDate; - } - - /** - *方法: 设置java.util.Date - *@param: java.util.Date 创建日期 - */ - public void setCreateDate(Date createDate){ - this.createDate = createDate; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 更新人名称 - */ - - @Column(name ="UPDATE_NAME",nullable=true,length=50) - public String getUpdateName(){ - return this.updateName; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 更新人名称 - */ - public void setUpdateName(String updateName){ - this.updateName = updateName; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 更新人登录名称 - */ - - @Column(name ="UPDATE_BY",nullable=true,length=50) - public String getUpdateBy(){ - return this.updateBy; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 更新人登录名称 - */ - public void setUpdateBy(String updateBy){ - this.updateBy = updateBy; - } - - /** - *方法: 取得java.util.Date - *@return: java.util.Date 更新日期 - */ - - @Column(name ="UPDATE_DATE",nullable=true,length=20) - public Date getUpdateDate(){ - return this.updateDate; - } - - /** - *方法: 设置java.util.Date - *@param: java.util.Date 更新日期 - */ - public void setUpdateDate(Date updateDate){ - this.updateDate = updateDate; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 所属部门 - */ - - @Column(name ="SYS_ORG_CODE",nullable=true,length=50) - public String getSysOrgCode(){ - return this.sysOrgCode; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 所属部门 - */ - public void setSysOrgCode(String sysOrgCode){ - this.sysOrgCode = sysOrgCode; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 所属公司 - */ - - @Column(name ="SYS_COMPANY_CODE",nullable=true,length=50) - public String getSysCompanyCode(){ - return this.sysCompanyCode; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 所属公司 - */ - public void setSysCompanyCode(String sysCompanyCode){ - this.sysCompanyCode = sysCompanyCode; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 流程状态 - */ - - @Column(name ="BPM_STATUS",nullable=true,length=32) - public String getBpmStatus(){ - return this.bpmStatus; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 流程状态 - */ - public void setBpmStatus(String bpmStatus){ - this.bpmStatus = bpmStatus; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 供应商编码 - */ - - @Column(name ="VENDOR_CODE",nullable=true,length=32) - public String getVendorCode(){ - return this.vendorCode; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 供应商编码 - */ - public void setVendorCode(String vendorCode){ - this.vendorCode = vendorCode; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 供应商名称 - */ - - @Column(name ="VENDOR_NAME",nullable=true,length=32) - public String getVendorName(){ - return this.vendorName; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 供应商名称 - */ - public void setVendorName(String vendorName){ - this.vendorName = vendorName; - } - - /** - *方法: 取得java.util.Date - *@return: java.util.Date 入库日期 - */ - - @Column(name ="DOC_DATE",nullable=true,length=32) - public Date getDocDate(){ - return this.docDate; - } - - /** - *方法: 设置java.util.Date - *@param: java.util.Date 入库日期 - */ - public void setDocDate(Date docDate){ - this.docDate = docDate; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 入库备注 - */ - - @Column(name ="RK_REMARK",nullable=true,length=32) - public String getRkRemark(){ - return this.rkRemark; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 入库备注 - */ - public void setRkRemark(String rkRemark){ - this.rkRemark = rkRemark; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 附件 - */ - - @Column(name ="RK_FUJIAN",nullable=true,length=32) - public String getRkFujian(){ - return this.rkFujian; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 附件 - */ - public void setRkFujian(String rkFujian){ - this.rkFujian = rkFujian; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 备用1 - */ - - @Column(name ="BY1",nullable=true,length=32) - public String getBy1(){ - return this.by1; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 备用1 - */ - public void setBy1(String by1){ - this.by1 = by1; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 备用2 - */ - - @Column(name ="BY2",nullable=true,length=32) - public String getBy2(){ - return this.by2; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 备用2 - */ - public void setBy2(String by2){ - this.by2 = by2; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 备用3 - */ - - @Column(name ="BY3",nullable=true,length=32) - public String getBy3(){ - return this.by3; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 备用3 - */ - public void setBy3(String by3){ - this.by3 = by3; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 备用4 - */ - - @Column(name ="BY4",nullable=true,length=32) - public String getBy4(){ - return this.by4; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 备用4 - */ - public void setBy4(String by4){ - this.by4 = by4; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 备用5 - */ - - @Column(name ="BY5",nullable=true,length=32) - public String getBy5(){ - return this.by5; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 备用5 - */ - public void setBy5(String by5){ - this.by5 = by5; - } - -} diff --git a/src/main/java/com/zzjee/wzyw/entity/TWzRkItemDto.java b/src/main/java/com/zzjee/wzyw/entity/TWzRkItemDto.java deleted file mode 100644 index d3c54edc..00000000 --- a/src/main/java/com/zzjee/wzyw/entity/TWzRkItemDto.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.zzjee.wzyw.entity; - -import org.jeecgframework.poi.excel.annotation.Excel; - -public class TWzRkItemDto { - - /**主键*/ - private Integer id; - /**物料名称*/ - @Excel(name="编码/商品名称",width=15) - private String matName; - /**物料编码*/ - @Excel(name="规格",width=15) - private String spec; - /**物料单位*/ - @Excel(name="单位",width=15) - private String matUnit; - /**仓库*/ - @Excel(name="仓库",width=15) - private String matLocation; - /**入库数量*/ - @Excel(name="入库数量",width=15) - private String matQty; - /**单价*/ - @Excel(name="单价",width=15) - private String matPrice; - /**总价*/ - private String matAmount; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getMatName() { - return matName; - } - - public void setMatName(String matName) { - this.matName = matName; - } - - public String getSpec() { - return spec; - } - - public void setSpec(String spec) { - this.spec = spec; - } - - public String getMatUnit() { - return matUnit; - } - - public void setMatUnit(String matUnit) { - this.matUnit = matUnit; - } - - public String getMatLocation() { - return matLocation; - } - - public void setMatLocation(String matLocation) { - this.matLocation = matLocation; - } - - public String getMatQty() { - return matQty; - } - - public void setMatQty(String matQty) { - this.matQty = matQty; - } - - public String getMatPrice() { - return matPrice; - } - - public void setMatPrice(String matPrice) { - this.matPrice = matPrice; - } - - public String getMatAmount() { - return matAmount; - } - - public void setMatAmount(String matAmount) { - this.matAmount = matAmount; - } -} diff --git a/src/main/java/com/zzjee/wzyw/entity/TWzRkItemEntity.java b/src/main/java/com/zzjee/wzyw/entity/TWzRkItemEntity.java deleted file mode 100644 index 974a1cf1..00000000 --- a/src/main/java/com/zzjee/wzyw/entity/TWzRkItemEntity.java +++ /dev/null @@ -1,551 +0,0 @@ -package com.zzjee.wzyw.entity; - -import org.jeecgframework.poi.excel.annotation.Excel; - -import javax.persistence.*; -import java.util.Date; - -/** - * @Title: Entity - * @Description: 入库商品 - * @author onlineGenerator - * @date 2018-05-20 21:43:08 - * @version V1.0 - * - */ -@Entity -@Table(name = "t_wz_rk_item", schema = "") -@SuppressWarnings("serial") -public class TWzRkItemEntity implements java.io.Serializable { - /**主键*/ - private Integer id; - /**创建人名称*/ - private String createName; - /**创建人登录名称*/ - private String createBy; - /**创建日期*/ - private Date createDate; - /**更新人名称*/ - private String updateName; - /**更新人登录名称*/ - private String updateBy; - /**更新日期*/ - private Date updateDate; - /**所属部门*/ - private String sysOrgCode; - /**所属公司*/ - private String sysCompanyCode; - /**流程状态*/ - private String bpmStatus; - /**外键*/ - private String wzrkHid; - /**物料编码*/ - @Excel(name="物料编码",width=15) - private String matCode; - /**物料名称*/ - @Excel(name="物料名称",width=15) - private String matName; - /**入库数量*/ - @Excel(name="入库数量",width=15) - private String matQty; - /**物料单位*/ - @Excel(name="物料单位",width=15) - private String matUnit; - /**仓库*/ - @Excel(name="仓库",width=15) - private String matLocation; - /**批次*/ - @Excel(name="批次",width=15) - private String matBatch; - /**标准价*/ - @Excel(name="标准价",width=15) - private String matPrice; - /**总价*/ - private String matAmount; - /**备注*/ - @Excel(name="备注",width=15) - private String itemRemark; - /**备用1*/ - private String by1; - /**备用2*/ - private String by2; - /**备用3*/ - private String by3; - /**备用4*/ - private String by4; - /**备用5*/ - private String by5; - /**备用6*/ - private String by6; - - /** - *方法: 取得java.lang.Integer - *@return: java.lang.Integer 主键 - */ - @Id - @GeneratedValue(strategy = GenerationType.AUTO) - - @Column(name ="ID",nullable=false,length=20) - public Integer getId(){ - return this.id; - } - - /** - *方法: 设置java.lang.Integer - *@param: java.lang.Integer 主键 - */ - public void setId(Integer id){ - this.id = id; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 创建人名称 - */ - - @Column(name ="CREATE_NAME",nullable=true,length=50) - public String getCreateName(){ - return this.createName; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 创建人名称 - */ - public void setCreateName(String createName){ - this.createName = createName; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 创建人登录名称 - */ - - @Column(name ="CREATE_BY",nullable=true,length=50) - public String getCreateBy(){ - return this.createBy; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 创建人登录名称 - */ - public void setCreateBy(String createBy){ - this.createBy = createBy; - } - - /** - *方法: 取得java.util.Date - *@return: java.util.Date 创建日期 - */ - - @Column(name ="CREATE_DATE",nullable=true,length=20) - public Date getCreateDate(){ - return this.createDate; - } - - /** - *方法: 设置java.util.Date - *@param: java.util.Date 创建日期 - */ - public void setCreateDate(Date createDate){ - this.createDate = createDate; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 更新人名称 - */ - - @Column(name ="UPDATE_NAME",nullable=true,length=50) - public String getUpdateName(){ - return this.updateName; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 更新人名称 - */ - public void setUpdateName(String updateName){ - this.updateName = updateName; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 更新人登录名称 - */ - - @Column(name ="UPDATE_BY",nullable=true,length=50) - public String getUpdateBy(){ - return this.updateBy; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 更新人登录名称 - */ - public void setUpdateBy(String updateBy){ - this.updateBy = updateBy; - } - - /** - *方法: 取得java.util.Date - *@return: java.util.Date 更新日期 - */ - - @Column(name ="UPDATE_DATE",nullable=true,length=20) - public Date getUpdateDate(){ - return this.updateDate; - } - - /** - *方法: 设置java.util.Date - *@param: java.util.Date 更新日期 - */ - public void setUpdateDate(Date updateDate){ - this.updateDate = updateDate; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 所属部门 - */ - - @Column(name ="SYS_ORG_CODE",nullable=true,length=50) - public String getSysOrgCode(){ - return this.sysOrgCode; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 所属部门 - */ - public void setSysOrgCode(String sysOrgCode){ - this.sysOrgCode = sysOrgCode; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 所属公司 - */ - - @Column(name ="SYS_COMPANY_CODE",nullable=true,length=50) - public String getSysCompanyCode(){ - return this.sysCompanyCode; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 所属公司 - */ - public void setSysCompanyCode(String sysCompanyCode){ - this.sysCompanyCode = sysCompanyCode; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 流程状态 - */ - - @Column(name ="BPM_STATUS",nullable=true,length=32) - public String getBpmStatus(){ - return this.bpmStatus; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 流程状态 - */ - public void setBpmStatus(String bpmStatus){ - this.bpmStatus = bpmStatus; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 外键 - */ - - @Column(name ="WZRK_HID",nullable=true,length=32) - public String getWzrkHid(){ - return this.wzrkHid; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 外键 - */ - public void setWzrkHid(String wzrkHid){ - this.wzrkHid = wzrkHid; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 物料编码 - */ - - @Column(name ="MAT_CODE",nullable=true,length=32) - public String getMatCode(){ - return this.matCode; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 物料编码 - */ - public void setMatCode(String matCode){ - this.matCode = matCode; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 物料名称 - */ - - @Column(name ="MAT_NAME",nullable=true,length=32) - public String getMatName(){ - return this.matName; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 物料名称 - */ - public void setMatName(String matName){ - this.matName = matName; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 入库数量 - */ - - @Column(name ="MAT_QTY",nullable=true,length=32) - public String getMatQty(){ - return this.matQty; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 入库数量 - */ - public void setMatQty(String matQty){ - this.matQty = matQty; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 物料单位 - */ - - @Column(name ="MAT_UNIT",nullable=true,length=32) - public String getMatUnit(){ - return this.matUnit; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 物料单位 - */ - public void setMatUnit(String matUnit){ - this.matUnit = matUnit; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 仓库 - */ - - @Column(name ="MAT_LOCATION",nullable=true,length=32) - public String getMatLocation(){ - return this.matLocation; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 仓库 - */ - public void setMatLocation(String matLocation){ - this.matLocation = matLocation; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 批次 - */ - - @Column(name ="MAT_BATCH",nullable=true,length=32) - public String getMatBatch(){ - return this.matBatch; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 批次 - */ - public void setMatBatch(String matBatch){ - this.matBatch = matBatch; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 标准价 - */ - - @Column(name ="MAT_PRICE",nullable=true,length=32) - public String getMatPrice(){ - return this.matPrice; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 标准价 - */ - public void setMatPrice(String matPrice){ - this.matPrice = matPrice; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 总价 - */ - - @Column(name ="MAT_AMOUNT",nullable=true,length=32) - public String getMatAmount(){ - return this.matAmount; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 总价 - */ - public void setMatAmount(String matAmount){ - this.matAmount = matAmount; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 备注 - */ - - @Column(name ="ITEM_REMARK",nullable=true,length=32) - public String getItemRemark(){ - return this.itemRemark; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 备注 - */ - public void setItemRemark(String itemRemark){ - this.itemRemark = itemRemark; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 备用1 - */ - - @Column(name ="BY1",nullable=true,length=32) - public String getBy1(){ - return this.by1; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 备用1 - */ - public void setBy1(String by1){ - this.by1 = by1; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 备用2 - */ - - @Column(name ="BY2",nullable=true,length=32) - public String getBy2(){ - return this.by2; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 备用2 - */ - public void setBy2(String by2){ - this.by2 = by2; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 备用3 - */ - - @Column(name ="BY3",nullable=true,length=32) - public String getBy3(){ - return this.by3; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 备用3 - */ - public void setBy3(String by3){ - this.by3 = by3; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 备用4 - */ - - @Column(name ="BY4",nullable=true,length=32) - public String getBy4(){ - return this.by4; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 备用4 - */ - public void setBy4(String by4){ - this.by4 = by4; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 备用5 - */ - - @Column(name ="BY5",nullable=true,length=32) - public String getBy5(){ - return this.by5; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 备用5 - */ - public void setBy5(String by5){ - this.by5 = by5; - } - - /** - *方法: 取得java.lang.String - *@return: java.lang.String 备用6 - */ - - @Column(name ="BY6",nullable=true,length=32) - public String getBy6(){ - return this.by6; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 备用6 - */ - public void setBy6(String by6){ - this.by6 = by6; - } - -} diff --git a/src/main/java/com/zzjee/wzyw/page/TWzCkHeadPage.java b/src/main/java/com/zzjee/wzyw/page/TWzCkHeadPage.java deleted file mode 100644 index 954bf13f..00000000 --- a/src/main/java/com/zzjee/wzyw/page/TWzCkHeadPage.java +++ /dev/null @@ -1,449 +0,0 @@ - -package com.zzjee.wzyw.page; - -import com.zzjee.wzyw.entity.TWzCkItemEntity; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.jeecgframework.poi.excel.annotation.ExcelCollection; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -/** - * @Title: Entity - * @Description: 物料出库 - * @author onlineGenerator - * @date 2018-05-20 21:43:29 - * @version V1.0 - * - */ -public class TWzCkHeadPage implements java.io.Serializable { - /**主键*/ - @Excel(name="出库单号") - private Integer id; - /**创建人名称*/ - private String createName; - /**创建人登录名称*/ - private String createBy; - /**创建日期*/ - private Date createDate; - /**更新人名称*/ - private String updateName; - /**更新人登录名称*/ - private String updateBy; - /**更新日期*/ - private Date updateDate; - /**所属部门*/ - private String sysOrgCode; - /**所属公司*/ - private String sysCompanyCode; - /**流程状态*/ - private String bpmStatus; - /**领用部门*/ - @Excel(name="领用部门") - private String orgCode; - /**领用部门名称*/ - @Excel(name="领用部门名称") - private String orgName; - /**领用人*/ - @Excel(name="领用人") - private String ckUsername; - /**领用人名字*/ - @Excel(name="领用人名字") - private String ckName; - /**单据日期*/ - @Excel(name="单据日期") - private String docDate; - /**整单价值*/ - private String ckValue; - /**出库备注*/ - @Excel(name="出库备注") - private String ckRemark; - /**手工审批*/ - @Excel(name="手工审批") - private String ckSgsp; - /**附件*/ - @Excel(name="附件") - private String ckFujian; - /**备用1*/ - private String by1; - /**备用2*/ - private String by2; - /**备用3*/ - private String by3; - /**备用4*/ - private String by4; - /**备用5*/ - private String by5; - - /** - *方法: 取得java.lang.Integer - *@return: java.lang.Integer 主键 - */ - public Integer getId(){ - return this.id; - } - - /** - *方法: 设置java.lang.Integer - *@param: java.lang.Integer 主键 - */ - public void setId(Integer id){ - this.id = id; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 创建人名称 - */ - public String getCreateName(){ - return this.createName; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 创建人名称 - */ - public void setCreateName(String createName){ - this.createName = createName; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 创建人登录名称 - */ - public String getCreateBy(){ - return this.createBy; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 创建人登录名称 - */ - public void setCreateBy(String createBy){ - this.createBy = createBy; - } - /** - *方法: 取得java.util.Date - *@return: java.util.Date 创建日期 - */ - public Date getCreateDate(){ - return this.createDate; - } - - /** - *方法: 设置java.util.Date - *@param: java.util.Date 创建日期 - */ - public void setCreateDate(Date createDate){ - this.createDate = createDate; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 更新人名称 - */ - public String getUpdateName(){ - return this.updateName; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 更新人名称 - */ - public void setUpdateName(String updateName){ - this.updateName = updateName; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 更新人登录名称 - */ - public String getUpdateBy(){ - return this.updateBy; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 更新人登录名称 - */ - public void setUpdateBy(String updateBy){ - this.updateBy = updateBy; - } - /** - *方法: 取得java.util.Date - *@return: java.util.Date 更新日期 - */ - public Date getUpdateDate(){ - return this.updateDate; - } - - /** - *方法: 设置java.util.Date - *@param: java.util.Date 更新日期 - */ - public void setUpdateDate(Date updateDate){ - this.updateDate = updateDate; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 所属部门 - */ - public String getSysOrgCode(){ - return this.sysOrgCode; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 所属部门 - */ - public void setSysOrgCode(String sysOrgCode){ - this.sysOrgCode = sysOrgCode; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 所属公司 - */ - public String getSysCompanyCode(){ - return this.sysCompanyCode; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 所属公司 - */ - public void setSysCompanyCode(String sysCompanyCode){ - this.sysCompanyCode = sysCompanyCode; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 流程状态 - */ - public String getBpmStatus(){ - return this.bpmStatus; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 流程状态 - */ - public void setBpmStatus(String bpmStatus){ - this.bpmStatus = bpmStatus; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 领用部门 - */ - public String getOrgCode(){ - return this.orgCode; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 领用部门 - */ - public void setOrgCode(String orgCode){ - this.orgCode = orgCode; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 领用部门名称 - */ - public String getOrgName(){ - return this.orgName; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 领用部门名称 - */ - public void setOrgName(String orgName){ - this.orgName = orgName; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 领用人 - */ - public String getCkUsername(){ - return this.ckUsername; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 领用人 - */ - public void setCkUsername(String ckUsername){ - this.ckUsername = ckUsername; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 领用人名字 - */ - public String getCkName(){ - return this.ckName; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 领用人名字 - */ - public void setCkName(String ckName){ - this.ckName = ckName; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 单据日期 - */ - public String getDocDate(){ - return this.docDate; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 单据日期 - */ - public void setDocDate(String docDate){ - this.docDate = docDate; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 整单价值 - */ - public String getCkValue(){ - return this.ckValue; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 整单价值 - */ - public void setCkValue(String ckValue){ - this.ckValue = ckValue; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 出库备注 - */ - public String getCkRemark(){ - return this.ckRemark; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 出库备注 - */ - public void setCkRemark(String ckRemark){ - this.ckRemark = ckRemark; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 手工审批 - */ - public String getCkSgsp(){ - return this.ckSgsp; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 手工审批 - */ - public void setCkSgsp(String ckSgsp){ - this.ckSgsp = ckSgsp; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 附件 - */ - public String getCkFujian(){ - return this.ckFujian; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 附件 - */ - public void setCkFujian(String ckFujian){ - this.ckFujian = ckFujian; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 备用1 - */ - public String getBy1(){ - return this.by1; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 备用1 - */ - public void setBy1(String by1){ - this.by1 = by1; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 备用2 - */ - public String getBy2(){ - return this.by2; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 备用2 - */ - public void setBy2(String by2){ - this.by2 = by2; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 备用3 - */ - public String getBy3(){ - return this.by3; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 备用3 - */ - public void setBy3(String by3){ - this.by3 = by3; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 备用4 - */ - public String getBy4(){ - return this.by4; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 备用4 - */ - public void setBy4(String by4){ - this.by4 = by4; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 备用5 - */ - public String getBy5(){ - return this.by5; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 备用5 - */ - public void setBy5(String by5){ - this.by5 = by5; - } - - /**保存-出库商品*/ - @ExcelCollection(name="出库商品") - private List tWzCkItemList = new ArrayList(); - public List getTWzCkItemList() { - return tWzCkItemList; - } - public void setTWzCkItemList(List tWzCkItemList) { - this.tWzCkItemList = tWzCkItemList; - } -} diff --git a/src/main/java/com/zzjee/wzyw/page/TWzPoHeadPage.java b/src/main/java/com/zzjee/wzyw/page/TWzPoHeadPage.java deleted file mode 100644 index 1710844a..00000000 --- a/src/main/java/com/zzjee/wzyw/page/TWzPoHeadPage.java +++ /dev/null @@ -1,343 +0,0 @@ - -package com.zzjee.wzyw.page; - -import com.zzjee.wzyw.entity.TWzPoItemEntity; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.jeecgframework.poi.excel.annotation.ExcelCollection; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -/** - * @Title: Entity - * @Description: 物料采购订单 - * @author onlineGenerator - * @date 2018-05-21 13:23:13 - * @version V1.0 - * - */ -public class TWzPoHeadPage implements java.io.Serializable { - /**主键*/ - @Excel(name="采购单号") - private Integer id; - /**创建人名称*/ - private String createName; - /**创建人登录名称*/ - private String createBy; - /**创建日期*/ - private Date createDate; - /**更新人名称*/ - private String updateName; - /**更新人登录名称*/ - private String updateBy; - /**更新日期*/ - private Date updateDate; - /**所属部门*/ - private String sysOrgCode; - /**所属公司*/ - private String sysCompanyCode; - /**流程状态*/ - private String bpmStatus; - /**供应商编码*/ - @Excel(name="供应商编码") - private String vendorCode; - /**供应商名称*/ - @Excel(name="供应商名称") - private String vendorName; - /**采购订单日期*/ - @Excel(name="采购订单日期",format = "yyyy-MM-dd") - private Date docDate; - /**采购订单备注*/ - @Excel(name="采购订单备注") - private String poRemark; - /**备用1*/ - private String poBy1; - /**备用2*/ - private String poBy2; - /**备用3*/ - private String poBy3; - /**备用4*/ - private String poBy4; - - /** - *方法: 取得java.lang.Integer - *@return: java.lang.Integer 主键 - */ - public Integer getId(){ - return this.id; - } - - /** - *方法: 设置java.lang.Integer - *@param: java.lang.Integer 主键 - */ - public void setId(Integer id){ - this.id = id; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 创建人名称 - */ - public String getCreateName(){ - return this.createName; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 创建人名称 - */ - public void setCreateName(String createName){ - this.createName = createName; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 创建人登录名称 - */ - public String getCreateBy(){ - return this.createBy; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 创建人登录名称 - */ - public void setCreateBy(String createBy){ - this.createBy = createBy; - } - /** - *方法: 取得java.util.Date - *@return: java.util.Date 创建日期 - */ - public Date getCreateDate(){ - return this.createDate; - } - - /** - *方法: 设置java.util.Date - *@param: java.util.Date 创建日期 - */ - public void setCreateDate(Date createDate){ - this.createDate = createDate; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 更新人名称 - */ - public String getUpdateName(){ - return this.updateName; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 更新人名称 - */ - public void setUpdateName(String updateName){ - this.updateName = updateName; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 更新人登录名称 - */ - public String getUpdateBy(){ - return this.updateBy; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 更新人登录名称 - */ - public void setUpdateBy(String updateBy){ - this.updateBy = updateBy; - } - /** - *方法: 取得java.util.Date - *@return: java.util.Date 更新日期 - */ - public Date getUpdateDate(){ - return this.updateDate; - } - - /** - *方法: 设置java.util.Date - *@param: java.util.Date 更新日期 - */ - public void setUpdateDate(Date updateDate){ - this.updateDate = updateDate; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 所属部门 - */ - public String getSysOrgCode(){ - return this.sysOrgCode; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 所属部门 - */ - public void setSysOrgCode(String sysOrgCode){ - this.sysOrgCode = sysOrgCode; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 所属公司 - */ - public String getSysCompanyCode(){ - return this.sysCompanyCode; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 所属公司 - */ - public void setSysCompanyCode(String sysCompanyCode){ - this.sysCompanyCode = sysCompanyCode; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 流程状态 - */ - public String getBpmStatus(){ - return this.bpmStatus; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 流程状态 - */ - public void setBpmStatus(String bpmStatus){ - this.bpmStatus = bpmStatus; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 供应商编码 - */ - public String getVendorCode(){ - return this.vendorCode; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 供应商编码 - */ - public void setVendorCode(String vendorCode){ - this.vendorCode = vendorCode; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 供应商名称 - */ - public String getVendorName(){ - return this.vendorName; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 供应商名称 - */ - public void setVendorName(String vendorName){ - this.vendorName = vendorName; - } - /** - *方法: 取得java.util.Date - *@return: java.util.Date 采购订单日期 - */ - public Date getDocDate(){ - return this.docDate; - } - - /** - *方法: 设置java.util.Date - *@param: java.util.Date 采购订单日期 - */ - public void setDocDate(Date docDate){ - this.docDate = docDate; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 采购订单备注 - */ - public String getPoRemark(){ - return this.poRemark; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 采购订单备注 - */ - public void setPoRemark(String poRemark){ - this.poRemark = poRemark; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 备用1 - */ - public String getPoBy1(){ - return this.poBy1; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 备用1 - */ - public void setPoBy1(String poBy1){ - this.poBy1 = poBy1; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 备用2 - */ - public String getPoBy2(){ - return this.poBy2; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 备用2 - */ - public void setPoBy2(String poBy2){ - this.poBy2 = poBy2; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 备用3 - */ - public String getPoBy3(){ - return this.poBy3; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 备用3 - */ - public void setPoBy3(String poBy3){ - this.poBy3 = poBy3; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 备用4 - */ - public String getPoBy4(){ - return this.poBy4; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 备用4 - */ - public void setPoBy4(String poBy4){ - this.poBy4 = poBy4; - } - - /**保存-采购订单行项目*/ - @ExcelCollection(name="采购订单行项目") - private List tWzPoItemList = new ArrayList(); - public List getTWzPoItemList() { - return tWzPoItemList; - } - public void setTWzPoItemList(List tWzPoItemList) { - this.tWzPoItemList = tWzPoItemList; - } -} diff --git a/src/main/java/com/zzjee/wzyw/page/TWzRkHeadPage.java b/src/main/java/com/zzjee/wzyw/page/TWzRkHeadPage.java deleted file mode 100644 index 214c8a58..00000000 --- a/src/main/java/com/zzjee/wzyw/page/TWzRkHeadPage.java +++ /dev/null @@ -1,378 +0,0 @@ - -package com.zzjee.wzyw.page; - -import com.zzjee.wzyw.entity.TWzRkItemEntity; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.jeecgframework.poi.excel.annotation.ExcelCollection; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -/** - * @Title: Entity - * @Description: 入库抬头 - * @author onlineGenerator - * @date 2018-05-20 21:43:08 - * @version V1.0 - * - */ -public class TWzRkHeadPage implements java.io.Serializable { - /**主键*/ - @Excel(name="入库单号") - private Integer id; - /**创建人名称*/ - private String createName; - /**创建人登录名称*/ - private String createBy; - /**创建日期*/ - private Date createDate; - /**更新人名称*/ - private String updateName; - /**更新人登录名称*/ - private String updateBy; - /**更新日期*/ - private Date updateDate; - /**所属部门*/ - private String sysOrgCode; - /**所属公司*/ - private String sysCompanyCode; - /**流程状态*/ - private String bpmStatus; - /**供应商编码*/ - @Excel(name="供应商编码") - private String vendorCode; - /**供应商名称*/ - @Excel(name="供应商名称") - private String vendorName; - /**入库日期*/ - @Excel(name="入库日期",format = "yyyy-MM-dd") - private Date docDate; - /**入库备注*/ - @Excel(name="入库备注") - private String rkRemark; - /**附件*/ - @Excel(name="附件") - private String rkFujian; - /**备用1*/ - private String by1; - /**备用2*/ - private String by2; - /**备用3*/ - private String by3; - /**备用4*/ - private String by4; - /**备用5*/ - private String by5; - - /** - *方法: 取得java.lang.Integer - *@return: java.lang.Integer 主键 - */ - public Integer getId(){ - return this.id; - } - - /** - *方法: 设置java.lang.Integer - *@param: java.lang.Integer 主键 - */ - public void setId(Integer id){ - this.id = id; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 创建人名称 - */ - public String getCreateName(){ - return this.createName; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 创建人名称 - */ - public void setCreateName(String createName){ - this.createName = createName; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 创建人登录名称 - */ - public String getCreateBy(){ - return this.createBy; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 创建人登录名称 - */ - public void setCreateBy(String createBy){ - this.createBy = createBy; - } - /** - *方法: 取得java.util.Date - *@return: java.util.Date 创建日期 - */ - public Date getCreateDate(){ - return this.createDate; - } - - /** - *方法: 设置java.util.Date - *@param: java.util.Date 创建日期 - */ - public void setCreateDate(Date createDate){ - this.createDate = createDate; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 更新人名称 - */ - public String getUpdateName(){ - return this.updateName; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 更新人名称 - */ - public void setUpdateName(String updateName){ - this.updateName = updateName; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 更新人登录名称 - */ - public String getUpdateBy(){ - return this.updateBy; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 更新人登录名称 - */ - public void setUpdateBy(String updateBy){ - this.updateBy = updateBy; - } - /** - *方法: 取得java.util.Date - *@return: java.util.Date 更新日期 - */ - public Date getUpdateDate(){ - return this.updateDate; - } - - /** - *方法: 设置java.util.Date - *@param: java.util.Date 更新日期 - */ - public void setUpdateDate(Date updateDate){ - this.updateDate = updateDate; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 所属部门 - */ - public String getSysOrgCode(){ - return this.sysOrgCode; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 所属部门 - */ - public void setSysOrgCode(String sysOrgCode){ - this.sysOrgCode = sysOrgCode; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 所属公司 - */ - public String getSysCompanyCode(){ - return this.sysCompanyCode; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 所属公司 - */ - public void setSysCompanyCode(String sysCompanyCode){ - this.sysCompanyCode = sysCompanyCode; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 流程状态 - */ - public String getBpmStatus(){ - return this.bpmStatus; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 流程状态 - */ - public void setBpmStatus(String bpmStatus){ - this.bpmStatus = bpmStatus; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 供应商编码 - */ - public String getVendorCode(){ - return this.vendorCode; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 供应商编码 - */ - public void setVendorCode(String vendorCode){ - this.vendorCode = vendorCode; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 供应商名称 - */ - public String getVendorName(){ - return this.vendorName; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 供应商名称 - */ - public void setVendorName(String vendorName){ - this.vendorName = vendorName; - } - /** - *方法: 取得java.util.Date - *@return: java.util.Date 入库日期 - */ - public Date getDocDate(){ - return this.docDate; - } - - /** - *方法: 设置java.util.Date - *@param: java.util.Date 入库日期 - */ - public void setDocDate(Date docDate){ - this.docDate = docDate; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 入库备注 - */ - public String getRkRemark(){ - return this.rkRemark; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 入库备注 - */ - public void setRkRemark(String rkRemark){ - this.rkRemark = rkRemark; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 附件 - */ - public String getRkFujian(){ - return this.rkFujian; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 附件 - */ - public void setRkFujian(String rkFujian){ - this.rkFujian = rkFujian; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 备用1 - */ - public String getBy1(){ - return this.by1; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 备用1 - */ - public void setBy1(String by1){ - this.by1 = by1; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 备用2 - */ - public String getBy2(){ - return this.by2; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 备用2 - */ - public void setBy2(String by2){ - this.by2 = by2; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 备用3 - */ - public String getBy3(){ - return this.by3; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 备用3 - */ - public void setBy3(String by3){ - this.by3 = by3; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 备用4 - */ - public String getBy4(){ - return this.by4; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 备用4 - */ - public void setBy4(String by4){ - this.by4 = by4; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 备用5 - */ - public String getBy5(){ - return this.by5; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 备用5 - */ - public void setBy5(String by5){ - this.by5 = by5; - } - - /**保存-入库商品*/ - @ExcelCollection(name="入库商品") - private List tWzRkItemList = new ArrayList(); - public List getTWzRkItemList() { - return tWzRkItemList; - } - public void setTWzRkItemList(List tWzRkItemList) { - this.tWzRkItemList = tWzRkItemList; - } -} diff --git a/src/main/java/com/zzjee/wzyw/service/TWzCkHeadServiceI.java b/src/main/java/com/zzjee/wzyw/service/TWzCkHeadServiceI.java deleted file mode 100644 index 4d535425..00000000 --- a/src/main/java/com/zzjee/wzyw/service/TWzCkHeadServiceI.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.zzjee.wzyw.service; - -import com.zzjee.wzyw.entity.TWzCkHeadEntity; -import com.zzjee.wzyw.entity.TWzCkItemEntity; -import org.jeecgframework.core.common.service.CommonService; - -import java.util.List; - -public interface TWzCkHeadServiceI extends CommonService { - - @Override - public void delete(T entity); - /** - * 添加一对多 - * - */ - public void addMain(TWzCkHeadEntity tWzCkHead, - List tWzCkItemList) ; - /** - * 修改一对多 - * - */ - public void updateMain(TWzCkHeadEntity tWzCkHead, - List tWzCkItemList); - public void delMain(TWzCkHeadEntity tWzCkHead); - - /** - * 默认按钮-sql增强-新增操作 - * @param t - * @return - */ - public boolean doAddSql(TWzCkHeadEntity t); - /** - * 默认按钮-sql增强-更新操作 - * @param t - * @return - */ - public boolean doUpdateSql(TWzCkHeadEntity t); - /** - * 默认按钮-sql增强-删除操作 - * @param t - * @return - */ - public boolean doDelSql(TWzCkHeadEntity t); -} diff --git a/src/main/java/com/zzjee/wzyw/service/TWzPoHeadServiceI.java b/src/main/java/com/zzjee/wzyw/service/TWzPoHeadServiceI.java deleted file mode 100644 index c159eec2..00000000 --- a/src/main/java/com/zzjee/wzyw/service/TWzPoHeadServiceI.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.zzjee.wzyw.service; - -import com.zzjee.wzyw.entity.TWzPoHeadEntity; -import com.zzjee.wzyw.entity.TWzPoItemEntity; -import org.jeecgframework.core.common.service.CommonService; - -import java.util.List; - -public interface TWzPoHeadServiceI extends CommonService { - - @Override - public void delete(T entity); - /** - * 添加一对多 - * - */ - public void addMain(TWzPoHeadEntity tWzPoHead, - List tWzPoItemList) ; - /** - * 修改一对多 - * - */ - public void updateMain(TWzPoHeadEntity tWzPoHead, - List tWzPoItemList); - public void delMain(TWzPoHeadEntity tWzPoHead); - - /** - * 默认按钮-sql增强-新增操作 - * @param t - * @return - */ - public boolean doAddSql(TWzPoHeadEntity t); - /** - * 默认按钮-sql增强-更新操作 - * @param t - * @return - */ - public boolean doUpdateSql(TWzPoHeadEntity t); - /** - * 默认按钮-sql增强-删除操作 - * @param t - * @return - */ - public boolean doDelSql(TWzPoHeadEntity t); -} diff --git a/src/main/java/com/zzjee/wzyw/service/TWzRkHeadServiceI.java b/src/main/java/com/zzjee/wzyw/service/TWzRkHeadServiceI.java deleted file mode 100644 index 9be9bc1b..00000000 --- a/src/main/java/com/zzjee/wzyw/service/TWzRkHeadServiceI.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.zzjee.wzyw.service; - -import com.zzjee.wzyw.entity.TWzRkHeadEntity; -import com.zzjee.wzyw.entity.TWzRkItemEntity; -import org.jeecgframework.core.common.service.CommonService; - -import java.util.List; - -public interface TWzRkHeadServiceI extends CommonService { - - @Override - public void delete(T entity); - /** - * 添加一对多 - * - */ - public void addMain(TWzRkHeadEntity tWzRkHead, - List tWzRkItemList) ; - /** - * 修改一对多 - * - */ - public void updateMain(TWzRkHeadEntity tWzRkHead, - List tWzRkItemList); - public void delMain(TWzRkHeadEntity tWzRkHead); - - /** - * 默认按钮-sql增强-新增操作 - * @param t - * @return - */ - public boolean doAddSql(TWzRkHeadEntity t); - /** - * 默认按钮-sql增强-更新操作 - * @param t - * @return - */ - public boolean doUpdateSql(TWzRkHeadEntity t); - /** - * 默认按钮-sql增强-删除操作 - * @param t - * @return - */ - public boolean doDelSql(TWzRkHeadEntity t); -} diff --git a/src/main/java/com/zzjee/wzyw/service/impl/TWzCkHeadServiceImpl.java b/src/main/java/com/zzjee/wzyw/service/impl/TWzCkHeadServiceImpl.java deleted file mode 100644 index 1d6786e5..00000000 --- a/src/main/java/com/zzjee/wzyw/service/impl/TWzCkHeadServiceImpl.java +++ /dev/null @@ -1,192 +0,0 @@ -package com.zzjee.wzyw.service.impl; - -import com.zzjee.wzyw.entity.TWzCkHeadEntity; -import com.zzjee.wzyw.entity.TWzCkItemEntity; -import com.zzjee.wzyw.service.TWzCkHeadServiceI; -import org.jeecgframework.core.common.exception.BusinessException; -import org.jeecgframework.core.common.service.impl.CommonServiceImpl; -import org.jeecgframework.core.util.MyBeanUtils; -import org.jeecgframework.core.util.StringUtil; -import org.jeecgframework.core.util.oConvertUtils; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; -import java.util.UUID; - - -@Service("tWzCkHeadService") -@Transactional -public class TWzCkHeadServiceImpl extends CommonServiceImpl implements TWzCkHeadServiceI { - - @Override - public void delete(T entity) { - super.delete(entity); - //执行删除操作配置的sql增强 - this.doDelSql((TWzCkHeadEntity)entity); - } - - @Override - public void addMain(TWzCkHeadEntity tWzCkHead, - List tWzCkItemList){ - //保存主信息 -// tWzCkHead.setBpmStatus("0"); - this.save(tWzCkHead); - - /**保存-出库商品*/ - for(TWzCkItemEntity tWzCkItem:tWzCkItemList){ - //外键设置 - tWzCkItem.setWzckHid(tWzCkHead.getId().toString()); -// tWzCkItem.setBpmStatus("0"); - this.save(tWzCkItem); - } - //执行新增操作配置的sql增强 - this.doAddSql(tWzCkHead); - } - - - @Override - public void updateMain(TWzCkHeadEntity tWzCkHead, - List tWzCkItemList) { - //保存主表信息 - if(StringUtil.isNotEmpty(tWzCkHead.getId())){ - try { - TWzCkHeadEntity temp = findUniqueByProperty(TWzCkHeadEntity.class, "id", tWzCkHead.getId()); - MyBeanUtils.copyBeanNotNull2Bean(tWzCkHead, temp); - this.saveOrUpdate(temp); - } catch (Exception e) { - e.printStackTrace(); - } - }else{ - this.saveOrUpdate(tWzCkHead); - } - //=================================================================================== - //获取参数 - Object id0 = tWzCkHead.getId(); - //=================================================================================== - //1.查询出数据库的明细数据-出库商品 - String hql0 = "from TWzCkItemEntity where 1 = 1 AND wZCK_HID = ? "; - List tWzCkItemOldList = this.findHql(hql0,id0); - //2.筛选更新明细数据-出库商品 - if(tWzCkItemList!=null&&tWzCkItemList.size()>0){ - for(TWzCkItemEntity oldE:tWzCkItemOldList){ - boolean isUpdate = false; - for(TWzCkItemEntity sendE:tWzCkItemList){ - //需要更新的明细数据-出库商品 - if(oldE.getId().equals(sendE.getId())){ - try { - MyBeanUtils.copyBeanNotNull2Bean(sendE,oldE); - this.saveOrUpdate(oldE); - } catch (Exception e) { - e.printStackTrace(); - throw new BusinessException(e.getMessage()); - } - isUpdate= true; - break; - } - } - if(!isUpdate){ - //如果数据库存在的明细，前台没有传递过来则是删除-出库商品 - super.delete(oldE); - } - - } - //3.持久化新增的数据-出库商品 - for(TWzCkItemEntity tWzCkItem:tWzCkItemList){ - if(oConvertUtils.isEmpty(tWzCkItem.getId())){ - //外键设置 - tWzCkItem.setWzckHid(tWzCkHead.getId().toString()); - this.save(tWzCkItem); - } - } - } - //执行更新操作配置的sql增强 - this.doUpdateSql(tWzCkHead); - } - - - @Override - public void delMain(TWzCkHeadEntity tWzCkHead) { - //删除主表信息 - this.delete(tWzCkHead); - //=================================================================================== - //获取参数 - Object id0 = tWzCkHead.getId(); - //=================================================================================== - //删除-出库商品 - String hql0 = "from TWzCkItemEntity where 1 = 1 AND wZCK_HID = ? "; - List tWzCkItemOldList = this.findHql(hql0,id0); - this.deleteAllEntitie(tWzCkItemOldList); - } - - - /** - * 默认按钮-sql增强-新增操作 - * @param t - * @return - */ - @Override - public boolean doAddSql(TWzCkHeadEntity t){ - - String tsql = "call p_wz_shenpi("+"'"+t.getId()+")"; - try { - this.executeSql(tsql); - } catch (Exception e) { - // TODO: handle exception - } -// wzUtil.saveentity(t.getId().toString());//审批控制 - return true; - } - /** - * 默认按钮-sql增强-更新操作 - * @param t - * @return - */ - @Override - public boolean doUpdateSql(TWzCkHeadEntity t){ - return true; - } - /** - * 默认按钮-sql增强-删除操作 - * @param t - * @return - */ - @Override - public boolean doDelSql(TWzCkHeadEntity t){ - return true; - } - - /** - * 替换sql中的变量 - * @param sql - * @return - */ - public String replaceVal(String sql,TWzCkHeadEntity t){ - sql = sql.replace("#{id}",String.valueOf(t.getId())); - sql = sql.replace("#{create_name}",String.valueOf(t.getCreateName())); - sql = sql.replace("#{create_by}",String.valueOf(t.getCreateBy())); - sql = sql.replace("#{create_date}",String.valueOf(t.getCreateDate())); - sql = sql.replace("#{update_name}",String.valueOf(t.getUpdateName())); - sql = sql.replace("#{update_by}",String.valueOf(t.getUpdateBy())); - sql = sql.replace("#{update_date}",String.valueOf(t.getUpdateDate())); - sql = sql.replace("#{sys_org_code}",String.valueOf(t.getSysOrgCode())); - sql = sql.replace("#{sys_company_code}",String.valueOf(t.getSysCompanyCode())); - sql = sql.replace("#{bpm_status}",String.valueOf(t.getBpmStatus())); - sql = sql.replace("#{org_code}",String.valueOf(t.getOrgCode())); - sql = sql.replace("#{org_name}",String.valueOf(t.getOrgName())); - sql = sql.replace("#{ck_username}",String.valueOf(t.getCkUsername())); - sql = sql.replace("#{ck_name}",String.valueOf(t.getCkName())); - sql = sql.replace("#{doc_date}",String.valueOf(t.getDocDate())); - sql = sql.replace("#{ck_value}",String.valueOf(t.getCkValue())); - sql = sql.replace("#{ck_remark}",String.valueOf(t.getCkRemark())); - sql = sql.replace("#{ck_sgsp}",String.valueOf(t.getCkSgsp())); - sql = sql.replace("#{ck_fujian}",String.valueOf(t.getCkFujian())); - sql = sql.replace("#{by1}",String.valueOf(t.getBy1())); - sql = sql.replace("#{by2}",String.valueOf(t.getBy2())); - sql = sql.replace("#{by3}",String.valueOf(t.getBy3())); - sql = sql.replace("#{by4}",String.valueOf(t.getBy4())); - sql = sql.replace("#{by5}",String.valueOf(t.getBy5())); - sql = sql.replace("#{UUID}",UUID.randomUUID().toString()); - return sql; - } -} diff --git a/src/main/java/com/zzjee/wzyw/service/impl/TWzPoHeadServiceImpl.java b/src/main/java/com/zzjee/wzyw/service/impl/TWzPoHeadServiceImpl.java deleted file mode 100644 index a1fc55c7..00000000 --- a/src/main/java/com/zzjee/wzyw/service/impl/TWzPoHeadServiceImpl.java +++ /dev/null @@ -1,176 +0,0 @@ -package com.zzjee.wzyw.service.impl; - -import com.zzjee.wzyw.entity.TWzPoHeadEntity; -import com.zzjee.wzyw.entity.TWzPoItemEntity; -import com.zzjee.wzyw.service.TWzPoHeadServiceI; -import org.jeecgframework.core.common.exception.BusinessException; -import org.jeecgframework.core.common.service.impl.CommonServiceImpl; -import org.jeecgframework.core.util.MyBeanUtils; -import org.jeecgframework.core.util.StringUtil; -import org.jeecgframework.core.util.oConvertUtils; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; -import java.util.UUID; - - -@Service("tWzPoHeadService") -@Transactional -public class TWzPoHeadServiceImpl extends CommonServiceImpl implements TWzPoHeadServiceI { - - @Override - public void delete(T entity) { - super.delete(entity); - //执行删除操作配置的sql增强 - this.doDelSql((TWzPoHeadEntity)entity); - } - - @Override - public void addMain(TWzPoHeadEntity tWzPoHead, - List tWzPoItemList){ - //保存主信息 - this.save(tWzPoHead); - - /**保存-采购订单行项目*/ - for(TWzPoItemEntity tWzPoItem:tWzPoItemList){ - //外键设置 - tWzPoItem.setPoId(tWzPoHead.getId().toString()); - this.save(tWzPoItem); - } - //执行新增操作配置的sql增强 - this.doAddSql(tWzPoHead); - } - - - @Override - public void updateMain(TWzPoHeadEntity tWzPoHead, - List tWzPoItemList) { - //保存主表信息 - if(StringUtil.isNotEmpty(tWzPoHead.getId())){ - try { - TWzPoHeadEntity temp = findUniqueByProperty(TWzPoHeadEntity.class, "id", tWzPoHead.getId()); - MyBeanUtils.copyBeanNotNull2Bean(tWzPoHead, temp); - this.saveOrUpdate(temp); - } catch (Exception e) { - e.printStackTrace(); - } - }else{ - this.saveOrUpdate(tWzPoHead); - } - //=================================================================================== - //获取参数 - Object id0 = tWzPoHead.getId(); - //=================================================================================== - //1.查询出数据库的明细数据-采购订单行项目 - String hql0 = "from TWzPoItemEntity where 1 = 1 AND pO_ID = ? "; - List tWzPoItemOldList = this.findHql(hql0,id0); - //2.筛选更新明细数据-采购订单行项目 - if(tWzPoItemList!=null&&tWzPoItemList.size()>0){ - for(TWzPoItemEntity oldE:tWzPoItemOldList){ - boolean isUpdate = false; - for(TWzPoItemEntity sendE:tWzPoItemList){ - //需要更新的明细数据-采购订单行项目 - if(oldE.getId().equals(sendE.getId())){ - try { - MyBeanUtils.copyBeanNotNull2Bean(sendE,oldE); - this.saveOrUpdate(oldE); - } catch (Exception e) { - e.printStackTrace(); - throw new BusinessException(e.getMessage()); - } - isUpdate= true; - break; - } - } - if(!isUpdate){ - //如果数据库存在的明细，前台没有传递过来则是删除-采购订单行项目 - super.delete(oldE); - } - - } - //3.持久化新增的数据-采购订单行项目 - for(TWzPoItemEntity tWzPoItem:tWzPoItemList){ - if(oConvertUtils.isEmpty(tWzPoItem.getId())){ - //外键设置 - tWzPoItem.setPoId(tWzPoHead.getId().toString()); - this.save(tWzPoItem); - } - } - } - //执行更新操作配置的sql增强 - this.doUpdateSql(tWzPoHead); - } - - - @Override - public void delMain(TWzPoHeadEntity tWzPoHead) { - //删除主表信息 - this.delete(tWzPoHead); - //=================================================================================== - //获取参数 - Object id0 = tWzPoHead.getId(); - //=================================================================================== - //删除-采购订单行项目 - String hql0 = "from TWzPoItemEntity where 1 = 1 AND pO_ID = ? "; - List tWzPoItemOldList = this.findHql(hql0,id0); - this.deleteAllEntitie(tWzPoItemOldList); - } - - - /** - * 默认按钮-sql增强-新增操作 - * @param t - * @return - */ - @Override - public boolean doAddSql(TWzPoHeadEntity t){ - return true; - } - /** - * 默认按钮-sql增强-更新操作 - * @param t - * @return - */ - @Override - public boolean doUpdateSql(TWzPoHeadEntity t){ - return true; - } - /** - * 默认按钮-sql增强-删除操作 - * @param t - * @return - */ - @Override - public boolean doDelSql(TWzPoHeadEntity t){ - return true; - } - - /** - * 替换sql中的变量 - * @param sql - * @return - */ - public String replaceVal(String sql,TWzPoHeadEntity t){ - sql = sql.replace("#{id}",String.valueOf(t.getId())); - sql = sql.replace("#{create_name}",String.valueOf(t.getCreateName())); - sql = sql.replace("#{create_by}",String.valueOf(t.getCreateBy())); - sql = sql.replace("#{create_date}",String.valueOf(t.getCreateDate())); - sql = sql.replace("#{update_name}",String.valueOf(t.getUpdateName())); - sql = sql.replace("#{update_by}",String.valueOf(t.getUpdateBy())); - sql = sql.replace("#{update_date}",String.valueOf(t.getUpdateDate())); - sql = sql.replace("#{sys_org_code}",String.valueOf(t.getSysOrgCode())); - sql = sql.replace("#{sys_company_code}",String.valueOf(t.getSysCompanyCode())); - sql = sql.replace("#{bpm_status}",String.valueOf(t.getBpmStatus())); - sql = sql.replace("#{vendor_code}",String.valueOf(t.getVendorCode())); - sql = sql.replace("#{vendor_name}",String.valueOf(t.getVendorName())); - sql = sql.replace("#{doc_date}",String.valueOf(t.getDocDate())); - sql = sql.replace("#{po_remark}",String.valueOf(t.getPoRemark())); - sql = sql.replace("#{po_by1}",String.valueOf(t.getPoBy1())); - sql = sql.replace("#{po_by2}",String.valueOf(t.getPoBy2())); - sql = sql.replace("#{po_by3}",String.valueOf(t.getPoBy3())); - sql = sql.replace("#{po_by4}",String.valueOf(t.getPoBy4())); - sql = sql.replace("#{UUID}",UUID.randomUUID().toString()); - return sql; - } -} diff --git a/src/main/java/com/zzjee/wzyw/service/impl/TWzRkHeadServiceImpl.java b/src/main/java/com/zzjee/wzyw/service/impl/TWzRkHeadServiceImpl.java deleted file mode 100644 index d0b137d9..00000000 --- a/src/main/java/com/zzjee/wzyw/service/impl/TWzRkHeadServiceImpl.java +++ /dev/null @@ -1,181 +0,0 @@ -package com.zzjee.wzyw.service.impl; - -import com.zzjee.wzyw.entity.TWzRkHeadEntity; -import com.zzjee.wzyw.entity.TWzRkItemEntity; -import com.zzjee.wzyw.service.TWzRkHeadServiceI; -import org.jeecgframework.core.common.exception.BusinessException; -import org.jeecgframework.core.common.service.impl.CommonServiceImpl; -import org.jeecgframework.core.util.MyBeanUtils; -import org.jeecgframework.core.util.StringUtil; -import org.jeecgframework.core.util.oConvertUtils; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; -import java.util.UUID; - - -@Service("tWzRkHeadService") -@Transactional -public class TWzRkHeadServiceImpl extends CommonServiceImpl implements TWzRkHeadServiceI { - - @Override - public void delete(T entity) { - super.delete(entity); - //执行删除操作配置的sql增强 - this.doDelSql((TWzRkHeadEntity)entity); - } - - @Override - public void addMain(TWzRkHeadEntity tWzRkHead, - List tWzRkItemList){ - //保存主信息 - tWzRkHead.setBpmStatus("0"); - this.save(tWzRkHead); - - /**保存-入库商品*/ - for(TWzRkItemEntity tWzRkItem:tWzRkItemList){ - //外键设置 - tWzRkItem.setWzrkHid(tWzRkHead.getId().toString()); - tWzRkItem.setBpmStatus("0"); - this.save(tWzRkItem); - } - //执行新增操作配置的sql增强 - this.doAddSql(tWzRkHead); - } - - - @Override - public void updateMain(TWzRkHeadEntity tWzRkHead, - List tWzRkItemList) { - //保存主表信息 - if(StringUtil.isNotEmpty(tWzRkHead.getId())){ - try { - TWzRkHeadEntity temp = findUniqueByProperty(TWzRkHeadEntity.class, "id", tWzRkHead.getId()); - MyBeanUtils.copyBeanNotNull2Bean(tWzRkHead, temp); - this.saveOrUpdate(temp); - } catch (Exception e) { - e.printStackTrace(); - } - }else{ - this.saveOrUpdate(tWzRkHead); - } - //=================================================================================== - //获取参数 - Object id0 = tWzRkHead.getId(); - //=================================================================================== - //1.查询出数据库的明细数据-入库商品 - String hql0 = "from TWzRkItemEntity where 1 = 1 AND wZRK_HID = ? "; - List tWzRkItemOldList = this.findHql(hql0,id0); - //2.筛选更新明细数据-入库商品 - if(tWzRkItemList!=null&&tWzRkItemList.size()>0){ - for(TWzRkItemEntity oldE:tWzRkItemOldList){ - boolean isUpdate = false; - for(TWzRkItemEntity sendE:tWzRkItemList){ - //需要更新的明细数据-入库商品 - if(oldE.getId().equals(sendE.getId())){ - try { - MyBeanUtils.copyBeanNotNull2Bean(sendE,oldE); - this.saveOrUpdate(oldE); - } catch (Exception e) { - e.printStackTrace(); - throw new BusinessException(e.getMessage()); - } - isUpdate= true; - break; - } - } - if(!isUpdate){ - //如果数据库存在的明细，前台没有传递过来则是删除-入库商品 - super.delete(oldE); - } - - } - //3.持久化新增的数据-入库商品 - for(TWzRkItemEntity tWzRkItem:tWzRkItemList){ - if(oConvertUtils.isEmpty(tWzRkItem.getId())){ - //外键设置 - tWzRkItem.setWzrkHid(tWzRkHead.getId().toString()); - this.save(tWzRkItem); - } - } - } - //执行更新操作配置的sql增强 - this.doUpdateSql(tWzRkHead); - } - - - @Override - public void delMain(TWzRkHeadEntity tWzRkHead) { - //删除主表信息 - this.delete(tWzRkHead); - //=================================================================================== - //获取参数 - Object id0 = tWzRkHead.getId(); - //=================================================================================== - //删除-入库商品 - String hql0 = "from TWzRkItemEntity where 1 = 1 AND wZRK_HID = ? "; - List tWzRkItemOldList = this.findHql(hql0,id0); - this.deleteAllEntitie(tWzRkItemOldList); - } - - - /** - * 默认按钮-sql增强-新增操作 - * @param t - * @return - */ - @Override - public boolean doAddSql(TWzRkHeadEntity t){ - - return true; - } - /** - * 默认按钮-sql增强-更新操作 - * @param t - * @return - */ - @Override - public boolean doUpdateSql(TWzRkHeadEntity t){ - return true; - } - /** - * 默认按钮-sql增强-删除操作 - * @param t - * @return - */ - @Override - public boolean doDelSql(TWzRkHeadEntity t){ - return true; - } - - /** - * 替换sql中的变量 - * @param sql - * @return - */ - public String replaceVal(String sql, TWzRkHeadEntity t){ - sql = sql.replace("#{id}",String.valueOf(t.getId())); - sql = sql.replace("#{create_name}",String.valueOf(t.getCreateName())); - sql = sql.replace("#{create_by}",String.valueOf(t.getCreateBy())); - sql = sql.replace("#{create_date}",String.valueOf(t.getCreateDate())); - sql = sql.replace("#{update_name}",String.valueOf(t.getUpdateName())); - sql = sql.replace("#{update_by}",String.valueOf(t.getUpdateBy())); - sql = sql.replace("#{update_date}",String.valueOf(t.getUpdateDate())); - sql = sql.replace("#{sys_org_code}",String.valueOf(t.getSysOrgCode())); - sql = sql.replace("#{sys_company_code}",String.valueOf(t.getSysCompanyCode())); - sql = sql.replace("#{bpm_status}",String.valueOf(t.getBpmStatus())); - sql = sql.replace("#{vendor_code}",String.valueOf(t.getVendorCode())); - sql = sql.replace("#{vendor_name}",String.valueOf(t.getVendorName())); - sql = sql.replace("#{doc_date}",String.valueOf(t.getDocDate())); - sql = sql.replace("#{rk_remark}",String.valueOf(t.getRkRemark())); - sql = sql.replace("#{rk_fujian}",String.valueOf(t.getRkFujian())); - sql = sql.replace("#{by1}",String.valueOf(t.getBy1())); - sql = sql.replace("#{by2}",String.valueOf(t.getBy2())); - sql = sql.replace("#{by3}",String.valueOf(t.getBy3())); - sql = sql.replace("#{by4}",String.valueOf(t.getBy4())); - sql = sql.replace("#{by5}",String.valueOf(t.getBy5())); - sql = sql.replace("#{UUID}",UUID.randomUUID().toString()); - return sql; - } -} diff --git a/src/main/webapp/plug-in/tools/curdtools_zh-cn.js b/src/main/webapp/plug-in/tools/curdtools_zh-cn.js index d1201e44..1d3ef03c 100644 --- a/src/main/webapp/plug-in/tools/curdtools_zh-cn.js +++ b/src/main/webapp/plug-in/tools/curdtools_zh-cn.js @@ -1122,6 +1122,7 @@ function inputClick(obj,name,code) { height: 400, cache:false, ok: function(){ + console.log("") iframe = this.iframe.contentWindow; var selected = iframe.getSelectRows(); if (selected == '' || selected == null ){ diff --git a/src/main/webapp/webpage/com/zzjee/uniapp/wmsAppRole-add.jsp b/src/main/webapp/webpage/com/zzjee/uniapp/wmsAppRole-add.jsp index 3c46b4fd..7d1466b7 100644 --- a/src/main/webapp/webpage/com/zzjee/uniapp/wmsAppRole-add.jsp +++ b/src/main/webapp/webpage/com/zzjee/uniapp/wmsAppRole-add.jsp @@ -79,26 +79,26 @@ - - - - - - - - - - +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> diff --git a/src/main/webapp/webpage/com/zzjee/uniapp/wmsAppRole-update.jsp b/src/main/webapp/webpage/com/zzjee/uniapp/wmsAppRole-update.jsp index ec0f324a..7a5112e7 100644 --- a/src/main/webapp/webpage/com/zzjee/uniapp/wmsAppRole-update.jsp +++ b/src/main/webapp/webpage/com/zzjee/uniapp/wmsAppRole-update.jsp @@ -78,26 +78,26 @@ - - - - - - - - - - +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> diff --git a/src/main/webapp/webpage/com/zzjee/uniapp/wmsAppRoleList.jsp b/src/main/webapp/webpage/com/zzjee/uniapp/wmsAppRoleList.jsp index 5d9b9740..c70822c0 100644 --- a/src/main/webapp/webpage/com/zzjee/uniapp/wmsAppRoleList.jsp +++ b/src/main/webapp/webpage/com/zzjee/uniapp/wmsAppRoleList.jsp @@ -15,9 +15,9 @@ - +<%-- --%> - +<%-- --%> diff --git a/src/main/webapp/webpage/com/zzjee/uniapp/wmsAppUser-add.jsp b/src/main/webapp/webpage/com/zzjee/uniapp/wmsAppUser-add.jsp index 42fc71ae..0851c550 100644 --- a/src/main/webapp/webpage/com/zzjee/uniapp/wmsAppUser-add.jsp +++ b/src/main/webapp/webpage/com/zzjee/uniapp/wmsAppUser-add.jsp @@ -38,25 +38,29 @@ ignore="ignore" /> +<%-- --%> + + + <%-- --%> - - - - - - --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- - ignore="ignore" - /> - - - - +<%-- ignore="ignore"--%> +<%-- />--%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> <%-- --%> <%-- --%> <%--