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

优化

Browse Source
This commit is contained in:
zds
2022-12-07 14:34:03 +08:00
parent 5199a6ecc2
commit ddf34c272d
6 changed files with 67 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mes/hd/nladmin-system/src/main/java/org/nl/ext/lk/wql/QLK01.wql
View File

@@ -20,7 +20,7 @@
输入.pcsn TYPEAS s_string
输入.begin_time TYPEAS s_string
输入.end_time TYPEAS s_string
输入.weigh_status TYPEAS s_string
输入.weight_status TYPEAS s_string
输入.status TYPEAS s_string
输入.available TYPEAS s_string
@@ -114,6 +114,7 @@
pcsn,
status,
available,
weight_status,
MAX(inputtime) AS inputtime
FROM
VWmsInventory
@@ -145,7 +146,7 @@
available = 输入.available
ENDOPTION
group by material_code,material_name,available,pcsn,status,pallet_code
group by material_code,material_name,available,pcsn,status,pallet_code,weight_status
ENDSELECT
ENDPAGEQUERY
@@ -194,7 +195,7 @@
pcsn,
status,
available,
weigh_status,
weight_status,
MAX(inputtime) AS inputtime
FROM
VWmsInventory
@@ -219,10 +220,10 @@
OPTION 输入.available <> ""
available = 输入.available
ENDOPTION
OPTION 输入.weigh_status <> ""
weigh_status = 输入.weigh_status
OPTION 输入.weight_status <> ""
weight_status = 输入.weight_status
ENDOPTION
group by material_code,material_name,available,pcsn,status,pallet_code,weigh_status
group by material_code,material_name,available,pcsn,status,pallet_code,weight_status
order by material_code,pcsn
ENDSELECT
ENDQUERY

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/lk/service/impl/LibraryqueryServiceImpl.java
View File

