no message

main
liyang 2024-04-15 14:28:16 +08:00
parent a66675efaf
commit 7a19e61f8e
9 changed files with 255 additions and 195 deletions

View File

@ -44,7 +44,7 @@ export default {
if (res.code == 200) { if (res.code == 200) {
// //
sessionStorage.setItem("user", JSON.stringify(res.data.user)) 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.$store.commit("setMenu",res.data.menu)
// //
this.$router.push('/index') this.$router.push('/index')

View File

@ -51,7 +51,7 @@ export default {
if (res.code == 200) { if (res.code == 200) {
// //
sessionStorage.setItem("user", JSON.stringify(res.data.user)) 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.$store.commit("setMenu",res.data.menu)
// //
this.$router.push('/index') this.$router.push('/index')

View File

@ -271,7 +271,7 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="工作站" label="工作站"
width="50"> width="60">
<template slot-scope="scope"> <template slot-scope="scope">
<div slot="reference" class="name-wrapper"> <div slot="reference" class="name-wrapper">
<span>{{ scope.row.END_REGION }}</span> <span>{{ scope.row.END_REGION }}</span>
@ -452,7 +452,7 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="特殊标记" label="特殊标记"
width="60"> width="80">
<template slot-scope="scope"> <template slot-scope="scope">
<div slot="reference" class="name-wrapper"> <div slot="reference" class="name-wrapper">
<span>{{ scope.row.PROP_C3 }}</span> <span>{{ scope.row.PROP_C3 }}</span>
@ -505,7 +505,7 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="加急标记" label="加急标记"
width="60"> width="80">
<template slot-scope="scope"> <template slot-scope="scope">
<div slot="reference" class="name-wrapper"> <div slot="reference" class="name-wrapper">
<span>{{ scope.row.equated_Quantity }}</span> <span>{{ scope.row.equated_Quantity }}</span>

View File

@ -220,15 +220,15 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <!-- <el-table-column-->
label="序列号" <!-- label="序列号"-->
width="100"> <!-- width="100">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<div slot="reference" class="name-wrapper"> <!-- <div slot="reference" class="name-wrapper">-->
<span>{{ scope.row.barCode }}</span> <!-- <span>{{ scope.row.barCode }}</span>-->
</div> <!-- </div>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column <el-table-column
label="状态" label="状态"
width="80"> width="80">
@ -238,24 +238,24 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <!-- <el-table-column-->
label="库位ID" <!-- label="库位ID"-->
width="100"> <!-- width="100">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<div slot="reference" class="name-wrapper"> <!-- <div slot="reference" class="name-wrapper">-->
<span>{{ scope.row.LOCATION_ID }}</span> <!-- <span>{{ scope.row.LOCATION_ID }}</span>-->
</div> <!-- </div>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column <!-- <el-table-column-->
label="料号属性ID" <!-- label="料号属性ID"-->
width="80"> <!-- width="80">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<div slot="reference" class="name-wrapper"> <!-- <div slot="reference" class="name-wrapper">-->
<span>{{ scope.row.ITEM_KEY_ID }}</span> <!-- <span>{{ scope.row.ITEM_KEY_ID }}</span>-->
</div> <!-- </div>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column <el-table-column
label="库存数量" label="库存数量"
width="100"> width="100">
@ -356,15 +356,15 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <!-- <el-table-column-->
label="入库单号" <!-- label="入库单号"-->
width="160"> <!-- width="160">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<div slot="reference" class="name-wrapper"> <!-- <div slot="reference" class="name-wrapper">-->
<span>{{ scope.row.soi }}</span> <!-- <span>{{ scope.row.soi }}</span>-->
</div> <!-- </div>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column <el-table-column
label="生产日期" label="生产日期"
width="180"> width="180">
@ -392,15 +392,15 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <!-- <el-table-column-->
label="库区ID" <!-- label="库区ID"-->
width="80"> <!-- width="80">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<div slot="reference" class="name-wrapper"> <!-- <div slot="reference" class="name-wrapper">-->
<span>{{ scope.row.ZONE_ID }}</span> <!-- <span>{{ scope.row.ZONE_ID }}</span>-->
</div> <!-- </div>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column <el-table-column
label="是否盘点" label="是否盘点"
width="80"> width="80">
@ -419,15 +419,15 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <!-- <el-table-column-->
label="是否SAP料号" <!-- label="是否SAP料号"-->
width="80"> <!-- width="80">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<div slot="reference" class="name-wrapper"> <!-- <div slot="reference" class="name-wrapper">-->
<span>{{ scope.row.Be_SAP_Item==1?"是":"否"}}</span> <!-- <span>{{ scope.row.Be_SAP_Item==1?"是":"否"}}</span>-->
</div> <!-- </div>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column <el-table-column
label="体积" label="体积"
width="80"> width="80">
@ -453,15 +453,16 @@
<span>{{ scope.row.SHIP_RULES }}</span> <span>{{ scope.row.SHIP_RULES }}</span>
</div> </div>
</template> </template>
</el-table-column><el-table-column </el-table-column>
label="OA料号" <!-- <el-table-column-->
width="80"> <!-- label="OA料号"-->
<template slot-scope="scope"> <!-- width="80">-->
<div slot="reference" class="name-wrapper"> <!-- <template slot-scope="scope">-->
<span>{{ scope.row.FEE_TYPE }}</span> <!-- <div slot="reference" class="name-wrapper">-->
</div> <!-- <span>{{ scope.row.FEE_TYPE }}</span>-->
</template> <!-- </div>-->
</el-table-column> <!-- </template>-->
<!-- </el-table-column>-->
<el-table-column <el-table-column
label="是否批号管理" label="是否批号管理"
width="80"> width="80">
@ -507,24 +508,24 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <!-- <el-table-column-->
label="标准价" <!-- label="标准价"-->
width="80"> <!-- width="80">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<div slot="reference" class="name-wrapper"> <!-- <div slot="reference" class="name-wrapper">-->
<span>{{ scope.row.STR_EXTEND3 }}</span> <!-- <span>{{ scope.row.STR_EXTEND3 }}</span>-->
</div> <!-- </div>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column <!-- <el-table-column-->
label="库存单位" <!-- label="库存单位"-->
width="80"> <!-- width="80">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<div slot="reference" class="name-wrapper"> <!-- <div slot="reference" class="name-wrapper">-->
<span>{{ scope.row.STR_EXTEND4 }}</span> <!-- <span>{{ scope.row.STR_EXTEND4 }}</span>-->
</div> <!-- </div>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column <el-table-column
label="是否在GAV仓" label="是否在GAV仓"
width="80"> width="80">
@ -534,15 +535,15 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <!-- <el-table-column-->
label="库位id" <!-- label="库位id"-->
width="80"> <!-- width="80">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<div slot="reference" class="name-wrapper"> <!-- <div slot="reference" class="name-wrapper">-->
<span>{{ scope.row.locId }}</span> <!-- <span>{{ scope.row.locId }}</span>-->
</div> <!-- </div>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column <el-table-column
label="库位类型" label="库位类型"
width="80"> width="80">
@ -568,15 +569,16 @@
<span>{{ new Date(scope.row.storageDate).toISOString().replace('T','').substring(0,10)}}</span> <span>{{ new Date(scope.row.storageDate).toISOString().replace('T','').substring(0,10)}}</span>
</div> </div>
</template> </template>
</el-table-column> <el-table-column </el-table-column>
label="工作站" <!-- <el-table-column-->
width="80"> <!-- label="工作站"-->
<template slot-scope="scope"> <!-- width="80">-->
<div slot="reference" class="name-wrapper"> <!-- <template slot-scope="scope">-->
<span>{{ scope.row.moveStatus }}</span> <!-- <div slot="reference" class="name-wrapper">-->
</div> <!-- <span>{{ scope.row.moveStatus }}</span>-->
</template> <!-- </div>-->
</el-table-column> <!-- </template>-->
<!-- </el-table-column>-->
<el-table-column <el-table-column
label="退料标记" label="退料标记"
width="80"> width="80">

View File

@ -234,13 +234,22 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="发生日期" label="发生日期"
width="180"> width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<div slot="reference" class="name-wrapper"> <div slot="reference" class="name-wrapper">
<span>{{ scope.row.OCCUR_TIME!=null?new Date(scope.row.OCCUR_TIME).toISOString().replace('T','').substring(0,10):scope.row.OCCUR_TIME}}</span> <span>{{ scope.row.OCCUR_TIME!=null?new Date(scope.row.OCCUR_TIME).toISOString().replace('T','').substring(0,10):scope.row.OCCUR_TIME}}</span>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
label="发生时间"
width="100">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.OCCUR_TIME!=null?new Date(scope.row.OCCUR_TIME).toISOString().replace('T','').substring(10,18):scope.row.OCCUR_TIME}}</span>
</div>
</template>
</el-table-column>
<el-table-column <el-table-column
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
label="备注" label="备注"

View File

@ -33,19 +33,19 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <!-- <el-col :span="4">-->
<el-form-item label="状态:" > <!-- <el-form-item label="状态:" >-->
<el-select v-model="param.s_status" multiple filterable placeholder="请选择状态" > <!-- <el-select v-model="param.s_status" multiple filterable placeholder="请选择状态" >-->
<el-option <!-- <el-option-->
v-for="item in Sstatus" <!-- v-for="item in Sstatus"-->
:key="item.label" <!-- :key="item.label"-->
:label="item.values" <!-- :label="item.values"-->
:value="item.values" <!-- :value="item.values"-->
> <!-- >-->
</el-option> <!-- </el-option>-->
</el-select> <!-- </el-select>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
</el-row> </el-row>
@ -55,8 +55,7 @@
</div> </div>
<el-table <el-table
:summary-method="getSummaries" border
show-summary
v-loading="this.tableloding" v-loading="this.tableloding"
:height="MaxHeight" :height="MaxHeight"
:header-cell-style="{background:'#000',color:'#fff'}" :header-cell-style="{background:'#000',color:'#fff'}"
@ -72,13 +71,14 @@
fixed fixed
label="序号" label="序号"
v-if="false" v-if="false"
width="180"> width="80">
<template slot-scope="scope"> <template slot-scope="scope">
<span style="margin-left: 10px">{{ scope.row.code }}</span> <span style="margin-left: 10px">{{ scope.row.code }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="类型" label=""
width="100"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<div slot="reference" class="name-wrapper"> <div slot="reference" class="name-wrapper">
@ -88,36 +88,56 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="状态" label="总数"
width="100"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<div slot="reference" class="name-wrapper"> <div slot="reference" class="name-wrapper">
<span>{{ scope.row.STATUS}}</span> <span>{{ scope.row.zs}}</span>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="是否在AGV库" width="100"
label="满不在库"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<div slot="reference" class="name-wrapper"> <div slot="reference" class="name-wrapper">
<span>{{ scope.row.agvFlag==1?'是':'否'}}</span> <span>{{ scope.row.mbzk}}</span>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="箱子数" label="满在库"
width="100"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<div slot="reference" class="name-wrapper"> <div slot="reference" class="name-wrapper">
<span>{{ scope.row.shu}}</span> <span>{{ scope.row.mzk}}</span>
</div>
</template>
</el-table-column>
<el-table-column
label="空不在库"
width="100"
>
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.kbzk}}</span>
</div>
</template>
</el-table-column>
<el-table-column
label="空在库"
width="100"
>
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ scope.row.kzk}}</span>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination <el-pagination
@ -140,6 +160,7 @@ export default {
tableloding: false, tableloding: false,
isShow:false,// isShow:false,//
tableData: [], tableData: [],
pageSize: 50, pageSize: 50,
pageNum: 1, pageNum: 1,
total: 3, total: 3,
@ -214,41 +235,41 @@ export default {
}, },
methods: { methods: {
// //
getSummaries(param) { // getSummaries(param) {
// // //
//columns: // //columns:
//data: [{id:1,num:1,price:20},{id:2,num:1,price:20},{id:3,num:1,price:20}] // //data: [{id:1,num:1,price:20},{id:2,num:1,price:20},{id:3,num:1,price:20}]
const { // const {
columns, // columns,
data // data
} = param; // } = param;
//, // //,
const sums = []; // const sums = [];
//
columns.forEach((column, index) => { // columns.forEach((column, index) => {
//
// datanumprice // // datanumprice
if (index == 4) { // if (index == 4) {
sums[index]="汇总:" // sums[index]=":"
const values = data.map(item => Number(item['shu'])); // const values = data.map(item => Number(item['shu']));
sums[index] += values.reduce((prev, curr) => { // sums[index] += values.reduce((prev, curr) => {
const value = Number(curr); // const value = Number(curr);
//,, // //,,
if (!isNaN(value)) { // if (!isNaN(value)) {
return prev + curr; // return prev + curr;
} else { // } else {
return prev; // return prev;
} // }
},0) // },0)
//
} // }
else { // else {
sums[index] = ''; // sums[index] = '';
} // }
}); // });
//
return sums; // return sums;
}, // },
handleEdit(index, row) { handleEdit(index, row) {
console.log(index, row); console.log(index, row);
}, },
@ -293,6 +314,7 @@ export default {
if (res.code == 200) { if (res.code == 200) {
this.tableData = res.data this.tableData = res.data
this.total = res.total this.total = res.total
//console.log(res.data)
} else { } else {
this.$message.error('获取数据失败'); this.$message.error('获取数据失败');
} }

View File

@ -249,15 +249,15 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <!-- <el-table-column-->
label="区域" <!-- label="区域"-->
width="80"> <!-- width="80">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<div slot="reference" class="name-wrapper"> <!-- <div slot="reference" class="name-wrapper">-->
<span>{{ scope.row.PROP_C8 }}</span> <!-- <span>{{ scope.row.PROP_C8 }}</span>-->
</div> <!-- </div>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column <el-table-column
label="工厂" label="工厂"
width="80"> width="80">
@ -382,7 +382,7 @@
width="80"> width="80">
<template slot-scope="scope"> <template slot-scope="scope">
<div slot="reference" class="name-wrapper"> <div slot="reference" class="name-wrapper">
<span>{{ scope.row.BE_QUALITY }}</span> <span>{{ scope.row.BE_QUALITY==0?'否':'是' }}</span>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>

View File

@ -320,6 +320,15 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
label="收货时间"
width="100">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{new Date(scope.row.ORDER_DATE).toISOString().replace('T','').substring(10,18) }}</span>
</div>
</template>
</el-table-column>
<el-table-column <el-table-column
label="整理日期" label="整理日期"
width="100"> width="100">
@ -329,6 +338,15 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
label="整理时间"
width="100">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<span>{{ new Date(scope.row.RECEIVE_DATE).toISOString().replace('T','').substring(10,18) }}</span>
</div>
</template>
</el-table-column>
<el-table-column <el-table-column
label="整理人" label="整理人"
width="60"> width="60">
@ -392,15 +410,15 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <!-- <el-table-column-->
label="区域" <!-- label="区域"-->
width="100"> <!-- width="100">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<div slot="reference" class="name-wrapper"> <!-- <div slot="reference" class="name-wrapper">-->
<span>{{ scope.row.PROP_C8 }}</span> <!-- <span>{{ scope.row.PROP_C8 }}</span>-->
</div> <!-- </div>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column <el-table-column
label="工厂" label="工厂"
width="80"> width="80">

View File

@ -29,10 +29,19 @@ public class LiaoxiangjiankongImpl implements com.yc.wms.service.Liaoxiangjianko
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); 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" + String sql="SELECT\n" +
"from stock s\n" + " ct.code,\n" +
"left join containerType ct on ct.id= s.containerType\n" + " SUM(CASE WHEN s.STATUS = 'OCCUPY' OR s.STATUS = 'FREE' THEN 1 ELSE 0 END) AS zs,\n" +
"where 1=1 and s.LP like 'X%'"; "\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"+ String sqlCount = "select count(t.code) as nums from (" + sql+"\n GROUP BY ct.code\n" + ") t";
") t"; String sqlFy = sql+"GROUP BY ct.code\n " +
String sqlFy = "select t.* from(" + sql+"GROUP BY ct.code,s.STATUS,s.agvFlag \n" + "ORDER BY ct.code";
") t";
sqlFy+= " WHERE Row_Num BETWEEN " + (pageNum-1) * pageSize + " AND " + (pageNum) * pageSize; sqlFy+= " OFFSET "+(pageNum-1) * pageSize+ " ROWS FETCH NEXT "+(pageNum) * pageSize +" ROWS ONLY";
//查询单数据 //查询单数据
Map<String,Object> listCount = jdbcTemplate.queryForMap(sqlCount, new HashMap<>()); Map<String,Object> listCount = jdbcTemplate.queryForMap(sqlCount, new HashMap<>());
//查询多条数据据 //查询多条数据据
List<Map<String,Object>> maps = jdbcTemplate.queryForList(sqlFy, new HashMap<>()); List<Map<String,Object>> maps = jdbcTemplate.queryForList(sqlFy, new HashMap<>());
return Result.success(Long.parseLong(listCount.get("nums").toString()),maps); return Result.success(Long.parseLong(listCount.get("nums").toString()),maps);
} }