lhq/FT501-WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

平库盘点页面

Browse Source
This commit is contained in:
liuhanqing
2025-06-30 15:38:57 +08:00
parent 81c04bd90d
commit ace9f89b3f
7 changed files with 283 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ruoyi-admin/src/main/java/com/ruoyi/check/difference/service/impl/CheckDifferenceRecordServiceImpl.java
View File

@@ -4,6 +4,8 @@ import java.util.Date;
import java.util.List; import java.util.List;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import com.ruoyi.bas.cargoSpace.domain.BasCargoSpace;
import com.ruoyi.bas.cargoSpace.service.IBasCargoSpaceService;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.stock.stock.domain.BasStock; import com.ruoyi.stock.stock.domain.BasStock;
@@ -27,6 +29,8 @@ public class CheckDifferenceRecordServiceImpl implements ICheckDifferenceRecordS
private CheckDifferenceRecordMapper checkDifferenceRecordMapper; private CheckDifferenceRecordMapper checkDifferenceRecordMapper;
@Autowired @Autowired
private IBasStockService basStockService; private IBasStockService basStockService;
@Autowired
private IBasCargoSpaceService basCargoSpaceService;
/** /**
@@ -72,6 +76,21 @@ public class CheckDifferenceRecordServiceImpl implements ICheckDifferenceRecordS
basStockService.updateBasStock(basStock); basStockService.updateBasStock(basStock);
checkDifferenceRecord.setOldQuantity(basStock.getQuantity()); checkDifferenceRecord.setOldQuantity(basStock.getQuantity());
}else if (checkDifferenceRecord.getRecordType()==2){ }else if (checkDifferenceRecord.getRecordType()==2){
//判断该物料是否已经存在
BasStock queryStock = new BasStock();
queryStock.setProductId(checkDifferenceRecord.getProductId());
queryStock.setWarehouseId(checkDifferenceRecord.getWarehouseId());
List<BasStock> stocks = basStockService.selectBasStockList(queryStock);
if (!stocks.isEmpty()) {
return AjaxResult.error("该物料已存在");
}
BasCargoSpace queryCargoSpace = new BasCargoSpace();
queryCargoSpace.setWarehouseId(checkDifferenceRecord.getWarehouseId());
List<BasCargoSpace> cargoSpaces = basCargoSpaceService.selectBasCargoSpaceList(queryCargoSpace);
if (cargoSpaces.isEmpty()){
return AjaxResult.error("没有货位");
}
checkDifferenceRecord.setCargoSpaceId(cargoSpaces.get(0).getCargoSpaceId());
checkDifferenceRecord.setOldQuantity("0"); checkDifferenceRecord.setOldQuantity("0");
}else if (checkDifferenceRecord.getRecordType()==3){ }else if (checkDifferenceRecord.getRecordType()==3){
BasStock basStock = basStockService.selectBasStockByStockId(checkDifferenceRecord.getStockId()); BasStock basStock = basStockService.selectBasStockByStockId(checkDifferenceRecord.getStockId());

12
ruoyi-admin/src/main/resources/mapper/search/ViewStockWarningMapper.xml
View File

@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.search.ViewStockWarning.mapper.ViewStockWarningMapper"> <mapper namespace="com.ruoyi.search.ViewStockWarning.mapper.ViewStockWarningMapper">
<resultMap type="ViewStockWarning" id="ViewStockWarningResult"> <resultMap type="ViewStockWarning" id="ViewStockWarningResult">
<result property="stockId" column="stock_id" /> <result property="stockId" column="stock_id" />
<result property="cargoSpaceId" column="cargo_space_id" /> <result property="cargoSpaceId" column="cargo_space_id" />
@@ -61,12 +61,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap> </resultMap>
<sql id="selectViewStockWarningVo"> <sql id="selectViewStockWarningVo">
select stock_id, cargo_space_id, stock_status, product_status, lot_no, in_date, back_date, product_guid, quantity, job_id, tray_code, out_quantity, stockin_detail_id, stockin_id, in_type, in_class_id, warehouse_id, stacking_id, spare1, spare2, spare5, spare6, product_id, warehouse_name, address, c_desc, warehouse_kind, warehouse_type, is_current, product_name, spec, unit, price, remark, cargo_space_name, roadway_id, cargo_area_id, the_type, the_type_name, the_platoon, the_column, the_floor, cargo_status, locked, cargo_hight, iss_double, group_coding_no, group_coding, cargo_space_logo, this_cargo_area,spare7,spare8, remark from view_stock_warning select stock_id, cargo_space_id, stock_status, product_status, lot_no, in_date, back_date, product_guid, quantity, job_id, tray_code, out_quantity, stockin_detail_id, stockin_id, in_type, in_class_id, warehouse_id, stacking_id, spare1, spare2, spare5, spare6, product_id, warehouse_name, address, c_desc, warehouse_kind, warehouse_type, is_current, product_name, spec, unit, price, remark, cargo_space_name, roadway_id, cargo_area_id, the_type, the_type_name, the_platoon, the_column, the_floor, cargo_status, locked, cargo_hight, iss_double, group_coding_no, group_coding, cargo_space_logo, this_cargo_area,spare7,spare8 from view_stock_warning
</sql> </sql>
<select id="selectViewStockWarningList" parameterType="ViewStockWarning" resultMap="ViewStockWarningResult"> <select id="selectViewStockWarningList" parameterType="ViewStockWarning" resultMap="ViewStockWarningResult">
<include refid="selectViewStockWarningVo"/> <include refid="selectViewStockWarningVo"/>
<where> <where>
<if test="stockId != null and stockId != ''"> and stock_id = #{stockId}</if> <if test="stockId != null and stockId != ''"> and stock_id = #{stockId}</if>
<if test="cargoSpaceId != null and cargoSpaceId != ''"> and cargo_space_id like concat('%', #{cargoSpaceId}, '%')</if> <if test="cargoSpaceId != null and cargoSpaceId != ''"> and cargo_space_id like concat('%', #{cargoSpaceId}, '%')</if>
<if test="stockStatus != null and stockStatus != ''"> and stock_status like concat('%', #{stockStatus}, '%')</if> <if test="stockStatus != null and stockStatus != ''"> and stock_status like concat('%', #{stockStatus}, '%')</if>
@@ -123,7 +123,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if> </if>
</where> </where>
</select> </select>
<select id="selectViewStockWarningByStockId" parameterType="String" resultMap="ViewStockWarningResult"> <select id="selectViewStockWarningByStockId" parameterType="String" resultMap="ViewStockWarningResult">
<include refid="selectViewStockWarningVo"/> <include refid="selectViewStockWarningVo"/>
where stock_id = #{stockId} where stock_id = #{stockId}
@@ -307,9 +307,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete> </delete>
<delete id="deleteViewStockWarningByStockIds" parameterType="String"> <delete id="deleteViewStockWarningByStockIds" parameterType="String">
delete from view_stock_warning where stock_id in delete from view_stock_warning where stock_id in
<foreach item="stockId" collection="array" open="(" separator="," close=")"> <foreach item="stockId" collection="array" open="(" separator="," close=")">
#{stockId} #{stockId}
</foreach> </foreach>
</delete> </delete>
</mapper> </mapper>

3
ruoyi-ui/src/lang/en.js
View File

@@ -687,7 +687,8 @@ export default {
height:'height', height:'height',
volume:'volume', volume:'volume',
cargoSpaceStatus: 'cargoSpaceStatus', cargoSpaceStatus: 'cargoSpaceStatus',
cargoSpaceStockStatus: 'cargoSpaceStockStatus' cargoSpaceStockStatus: 'cargoSpaceStockStatus',
inputMaterialDesc: 'inputMaterialDesc'
}, },

1
ruoyi-ui/src/lang/zh.js
View File

@@ -657,6 +657,7 @@ export default {
deleteSuccess: '删除成功', deleteSuccess: '删除成功',
confirmDelete: '是否确认删除库存信息编号为"{stockIds}"的数据项？', confirmDelete: '是否确认删除库存信息编号为"{stockIds}"的数据项？',
materialDesc:'物料描述', materialDesc:'物料描述',
inputMaterialDesc:'请选择物料',
materialInDesc:'物料描述', materialInDesc:'物料描述',
englishDesc:'英文描述', englishDesc:'英文描述',
netWeight:'净重', netWeight:'净重',

283
ruoyi-ui/src/views/check/flat/index.vue
View File

@@ -202,16 +202,16 @@
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="primary" type="primary"
plain plain
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['stock:management:add']" v-hasPermi="['stock:management:add']"
>{{$t('stockManagement.add')}} &lt;!&ndash; 新增 &ndash;&gt;</el-button> >{{ $t('stockManagement.add') }} <!-- 新增 --></el-button>
</el-col>--> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="success" type="success"
@@ -229,7 +229,7 @@
plain plain
icon="el-icon-delete" icon="el-icon-delete"
size="mini" size="mini"
:disabled="multiple" :disabled="single"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['stock:management:remove']" v-hasPermi="['stock:management:remove']"
>{{$t('stockManagement.delete')}} <!-- 删除 --></el-button> >{{$t('stockManagement.delete')}} <!-- 删除 --></el-button>
@@ -320,24 +320,70 @@
@pagination="getList" @pagination="getList"
/> />
<!-- 添加或修改库存信息对话框 --> <!-- 新增库存信息对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="$t('stockManagement.addTitle')" :visible.sync="addOpen" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="addForm" :model="addForm" :rules="addRules" label-width="80px">
<el-form-item :label="$t('stockManagement.stockId')" prop="stockId"> <!-- 库存id --> <!--<el-form-item :label="$t('stockManagement.stockId')" prop="stockId"> &lt;!&ndash; 库存id &ndash;&gt;
<el-input v-model="form.stockId" :placeholder="$t('stockManagement.inputStockId')" /> <el-input v-model="addForm.stockId" :placeholder="$t('stockManagement.inputStockId')" />
</el-form-item>-->
<!-- <el-form-item :label="$t('stockManagement.productId')" prop="productId"> &lt;!&ndash; 物料编码 &ndash;&gt;
<el-input v-model="addForm.extraField.productId" :placeholder="$t('stockManagement.inputProductId')" />
</el-form-item>-->
<el-form-item :label="$t('stockManagement.warehouseId')" prop="warehouseId"> <!-- 仓库 -->
<el-select v-model="addForm.warehouseId" :placeholder="$t('stockManagement.inputWarehouseId')" clearable>
<el-option
v-for="item in warehouseOptions"
:key="item.warehouseId"
:label="item.warehouseName"
:value="item.warehouseId"
/>
</el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('stockManagement.trayCode')" prop="trayCode"> <!-- 托盘条码 --> <el-form-item :label="$t('stockManagement.materialDesc')" prop="materialDesc"> <!-- 物料名称 -->
<el-input v-model="form.trayCode" :placeholder="$t('stockManagement.inputTrayCode')" /> <el-select v-model="addForm.extraField.productId" :placeholder="$t('stockManagement.inputMaterialDesc')" clearable filterable>
<el-option
v-for="item in productOptions"
:key="item.productId"
:label="item.productName"
:value="item.productName"
/>
</el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item :label="$t('stockManagement.englishDesc')" prop="englishDesc"> &lt;!&ndash; 物料名称 &ndash;&gt;-->
<!-- <el-input v-model="addForm.extraField.englishDesc" :placeholder="$t('stockManagement.inputEnglishDesc')" />-->
<!-- </el-form-item>-->
<el-form-item :label="$t('stockManagement.quantity')" prop="quantity"> <!-- 库存数量 --> <el-form-item :label="$t('stockManagement.quantity')" prop="quantity"> <!-- 库存数量 -->
<el-input v-model="form.quantity" :placeholder="$t('stockManagement.inputQuantity')" /> <el-input v-model="addForm.quantity" :placeholder="$t('stockManagement.inputQuantity')" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">{{$t('stockManagement.confirm')}} <!-- 确定 --></el-button> <el-button type="primary" @click="submitAddForm">{{$t('stockManagement.confirm')}} <!-- 确定 --></el-button>
<el-button @click="cancel">{{$t('stockManagement.cancel')}} <!-- 取消 --></el-button> <el-button @click="cancelAdd">{{$t('stockManagement.cancel')}} <!-- 取消 --></el-button>
</div>
</el-dialog>
<!-- 修改库存信息对话框 -->
<el-dialog :title="$t('stockManagement.editTitle')" :visible.sync="editOpen" width="500px" append-to-body>
<el-form ref="editForm" :model="editForm" :rules="editRules" label-width="80px">
<el-form-item :label="$t('stockManagement.stockId')" prop="stockId"> <!-- 库存id -->
<el-input v-model="editForm.stockId" :placeholder="$t('stockManagement.inputStockId')" disabled />
</el-form-item>
<el-form-item :label="$t('stockManagement.productId')" prop="productId"> <!-- 物料编码 -->
<el-input v-model="editForm.extraField.productId" :placeholder="$t('stockManagement.inputProductId')" disabled />
</el-form-item>
<el-form-item :label="$t('stockManagement.materialDesc')" prop="materialDesc"> <!-- 物料名称 -->
<el-input v-model="editForm.extraField.materialDesc" :placeholder="$t('stockManagement.inputMaterialDesc')" disabled />
</el-form-item>
<el-form-item :label="$t('stockManagement.englishDesc')" prop="englishDesc"> <!-- 物料名称 -->
<el-input v-model="editForm.extraField.englishDesc" :placeholder="$t('stockManagement.inputEnglishDesc')" disabled />
</el-form-item>
<el-form-item :label="$t('stockManagement.quantity')" prop="quantity"> <!-- 库存数量 -->
<el-input v-model="editForm.quantity" :placeholder="$t('stockManagement.inputQuantity')" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitEditForm">{{$t('stockManagement.confirm')}} <!-- 确定 --></el-button>
<el-button @click="cancelEdit">{{$t('stockManagement.cancel')}} <!-- 取消 --></el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
@@ -347,6 +393,7 @@
import { listManagement, getManagement, delManagement, addManagement, updateManagement } from "@/api/stock/management" import { listManagement, getManagement, delManagement, addManagement, updateManagement } from "@/api/stock/management"
import {listWarehouse} from "@/api/bas/warehouse" import {listWarehouse} from "@/api/bas/warehouse"
import {addDifference} from "@/api/check/difference"; import {addDifference} from "@/api/check/difference";
import {listBasProduct} from "@/api/bas/BasProduct"
export default { export default {
name: "Management", name: "Management",
@@ -369,12 +416,12 @@ export default {
managementList: [], managementList: [],
// 仓库选项 // 仓库选项
warehouseOptions: [], warehouseOptions: [],
// 弹出层标题 // 物料选项
title: "", productOptions: [],
//点击的按钮 // 是否显示新增弹出层
type: "", addOpen: false,
// 是否显示弹出层 // 是否显示修改弹出层
open: false, editOpen: false,
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
@@ -405,10 +452,22 @@ export default {
spare6: null, spare6: null,
typeData: ["3"] typeData: ["3"]
}, },
// 表单参数 // 新增表单参数
form: {}, addForm: {
// 表单校验 extraField:{}
rules: { },
// 修改表单参数
editForm: {
extraField:{}
},
// 新增表单校验
addRules: {
/*stockId: [
{ required: true, message: this.$t('stockManagement.stockIdRequired'), trigger: "blur" } // 库存id不能为空
]*/
},
// 修改表单校验
editRules: {
/*stockId: [ /*stockId: [
{ required: true, message: this.$t('stockManagement.stockIdRequired'), trigger: "blur" } // 库存id不能为空 { required: true, message: this.$t('stockManagement.stockIdRequired'), trigger: "blur" } // 库存id不能为空
]*/ ]*/
@@ -418,6 +477,7 @@ export default {
}, },
created() { created() {
this.getWarehouseList(); this.getWarehouseList();
this.getProductList();
this.getList() this.getList()
}, },
methods: { methods: {
@@ -430,6 +490,12 @@ export default {
this.warehouseOptions = response.rows; this.warehouseOptions = response.rows;
}); });
}, },
/** 获取物料列表 */
getProductList() {
listBasProduct().then(response => {
this.productOptions = response.rows;
});
},
/** 查询库存信息列表 */ /** 查询库存信息列表 */
getList() { getList() {
this.loading = true this.loading = true
@@ -439,14 +505,19 @@ export default {
this.loading = false this.loading = false
}) })
}, },
// 取消按钮 // 取消新增按钮
cancel() { cancelAdd() {
this.open = false this.addOpen = false
this.reset() this.resetAdd()
}, },
// 表单重置 // 取消修改按钮
reset() { cancelEdit() {
this.form = { this.editOpen = false
this.resetEdit()
},
// 新增表单重置
resetAdd() {
this.addForm = {
stockId: null, stockId: null,
cargoSpaceId: null, cargoSpaceId: null,
stockStatus: null, stockStatus: null,
@@ -471,9 +542,40 @@ export default {
spare4: null, spare4: null,
spare5: null, spare5: null,
spare6: null, spare6: null,
type: "" extraField:{}
} }
this.resetForm("form") this.resetForm("addForm")
},
// 修改表单重置
resetEdit() {
this.editForm = {
stockId: null,
cargoSpaceId: null,
stockStatus: null,
productStatus: null,
lotNo: null,
inDate: null,
backDate: null,
productGuid: null,
quantity: null,
jobId: null,
trayCode: null,
outQuantity: null,
stockinDetailId: null,
stockinId: null,
inType: null,
inClassId: null,
warehouseId: null,
stackingId: null,
spare1: null,
spare2: null,
spare3: null,
spare4: null,
spare5: null,
spare6: null,
extraField:{}
}
this.resetForm("editForm")
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
@@ -493,56 +595,55 @@ export default {
}, },
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
this.reset() this.resetAdd()
this.open = true this.addOpen = true
this.title = this.$t('stockManagement.addTitle') // 添加库存信息
this.form.type = "2"
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
this.reset() this.resetEdit()
const stockId = row.stockId || this.ids const stockId = row.stockId || this.ids
getManagement(stockId).then(response => { getManagement(stockId).then(response => {
this.form = response.data this.editForm = response.data
this.open = true this.editOpen = true
this.title = this.$t('stockManagement.editTitle') // 修改库存信息 console.log(this.editForm)
this.form.type = "1"
}) })
}, },
/** 提交按钮 */ /** 提交新增表单 */
submitForm() { submitAddForm() {
this.$refs["form"].validate(valid => { this.$refs["addForm"].validate(valid => {
if (this.form.type === "1") { if (valid) {
this.pdData={}
//修改
this.pdData= {
stockId: this.form.stockId,
trayCode: this.form.trayCode,
newQuantity: this.form.quantity,
cargoSpaceId: this.form.cargoSpaceId,
warehouseId: this.form.warehouseId,
productId: this.form.productId,
recordType: 1
}
addDifference(this.pdData).then(response => {
this.$modal.msgSuccess(this.$t('stockManagement.editSuccess'))
this.open = false
this.getList()
});
} else if (this.form.type === "2") {
this.pdData={} this.pdData={}
//新增 //新增
this.pdData= { this.pdData= {
trayCode: this.form.trayCode, newQuantity: this.addForm.quantity,
newQuantity: this.form.quantity, warehouseId: this.addForm.warehouseId,
cargoSpaceId: this.form.cargoSpaceId, productId: this.addForm.productId,
warehouseId: this.form.warehouseId,
productId: this.form.productId,
recordType: 2 recordType: 2
} }
addDifference(this.pdData).then(response => { addDifference(this.pdData).then(response => {
this.$modal.msgSuccess(this.$t('stockManagement.addSuccess')) this.$modal.msgSuccess(this.$t('stockManagement.addSuccess'))
this.open = false this.addOpen = false
this.getList()
});
}
})
},
/** 提交修改表单 */
submitEditForm() {
this.$refs["editForm"].validate(valid => {
if (valid) {
this.pdData={}
//修改
this.pdData= {
stockId: this.editForm.stockId,
newQuantity: this.editForm.quantity,
warehouseId: this.editForm.warehouseId,
productId: this.editForm.productId,
recordType: 1
}
addDifference(this.pdData).then(response => {
this.$modal.msgSuccess(this.$t('stockManagement.editSuccess'))
this.editOpen = false
this.getList() this.getList()
}); });
} }
@@ -550,22 +651,20 @@ export default {
}, },
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const stockIds = row.stockId || this.ids this.$modal.confirm(this.$t('stockManagement.deleteConfirm')).then(function() {
//删除 //删除
this.pdData={} const pdData = {
this.pdData={ stockId: row.stockId,
trayCode: this.form.trayCode, oldQuantity: row.quantity,
oldQuantity: this.form.quantity, warehouseId: row.warehouseId,
cargoSpaceId: this.form.cargoSpaceId, productId: row.productId,
warehouseId: this.form.warehouseId, recordType: 3
productId: this.form.productId, }
recordType: 3 return addDifference(pdData);
} }).then(() => {
addDifference(this.pdData).then(response => {
this.$modal.msgSuccess(this.$t('stockManagement.deleteSuccess')) this.$modal.msgSuccess(this.$t('stockManagement.deleteSuccess'))
this.getList() this.getList()
this.reset() }).catch(() => {});
});
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {

43
ruoyi-ui/src/views/search/ViewStockWarning/index.vue
View File

@@ -47,14 +47,14 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('searchViewStockWarning.lotNo')" prop="lotNo"> <!-- 批次号 --> <!-- <el-form-item :label="$t('searchViewStockWarning.lotNo')" prop="lotNo"> &lt;!&ndash; 批次号 &ndash;&gt;
<el-input <el-input
v-model="queryParams.lotNo" v-model="queryParams.lotNo"
:placeholder="$t('searchViewStockWarning.inputLotNo')" :placeholder="$t('searchViewStockWarning.inputLotNo')"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>-->
<el-form-item :label="$t('searchViewStockWarning.inDate')" prop="inDate"> <!-- 入库时间 --> <el-form-item :label="$t('searchViewStockWarning.inDate')" prop="inDate"> <!-- 入库时间 -->
<el-input <el-input
v-model="queryParams.inDate" v-model="queryParams.inDate"
@@ -63,14 +63,14 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item :label="$t('searchViewStockWarning.backDate')" prop="backDate"> <!-- 回流时间 --> <!-- <el-form-item :label="$t('searchViewStockWarning.backDate')" prop="backDate"> &lt;!&ndash; 回流时间 &ndash;&gt;
<el-input <el-input
v-model="queryParams.backDate" v-model="queryParams.backDate"
:placeholder="$t('searchViewStockWarning.inputBackDate')" :placeholder="$t('searchViewStockWarning.inputBackDate')"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>-->
<el-form-item :label="$t('searchViewStockWarning.trayCode')" prop="trayCode"> <!-- 托盘条码 --> <el-form-item :label="$t('searchViewStockWarning.trayCode')" prop="trayCode"> <!-- 托盘条码 -->
<el-input <el-input
v-model="queryParams.trayCode" v-model="queryParams.trayCode"
@@ -105,14 +105,14 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item :label="$t('searchViewStockWarning.spec')" prop="spec"> <!-- 规格 --> <!-- <el-form-item :label="$t('searchViewStockWarning.spec')" prop="spec"> &lt;!&ndash; 规格 &ndash;&gt;
<el-input <el-input
v-model="queryParams.spec" v-model="queryParams.spec"
:placeholder="$t('searchViewStockWarning.inputSpec')" :placeholder="$t('searchViewStockWarning.inputSpec')"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>-->
<el-form-item :label="$t('searchViewStockWarning.thePlatoon')" prop="thePlatoon"> <!-- 排 --> <el-form-item :label="$t('searchViewStockWarning.thePlatoon')" prop="thePlatoon"> <!-- 排 -->
<el-input <el-input
v-model="queryParams.thePlatoon" v-model="queryParams.thePlatoon"
@@ -171,7 +171,7 @@
<dict-tag :options="dict.type.product_status" :value="scope.row.productStatus"/> <dict-tag :options="dict.type.product_status" :value="scope.row.productStatus"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('searchViewStockWarning.lotNo')" align="center" prop="lotNo" /> <!-- 批次号 --> <!-- <el-table-column :label="$t('searchViewStockWarning.lotNo')" align="center" prop="lotNo" /> &lt;!&ndash; 批次号 &ndash;&gt;-->
<el-table-column :label="$t('searchViewStockWarning.inDate')" align="center" prop="inDate" /> <!-- 入库时间 --> <el-table-column :label="$t('searchViewStockWarning.inDate')" align="center" prop="inDate" /> <!-- 入库时间 -->
<el-table-column :label="$t('searchViewStockWarning.backDate')" align="center" prop="backDate" /> <!-- 回流时间 --> <el-table-column :label="$t('searchViewStockWarning.backDate')" align="center" prop="backDate" /> <!-- 回流时间 -->
<el-table-column :label="$t('searchViewStockWarning.quantity')" align="center" prop="quantity" /> <!-- 库存数量 --> <el-table-column :label="$t('searchViewStockWarning.quantity')" align="center" prop="quantity" /> <!-- 库存数量 -->
@@ -185,24 +185,33 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('searchViewStockWarning.warehouseId')" align="center" prop="warehouseId" /> <!-- 仓库ID --> <el-table-column :label="$t('searchViewStockWarning.warehouseId')" align="center" prop="warehouseId" /> <!-- 仓库ID -->
<el-table-column :label="$t('searchViewStockWarning.stackingId')" align="center" prop="stackingId" /> <!-- 垛型ID --> <!-- <el-table-column :label="$t('searchViewStockWarning.stackingId')" align="center" prop="stackingId" /> &lt;!&ndash; 垛型ID &ndash;&gt;-->
<el-table-column :label="$t('searchViewStockWarning.productId')" align="center" prop="productId" /> <!-- 物料ID --> <el-table-column :label="$t('searchViewStockWarning.productId')" align="center" prop="productId" /> <!-- 物料ID -->
<el-table-column :label="$t('searchViewStockWarning.warehouseName')" align="center" prop="warehouseName" /> <!-- 仓库名称 --> <el-table-column :label="$t('searchViewStockWarning.warehouseName')" align="center" prop="warehouseName" /> <!-- 仓库名称 -->
<el-table-column :label="$t('searchViewStockWarning.warehouseType')" align="center" prop="warehouseType" /> <!-- 仓库类型 --> <el-table-column :label="$t('searchViewStockWarning.warehouseType')" align="center" prop="warehouseType" /> <!-- 仓库类型 -->
<el-table-column :label="$t('searchViewStockWarning.isCurrent')" align="center" prop="isCurrent" /> <!-- 是否可用 --> <el-table-column :label="$t('searchViewStockWarning.isCurrent')" align="center" prop="isCurrent" /> <!-- 是否可用 -->
<el-table-column :label="$t('searchViewStockWarning.productName')" align="center" prop="productName" /> <!-- 物料名称 --> <el-table-column :label="$t('searchViewStockWarning.productName')" align="center" prop="productName" /> <!-- 物料名称 -->
<el-table-column :label="$t('searchViewStockWarning.spec')" align="center" prop="spec" /> <!-- 规格 --> <!-- <el-table-column :label="$t('searchViewStockWarning.spec')" align="center" prop="spec" /> &lt;!&ndash; 规格 &ndash;&gt;-->
<el-table-column :label="$t('searchViewStockWarning.cargoNo')" align="center" prop="cargoNo" /> <!-- 品牌 -->
<el-table-column :label="$t('searchViewStockWarning.unit')" align="center" prop="unit" /> <!-- 单位 -->
<el-table-column :label="$t('searchViewStockWarning.cargoSpaceName')" align="center" prop="cargoSpaceName" /> <!-- 货位名称 --> <el-table-column :label="$t('searchViewStockWarning.cargoSpaceName')" align="center" prop="cargoSpaceName" /> <!-- 货位名称 -->
<el-table-column :label="$t('searchViewStockWarning.cargoAreaId')" align="center" prop="cargoAreaId" /> <!-- 货区ID --> <!-- <el-table-column :label="$t('searchViewStockWarning.cargoAreaId')" align="center" prop="cargoAreaId" /> &lt;!&ndash; 货区ID &ndash;&gt;-->
<el-table-column :label="$t('searchViewStockWarning.theType')" align="center" prop="theType" /> <!-- 货位类型 --> <!-- <el-table-column :label="$t('searchViewStockWarning.theType')" align="center" prop="theType" /> &lt;!&ndash; 货位类型 &ndash;&gt;-->
<el-table-column :label="$t('searchViewStockWarning.cargoStatus')" align="center" prop="cargoStatus" /> <!-- 货位状态 --> <el-table-column :label="$t('searchViewStockWarning.cargoStatus')" align="center" prop="cargoStatus" >
<el-table-column :label="$t('searchViewStockWarning.locked')" align="center" prop="locked" /> <!-- 是否锁定 --> <template slot-scope="scope">
<dict-tag :options="dict.type.cargo_space_status" :value="scope.row.cargoStatus"/>
</template>
</el-table-column><!-- 货位状态 -->
<el-table-column :label="$t('searchViewStockWarning.locked')" align="center" prop="locked" >
<template slot-scope="scope">
<dict-tag :options="dict.type.cargo_space_lock_status" :value="scope.row.locked"/>
</template>
</el-table-column><!-- 是否锁定 -->
<el-table-column :label="$t('searchViewStockWarning.cargoHight')" align="center" prop="cargoHight" /> <!-- 货位高度 --> <el-table-column :label="$t('searchViewStockWarning.cargoHight')" align="center" prop="cargoHight" /> <!-- 货位高度 -->
<el-table-column :label="$t('searchViewStockWarning.issDouble')" align="center" prop="issDouble" /> <!-- 是否双伸 --> <!-- <el-table-column :label="$t('searchViewStockWarning.issDouble')" align="center" prop="issDouble" /> &lt;!&ndash; 是否双伸 &ndash;&gt;-->
<el-table-column :label="$t('basproduct1.englishName')" align="center" prop="spare1" /><!-- 英文名称 --> <el-table-column :label="$t('basproduct1.englishName')" align="center" prop="spare1" /><!-- 英文名称 -->
<el-table-column :label="$t('basproduct1.netWeightPerUnit')" align="center" prop="spare2" /><!-- 单件净重 --> <el-table-column :label="$t('basproduct1.netWeightPerUnit')" align="center" prop="spare2" /><!-- 单件净重 -->
<el-table-column :label="$t('searchViewStockWarning.cargoNo')" align="center" prop="cargoNo" /> <!-- 品牌 -->
<el-table-column :label="$t('searchViewStockWarning.unit')" align="center" prop="unit" /> <!-- 单位 -->
<el-table-column :label="$t('basproduct1.long')" align="center" prop="spare5" /><!-- 长MM --> <el-table-column :label="$t('basproduct1.long')" align="center" prop="spare5" /><!-- 长MM -->
<el-table-column :label="$t('basproduct1.wide')" align="center" prop="spare6" /><!-- 宽MM --> <el-table-column :label="$t('basproduct1.wide')" align="center" prop="spare6" /><!-- 宽MM -->
<el-table-column :label="$t('basproduct1.tall')" align="center" prop="spare7" /><!-- 高MM --> <el-table-column :label="$t('basproduct1.tall')" align="center" prop="spare7" /><!-- 高MM -->
@@ -287,7 +296,7 @@ import { listWarehouse } from "@/api/bas/warehouse"
export default { export default {
name: "ViewStockWarning", name: "ViewStockWarning",
dicts: ['product_status', 'in_bill_type', 'stock_status'], dicts: ['product_status', 'in_bill_type', 'stock_status','cargo_space_status','cargo_space_lock_status'],
data() { data() {
return { return {
// 遮罩层 // 遮罩层

148
ruoyi-ui/src/views/stock/management/index.vue
View File

@@ -55,38 +55,38 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<!-- <el-form-item label="回流时间" prop="backDate"> <!-- <el-form-item label="回流时间" prop="backDate">
<el-input <el-input
v-model="queryParams.backDate" v-model="queryParams.backDate"
placeholder="请输入回流时间" placeholder="请输入回流时间"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="物料GUID" prop="productGuid"> <el-form-item label="物料GUID" prop="productGuid">
<el-input <el-input
v-model="queryParams.productGuid" v-model="queryParams.productGuid"
placeholder="请输入物料GUID" placeholder="请输入物料GUID"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="库存数量" prop="quantity"> <el-form-item label="库存数量" prop="quantity">
<el-input <el-input
v-model="queryParams.quantity" v-model="queryParams.quantity"
placeholder="请输入库存数量" placeholder="请输入库存数量"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="作业ID" prop="jobId"> <el-form-item label="作业ID" prop="jobId">
<el-input <el-input
v-model="queryParams.jobId" v-model="queryParams.jobId"
placeholder="请输入作业ID" placeholder="请输入作业ID"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item>--> </el-form-item>-->
<el-form-item :label="$t('stockManagement.trayCode')" prop="trayCode"><!-- 托盘条码 --> <el-form-item :label="$t('stockManagement.trayCode')" prop="trayCode"><!-- 托盘条码 -->
<el-input <el-input
v-model="queryParams.trayCode" v-model="queryParams.trayCode"
@@ -272,7 +272,7 @@
<dict-tag :options="dict.type.product_status" :value="scope.row.productStatus"/> <dict-tag :options="dict.type.product_status" :value="scope.row.productStatus"/>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column :label="$t('stockManagement.backDate')" align="center" prop="backDate" /> &lt;!&ndash; 回流时间 &ndash;&gt;--> <!-- <el-table-column :label="$t('stockManagement.backDate')" align="center" prop="backDate" /> &lt;!&ndash; 回流时间 &ndash;&gt;-->
<el-table-column :label="$t('stockManagement.productId')" align="center" prop="extraField.productId" /> <!-- 物料Id --> <el-table-column :label="$t('stockManagement.productId')" align="center" prop="extraField.productId" /> <!-- 物料Id -->
<el-table-column :label="$t('stockManagement.materialDesc')" align="center" prop="extraField.materialDesc" /> <!-- 物料描述 --> <el-table-column :label="$t('stockManagement.materialDesc')" align="center" prop="extraField.materialDesc" /> <!-- 物料描述 -->
<el-table-column :label="$t('stockManagement.englishDesc')" align="center" prop="extraField.englishDesc" /> <!-- 物料英文描述 --> <el-table-column :label="$t('stockManagement.englishDesc')" align="center" prop="extraField.englishDesc" /> <!-- 物料英文描述 -->
@@ -284,14 +284,14 @@
<el-table-column :label="$t('stockManagement.quantity')" align="center" prop="quantity" /> <!-- 库存数量 --> <el-table-column :label="$t('stockManagement.quantity')" align="center" prop="quantity" /> <!-- 库存数量 -->
<el-table-column :label="$t('stockManagement.jobId')" align="center" prop="jobId" /> <!-- 作业ID --> <el-table-column :label="$t('stockManagement.jobId')" align="center" prop="jobId" /> <!-- 作业ID -->
<el-table-column :label="$t('stockManagement.trayCode')" align="center" prop="trayCode" /> <!-- 托盘条码 --> <el-table-column :label="$t('stockManagement.trayCode')" align="center" prop="trayCode" /> <!-- 托盘条码 -->
<!-- <el-table-column :label="$t('stockManagement.outQuantity')" align="center" prop="outQuantity" /> &lt;!&ndash; 出库数量 &ndash;&gt;--> <!-- <el-table-column :label="$t('stockManagement.outQuantity')" align="center" prop="outQuantity" /> &lt;!&ndash; 出库数量 &ndash;&gt;-->
<el-table-column :label="$t('stockManagement.stockinId')" align="center" prop="stockinId" /> <!-- 入库主单 --> <el-table-column :label="$t('stockManagement.stockinId')" align="center" prop="stockinId" /> <!-- 入库主单 -->
<el-table-column :label="$t('stockManagement.stockinDetailId')" align="center" prop="stockinDetailId" /> <!-- 入库子单id --> <el-table-column :label="$t('stockManagement.stockinDetailId')" align="center" prop="stockinDetailId" /> <!-- 入库子单id -->
<el-table-column :label="$t('stockManagement.inType')" align="center" prop="inType" /> <!-- 入库类型 --> <el-table-column :label="$t('stockManagement.inType')" align="center" prop="inType" /> <!-- 入库类型 -->
<!-- <el-table-column :label="$t('stockManagement.inClassId')" align="center" prop="inClassId" /> &lt;!&ndash; 入库班组ID &ndash;&gt;--> <!-- <el-table-column :label="$t('stockManagement.inClassId')" align="center" prop="inClassId" /> &lt;!&ndash; 入库班组ID &ndash;&gt;-->
<el-table-column :label="$t('stockManagement.warehouseId')" align="center" prop="warehouseName" /> <!-- 仓库 --> <el-table-column :label="$t('stockManagement.warehouseId')" align="center" prop="warehouseName" /> <!-- 仓库 -->
<el-table-column :label="$t('stockManagement.inDate')" align="center" prop="inDate" /> <!-- 入库时间 --> <el-table-column :label="$t('stockManagement.inDate')" align="center" prop="inDate" /> <!-- 入库时间 -->
<!-- <el-table-column :label="$t('stockManagement.stackingId')" align="center" prop="stackingId" /> &lt;!&ndash; 垛型ID &ndash;&gt;--> <!-- <el-table-column :label="$t('stockManagement.stackingId')" align="center" prop="stackingId" /> &lt;!&ndash; 垛型ID &ndash;&gt;-->
<el-table-column :label="$t('stockManagement.operation')" align="center" class-name="small-padding fixed-width"> <!-- 操作 --> <el-table-column :label="$t('stockManagement.operation')" align="center" class-name="small-padding fixed-width"> <!-- 操作 -->
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@@ -339,83 +339,11 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item :label="$t('stockManagement.cargoSpaceStatus')" prop="cargoSpaceStatus"> &lt;!&ndash; 货位状态 &ndash;&gt;
<el-select v-model="form.cargoSpaceStatus" :placeholder="$t('stockManagement.cargoSpaceStatus')">
<el-option
v-for="dict in dict.type.cargo_space_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>-->
<!-- <el-form-item :label="$t('stockManagement.productStatus')" prop="productStatus"> &lt;!&ndash; 物料状态 &ndash;&gt;-->
<!-- <el-select v-model="form.productStatus" :placeholder="$t('stockManagement.selectProductStatus')">-->
<!-- <el-option-->
<!-- v-for="dict in dict.type.product_status"-->
<!-- :key="dict.value"-->
<!-- :label="dict.label"-->
<!-- :value="dict.value"-->
<!-- ></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('stockManagement.lotNo')" prop="lotNo"> &lt;!&ndash; 批次号 &ndash;&gt;-->
<!-- <el-input v-model="form.lotNo" :placeholder="$t('stockManagement.inputLotNo')" />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('stockManagement.inDate')" prop="inDate"> &lt;!&ndash; 入库时间 &ndash;&gt;-->
<!-- <el-input v-model="form.inDate" :placeholder="$t('stockManagement.inputInDate')" />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('stockManagement.backDate')" prop="backDate"> &lt;!&ndash; 回流时间 &ndash;&gt;-->
<!-- <el-input v-model="form.backDate" :placeholder="$t('stockManagement.inputBackDate')" />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('stockManagement.productGuid')" prop="productGuid"> &lt;!&ndash; 物料GUID &ndash;&gt;-->
<!-- <el-input v-model="form.productGuid" :placeholder="$t('stockManagement.inputProductGuid')" />-->
<!-- </el-form-item>-->
<el-form-item :label="$t('stockManagement.quantity')" prop="quantity"> <!-- 库存数量 --> <el-form-item :label="$t('stockManagement.quantity')" prop="quantity"> <!-- 库存数量 -->
<el-input v-model="form.quantity" :placeholder="$t('stockManagement.inputQuantity')" /> <el-input v-model="form.quantity" :placeholder="$t('stockManagement.inputQuantity')" />
</el-form-item> </el-form-item>
<!-- <el-form-item :label="$t('stockManagement.jobId')" prop="jobId"> &lt;!&ndash; 作业ID &ndash;&gt;-->
<!-- <el-input v-model="form.jobId" :placeholder="$t('stockManagement.inputJobId')" />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('stockManagement.trayCode')" prop="trayCode"> &lt;!&ndash; 托盘条码 &ndash;&gt;-->
<!-- <el-input v-model="form.trayCode" :placeholder="$t('stockManagement.inputTrayCode')" />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('stockManagement.outQuantity')" prop="outQuantity"> &lt;!&ndash; 出库数量 &ndash;&gt;-->
<!-- <el-input v-model="form.outQuantity" :placeholder="$t('stockManagement.inputOutQuantity')" />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('stockManagement.stockinDetailId')" prop="stockinDetailId"> &lt;!&ndash; 入库子单id &ndash;&gt;-->
<!-- <el-input v-model="form.stockinDetailId" :placeholder="$t('stockManagement.inputStockinDetailId')" />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('stockManagement.stockinId')" prop="stockinId"> &lt;!&ndash; 入库主单 &ndash;&gt;-->
<!-- <el-input v-model="form.stockinId" :placeholder="$t('stockManagement.inputStockinId')" />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('stockManagement.inClassId')" prop="inClassId"> &lt;!&ndash; 入库班组ID &ndash;&gt;-->
<!-- <el-input v-model="form.inClassId" :placeholder="$t('stockManagement.inputInClassId')" />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('stockManagement.warehouseId')" prop="warehouseId"> &lt;!&ndash; 仓库 &ndash;&gt;-->
<!-- <el-input v-model="form.warehouseId" :placeholder="$t('stockManagement.inputWarehouseId')" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="垛型ID" prop="stackingId">-->
<!-- <el-input v-model="form.stackingId" placeholder="请输入垛型ID" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="备用字段1" prop="spare1">-->
<!-- <el-input v-model="form.spare1" placeholder="请输入备用字段1" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="备用字段2" prop="spare2">-->
<!-- <el-input v-model="form.spare2" placeholder="请输入备用字段2" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="备用字段3" prop="spare3">-->
<!-- <el-input v-model="form.spare3" placeholder="请输入备用字段3" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="备用字段4" prop="spare4">-->
<!-- <el-input v-model="form.spare4" placeholder="请输入备用字段4" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="备用字段5" prop="spare5">-->
<!-- <el-input v-model="form.spare5" placeholder="请输入备用字段5" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="备用字段6" prop="spare6">-->
<!-- <el-input v-model="form.spare6" placeholder="请输入备用字段6" />-->
<!-- </el-form-item>-->
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">{{$t('stockManagement.confirm')}} <!-- 确定 --></el-button> <el-button type="primary" @click="submitForm">{{$t('stockManagement.confirm')}} <!-- 确定 --></el-button>