From f4861056f86619aba8ec4ec9b122f8eb73c81a17 Mon Sep 17 00:00:00 2001 From: e Date: Sat, 1 Feb 2020 16:21:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=A2=E6=AC=A1=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ba/controller/WmsWaveConfController.java | 406 ------------------ .../zzjee/ba/entity/WmsWaveConfEntity.java | 312 -------------- .../zzjee/ba/service/WmsWaveConfServiceI.java | 15 - .../service/impl/WmsWaveConfServiceImpl.java | 146 ------- .../webpage/com/zzjee/ba/wmsWaveConf-add.jsp | 103 ----- .../com/zzjee/ba/wmsWaveConf-update.jsp | 98 ----- .../webpage/com/zzjee/ba/wmsWaveConf.js | 32 -- .../webpage/com/zzjee/ba/wmsWaveConfList.js | 0 .../webpage/com/zzjee/ba/wmsWaveConfList.jsp | 56 --- 9 files changed, 1168 deletions(-) delete mode 100644 src/main/java/com/zzjee/ba/controller/WmsWaveConfController.java delete mode 100644 src/main/java/com/zzjee/ba/entity/WmsWaveConfEntity.java delete mode 100644 src/main/java/com/zzjee/ba/service/WmsWaveConfServiceI.java delete mode 100644 src/main/java/com/zzjee/ba/service/impl/WmsWaveConfServiceImpl.java delete mode 100644 src/main/webapp/webpage/com/zzjee/ba/wmsWaveConf-add.jsp delete mode 100644 src/main/webapp/webpage/com/zzjee/ba/wmsWaveConf-update.jsp delete mode 100644 src/main/webapp/webpage/com/zzjee/ba/wmsWaveConf.js delete mode 100644 src/main/webapp/webpage/com/zzjee/ba/wmsWaveConfList.js delete mode 100644 src/main/webapp/webpage/com/zzjee/ba/wmsWaveConfList.jsp diff --git a/src/main/java/com/zzjee/ba/controller/WmsWaveConfController.java b/src/main/java/com/zzjee/ba/controller/WmsWaveConfController.java deleted file mode 100644 index e9eb53f1..00000000 --- a/src/main/java/com/zzjee/ba/controller/WmsWaveConfController.java +++ /dev/null @@ -1,406 +0,0 @@ -package com.zzjee.ba.controller; -import com.zzjee.ba.entity.WmsWaveConfEntity; -import com.zzjee.ba.service.WmsWaveConfServiceI; -import java.util.ArrayList; -import java.util.List; -import java.text.SimpleDateFormat; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.servlet.ModelAndView; - -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.common.TreeChildCount; -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.StringUtil; -import org.jeecgframework.tag.core.easyui.TagUtil; -import org.jeecgframework.web.system.pojo.base.TSDepart; -import org.jeecgframework.web.system.service.SystemService; -import org.jeecgframework.core.util.MyBeanUtils; - -import java.io.OutputStream; -import org.jeecgframework.core.util.BrowserUtils; -import org.jeecgframework.poi.excel.ExcelExportUtil; -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.TemplateExportParams; -import org.jeecgframework.poi.excel.entity.vo.NormalExcelConstants; -import org.jeecgframework.poi.excel.entity.vo.TemplateExcelConstants; -import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.jeecgframework.core.util.ResourceUtil; -import java.io.IOException; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.multipart.MultipartHttpServletRequest; -import java.util.Map; -import java.util.HashMap; -import org.jeecgframework.core.util.ExceptionUtil; - -import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.ResponseStatus; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpStatus; -import org.jeecgframework.core.beanvalidator.BeanValidators; -import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.Validator; -import java.net.URI; -import org.springframework.http.MediaType; -import org.springframework.web.util.UriComponentsBuilder; - -/** - * @Title: Controller - * @Description: 波次配置 - * @author onlineGenerator - * @date 2019-12-11 09:08:25 - * @version V1.0 - * - */ -@Controller -@RequestMapping("/wmsWaveConfController") -public class WmsWaveConfController extends BaseController { - /** - * Logger for this class - */ - private static final Logger logger = Logger.getLogger(WmsWaveConfController.class); - - @Autowired - private WmsWaveConfServiceI wmsWaveConfService; - @Autowired - private SystemService systemService; - @Autowired - private Validator validator; - - - - /** - * 波次配置列表 页面跳转 - * - * @return - */ - @RequestMapping(params = "list") - public ModelAndView list(HttpServletRequest request) { - return new ModelAndView("com/zzjee/ba/wmsWaveConfList"); - } - - /** - * easyui AJAX请求数据 - * - * @param request - * @param response - * @param dataGrid - * @param user - */ - - @RequestMapping(params = "datagrid") - public void datagrid(WmsWaveConfEntity wmsWaveConf,HttpServletRequest request, HttpServletResponse response, DataGrid dataGrid) { - CriteriaQuery cq = new CriteriaQuery(WmsWaveConfEntity.class, dataGrid); - //查询条件组装器 - org.jeecgframework.core.extend.hqlsearch.HqlGenerateUtil.installHql(cq, wmsWaveConf, request.getParameterMap()); - try{ - //自定义追加查询条件 - }catch (Exception e) { - throw new BusinessException(e.getMessage()); - } - cq.add(); - this.wmsWaveConfService.getDataGridReturn(cq, true); - TagUtil.datagrid(response, dataGrid); - } - - /** - * 删除波次配置 - * - * @return - */ - @RequestMapping(params = "doDel") - @ResponseBody - public AjaxJson doDel(WmsWaveConfEntity wmsWaveConf, HttpServletRequest request) { - String message = null; - AjaxJson j = new AjaxJson(); - wmsWaveConf = systemService.getEntity(WmsWaveConfEntity.class, wmsWaveConf.getId()); - message = "波次配置删除成功"; - try{ - wmsWaveConfService.delete(wmsWaveConf); - 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(",")){ - WmsWaveConfEntity wmsWaveConf = systemService.getEntity(WmsWaveConfEntity.class, - id - ); - wmsWaveConfService.delete(wmsWaveConf); - 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(WmsWaveConfEntity wmsWaveConf, HttpServletRequest request) { - String message = null; - AjaxJson j = new AjaxJson(); - message = "波次配置添加成功"; - try{ - wmsWaveConfService.save(wmsWaveConf); - 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(WmsWaveConfEntity wmsWaveConf, HttpServletRequest request) { - String message = null; - AjaxJson j = new AjaxJson(); - message = "波次配置更新成功"; - WmsWaveConfEntity t = wmsWaveConfService.get(WmsWaveConfEntity.class, wmsWaveConf.getId()); - try { - MyBeanUtils.copyBeanNotNull2Bean(wmsWaveConf, t); - wmsWaveConfService.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(WmsWaveConfEntity wmsWaveConf, HttpServletRequest req) { - if (StringUtil.isNotEmpty(wmsWaveConf.getId())) { - wmsWaveConf = wmsWaveConfService.getEntity(WmsWaveConfEntity.class, wmsWaveConf.getId()); - req.setAttribute("wmsWaveConfPage", wmsWaveConf); - } - return new ModelAndView("com/zzjee/ba/wmsWaveConf-add"); - } - /** - * 波次配置编辑页面跳转 - * - * @return - */ - @RequestMapping(params = "goUpdate") - public ModelAndView goUpdate(WmsWaveConfEntity wmsWaveConf, HttpServletRequest req) { - if (StringUtil.isNotEmpty(wmsWaveConf.getId())) { - wmsWaveConf = wmsWaveConfService.getEntity(WmsWaveConfEntity.class, wmsWaveConf.getId()); - req.setAttribute("wmsWaveConfPage", wmsWaveConf); - } - return new ModelAndView("com/zzjee/ba/wmsWaveConf-update"); - } - - /** - * 导入功能跳转 - * - * @return - */ - @RequestMapping(params = "upload") - public ModelAndView upload(HttpServletRequest req) { - req.setAttribute("controller_name","wmsWaveConfController"); - return new ModelAndView("common/upload/pub_excel_upload"); - } - - /** - * 导出excel - * - * @param request - * @param response - */ - @RequestMapping(params = "exportXls") - public String exportXls(WmsWaveConfEntity wmsWaveConf,HttpServletRequest request,HttpServletResponse response - , DataGrid dataGrid,ModelMap modelMap) { - CriteriaQuery cq = new CriteriaQuery(WmsWaveConfEntity.class, dataGrid); - org.jeecgframework.core.extend.hqlsearch.HqlGenerateUtil.installHql(cq, wmsWaveConf, request.getParameterMap()); - List wmsWaveConfs = this.wmsWaveConfService.getListByCriteriaQuery(cq,false); - modelMap.put(NormalExcelConstants.FILE_NAME,"波次配置"); - modelMap.put(NormalExcelConstants.CLASS,WmsWaveConfEntity.class); - modelMap.put(NormalExcelConstants.PARAMS,new ExportParams("波次配置列表", "导出人:"+ResourceUtil.getSessionUserName().getRealName(), - "导出信息")); - modelMap.put(NormalExcelConstants.DATA_LIST,wmsWaveConfs); - return NormalExcelConstants.JEECG_EXCEL_VIEW; - } - /** - * 导出excel 使模板 - * - * @param request - * @param response - */ - @RequestMapping(params = "exportXlsByT") - public String exportXlsByT(WmsWaveConfEntity wmsWaveConf,HttpServletRequest request,HttpServletResponse response - , DataGrid dataGrid,ModelMap modelMap) { - modelMap.put(NormalExcelConstants.FILE_NAME,"波次配置"); - modelMap.put(NormalExcelConstants.CLASS,WmsWaveConfEntity.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 listWmsWaveConfEntitys = ExcelImportUtil.importExcel(file.getInputStream(),WmsWaveConfEntity.class,params); - for (WmsWaveConfEntity wmsWaveConf : listWmsWaveConfEntitys) { - wmsWaveConfService.save(wmsWaveConf); - } - 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 listWmsWaveConfs=wmsWaveConfService.getList(WmsWaveConfEntity.class); - return listWmsWaveConfs; - } - - @RequestMapping(value = "/{id}", method = RequestMethod.GET) - @ResponseBody - public ResponseEntity get(@PathVariable("id") String id) { - WmsWaveConfEntity task = wmsWaveConfService.get(WmsWaveConfEntity.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 WmsWaveConfEntity wmsWaveConf, UriComponentsBuilder uriBuilder) { - //调用JSR303 Bean Validator进行校验，如果出错返回含400错误码及json格式的错误信息. - Set> failures = validator.validate(wmsWaveConf); - if (!failures.isEmpty()) { - return new ResponseEntity(BeanValidators.extractPropertyAndMessage(failures), HttpStatus.BAD_REQUEST); - } - - //保存 - try{ - wmsWaveConfService.save(wmsWaveConf); - } catch (Exception e) { - e.printStackTrace(); - return new ResponseEntity(HttpStatus.NO_CONTENT); - } - //按照Restful风格约定，创建指向新任务的url, 也可以直接返回id或对象. - String id = wmsWaveConf.getId(); - URI uri = uriBuilder.path("/rest/wmsWaveConfController/" + 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 WmsWaveConfEntity wmsWaveConf) { - //调用JSR303 Bean Validator进行校验，如果出错返回含400错误码及json格式的错误信息. - Set> failures = validator.validate(wmsWaveConf); - if (!failures.isEmpty()) { - return new ResponseEntity(BeanValidators.extractPropertyAndMessage(failures), HttpStatus.BAD_REQUEST); - } - - //保存 - try{ - wmsWaveConfService.saveOrUpdate(wmsWaveConf); - } 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) { - wmsWaveConfService.deleteEntityById(WmsWaveConfEntity.class, id); - } -} diff --git a/src/main/java/com/zzjee/ba/entity/WmsWaveConfEntity.java b/src/main/java/com/zzjee/ba/entity/WmsWaveConfEntity.java deleted file mode 100644 index bafb73ef..00000000 --- a/src/main/java/com/zzjee/ba/entity/WmsWaveConfEntity.java +++ /dev/null @@ -1,312 +0,0 @@ -package com.zzjee.ba.entity; - -import java.math.BigDecimal; -import java.util.Date; -import java.lang.String; -import java.lang.Double; -import java.lang.Integer; -import java.math.BigDecimal; -import javax.xml.soap.Text; -import java.sql.Blob; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; -import org.hibernate.annotations.GenericGenerator; -import javax.persistence.SequenceGenerator; -import org.jeecgframework.poi.excel.annotation.Excel; - -/** - * @Title: Entity - * @Description: 波次配置 - * @author onlineGenerator - * @date 2019-12-11 09:08:25 - * @version V1.0 - * - */ -@Entity -@Table(name = "wms_wave_conf", schema = "") -@SuppressWarnings("serial") -public class WmsWaveConfEntity 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; - /**配送点*/ - @Excel(name="配送点") - private String peisondian; - /**波次类型*/ - @Excel(name="波次类型") - private String waveType; - /**备用1*/ - @Excel(name="备用1") - private String wvBy1; - /**备用2*/ - @Excel(name="备用2") - private String wvBy2; - /**备用3*/ - @Excel(name="备用3") - private String wvBy3; - - /** - *方法: 取得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 ="PEISONDIAN",nullable=true,length=32) - public String getPeisondian(){ - return this.peisondian; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 配送点 - */ - public void setPeisondian(String peisondian){ - this.peisondian = peisondian; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 波次类型 - */ - @Column(name ="WAVE_TYPE",nullable=true,length=32) - public String getWaveType(){ - return this.waveType; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 波次类型 - */ - public void setWaveType(String waveType){ - this.waveType = waveType; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 备用1 - */ - @Column(name ="WV_BY1",nullable=true,length=32) - public String getWvBy1(){ - return this.wvBy1; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 备用1 - */ - public void setWvBy1(String wvBy1){ - this.wvBy1 = wvBy1; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 备用2 - */ - @Column(name ="WV_BY2",nullable=true,length=32) - public String getWvBy2(){ - return this.wvBy2; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 备用2 - */ - public void setWvBy2(String wvBy2){ - this.wvBy2 = wvBy2; - } - /** - *方法: 取得java.lang.String - *@return: java.lang.String 备用3 - */ - @Column(name ="WV_BY3",nullable=true,length=32) - public String getWvBy3(){ - return this.wvBy3; - } - - /** - *方法: 设置java.lang.String - *@param: java.lang.String 备用3 - */ - public void setWvBy3(String wvBy3){ - this.wvBy3 = wvBy3; - } -} diff --git a/src/main/java/com/zzjee/ba/service/WmsWaveConfServiceI.java b/src/main/java/com/zzjee/ba/service/WmsWaveConfServiceI.java deleted file mode 100644 index 73b003f7..00000000 --- a/src/main/java/com/zzjee/ba/service/WmsWaveConfServiceI.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.zzjee.ba.service; -import com.zzjee.ba.entity.WmsWaveConfEntity; -import org.jeecgframework.core.common.service.CommonService; - -import java.io.Serializable; - -public interface WmsWaveConfServiceI extends CommonService{ - - public void delete(WmsWaveConfEntity entity) throws Exception; - - public Serializable save(WmsWaveConfEntity entity) throws Exception; - - public void saveOrUpdate(WmsWaveConfEntity entity) throws Exception; - -} diff --git a/src/main/java/com/zzjee/ba/service/impl/WmsWaveConfServiceImpl.java b/src/main/java/com/zzjee/ba/service/impl/WmsWaveConfServiceImpl.java deleted file mode 100644 index 135c759c..00000000 --- a/src/main/java/com/zzjee/ba/service/impl/WmsWaveConfServiceImpl.java +++ /dev/null @@ -1,146 +0,0 @@ -package com.zzjee.ba.service.impl; -import com.zzjee.ba.service.WmsWaveConfServiceI; -import org.jeecgframework.core.common.service.impl.CommonServiceImpl; -import com.zzjee.ba.entity.WmsWaveConfEntity; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; -import java.io.Serializable; -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; - -@Service("wmsWaveConfService") -@Transactional -public class WmsWaveConfServiceImpl extends CommonServiceImpl implements WmsWaveConfServiceI { - - - public void delete(WmsWaveConfEntity entity) throws Exception{ - super.delete(entity); - //执行删除操作增强业务 - this.doDelBus(entity); - } - - public Serializable save(WmsWaveConfEntity entity) throws Exception{ - Serializable t = super.save(entity); - //执行新增操作增强业务 - this.doAddBus(entity); - return t; - } - - public void saveOrUpdate(WmsWaveConfEntity entity) throws Exception{ - super.saveOrUpdate(entity); - //执行更新操作增强业务 - this.doUpdateBus(entity); - } - - /** - * 新增操作增强业务 - * @param t - * @return - */ - private void doAddBus(WmsWaveConfEntity t) throws Exception{ - //-----------------sql增强 start---------------------------- - //-----------------sql增强 end------------------------------ - - //-----------------java增强 start--------------------------- - //-----------------java增强 end----------------------------- - } - /** - * 更新操作增强业务 - * @param t - * @return - */ - private void doUpdateBus(WmsWaveConfEntity t) throws Exception{ - //-----------------sql增强 start---------------------------- - //-----------------sql增强 end------------------------------ - - //-----------------java增强 start--------------------------- - //-----------------java增强 end----------------------------- - } - /** - * 删除操作增强业务 - * @param id - * @return - */ - private void doDelBus(WmsWaveConfEntity t) throws Exception{ - //-----------------sql增强 start---------------------------- - //-----------------sql增强 end------------------------------ - - //-----------------java增强 start--------------------------- - //-----------------java增强 end----------------------------- - } - - private Map populationMap(WmsWaveConfEntity 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("peisondian", t.getPeisondian()); - map.put("wave_type", t.getWaveType()); - map.put("wv_by1", t.getWvBy1()); - map.put("wv_by2", t.getWvBy2()); - map.put("wv_by3", t.getWvBy3()); - return map; - } - - /** - * 替换sql中的变量 - * @param sql - * @param t - * @return - */ - public String replaceVal(String sql,WmsWaveConfEntity 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("#{peisondian}",String.valueOf(t.getPeisondian())); - sql = sql.replace("#{wave_type}",String.valueOf(t.getWaveType())); - sql = sql.replace("#{wv_by1}",String.valueOf(t.getWvBy1())); - sql = sql.replace("#{wv_by2}",String.valueOf(t.getWvBy2())); - sql = sql.replace("#{wv_by3}",String.valueOf(t.getWvBy3())); - 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("wms_wave_conf",data); - } - } catch (Exception e) { - e.printStackTrace(); - throw new Exception("执行JAVA增强出现异常！"); - } - } - } -} \ No newline at end of file diff --git a/src/main/webapp/webpage/com/zzjee/ba/wmsWaveConf-add.jsp b/src/main/webapp/webpage/com/zzjee/ba/wmsWaveConf-add.jsp deleted file mode 100644 index b4131c2e..00000000 --- a/src/main/webapp/webpage/com/zzjee/ba/wmsWaveConf-add.jsp +++ /dev/null @@ -1,103 +0,0 @@ -<%@ page language="java" import="java.util.*" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@include file="/context/mytags.jsp"%> - - - - 波次配置 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - -
- - - - - -
- - - - - -
- - - - - -
- - - - - -
- - - diff --git a/src/main/webapp/webpage/com/zzjee/ba/wmsWaveConf-update.jsp b/src/main/webapp/webpage/com/zzjee/ba/wmsWaveConf-update.jsp deleted file mode 100644 index dbc40259..00000000 --- a/src/main/webapp/webpage/com/zzjee/ba/wmsWaveConf-update.jsp +++ /dev/null @@ -1,98 +0,0 @@ -<%@ page language="java" import="java.util.*" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@include file="/context/mytags.jsp"%> - - - - 波次配置 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - -
- - - - - -
- - - - - -
- - - - - -
- - - - - -
- - - diff --git a/src/main/webapp/webpage/com/zzjee/ba/wmsWaveConf.js b/src/main/webapp/webpage/com/zzjee/ba/wmsWaveConf.js deleted file mode 100644 index 5ec72b64..00000000 --- a/src/main/webapp/webpage/com/zzjee/ba/wmsWaveConf.js +++ /dev/null @@ -1,32 +0,0 @@ - - -//通用弹出式文件上传 -function commonUpload(callback){ - $.dialog({ - content: "url:systemController.do?commonUpload", - lock : true, - title:"文件上传", - zIndex:2100, - width:700, - height: 200, - parent:windowapi, - cache:false, - ok: function(){ - var iframe = this.iframe.contentWindow; - iframe.uploadCallback(callback); - return true; - }, - cancelVal: '关闭', - cancel: function(){ - } - }); -} -function browseImages(inputId, Img) {// 图片管理器，可多个上传共用 -} -function browseFiles(inputId, file) {// 文件管理器，可多个上传共用 -} -function decode(value, id) {//value传入值,id接受值 - var last = value.lastIndexOf("/"); - var filename = value.substring(last + 1, value.length); - $("#" + id).text(decodeURIComponent(filename)); -} \ No newline at end of file diff --git a/src/main/webapp/webpage/com/zzjee/ba/wmsWaveConfList.js b/src/main/webapp/webpage/com/zzjee/ba/wmsWaveConfList.js deleted file mode 100644 index e69de29b..00000000 diff --git a/src/main/webapp/webpage/com/zzjee/ba/wmsWaveConfList.jsp b/src/main/webapp/webpage/com/zzjee/ba/wmsWaveConfList.jsp deleted file mode 100644 index 02a75020..00000000 --- a/src/main/webapp/webpage/com/zzjee/ba/wmsWaveConfList.jsp +++ /dev/null @@ -1,56 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@include file="/context/mytags.jsp"%> - -
-
- - - - - - - - - - - - - - - - - - - - - <%----%> - - - - - -
-
- - \ No newline at end of file