diff --git a/src/main/java/com/zzjee/md/controller/MdGoodsController.java b/src/main/java/com/zzjee/md/controller/MdGoodsController.java index 3b9ef2cc..5fd4e9c0 100644 --- a/src/main/java/com/zzjee/md/controller/MdGoodsController.java +++ b/src/main/java/com/zzjee/md/controller/MdGoodsController.java @@ -265,34 +265,7 @@ public class MdGoodsController extends BaseController { return j; } - /** - * 更新商品信息 - * - * @return - */ - @RequestMapping(params = "doGet") - @ResponseBody - public AjaxJson dogetfromother(String formDate,String othercode, HttpServletRequest request) { - String message = null; - AjaxJson j = new AjaxJson(); - message = "商品信息读取成功"; - try { - if ("DSC".equals(ResourceUtil.getConfigByName("interfacetype"))){ - - dscUtil.updateGoodsFromDsc(); - - } - 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; - } /** * 更新商品信息 @@ -526,14 +499,7 @@ public class MdGoodsController extends BaseController { if(!StringUtil.isEmpty(searchstr)) { hql=hql+" and (shpBianMa = '" + searchstr + "'"; hql=hql+" or shpTiaoMa = '" + searchstr + "')"; - } -// if(!StringUtil.isEmpty(searchstr2)) { -// hql=hql+" and (shpTiaoMa = '" + searchstr2 + "'"; -// hql=hql+" or shpBianMa = '" + searchstr2 + "')"; -// -// } - List listMdGoodss = mdGoodsService.findHql(hql); D0.setOK(true); List result = new ArrayList(); @@ -545,9 +511,6 @@ public class MdGoodsController extends BaseController { break; } } -// t.setShpYanSe(searchstrin1); -// t.setPpTuPian(searchstrin2); -// t.setJjZhongBi(searchstrin3); result.add(t); } @@ -569,14 +532,6 @@ public class MdGoodsController extends BaseController { @ResponseBody public ResponseEntity create(@RequestParam String mdGoodsstr, UriComponentsBuilder uriBuilder) { - // 调用JSR303 Bean Validator进行校验,如果出错返回含400错误码及json格式的错误信息. -// Set> failures = validator -// .validate(mdGoods); -// if (!failures.isEmpty()) { -// return new ResponseEntity( -// BeanValidators.extractPropertyAndMessage(failures), -// HttpStatus.BAD_REQUEST); -// } ResultDO D0 = new ResultDO(); MdGoodsEntity mdGoods = (MdGoodsEntity)JSONHelper.json2Object(mdGoodsstr,MdGoodsEntity.class); diff --git a/src/main/webapp/webpage/com/zzjee/md/mdGoodsList.jsp b/src/main/webapp/webpage/com/zzjee/md/mdGoodsList.jsp index 445f0ed1..91173d51 100644 --- a/src/main/webapp/webpage/com/zzjee/md/mdGoodsList.jsp +++ b/src/main/webapp/webpage/com/zzjee/md/mdGoodsList.jsp @@ -67,16 +67,10 @@ - -
- <%----%> - 日期: - 商品编码: -
@@ -84,32 +78,6 @@ $(document).ready(function(){ // $('#mdGoodsList').datagrid('reload',{}); }); - - function otherimp() { - var batchdate; - batchdate = $('input[name="batchdate"]').attr("value"); - othercode = $('input[name="othercode"]').attr("value"); - - - var url = "mdGoodsController.do?doGet&formDate="+batchdate+"&othercode="+othercode; - $.ajax({ - async : true, - cache : false, - type : 'POST', - url : url,// 请求的action路径 - error : function() {// 请求失败处理函数 - }, - success : function(data) { - var d = $.parseJSON(data); - if (d.success) { - - } - } - }); - tip("获取成功"); - $('#mdGoodsList').datagrid('reload',{}); - - } function doprint(id){ var url = "mdGoodsController.do?doPrintmdgoods&id="+id; createdetailwindow(" 商品标签", url, 400, 300);