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

Merge remote-tracking branch 'origin/b_lms' into master_merge

Browse Source
This commit is contained in:
liyongde
2024-06-30 16:05:34 +08:00
parent 1b3075007d 17032c858a
commit 7caf3d0f97
6 changed files with 156 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/controller/BstIvtShafttubeivtController.java
View File

@@ -1,5 +1,6 @@
package org.nl.b_lms.bst.ivt.shafttubeivt.controller;
import com.alibaba.fastjson.JSONObject;
import lombok.extern.slf4j.Slf4j;
import org.nl.b_lms.bst.ivt.shafttubeivt.service.dto.BstIvtShafttubeivtQuery;
import org.nl.common.TableDataInfo;
@@ -37,8 +38,7 @@ public class BstIvtShafttubeivtController {
@PostMapping
@Log("新增穿拔轴区点位库存管理")
//@SaCheckPermission("@el.check('bstIvtShafttubeivt:add')")
public ResponseEntity
<Object> create(@Validated @RequestBody BstIvtShafttubeivt entity){
public ResponseEntity <Object> create(@Validated @RequestBody BstIvtShafttubeivt entity){
bstIvtShafttubeivtService.create(entity);
return new ResponseEntity<>(HttpStatus.CREATED);
}
@@ -58,4 +58,12 @@ public class BstIvtShafttubeivtController {
bstIvtShafttubeivtService.deleteAll(ids);
return new ResponseEntity<>(HttpStatus.OK);
}
@Log("设置是否有轴")
//@SaCheckPermission("@el.check('bstIvtShafttubeivt:del')")
@PostMapping("/setHaveShaft")
public ResponseEntity<Object> setHaveShaft(@RequestBody JSONObject param) {
bstIvtShafttubeivtService.setHaveShaft(param);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
}

3
lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/IBstIvtShafttubeivtService.java
View File

@@ -1,5 +1,6 @@
package org.nl.b_lms.bst.ivt.shafttubeivt.service;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.nl.b_lms.bst.ivt.shafttubeivt.service.dto.BstIvtShafttubeivtQuery;
import org.nl.common.domain.query.PageQuery;
@@ -92,4 +93,6 @@ public interface IBstIvtShafttubeivtService extends IService<BstIvtShafttubeivt>
* @return
*/
List<BstIvtShafttubeivt> getNotTaskShaftCacheEmpty(BstIvtShafttubeivt startPoint);
void setHaveShaft(JSONObject param);
}

16
lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/impl/BstIvtShafttubeivtServiceImpl.java
View File

@@ -3,6 +3,8 @@ package org.nl.b_lms.bst.ivt.shafttubeivt.service.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -12,6 +14,7 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.b_lms.bst.ivt.shafttubeivt.service.dto.BstIvtShafttubeivtQuery;
import org.nl.b_lms.sch.tasks.slitter.constant.SlitterConstant;
import org.nl.common.utils.TaskUtils;
import org.nl.modules.common.exception.BadRequestException;
import org.nl.common.domain.query.PageQuery;
import org.nl.common.utils.SecurityUtils;
@@ -24,6 +27,7 @@ import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.function.Consumer;
/**
* @description 服务实现
@@ -128,4 +132,16 @@ public class BstIvtShafttubeivtServiceImpl extends ServiceImpl<BstIvtShafttubeiv
return bstIvtShafttubeivtMapper.getNotTaskShaftCacheEmpty(startPoint);
}
@Override
public void setHaveShaft(JSONObject param) {
JSONArray data = param.getJSONArray("data");
String have_qzz = param.getString("have_qzz");
List<BstIvtShafttubeivt> list = data.toJavaList(BstIvtShafttubeivt.class);
list.forEach(bs -> {
bs.setHave_qzz(have_qzz);
TaskUtils.updateOptMessageByBShaftPoint(bs);
});
this.updateBatchById(list);
}
}

10
lms/nladmin-ui/src/views/b_lms/bst/ivt/shafttubeivt/bstIvtShafttubeivt.js
View File

@@ -24,4 +24,12 @@ export function edit(data) {
})
}
export default { add, edit, del }
export function setHaveShaft(data) {
return request({
url: 'api/bstIvtShafttubeivt/setHaveShaft',
method: 'post',
data
})
}
export default { add, edit, del, setHaveShaft }

71
lms/nladmin-ui/src/views/b_lms/bst/ivt/shafttubeivt/index.vue
View File

@@ -65,7 +65,32 @@
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission" />
<crudOperation :permission="permission">
<el-button
v-if="crud.query.point_type === '6'"
slot="right"
class="filter-item"
size="mini"
type="primary"
icon="el-icon-circle-check"
:disabled="crud.selections.length === 0"
@click="setHaveShaft(crud.selections, '1')"
>
放轴
</el-button>
<el-button
v-if="crud.query.point_type === '6'"
slot="right"
class="filter-item"
size="mini"
type="danger"
icon="el-icon-circle-close"
:disabled="crud.selections.length === 0"
@click="setHaveShaft(crud.selections, '0')"
>
清轴
</el-button>
</crudOperation>
<!--表单组件-->
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="790px">
<el-form ref="form" :model="form" :inline="true" :rules="rules" size="mini" label-width="120px">
@@ -144,16 +169,16 @@
<!--表格渲染-->
<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 prop="point_code" label="点位编码" :min-width="flexWidth('point_code',crud.data,'点位编码')"/>
<el-table-column prop="point_name" label="点位名称" :min-width="flexWidth('point_name',crud.data,'点位名称')"/>
<el-table-column prop="qzz_size" label="气涨轴尺寸" :min-width="flexWidth('qzz_size',crud.data,'气涨轴尺寸')"/>
<el-table-column prop="qzz_generation" label="气涨轴代数" :min-width="flexWidth('qzz_generation',crud.data,'气涨轴代数')"/>
<el-table-column prop="tube_code1" label="纸管1编码" :min-width="flexWidth('tube_code1',crud.data,'纸管1编码')"/>
<el-table-column prop="tube_name1" label="纸管1描述" :min-width="flexWidth('tube_name1',crud.data,'纸管1描述')"/>
<el-table-column prop="tube_code2" label="纸管2编码" :min-width="flexWidth('tube_code2',crud.data,'纸管2编码')"/>
<el-table-column prop="tube_name2" label="纸管2描述" :min-width="flexWidth('tube_name2',crud.data,'纸管2描述')"/>
<el-table-column prop="container_name1" label="子卷号1" :min-width="flexWidth('container_name1',crud.data,'子卷号1')"/>
<el-table-column prop="container_name2" label="子卷号2" :min-width="flexWidth('container_name2',crud.data,'子卷号2')"/>
<el-table-column prop="point_code" label="点位编码" :min-width="flexWidth('point_code',crud.data,'点位编码')" />
<el-table-column prop="point_name" label="点位名称" :min-width="flexWidth('point_name',crud.data,'点位名称')" />
<el-table-column prop="qzz_size" label="气涨轴尺寸" :min-width="flexWidth('qzz_size',crud.data,'气涨轴尺寸')" />
<el-table-column prop="qzz_generation" label="气涨轴代数" :min-width="flexWidth('qzz_generation',crud.data,'气涨轴代数')" />
<el-table-column prop="tube_code1" label="纸管1编码" :min-width="flexWidth('tube_code1',crud.data,'纸管1编码')" />
<el-table-column prop="tube_name1" label="纸管1描述" :min-width="flexWidth('tube_name1',crud.data,'纸管1描述')" />
<el-table-column prop="tube_code2" label="纸管2编码" :min-width="flexWidth('tube_code2',crud.data,'纸管2编码')" />
<el-table-column prop="tube_name2" label="纸管2描述" :min-width="flexWidth('tube_name2',crud.data,'纸管2描述')" />
<el-table-column prop="container_name1" label="子卷号1" :min-width="flexWidth('container_name1',crud.data,'子卷号1')" />
<el-table-column prop="container_name2" label="子卷号2" :min-width="flexWidth('container_name2',crud.data,'子卷号2')" />
<el-table-column prop="point_type" label="点位类型" :min-width="flexWidth('point_type',crud.data,'气涨轴设备位')">
<template slot-scope="scope">
{{ dict.label.SHAFT_POINT_TYPE[scope.row.point_type] }}
@@ -174,12 +199,12 @@
{{ scope.row.is_used === '1' ? '是' : '否' }}
</template>
</el-table-column>
<el-table-column prop="sort_seq" label="顺序号" :min-width="flexWidth('sort_seq',crud.data,'顺序号')"/>
<el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')"/>
<el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')"/>
<el-table-column prop="update_optname" label="修改人" :min-width="flexWidth('update_optname',crud.data,'修改人')"/>
<el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')"/>
<el-table-column prop="plan" label="规划" :min-width="flexWidth('plan',crud.data,'规划')"/>
<el-table-column prop="sort_seq" label="顺序号" :min-width="flexWidth('sort_seq',crud.data,'顺序号')" />
<el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')" />
<el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
<el-table-column prop="update_optname" label="修改人" :min-width="flexWidth('update_optname',crud.data,'修改人')" />
<el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')" />
<el-table-column prop="plan" label="规划" :min-width="flexWidth('plan',crud.data,'规划')" />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
@@ -198,7 +223,7 @@
<script>
import crudBstIvtShafttubeivt from './bstIvtShafttubeivt'
import CRUD, {crud, form, header, presenter} from '@crud/crud'
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'
@@ -265,6 +290,16 @@ export default {
},
hand(value) {
this.crud.toQuery()
},
setHaveShaft(data, falg) {
const param = {
data: data,
have_qzz: falg
}
crudBstIvtShafttubeivt.setHaveShaft(param).then(res => {
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
})
}
}
}

73
lms/nladmin-ui/src/views/b_lms/bst/ivt/stockingivt/index.vue
View File

@@ -20,19 +20,55 @@
<el-input v-model="form.product_area" style="width: 370px;" />
</el-form-item>
<el-form-item label="点位类型">
<el-input v-model="form.point_type" style="width: 370px;" />
<el-select
v-model="form.point_type"
size="mini"
placeholder="点位类型"
class="filter-item"
style="width: 370px;"
>
<el-option
v-for="item in dict.STOCK_POINT_TYPE"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="点位状态">
<el-input v-model="form.ivt_status" style="width: 370px;" />
<el-select
v-model="form.ivt_status"
size="mini"
placeholder="点位状态"
class="filter-item"
style="width: 370px;"
>
<el-option
v-for="item in dict.STOCK_POINT_STATUS"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="位置">
<el-input v-model="form.point_location" style="width: 370px;" />
<el-select
v-model="form.point_location"
size="mini"
placeholder="位置"
class="filter-item"
style="width: 370px;"
>
<el-option
v-for="item in dict.point_location"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="顺序号" prop="sort_seq">
<el-input v-model="form.sort_seq" style="width: 370px;" />
</el-form-item>
<el-form-item label="是否启用" prop="is_used">
<el-input v-model="form.is_used" style="width: 370px;" />
<el-switch v-model="form.is_used" active-value="1" inactive-value="0" style="width: 240px;" />
</el-form-item>
<el-form-item label="备注">
<el-input v-model="form.remark" style="width: 370px;" />
@@ -53,9 +89,21 @@
<el-table-column prop="point_name" label="点位名称" :min-width="flexWidth('point_name',crud.data,'点位名称')" />
<el-table-column prop="vehicle_code" label="托盘号" :min-width="flexWidth('vehicle_code',crud.data,'托盘号')" />
<el-table-column prop="product_area" label="区域" :min-width="flexWidth('product_area',crud.data,'区域')" />
<el-table-column prop="point_type" label="点位类型" :min-width="flexWidth('point_type',crud.data,'点位类型')" />
<el-table-column prop="ivt_status" label="点位状态" :min-width="flexWidth('ivt_status',crud.data,'点位状态')" />
<el-table-column prop="point_location" label="位置" :min-width="flexWidth('point_location',crud.data,'位置')" />
<el-table-column prop="point_type" label="点位类型" :min-width="flexWidth('point_type',crud.data,'点位类型')">
<template slot-scope="scope">
{{ dict.label.STOCK_POINT_TYPE[scope.row.point_type] }}
</template>
</el-table-column>
<el-table-column prop="ivt_status" label="点位状态" :min-width="flexWidth('ivt_status',crud.data,'点位状态')">
<template slot-scope="scope">
{{ dict.label.STOCK_POINT_STATUS[scope.row.ivt_status] }}
</template>
</el-table-column>
<el-table-column prop="point_location" label="位置" :min-width="flexWidth('point_location',crud.data,'位置')">
<template slot-scope="scope">
{{ dict.label.point_location[scope.row.point_location] }}
</template>
</el-table-column>
<el-table-column prop="sort_seq" label="顺序号" :min-width="flexWidth('sort_seq',crud.data,'顺序号')" />
<el-table-column prop="is_used" label="是否启用" :min-width="flexWidth('is_used',crud.data,'是否启用')" />
<el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
@@ -68,6 +116,7 @@
<template slot-scope="scope">
<udOperation
:data="scope.row"
:disabled-dle="true"
:permission="permission"
/>
</template>
@@ -109,6 +158,7 @@ const defaultForm = {
}
export default {
name: 'BstIvtStockingivt',
dicts: ['STOCK_POINT_STATUS', 'STOCK_POINT_TYPE', 'point_location'],
components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
@@ -117,7 +167,14 @@ export default {
url: 'api/bstIvtStockingivt',
idField: 'ivt_id',
sort: 'ivt_id,desc',
crudMethod: { ...crudBstIvtStockingivt }
crudMethod: { ...crudBstIvtStockingivt },
optShow: {
add: false,
edit: true,
del: false,
download: false,
reset: true
}
})
},
data() {