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

出库单据

Browse Source
This commit is contained in:
张怡蓉
2025-10-10 14:36:32 +08:00
parent 07c602a992
commit 2c14013285
6 changed files with 309 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/impl/BasStockServiceImpl.java
View File

@@ -85,20 +85,20 @@ public class BasStockServiceImpl implements IBasStockService
}
private void insertMaintainRecord(BasStock oldStock, BasStock basStock, String operate) {
if (oldStock != null && !oldStock.getQuantity().equals(basStock.getQuantity())) {
if (oldStock != null && (!oldStock.getQuantity().equals(basStock.getQuantity())||!oldStock.getProductId().equals(basStock.getProductId()))) {
BasStockMaintainRecord basStockMaintainRecord = new BasStockMaintainRecord();
basStockMaintainRecord.setWhGuid(IdUtil.fastSimpleUUID());
basStockMaintainRecord.setStockId(basStock.getStockId());
basStockMaintainRecord.setCargoSpaceId(basStock.getCargoSpaceId());
basStockMaintainRecord.setLotNo(basStock.getLotNo());
basStockMaintainRecord.setLotNo(oldStock.getCargoSpaceId());
basStockMaintainRecord.setTrayCode(basStock.getTrayCode());
basStockMaintainRecord.setProductGuid(basStock.getProductGuid());
basStockMaintainRecord.setProductGuid(oldStock.getProductName());
basStockMaintainRecord.setCreateBy(SecurityUtils.getLoginUser().getUsername());
basStockMaintainRecord.setCreateTime(new Date());
basStockMaintainRecord.setOldQuantity(oldStock.getQuantity());
basStockMaintainRecord.setQuantity(basStock.getQuantity());
basStockMaintainRecord.setProductId(basStock.getExtraField().getProductId());
basStockMaintainRecord.setProductName(basStock.getExtraField().getMaterialDesc());
basStockMaintainRecord.setProductId(basStock.getProductId());
basStockMaintainRecord.setProductName(basStock.getProductName());
basStockMaintainRecord.setWarehouseId(basStock.getWarehouseId());
basStockMaintainRecord.setMethod(operate);
basStockMaintainRecordService.insertBasStockMaintainRecord(basStockMaintainRecord);

3
ruoyi-admin/src/main/resources/mapper/out/ViewHandAllotStockMapper.xml
View File

@@ -53,10 +53,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<where>
<if test="stockId != null and stockId != ''"> and stock_id = #{stockId}</if>
<if test="cargoSpaceId != null and cargoSpaceId != ''"> and cargo_space_id = #{cargoSpaceId}</if>
<if test="cargoSpaceName != null and cargoSpaceName != ''"> and cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
<if test="stockStatus != null and stockStatus != ''"> and stock_status = #{stockStatus}</if>
<if test="productStatus != null and productStatus != ''"> and product_status = #{productStatus}</if>
<if test="lotNo != null and lotNo != ''"> and lot_no = #{lotNo}</if>
<if test="inDate != null and inDate != ''"> and in_date = #{inDate}</if>
<if test="inDate != null and inDate != ''"> and in_date like concat('%', #{inDate}, '%')</if>
<if test="backDate != null and backDate != ''"> and back_date = #{backDate}</if>
<if test="productGuid != null and productGuid != ''"> and product_guid = #{productGuid}</if>
<if test="quantity != null "> and quantity = #{quantity}</if>

3
ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml
View File

@@ -75,13 +75,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<where>
<if test="stockId != null and stockId != ''"> and bs.stock_id = #{stockId}</if>
<if test="cargoSpaceId != null and cargoSpaceId != ''"> and bs.cargo_space_id = #{cargoSpaceId}</if>
<if test="cargoSpaceName != null and cargoSpaceName != ''"> and bs.cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
<if test="stockStatus != null and stockStatus != ''"> and bs.stock_status = #{stockStatus}</if>
<if test="productStatus != null and productStatus != ''"> and bs.product_status = #{productStatus}</if>
<if test="lotNo != null and lotNo != ''"> and bs.lot_no = #{lotNo}</if>
<if test="inDate != null and inDate != ''"> and bs.in_date like concat('%', #{inDate}, '%')</if>
<if test="backDate != null and backDate != ''"> and bs.back_date = #{backDate}</if>
<if test="productGuid != null and productGuid != ''"> and bs.product_guid = #{productGuid}</if>
<if test="productName != null and productName != ''"> and bs.product_name = #{productName}</if>
<if test="productName != null and productName != ''"> and bs.product_name like concat('%', #{productName}, '%')</if>
<if test="quantity != null and quantity != ''"> and bs.quantity = #{quantity}</if>
<if test="jobId != null and jobId != ''"> and bs.job_id = #{jobId}</if>
<if test="trayCode != null and trayCode != ''"> and bs.tray_code = #{trayCode}</if>

4
ruoyi-ui/src/views/job/outJobManagement.vue
View File

@@ -419,10 +419,10 @@ export default {
}
// 检查选中任务的状态是否小于3(未执行)
const invalidTasks = this.mydoJobList.filter(item =>
this.ids.includes(item.jobId) && item.status >= '3'
this.ids.includes(item.jobId) && item.status > '3'
);
if (invalidTasks.length > 0) {
this.$modal.msgError("只能手动作废状态为[未执行]的作业");
this.$modal.msgError("作业已完成，无法作废！");
return;
}
this.$modal.confirm('是否确认手动作废选中的任务？').then(() => {

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

@@ -9,10 +9,18 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="货位ID" prop="cargoSpaceId"><!-- 货位id -->
<el-form-item label="货位编码" prop="cargoSpaceId"><!-- 货位id -->
<el-input
v-model="queryParams.cargoSpaceId"
placeholder="请输入货位ID"
placeholder="请输入货位编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="货位名称" prop="cargoSpaceName"><!-- 货位id -->
<el-input
v-model="queryParams.cargoSpaceName"
placeholder="请输入货位名称"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -27,26 +35,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="货位状态" prop="cargoSpaceStockStatus"><!-- 货位状态 -->
<el-select v-model="queryParams.cargoSpaceStockStatus" placeholder="请选择货位状态" clearable>
<el-option
v-for="dict in dict.type.cargo_space_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="物料状态" prop="productStatus"><!-- 物料状态 -->
<el-select v-model="queryParams.productStatus" placeholder="请选择物料状态" clearable>
<el-option
v-for="dict in dict.type.product_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="入库时间" prop="startDate"><!-- 入库时间 -->
<el-date-picker clearable
v-model="queryParams.inDate"
@@ -55,33 +44,17 @@
placeholder="请选择入库时间">
</el-date-picker>
</el-form-item>
<el-form-item label="托盘条码" prop="trayCode"><!-- 托盘条码 -->
<el-form-item label="品名" prop="productName"><!-- 物料描述 -->
<el-input
v-model="queryParams.trayCode"
placeholder="请输入托盘条码"
v-model="queryParams.productName"
placeholder="请输入品名"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料描述" prop="productName"><!-- 物料描述 -->
<el-input
v-model="queryParams.productName"
placeholder="请输入物料描述"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="仓库" prop="warehouseId"><!-- 仓库id -->
<el-select v-model="queryParams.warehouseId" placeholder="请选择仓库">
<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-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button><!-- 搜索 -->
@@ -129,6 +102,11 @@
<el-table-column type="selection" align="center" />
<el-table-column label="库存编码" align="center" prop="stockId" />
<el-table-column label="货位名称" align="center" prop="cargoSpaceName" />
<el-table-column label="库存状态" align="center" prop="stockStatus" >
<template slot-scope="scope">
<dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/>
</template>
</el-table-column>
<el-table-column label="品号" align="center" prop="productId" />
<el-table-column label="品名" align="center" prop="productName" />
<el-table-column label="批次号" align="center" prop="lotNo" />
@@ -184,12 +162,41 @@
<!-- 添加或修改库存信息对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="库存ID" prop="stockId"> <!-- 库存id -->
<el-input v-model="form.stockId" placeholder="请输入库存ID" />
<!-- <el-form-item label="库存ID" prop="stockId"> &lt;!&ndash; 库存id &ndash;&gt;-->
<!-- <el-input v-model="form.stockId" placeholder="请输入库存ID" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="货位ID" prop="cargoSpaceId"> &lt;!&ndash; 货位id &ndash;&gt;-->
<!-- <el-input v-model="form.cargoSpaceId" placeholder="请输入货位ID" />-->
<!-- </el-form-item>-->
<el-form-item label="物料" prop="productId"> <!-- 物料 -->
<el-input
v-model="form.productName"
placeholder="请选择物料"
readonly
@click="openProductSelect"
style="cursor: pointer;"
>
<template slot="append">
<el-button icon="el-icon-search" @click="openProductSelect"></el-button>
</template>
</el-input>
</el-form-item>
<el-form-item label="货位ID" prop="cargoSpaceId"> <!-- 货位id -->
<el-input v-model="form.cargoSpaceId" placeholder="请输入货位ID" />
<el-form-item label="货位" prop="cargoSpaceId"> <!-- 货位 -->
<el-input
v-model="form.cargoSpaceName"
placeholder="请选择货位"
readonly
@click="openCargoSpaceSelect"
style="cursor: pointer;"
>
<template slot="append">
<el-button icon="el-icon-search" @click="openCargoSpaceSelect"></el-button>
</template>
</el-input>
</el-form-item>
<el-form-item label="库存状态" prop="stockStatus"> <!-- 库存状态 -->
<el-select v-model="form.stockStatus" placeholder="请选择库存状态">
<el-option
@@ -211,12 +218,134 @@
<el-button @click="cancel">取消 <!-- 取消 --></el-button>
</div>
</el-dialog>
<!-- 物料选择对话框 -->
<el-dialog title="选择物料" :visible.sync="productSelectVisible" width="800px" append-to-body>
<el-form :model="productQueryParams" ref="productQueryForm" size="small" :inline="true" label-width="68px">
<el-form-item label="物料编码" prop="productId">
<el-input
v-model="productQueryParams.productId"
placeholder="请输入物料编码"
clearable
@keyup.enter.native="getProductList"
/>
</el-form-item>
<el-form-item label="物料名称" prop="productName">
<el-input
v-model="productQueryParams.productName"
placeholder="请输入物料名称"
clearable
@keyup.enter.native="getProductList"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="getProductList">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetProductQuery">重置</el-button>
</el-form-item>
</el-form>
<el-table
v-loading="productLoading"
:data="productList"
@row-click="handleProductRowClick"
highlight-current-row
max-height="400">
<el-table-column label="物料编码" align="center" prop="productId" />
<el-table-column label="物料名称" align="center" prop="productName" />
<el-table-column label="规格" align="center" prop="spec" />
<el-table-column label="型号" align="center" prop="spare1" />
<el-table-column label="单位" align="center" prop="unit" />
</el-table>
<pagination
v-show="productTotal>0"
:total="productTotal"
:page.sync="productQueryParams.pageNum"
:limit.sync="productQueryParams.pageSize"
@pagination="getProductList"
/>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="confirmProductSelect">确定</el-button>
<el-button @click="productSelectVisible = false">取消</el-button>
</div>
</el-dialog>
<!-- 货位选择对话框 -->
<el-dialog title="选择货位" :visible.sync="cargoSpaceSelectVisible" width="800px" append-to-body>
<el-form :model="cargoSpaceQueryParams" ref="cargoSpaceQueryForm" size="small" :inline="true" label-width="68px">
<el-form-item label="货位编码" prop="cargoSpaceId">
<el-input
v-model="cargoSpaceQueryParams.cargoSpaceId"
placeholder="请输入货位编码"
clearable
@keyup.enter.native="getCargoSpaceList"
/>
</el-form-item>
<el-form-item label="货位名称" prop="cargoSpaceName">
<el-input
v-model="cargoSpaceQueryParams.cargoSpaceName"
placeholder="请输入货位名称"
clearable
@keyup.enter.native="getCargoSpaceList"
/>
</el-form-item>
<el-form-item label="仓库" prop="warehouseId">
<el-select v-model="cargoSpaceQueryParams.warehouseId" placeholder="请选择仓库" 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-button type="primary" icon="el-icon-search" size="mini" @click="getCargoSpaceList">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetCargoSpaceQuery">重置</el-button>
</el-form-item>
</el-form>
<el-table
v-loading="cargoSpaceLoading"
:data="cargoSpaceList"
@row-click="handleCargoSpaceRowClick"
highlight-current-row
max-height="400">
<el-table-column label="货位编码" align="center" prop="cargoSpaceId" />
<el-table-column label="货位名称" align="center" prop="cargoSpaceName" />
<el-table-column label="仓库名称" align="center" prop="warehouseName" />
<el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.cargo_space_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="排" align="center" prop="thePlatoon" />
<el-table-column label="列" align="center" prop="theColumn" />
<el-table-column label="层" align="center" prop="theFloor" />
</el-table>
<pagination
v-show="cargoSpaceTotal>0"
:total="cargoSpaceTotal"
:page.sync="cargoSpaceQueryParams.pageNum"
:limit.sync="cargoSpaceQueryParams.pageSize"
@pagination="getCargoSpaceList"
/>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="confirmCargoSpaceSelect">确定</el-button>
<el-button @click="cargoSpaceSelectVisible = false">取消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listManagement, getManagement, delManagement, addManagement, updateManagement } from "@/api/stock/management"
import {listWarehouse} from "@/api/bas/warehouse"
import { listBasProduct } from "@/api/bas/BasProduct"
import { listCargoSpace } from "@/api/bas/cargoSpace"
export default {
name: "Management",
dicts: ['product_status', 'stock_status','cargo_space_status','cargo_space_lock_status'],
@@ -248,6 +377,7 @@ export default {
pageSize: 10,
stockId: null,
cargoSpaceId: null,
cargoSpaceName: null,
stockStatus: null,
productStatus: null,
lotNo: null,
@@ -282,7 +412,32 @@ export default {
/*stockId: [
{ required: true, message: this.$t('stockManagement.stockIdRequired'), trigger: "blur" } // 库存id不能为空
]*/
}
},
// 物料选择相关
productSelectVisible: false,
productList: [],
productTotal: 0,
productLoading: false,
productQueryParams: {
pageNum: 1,
pageSize: 10,
productId: null,
productName: null
},
selectedProduct: null,
// 货位选择相关
cargoSpaceSelectVisible: false,
cargoSpaceList: [],
cargoSpaceTotal: 0,
cargoSpaceLoading: false,
cargoSpaceQueryParams: {
pageNum: 1,
pageSize: 10,
cargoSpaceId: null,
cargoSpaceName: null,
warehouseId: null
},
selectedCargoSpace: null
}
},
created() {
@@ -315,12 +470,15 @@ export default {
this.form = {
stockId: null,
cargoSpaceId: null,
cargoSpaceName: null,
stockStatus: null,
productStatus: null,
lotNo: null,
inDate: null,
backDate: null,
productGuid: null,
productId: null,
productName: null,
quantity: null,
jobId: null,
trayCode: null,
@@ -348,6 +506,8 @@ export default {
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm")
// 手动清空入库时间字段
this.queryParams.inDate = null
this.handleQuery()
},
// 多选框选中数据
@@ -407,6 +567,90 @@ export default {
this.download('stock/management/export', {
...this.queryParams
}, `management_${new Date().getTime()}.xlsx`)
},
/** 打开物料选择框 */
openProductSelect() {
this.productSelectVisible = true
this.getProductList()
},
/** 获取物料列表 */
getProductList() {
this.productLoading = true
listBasProduct(this.productQueryParams).then(response => {
this.productList = response.rows
this.productTotal = response.total
this.productLoading = false
}).catch(() => {
this.productLoading = false
})
},
/** 重置物料查询 */
resetProductQuery() {
this.productQueryParams = {
pageNum: 1,
pageSize: 10,
productId: null,
productName: null
}
this.getProductList()
},
/** 物料选择行点击 */
handleProductRowClick(row) {
this.selectedProduct = row
},
/** 确认选择物料 */
confirmProductSelect() {
if (this.selectedProduct) {
this.form.productGuid = this.selectedProduct.productGuid
this.form.productName = this.selectedProduct.productName
this.form.productId = this.selectedProduct.productId
this.productSelectVisible = false
this.selectedProduct = null
} else {
this.$modal.msgWarning("请选择一个物料")
}
},
/** 打开货位选择框 */
openCargoSpaceSelect() {
this.cargoSpaceSelectVisible = true
this.getCargoSpaceList()
},
/** 获取货位列表 */
getCargoSpaceList() {
this.cargoSpaceLoading = true
listCargoSpace(this.cargoSpaceQueryParams).then(response => {
this.cargoSpaceList = response.rows
this.cargoSpaceTotal = response.total
this.cargoSpaceLoading = false
}).catch(() => {
this.cargoSpaceLoading = false
})
},
/** 重置货位查询 */
resetCargoSpaceQuery() {
this.cargoSpaceQueryParams = {
pageNum: 1,
pageSize: 10,
cargoSpaceId: null,
cargoSpaceName: null,
warehouseId: null
}
this.getCargoSpaceList()
},
/** 货位选择行点击 */
handleCargoSpaceRowClick(row) {
this.selectedCargoSpace = row
},
/** 确认选择货位 */
confirmCargoSpaceSelect() {
if (this.selectedCargoSpace) {
this.form.cargoSpaceId = this.selectedCargoSpace.cargoSpaceId
this.form.cargoSpaceName = this.selectedCargoSpace.cargoSpaceName
this.cargoSpaceSelectVisible = false
this.selectedCargoSpace = null
} else {
this.$modal.msgWarning("请选择一个货位")
}
}
}
}

10
ruoyi-ui/src/views/stock/record/index.vue
View File

@@ -85,11 +85,13 @@
<el-table v-loading="loading" :data="recordList" @selection-change="handleSelectionChange" max-height="650">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="库存编码" align="left" prop="stockId" /> <!-- 库存编码 -->
<el-table-column label="货位编码" align="left" prop="cargoSpaceId" /> <!-- 货位编码 -->
<el-table-column label="货位名称" align="left" prop="cargoSpaceName" /> <!-- 货位编码 -->
<el-table-column label="初始货位编码" align="left" prop="lotNo" /> <!-- 库存编码 -->
<el-table-column label="操作后货位编码" align="left" prop="cargoSpaceId" /> <!-- 货位编码 -->
<el-table-column label="操作后货位名称" align="left" prop="cargoSpaceName" /> <!-- 货位编码 -->
<el-table-column label="托盘条码" align="left" prop="trayCode" /> <!-- 托盘条码 -->
<el-table-column label="物品编码" align="left" prop="productId" /> <!-- 物品编码 -->
<el-table-column label="物品名称" align="left" prop="productName" /> <!-- 物品名称 -->
<el-table-column label="初始物品名称" align="left" prop="productGuid" /> <!-- 托盘条码 -->
<el-table-column label="操作后物品编码" align="left" prop="productId" /> <!-- 物品编码 -->
<el-table-column label="操作后物品名称" align="left" prop="productName" /> <!-- 物品名称 -->
<el-table-column label="初始数量" align="right" prop="oldQuantity" /> <!-- 初始数量 -->
<el-table-column label="操作后数量" align="right" prop="quantity" /> <!-- 操作后数量 -->
<el-table-column label="操作" align="left" prop="method"> <!-- 操作 -->