@@ -384,7 +409,7 @@
@@ -393,11 +418,11 @@
- {{ scope.row.BE_MOVED }}
+ {{ scope.row.BE_MOVED==1?"上架":"未上架" }}
@@ -410,58 +435,25 @@
+
+
+
+ {{ scope.row.a_CODE }}
+
+
+
+
+
+
+ {{ scope.row.lc_CODE }}
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
{
+ this.MaxHeight = window.innerHeight - 300;//300是页面中除了表格外其他组件的高度
+ })
},
methods: {
handleEdit(index, row) {
@@ -616,14 +623,14 @@ export default {
this.pageNum = val;
this.queryUser();
},
- LOC(){
- //LOC下拉列表数据加载
- this.$axios.post(this.$httpUrl + '/user/LOC', {
-
+ Plant(){
+ //下拉数据架子啊
+ this.$axios.post(this.$httpUrl + '/Zhengliqingdan/ZPlant', {
}).then(res => res.data)
.then(res => {
if (res.code == 200) {
- this.LOCS = res.data;
+ console.log(res.data)
+ this.plant = res.data
} else {
this.$message.error('获取数据失败');
}
@@ -632,14 +639,30 @@ export default {
console.log(err);
})
},
- PlantS(){
- //工厂下拉列表数据加载
- this.$axios.post(this.$httpUrl + '/user/Plant', {
-
+ Loc(){
+ //下拉数据架子啊
+ this.$axios.post(this.$httpUrl + '/Zhengliqingdan/ZLOC', {
}).then(res => res.data)
.then(res => {
if (res.code == 200) {
- this.Plant = res.data;
+ console.log(res.data)
+ this.loc = res.data
+ } else {
+ this.$message.error('获取数据失败');
+ }
+ })
+ .catch(function (err) {
+ console.log(err);
+ })
+ },
+ z_Name(){
+ //下拉数据架子啊
+ this.$axios.post(this.$httpUrl + '/Zhengliqingdan/ZZONE', {
+ }).then(res => res.data)
+ .then(res => {
+ if (res.code == 200) {
+ console.log(res.data)
+ this.name = res.data
} else {
this.$message.error('获取数据失败');
}
@@ -650,7 +673,7 @@ export default {
},
queryUser() {
//列表数据加载
- this.$axios.post(this.$httpUrl + '/user/queryUser', {
+ this.$axios.post(this.$httpUrl + '/Zhengliqingdan/queryWhere', {
pageSize: this.pageSize,
pageNum: this.pageNum,
param: this.param,
@@ -662,8 +685,6 @@ export default {
} else {
this.$message.error('获取数据失败');
}
-
-
})
.catch(function (err) {
console.log(err);
@@ -678,8 +699,9 @@ export default {
Allquesr(){
//查询按钮
if(this.checked){
- this.rest();
- this.queryUser();
+ this.isShow=true;
+ }else {
+ this.isShow=false;
}
},
rest() {
diff --git a/wms-vue/src/router/router.js b/wms-vue/src/router/router.js
index 1d1a656..b80d6ea 100644
--- a/wms-vue/src/router/router.js
+++ b/wms-vue/src/router/router.js
@@ -17,7 +17,7 @@ const routes=[
meta:{
title:'首页'
},
- component: () => import('../components/duochaxun/Rukuzhengli.vue')
+ component: () => import('../components/duochaxun/Zhengliqingdan.vue')
},
{
path:'/Zhengliqingdan',
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 4e63704..00a7919 100644
--- a/wms/src/main/java/com/yc/wms/bean/Zhengliqingdan.java
+++ b/wms/src/main/java/com/yc/wms/bean/Zhengliqingdan.java
@@ -1,5 +1,57 @@
package com.yc.wms.bean;
+import java.util.Date;
+
public class Zhengliqingdan {
+ //采购单号
+ public String sourceId;
+
+ //收货凭证号
+ public String strBill7;
+
+ //料号
+ public String i_CODE;
+
+ //物料描述
+ public String i_name;
+
+ //库区
+ public String[] z_name;
+
+ //库位号
+ public String lc_CODE;
+
+ //批次号
+ public String PROP_C1;
+
+ //LOC
+ public String [] PROP_C2;
+
+ //特殊标记
+ public String PROP_C3;
+
+ //工厂
+ public String [] PROP_C9;
+
+ //整理人
+ public String OPERATOR;
+
+ //SPA接口号
+ public String a_CODE;
+
+ //整理日期
+ public Date[] RECEIVE_DATE;
+
+ //收货日期
+ public Date[] ORDER_DATE;
+
+ //备注
+ public String description;
+
+ //容器码
+ public String LP;
+
+
+
}
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 639792d..e2aef36 100644
--- a/wms/src/main/java/com/yc/wms/controller/ZhengliqingdanController.java
+++ b/wms/src/main/java/com/yc/wms/controller/ZhengliqingdanController.java
@@ -2,7 +2,7 @@ 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.bean.Zhengliqingdan;
import com.yc.wms.until.QueryPageUtil;
import com.yc.wms.until.Result;
import lombok.extern.slf4j.Slf4j;
@@ -14,9 +14,45 @@ import org.springframework.web.bind.annotation.RestController;
@RestController
@Slf4j
-@RequestMapping("/ZhengliqingdanController")
+@RequestMapping("/Zhengliqingdan")
public class ZhengliqingdanController {
+ @Autowired
+ private com.yc.wms.service.Zhengliqingdan zhengliqingdan;
+
+ //查询全部条件分页
+ @PostMapping("/queryWhere")
+ 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");
+
+ Zhengliqingdan zhengliqingdan1 = JSONUtil.toBean(param.toString(), Zhengliqingdan.class);
+
+ return zhengliqingdan.QueryJson(query,zhengliqingdan1);
+ }
+ //下拉工厂填充
+ @PostMapping("/ZPlant")
+ public Result Plant() {
+ return zhengliqingdan.Plant();
+ }
+
+ //LOC下拉填充
+ @PostMapping("ZLOC")
+ public Result LOC() {
+ return zhengliqingdan.LOC();
+ }
+
+ //库区填充
+ @PostMapping("ZZONE")
+ public Result ZONE() {
+ return zhengliqingdan.ZONE();
+ }
}
+
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 f8f4230..9a1d512 100644
--- a/wms/src/main/java/com/yc/wms/service/Zhengliqingdan.java
+++ b/wms/src/main/java/com/yc/wms/service/Zhengliqingdan.java
@@ -14,5 +14,15 @@ import com.yc.wms.until.Result;
*/
public interface Zhengliqingdan {
- Result QueryJson(QueryPageUtil query, com.yc.wms.bean.Zhengliqingdan zlqd);
+ // 条件查询加分页
+ Result QueryJson(QueryPageUtil query, com.yc.wms.bean.Zhengliqingdan zhengliqingdan);
+
+ //查询下拉列表工厂
+ Result Plant();
+
+ //查询下拉列表LOC
+ Result LOC();
+
+ //查询下拉列表库区
+ Result ZONE();
}
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 6428f2c..57cf94c 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
@@ -47,16 +47,64 @@ public class RukuzhengliImpl implements com.yc.wms.service.Rukuzhengli {
//查询条件
//采购订单
if(rukuzhengli.sourceId!=null&&!rukuzhengli.sourceId.equals("")){
- sql_bz+=" and ad.sourceId ="+"'"+ rukuzhengli.sourceId+"'";
+ String[] str=rukuzhengli.sourceId.split("\n");
+ StringBuffer sb = new StringBuffer();
+ for (int i=0;i0){
String startDate = simpleDateFormat.format(rukuzhengli.ORDER_DATE[0]);
@@ -101,7 +149,6 @@ public class RukuzhengliImpl implements com.yc.wms.service.Rukuzhengli {
sql_bz+=" and ad.PROP_C2 in ("+sb.toString()+")";;
}
-
//SAP接口
if(rukuzhengli.CODE!=null&&!rukuzhengli.CODE.equals("")){
@@ -117,7 +164,6 @@ public class RukuzhengliImpl implements com.yc.wms.service.Rukuzhengli {
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;
//查询单数据
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 762c0ea..6130be7 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
@@ -22,25 +22,225 @@ public class ZhengliqingdanImpl implements Zhengliqingdan {
@Override
- public Result QueryJson(QueryPageUtil query, com.yc.wms.bean.Zhengliqingdan zlqd) {
+ public Result QueryJson(QueryPageUtil query, com.yc.wms.bean.Zhengliqingdan zhengliqingdan) {
int pageNum = query.getPageNum();//当前页
int pageSize = query.getPageSize();//条数
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- String sql ="";
+ String sql ="select Row_number() OVER(ORDER BY rd.id) as Row_Num,rd.id,ad.sourceId ,ad.strBill7,ad.strBill8,i.CODE i_CODE,i.NAME,i.UNIT,a.ORDER_DATE,rd.RECEIVE_DATE ,\n" +
+ "rd.OPERATOR,w.NAME w_NAME,s.LP,ik.PROP_C1,ik.PROP_C2,\n" +
+ "ik.PROP_C3,ik.PROP_C5,ik.PROP_C8,ik.PROP_C9,\n" +
+ "rd.BAR_CODE,rd.BE_MOVED,ad.description,a.CODE a_CODE,lc.CODE lc_CODE\n" +
+ "\tFROM RECEIVED_RECORD rd \n" +
+ "left join ASN_DETAIL ad on ad.id=rd.ASN_DETAIL_ID\n" +
+ "left join asn a on a.ID=ad.ASN_ID\n" +
+ "left join ITEM_KEY ik on ik.id=rd.ITEM_KEY_ID\n" +
+ "left join ITEM i on i.id=ad.ITEM_ID\n" +
+ "left join stock s on s.id=rd.SRC_LP\n" +
+ "left join WORKER w on w.id=rd.WORKER_ID\n" +
+ "left join [ZONE] z on z.id=rd.WAREHOUSE_AREA_ID\n" +
+ "left join LOCATION lc on lc.id=rd.LOCATION_ID"+
+ " where 1=1";
- String sqlCount = "select count(t.id) as nums from(" + sql+") t";
+ //查询条件
+ //采购单号
+ if(zhengliqingdan.sourceId!=null&&!zhengliqingdan.sourceId.equals("")){
+ sql+=" and ad.sourceId="+"'"+zhengliqingdan.sourceId+"'";
+ }
+ //收货凭证
+ if(zhengliqingdan.strBill7!=null&&!zhengliqingdan.strBill7.equals("")){
+ String[] str=zhengliqingdan.strBill7.split("\n");
+ StringBuffer sb = new StringBuffer();
+ for (int i=0;i0){
+ StringBuffer sb = new StringBuffer();
+ for (int i = 0; i< zhengliqingdan.z_name.length; i++){
+ if(zhengliqingdan.z_name.length-1==i){
+ sb.append("'"+ zhengliqingdan.z_name[i]+"'");
+ }else {
+ sb.append("'"+ zhengliqingdan.z_name[i]+"'"+",");
+ }
+ }
+ sql+=" and z.name in ("+sb.toString()+")";
+ }
+
+ //库位号
+ if(zhengliqingdan.lc_CODE!=null&&!zhengliqingdan.lc_CODE.equals("")){
+ String[] str=zhengliqingdan.lc_CODE.split("\n");
+ StringBuffer sb = new StringBuffer();
+ for (int i=0;i0){
+ StringBuffer sb = new StringBuffer();
+ for (int i = 0; i< zhengliqingdan.PROP_C2.length; i++){
+ if(zhengliqingdan.PROP_C2.length-1==i){
+ sb.append("'"+ zhengliqingdan.PROP_C2[i]+"'");
+ }else {
+ sb.append("'"+ zhengliqingdan.PROP_C2[i]+"'"+",");
+ }
+ }
+ sql+=" and ik.PROP_C2 in ("+sb.toString()+")";;
+ }
+
+ //特殊标记
+ if(zhengliqingdan.PROP_C3!=null&&!zhengliqingdan.PROP_C3.equals("")){
+ sql+=" and ik.PROP_C3="+"'"+zhengliqingdan.PROP_C3+"'";
+ }
+
+ //工厂
+ if(zhengliqingdan.PROP_C9!=null&& zhengliqingdan.PROP_C9.length>0){
+ StringBuffer sb = new StringBuffer();
+ for (int i = 0; i< zhengliqingdan.PROP_C9.length; i++){
+ if(zhengliqingdan.PROP_C9.length-1==i){
+ sb.append("'"+ zhengliqingdan.PROP_C9[i]+"'");
+ }else {
+ sb.append("'"+ zhengliqingdan.PROP_C9[i]+"'"+",");
+ }
+ }
+ sql+=" and ik.PROP_C9 in ("+sb.toString()+")";;
+ }
+
+ //整理人
+ if(zhengliqingdan.OPERATOR!=null&&!zhengliqingdan.OPERATOR.equals("")){
+ String[] str=zhengliqingdan.OPERATOR.split("\n");
+ StringBuffer sb = new StringBuffer();
+ for (int i=0;i0){
+ System.out.println("fghjk");
+ String startDate = simpleDateFormat.format(zhengliqingdan.RECEIVE_DATE[0]);
+ String endDate = simpleDateFormat.format(zhengliqingdan.RECEIVE_DATE[1]);
+ sql+=" and rd.RECEIVE_DATE between "+"'"+startDate+"'"+" and "+ "'"+endDate+"'";
+ }
+
+ //收货日期
+ if(zhengliqingdan.ORDER_DATE!=null&&zhengliqingdan.ORDER_DATE.length>0){
+ String startDate = simpleDateFormat.format(zhengliqingdan.ORDER_DATE[0]);
+ String endDate = simpleDateFormat.format(zhengliqingdan.ORDER_DATE[1]);
+ sql+=" and a.ORDER_DATE between "+"'"+startDate+"'"+" and "+ "'"+endDate+"'";
+ }
+
+ //备注
+ if(zhengliqingdan.description!=null&&!zhengliqingdan.description.equals("")){
+ sql+=" and ad.description like"+"'%"+zhengliqingdan.description+"%'";
+ }
+
+ //容器码
+ if(zhengliqingdan.LP!=null&&!zhengliqingdan.LP.equals("")){
+ String[] str=zhengliqingdan.LP.split("\n");
+ StringBuffer sb = new StringBuffer();
+ for (int i=0;i listCount = jdbcTemplate.queryForMap(sqlCount, new HashMap<>());
//查询多条数据据
List> maps = jdbcTemplate.queryForList(sqlFy, new HashMap<>());
- return Result.success(Long.parseLong(listCount.get("nums").toString()),maps);
+ return Result.success(Long.parseLong(listCount.get("Znum").toString()),maps);
}
+
+ @Override
+ public Result Plant() {
+
+ String sql = "select distinct PROP_C9 from ITEM_KEY where PROP_C9!='' and PROP_C9 is not null;";
+ List> list=jdbcTemplate.queryForList(sql,new HashMap<>());
+ return Result.success(list);
+ }
+
+ @Override
+ public Result LOC() {
+
+ String sql="select distinct PROP_C2 from ITEM_KEY where PROP_C9!='' and PROP_C2 is not null";
+ List> list=jdbcTemplate.queryForList(sql,new HashMap<>());
+ return Result.success(list);
+ }
+
+ @Override
+ public Result ZONE() {
+
+ String sql="select distinct name from [ZONE] where name!='' and name is not null;";
+ List> list =jdbcTemplate.queryForList(sql,new HashMap<>());
+
+ return Result.success(list);
+ }
}
diff --git a/wms/src/main/resources/application.yml b/wms/src/main/resources/application.yml
index 43262ba..23de31a 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=zwwms
+ url: jdbc:sqlserver://47.100.54.81:1433;DatabaseName=zwtest
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
username: super
password: 1K4QfD%ESd1fe@VJ