多查询
liyang
parent
1b90edfc1a
commit
45541fe293
|
|
@ -3982,6 +3982,27 @@
|
|||
"integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
|
||||
"dev": true
|
||||
},
|
||||
"el-table-horizontal-scroll": {
|
||||
"version": "1.2.5",
|
||||
"resolved": "https://registry.npmjs.org/el-table-horizontal-scroll/-/el-table-horizontal-scroll-1.2.5.tgz",
|
||||
"integrity": "sha512-2Ays+8skp64Yl5YE2Kpa/9lJ720jPn1ooNSc2LKiF0ECiXPEoBZ5hhd144Inp1JATs5of4YzNwNd9L/Xy397GQ==",
|
||||
"requires": {
|
||||
"core-js": "^3.6.5",
|
||||
"element-ui": "^2.15.6",
|
||||
"lodash": "^4.17.21",
|
||||
"throttle-debounce": "^5.0.0",
|
||||
"vue": "^2.6.11",
|
||||
"vue-route": "^1.5.1",
|
||||
"vue-router": "^3.5.3"
|
||||
},
|
||||
"dependencies": {
|
||||
"throttle-debounce": {
|
||||
"version": "5.0.0",
|
||||
"resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-5.0.0.tgz",
|
||||
"integrity": "sha512-2iQTSgkkc1Zyk0MeVrt/3BvuOXYPl/R8Z0U2xxo9rjwNciaHDG3R+Lm6dh4EeUci49DanvBnuqI6jshoQQRGEg=="
|
||||
}
|
||||
}
|
||||
},
|
||||
"electron-to-chromium": {
|
||||
"version": "1.4.713",
|
||||
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.713.tgz",
|
||||
|
|
@ -5710,8 +5731,7 @@
|
|||
"lodash": {
|
||||
"version": "4.17.21",
|
||||
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
|
||||
"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
|
||||
"dev": true
|
||||
"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
|
||||
},
|
||||
"lodash.debounce": {
|
||||
"version": "4.0.8",
|
||||
|
|
@ -6524,6 +6544,29 @@
|
|||
"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
|
||||
"dev": true
|
||||
},
|
||||
"page": {
|
||||
"version": "1.11.6",
|
||||
"resolved": "https://registry.npmjs.org/page/-/page-1.11.6.tgz",
|
||||
"integrity": "sha512-P6e2JfzkBrPeFCIPplLP7vDDiU84RUUZMrWdsH4ZBGJ8OosnwFkcUkBHp1DTIjuipLliw9yQn/ZJsXZvarsO+g==",
|
||||
"requires": {
|
||||
"path-to-regexp": "~1.2.1"
|
||||
},
|
||||
"dependencies": {
|
||||
"isarray": {
|
||||
"version": "0.0.1",
|
||||
"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
|
||||
"integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ=="
|
||||
},
|
||||
"path-to-regexp": {
|
||||
"version": "1.2.1",
|
||||
"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.2.1.tgz",
|
||||
"integrity": "sha512-DBw9IhWfevR2zCVwEZURTuQNseCvu/Q9f5ZgqMCK0Rh61bDa4uyjPAOy9b55yKiPT59zZn+7uYKxmWwsguInwg==",
|
||||
"requires": {
|
||||
"isarray": "0.0.1"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"param-case": {
|
||||
"version": "3.0.4",
|
||||
"resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz",
|
||||
|
|
@ -8403,6 +8446,14 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
"vue-route": {
|
||||
"version": "1.5.1",
|
||||
"resolved": "https://registry.npmjs.org/vue-route/-/vue-route-1.5.1.tgz",
|
||||
"integrity": "sha512-RoeEWvSTk/Zasjx11En4XPyE1jXwuFQ4Itr4fzh1TOSMYefUddhhlHXmAGFFPn37J1YrEymm6sU/3IRTyu23Aw==",
|
||||
"requires": {
|
||||
"page": "^1.5.0"
|
||||
}
|
||||
},
|
||||
"vue-router": {
|
||||
"version": "3.6.5",
|
||||
"resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.6.5.tgz",
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@
|
|||
"dependencies": {
|
||||
"axios": "^1.6.7",
|
||||
"core-js": "^3.8.3",
|
||||
"el-table-horizontal-scroll": "^1.2.5",
|
||||
"element-ui": "^2.15.13",
|
||||
"file-saver": "^2.0.5",
|
||||
"less-loader": "^12.2.0",
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@
|
|||
<el-row :gutter="24">
|
||||
<el-col :span="4">
|
||||
<el-form-item label="采购单号:">
|
||||
|
||||
<el-input type="textarea" v-model="param.sourceId" :rows="1"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
|
@ -58,7 +57,7 @@
|
|||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-row :gutter="24">
|
||||
<el-row :gutter="24" v-if="isShow">
|
||||
<el-col :span="8">
|
||||
<el-form-item label="收货日期:">
|
||||
<el-date-picker style="width: 325px"
|
||||
|
|
@ -75,7 +74,7 @@
|
|||
</el-col>
|
||||
|
||||
<el-col :span="8">
|
||||
<el-form-item label="整理日期:">
|
||||
<el-form-item label="整理日期:" ref="all">
|
||||
<el-date-picker style="width: 325px"
|
||||
v-model="param.RECEIVE_DATE"
|
||||
type="daterange"
|
||||
|
|
@ -90,7 +89,7 @@
|
|||
</el-col>
|
||||
|
||||
<el-col :span="4">
|
||||
<el-form-item label="特殊标记:">
|
||||
<el-form-item label="特殊标记:" ref="all">
|
||||
<el-input type="text" v-model="param.PROP_C3"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
|
@ -103,19 +102,17 @@
|
|||
</el-row>
|
||||
|
||||
<el-row :gutter="24">
|
||||
<el-col :span="4">
|
||||
<el-col :span="4" v-if="isShow">
|
||||
<el-form-item label="加急标记">
|
||||
<el-input type="text" v-model="param.strBill11"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="8">
|
||||
<el-checkbox v-model="checked" @change="Allquesr">是否显示全部</el-checkbox>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-button type="success" @click="find">查找</el-button>
|
||||
<el-button type="success" @click="rest">重置</el-button>
|
||||
<el-button type="success" @click="rest">重置</el-button>
|
||||
<el-checkbox v-model="checked" @change="Allquesr">是否显示全部查询条件</el-checkbox>
|
||||
</el-form>
|
||||
|
||||
</div>
|
||||
|
|
@ -326,7 +323,7 @@
|
|||
width="180">
|
||||
<template slot-scope="scope">
|
||||
<div slot="reference" class="name-wrapper">
|
||||
<span>{{ new Date(scope.row.RECEIVE_DATE).toISOString().replace('T','').substring(10,19)}}</span>
|
||||
<span>{{ new Date(scope.row.RECEIVE_DATE).toISOString().replace('T','').substring(10,18)}}</span>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
|
@ -354,7 +351,7 @@
|
|||
width="180">
|
||||
<template slot-scope="scope">
|
||||
<div slot="reference" class="name-wrapper">
|
||||
<span>{{ new Date(scope.row.DELIVERY_DATE).toISOString().replace('T','').substring(10,19) }}</span>
|
||||
<span>{{ new Date(scope.row.DELIVERY_DATE).toISOString().replace('T','').substring(10,18) }}</span>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
|
@ -439,6 +436,7 @@ export default {
|
|||
}
|
||||
}]
|
||||
},
|
||||
isShow:false,//是否展示全部搜索条件
|
||||
value1: '',
|
||||
value2: '',
|
||||
tableData: [],
|
||||
|
|
@ -550,12 +548,13 @@ export default {
|
|||
Allquesr(){
|
||||
//查询按钮
|
||||
if(this.checked){
|
||||
this.rest();
|
||||
this.queryUser();
|
||||
this.isShow=true;
|
||||
}else {
|
||||
this.isShow=false;
|
||||
}
|
||||
},
|
||||
rest() {
|
||||
//表单重置
|
||||
//条件查询重置
|
||||
this.param={};
|
||||
},
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,8 +8,7 @@
|
|||
<el-row :gutter="24">
|
||||
<el-col :span="4">
|
||||
<el-form-item label="采购单号:">
|
||||
|
||||
<el-input type="textarea" v-model="param.sourceId" :rows="1"></el-input>
|
||||
<el-input type="text" v-model="param.sourceId" :rows="1"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="4">
|
||||
|
|
@ -19,29 +18,48 @@
|
|||
</el-col>
|
||||
<el-col :span="4">
|
||||
<el-form-item label="料号:">
|
||||
<el-input type="textarea" v-model="param.code" :rows="1"></el-input>
|
||||
<el-input type="textarea" v-model="param.i_CODE" :rows="1"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="4">
|
||||
<el-form-item label="物料描述:">
|
||||
<el-input type="text" v-model="param.i_name" :rows="1"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="4">
|
||||
<el-form-item label="工厂:">
|
||||
<el-select v-model="param.PROP_C9" multiple filterable placeholder="请选择工厂" style="width: 100%;">
|
||||
<el-form-item label="库区:">
|
||||
<el-select v-model="param.z_name" multiple filterable placeholder="请选择库区" style="width: 100%;">
|
||||
<el-option
|
||||
v-for="item in Plant"
|
||||
v-for="item in name"
|
||||
:key="item.ID"
|
||||
:label="item.PROP_C9"
|
||||
:value="item.PROP_C9"
|
||||
:label="item.name"
|
||||
:value="item.name"
|
||||
>
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="4">
|
||||
<el-form-item label="库位号:">
|
||||
<el-input type="textarea" v-model="param.lc_CODE" :rows="1"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-row :gutter="24" v-show="isShow">
|
||||
<el-col :span="4">
|
||||
<el-form-item label="批次号:">
|
||||
<el-input type="text" v-model="param.PROP_C1" :rows="1"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="4">
|
||||
<el-form-item label="LOC:">
|
||||
<el-select v-model="param.PROP_C2" multiple filterable placeholder="请选择LOC" style="width: 100%;">
|
||||
<el-option
|
||||
v-for="item in LOCS"
|
||||
v-for="item in loc"
|
||||
:key="item.ID"
|
||||
:label="item.PROP_C2"
|
||||
:value="item.PROP_C2"
|
||||
|
|
@ -52,28 +70,41 @@
|
|||
</el-col>
|
||||
|
||||
<el-col :span="4">
|
||||
<el-form-item label="批次号:">
|
||||
<el-input type="textarea" v-model="param.PROP_C1" :rows="1"></el-input>
|
||||
<el-form-item label="特殊标记:">
|
||||
<el-input type="text" v-model="param.PROP_C3"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="4">
|
||||
<el-form-item label="工厂:">
|
||||
<el-select v-model="param.PROP_C9" multiple filterable placeholder="请选择工厂" style="width: 100%;">
|
||||
<el-option
|
||||
v-for="item in plant"
|
||||
:key="item.ID"
|
||||
:label="item.PROP_C9"
|
||||
:value="item.PROP_C9"
|
||||
>
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
|
||||
<el-col :span="4">
|
||||
<el-form-item label="整理人:">
|
||||
<el-input type="textarea" v-model="param.OPERATOR" :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.a_CODE"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
</el-row>
|
||||
|
||||
<el-row :gutter="24">
|
||||
<el-col :span="8">
|
||||
<el-form-item label="收货日期:">
|
||||
<el-date-picker style="width: 325px"
|
||||
v-model="param.ORDER_DATE"
|
||||
type="daterange"
|
||||
align="right"
|
||||
unlink-panels
|
||||
range-separator="至"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"
|
||||
:picker-options="pickerOptions">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-row :gutter="24" v-show="isShow">
|
||||
<el-col :span="8">
|
||||
<el-form-item label="整理日期:">
|
||||
<el-date-picker style="width: 325px"
|
||||
|
|
@ -89,33 +120,40 @@
|
|||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="4">
|
||||
<el-form-item label="特殊标记:">
|
||||
<el-input type="text" v-model="param.PROP_C3"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="4">
|
||||
<el-form-item label="SAP接口:">
|
||||
<el-input type="text" v-model="param.CODE"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-row :gutter="24">
|
||||
<el-col :span="4">
|
||||
<el-form-item label="加急标记">
|
||||
<el-input type="text" v-model="param.strBill11"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="8">
|
||||
<el-checkbox v-model="checked" @change="Allquesr">是否显示全部</el-checkbox>
|
||||
<el-form-item label="收货日期:">
|
||||
<el-date-picker style="width: 325px"
|
||||
v-model="param.ORDER_DATE"
|
||||
type="daterange"
|
||||
align="right"
|
||||
unlink-panels
|
||||
range-separator="至"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"
|
||||
:picker-options="pickerOptions">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
|
||||
<el-col :span="4">
|
||||
<el-form-item label="备注:">
|
||||
<el-input type="text" v-model="param.description"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
|
||||
<el-col :span="4">
|
||||
<el-form-item label="容器码:">
|
||||
<el-input type="textarea" v-model="param.LP" :rows="1"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
|
||||
<el-button type="success" @click="find">查找</el-button>
|
||||
<el-button type="success" @click="rest">重置</el-button>
|
||||
<el-button type="success" @click="rest">重置</el-button>
|
||||
<el-checkbox v-model="checked" @change="Allquesr">是否显示全部查询条件</el-checkbox>
|
||||
</el-form>
|
||||
|
||||
<!-- <el-input v-model="param.sourceId"-->
|
||||
|
|
@ -187,6 +225,7 @@
|
|||
|
||||
|
||||
<el-table
|
||||
:max-height="MaxHeight"
|
||||
:header-cell-style="{background:'#000',color:'#fff'}"
|
||||
:data="tableData"
|
||||
id="educe-table"
|
||||
|
|
@ -207,20 +246,6 @@
|
|||
<span style="margin-left: 10px">{{ scope.row.id }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- <el-table-column-->
|
||||
<!-- fixed-->
|
||||
<!-- label="账号"-->
|
||||
<!-- width="180">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <el-popover trigger="hover" placement="top">-->
|
||||
<!-- <p>账号: {{ scope.row.userNo }}</p>-->
|
||||
<!-- <p>电话: {{ scope.row.phone }}</p>-->
|
||||
<!-- <div slot="reference" class="name-wrapper">-->
|
||||
<!-- <el-tag size="medium">{{ scope.row.userNo }}</el-tag>-->
|
||||
<!-- </div>-->
|
||||
<!-- </el-popover>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<el-table-column
|
||||
label="ID"
|
||||
width="180">
|
||||
|
|
@ -262,7 +287,7 @@
|
|||
width="180">
|
||||
<template slot-scope="scope">
|
||||
<div slot="reference" class="name-wrapper">
|
||||
<span>{{ scope.row.CODE }}</span>
|
||||
<span>{{ scope.row.i_CODE }}</span>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
|
@ -303,7 +328,7 @@
|
|||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="OPERATOR"
|
||||
label="整理人"
|
||||
width="180">
|
||||
<template slot-scope="scope">
|
||||
<div slot="reference" class="name-wrapper">
|
||||
|
|
@ -312,16 +337,16 @@
|
|||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="z_name"
|
||||
label="上架人"
|
||||
width="180">
|
||||
<template slot-scope="scope">
|
||||
<div slot="reference" class="name-wrapper">
|
||||
<span>{{ scope.row.z_name }}</span>
|
||||
<span>{{ scope.row.w_NAME }}</span>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="LP"
|
||||
label="容器"
|
||||
width="180">
|
||||
<template slot-scope="scope">
|
||||
<div slot="reference" class="name-wrapper">
|
||||
|
|
@ -330,7 +355,7 @@
|
|||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="批次"
|
||||
label="批号"
|
||||
width="180">
|
||||
<template slot-scope="scope">
|
||||
<div slot="reference" class="name-wrapper">
|
||||
|
|
@ -384,7 +409,7 @@
|
|||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="BAR_CODE"
|
||||
label="序列号"
|
||||
width="180">
|
||||
<template slot-scope="scope">
|
||||
<div slot="reference" class="name-wrapper">
|
||||
|
|
@ -393,11 +418,11 @@
|
|||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="BE_MOVED"
|
||||
label="是否上架"
|
||||
width="180">
|
||||
<template slot-scope="scope">
|
||||
<div slot="reference" class="name-wrapper">
|
||||
<span>{{ scope.row.BE_MOVED }}</span>
|
||||
<span>{{ scope.row.BE_MOVED==1?"上架":"未上架" }}</span>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
|
@ -410,58 +435,25 @@
|
|||
</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.a_CODE }}</span>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="库位号"
|
||||
width="180">
|
||||
<template slot-scope="scope">
|
||||
<div slot="reference" class="name-wrapper">
|
||||
<span>{{ scope.row.lc_CODE }}</span>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<!-- <el-table-column-->
|
||||
<!-- label="性别"-->
|
||||
<!-- width="180">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
|
||||
<!-- <div slot="reference" class="name-wrapper">-->
|
||||
<!-- <el-tag size="medium" :type="scope.row.sex ===0 ? 'primary' : 'success'">-->
|
||||
<!-- {{ scope.row.sex === 0 ? '女' : '男' }}-->
|
||||
<!-- </el-tag>-->
|
||||
<!-- </div>-->
|
||||
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column-->
|
||||
<!-- label="角色"-->
|
||||
<!-- width="180">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <div slot="reference" class="name-wrapper">-->
|
||||
<!-- <el-tag size="medium"-->
|
||||
<!-- :type="scope.row.roleId ===0 ? 'danger' : (scope.row.roleId ===1 ? 'primary':'success') ">-->
|
||||
<!-- {{ scope.row.roleId === 0 ? '超级管理员' : (scope.row.roleId === 1 ? '管理员' : '用户') }}-->
|
||||
<!-- </el-tag>-->
|
||||
|
||||
<!-- </div>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
|
||||
|
||||
<!-- <el-table-column-->
|
||||
<!-- fixed="right"-->
|
||||
<!-- label="操作"-->
|
||||
<!-- width="100">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <!– <el-button-->
|
||||
<!-- size="small"-->
|
||||
<!-- @click="handleEdit(scope.$index, scope.row)">编辑-->
|
||||
<!-- </el-button>-->
|
||||
<!-- <el-button-->
|
||||
<!-- size="small"-->
|
||||
<!-- type="danger"-->
|
||||
<!-- @click="handleDelete(scope.$index, scope.row)">删除-->
|
||||
<!-- </el-button>–>-->
|
||||
<!-- <el-button @click="handleClick(scope.row)" type="text" size="small">查看</el-button>-->
|
||||
<!-- <el-button type="text" size="small" @click="editUser(scope.row)">编辑</el-button>-->
|
||||
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
</el-table>
|
||||
<el-pagination
|
||||
@size-change="handleSizeChange"
|
||||
|
|
@ -479,6 +471,7 @@
|
|||
|
||||
|
||||
|
||||
// import horizontalScroll from 'el-table-horizontal-scroll'
|
||||
import {outFile} from "@/util/excel.vue";
|
||||
|
||||
export default {
|
||||
|
|
@ -532,41 +525,50 @@ export default {
|
|||
}
|
||||
}]
|
||||
},
|
||||
value1: '',
|
||||
value2: '',
|
||||
tableData: [],
|
||||
pageSize: 10,
|
||||
pageNum: 1,
|
||||
total: 3,
|
||||
param: {
|
||||
//采购单号
|
||||
sourceId: '',
|
||||
//收货凭证号
|
||||
strBill7: '',
|
||||
code: '',
|
||||
//料号
|
||||
i_CODE: '',
|
||||
//物料描述
|
||||
i_name: '',
|
||||
//库区
|
||||
z_name: [],
|
||||
//库位号
|
||||
lc_CODE: '',
|
||||
//批次号
|
||||
PROP_C1: '',
|
||||
PROP_C3: '',
|
||||
CODE: '',
|
||||
PROP_C9: [],
|
||||
//LOC
|
||||
PROP_C2: [],
|
||||
//特殊标记
|
||||
PROP_C3: '',
|
||||
//工厂
|
||||
PROP_C9: [],
|
||||
//整理人
|
||||
OPERATOR: '',
|
||||
//SPA接口号
|
||||
a_CODE: '',
|
||||
//整理日期
|
||||
RECEIVE_DATE: [],
|
||||
//收货日期
|
||||
ORDER_DATE: [],
|
||||
//备注
|
||||
description: '',
|
||||
//容器码
|
||||
LP: ''
|
||||
},
|
||||
Plant: [],
|
||||
LOCS: [],
|
||||
MaxHeight: '',
|
||||
plant: [],
|
||||
loc: [],
|
||||
name: [],
|
||||
checked: false,
|
||||
zh:'',
|
||||
PROP_C2S: [
|
||||
{
|
||||
label: '1',
|
||||
value: 'LOC1'
|
||||
},
|
||||
{
|
||||
label: '2',
|
||||
value: 'LOC2'
|
||||
}
|
||||
],
|
||||
|
||||
isShow: false,
|
||||
form: {
|
||||
id: '',
|
||||
userNo: '',
|
||||
|
|
@ -594,9 +596,14 @@ export default {
|
|||
centerDialogVisible: false,
|
||||
title:''
|
||||
}
|
||||
},mounted() {
|
||||
this.PlantS();
|
||||
this.LOC();
|
||||
},
|
||||
mounted() {
|
||||
this.Plant();
|
||||
this.Loc();
|
||||
this.z_Name();
|
||||
this.$nextTick(()=> {
|
||||
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() {
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ const routes=[
|
|||
meta:{
|
||||
title:'首页'
|
||||
},
|
||||
component: () => import('../components/duochaxun/Rukuzhengli.vue')
|
||||
component: () => import('../components/duochaxun/Zhengliqingdan.vue')
|
||||
},
|
||||
{
|
||||
path:'/Zhengliqingdan',
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;i<str.length;i++){
|
||||
|
||||
if(str.length-1==i){
|
||||
sb.append("'"+ str[i]+"'");
|
||||
}else {
|
||||
sb.append("'"+ str[i]+"'"+",");
|
||||
}
|
||||
}
|
||||
sql_bz+=" and ad.sourceId in ("+sb.toString()+")";
|
||||
}
|
||||
|
||||
//收货凭证
|
||||
if(rukuzhengli.strBill7!=null&&!rukuzhengli.strBill7.equals("")){
|
||||
sql_bz+=" and ad.strBill7 ="+"'"+ rukuzhengli.strBill7+"'";
|
||||
String[] str=rukuzhengli.strBill7.split("\n");
|
||||
StringBuffer sb = new StringBuffer();
|
||||
for (int i=0;i<str.length;i++){
|
||||
|
||||
if(str.length-1==i){
|
||||
sb.append("'"+ str[i]+"'");
|
||||
}else {
|
||||
sb.append("'"+ str[i]+"'"+",");
|
||||
}
|
||||
}
|
||||
sql_bz+=" and ad.strBill7 in ("+sb.toString()+")";
|
||||
}
|
||||
|
||||
//料号
|
||||
if(rukuzhengli.code!=null&&!rukuzhengli.code.equals("")){
|
||||
sql_bz+=" and i.code ="+"'"+ rukuzhengli.code+"'";
|
||||
String[] str=rukuzhengli.code.split("\n");
|
||||
StringBuffer sb = new StringBuffer();
|
||||
for (int i=0;i<str.length;i++){
|
||||
|
||||
if(str.length-1==i){
|
||||
sb.append("'"+ str[i]+"'");
|
||||
}else {
|
||||
sb.append("'"+ str[i]+"'"+",");
|
||||
}
|
||||
}
|
||||
sql_bz+=" and i.code in ("+sb.toString()+")";
|
||||
}
|
||||
|
||||
//批次号
|
||||
if(rukuzhengli.PROP_C1!=null&&!rukuzhengli.PROP_C1.equals("")){
|
||||
String[] str=rukuzhengli.PROP_C1.split("\n");
|
||||
StringBuffer sb = new StringBuffer();
|
||||
for (int i=0;i<str.length;i++){
|
||||
|
||||
if(str.length-1==i){
|
||||
sb.append("'"+ str[i]+"'");
|
||||
}else {
|
||||
sb.append("'"+ str[i]+"'"+",");
|
||||
}
|
||||
}
|
||||
sql_bz+=" and ad.PROP_C1 in ("+sb.toString()+")";
|
||||
}
|
||||
|
||||
//收货日期
|
||||
if(rukuzhengli.ORDER_DATE!=null&& rukuzhengli.ORDER_DATE.length>0){
|
||||
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;
|
||||
//查询单数据
|
||||
|
|
|
|||
|
|
@ -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;i<str.length;i++){
|
||||
|
||||
if(str.length-1==i){
|
||||
sb.append("'"+ str[i]+"'");
|
||||
}else {
|
||||
sb.append("'"+ str[i]+"'"+",");
|
||||
}
|
||||
}
|
||||
sql+=" and ad.strBill7 in ("+sb.toString()+")";
|
||||
}
|
||||
|
||||
//料号
|
||||
if(zhengliqingdan.i_CODE!=null&&!zhengliqingdan.i_CODE.equals("")){
|
||||
String[] str=zhengliqingdan.i_CODE.split("\n");
|
||||
StringBuffer sb = new StringBuffer();
|
||||
for (int i=0;i<str.length;i++){
|
||||
|
||||
if(str.length-1==i){
|
||||
sb.append("'"+ str[i]+"'");
|
||||
}else {
|
||||
sb.append("'"+ str[i]+"'"+",");
|
||||
}
|
||||
}
|
||||
sql+=" and i.CODE in ("+sb.toString()+")";
|
||||
}
|
||||
|
||||
//物料描述
|
||||
if(zhengliqingdan.i_name!=null&&!zhengliqingdan.i_name.equals("")){
|
||||
sql+=" and i.NAME="+"'"+zhengliqingdan.i_name+"'";
|
||||
}
|
||||
|
||||
//库区
|
||||
if(zhengliqingdan.z_name!=null&& zhengliqingdan.z_name.length>0){
|
||||
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;i<str.length;i++){
|
||||
|
||||
if(str.length-1==i){
|
||||
sb.append("'"+ str[i]+"'");
|
||||
}else {
|
||||
sb.append("'"+ str[i]+"'"+",");
|
||||
}
|
||||
}
|
||||
sql+=" and lc.CODE in ("+sb.toString()+")";
|
||||
}
|
||||
|
||||
//批次号
|
||||
if(zhengliqingdan.PROP_C1!=null&&!zhengliqingdan.PROP_C1.equals("")){
|
||||
sql+=" and ik.PROP_C1="+"'"+zhengliqingdan.PROP_C1+"'";
|
||||
}
|
||||
|
||||
//LOC
|
||||
if(zhengliqingdan.PROP_C2!=null&& zhengliqingdan.PROP_C2.length>0){
|
||||
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;i<str.length;i++){
|
||||
|
||||
if(str.length-1==i){
|
||||
sb.append("'"+ str[i]+"'");
|
||||
}else {
|
||||
sb.append("'"+ str[i]+"'"+",");
|
||||
}
|
||||
}
|
||||
sql+=" and rd.OPERATOR in ("+sb.toString()+")";
|
||||
}
|
||||
|
||||
//SAP接口
|
||||
if(zhengliqingdan.a_CODE!=null&&!zhengliqingdan.a_CODE.equals("")){
|
||||
sql+=" and a.CODE="+"'"+zhengliqingdan.a_CODE+"'";
|
||||
}
|
||||
|
||||
//整理日期
|
||||
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+"'";
|
||||
}
|
||||
|
||||
//收货日期
|
||||
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<str.length;i++){
|
||||
|
||||
if(str.length-1==i){
|
||||
sb.append("'"+ str[i]+"'");
|
||||
}else {
|
||||
sb.append("'"+ str[i]+"'"+",");
|
||||
}
|
||||
}
|
||||
sql+=" and s.LP in ("+sb.toString()+")";
|
||||
}
|
||||
|
||||
|
||||
String sqlCount = "select count(1) as Znum from(" + sql+") t";
|
||||
String sqlFy = "select t.* from(" + sql+") t";
|
||||
|
||||
// System.out.println(sqlFy);
|
||||
|
||||
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);
|
||||
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<Map<String,Object>> 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<Map<String,Object>> 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<Map<String,Object>> list =jdbcTemplate.queryForList(sql,new HashMap<>());
|
||||
|
||||
return Result.success(list);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue