huojin
/
ZW_MultiSelect
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

查询内容

main
userName 2024-09-30 16:51:38 +08:00
parent fdc11b3cae
commit 623dd9598f
17 changed files with 160 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
wms-vue/dist.rar
View File

Binary file not shown.

13
wms-vue/src/components/duochaxun/AGVKUCUN.vue 100644
View File

@ -0,0 +1,13 @@
<script setup>
</script>
<template>
<div class="DIV1">
</div>
</template>
<style scoped>
</style>

42
wms-vue/src/components/duochaxun/Jianhuojiemian.vue
View File

@ -14,11 +14,6 @@
<el-input type="textarea" v-model="param.pt_code" :rows="1"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="SAP类型:">
<el-input type="text" v-model="param.sourceType" :rows="1"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="拣货库区">
@ -34,13 +29,13 @@
</el-form-item>
</el-col>
<el-col :span="4">
<el-col :span="5">
<el-form-item label="所在库位:">
<el-input type="textarea" v-model="param.lc2_code" :rows="1"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-col :span="6">
<el-form-item label="料号:">
<el-input type="textarea" v-model="param.i_code" :rows="1"></el-input>
</el-form-item>
@ -211,7 +206,11 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="SAP类型:">
<el-input type="text" v-model="param.sourceType" :rows="1"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-button type="success" @click="find">查找</el-button>
@ -601,32 +600,7 @@
</div>
</template>
</el-table-column>
<!-- <el-table-column-->
<!-- label="SAP状态 "-->
<!-- width="180">-->
<!-- <template slot-scope="scope">-->
<!-- <div slot="reference" class="name-wrapper">-->
<!-- <span>{{ scope.row.statusCode }}</span>-->
<!-- </div>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- label="AGV状态"-->
<!-- width="180">-->
<!-- <template slot-scope="scope">-->
<!-- <div slot="reference" class="name-wrapper">-->
<!-- <span>{{ scope.row.agv_Status }}</span>-->
<!-- </div>-->
<!-- </template>-->
<!-- </el-table-column> <el-table-column-->
<!-- label="sap扣料"-->
<!-- width="180">-->
<!-- <template slot-scope="scope">-->
<!-- <div slot="reference" class="name-wrapper">-->
<!-- <span>{{ scope.row.popular}}</span>-->
<!-- </div>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column
label="任务号"
width="180">

2
wms-vue/src/components/duochaxun/Zhengliqingdan.vue
View File

@ -16,7 +16,7 @@
<el-input type="textarea" v-model="param.strBill7" :rows="1"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-col :span="6">
<el-form-item label="料号:">
<el-input type="textarea" v-model="param.i_CODE" :rows="1"></el-input>
</el-form-item>

4
wms-vue/src/main.js
View File

@ -8,9 +8,9 @@ import VueRouter from "vue-router";
import router from "@/router/router";
import store from "@/store/store";
Vue.prototype.$axios=axios;
//Vue.prototype.$httpUrl='http://127.0.0.1:8081';
//Vue.prototype.$httpUrl='http://127.0.0.1:8083';
//Vue.prototype.$httpUrl='http://192.68.2.88:8081';
Vue.prototype.$httpUrl='http://127.0.0.1:8083';
Vue.prototype.$httpUrl='http://10.1.112.23:8083';
Vue.config.productionTip = false;
Vue.use(VueRouter)
Vue.use(ElementUI,{size:'small'});

12
wms/src/main/java/com/yc/wms/bean/InventoryLog.java 100644
View File

@ -0,0 +1,12 @@
package com.yc.wms.bean;
public class InventoryLog {
public String RELATED_BILL;
public String LOG_TYPE;
public String bt_NAME;
public String lc_CODE;
public String lc1_CODE;
public String OCCUR_TIME;
}

41
wms/src/main/java/com/yc/wms/controller/InventoryLogController.java 100644
View File

