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

代码修改

Browse Source
This commit is contained in:
liyongde
2023-03-20 17:25:12 +08:00
parent 792213bccb
commit 19737d8d8e
5 changed files with 38 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/wql/MPS_PRODUCEWORKORDER.wql
View File

@@ -15,8 +15,8 @@
################################################# #################################################
输入.flag TYPEAS s_string 输入.flag TYPEAS s_string
输入.jockey_id TYPEAS s_string 输入.jockey_id TYPEAS s_string
输入.sale_id TYPEAS s_string 输入.sale_id TYPEAS s_string
输入.produceorder_id TYPEAS s_string 输入.produceorder_id TYPEAS s_string
输入.workprocedure_code TYPEAS s_string 输入.workprocedure_code TYPEAS s_string
输入.order_status TYPEAS s_string 输入.order_status TYPEAS s_string
输入.shift_type_scode TYPEAS s_string 输入.shift_type_scode TYPEAS s_string
@@ -75,7 +75,7 @@
ShiftOrder.workorder_status <> '5' ShiftOrder.workorder_status <> '5'
ENDOPTION ENDOPTION
OPTION 输入.order_status <> "" OPTION 输入.order_status <> ""
find_in_set( ShiftOrder.workorder_status, 输入.order_status) find_in_set(ShiftOrder.workorder_status, 输入.order_status)
ENDOPTION ENDOPTION
OPTION 输入.shift_type_scode <> "" OPTION 输入.shift_type_scode <> ""
ShiftOrder.shift_type_scode = 输入.shift_type_scode ShiftOrder.shift_type_scode = 输入.shift_type_scode
@@ -87,10 +87,10 @@
material.product_series in 输入.product_series material.product_series in 输入.product_series
ENDOPTION ENDOPTION
OPTION 输入.begin_time <> "" OPTION 输入.begin_time <> ""
ShiftOrder.produce_date >= 输入.begin_time ShiftOrder.realproducestart_date >= 输入.begin_time
ENDOPTION ENDOPTION
OPTION 输入.end_time <> "" OPTION 输入.end_time <> ""
ShiftOrder.produce_date <= 输入.end_time ShiftOrder.realproducestart_date <= 输入.end_time
ENDOPTION ENDOPTION
OPTION 输入.sale_id <> "" OPTION 输入.sale_id <> ""
ShiftOrder.sale_id like 输入.sale_id ShiftOrder.sale_id like 输入.sale_id

BIN
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls
View File

Binary file not shown.

50
mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/RegionServiceImpl.java
View File

@@ -125,19 +125,18 @@ public class RegionServiceImpl implements RegionService {
/** /**
* label,value * label,value
*/ */
// JSONArray res = new JSONArray(); JSONArray res = new JSONArray();
// String point_status_explain = findByCode(region_id).getPoint_status_explain(); String point_status_explain = findByCode(region_code).getPoint_status_explain();
// if (ObjectUtil.isEmpty(point_status_explain)) return res; if (ObjectUtil.isEmpty(point_status_explain)) return res;
// String[] explain = point_status_explain.split("，"); String[] explain = point_status_explain.split("，");
// for (int i = 0; i < explain.length; i++) { for (int i = 0; i < explain.length; i++) {
// String[] status = explain[i].split("-"); String[] status = explain[i].split("-");
// JSONObject point_status = new JSONObject(); JSONObject point_status = new JSONObject();
// point_status.put("label", status[1]); point_status.put("label", status[1]);
// point_status.put("value", status[0]); point_status.put("value", status[0]);
// res.add(point_status); res.add(point_status);
// } }
// return res; return res;
return null;
} }
/** /**
@@ -151,19 +150,18 @@ public class RegionServiceImpl implements RegionService {
/** /**
* label,value * label,value
*/ */
// JSONArray res = new JSONArray(); JSONArray res = new JSONArray();
// String point_type_explain = findById(region_id).getPoint_type_explain(); String point_type_explain = findByCode(region_code).getPoint_type_explain();
// if (ObjectUtil.isEmpty(point_type_explain)) return res; if (ObjectUtil.isEmpty(point_type_explain)) return res;
// String[] explain = point_type_explain.split("，"); String[] explain = point_type_explain.split("，");
// for (int i = 0; i < explain.length; i++) { for (int i = 0; i < explain.length; i++) {
// String[] types = explain[i].split("-"); String[] types = explain[i].split("-");
// JSONObject point_type = new JSONObject(); JSONObject point_type = new JSONObject();
// point_type.put("label", types[1]); point_type.put("label", types[1]);
// point_type.put("value", types[0]); point_type.put("value", types[0]);
// res.add(point_type); res.add(point_type);
// } }
// return res; return res;
return null;
} }
} }