@@ -50,7 +50,7 @@ public class LibraryqueryServiceImpl implements LibraryqueryService {
if (ObjectUtil.isNotEmpty(pcsn)) {
map.put("pcsn","%"+pcsn+"%" );
}
map.put("weigh_status", MapUtil.getStr(whereJson,"weigh_status"));
map.put("weight_status", MapUtil.getStr(whereJson,"weight_status"));
map.put("begin_time", MapUtil.getStr(whereJson,"begin_time"));
map.put("end_time", MapUtil.getStr(whereJson,"end_time"));
map.put("status", MapUtil.getStr(whereJson,"status"));
@@ -137,7 +137,7 @@ public class LibraryqueryServiceImpl implements LibraryqueryService {
map.put("begin_time", MapUtil.getStr(whereJson,"begin_time"));
map.put("end_time", MapUtil.getStr(whereJson,"end_time"));
map.put("status", MapUtil.getStr(whereJson,"status"));
map.put("weigh_status", MapUtil.getStr(whereJson,"weigh_status"));
map.put("weight_status", MapUtil.getStr(whereJson,"weight_status"));
map.put("available", MapUtil.getStr(whereJson,"available"));
JSONArray rows = WQL.getWO("QLK01").setDbname("dataSource2").addParamMap(map).process().getResultJSONArray(0);
@@ -166,7 +166,7 @@ public class LibraryqueryServiceImpl implements LibraryqueryService {
}else{
dtl_map.put("是否可用", "不可用");
}
dtl_map.put("称重状态", jo.getString("weigh_status"));
dtl_map.put("称重状态", jo.getString("weight_status"));
dtl_map.put("入库时间", jo.getString("inputtime"));
list.add(dtl_map);
}

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

@@ -284,8 +284,10 @@ public class StatisticalReportServiceImpl implements StatisticalReportService {
map.put("ext_id", jsonMater.getString("ext_id"));
//JSONObject num_jo = null;
JSONObject num_jo = WQL.getWO("QL_ERP").addParamMap(map).setDbname("dataSource1").process().uniqueResult(0);
//合同在途
double notqty = 0;
if (ObjectUtil.isNotEmpty(num_jo)) {

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

@@ -107,28 +107,57 @@
SELECT DISTINCT
mb.material_id,
mb.material_name,
mb.material_code
FROM
mb.material_code,
class.parent_class_id,
(
SELECT
wo.material_id
CASE
WHEN class.class_id = '1503644362192588800' THEN
1
WHEN class.class_id = '1503644361664106496' THEN
2
WHEN class.class_id = '1503644362788179968' THEN
4
WHEN class.class_id = '1503644362234531840' THEN
5 ELSE 3
END
) AS order_no
FROM
pdm_bi_workorder wo
WHERE
wo.is_delete = '0'
AND wo.`status` IN ( '10', '20', '30' )
UNION
SELECT
plan.material_id
FROM
mps_bd_productdailyplan plan
WHERE
plan.`status` = '01'
) a
LEFT JOIN md_pd_productbom bom ON bom.material_id = a.material_id
LEFT JOIN md_pd_productbomdtl dtl ON dtl.bom_id = bom.bom_id
LEFT JOIN md_me_materialbase mb ON mb.material_id = dtl.material_id
ORDER BY material_code
(
SELECT
dtl.material_id
FROM
(
SELECT
wo.material_id
FROM
pdm_bi_workorder wo
WHERE
wo.is_delete = '0'
AND wo.`status` IN ( '10', '20', '30' ) UNION
SELECT
plan.material_id
FROM
mps_bd_productdailyplan plan
WHERE
plan.`status` = '01'
) a
INNER JOIN md_pd_productbom bom ON bom.material_id = a.material_id
INNER JOIN md_pd_productbomdtl dtl ON dtl.bom_id = bom.bom_id UNION
SELECT
mb2.material_id
FROM
md_me_materialbase mb2
WHERE
1 = 1
AND mb2.is_delete = '0'
AND mb2.material_type_id IN ( '1503644361664106496', '1503644361697660928', '1503644362192588800', '1503644362234531840', '1503644362788179968', '1503644362838511616' )
) b
INNER JOIN md_me_materialbase mb ON mb.material_id = b.material_id
INNER JOIN md_pb_classstandard class ON class.class_id = mb.material_type_id
ORDER BY
order_no,
material_code
ENDSELECT
ENDQUERY
ENDIF

2
mes/qd/src/views/wms/lk/libraryquery/QueryDtlDialog.vue
View File

@@ -29,7 +29,7 @@
<el-table-column prop="weight" label="重量" :formatter="crud.formatNum3" min-width="120" />
<el-table-column prop="status" label="品质类型" :formatter="formatStatus" min-width="120" />
<el-table-column prop="available" label="是否可用" :formatter="formatIsUsable" min-width="120" />
<el-table-column prop="weigh_status" label="称重状态" min-width="120" />
<el-table-column prop="weight_status" label="称重状态" min-width="120" />
<el-table-column prop="ordernum" label="序号" min-width="120" />
<el-table-column prop="inputtime" label="入库时间" min-width="150" />
</el-table>

11
mes/qd/src/views/wms/lk/libraryquery/index.vue
View File

@@ -80,7 +80,7 @@
<el-form-item label="称重状态">
<el-select
v-model="query.weigh_status"
v-model="query.weight_status"
clearable
size="mini"
placeholder="请选择"
@@ -89,7 +89,7 @@
@change="hand"
>
<el-option
v-for="item in dict.weigh_status"
v-for="item in dict.weight_status"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -136,7 +136,7 @@
<el-table-column prop="weight" label="重量" :formatter="crud.formatNum3" min-width="120" />
<el-table-column prop="status" label="品质类型" :formatter="formatStatus" min-width="120" />
<el-table-column prop="available" label="是否可用" :formatter="formatIsUsable" min-width="120"/>
<el-table-column prop="weigh_status" label="称重状态" min-width="120"/>
<el-table-column prop="weight_status" label="称重状态" min-width="120"/>
<el-table-column prop="inputtime" label="入库时间" min-width="150" />
</el-table>
<!--分页组件-->
@@ -151,7 +151,6 @@ import crudLibraryquery from '@/api/wms/lk/libraryquery'
import CRUD, { presenter, header, form, crud } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import DateRangePicker from '@/components/DateRangePicker'
import QueryDtlDialog from '@/views/wms/lk/libraryquery/QueryDtlDialog'
@@ -161,8 +160,8 @@ import { downloadFile } from '@/utils'
const defaultForm = { agvaddr: null }
export default {
name: 'Libraryquery',
dicts: ['is_usable', 'ST_QUALITY_SCODE', 'weigh_status'],
components: { QueryDtlDialog, pagination, crudOperation, rrOperation, udOperation, DateRangePicker },
dicts: ['is_usable', 'ST_QUALITY_SCODE', 'weight_status'],
components: { QueryDtlDialog, pagination, crudOperation, rrOperation, DateRangePicker },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({