billion-main/src/main/java/com/billion/main/bs/controller/BsLineInfoController.java
@@ -35,6 +35,15 @@ private IBsLineInfoService bsLineInfoService; /** * 产线下拉框列表 */ @GetMapping("/getLineOptions") public AjaxResult getLineOptions() { return AjaxResult.success(bsLineInfoService.list()); } /** * 查询产线信息列表 */ @PreAuthorize("@ss.hasPermi('bs:lineInfo:list')") billion-main/src/main/java/com/billion/main/bs/service/impl/BsLineInfoServiceImpl.java
@@ -10,6 +10,8 @@ import com.billion.main.bs.domain.BsLineInfo; import com.billion.main.bs.service.IBsLineInfoService; import static org.apache.commons.lang3.SystemUtils.getUserName; /** * 产线信息Service业务层处理 * @@ -56,6 +58,7 @@ public int insertBsLineInfo(BsLineInfo bsLineInfo) { bsLineInfo.setCreateTime(DateUtils.getNowDate()); bsLineInfo.setCreateBy(getUserName()); return bsLineInfoMapper.insertBsLineInfo(bsLineInfo); } @@ -69,6 +72,7 @@ public int updateBsLineInfo(BsLineInfo bsLineInfo) { bsLineInfo.setUpdateTime(DateUtils.getNowDate()); bsLineInfo.setUpdateBy(getUserName()); return bsLineInfoMapper.updateBsLineInfo(bsLineInfo); }
@@ -10,6 +10,8 @@ import com.billion.main.bs.domain.BsLocationInfo; import com.billion.main.bs.service.IBsLocationInfoService; import static org.apache.commons.lang3.SystemUtils.getUserName; /** * 工位信息Service业务层处理 * @@ -56,6 +58,7 @@ public int insertBsLocationInfo(BsLocationInfo bsLocationInfo) { bsLocationInfo.setCreateTime(DateUtils.getNowDate()); bsLocationInfo.setCreateBy(getUserName()); return bsLocationInfoMapper.insertBsLocationInfo(bsLocationInfo); } @@ -69,6 +72,7 @@ public int updateBsLocationInfo(BsLocationInfo bsLocationInfo) { bsLocationInfo.setUpdateTime(DateUtils.getNowDate()); bsLocationInfo.setUpdateBy(getUserName()); return bsLocationInfoMapper.updateBsLocationInfo(bsLocationInfo); }
@@ -10,6 +10,8 @@ import com.billion.main.bs.domain.BsMaterialInfo; import com.billion.main.bs.service.IBsMaterialInfoService; import static org.apache.commons.lang3.SystemUtils.getUserName; /** * 物料信息Service业务层处理 * @@ -56,6 +58,7 @@ public int insertBsMaterialInfo(BsMaterialInfo bsMaterialInfo) { bsMaterialInfo.setCreateTime(DateUtils.getNowDate()); bsMaterialInfo.setCreateBy(getUserName()); return bsMaterialInfoMapper.insertBsMaterialInfo(bsMaterialInfo); } @@ -69,6 +72,7 @@ public int updateBsMaterialInfo(BsMaterialInfo bsMaterialInfo) { bsMaterialInfo.setUpdateTime(DateUtils.getNowDate()); bsMaterialInfo.setUpdateBy(getUserName()); return bsMaterialInfoMapper.updateBsMaterialInfo(bsMaterialInfo); }
@@ -1,5 +1,13 @@ import request from '@/utils/request' //产线下拉框信息列表 export function getLineOptions() { return request({ url: '/bs/lineInfo/getLineOptions', method: 'get', }) } // 查询产线信息列表 export function listLineInfo(query) { return request({ billion-ui/src/views/main/bs/lineInfo/index.vue
@@ -70,17 +70,16 @@ <el-table border v-loading="loading" :data="lineInfoList" @selection-change="handleSelectionChange"> <el-table-column type="selection" width="55" align="center" /> <el-table-column label="主键id" align="center" prop="id" /> <el-table-column show-overflow-tooltip="true" label="产线编号" align="center" prop="lineCode" /> <el-table-column show-overflow-tooltip="true" label="产线名称" align="center" prop="lineName" /> <el-table-column show-overflow-tooltip="true" label="备注" align="center" prop="remarks" /> <el-table-column show-overflow-tooltip="true" label="创建用户" align="center" prop="createBy" /> <el-table-column :show-overflow-tooltip="true" label="产线编号" align="center" prop="lineCode" /> <el-table-column :show-overflow-tooltip="true" label="产线名称" align="center" prop="lineName" /> <el-table-column :show-overflow-tooltip="true" label="备注" align="center" prop="remarks" /> <el-table-column :show-overflow-tooltip="true" label="创建用户" align="center" prop="createBy" /> <el-table-column label="创建时间" align="center" prop="createTime" width="180"> </el-table-column> <el-table-column show-overflow-tooltip="true" label="更改用户" align="center" prop="updateBy" /> <el-table-column :show-overflow-tooltip="true" label="更改用户" align="center" prop="updateBy" /> <el-table-column label="更改时间" align="center" prop="updateTime" width="180"> </el-table-column> <el-table-column show-overflow-tooltip="true" label="状态" align="center" prop="status" /> <el-table-column :show-overflow-tooltip="true" label="状态" align="center" prop="status" /> </el-table> <pagination billion-ui/src/views/main/bs/locationInfo/index.vue
@@ -88,19 +88,19 @@ <el-table border v-loading="loading" :data="locationInfoList" @selection-change="handleSelectionChange"> <el-table-column type="selection" width="55" align="center" /> <el-table-column show-overflow-tooltip="true" label="工位编号" align="center" prop="locationCode" /> <el-table-column show-overflow-tooltip="true" label="工位名称" align="center" prop="locationName" /> <el-table-column :show-overflow-tooltip="true" label="工位编号" align="center" prop="locationCode" /> <el-table-column :show-overflow-tooltip="true" label="工位名称" align="center" prop="locationName" /> <el-table-column label="工位类型" align="center" prop="locationType"> <template slot-scope="scope"> <dict-tag :options="dict.type.location_type" :value="scope.row.locationType"/> </template> </el-table-column> <el-table-column show-overflow-tooltip="true" label="产线编号" align="center" prop="lineCode" /> <el-table-column show-overflow-tooltip="true" label="备注" align="center" prop="remarks" /> <el-table-column show-overflow-tooltip="true" label="创建用户" align="center" prop="createBy" /> <el-table-column :show-overflow-tooltip="true" label="产线编号" align="center" prop="lineCode" /> <el-table-column :show-overflow-tooltip="true" label="备注" align="center" prop="remarks" /> <el-table-column :show-overflow-tooltip="true" label="创建用户" align="center" prop="createBy" /> <el-table-column label="创建时间" align="center" prop="createTime" width="180"> </el-table-column> <el-table-column show-overflow-tooltip="true" label="更改用户" align="center" prop="updateBy" /> <el-table-column :show-overflow-tooltip="true" label="更改用户" align="center" prop="updateBy" /> <el-table-column label="更改时间" align="center" prop="updateTime" width="180"> </el-table-column> </el-table> @@ -133,7 +133,15 @@ </el-select> </el-form-item> <el-form-item label="产线编号" prop="lineCode"> <el-input v-model="form.lineCode" placeholder="请输入产线编号" /> <!-- <el-input v-model="form.lineCode" placeholder="请输入产线编号" />--> <el-select style="width: 100%" v-model="form.lineCode" placeholder="请选择产线"> <el-option v-for="dict in lineOptions" :key="dict.value" :label="dict.lineName" :value="dict.lineCode" ></el-option> </el-select> </el-form-item> <el-form-item label="备注" prop="remarks"> <el-input v-model="form.remarks" placeholder="请输入备注" /> @@ -149,6 +157,7 @@ <script> import { listLocationInfo, getLocationInfo, delLocationInfo, addLocationInfo, updateLocationInfo } from "@/api/main/bs/locationInfo"; import {getLineOptions, listLineInfo} from "@/api/main/bs/lineInfo"; export default { name: "LocationInfo", @@ -189,13 +198,21 @@ id: [ { required: true, message: "主键id不能为空", trigger: "blur" } ], } }, lineOptions: [], }; }, created() { this.getList(); this.getLineOptions() }, methods: { getLineOptions() { this.loading = true; getLineOptions().then(response => { this.lineOptions = response.data; }); }, /** 查询工位信息列表 */ getList() { this.loading = true; billion-ui/src/views/main/bs/materialInfo/index.vue
@@ -167,8 +167,8 @@ /> <!-- 添加或修改物料信息对话框 --> <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body> <el-form :inline="true" ref="form" :model="form" :rules="rules" label-width="80px"> <el-form-item label="物料编号" prop="materialCode"> <el-input v-model="form.materialCode" placeholder="请输入物料编号" /> </el-form-item> @@ -179,7 +179,7 @@ <el-input v-model="form.materialView" placeholder="请输入视图" /> </el-form-item> <el-form-item label="种类" prop="typeZ"> <el-select style="width: 100%" v-model="form.typeZ" placeholder="请选择种类"> <el-select v-model="form.typeZ" placeholder="请选择种类"> <el-option v-for="dict in dict.type.type_z" :key="dict.value" @@ -189,7 +189,7 @@ </el-select> </el-form-item> <el-form-item label="类型" prop="typeL"> <el-select style="width: 100%" v-model="form.typeL" placeholder="请选择类型"> <el-select v-model="form.typeL" placeholder="请选择类型"> <el-option v-for="dict in dict.type.type_l" :key="dict.value" @@ -199,7 +199,7 @@ </el-select> </el-form-item> <el-form-item label="单位" prop="unit"> <el-select style="width: 100%" v-model="form.unit" placeholder="请选择单位"> <el-select v-model="form.unit" placeholder="请选择单位"> <el-option v-for="dict in dict.type.unit" :key="dict.value"
