diff --git a/src/main/java/com/zzjee/BI/BiBinController.java b/src/main/java/com/zzjee/BI/BiBinController.java index 1bc4976a..c2645fd9 100644 --- a/src/main/java/com/zzjee/BI/BiBinController.java +++ b/src/main/java/com/zzjee/BI/BiBinController.java @@ -27,13 +27,21 @@ public class BiBinController extends BaseController { // private Validator validator; @RequestMapping(params = "homebi") public ModelAndView bi(HttpServletRequest request) { + biEntity biEntity = getBi(""); + request.setAttribute("num1",biEntity.getNum1()); + request.setAttribute("num2",biEntity.getNum2()); + request.setAttribute("num3",biEntity.getNum3()); + request.setAttribute("num4",biEntity.getNum4()); + + return new ModelAndView("com/zzjee/BI/home/reportbi"); + } + + public biEntity getBi(String username){ + biEntity biEntity = new biEntity(); String num1= "0"; String num2= "0"; String num3= "0"; String num4= "0"; - -// String yearstr = DateUtils.date2Str(DateUtils.yyyyMMdd); - String ysql = "select CONVERT( sum(base_goodscount),DECIMAL(10,0)) as linecount from wm_im_notice_i where bin_pre = 'N'" ; List> ymaplist1=systemService.findForJdbc(ysql); @@ -82,15 +90,11 @@ public class BiBinController extends BaseController { } } - - - - request.setAttribute("num1",num1); - request.setAttribute("num2",num2); - request.setAttribute("num3",num3); - request.setAttribute("num4",num4); - - return new ModelAndView("com/zzjee/BI/home/reportbi"); + biEntity.setNum1(num1); + biEntity.setNum2(num2); + biEntity.setNum3(num3); + biEntity.setNum4(num4); + return biEntity; } /** * highchart diff --git a/src/main/java/com/zzjee/BI/biEntity.java b/src/main/java/com/zzjee/BI/biEntity.java new file mode 100644 index 00000000..4672ea68 --- /dev/null +++ b/src/main/java/com/zzjee/BI/biEntity.java @@ -0,0 +1,49 @@ +package com.zzjee.BI; + +public class biEntity { + String num1; + String num2; + String num3; + String num4; + String num5; + + public String getNum1() { + return num1; + } + + public void setNum1(String num1) { + this.num1 = num1; + } + + public String getNum2() { + return num2; + } + + public void setNum2(String num2) { + this.num2 = num2; + } + + public String getNum3() { + return num3; + } + + public void setNum3(String num3) { + this.num3 = num3; + } + + public String getNum4() { + return num4; + } + + public void setNum4(String num4) { + this.num4 = num4; + } + + public String getNum5() { + return num5; + } + + public void setNum5(String num5) { + this.num5 = num5; + } +} diff --git a/src/main/java/com/zzjee/api/ApiController.java b/src/main/java/com/zzjee/api/ApiController.java index f5f4ea7c..be7bea84 100644 --- a/src/main/java/com/zzjee/api/ApiController.java +++ b/src/main/java/com/zzjee/api/ApiController.java @@ -1,5 +1,7 @@ package com.zzjee.api; +import com.zzjee.BI.BiBinController; +import com.zzjee.BI.biEntity; import com.zzjee.md.controller.MdGoodsController; import com.zzjee.md.entity.MdCusEntity; import com.zzjee.md.entity.MdGoodsEntity; @@ -97,6 +99,9 @@ public class ApiController { private WmsAppRoleServiceI wmsAppRoleService; @Autowired private WmsAppFunctionServiceI wmsAppFunctionService; + + @Autowired + private BiBinController biBinController; //收货相关接口begin //收货列表 @RequestMapping(value = "/wvNoticeController/list", method = RequestMethod.GET) @@ -385,5 +390,15 @@ public class ApiController { } return Result.success(mesAppFunctions); } + //商品列表 + @RequestMapping(value = "/bi/list", method = RequestMethod.GET) + @ResponseBody + public ResponseEntity bilist(@RequestParam(value = "username", required = false) String username) { + biEntity biEntity = biBinController.getBi(username); + ResultDO D0 = new ResultDO(); + D0.setOK(false); + D0.setObj(biEntity); + return new ResponseEntity(D0, HttpStatus.OK); + } } diff --git a/src/main/resources/sysConfig.properties b/src/main/resources/sysConfig.properties index 2ad1f3a0..077240fc 100644 --- a/src/main/resources/sysConfig.properties +++ b/src/main/resources/sysConfig.properties @@ -219,7 +219,7 @@ show.goodsurl=http://120.92.53.114/jeewms/wmOmNoticeHController.do?showgoods&id= wms.totms=no #????? W???E???A?? -wms.yskz=E +wms.yskz=A sys.del=database wm.alldown=yes