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

fix：对接位分配查询优化

Browse Source
This commit is contained in:
zhouz
2024-07-31 09:38:45 +08:00
parent 6ccd09a395
commit 7907a8493c
4 changed files with 71 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/FeedingServiceImpl.java
View File

@@ -356,10 +356,10 @@ public class FeedingServiceImpl implements FeedingService {
break; break;
} }
JSONObject map = new JSONObject(); JSONObject map = new JSONObject();
map.put("flag", "1"); map.put("flag", "4");
map.put("reging_id", reging_id); map.put("reging_id", reging_id);
map.put("point_location", cool_jo.getString("point_location")); map.put("point_location", cool_jo.getString("point_location"));
//只找出箱点位 //只找入箱点位
map.put("point_type", "5"); map.put("point_type", "5");
JSONObject pointArr = WQL.getWO("PDA_OVENINANDOUT_01").addParamMap(map).process().uniqueResult(0); JSONObject pointArr = WQL.getWO("PDA_OVENINANDOUT_01").addParamMap(map).process().uniqueResult(0);

3
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_OVENINANDOUT_01.wql
View File

@@ -299,13 +299,14 @@
AND IFNULL(po.material_code,'') = '' AND IFNULL(po.material_code,'') = ''
AND po.region_id = 输入.reging_id AND po.region_id = 输入.reging_id
AND po.point_location = 输入.point_location AND po.point_location = 输入.point_location
AND po.point_type = 输入.point_type
AND NOT EXISTS ( AND NOT EXISTS (
SELECT SELECT
* *
FROM FROM
sch_base_task sch_base_task
WHERE WHERE
( point_code2 = point_code OR point_code4 = point_code ) (point_code1 = point_code OR point_code2 = point_code OR point_code4 = point_code )
AND task_status < '07' AND task_status < '07'
AND is_delete = '0' AND is_delete = '0'
) )

5
lms/nladmin-system/src/main/java/org/nl/wms/sch/service/dto/PointDto.java
View File

