From 4bb01d4a9ca42a715c62dd3b89be88506ee9209a Mon Sep 17 00:00:00 2001 From: liyang <1260016348@qq.com> Date: Fri, 12 Apr 2024 11:52:09 +0800 Subject: [PATCH] no message --- wms-vue/src/components/duochaxun/dcx.vue | 246 ++++++++++++++++++ wms-vue/src/router/router.js | 10 +- .../main/java/com/yc/wms/bean/Modeldcx.java | 10 + .../wms/controller/KucunrizhiController.java | 3 +- .../com/yc/wms/controller/UserController.java | 6 +- .../com/yc/wms/controller/dcxController.java | 42 +++ .../main/java/com/yc/wms/service/Zwdcx.java | 14 + .../wms/service/impl/JianhuojiemianImpl.java | 2 +- .../java/com/yc/wms/service/impl/dcxImpl.java | 77 ++++++ 9 files changed, 406 insertions(+), 4 deletions(-) create mode 100644 wms-vue/src/components/duochaxun/dcx.vue create mode 100644 wms/src/main/java/com/yc/wms/bean/Modeldcx.java create mode 100644 wms/src/main/java/com/yc/wms/controller/dcxController.java create mode 100644 wms/src/main/java/com/yc/wms/service/Zwdcx.java create mode 100644 wms/src/main/java/com/yc/wms/service/impl/dcxImpl.java diff --git a/wms-vue/src/components/duochaxun/dcx.vue b/wms-vue/src/components/duochaxun/dcx.vue new file mode 100644 index 0000000..794049f --- /dev/null +++ b/wms-vue/src/components/duochaxun/dcx.vue @@ -0,0 +1,246 @@ + + + + + diff --git a/wms-vue/src/router/router.js b/wms-vue/src/router/router.js index 8141881..63d552c 100644 --- a/wms-vue/src/router/router.js +++ b/wms-vue/src/router/router.js @@ -22,7 +22,7 @@ const routes=[ meta:{ title:'首页' }, - component: () => import('../components/duochaxun/Kucunrizhi') + component: () => import('../components/duochaxun/dcx') }, { path:'/Zhengliqingdan', @@ -64,6 +64,14 @@ const routes=[ }, component: () => import('@/components/duochaxun/Kucunrizhi.vue') }, + { + path:'/dcx', + name:'dcx', + meta:{ + title:'多查询' + }, + component: () => import('@/components/duochaxun/dcx.vue') + }, ] } diff --git a/wms/src/main/java/com/yc/wms/bean/Modeldcx.java b/wms/src/main/java/com/yc/wms/bean/Modeldcx.java new file mode 100644 index 0000000..c57a9e3 --- /dev/null +++ b/wms/src/main/java/com/yc/wms/bean/Modeldcx.java @@ -0,0 +1,10 @@ +package com.yc.wms.bean; + +public class Modeldcx { + //类型 + public String[] ct_code; + + //是否 + public String agvFlag; + +} diff --git a/wms/src/main/java/com/yc/wms/controller/KucunrizhiController.java b/wms/src/main/java/com/yc/wms/controller/KucunrizhiController.java index 7859245..5263f7c 100644 --- a/wms/src/main/java/com/yc/wms/controller/KucunrizhiController.java +++ b/wms/src/main/java/com/yc/wms/controller/KucunrizhiController.java @@ -36,6 +36,7 @@ public class KucunrizhiController { @PostMapping("/log") public Result Log() { + return kucunrizhi.Log(); } -} \ 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 0b42b39..ac44922 100644 --- a/wms/src/main/java/com/yc/wms/controller/UserController.java +++ b/wms/src/main/java/com/yc/wms/controller/UserController.java @@ -48,7 +48,7 @@ public class UserController { // return result; JSONArray array=new JSONArray(); JSONObject data=new JSONObject(); - int menuCount=5; + int menuCount=6; for (int i=1;i<=menuCount;i++){ JSONObject menu=new JSONObject(); menu.put("id",i); @@ -73,6 +73,10 @@ public class UserController { menu.put("menuName", "库存操作日志"); menu.put("menuComponent","/Kucunrizhi"); menu.put("menuClick","Kucunrizhi"); + }else if(i==6) { + menu.put("menuName", "666"); + menu.put("menuComponent","/dcx"); + menu.put("menuClick","dcx"); } menu.put("menuLevel",i); menu.put("menuParentCode",i); diff --git a/wms/src/main/java/com/yc/wms/controller/dcxController.java b/wms/src/main/java/com/yc/wms/controller/dcxController.java new file mode 100644 index 0000000..2e3919e --- /dev/null +++ b/wms/src/main/java/com/yc/wms/controller/dcxController.java @@ -0,0 +1,42 @@ +package com.yc.wms.controller; + + +import cn.hutool.json.JSONObject; +import cn.hutool.json.JSONUtil; +import com.yc.wms.bean.Modeldcx; +import com.yc.wms.service.Zwdcx; +import com.yc.wms.until.QueryPageUtil; +import com.yc.wms.until.Result; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +@RestController +@Slf4j +@RequestMapping("/dcx") +public class dcxController { + @Autowired + private Zwdcx dcx; + + + @PostMapping("/querydcx") + public Result queryUser(@RequestBody String json) { + + 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"); + + Modeldcx d = JSONUtil.toBean(param.toString(), Modeldcx.class); + + return dcx.QueryJson(query,d); + } + + @PostMapping ("/type") + public Result Type() { + return dcx.Type(); + } + +} diff --git a/wms/src/main/java/com/yc/wms/service/Zwdcx.java b/wms/src/main/java/com/yc/wms/service/Zwdcx.java new file mode 100644 index 0000000..92f38d5 --- /dev/null +++ b/wms/src/main/java/com/yc/wms/service/Zwdcx.java @@ -0,0 +1,14 @@ +package com.yc.wms.service; + +import com.yc.wms.bean.Modeldcx; +import com.yc.wms.until.QueryPageUtil; +import com.yc.wms.until.Result; + +public interface Zwdcx { + + // 条件查询加分页 + Result QueryJson(QueryPageUtil query, Modeldcx dcx); + + //下拉 + Result Type(); +} diff --git a/wms/src/main/java/com/yc/wms/service/impl/JianhuojiemianImpl.java b/wms/src/main/java/com/yc/wms/service/impl/JianhuojiemianImpl.java index b25082f..777d7f5 100644 --- a/wms/src/main/java/com/yc/wms/service/impl/JianhuojiemianImpl.java +++ b/wms/src/main/java/com/yc/wms/service/impl/JianhuojiemianImpl.java @@ -52,7 +52,7 @@ public class JianhuojiemianImpl implements Jianhuojiemian { " left join WORKER w1 on w1.id=t.WORKER1_ID\n" + " left join WORKER w4 on w4.id=t.WORKER4_ID\n" + " left join stock st on st.id=t.DST_LP\n" + - "where 1=1"; + "where 1=1 and t.TYPE='MV_PICKTICKET' and t.PLAN_QUANTITY>0"; //子任务号 if(jianhuojiemian.BILLCODE!=null){ diff --git a/wms/src/main/java/com/yc/wms/service/impl/dcxImpl.java b/wms/src/main/java/com/yc/wms/service/impl/dcxImpl.java new file mode 100644 index 0000000..27da74a --- /dev/null +++ b/wms/src/main/java/com/yc/wms/service/impl/dcxImpl.java @@ -0,0 +1,77 @@ +package com.yc.wms.service.impl; + +import com.yc.wms.bean.Modeldcx; +import com.yc.wms.service.Zwdcx; +import com.yc.wms.until.QueryPageUtil; +import com.yc.wms.until.Result; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; +import org.springframework.stereotype.Service; + +import java.text.SimpleDateFormat; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + + +@Slf4j +@Service +public class dcxImpl implements Zwdcx { + + @Autowired + private NamedParameterJdbcTemplate jdbcTemplate; + + @Override + public Result QueryJson(QueryPageUtil query, Modeldcx dcx) { + + int pageNum = query.getPageNum();//当前页 + int pageSize = query.getPageSize();//条数 + + 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%'"; + + + //类型 + if(dcx.ct_code!=null&& dcx.ct_code.length>0){ + StringBuffer sb = new StringBuffer(); + for (int i = 0; i< dcx.ct_code.length; i++){ + if(dcx.ct_code.length-1==i){ + sb.append("'"+ dcx.ct_code[i]+"'"); + }else { + sb.append("'"+ dcx.ct_code[i]+"'"+","); + } + } + sql+=" and ct.code in ("+sb.toString()+")";; + } + + //是否 + if(dcx.agvFlag!=null&& !dcx.agvFlag.equals("")){ + sql+=" and s.agvFlag ="+"'"+dcx.agvFlag+"'"; + } + + 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; + //查询单数据 + Map listCount = jdbcTemplate.queryForMap(sqlCount, new HashMap<>()); + //查询多条数据据 + List> maps = jdbcTemplate.queryForList(sqlFy, new HashMap<>()); + + return Result.success(Long.parseLong(listCount.get("nums").toString()),maps); + } + + + @Override + public Result Type() { + String sql="select distinct code from containerType"; + List> list=jdbcTemplate.queryForList(sql,new HashMap<>()); + return Result.success(list); + } +}