From 889db214d8b0631b933c7b55022b9f6a7cea7728 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9A=B4=E7=82=B3=E6=9E=97?= <15237758276@163.com> Date: Mon, 13 Jan 2025 10:38:53 +0800 Subject: [PATCH] no message --- wms-vue/src/components/duochaxun/RongQi.vue | 494 ++++++++++++++++++ wms-vue/src/router/router.js | 9 +- .../com/yc/wms/controller/RQTaskModel.java | 24 + .../yc/wms/controller/RongQiController.java | 462 ++++++++++++++++ .../com/yc/wms/controller/UserController.java | 6 +- wms/src/main/resources/application.yml | 2 +- 6 files changed, 994 insertions(+), 3 deletions(-) create mode 100644 wms-vue/src/components/duochaxun/RongQi.vue create mode 100644 wms/src/main/java/com/yc/wms/controller/RQTaskModel.java create mode 100644 wms/src/main/java/com/yc/wms/controller/RongQiController.java diff --git a/wms-vue/src/components/duochaxun/RongQi.vue b/wms-vue/src/components/duochaxun/RongQi.vue new file mode 100644 index 0000000..5250c6a --- /dev/null +++ b/wms-vue/src/components/duochaxun/RongQi.vue @@ -0,0 +1,494 @@ + + + + + diff --git a/wms-vue/src/router/router.js b/wms-vue/src/router/router.js index 765752a..59f91c5 100644 --- a/wms-vue/src/router/router.js +++ b/wms-vue/src/router/router.js @@ -128,7 +128,14 @@ const routes=[ }, component: () => import('@/components/duochaxun/Xuliehao.vue') }, - + { + path:'/RongQi', + name:'RongQi', + meta:{ + title:'容器流通' + }, + component: () => import('@/components/duochaxun/RongQi.vue') + } ] } ] diff --git a/wms/src/main/java/com/yc/wms/controller/RQTaskModel.java b/wms/src/main/java/com/yc/wms/controller/RQTaskModel.java new file mode 100644 index 0000000..27eaa18 --- /dev/null +++ b/wms/src/main/java/com/yc/wms/controller/RQTaskModel.java @@ -0,0 +1,24 @@ +package com.yc.wms.controller; + +import lombok.Data; + +import javax.persistence.Entity; +import javax.persistence.Id; +import java.io.Serializable; + +@Data +@Entity +public class RQTaskModel implements Serializable{ + @Id + private Long id; + private int ts; + // 料号 + private String liaohao; + // 工作站 + private String gzz; + // 容器 + private String rqh; + // 物料 + private String zrwh; + private String agvId; +} diff --git a/wms/src/main/java/com/yc/wms/controller/RongQiController.java b/wms/src/main/java/com/yc/wms/controller/RongQiController.java new file mode 100644 index 0000000..b9d2e84 --- /dev/null +++ b/wms/src/main/java/com/yc/wms/controller/RongQiController.java @@ -0,0 +1,462 @@ +package com.yc.wms.controller; + +import cn.hutool.json.JSONArray; +import cn.hutool.json.JSONObject; +import cn.hutool.json.JSONUtil; +import com.yc.wms.bean.Xuliehao; +import com.yc.wms.service.Xuliehaoqingdan; +import com.yc.wms.until.QueryPageUtil; +import com.yc.wms.until.Result; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.persistence.*; +import javax.servlet.http.HttpServletResponse; +import java.io.Serializable; +import java.text.SimpleDateFormat; +import java.util.*; +import java.util.stream.Collectors; +import java.util.stream.IntStream; + +@RestController +@Slf4j +@RequestMapping("/RongQi") +public class RongQiController { + @PersistenceContext + private EntityManager entityManager; + @Autowired + private Xuliehaoqingdan xuliehaoqingdan; + + @PostMapping("/queryList") + public Result queryList(@RequestBody String json) { + /* 返回data设置*/ + QueryPageUtil query =new QueryPageUtil(); + JSONObject jsonObject= JSONUtil.parseObj(json); + query.setPageSize((int)jsonObject.get("pageSize")); + query.setPageNum((int)jsonObject.get("pageNum")); + JSONObject param= (JSONObject)jsonObject.get("param"); + String wdCode=param.getStr("wdCode"); +// "BC241225094433013372"; + /* JSONArray jsonArray=param.getJSONArray("issued_Date"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + String startDate=""; + String endDate=""; + if (jsonArray.size()>0){ + Date date1=jsonArray.getDate(0); + startDate=sdf.format(date1); + Date date2=jsonArray.getDate(1); + endDate=sdf.format(date2); + }else { + startDate="2024-05-01"; + Date date = new Date(); + endDate=sdf.format(date); + }*/ + /* 基础sql数据查询*/ + String sql=" SELECT " + +" MAX(t.id) as id, " + +" count(t.id) as ts, " + +" MAX(t.agvTask_ID) as agv_id, " + +" item.code AS liaohao, " + +" MAX ( t.END_REGION ) AS gzz, " + +" MAX ( s2.LP ) AS rqh, " + +" t.BILLCODE AS zrwh " + +" FROM " + +" task t " + +" LEFT JOIN PICK_TICKET_DETAIL ptd ON ptd.id= t.PICK_TICKET_DETAIL_ID " + +" LEFT JOIN PICK_TICKET pt ON pt.id= ptd.PICK_TICKET_ID " + +" LEFT JOIN LOCATION loc ON loc.id= t.SRC_LOC_ID " + +" LEFT JOIN ZONE z ON z.id= loc.ZONE_ID " + +" LEFT JOIN ITEM_KEY ik ON ik.id= t.ITEM_KEY_ID " + +" LEFT JOIN ITEM item ON item.id= ik.ITEM_ID " + +" LEFT JOIN STOCK s2 ON s2.id= t.SRC_LP " + +" LEFT JOIN STOCK s1 ON s1.id= loc.stock " + +" LEFT JOIN WAVE_DOC wd ON wd.id= t.WAVE_DOC_ID " + +" WHERE " + +" 1 = 1 " + +" AND pt.BILL_TYPE_ID= 1094 " + +" AND wd.code= '"+wdCode+"' " + +" AND t.WAVE_DOC_ID IS NOT NULL and z.id=1763 " + +" GROUP BY " + +" pt.code, " + +" t.agvTask_ID, " + +" t.BILLCODE, " + +" item.id, " + +" item.code, " + +" item.BE_MARK_WEIGHT, " + +" loc.id, " + +" loc.code, " + +" ik.PROP_C1, " + +" ik.PROP_C2, " + +" ik.PROP_C3, " + +" ik.PROP_D1, " + +" ik.PROP_D2, " + +" item.ISBOM " + ; + String sqlCount = "select count(t.id) as nums from (" + sql+") t"; + /* 总条数*/ + List counts = entityManager.createNativeQuery(sqlCount).getResultList(); + /* 当前页数据*/ + int pageNum = query.getPageNum();//当前页 + int pageSize = counts.get(0);//条数 + String querySql="";//查询条件 + + String sqlFy = "select * from( " + + sql + + ") t where 1=1 " + + querySql + +" ORDER BY rqh " + + " ,id" + +" OFFSET "+ (pageNum-1) * pageSize +" ROWS " + +" FETCH NEXT "+pageSize+" ROWS ONLY; "; + + /* 箱子流通数*/ + List rqLtList=new ArrayList<>(); + RongQiLt rongQiOLD=new RongQiLt(); + rongQiOLD.setWorkstation("现有逻辑"); + rqLtList.add(rongQiOLD); + + RongQiLt rongQiNEW=new RongQiLt(); + rongQiNEW.setWorkstation("头物料+容器逻辑"); + rqLtList.add(rongQiNEW); + + /* 工作站命中率*/ + List rqMzList=new ArrayList<>(); + RongQiMz rqMzOLD=new RongQiMz(); + rqMzOLD.setWorkstation("现有逻辑"); + rqMzList.add(rqMzOLD); + + RongQiMz rqMzNEW=new RongQiMz(); + rqMzNEW.setWorkstation("新逻辑"); + rqMzList.add(rqMzNEW); + /* 详情数据*/ + List rqList = new ArrayList<>(); + /* 查询所有数据*/ + List listAll = entityManager.createNativeQuery(sqlFy, RQTaskModel.class).getResultList(); + /* 按容器分组*/ + Map> groupedByRqh = listAll.stream() + .collect(Collectors.groupingBy(RQTaskModel::getRqh)); + for (String rqh : groupedByRqh.keySet()) { + RongQi rongQi=new RongQi(); + rongQi.setRqh(rqh); + List listRqh=groupedByRqh.get(rqh); + rongQi.setId(listRqh.get(0).getId()); + /* 按工作站分组*/ + Map> groupedByGzz = listRqh.stream() + .collect(Collectors.groupingBy(RQTaskModel::getGzz)); + for (String gzz : groupedByGzz.keySet()) { + List listGzz=groupedByGzz.get(gzz); + /* 按AgvId任务分组，获取分组后的集合长度，算出当前料箱到当前工作站的次数*/ + Map> groupedByAgvId = listGzz.stream() + .collect(Collectors.groupingBy(RQTaskModel::getAgvId)); + /* 工作站搬运任务数*/ + int gzzCount=groupedByAgvId.size(); + /* 工作站拣货任务总行数*/ + int taskCount=0; + for (RQTaskModel rqTaskModel : listGzz){ + taskCount=taskCount+rqTaskModel.getTs(); + } + int i=1;//1 新逻辑 0 原逻辑 + RongQiMz rongQiMz=rqMzList.get(i); + switch (gzz){ + case "201": + rongQi.setG201(taskCount); + rqLtList.get(i).setG201(rqLtList.get(i).getG201()+gzzCount); + rongQiMz.getG201().setTaskCount(rongQiMz.getG201().getTaskCount()+taskCount); + rongQiMz.getG201().setLxCount(rongQiMz.getG201().getLxCount()+1); + break; + case "202": + rongQi.setG202(taskCount); + rqLtList.get(i).setG202(rqLtList.get(i).getG202()+gzzCount); + rongQiMz.getG202().setTaskCount(rongQiMz.getG202().getTaskCount()+taskCount); + rongQiMz.getG202().setLxCount(rongQiMz.getG202().getLxCount()+1); + break; + case "203": + rongQi.setG203(taskCount); + rqLtList.get(i).setG203(rqLtList.get(i).getG203()+gzzCount); + rongQiMz.getG203().setTaskCount(rongQiMz.getG203().getTaskCount()+taskCount); + rongQiMz.getG203().setLxCount(rongQiMz.getG203().getLxCount()+1); + break; + case "204": + rongQi.setG204(taskCount); + rqLtList.get(i).setG204(rqLtList.get(i).getG204()+gzzCount); + rongQiMz.getG204().setTaskCount(rongQiMz.getG204().getTaskCount()+taskCount); + rongQiMz.getG204().setLxCount(rongQiMz.getG204().getLxCount()+1); + break; + case "205": + rongQi.setG205(taskCount); + rqLtList.get(i).setG205(rqLtList.get(i).getG205()+gzzCount); + rongQiMz.getG205().setTaskCount(rongQiMz.getG205().getTaskCount()+taskCount); + rongQiMz.getG205().setLxCount(rongQiMz.getG205().getLxCount()+1); + break; + case "206": + rongQi.setG206(taskCount); + rqLtList.get(i).setG206(rqLtList.get(i).getG206()+gzzCount); + rongQiMz.getG206().setTaskCount(rongQiMz.getG206().getTaskCount()+taskCount); + rongQiMz.getG206().setLxCount(rongQiMz.getG206().getLxCount()+1); + break; + case "207": + rongQi.setG207(taskCount); + rqLtList.get(i).setG207(rqLtList.get(i).getG207()+gzzCount); + rongQiMz.getG207().setTaskCount(rongQiMz.getG207().getTaskCount()+taskCount); + rongQiMz.getG207().setLxCount(rongQiMz.getG207().getLxCount()+1); + break; + case "208": + rongQi.setG208(taskCount); + rqLtList.get(i).setG208(rqLtList.get(i).getG208()+gzzCount); + rongQiMz.getG208().setTaskCount(rongQiMz.getG208().getTaskCount()+taskCount); + rongQiMz.getG208().setLxCount(rongQiMz.getG208().getLxCount()+1); + break; + case "209": + rongQi.setG209(taskCount); + rqLtList.get(i).setG209(rqLtList.get(i).getG209()+gzzCount); + rongQiMz.getG209().setTaskCount(rongQiMz.getG209().getTaskCount()+taskCount); + rongQiMz.getG209().setLxCount(rongQiMz.getG209().getLxCount()+1); + break; + case "210": + rongQi.setG210(taskCount); + rqLtList.get(i).setG210(rqLtList.get(i).getG210()+gzzCount); + rongQiMz.getG210().setTaskCount(rongQiMz.getG210().getTaskCount()+taskCount); + rongQiMz.getG210().setLxCount(rongQiMz.getG210().getLxCount()+1); + break; + case "211": + rongQi.setG211(taskCount); + rqLtList.get(i).setG211(rqLtList.get(i).getG211()+gzzCount); + rongQiMz.getG211().setTaskCount(rongQiMz.getG211().getTaskCount()+taskCount); + rongQiMz.getG211().setLxCount(rongQiMz.getG211().getLxCount()+1); + break; + case "212": + rongQi.setG212(taskCount); + rqLtList.get(i).setG212(rqLtList.get(i).getG212()+gzzCount); + rongQiMz.getG212().setTaskCount(rongQiMz.getG212().getTaskCount()+taskCount); + rongQiMz.getG212().setLxCount(rongQiMz.getG212().getLxCount()+1); + break; + case "213": + rongQi.setG213(taskCount); + rqLtList.get(i).setG213(rqLtList.get(i).getG213()+gzzCount); + rongQiMz.getG213().setTaskCount(rongQiMz.getG213().getTaskCount()+taskCount); + rongQiMz.getG213().setLxCount(rongQiMz.getG213().getLxCount()+1); + break; + case "214": + rongQi.setG214(taskCount); + rqLtList.get(i).setG214(rqLtList.get(i).getG214()+gzzCount); + rongQiMz.getG214().setTaskCount(rongQiMz.getG214().getTaskCount()+taskCount); + rongQiMz.getG214().setLxCount(rongQiMz.getG214().getLxCount()+1); + break; + case "215": + rongQi.setG215(taskCount); + rqLtList.get(i).setG215(rqLtList.get(i).getG215()+gzzCount); + rongQiMz.getG215().setTaskCount(rongQiMz.getG215().getTaskCount()+taskCount); + rongQiMz.getG215().setLxCount(rongQiMz.getG215().getLxCount()+1); + break; + default: + break; + } + rqLtList.get(i).setTotal(rqLtList.get(i).getTotal()+gzzCount); + + } + rqList.add(rongQi); + } + // 使用 Comparator 进行排序 + Collections.sort(rqList, new Comparator() { + @Override + public int compare(RongQi r1, RongQi r2) { + return r1.getRqh().compareTo(r2.getRqh()); + } + }); + JSONObject jsonF=new JSONObject(); + jsonF.accumulate("rqList", rqList); + jsonF.accumulate("rqLtList", rqLtList); + for (int i = 0; i < rqMzList.size(); i++) { + RongQiMz rongQiMz=rqMzList.get(i);//工作站料箱数 + if (rongQiMz.getG201().getLxCount()!=0){ + rongQiMz.getG201().setMz(Math.round(rongQiMz.getG201().getTaskCount()/rongQiMz.getG201().getLxCount() * 100) / 100.0); + rongQiMz.getTotal().setTaskCount(rongQiMz.getTotal().getTaskCount()+rongQiMz.getG201().getMz()); + rongQiMz.getTotal().setLxCount(rongQiMz.getTotal().getLxCount()+1); + } + if (rongQiMz.getG202().getLxCount()!=0) { + rongQiMz.getG202().setMz(Math.round(rongQiMz.getG202().getTaskCount() / rongQiMz.getG202().getLxCount() * 100) / 100.0); + rongQiMz.getTotal().setTaskCount(rongQiMz.getTotal().getTaskCount()+rongQiMz.getG202().getMz()); + rongQiMz.getTotal().setLxCount(rongQiMz.getTotal().getLxCount()+1); + } + if (rongQiMz.getG203().getLxCount()!=0) { + rongQiMz.getG203().setMz(Math.round(rongQiMz.getG203().getTaskCount() / rongQiMz.getG203().getLxCount() * 100) / 100.0); + rongQiMz.getTotal().setTaskCount(rongQiMz.getTotal().getTaskCount()+rongQiMz.getG201().getMz()); + rongQiMz.getTotal().setLxCount(rongQiMz.getTotal().getLxCount()+1); + } + if (rongQiMz.getG204().getLxCount()!=0) { + rongQiMz.getG204().setMz(Math.round(rongQiMz.getG204().getTaskCount() / rongQiMz.getG204().getLxCount() * 100) / 100.0); + rongQiMz.getTotal().setTaskCount(rongQiMz.getTotal().getTaskCount()+rongQiMz.getG201().getMz()); + rongQiMz.getTotal().setLxCount(rongQiMz.getTotal().getLxCount()+1); + } + if (rongQiMz.getG205().getLxCount()!=0) { + rongQiMz.getG205().setMz(Math.round(rongQiMz.getG205().getTaskCount() / rongQiMz.getG205().getLxCount() * 100) / 100.0); + rongQiMz.getTotal().setTaskCount(rongQiMz.getTotal().getTaskCount()+rongQiMz.getG205().getMz()); + rongQiMz.getTotal().setLxCount(rongQiMz.getTotal().getLxCount()+1); + } + if (rongQiMz.getG206().getLxCount()!=0) { + rongQiMz.getG206().setMz(Math.round(rongQiMz.getG206().getTaskCount() / rongQiMz.getG206().getLxCount() * 100) / 100.0); + rongQiMz.getTotal().setTaskCount(rongQiMz.getTotal().getTaskCount()+rongQiMz.getG206().getMz()); + rongQiMz.getTotal().setLxCount(rongQiMz.getTotal().getLxCount()+1); + } + if (rongQiMz.getG207().getLxCount()!=0) { + rongQiMz.getG207().setMz(Math.round(rongQiMz.getG207().getTaskCount() / rongQiMz.getG207().getLxCount() * 100) / 100.0); + rongQiMz.getTotal().setTaskCount(rongQiMz.getTotal().getTaskCount()+rongQiMz.getG207().getMz()); + rongQiMz.getTotal().setLxCount(rongQiMz.getTotal().getLxCount()+1); + } + if (rongQiMz.getG208().getLxCount()!=0) { + rongQiMz.getG208().setMz(Math.round(rongQiMz.getG208().getTaskCount() / rongQiMz.getG208().getLxCount() * 100) / 100.0); + rongQiMz.getTotal().setTaskCount(rongQiMz.getTotal().getTaskCount()+rongQiMz.getG208().getMz()); + rongQiMz.getTotal().setLxCount(rongQiMz.getTotal().getLxCount()+1); + } + if (rongQiMz.getG209().getLxCount()!=0) { + rongQiMz.getG209().setMz(Math.round(rongQiMz.getG209().getTaskCount() / rongQiMz.getG209().getLxCount() * 100) / 100.0); + rongQiMz.getTotal().setTaskCount(rongQiMz.getTotal().getTaskCount()+rongQiMz.getG209().getMz()); + rongQiMz.getTotal().setLxCount(rongQiMz.getTotal().getLxCount()+1); + } + if (rongQiMz.getG210().getLxCount()!=0) { + rongQiMz.getG210().setMz(Math.round(rongQiMz.getG210().getTaskCount() / rongQiMz.getG210().getLxCount() * 100) / 100.0); + rongQiMz.getTotal().setTaskCount(rongQiMz.getTotal().getTaskCount()+rongQiMz.getG210().getMz()); + rongQiMz.getTotal().setLxCount(rongQiMz.getTotal().getLxCount()+1); + } + if (rongQiMz.getG211().getLxCount()!=0) { + rongQiMz.getG211().setMz(Math.round(rongQiMz.getG211().getTaskCount() / rongQiMz.getG211().getLxCount() * 100) / 100.0); + rongQiMz.getTotal().setTaskCount(rongQiMz.getTotal().getTaskCount()+rongQiMz.getG211().getMz()); + rongQiMz.getTotal().setLxCount(rongQiMz.getTotal().getLxCount()+1); + } + if (rongQiMz.getG212().getLxCount()!=0) { + rongQiMz.getG212().setMz(Math.round(rongQiMz.getG212().getTaskCount() / rongQiMz.getG212().getLxCount() * 100) / 100.0); + rongQiMz.getTotal().setTaskCount(rongQiMz.getTotal().getTaskCount()+rongQiMz.getG212().getMz()); + rongQiMz.getTotal().setLxCount(rongQiMz.getTotal().getLxCount()+1); + } + if (rongQiMz.getG213().getLxCount()!=0) { + rongQiMz.getG213().setMz(Math.round(rongQiMz.getG213().getTaskCount() / rongQiMz.getG213().getLxCount() * 100) / 100.0); + rongQiMz.getTotal().setTaskCount(rongQiMz.getTotal().getTaskCount()+rongQiMz.getG213().getMz()); + rongQiMz.getTotal().setLxCount(rongQiMz.getTotal().getLxCount()+1); + } + if (rongQiMz.getG214().getLxCount()!=0) { + rongQiMz.getG214().setMz(Math.round(rongQiMz.getG214().getTaskCount() / rongQiMz.getG214().getLxCount() * 100) / 100.0); + rongQiMz.getTotal().setTaskCount(rongQiMz.getTotal().getTaskCount()+rongQiMz.getG214().getMz()); + rongQiMz.getTotal().setLxCount(rongQiMz.getTotal().getLxCount()+1); + } + if (rongQiMz.getG215().getLxCount()!=0) { + rongQiMz.getG215().setMz(Math.round(rongQiMz.getG215().getTaskCount() / rongQiMz.getG215().getLxCount() * 100) / 100.0); + rongQiMz.getTotal().setTaskCount(rongQiMz.getTotal().getTaskCount()+rongQiMz.getG215().getMz()); + rongQiMz.getTotal().setLxCount(rongQiMz.getTotal().getLxCount()+1); + } + if (rongQiMz.getTotal().getLxCount()!=0) { + rongQiMz.getTotal().setMz(Math.round(rongQiMz.getTotal().getTaskCount() / rongQiMz.getTotal().getLxCount() * 100) / 100.0); + } + } + jsonF.accumulate("rqMzList", rqMzList); + + Result result=Result.result(200,"操作成功",Long.parseLong(counts.get(0).toString()), jsonF); + + return result; + } + + @PostMapping(value = "/download") + public void exportCompany(HttpServletResponse response, @RequestBody String json) throws Exception { + + QueryPageUtil query =new QueryPageUtil(); + JSONObject jsonObject= JSONUtil.parseObj(json); + query.setPageSize((int)jsonObject.get("pageSize")); + query.setPageNum((int)jsonObject.get("pageNum")); + + JSONObject param= (JSONObject)jsonObject.get("param"); + + Xuliehao j = JSONUtil.toBean(param.toString(), Xuliehao.class); + + + xuliehaoqingdan.download( (List>)xuliehaoqingdan.QueryJson(query,j).getData(), response); + } + +} +@Data +@Entity +class RongQi implements Serializable{ + @Id + private Long id; + /* 容器号*/ + private String rqh; + private int g201=0; + private int g202=0; + private int g203=0; + private int g204=0; + private int g205=0; + private int g206=0; + private int g207=0; + private int g208=0; + private int g209=0; + private int g210=0; + private int g211=0; + private int g212=0; + private int g213=0; + private int g214=0; + private int g215=0; +} +@Data +@Entity +class RongQiLt implements Serializable{ + @Id + private Long id; + /* 容器号*/ + private String workstation; + private int g201=0; + private int g202=0; + private int g203=0; + private int g204=0; + private int g205=0; + private int g206=0; + private int g207=0; + private int g208=0; + private int g209=0; + private int g210=0; + private int g211=0; + private int g212=0; + private int g213=0; + private int g214=0; + private int g215=0; + private int total=0; +} + +@Data +@Entity +class RongQiMz implements Serializable { + @Id + private Long id; + /* 容器号*/ + private String workstation; + private RQMzModel g201=new RQMzModel(); + private RQMzModel g202=new RQMzModel(); + private RQMzModel g203=new RQMzModel(); + private RQMzModel g204=new RQMzModel(); + private RQMzModel g205=new RQMzModel(); + private RQMzModel g206=new RQMzModel(); + private RQMzModel g207=new RQMzModel(); + private RQMzModel g208=new RQMzModel(); + private RQMzModel g209=new RQMzModel(); + private RQMzModel g210=new RQMzModel(); + private RQMzModel g211=new RQMzModel(); + private RQMzModel g212=new RQMzModel(); + private RQMzModel g213=new RQMzModel(); + private RQMzModel g214=new RQMzModel(); + private RQMzModel g215=new RQMzModel(); + private RQMzModel total=new RQMzModel(); +} + +@Data +class RQMzModel implements Serializable { + @Id + private Long id; + /*任务行*/ + private double taskCount=0; + /*料箱数*/ + private double lxCount=0; + /*命中率*/ + private double mz=0; +} \ No newline at end of file diff --git a/wms/src/main/java/com/yc/wms/controller/UserController.java b/wms/src/main/java/com/yc/wms/controller/UserController.java index 8a3d660..29bf31c 100644 --- a/wms/src/main/java/com/yc/wms/controller/UserController.java +++ b/wms/src/main/java/com/yc/wms/controller/UserController.java @@ -34,7 +34,7 @@ public class UserController { public Result login(@RequestBody String user) { JSONArray array=new JSONArray(); JSONObject data=new JSONObject(); - int menuCount=12; + int menuCount=13; for (int i=1;i<=menuCount;i++){ JSONObject menu=new JSONObject(); menu.put("id",i); @@ -87,6 +87,10 @@ public class UserController { menu.put("menuName", "人效管理"); menu.put("menuComponent","/RenXiao"); menu.put("menuClick","RenXiao"); + }else if(i==13) { + menu.put("menuName", "容器流通"); + menu.put("menuComponent","/RongQi"); + menu.put("menuClick","RongQi"); } menu.put("menuLevel",i); menu.put("menuParentCode",i); diff --git a/wms/src/main/resources/application.yml b/wms/src/main/resources/application.yml index 29dc3f6..2784178 100644 --- a/wms/src/main/resources/application.yml +++ b/wms/src/main/resources/application.yml @@ -13,7 +13,7 @@ server: spring: datasource: # url: jdbc:sqlserver://10.1.96.105:1433;DatabaseName=LD_WMSDB - url: jdbc:sqlserver://47.103.100.52:1433;DatabaseName=zwtest + url: jdbc:sqlserver://47.103.100.52:1433;DatabaseName=zwlgtest driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver # username: wmsdb # password: AmecDDbb32A