root/wuHanXinRui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://121.40.234.130:8899/root/wuHanXinRui

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2022-08-24 11:25:20 +08:00
parent a2ccffd8b1 73a6f7d44e
commit 12190ed0c5
14 changed files with 63 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/IvtQueryServiceImpl.java
View File

@@ -30,7 +30,6 @@ public class IvtQueryServiceImpl implements IvtQueryService {
HashMap map = new HashMap();
map.put("flag", "1");
map.put("stor_id", MapUtil.getStr(whereJson,"stor_id"));
map.put("sect_id", MapUtil.getStr(whereJson,"sect_id"));
map.put("material_name", MapUtil.getStr(whereJson,"material_name"));
map.put("material_type_id", MapUtil.getStr(whereJson,"material_type_id"));
map.put("storagevehicle_code", MapUtil.getStr(whereJson,"storagevehicle_code"));
@@ -51,6 +50,21 @@ public class IvtQueryServiceImpl implements IvtQueryService {
String classIds = classstandardService.getAllChildIdStr(class_idStr);
map.put("classIds", classIds);
}
String sect_id = (String) whereJson.get("sect_id");
if(StrUtil.isNotEmpty(sect_id)){
String[] sects = sect_id.substring(1).split(",");
StringBuilder sb = new StringBuilder();
if(sects != null){
for(int i=0;i< sects.length;i++){
sb.append(",'" + sects[i] + "'");
}
}
if(sb.length()>0){
String str = sb.toString();
str = "(" + str.substring(1) + ")";
map.put("sects",str);
}
}
JSONObject json = WQL.getWO("Qivt_query_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "ivt.instorage_time desc");
return json;
}
@@ -74,7 +88,6 @@ public class IvtQueryServiceImpl implements IvtQueryService {
HashMap map = new HashMap();
map.put("flag", "1");
map.put("stor_id", MapUtil.getStr(whereJson,"stor_id"));
map.put("sect_id", MapUtil.getStr(whereJson,"sect_id"));
map.put("material_name", MapUtil.getStr(whereJson,"material_name"));
map.put("material_type_id", MapUtil.getStr(whereJson,"material_type_id"));
map.put("storagevehicle_code", MapUtil.getStr(whereJson,"storagevehicle_code"));
@@ -95,6 +108,21 @@ public class IvtQueryServiceImpl implements IvtQueryService {
String classIds = classstandardService.getAllChildIdStr(class_idStr);
map.put("classIds", classIds);
}
String sect_id = (String) whereJson.get("sect_id");
if(StrUtil.isNotEmpty(sect_id)){
String[] sects = sect_id.substring(1).split(",");
StringBuilder sb = new StringBuilder();
if(sects != null){
for(int i=0;i< sects.length;i++){
sb.append(",'" + sects[i] + "'");
}
}
if(sb.length()>0){
String str = sb.toString();
str = "(" + str.substring(1) + ")";
map.put("sects",str);
}
}
JSONArray rows = WQL.getWO("Qivt_query_01").addParamMap(map).process().getResultJSONArray(0);
List<Map<String, Object>> list = new ArrayList<>();
for (int i = 0; i < rows.size(); i++) {

5
mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/Qivt_query_01.wql
View File

@@ -27,6 +27,7 @@
输入.bucketunique TYPEAS s_string
输入.material_model TYPEAS s_string
输入.classIds TYPEAS f_string
输入.sects TYPEAS f_string
[临时表]
@@ -108,8 +109,8 @@
OPTION 输入.stor_id <> ""
struct.stor_id = 输入.stor_id
ENDOPTION
OPTION 输入.sect_id <> ""
struct.sect_id = 输入.sect_id
OPTION 输入.sects <> ""
struct.sect_id in 输入.sects
ENDOPTION
OPTION 输入.material_name <> ""
( me.material_name like "%" 输入.material_name "%" or me.material_code like "%" 输入.material_name "%" )

10
mes/qd/src/views/wms/statistics/hpcQuery/index.vue
View File

@@ -53,8 +53,8 @@
v-loading="crud.loading"
:data="crud.data"
size="mini"
height="420"
style="width: 100%;"
:max-height="420"
style="width: 100%;background: transparent;overflow:auto;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="index" label="序号" width="100" align="center" />
@@ -63,7 +63,8 @@
</template>
</el-table>
<!--分页组件-->
<pagination />
<pagination />
</div>
</div>
</template>
@@ -131,4 +132,7 @@ export default {
<style scoped>
::-webkit-scrollbar-corner{
background: transparent;
}
</style>

2
mes/qd/src/views/wms/statistics/ioStorQuery/index.vue
View File

@@ -188,7 +188,7 @@
v-loading="crud.loading"
size="mini"
:data="crud.data"
height="420"
:max-height="420"
style="width: 100%;"
:highlight-current-row="true"
@selection-change="crud.selectionChangeHandler"

27
mes/qd/src/views/wms/statistics/ivtQuery/index.vue
View File

@@ -15,8 +15,9 @@
<el-cascader
placeholder="所属库区"
:options="sects"
:props="{ checkStrictly: true }"
:props="{ multiple: true }"
clearable
collapse-tags
class="filter-item"
@change="sectQueryChange"
/>
@@ -138,7 +139,6 @@
class="filter-item"
type="success"
icon="el-icon-check"
:disabled="downdtl_flag"
size="mini"
@click="downdtl"
>
@@ -151,7 +151,7 @@
ref="table"
v-loading="crud.loading"
:data="crud.data"
height="420"
:max-height="420"
size="mini"
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
@@ -168,9 +168,9 @@
</el-table-column>
<el-table-column prop="material_code" label="物料编码" min-width="150" show-overflow-tooltip />
<el-table-column prop="material_name" label="物料名称" min-width="120" show-overflow-tooltip />
<el-table-column prop="material_spec" label="物料规格" show-overflow-tooltip/>
<el-table-column prop="material_spec" label="物料规格" show-overflow-tooltip />
<el-table-column prop="material_model" label="型号" />
<el-table-column prop="pcsn" label="批次" show-overflow-tooltip width="150px"/>
<el-table-column prop="pcsn" label="批次" show-overflow-tooltip width="150px" />
<el-table-column prop="quality_scode" label="品质类型" :formatter="format_quality_scode" />
<el-table-column prop="ivt_level" label="库存等级" :formatter="format_ivt_level" />
<el-table-column prop="is_active" label="是否可用" :formatter="format_is_active" />
@@ -185,7 +185,7 @@
<!--分页组件-->
<pagination />
</div>
<BucketDialog :dialog-show.sync="bucketDialog" :open-param="openParam"/>
<BucketDialog :dialog-show.sync="bucketDialog" :open-param="openParam" />
</div>
</template>
@@ -259,17 +259,16 @@ export default {
return true
},
sectQueryChange(val) {
if (val.length === 1) {
this.query.stor_id = val[0]
this.query.sect_id = ''
}
debugger
if (val.length === 0) {
this.query.sect_id = ''
this.query.stor_id = ''
}
if (val.length === 2) {
this.query.stor_id = val[0]
this.query.sect_id = val[1]
} else {
this.query.stor_id = val[0][0]
this.query.sect_id = ''
for (var i = 0; i < val.length; i++) {
this.query.sect_id = this.query.sect_id + ',' + val[i][1]
}
}
this.crud.toQuery()
},

2
mes/qd/src/views/wms/statistics/ledgerQuery/index.vue
View File

@@ -57,7 +57,7 @@
ref="table"
v-loading="crud.loading"
:data="crud.data"
height="420"
:max-height="420"
size="mini"
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"

2
mes/qd/src/views/wms/statistics/outStorQuery/index.vue
View File

@@ -101,7 +101,7 @@
ref="table"
v-loading="crud.loading"
size="mini"
height="420"
:max-height="420"
:data="crud.data"
style="width: 100%;"
:highlight-current-row="true"

2
mes/qd/src/views/wms/statistics/phySicalQuery/index.vue
View File

@@ -119,7 +119,7 @@
ref="table"
v-loading="crud.loading"
:data="crud.data"
height="420"
:max-height="420"
size="mini"
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"

2
mes/qd/src/views/wms/statistics/powderOrderQuery/index.vue
View File

@@ -68,7 +68,7 @@
<!--表格渲染-->
<el-table
ref="table"
height="420"
:max-height="420"
v-loading="crud.loading"
:data="crud.data"
size="mini"

2
mes/qd/src/views/wms/statistics/powderProductionQuery/index.vue
View File

@@ -52,7 +52,7 @@
v-loading="crud.loading"
:data="crud.data"
size="mini"
height="420"
:max-height="420"
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>

2
mes/qd/src/views/wms/statistics/productionDayQuery/index.vue
View File

@@ -63,7 +63,7 @@
v-loading="crud.loading"
:data="crud.data"
size="mini"
height="420"
:max-height="420"
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>

2
mes/qd/src/views/wms/statistics/rawUatWcQuery/index.vue
View File

@@ -92,7 +92,7 @@
v-loading="crud.loading"
:data="crud.data"
size="mini"
height="420"
:max-height="420"
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>

2
mes/qd/src/views/wms/statistics/sendReceiveQuery/index.vue
View File

@@ -81,7 +81,7 @@
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission"/>
<!--表格渲染-->
<el-table ref="table" show-summary :summary-method="getSum" height="420" v-loading="crud.loading" :data="crud.data" size="mini"
<el-table ref="table" show-summary :summary-method="getSum" :max-height="420" v-loading="crud.loading" :data="crud.data" size="mini"
style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column prop="class_name" label="物料分类"/>
<el-table-column prop="material_code" label="物料编码" min-width="150" show-overflow-tooltip/>

2
mes/qd/src/views/wms/statistics/stifleQuery/index.vue
View File

@@ -52,7 +52,7 @@
ref="table"
v-loading="crud.loading"
:data="crud.data"
height="420"
:max-height="420"
size="mini"
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"