psh
12 months ago
23 changed files with 635 additions and 24 deletions
@ -1,6 +0,0 @@ |
|||
<?xml version="1.0" encoding="UTF-8"?> |
|||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> |
|||
<mapper namespace="org.nl.wms.sch.material.service.dao.mapper.MaterialMapper"> |
|||
|
|||
|
|||
</mapper> |
|||
@ -0,0 +1,35 @@ |
|||
package org.nl.wms.sch.report; |
|||
|
|||
import io.swagger.annotations.Api; |
|||
import io.swagger.annotations.ApiOperation; |
|||
import lombok.extern.slf4j.Slf4j; |
|||
import org.nl.common.base.TableDataInfo; |
|||
import org.nl.common.domain.query.PageQuery; |
|||
import org.nl.common.logging.annotation.Log; |
|||
import org.nl.wms.sch.report.service.IReportService; |
|||
import org.nl.wms.sch.report.service.dto.ReportQuery; |
|||
import org.springframework.beans.factory.annotation.Autowired; |
|||
import org.springframework.http.HttpStatus; |
|||
import org.springframework.http.ResponseEntity; |
|||
import org.springframework.web.bind.annotation.*; |
|||
|
|||
@Slf4j |
|||
@RestController |
|||
@Api(tags = "报表管理") |
|||
@RequestMapping("/api/report") |
|||
public class ReportController { |
|||
|
|||
@Autowired |
|||
private IReportService reportService; |
|||
|
|||
@GetMapping |
|||
@Log("查询组盘信息管理") |
|||
@ApiOperation("查询组盘信息管理") |
|||
//@SaCheckPermission("@el.check('material:list')")
|
|||
public ResponseEntity<Object> query(ReportQuery whereJson, PageQuery page){ |
|||
return new ResponseEntity<>(TableDataInfo.build(reportService.queryAll(whereJson,page)),HttpStatus.OK); |
|||
} |
|||
|
|||
|
|||
|
|||
} |
|||
@ -0,0 +1,20 @@ |
|||
package org.nl.wms.sch.report.service; |
|||
|
|||
import com.baomidou.mybatisplus.core.metadata.IPage; |
|||
import com.baomidou.mybatisplus.extension.service.IService; |
|||
import org.nl.common.domain.query.PageQuery; |
|||
import org.nl.wms.sch.report.service.dto.ReportDto; |
|||
import org.nl.wms.sch.report.service.dto.ReportQuery; |
|||
|
|||
|
|||
public interface IReportService extends IService<ReportDto> { |
|||
|
|||
/** |
|||
* 查询数据分页 |
|||
* @param whereJson 条件 |
|||
* @param pageable 分页参数 |
|||
* @return IPage<Material> |
|||
*/ |
|||
IPage<ReportDto> queryAll(ReportQuery whereJson, PageQuery pageable); |
|||
|
|||
} |
|||
@ -0,0 +1,23 @@ |
|||
package org.nl.wms.sch.report.service.dao.mapper; |
|||
|
|||
import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
|||
import com.baomidou.mybatisplus.core.metadata.IPage; |
|||
import org.nl.wms.pdm.service.dao.PdmBdWorkorder; |
|||
import org.nl.wms.pdm.service.dto.PdmBdWorkorderQuery; |
|||
import org.nl.wms.sch.report.service.dto.ReportDto; |
|||
import org.nl.wms.sch.report.service.dto.ReportQuery; |
|||
|
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @author lyd |
|||
* @date 2023-05-16 |
|||
**/ |
|||
public interface ReportMapper extends BaseMapper<ReportDto> { |
|||
|
|||
/** |
|||
* 分页查找 |
|||
* @return |
|||
*/ |
|||
IPage<ReportDto> queryReport(IPage<ReportDto> pages, ReportQuery query); |
|||
} |
|||
@ -0,0 +1,26 @@ |
|||
<?xml version="1.0" encoding="UTF-8"?> |
|||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> |
|||
<mapper namespace="org.nl.wms.sch.report.service.dao.mapper.ReportMapper"> |
|||
|
|||
<select id="queryReport" resultType="org.nl.wms.sch.report.service.dto.ReportDto"> |
|||
SELECT |
|||
p.point_code as pointCode, |
|||
m.productDescription, |
|||
m.supplierName |
|||
FROM |
|||
sch_base_point p |
|||
LEFT JOIN sch_base_material m ON p.vehicle_code2 = m.lotSN |
|||
WHERE |
|||
region_code IN ( 'HW', 'HWK' ) |
|||
AND vehicle_code2 IS NOT NULL |
|||
AND vehicle_code2 != '' |
|||
<if test="query.supplierName != null"> |
|||
and m.supplierName like CONCAT('%', #{query.supplierName}, '%') |
|||
</if> |
|||
<if test="query.productDescription != null"> |
|||
and m.productDescription like CONCAT('%', #{query.productDescription}, '%') |
|||
</if> |
|||
ORDER BY point_code ASC |
|||
</select> |
|||
|
|||
</mapper> |
|||
@ -0,0 +1,15 @@ |
|||
package org.nl.wms.sch.report.service.dto; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
@Data |
|||
public class ReportDto implements Serializable { |
|||
/** 点位编码 */ |
|||
private String pointCode; |
|||
/** 物料名称 */ |
|||
private String productDescription; |
|||
/** 供应商名称 */ |
|||
private String supplierName; |
|||
} |
|||
@ -0,0 +1,23 @@ |
|||
package org.nl.wms.sch.report.service.dto; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
@Data |
|||
public class ReportQuery implements Serializable { |
|||
//托盘号
|
|||
private String palletSN; |
|||
//物料条码号
|
|||
private String lotSN; |
|||
//物料名称
|
|||
private String productName; |
|||
//供应商编码
|
|||
private String productDescription; |
|||
//供应商编码
|
|||
private String supplierCode; |
|||
//供应商名称
|
|||
private String supplierName; |
|||
//绑定状态
|
|||
private String group_bind_material_status; |
|||
} |
|||
@ -0,0 +1,40 @@ |
|||
package org.nl.wms.sch.report.service.impl; |
|||
|
|||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
|||
import com.baomidou.mybatisplus.core.metadata.IPage; |
|||
import com.baomidou.mybatisplus.core.toolkit.StringUtils; |
|||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
|||
import lombok.extern.slf4j.Slf4j; |
|||
import org.nl.common.domain.query.PageQuery; |
|||
import org.nl.wms.pdm.service.dao.PdmBdWorkorder; |
|||
import org.nl.wms.pdm.service.dto.PdmBdWorkorderQuery; |
|||
import org.nl.wms.sch.material.service.dao.Material; |
|||
import org.nl.wms.sch.material.service.dao.mapper.MaterialMapper; |
|||
import org.nl.wms.sch.report.service.IReportService; |
|||
import org.nl.wms.sch.report.service.dao.mapper.ReportMapper; |
|||
import org.nl.wms.sch.report.service.dto.ReportDto; |
|||
import org.nl.wms.sch.report.service.dto.ReportQuery; |
|||
import org.springframework.beans.factory.annotation.Autowired; |
|||
import org.springframework.stereotype.Service; |
|||
import org.nl.common.utils.PageUtil; |
|||
|
|||
import java.util.List; |
|||
|
|||
@Slf4j |
|||
@Service |
|||
public class ReportServiceImpl extends ServiceImpl<ReportMapper, ReportDto> implements IReportService { |
|||
|
|||
@Autowired |
|||
private ReportMapper reportMapper; |
|||
|
|||
@Override |
|||
public IPage<ReportDto> queryAll(ReportQuery query, PageQuery pageQuery){ |
|||
IPage<ReportDto> pages = new Page<>(pageQuery.getPage() + 1, pageQuery.getSize()); |
|||
pages = reportMapper.queryReport(pages, query); |
|||
return pages; |
|||
|
|||
} |
|||
|
|||
|
|||
} |
|||
@ -0,0 +1,333 @@ |
|||
<template> |
|||
<div class="app-container"> |
|||
<!--工具栏--> |
|||
<div class="head-container"> |
|||
<div v-if="crud.props.searchToggle"> |
|||
<el-form |
|||
:inline="true" |
|||
class="demo-form-inline" |
|||
label-position="right" |
|||
label-width="90px" |
|||
label-suffix=":" |
|||
> |
|||
<el-form-item label="供应商名称"> |
|||
<el-input |
|||
v-model="query.supplierName" |
|||
clearable |
|||
size="mini" |
|||
placeholder="供应商名称" |
|||
@keyup.enter.native="crud.toQuery" |
|||
/> |
|||
</el-form-item> |
|||
<el-form-item label="物料名称"> |
|||
<el-input |
|||
v-model="query.productDescription" |
|||
clearable |
|||
size="mini" |
|||
placeholder="物料名称" |
|||
@keyup.enter.native="crud.toQuery" |
|||
/> |
|||
</el-form-item> |
|||
<rrOperation /> |
|||
</el-form> |
|||
</div> |
|||
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'--> |
|||
<crudOperation :permission="permission" /> |
|||
<!--表单组件--> |
|||
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="800px"> |
|||
<el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" :rules="rules" size="mini" label-width="115px" label-suffix=":"> |
|||
<el-form-item label="载具编码"> |
|||
<el-input v-model="form.vehicle_code" style="width: 240px;" /> |
|||
</el-form-item> |
|||
<!--<el-form-item label="子载具编码"> |
|||
<el-input v-model="form.child_vehicle_code" style="width: 240px;" /> |
|||
</el-form-item>--> |
|||
<!-- <el-form-item v-if="false" label="来源载具"> |
|||
<el-input v-model="form.source_vehicle_code" style="width: 240px;" /> |
|||
</el-form-item> --> |
|||
<el-form-item label="托盘类型"> |
|||
<el-radio-group v-model="form.vehicle_type" style="width: 240px"> |
|||
<el-radio label="1">子托盘</el-radio> |
|||
<el-radio label="0">母托盘</el-radio> |
|||
</el-radio-group> |
|||
</el-form-item> |
|||
<el-form-item label="回温开始时间"> |
|||
<el-date-picker |
|||
v-model="form.instorage_time" |
|||
type="datetime" |
|||
value-format="yyyy-MM-dd HH:mm:ss" |
|||
style="width: 240px;" |
|||
placeholder="选择日期时间" |
|||
/> |
|||
</el-form-item> |
|||
<el-form-item label="点位编码"> |
|||
<el-select |
|||
v-model="form.point_code" |
|||
filterable |
|||
placeholder="请选择" |
|||
style="width: 240px;" |
|||
@change="setPointName" |
|||
> |
|||
<el-option |
|||
v-for="item in pointList" |
|||
:key="item.point_code" |
|||
:label="item.point_code" |
|||
:value="item.point_code" |
|||
> |
|||
<span style="float: left">{{ item.point_name }}</span> |
|||
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.point_code }}</span> |
|||
</el-option> |
|||
</el-select> |
|||
<!-- <el-input v-model="form.point_code" style="width: 240px;" />--> |
|||
</el-form-item> |
|||
<el-form-item label="点位名称"> |
|||
<el-input v-model="form.point_name" style="width: 240px;" disabled /> |
|||
</el-form-item> |
|||
<el-form-item label="是否满托"> |
|||
<el-radio-group v-model="form.is_full" style="width: 240px"> |
|||
<el-radio :label="true">是</el-radio> |
|||
<el-radio :label="false">否</el-radio> |
|||
</el-radio-group> |
|||
</el-form-item> |
|||
<el-form-item label="批次"> |
|||
<el-input v-model="form.pcsn" style="width: 240px;" /> |
|||
</el-form-item> |
|||
<el-form-item label="静置时间(分钟)"> |
|||
<el-input-number |
|||
v-model.number="form.standing_time" |
|||
:min="1" |
|||
:max="999" |
|||
style="width: 240px;" |
|||
/> |
|||
</el-form-item> |
|||
<el-form-item label="物料数量"> |
|||
<el-input-number |
|||
v-model.number="form.material_qty" |
|||
:min="0" |
|||
style="width: 240px;" |
|||
/> |
|||
</el-form-item> |
|||
<el-form-item label="物料重量"> |
|||
<el-input-number |
|||
v-model.number="form.material_weight" |
|||
:min="0" |
|||
style="width: 240px;" |
|||
/> |
|||
</el-form-item> |
|||
<el-form-item label="工单编码"> |
|||
<el-input v-model="form.workorder_code" style="width: 240px;" /> |
|||
</el-form-item> |
|||
<el-form-item label="物料来源"> |
|||
<el-radio-group v-model="choose" size="mini" style="width: 240px;"> |
|||
<el-radio-button label="物料" /> |
|||
<el-radio-button label="工单" /> |
|||
</el-radio-group> |
|||
</el-form-item> |
|||
<el-form-item v-if="false" label="物料名称"> |
|||
<el-input v-model="form.material_id" suffix-icon="el-icon-date" clearable style="width: 370px;" @focus="getMaterial" /> |
|||
</el-form-item> |
|||
<el-form-item label="物料名称"> |
|||
<el-input v-model="form.material_name" clearable style="width: 240px;" @clear="clearMaterial" @focus="getMaterial" /> |
|||
</el-form-item> |
|||
<el-form-item label="物料编码"> |
|||
<el-input v-model="form.material_code" disabled style="width: 240px;" /> |
|||
</el-form-item> |
|||
<el-form-item label="物料规格"> |
|||
<el-input v-model="form.material_spec" disabled style="width: 240px;" /> |
|||
</el-form-item> |
|||
<el-form-item label="组盘次数"> |
|||
<el-input v-model="form.group_number" style="width: 240px;" /> |
|||
</el-form-item> |
|||
<el-form-item label="任务编码"> |
|||
<el-input v-model="form.task_code" style="width: 240px;" /> |
|||
</el-form-item> |
|||
<!--<el-form-item label="车间编码"> |
|||
<el-input v-model="form.workshop_code" style="width: 240px;" /> |
|||
</el-form-item>--> |
|||
<el-form-item label="组盘状态"> |
|||
<el-select |
|||
v-model="form.group_status" |
|||
size="mini" |
|||
placeholder="点位状态" |
|||
class="filter-item" |
|||
style="width: 240px;" |
|||
clearable |
|||
> |
|||
<el-option |
|||
v-for="item in dict.group_status" |
|||
:label="item.label" |
|||
:value="item.value" |
|||
/> |
|||
</el-select> |
|||
</el-form-item> |
|||
<!--<el-form-item label="是否首个流程任务"> |
|||
<el-input v-model="form.is_first_flow_task" style="width: 240px;" /> |
|||
</el-form-item>--> |
|||
<el-form-item label="流程编码"> |
|||
<el-input v-model="form.flow_code" style="width: 240px;" /> |
|||
</el-form-item> |
|||
<el-form-item label="流程顺序"> |
|||
<el-input v-model="form.flow_num" style="width: 240px;" /> |
|||
</el-form-item> |
|||
<el-form-item label="上一任务"> |
|||
<el-input v-model="form.before_task_code" style="width: 240px;" /> |
|||
</el-form-item> |
|||
<el-form-item label="下一任务"> |
|||
<el-input v-model="form.next_task_code" style="width: 240px;" /> |
|||
</el-form-item> |
|||
<el-form-item label="备注" prop="remark"> |
|||
<label slot="label">备 注:</label> |
|||
<el-input v-model.trim="form.remark" style="width: 480px;" rows="2" type="textarea" :disabled="crud.status.view > 0" /> |
|||
</el-form-item> |
|||
</el-form> |
|||
<div slot="footer" class="dialog-footer"> |
|||
<el-button type="text" @click="crud.cancelCU">取消</el-button> |
|||
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button> |
|||
</div> |
|||
</el-dialog> |
|||
<!--表格渲染--> |
|||
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler"> |
|||
<el-table-column prop="pointCode" label="点位编码" :min-width="flexWidth('pointCode',crud.data,'点位编码')" /> |
|||
<el-table-column prop="supplierName" label="供应商名称" :min-width="flexWidth('supplierName',crud.data,'供应商名称')" /> |
|||
<el-table-column prop="productDescription" label="物料名称" :min-width="flexWidth('productDescription',crud.data,'物料名称')" /> |
|||
</el-table> |
|||
<!--分页组件--> |
|||
<pagination /> |
|||
</div> |
|||
</div> |
|||
</template> |
|||
|
|||
<script> |
|||
import crudMaterial from './report' |
|||
import CRUD, { crud, form, header, presenter } 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 crudMdBaseWorkShop from '@/views/wms/basedata/workshop/mdBaseWorkshop' |
|||
import crudSchBasePoint from '@/views/wms/sch/point/schBasePoint' |
|||
import crudSchBaseRegion from '@/views/wms/sch/region/schBaseRegion' |
|||
|
|||
const defaultForm = { |
|||
group_id: null, |
|||
vehicle_code: null, |
|||
vehicle_type: null, |
|||
material_id: null, |
|||
child_vehicle_code: null, |
|||
source_vehicle_code: null, |
|||
point_code: null, |
|||
point_name: null, |
|||
is_full: true, |
|||
pcsn: null, |
|||
instorage_time: null, |
|||
standing_time: null, |
|||
material_qty: null, |
|||
material_weight: null, |
|||
workorder_code: null, |
|||
group_number: null, |
|||
task_code: null, |
|||
ext_data: null, |
|||
workshop_code: null, |
|||
group_status: null, |
|||
table_name: null, |
|||
table_fk: null, |
|||
table_fk_id: null, |
|||
buss_move_id: null, |
|||
is_first_flow_task: true, |
|||
flow_code: null, |
|||
flow_num: null, |
|||
before_task_code: null, |
|||
next_task_code: null, |
|||
remark: null, |
|||
is_delete: false |
|||
} |
|||
export default { |
|||
name: 'VehicleMaterialGroup', |
|||
dicts: ['group_status', 'group_bind_material_status', 'vehicle_type'], |
|||
components: {pagination, crudOperation, rrOperation, udOperation }, |
|||
mixins: [presenter(), header(), form(defaultForm), crud()], |
|||
cruds() { |
|||
return CRUD({ |
|||
title: '组盘信息管理', |
|||
url: 'api/report', |
|||
idField: 'group_id', |
|||
sort: 'pointCode,desc', |
|||
optShow: { |
|||
add: false, |
|||
edit: false, |
|||
del: false, |
|||
download: false, |
|||
reset: false |
|||
}, |
|||
query: { |
|||
group_bind_material_status: '2' |
|||
}, |
|||
crudMethod: { ...crudMaterial } |
|||
}) |
|||
}, |
|||
data() { |
|||
return { |
|||
permission: { |
|||
}, |
|||
rules: { |
|||
}, |
|||
workShopList: [], |
|||
pointList: [], |
|||
regionList: [], |
|||
choose: '物料' |
|||
} |
|||
}, |
|||
created() { |
|||
this.getWorkShopList() |
|||
this.getPointList() |
|||
this.getRegionList() |
|||
}, |
|||
methods: { |
|||
// 钩子：在获取表格数据之前执行，false 则代表不获取数据 |
|||
[CRUD.HOOK.beforeRefresh]() { |
|||
return true |
|||
}, |
|||
getWorkShopList() { // 获取车间列表 |
|||
crudMdBaseWorkShop.getWorkShopList().then(res => { |
|||
this.workShopList = res |
|||
}) |
|||
}, |
|||
getRegionList() { |
|||
crudSchBaseRegion.getRegionList().then(res => { |
|||
this.regionList = res |
|||
}) |
|||
}, |
|||
getPointList() { // 获取点位列表 |
|||
crudSchBasePoint.getPointList().then(res => { |
|||
this.pointList = res |
|||
}) |
|||
}, |
|||
tableChanged(row) { |
|||
this.form.material_name = row.material_name |
|||
this.form.material_id = row.material_id |
|||
this.form.material_spec = row.material_spec |
|||
this.form.material_code = row.material_code |
|||
if (this.choose === '工单') { |
|||
this.form.workorder_code = row.workorder_code |
|||
} |
|||
}, |
|||
clearMaterial() { |
|||
this.form.material_name = null |
|||
this.form.material_id = null |
|||
this.form.material_spec = null |
|||
this.form.material_code = null |
|||
}, |
|||
setPointName(data) { |
|||
var point = this.pointList.find(item => item.point_code === data) |
|||
this.form.point_name = point.point_name |
|||
}, |
|||
hand(value) { |
|||
this.crud.toQuery() |
|||
} |
|||
} |
|||
} |
|||
</script> |
|||
|
|||
<style scoped> |
|||
|
|||
</style> |
|||
@ -0,0 +1,35 @@ |
|||
import request from '@/utils/request' |
|||
|
|||
export function add(data) { |
|||
return request({ |
|||
url: 'api/report', |
|||
method: 'post', |
|||
data |
|||
}) |
|||
} |
|||
|
|||
export function del(ids) { |
|||
return request({ |
|||
url: 'api/report/', |
|||
method: 'delete', |
|||
data: ids |
|||
}) |
|||
} |
|||
|
|||
export function edit(data) { |
|||
return request({ |
|||
url: 'api/report', |
|||
method: 'put', |
|||
data |
|||
}) |
|||
} |
|||
|
|||
export function getGroup(data) { |
|||
return request({ |
|||
url: 'api/report/getGroup', |
|||
method: 'post', |
|||
data |
|||
}) |
|||
} |
|||
|
|||
export default { add, edit, del, getGroup } |
|||
Loading…
Reference in new issue