From 7a19e61f8ed30b431d39669e9136765113451b2e Mon Sep 17 00:00:00 2001 From: liyang <1260016348@qq.com> Date: Mon, 15 Apr 2024 14:28:16 +0800 Subject: [PATCH] no message --- wms-vue/src/components/Aside.vue | 2 +- wms-vue/src/components/Login.vue | 2 +- .../components/duochaxun/Jianhuojiemian.vue | 6 +- .../src/components/duochaxun/Kucunhuizong.vue | 200 +++++++++--------- .../src/components/duochaxun/Kucunrizhi.vue | 11 +- .../duochaxun/Liaoxiangjiankong.vue | 144 +++++++------ .../src/components/duochaxun/Rukuzhengli.vue | 20 +- .../components/duochaxun/Zhengliqingdan.vue | 36 +++- .../service/impl/LiaoxiangjiankongImpl.java | 29 ++- 9 files changed, 255 insertions(+), 195 deletions(-) diff --git a/wms-vue/src/components/Aside.vue b/wms-vue/src/components/Aside.vue index c6656e7..24bd79f 100644 --- a/wms-vue/src/components/Aside.vue +++ b/wms-vue/src/components/Aside.vue @@ -44,7 +44,7 @@ export default { if (res.code == 200) { //存储 sessionStorage.setItem("user", JSON.stringify(res.data.user)) - console.log(res.data.menu) + // console.log(res.data.menu) this.$store.commit("setMenu",res.data.menu) //跳转页面 this.$router.push('/index') diff --git a/wms-vue/src/components/Login.vue b/wms-vue/src/components/Login.vue index e411323..983fd6d 100644 --- a/wms-vue/src/components/Login.vue +++ b/wms-vue/src/components/Login.vue @@ -51,7 +51,7 @@ export default { if (res.code == 200) { //存储 sessionStorage.setItem("user", JSON.stringify(res.data.user)) - console.log(res.data.menu) + //console.log(res.data.menu) this.$store.commit("setMenu",res.data.menu) //跳转页面 this.$router.push('/index') diff --git a/wms-vue/src/components/duochaxun/Jianhuojiemian.vue b/wms-vue/src/components/duochaxun/Jianhuojiemian.vue index 8f3ba1e..ed6ed62 100644 --- a/wms-vue/src/components/duochaxun/Jianhuojiemian.vue +++ b/wms-vue/src/components/duochaxun/Jianhuojiemian.vue @@ -271,7 +271,7 @@ + width="60"> - - - + + + + + + + + + @@ -392,15 +392,15 @@ - - - + + + + + + + + + @@ -419,15 +419,15 @@ - - - + + + + + + + + + @@ -453,15 +453,16 @@ {{ scope.row.SHIP_RULES }} - - - + + + + + + + + + + @@ -507,24 +508,24 @@ - - - - - - + + + + + + + + + + + + + + + + + + @@ -534,15 +535,15 @@ - - - + + + + + + + + + @@ -568,15 +569,16 @@ {{ new Date(scope.row.storageDate).toISOString().replace('T','').substring(0,10)}} - - - + + + + + + + + + + diff --git a/wms-vue/src/components/duochaxun/Kucunrizhi.vue b/wms-vue/src/components/duochaxun/Kucunrizhi.vue index fcbe98f..9fa7ab6 100644 --- a/wms-vue/src/components/duochaxun/Kucunrizhi.vue +++ b/wms-vue/src/components/duochaxun/Kucunrizhi.vue @@ -234,13 +234,22 @@ + width="100"> + + + - - - - - - - - + + + + + + + + + + + + + @@ -55,8 +55,7 @@ + width="80"> - - - + + + + + + + + + @@ -382,7 +382,7 @@ width="80"> diff --git a/wms-vue/src/components/duochaxun/Zhengliqingdan.vue b/wms-vue/src/components/duochaxun/Zhengliqingdan.vue index cdb87e4..c6fbb85 100644 --- a/wms-vue/src/components/duochaxun/Zhengliqingdan.vue +++ b/wms-vue/src/components/duochaxun/Zhengliqingdan.vue @@ -320,6 +320,15 @@ + + + @@ -329,6 +338,15 @@ + + + @@ -392,15 +410,15 @@ - - - + + + + + + + + + diff --git a/wms/src/main/java/com/yc/wms/service/impl/LiaoxiangjiankongImpl.java b/wms/src/main/java/com/yc/wms/service/impl/LiaoxiangjiankongImpl.java index 309973f..f6917b8 100644 --- a/wms/src/main/java/com/yc/wms/service/impl/LiaoxiangjiankongImpl.java +++ b/wms/src/main/java/com/yc/wms/service/impl/LiaoxiangjiankongImpl.java @@ -29,10 +29,19 @@ public class LiaoxiangjiankongImpl implements com.yc.wms.service.Liaoxiangjianko SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - String sql="select Row_number() OVER(ORDER BY ct.code) as Row_Num,ct.code,s.STATUS,s.agvFlag,count(s.LP) shu\n" + - "from stock s\n" + - "left join containerType ct on ct.id= s.containerType\n" + - "where 1=1 and s.LP like 'X%'"; + String sql="SELECT\n" + + " ct.code,\n" + + " SUM(CASE WHEN s.STATUS = 'OCCUPY' OR s.STATUS = 'FREE' THEN 1 ELSE 0 END) AS zs,\n" + + "\t\tSUM(CASE WHEN s.STATUS = 'OCCUPY' AND s.agvFlag = 0 THEN 1 ELSE 0 END) AS mbzk,\n" + + " SUM(CASE WHEN s.STATUS = 'OCCUPY' AND s.agvFlag = 1 THEN 1 ELSE 0 END) AS mzk,\n" + + "\t\tSUM(CASE WHEN s.STATUS = 'FREE' AND s.agvFlag = 0 THEN 1 ELSE 0 END) AS kbzk,\n" + + " SUM(CASE WHEN s.STATUS = 'FREE' AND s.agvFlag = 1 THEN 1 ELSE 0 END) AS kzk\n" + + "FROM\n" + + " stock s\n" + + "LEFT JOIN containerType ct ON ct.id = s.containerType\n" + + "WHERE\n" + + " s.LP LIKE 'X%'\n" + + " AND ct.code != 'XN'"; //类型 @@ -67,16 +76,16 @@ public class LiaoxiangjiankongImpl implements com.yc.wms.service.Liaoxiangjianko } - String sqlCount = "select count(t.code) as nums from(" + sql+"\n GROUP BY ct.code,s.STATUS,s.agvFlag \n"+ - ") t"; - String sqlFy = "select t.* from(" + sql+"GROUP BY ct.code,s.STATUS,s.agvFlag \n" + - ") t"; - sqlFy+= " WHERE Row_Num BETWEEN " + (pageNum-1) * pageSize + " AND " + (pageNum) * pageSize; + String sqlCount = "select count(t.code) as nums from (" + sql+"\n GROUP BY ct.code\n" + ") t"; + String sqlFy = sql+"GROUP BY ct.code\n " + + "ORDER BY ct.code"; + + sqlFy+= " OFFSET "+(pageNum-1) * pageSize+ " ROWS FETCH NEXT "+(pageNum) * pageSize +" ROWS ONLY"; + //查询单数据 Map listCount = jdbcTemplate.queryForMap(sqlCount, new HashMap<>()); //查询多条数据据 List> maps = jdbcTemplate.queryForList(sqlFy, new HashMap<>()); - return Result.success(Long.parseLong(listCount.get("nums").toString()),maps); }