@ -0,0 +1,41 @@
package com.yc.wms.controller;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.yc.wms.bean.InventoryLog;
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("/InventoryLogManager")
public class InventoryLogController {
@Autowired
private com.yc.wms.service.InventoryLogManager dcxService;
/**
* @return
* @param查询用户
*/
@PostMapping("/queryInventoryLog")
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");
InventoryLog inventoryLog = JSONUtil.toBean(param.toString(), InventoryLog.class);
return dcxService.readJson(query, inventoryLog);
}
}

10
wms/src/main/java/com/yc/wms/service/InventoryLogManager.java 100644
View File

@ -0,0 +1,10 @@
package com.yc.wms.service;
import com.yc.wms.bean.InventoryLog;
import com.yc.wms.until.QueryPageUtil;
import com.yc.wms.until.Result;
public interface InventoryLogManager {
Result readJson(QueryPageUtil query, InventoryLog inv_log);
}

55
wms/src/main/java/com/yc/wms/service/impl/InventoryLogImpl.java 100644
View File

@ -0,0 +1,55 @@
package com.yc.wms.service.impl;
import com.yc.wms.bean.InventoryLog;
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 InventoryLogImpl implements com.yc.wms.service.InventoryLogManager{
@Autowired
private NamedParameterJdbcTemplate jdbcTemplate;
@Override
public Result readJson(QueryPageUtil query, InventoryLog inv_log) {
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 log.id) AS Row_Num, log.id as ID,log.RELATED_BILL AS 相关单号,\n" +
"log.LOG_TYPE as 日志类型,bt.NAME as 单据类型,loc1.CODE as 源库位,loc.CODE as 目标库位,\n" +
"i.CODE as 料号,i.NAME as 描述,i.UNIT as 单位,\n" +
"log.OCCUR_QUANTITY*log.INC_DEC 发生数量,\n" +
"log.OPERATOR as 操作人,log.OCCUR_TIME 发生日期 ,log.DESCRIPTION as 备注,\n" +
"ik.PROP_C1 as 批号,ik.PROP_C2 as LOC,ik.PROP_C3 as 特殊标记,ik.PROP_C5 as 供应商编号,ik.PROP_C8 as 暂存原因,\n" +
"ik.PROP_C9 as 工厂,log.endRegion as 工作站,log.LP as 容器\n" +
"FROM INVENTORY_LOG log\n" +
"left join BILL_TYPE bt on bt.ID=log.BILL_TYPE_ID\n" +
"left join LOCATION loc on loc.id=log.LOCATION_ID\n" +
"left join LOCATION loc1 on loc1.id=log.SRCLOC_ID\n" +
"left join ITEM_KEY ik on ik.id=log.ITEM_KEY_ID\n" +
"left join item i on i.id=ik.ITEM_ID\n";
if(inv_log.RELATED_BILL!=null&&!inv_log.RELATED_BILL.equals("")){
sql+=" and log.RELATED_BILL ="+"'"+ inv_log.RELATED_BILL+"'";
}
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<String,Object> listCount = jdbcTemplate.queryForMap(sqlCount, new HashMap<>());
//查询多条数据据
List<Map<String,Object>> maps = jdbcTemplate.queryForList(sqlFy, new HashMap<>());
return Result.success(Long.parseLong(listCount.get("nums").toString()),maps);
}
}

6
wms/src/main/java/com/yc/wms/service/impl/JianhuojiemianImpl.java
View File