16
mes/qd/src/views/wms/pdm/device/index.vue
View File

@@ -117,16 +117,16 @@
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler"> <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55" /> <el-table-column type="selection" width="55" />
<el-table-column prop="device_code" label="设备编码" width="100px" show-overflow-tooltip/> <el-table-column prop="device_code" label="设备编码" width="100px" show-overflow-tooltip/>
<el-table-column prop="device_name" label="设备名称" /> <el-table-column prop="device_name" label="设备名称" :min-width="flexWidth('device_name',crud.data,'设备名称')"/>
<el-table-column prop="product_area" label="生产区域" /> <el-table-column prop="product_area" label="生产区域" />
<el-table-column prop="device_code2" label="设备编码2" /> <el-table-column prop="device_code2" label="设备编码2" />
<el-table-column prop="inupperlimit_qty" label="设备来料仓上限数" width="120px"/> <el-table-column prop="inupperlimit_qty" label="设备来料仓上限数" :min-width="flexWidth('inupperlimit_qty',crud.data,'设备来料仓上限数')"/>
<el-table-column prop="inlowerlimit_qty" label="设备来料仓下限数" width="120px"/> <el-table-column prop="inlowerlimit_qty" label="设备来料仓下限数" :min-width="flexWidth('inlowerlimit_qty',crud.data,'设备来料仓下限数')"/>
<el-table-column prop="outupperlimit_qty" label="设备产品仓上限数" width="120px"/> <el-table-column prop="outupperlimit_qty" label="设备产品仓上限数" :min-width="flexWidth('outupperlimit_qty',crud.data,'设备产品仓上限数')"/>
<el-table-column prop="outlowerlimit_qty" label="设备产品仓下限数" width="120px"/> <el-table-column prop="outlowerlimit_qty" label="设备产品仓下限数" :min-width="flexWidth('outlowerlimit_qty',crud.data,'设备产品仓下限数')"/>
<el-table-column prop="deviceinitinstor_qty" label="设备初始来料仓数" width="120px"/> <el-table-column prop="deviceinitinstor_qty" label="设备初始来料仓数" :min-width="flexWidth('deviceinitinstor_qty',crud.data,'设备初始来料仓数')"/>
<el-table-column prop="deviceinstor_qty" label="设备实时来料仓数" width="120px"/> <el-table-column prop="deviceinstor_qty" label="设备实时来料仓数" :min-width="flexWidth('deviceinstor_qty',crud.data,'设备实时来料仓数')"/>
<el-table-column prop="deviceoutstor_qty" label="设备实时产品仓数" width="120px"/> <el-table-column prop="deviceoutstor_qty" label="设备实时产品仓数" :min-width="flexWidth('deviceoutstor_qty',crud.data,'设备实时产品仓数')"/>
<el-table-column prop="is_artificial" label="是否人工" > <el-table-column prop="is_artificial" label="是否人工" >
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.is_artificial=='1'?'是':'否'}} {{scope.row.is_artificial=='1'?'是':'否'}}

3
mes/qd/src/views/wms/sch/point/index.vue
View File

@@ -316,7 +316,6 @@
<el-input v-model="form.vehicle_code" clearable style="width: 370px;" /> <el-input v-model="form.vehicle_code" clearable style="width: 370px;" />
</el-form-item> </el-form-item>
<el-form-item label="已放载具类型" prop="vehicle_type"> <el-form-item label="已放载具类型" prop="vehicle_type">
<!-- <el-input v-model="" clearable style="width: 370px;" />-->
<el-select v-model="form.vehicle_type" placeholder="请选择" clearable style="width: 370px;"> <el-select v-model="form.vehicle_type" placeholder="请选择" clearable style="width: 370px;">
<el-option <el-option
v-for="item in dict.storagevehicle_type" v-for="item in dict.storagevehicle_type"
@@ -585,7 +584,7 @@ export default {
}).catch(() => { }).catch(() => {
}) })
}, },
getPointStatusAndTypeList(code, flag) { getPointStatusAndTypeList(code, flag) { // 获取点位状态和类型
if (code) { if (code) {
this.getPointStatusList(code, flag) this.getPointStatusList(code, flag)
this.getPointTypeList(code, flag) this.getPointTypeList(code, flag)