From 1b90edfc1ab1d666870ed66c72eb4bea4f2477d3 Mon Sep 17 00:00:00 2001 From: "WINDOWS-DN6K5JD\\EDY" <1260016348@qq.com> Date: Tue, 2 Apr 2024 09:34:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=95=B4=E7=90=86=E5=A4=9A?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wms-vue/src/components/Home.vue | 4 +- .../src/components/duochaxun/Rukuzhengli.vue | 569 +++++++++++++++++- wms-vue/src/router/router.js | 19 +- .../java/com/yc/wms/bean/Rukuzhengli.java | 7 +- .../java/com/yc/wms/bean/Zhengliqingdan.java | 5 +- .../wms/controller/RukuzhengliController.java | 55 +- .../com/yc/wms/controller/UserController.java | 65 +- .../controller/ZhengliqingdanController.java | 22 +- .../java/com/yc/wms/service/Rukuzhengli.java | 5 + .../com/yc/wms/service/Zhengliqingdan.java | 5 +- .../yc/wms/service/impl/RukuzhengliImpl.java | 148 ++++- .../wms/service/impl/ZhengliqingdanImpl.java | 31 +- wms/src/main/resources/application.yml | 2 +- 13 files changed, 846 insertions(+), 91 deletions(-) diff --git a/wms-vue/src/components/Home.vue b/wms-vue/src/components/Home.vue index 98894c2..09cde37 100644 --- a/wms-vue/src/components/Home.vue +++ b/wms-vue/src/components/Home.vue @@ -45,7 +45,7 @@ - - diff --git a/wms-vue/src/router/router.js b/wms-vue/src/router/router.js index 2ea8003..1d1a656 100644 --- a/wms-vue/src/router/router.js +++ b/wms-vue/src/router/router.js @@ -17,24 +17,25 @@ const routes=[ meta:{ title:'首页' }, - component: () => import('../components/duochaxun/demo1.vue') + component: () => import('../components/duochaxun/Rukuzhengli.vue') }, { - path:'/demo1', - name:'demo1', + path:'/Zhengliqingdan', + name:'Zhengliqingdan', meta:{ - title:'测试1' + title:'整理完成未上架清单' }, - component: () => import('@/components/duochaxun/demo1.vue') + component: () => import('@/components/duochaxun/Zhengliqingdan.vue') }, { - path:'/demo2', - name:'demo2', + path:'/Rukuzhengli', + name:'Rukuzhengli', meta:{ - title:'测试2' + title:'整理完成未上架清单' }, - component: () => import('@/components/duochaxun/demo2.vue') + component: () => import('@/components/duochaxun/Rukuzhengli.vue') } + ] } ] diff --git a/wms/src/main/java/com/yc/wms/bean/Rukuzhengli.java b/wms/src/main/java/com/yc/wms/bean/Rukuzhengli.java index bf4b11b..b20fe2b 100644 --- a/wms/src/main/java/com/yc/wms/bean/Rukuzhengli.java +++ b/wms/src/main/java/com/yc/wms/bean/Rukuzhengli.java @@ -2,7 +2,7 @@ package com.yc.wms.bean; import java.util.Date; -public class DcxBean1 { +public class Rukuzhengli { //工厂 public String [] PROP_C9; @@ -34,9 +34,4 @@ public class DcxBean1 { //加急标记 public String strBill11; - - - - - } diff --git a/wms/src/main/java/com/yc/wms/bean/Zhengliqingdan.java b/wms/src/main/java/com/yc/wms/bean/Zhengliqingdan.java index 0fc864c..4e63704 100644 --- a/wms/src/main/java/com/yc/wms/bean/Zhengliqingdan.java +++ b/wms/src/main/java/com/yc/wms/bean/Zhengliqingdan.java @@ -1,2 +1,5 @@ -package com.yc.wms.bean;public class Zhengliqingdan { +package com.yc.wms.bean; + +public class Zhengliqingdan { + } diff --git a/wms/src/main/java/com/yc/wms/controller/RukuzhengliController.java b/wms/src/main/java/com/yc/wms/controller/RukuzhengliController.java index 0c15b48..ef544cf 100644 --- a/wms/src/main/java/com/yc/wms/controller/RukuzhengliController.java +++ b/wms/src/main/java/com/yc/wms/controller/RukuzhengliController.java @@ -1,2 +1,55 @@ -package com.yc.wms.controller;public class RukuzhengliController { +package com.yc.wms.controller; + +import cn.hutool.json.JSONObject; +import cn.hutool.json.JSONUtil; +import com.yc.wms.bean.Rukuzhengli; +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.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@Slf4j +@RequestMapping("/Rukuzhengli") +public class RukuzhengliController { + + @Autowired + private com.yc.wms.service.Rukuzhengli dcxService; + + + /** + * @return + * @param查询用户 + */ + @PostMapping("/queryUser") + 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"); + + Rukuzhengli rukuzhengli = JSONUtil.toBean(param.toString(), Rukuzhengli.class); + + return dcxService.readJson(query, rukuzhengli); + } + + //下拉列表工厂 + @PostMapping("/Plant") + public Result Plant(){ + return dcxService.Plant(); + } + + //下拉列表LOC + @PostMapping("/LOC") + public Result LOC(){ + return dcxService.LOC(); + } + } 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 feab04f..2dc6194 100644 --- a/wms/src/main/java/com/yc/wms/controller/UserController.java +++ b/wms/src/main/java/com/yc/wms/controller/UserController.java @@ -1,9 +1,6 @@ package com.yc.wms.controller; -import cn.hutool.json.JSONUtil; -import com.yc.wms.bean.DcxBean1; -import com.yc.wms.service.DcxService; -import com.yc.wms.until.QueryPageUtil; +import com.yc.wms.service.Zhengliqingdan; import com.yc.wms.until.Result; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -13,9 +10,6 @@ import org.springframework.web.bind.annotation.*; import cn.hutool.json.JSONArray; import cn.hutool.json.JSONObject; -import java.util.Arrays; -import java.util.List; - /** *

* 前端控制器 @@ -29,11 +23,8 @@ import java.util.List; @RequestMapping("/user") public class UserController { - - @Autowired - private DcxService dcxService; - + private Zhengliqingdan zhengliqingdan; /** * @return @@ -57,23 +48,19 @@ public class UserController { // return result; JSONArray array=new JSONArray(); JSONObject data=new JSONObject(); - int menuCount=3; + int menuCount=2; for (int i=1;i<=menuCount;i++){ JSONObject menu=new JSONObject(); menu.put("id",i); menu.put("menuCode",i); if(i==1) { - menu.put("menuName", "库存汇总查询"); - menu.put("menuComponent","/demo1"); - menu.put("menuClick","demo1"); + menu.put("menuName", "整理完成未上架清单"); + menu.put("menuComponent","/Zhengliqingdan"); + menu.put("menuClick","Zhengliqingdan"); }else if(i==2) { - menu.put("menuName", "入库明细查询"); - menu.put("menuComponent","/demo2"); - menu.put("menuClick","demo2"); - }else if(i==3) { - menu.put("menuName", "出库明细查询"); - menu.put("menuComponent","/demo2"); - menu.put("menuClick","demo2"); + menu.put("menuName", "入库整理"); + menu.put("menuComponent","/Rukuzhengli"); + menu.put("menuClick","Rukuzhengli"); } menu.put("menuLevel",i); menu.put("menuParentCode",i); @@ -98,38 +85,4 @@ public class UserController { return Result.success(menuCount,data); } - /** - * @return - * @param查询用户 - */ - @PostMapping("/queryUser") - public Result queryUser(@RequestBody String json) { - - QueryPageUtil query =new QueryPageUtil(); - - System.out.println(json); - - JSONObject jsonObject=JSONUtil.parseObj(json); - query.setPageSize((int)jsonObject.get("pageSize")); - query.setPageNum((int)jsonObject.get("pageNum")); - - JSONObject param= (JSONObject)jsonObject.get("param"); - DcxBean1 dcxBean1 = JSONUtil.toBean(param.toString(), DcxBean1.class); - - - for (String s:dcxBean1.PROP_C9) { - System.out.println("c9:"+s); - } - - - - return dcxService.readJson(query,dcxBean1); - } - - - - - - - } diff --git a/wms/src/main/java/com/yc/wms/controller/ZhengliqingdanController.java b/wms/src/main/java/com/yc/wms/controller/ZhengliqingdanController.java index b9b4a42..639792d 100644 --- a/wms/src/main/java/com/yc/wms/controller/ZhengliqingdanController.java +++ b/wms/src/main/java/com/yc/wms/controller/ZhengliqingdanController.java @@ -1,2 +1,22 @@ -package com.yc.wms.controller;public class ZhengliqingdanController { +package com.yc.wms.controller; + +import cn.hutool.json.JSONObject; +import cn.hutool.json.JSONUtil; +import com.yc.wms.bean.Rukuzhengli; +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.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@Slf4j +@RequestMapping("/ZhengliqingdanController") +public class ZhengliqingdanController { + + + } diff --git a/wms/src/main/java/com/yc/wms/service/Rukuzhengli.java b/wms/src/main/java/com/yc/wms/service/Rukuzhengli.java index 840b0f6..d5aaed4 100644 --- a/wms/src/main/java/com/yc/wms/service/Rukuzhengli.java +++ b/wms/src/main/java/com/yc/wms/service/Rukuzhengli.java @@ -1,5 +1,6 @@ package com.yc.wms.service; +import com.yc.wms.until.QueryPageUtil; import com.yc.wms.until.Result; /** @@ -11,6 +12,10 @@ import com.yc.wms.until.Result; * @since 2023-04-01 */ public interface Rukuzhengli { + + //查询全部分页待条件 + Result readJson(QueryPageUtil query, com.yc.wms.bean.Rukuzhengli rukuzhengli); + //查询下拉列表工厂 Result Plant(); diff --git a/wms/src/main/java/com/yc/wms/service/Zhengliqingdan.java b/wms/src/main/java/com/yc/wms/service/Zhengliqingdan.java index 0d7b81e..f8f4230 100644 --- a/wms/src/main/java/com/yc/wms/service/Zhengliqingdan.java +++ b/wms/src/main/java/com/yc/wms/service/Zhengliqingdan.java @@ -1,7 +1,6 @@ package com.yc.wms.service; -import com.yc.wms.bean.Rukuzhengli; import com.yc.wms.until.QueryPageUtil; import com.yc.wms.until.Result; @@ -13,7 +12,7 @@ import com.yc.wms.until.Result; * @author wms * @since 2023-03-04 */ -public interface DcxService { - +public interface Zhengliqingdan { + Result QueryJson(QueryPageUtil query, com.yc.wms.bean.Zhengliqingdan zlqd); } diff --git a/wms/src/main/java/com/yc/wms/service/impl/RukuzhengliImpl.java b/wms/src/main/java/com/yc/wms/service/impl/RukuzhengliImpl.java index 6a7be4d..6428f2c 100644 --- a/wms/src/main/java/com/yc/wms/service/impl/RukuzhengliImpl.java +++ b/wms/src/main/java/com/yc/wms/service/impl/RukuzhengliImpl.java @@ -1,2 +1,148 @@ -package com.yc.wms.service.impl;public class RukuzhengliImpl { +package com.yc.wms.service.impl; + +import com.yc.wms.bean.Rukuzhengli; +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; + +@Service +@Slf4j +public class RukuzhengliImpl implements com.yc.wms.service.Rukuzhengli { + + @Autowired + private NamedParameterJdbcTemplate jdbcTemplate; + + public Result readJson(QueryPageUtil query, Rukuzhengli rukuzhengli) { + + + int pageNum = query.getPageNum();//当前页 + int pageSize = query.getPageSize();//条数 + + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + + String sql_bz = "SELECT ROW_NUMBER() OVER(ORDER BY ad.id) AS Row_Num,ad.id,ad.sourceId,ad.strBill7,\n" + + " ad.strBill8,i.code,i.name,i.unit,\n" + + " ad.strBill11,ad.PROP_C1,ad.PROP_C2,\n" + + "ad.PROP_C3,ad.PROP_C5,ad.PROP_C8,ad.PROP_C9,\n" + + "ad.EXPECTED_QUANTITY,ad.RECEIVED_QUANTITY,\n" + + "a.ORDER_DATE,ad.strBill2,ad.RECEIVE_DATE,\n" + + "a.USER_NAME,ad.DELIVERY_DATE,ad.RELATED_BILL5,\n" + + "ad.description,ad.BE_QUALITY,a.CODE a_CODE,\n" + + "ad.BE_INPUT\n" + + " from ASN_DETAIL ad \n" + + " left join asn a on a.id=ad.ASN_ID\n" + + " left join ITEM i on i.id=ad.ITEM_ID\n" + + " where 1=1"; + + + //查询条件 + //采购订单 + if(rukuzhengli.sourceId!=null&&!rukuzhengli.sourceId.equals("")){ + sql_bz+=" and ad.sourceId ="+"'"+ rukuzhengli.sourceId+"'"; + } + //收货凭证 + if(rukuzhengli.strBill7!=null&&!rukuzhengli.strBill7.equals("")){ + sql_bz+=" and ad.strBill7 ="+"'"+ rukuzhengli.strBill7+"'"; + } + //料号 + if(rukuzhengli.code!=null&&!rukuzhengli.code.equals("")){ + sql_bz+=" and i.code ="+"'"+ rukuzhengli.code+"'"; + } + //收货日期 + if(rukuzhengli.ORDER_DATE!=null&& rukuzhengli.ORDER_DATE.length>0){ + String startDate = simpleDateFormat.format(rukuzhengli.ORDER_DATE[0]); + String endDate = simpleDateFormat.format(rukuzhengli.ORDER_DATE[1]); + sql_bz+=" and a.ORDER_DATE between "+"'"+startDate+"'"+" and "+ "'"+endDate+"'"; + } + + //整理日期 + if(rukuzhengli.RECEIVE_DATE!=null&& rukuzhengli.RECEIVE_DATE.length>0){ + String startDate = simpleDateFormat.format(rukuzhengli.RECEIVE_DATE[0]); + String endDate = simpleDateFormat.format(rukuzhengli.RECEIVE_DATE[1]); + sql_bz+=" and ad.RECEIVE_DATE between "+"'"+startDate+"'"+" and "+ "'"+endDate+"'"; + + } + //特殊标记 + if(rukuzhengli.PROP_C3!=null&&!rukuzhengli.PROP_C3.equals("")){ + sql_bz+=" and ad.PROP_C3 ="+"'"+ rukuzhengli.PROP_C3+"'"; + } + + //工厂 + if(rukuzhengli.PROP_C9!=null&& rukuzhengli.PROP_C9.length>0){ + StringBuffer sb = new StringBuffer(); + for (int i = 0; i< rukuzhengli.PROP_C9.length; i++){ + if(rukuzhengli.PROP_C9.length-1==i){ + sb.append("'"+ rukuzhengli.PROP_C9[i]+"'"); + }else { + sb.append("'"+ rukuzhengli.PROP_C9[i]+"'"+","); + } + } + sql_bz+=" and ad.PROP_C9 in ("+sb.toString()+")"; + } + //LOC + if(rukuzhengli.PROP_C2!=null&& rukuzhengli.PROP_C2.length>0){ + StringBuffer sb = new StringBuffer(); + for (int i = 0; i< rukuzhengli.PROP_C2.length; i++){ + if(rukuzhengli.PROP_C2.length-1==i){ + sb.append("'"+ rukuzhengli.PROP_C2[i]+"'"); + }else { + sb.append("'"+ rukuzhengli.PROP_C2[i]+"'"+","); + } + } + sql_bz+=" and ad.PROP_C2 in ("+sb.toString()+")";; + } + + + //SAP接口 + if(rukuzhengli.CODE!=null&&!rukuzhengli.CODE.equals("")){ + + sql_bz+=" and a.CODE ="+"'"+ rukuzhengli.CODE+"'"; + } + + //加急标记 + if(rukuzhengli.strBill11!=null&&!rukuzhengli.strBill11.equals("")){ + + sql_bz+=" and ad.strBill11 ="+"'"+ rukuzhengli.strBill11+"'"; + } + + String sqlCount = "select count(t.id) as nums from(" + sql_bz+") t"; + String sqlFy = "select t.* from(" + sql_bz+") t"; + +// System.out.println(sqlFy); + + 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 Plant(){ + String sql=" select DISTINCT PROP_C9 from ASN_DETAIL where PROP_C9!=''"; + List> list = jdbcTemplate.queryForList(sql,new HashMap<>()); + + return Result.success(list); + } + + @Override + public Result LOC() { + String sql=" \n" + + " select DISTINCT PROP_C2 from ASN_DETAIL where PROP_C2!=''"; + List> list = jdbcTemplate.queryForList(sql,new HashMap<>()); + + return Result.success(list); + } } diff --git a/wms/src/main/java/com/yc/wms/service/impl/ZhengliqingdanImpl.java b/wms/src/main/java/com/yc/wms/service/impl/ZhengliqingdanImpl.java index 2ffff20..762c0ea 100644 --- a/wms/src/main/java/com/yc/wms/service/impl/ZhengliqingdanImpl.java +++ b/wms/src/main/java/com/yc/wms/service/impl/ZhengliqingdanImpl.java @@ -1,7 +1,6 @@ package com.yc.wms.service.impl; -import com.yc.wms.bean.Rukuzhengli; -import com.yc.wms.service.DcxService; +import com.yc.wms.service.Zhengliqingdan; import com.yc.wms.until.QueryPageUtil; import com.yc.wms.until.Result; import lombok.extern.slf4j.Slf4j; @@ -16,8 +15,32 @@ import java.util.Map; @Service @Slf4j -public class DcxServiceImpl implements DcxService { +public class ZhengliqingdanImpl implements Zhengliqingdan { - + @Autowired + private NamedParameterJdbcTemplate jdbcTemplate; + + @Override + public Result QueryJson(QueryPageUtil query, com.yc.wms.bean.Zhengliqingdan zlqd) { + + int pageNum = query.getPageNum();//当前页 + int pageSize = query.getPageSize();//条数 + + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + String sql =""; + + String sqlCount = "select count(t.id) as nums from(" + sql+") t"; + String sqlFy = "select t.* from(" + sql+") 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); + + } } diff --git a/wms/src/main/resources/application.yml b/wms/src/main/resources/application.yml index 23de31a..43262ba 100644 --- a/wms/src/main/resources/application.yml +++ b/wms/src/main/resources/application.yml @@ -3,7 +3,7 @@ server: spring: datasource: - url: jdbc:sqlserver://47.100.54.81:1433;DatabaseName=zwtest + url: jdbc:sqlserver://47.100.54.81:1433;DatabaseName=zwwms driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver username: super password: 1K4QfD%ESd1fe@VJ