@ -213,21 +213,21 @@ public class JianhuojiemianImpl implements Jianhuojiemian {
if(jianhuojiemian.ORDER_DATE!=null&&jianhuojiemian.ORDER_DATE.length>0){
String startDate = simpleDateFormat.format(jianhuojiemian.ORDER_DATE[0]);
String endDate = simpleDateFormat.format(jianhuojiemian.ORDER_DATE[1]);
sql+=" and pt.ORDER_DATE between "+"'"+startDate+"'"+" and "+ "'"+endDate+"'";
sql+=" and CONVERT(DATE, pt.ORDER_DATE) between "+"'"+startDate+"'"+" and "+ "'"+endDate+"'";
}
//分配日期
if(jianhuojiemian.CREATE_TIME!=null&&jianhuojiemian.CREATE_TIME.length>0){
String startDate = simpleDateFormat.format(jianhuojiemian.CREATE_TIME[0]);
String endDate = simpleDateFormat.format(jianhuojiemian.CREATE_TIME[1]);
sql+=" and t.CREATE_TIME between "+"'"+startDate+"'"+" and "+ "'"+endDate+"'";
sql+=" and CONVERT(DATE, t.CREATE_TIME) between "+"'"+startDate+"'"+" and "+ "'"+endDate+"'";
}
//拣货日期
if(jianhuojiemian.OPERATE_TIME!=null&&jianhuojiemian.OPERATE_TIME.length>0){
String startDate = simpleDateFormat.format(jianhuojiemian.OPERATE_TIME[0]);
String endDate = simpleDateFormat.format(jianhuojiemian.OPERATE_TIME[1]);
sql+=" and t.OPERATE_TIME between "+"'"+startDate+"'"+" and "+ "'"+endDate+"'";
sql+=" and CONVERT(DATE, t.OPERATE_TIME) between "+"'"+startDate+"'"+" and "+ "'"+endDate+"'";
}
//拣货状态

9
wms/src/main/java/com/yc/wms/service/impl/KucunhuizongImpl.java
View File

@ -28,7 +28,7 @@ public class KucunhuizongImpl implements Kucunhuizong {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String sql="select Row_number() OVER(ORDER BY inv.id) as Row_Num,\n" +
String sql="select Row_number() OVER(ORDER BY item.id,loc.id) as Row_Num,\n" +
"max(inv.id) as id,\n" +
"max(loc.code) as locCode,--库位号\n" +
"max(item.code) as itemCode,--料号\n" +
@ -203,7 +203,7 @@ public class KucunhuizongImpl implements Kucunhuizong {
if(kucunhuizong.storageDate!=null&&kucunhuizong.storageDate.length>0){
String startDate = simpleDateFormat.format(kucunhuizong.storageDate[0]);
String endDate = simpleDateFormat.format(kucunhuizong.storageDate[1]);
sql+=" and inv.STORAGE_DATE between "+"'"+startDate+"'"+" and "+ "'"+endDate+"'";
sql+=" and CONVERT(DATE, inv.STORAGE_DATE) between "+"'"+startDate+"'"+" and "+ "'"+endDate+"'";
}
//供应商号
@ -246,10 +246,11 @@ public class KucunhuizongImpl implements Kucunhuizong {
}
String sqlCount = "select count(t.id) as nums from(" + sql+"\n " +
"group by inv.id,item.id,loc.id,ik.PROP_C1,ik.PROP_C2,ik.PROP_C3,ik.PROP_C5,ik.PROP_C7,inv.STATUS,item.isBOM,inv.statuss,stock1.agvFlag"+") t";
" group by item.id,loc.id,ik.PROP_C1,ik.PROP_C2,ik.PROP_C3,ik.PROP_C5,ik.PROP_C7,inv.STATUS,item.isBOM,inv.statuss,stock1.agvFlag"+") t";
String sqlFy = "select t.* from(" + sql+"\n " +
"group by inv.id,item.id,loc.id,ik.PROP_C1,ik.PROP_C2,ik.PROP_C3,ik.PROP_C5,ik.PROP_C7,inv.STATUS,item.isBOM,inv.statuss,stock1.agvFlag"+") t";
" group by item.id,loc.id,ik.PROP_C1,ik.PROP_C2,ik.PROP_C3,ik.PROP_C5,ik.PROP_C7,inv.STATUS,item.isBOM,inv.statuss,stock1.agvFlag"+") t";
sqlFy+= " WHERE Row_Num BETWEEN " + (pageNum-1) * pageSize + " AND " + (pageNum) * pageSize;

2
wms/src/main/java/com/yc/wms/service/impl/KucunrizhiImpl.java
View File

@ -161,7 +161,7 @@ public class KucunrizhiImpl implements Kucunrizhi {
if(kucunrizhi.OCCUR_TIME!=null&&kucunrizhi.OCCUR_TIME.length>0){
String startDate = simpleDateFormat.format(kucunrizhi.OCCUR_TIME[0]);
String endDate = simpleDateFormat.format(kucunrizhi.OCCUR_TIME[1]);
sql+=" and log.OCCUR_TIME between"+"'"+startDate+"'"+" and "+ "'"+endDate+"'";
sql+=" and CONVERT(DATE, log.OCCUR_TIME) between"+"'"+startDate+"'"+" and "+ "'"+endDate+"'";
}

2
wms/src/main/java/com/yc/wms/service/impl/PandianmingxiImpl.java
View File

@ -185,7 +185,7 @@ public class PandianmingxiImpl implements Pandianmingxi {
if(pandianming.issued_Date!=null&&pandianming.issued_Date.length>0){
String startDate = simpleDateFormat.format(pandianming.issued_Date[0]);
String endDate = simpleDateFormat.format(pandianming.issued_Date[1]);
sql+=" and cr.issued_Date "+"'"+startDate+"'"+" and "+ "'"+endDate+"'";
sql+=" and CONVERT(DATE, cr.issued_Date) "+"'"+startDate+"'"+" and "+ "'"+endDate+"'";
}

4
wms/src/main/java/com/yc/wms/service/impl/RukuzhengliImpl.java
View File

@ -121,14 +121,14 @@ public class RukuzhengliImpl implements com.yc.wms.service.Rukuzhengli {
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+"'";
sql_bz+=" and CONVERT(DATE, 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+"'";
sql_bz+=" and CONVERT(DATE, ad.RECEIVE_DATE) between "+"'"+startDate+"'"+" and "+ "'"+endDate+"'";
}
//特殊标记

2
wms/src/main/java/com/yc/wms/service/impl/XuliehaoqingdanImpl.java
View File

@ -219,7 +219,7 @@ public class XuliehaoqingdanImpl implements Xuliehaoqingdan {
if(xuliehao.STORAGE_DATE!=null&&xuliehao.STORAGE_DATE.length>0){
String startDate = simpleDateFormat.format(xuliehao.STORAGE_DATE[0]);
String endDate = simpleDateFormat.format(xuliehao.STORAGE_DATE[1]);
sql+=" and inv.STORAGE_DATE between "+"'"+startDate+"'"+" and "+ "'"+endDate+"'";
sql+=" and CONVERT(DATE, inv.STORAGE_DATE) between "+"'"+startDate+"'"+" and "+ "'"+endDate+"'";
}

6
wms/src/main/java/com/yc/wms/service/impl/ZhengliqingdanImpl.java
View File

@ -190,17 +190,17 @@ public class ZhengliqingdanImpl implements Zhengliqingdan {
//整理日期
if(zhengliqingdan.RECEIVE_DATE!=null&&zhengliqingdan.RECEIVE_DATE.length>0){
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+"'";
sql+=" and CONVERT(DATE, 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+"'";
sql+=" and CONVERT(DATE, a.ORDER_DATE) between "+"'"+startDate+"'"+" and "+ "'"+endDate+"'";
}
//备注

3
wms/src/main/resources/application.yml
View File

@ -5,14 +5,13 @@ server:
# username: super
# password: 1K4QfD%ESd1fe@VJ
# url: jdbc:sqlserver://10.1.96.106:1433;DatabaseName=LD_WMSDB
# url: jdbc:sqlserver://10.1.96.105:1433;DatabaseName=LD_WMSDB
# driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
# username: wmsdb
# password: AmecDDbb32A
spring:
datasource:
# url: jdbc:sqlserver://47.103.100.52:1433;DatabaseName=zwtest
url: jdbc:sqlserver://10.1.96.105:1433;DatabaseName=LD_WMSDB
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
username: wmsdb