@@ -92,6 +92,11 @@ public class PointDto implements Serializable {
*/ */
private String vehicle_code; private String vehicle_code;
/**
* 载具编码
*/
private String material_code;
/** /**
* 载具数量 * 载具数量
*/ */

96
lms/nladmin-ui/src/views/wms/sch/point/index.vue
View File

@@ -134,7 +134,7 @@
@change="hand" @change="hand"
/> />
</el-form-item> </el-form-item>
<rrOperation /> <rrOperation/>
</el-form> </el-form>
</div> </div>
@@ -199,16 +199,16 @@
> >
仓位同步 仓位同步
</el-button>--> </el-button>-->
<!-- <el-button <!-- <el-button
slot="right" slot="right"
class="filter-item" class="filter-item"
type="success" type="success"
icon="el-icon-check" icon="el-icon-check"
size="mini" size="mini"
@click="downdtl" @click="downdtl"
> >
导出Excel 导出Excel
</el-button>--> </el-button>-->
</crudOperation> </crudOperation>
<!--表单组件--> <!--表单组件-->
<el-dialog <el-dialog
@@ -220,7 +220,7 @@
> >
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
<el-form-item v-if="false" label="点位标识" prop="point_id"> <el-form-item v-if="false" label="点位标识" prop="point_id">
<el-input v-model="form.point_id" style="width: 370px;" /> <el-input v-model="form.point_id" style="width: 370px;"/>
</el-form-item> </el-form-item>
<el-form-item label="所属区域" prop="region_id"> <el-form-item label="所属区域" prop="region_id">
<el-select <el-select
@@ -237,10 +237,10 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="点位编码" prop="point_code"> <el-form-item label="点位编码" prop="point_code">
<el-input v-model="form.point_code" style="width: 370px;" :disabled="this.form.point_type==='01'" /> <el-input v-model="form.point_code" style="width: 370px;" :disabled="this.form.point_type==='01'"/>
</el-form-item> </el-form-item>
<el-form-item label="点位名称" prop="point_name"> <el-form-item label="点位名称" prop="point_name">
<el-input v-model="form.point_name" style="width: 370px;" :disabled="this.form.point_type==='01'" /> <el-input v-model="form.point_name" style="width: 370px;" :disabled="this.form.point_type==='01'"/>
</el-form-item> </el-form-item>
<el-form-item label="点位状态" prop="point_status"> <el-form-item label="点位状态" prop="point_status">
<el-select <el-select
@@ -289,11 +289,14 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="载具编码" prop="vehicle_code"> <el-form-item label="载具编码" prop="vehicle_code">
<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 label="物料批次" prop="material_code">
<el-input v-model="form.material_code" clearable style="width: 370px;"/>
</el-form-item> </el-form-item>
<el-form-item label="备注"> <el-form-item label="备注">
<el-input v-model="form.remark" style="width: 370px;" rows="2" type="textarea" /> <el-input v-model="form.remark" style="width: 370px;" rows="2" type="textarea"/>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@@ -310,30 +313,34 @@
style="width: 100%;" style="width: 100%;"
@selection-change="crud.selectionChangeHandler" @selection-change="crud.selectionChangeHandler"
> >
<el-table-column type="selection" width="55" /> <el-table-column type="selection" width="55"/>
<el-table-column prop="point_code" label="点位编码" sortable width="100" /> <el-table-column prop="point_code" label="点位编码" sortable width="100"/>
<el-table-column prop="point_name" label="点位名称" width="120" sortable show-overflow-tooltip /> <el-table-column prop="point_name" label="点位名称" width="120" sortable show-overflow-tooltip/>
<el-table-column prop="region_name" label="区域名称" min-width="120" show-overflow-tooltip /> <el-table-column prop="region_name" label="区域名称" min-width="120" show-overflow-tooltip/>
<el-table-column prop="point_type_name" label="点位类型" /> <el-table-column prop="point_type_name" label="点位类型"/>
<el-table-column prop="point_status_name" label="点位状态" /> <el-table-column prop="point_status_name" label="点位状态"/>
<el-table-column prop="lock_type_name" label="锁定类型" /> <el-table-column prop="lock_type_name" label="锁定类型"/>
<!-- <el-table-column prop="vehicle_type" label="载具类型" min-width="120"> <!-- <el-table-column prop="vehicle_type" label="载具类型" min-width="120">
<template slot-scope="scope"> <template slot-scope="scope">
{{ dict.label.vehicle_type[scope.row.vehicle_type] }} {{ dict.label.vehicle_type[scope.row.vehicle_type] }}
</template> </template>
</el-table-column>--> </el-table-column>-->
<el-table-column prop="vehicle_code" label="载具编码" :min-width="flexWidth('vehicle_code',crud.data,'载具编码')" /> <el-table-column prop="vehicle_code" label="载具编码"
<el-table-column prop="material_code" label="物料批次" :min-width="flexWidth('material_code',crud.data,'物料批次')" /> :min-width="flexWidth('vehicle_code',crud.data,'载具编码')"
<el-table-column prop="vehicle_qty" label="载具数量" /> />
<el-table-column prop="product_area" label="生产区域" /> <el-table-column prop="material_code" label="物料批次"
<el-table-column prop="remark" label="备注" min-width="100" show-overflow-tooltip /> :min-width="flexWidth('material_code',crud.data,'物料批次')"
/>
<el-table-column prop="vehicle_qty" label="载具数量"/>
<el-table-column prop="product_area" label="生产区域"/>
<el-table-column prop="remark" label="备注" min-width="100" show-overflow-tooltip/>
<el-table-column prop="is_used" label="是否启用"> <el-table-column prop="is_used" label="是否启用">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.is_used=='1' ? '是' : '否' }} {{ scope.row.is_used == '1' ? '是' : '否' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="update_optname" label="修改人" /> <el-table-column prop="update_optname" label="修改人"/>
<el-table-column prop="update_time" label="修改时间" width="150" /> <el-table-column prop="update_time" label="修改时间" width="150"/>
<el-table-column <el-table-column
v-permission="[]" v-permission="[]"
label="操作" label="操作"
@@ -350,7 +357,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<!--分页组件--> <!--分页组件-->
<pagination /> <pagination/>
</div> </div>
</div> </div>
</template> </template>
@@ -366,7 +373,26 @@ import pagination from '@crud/Pagination'
import { download } from '@/api/data' import { download } from '@/api/data'
import { downloadFile } from '@/utils' import { downloadFile } from '@/utils'
const defaultForm = { point_id: null, point_code: null, point_name: null, point_type: null, point_status: null, lock_type: '1', vehicle_code: null, source_id: null, remark: null, is_used: null, is_delete: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null } const defaultForm = {
point_id: null,
point_code: null,
material_code: null,
point_name: null,
point_type: null,
point_status: null,
lock_type: '1',
vehicle_code: null,
source_id: null,
remark: null,
is_used: null,
is_delete: null,
create_id: null,
create_name: null,
create_time: null,
update_optid: null,
update_optname: null,
update_time: null
}
export default { export default {
name: 'Point', name: 'Point',
dicts: ['vehicle_type', 'd_lock_type', 'SCH_TASK_TYPE_DTL', 'vehicle_type'], dicts: ['vehicle_type', 'd_lock_type', 'SCH_TASK_TYPE_DTL', 'vehicle_type'],
@@ -483,7 +509,9 @@ export default {
this.getPointStatusList(id, flag) this.getPointStatusList(id, flag)
this.getPointTypeList(id, flag) this.getPointTypeList(id, flag)
} }
if (flag === 1) { this.crud.toQuery() } if (flag === 1) {
this.crud.toQuery()
}
}, },
getPointStatusList(id, flag) { getPointStatusList(id, flag) {
debugger debugger