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-23 11:22:50 +08:00
parent afb022d365
commit 7defbe45ff
16 changed files with 965 additions and 488 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ruoyi-ui/src/api/check/stockCheck.js
View File

@@ -49,3 +49,12 @@ export function delStockCheck(stockGuid) {
method: 'delete'
})
}
// 导出盘库单据主信息
export function autoAllocation(data) {
return request({
url: '/check/stockCheck/autoAllocation',
method: 'get',
params: data
})
}

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

@@ -438,7 +438,9 @@ export default {
reviewSuccess: 'Review successful',
onlyUnreviewedCanReview: 'Only unreviewed documents can be reviewed',
confirmSuccess: 'Confirm successful',
onlyReviewedCanConfirm: 'Only reviewed documents can be confirmed'
onlyReviewedCanConfirm: 'Only reviewed documents can be confirmed',
autoAllocation:'autoAllocation',
autoAllocationSuccess:"autoAllocationSuccess"
},
// ***************盘点入库作业*************
checkJobIn: {
@@ -502,7 +504,15 @@ export default {
jobIdRequired: 'Task ID cannot be empty',
statusRequired: 'Task Status cannot be empty',
taskNoRequired: 'Task No. cannot be empty',
selectData: 'Please select data to operate'
selectData: 'Please select data to operate',
materialDesc:"materialDesc",
englishDesc:"englishDesc",
cartonNo:"cartonNo",
packingMethod:"packingMethod",
netWeight:"netWeight",
totalNetWeight:"totalNetWeight",
grossWeight:"grossWeight",
onlyOneCanAutoAllocation:"onlyOneCanAutoAllocation"
},
// **************盘点出库作业****************
checkJobOut: {
@@ -561,7 +571,17 @@ export default {
confirmFinish: 'Are you sure to manually finish the data with ID "{jobIds}"?',
finishSuccess: 'Manual finish successful',
confirmInvalid: 'Are you sure to manually invalid the data with ID "{jobIds}"?',
invalidSuccess: 'Manual invalid successful'
invalidSuccess: 'Manual invalid successful',
materialDesc:"materialDesc",
englishDesc:"englishDesc",
cartonNo:"cartonNo",
packingMethod:"packingMethod",
netWeight:"netWeight",
totalNetWeight:"totalNetWeight",
grossWeight:"grossWeight",
onlyOneCanAutoAllocation:"onlyOneCanAutoAllocation",
outQuantity: 'outQuantity',
pickQuantity: 'pickQuantity'
},
// ****************盘点差异管理*****************
checkDifference: {

1257
ruoyi-ui/src/lang/hu.js
View File

File diff suppressed because it is too large Load Diff

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

@@ -416,7 +416,8 @@ export default {
confirmSuccess: '确认成功',
onlyReviewedCanConfirm: '只有已审核的单据可以确认',
cargoSpaceName: '货位名称',
autoAllocation:'自动分配'
autoAllocation:'自动分配',
autoAllocationSuccess:"自动分配成功"
},
// ***************盘点入库作业*************
checkJobIn: {
@@ -480,7 +481,15 @@ export default {
jobIdRequired: '任务ID不能为空',
statusRequired: '任务状态不能为空',
taskNoRequired: '任务号不能为空',
selectData: '请选择要操作的数据'
selectData: '请选择要操作的数据',
materialDesc:"物料描述",
englishDesc:"英文描述",
cartonNo:"箱号",
packingMethod:"包装方式",
netWeight:"净重",
totalNetWeight:"总净重",
grossWeight:"毛重",
onlyOneCanAutoAllocation:"请选择一条分配单据"
},
// **************盘点出库作业****************
checkJobOut: {
@@ -539,7 +548,17 @@ export default {
confirmFinish: '是否确认手动完成编号为"{jobIds}"的数据项?',
finishSuccess: '手动完成成功',
confirmInvalid: '是否确认手动作废编号为"{jobIds}"的数据项?',
invalidSuccess: '手动作废成功'
invalidSuccess: '手动作废成功',
materialDesc:"物料描述",
englishDesc:"英文描述",
cartonNo:"箱号",
packingMethod:"包装方式",
netWeight:"净重",
totalNetWeight:"总净重",
grossWeight:"毛重",
onlyOneCanAutoAllocation:"请选择一条分配单据",
outQuantity: '出库数量',
pickQuantity: '拣货数量'
},
// ****************盘点差异管理*****************
checkDifference: {

22
ruoyi-ui/src/views/check/job/in/index.vue
View File

@@ -299,7 +299,7 @@
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('checkJobIn.jobDetailId')" align="center" prop="jobDetailId" /> <!--子任务ID-->
<el-table-column :label="$t('checkJobIn.jobId')" align="center" prop="jobId" /> <!--任务ID-->
<el-table-column :label="$t('checkJobIn.stockId')" align="center" prop="stockId" /> <!--库存ID-->
<!-- <el-table-column :label="$t('checkJobIn.stockId')" align="center" prop="stockId" /> &lt;!&ndash;库存ID&ndash;&gt;-->
<el-table-column :label="$t('checkJobIn.lotNo')" align="center" prop="lotNo" /> <!--批次号-->
<el-table-column :label="$t('checkJobIn.inDate')" align="center" prop="inDate" width="180"> <!--入库时间-->
<template slot-scope="scope">
@@ -308,12 +308,19 @@
</el-table-column>
<el-table-column :label="$t('checkJobIn.inOrOutId')" align="center" prop="inOrOutId" /> <!--单据ID-->
<el-table-column :label="$t('checkJobIn.inOrOutDId')" align="center" prop="inOrOutDId" /> <!--子单据ID-->
<el-table-column :label="$t('checkJobIn.productGuid')" align="center" prop="productGuid" /> <!--物料GUID-->
<!-- <el-table-column :label="$t('checkJobIn.productGuid')" align="center" prop="productGuid" /> &lt;!&ndash;物料GUID&ndash;&gt;-->
<el-table-column :label="$t('checkJobIn.productId')" align="center" prop="productId" /> <!--物料编码-->
<el-table-column :label="$t('checkJobIn.stockStatus')" align="center" prop="stockStatus" /> <!--库存状态-->
<el-table-column :label="$t('checkJobIn.materialDesc')" align="center" prop="extraField.materialDesc" /> // 物料描述
<el-table-column :label="$t('checkJobIn.englishDesc')" align="center" prop="extraField.englishDesc" /> // 英文描述
<el-table-column :label="$t('checkJobIn.cartonNo')" align="center" prop="extraField.cartonNo" /> // 箱号
<el-table-column :label="$t('checkJobIn.packingMethod')" align="center" prop="extraField.packingMethod" /> // 包装方式
<el-table-column :label="$t('checkJobIn.netWeight')" align="center" prop="extraField.netWeight" /> // 净重
<el-table-column :label="$t('checkJobIn.totalNetWeight')" align="center" prop="extraField.totalNetWeight" /> // 总净重
<el-table-column :label="$t('checkJobIn.grossWeight')" align="center" prop="extraField.grossWeight" /> // 毛重
<!-- <el-table-column :label="$t('checkJobIn.stockStatus')" align="center" prop="stockStatus" /> &lt;!&ndash;库存状态&ndash;&gt;-->
<el-table-column :label="$t('checkJobIn.inQuantity')" align="center" prop="inQuantity" /> <!--入库数量-->
<el-table-column :label="$t('checkJobIn.printDate')" align="center" prop="printDate" /> <!--生产日期-->
<el-table-column :label="$t('checkJobIn.supplierId')" align="center" prop="supplierId" /> <!--供应商ID-->
<!-- <el-table-column :label="$t('checkJobIn.printDate')" align="center" prop="printDate" /> &lt;!&ndash;生产日期&ndash;&gt;-->
<!-- <el-table-column :label="$t('checkJobIn.supplierId')" align="center" prop="supplierId" /> &lt;!&ndash;供应商ID&ndash;&gt;-->
</el-table>
<pagination
@@ -381,7 +388,7 @@ export default {
workshopId: null,
priority: null,
executionPhase: null,
inOrOut: '2',
inOrOut: null,
createTime: null,
startTime: null,
finishTime: null,
@@ -389,7 +396,8 @@ export default {
exitId: null,
classId: null,
warehouseId: null,
faultFlag: null
faultFlag: null,
inOut:"3"
},
queryDetailParams:{
pageNum: 1,

66
ruoyi-ui/src/views/check/job/out/index.vue
View File

@@ -242,7 +242,7 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="jobList" @selection-change="handleSelectionChange" @row-click="handleRowClick">
<el-table v-loading="loading" :data="mydoJobList" @selection-change="handleSelectionChange" @row-click="handleRowClick">
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('checkJobOut.jobId')" align="center" prop="jobId" /> <!-- 任务ID -->
<el-table-column :label="$t('checkJobOut.status')" align="center" prop="status"> <!-- 任务状态 -->
@@ -261,15 +261,9 @@
</template>
</el-table-column>
<el-table-column :label="$t('checkJobOut.taskNo')" align="center" prop="taskNo" /> <!-- 任务号 -->
<el-table-column :label="$t('checkJobOut.supplierId')" align="center" prop="supplierId" /> <!-- 供应商ID -->
<el-table-column :label="$t('checkJobOut.departmentId')" align="center" prop="departmentId" /> <!-- 部门ID -->
<el-table-column :label="$t('checkJobOut.trayCode')" align="center" prop="trayCode" /> <!-- 托盘码 -->
<el-table-column :label="$t('checkJobOut.roadwayId')" align="center" prop="roadwayId" /> <!-- 巷道ID -->
<el-table-column :label="$t('checkJobOut.cargoSpaceId')" align="center" prop="cargoSpaceId" /> <!-- 货位ID -->
<el-table-column :label="$t('checkJobOut.targetRoadwayId')" align="center" prop="targetRoadwayId" /> <!-- 目标巷道ID -->
<el-table-column :label="$t('checkJobOut.targetCargoSpace')" align="center" prop="targetCargoSpaceId" /> <!-- 目标货位 -->
<el-table-column :label="$t('checkJobOut.lineId')" align="center" prop="lineId" /> <!-- 产线ID -->
<el-table-column :label="$t('checkJobOut.workshopId')" align="center" prop="workshopId" /> <!-- 车间ID -->
<el-table-column :label="$t('checkJobOut.priority')" align="center" prop="priority" /> <!-- 优先级 -->
<el-table-column :label="$t('checkJobOut.executionPhase')" align="center" prop="executionPhase"> <!-- 执行阶段 -->
<template slot-scope="scope">
@@ -286,11 +280,8 @@
<span>{{ parseTime(scope.row.finishTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('checkJobOut.entranceId')" align="center" prop="entranceId" /> <!-- 入口ID -->
<el-table-column :label="$t('checkJobOut.exitId')" align="center" prop="exitId" /> <!-- 出口ID -->
<el-table-column :label="$t('checkJobOut.classId')" align="center" prop="classId" /> <!-- 班组ID -->
<el-table-column :label="$t('checkJobOut.warehouse')" align="center" prop="warehouseId" /> <!-- 仓库 -->
<el-table-column :label="$t('checkJobOut.faultFlag')" align="center" prop="faultFlag" /> <!-- 重分标记 -->
<el-table-column :label="$t('checkJobOut.operation')" align="center" class-name="small-padding fixed-width"> <!-- 操作 -->
<template slot-scope="scope">
<el-button
@@ -317,36 +308,28 @@
@pagination="getList"
/>
<el-table v-loading="loading" :data="subJobList" @selection-change="handleSelectionChange">
<el-table v-loading="loading" :data="mydoJobDetailList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('checkJobOut.subJobId')" align="center" prop="subJobId" /> <!-- 子任务ID -->
<el-table-column :label="$t('checkJobOut.subJobId')" align="center" prop="jobDetailId" /> <!-- 子任务ID -->
<el-table-column :label="$t('checkJobOut.jobId')" align="center" prop="jobId" /> <!-- 任务ID -->
<el-table-column :label="$t('checkJobOut.stockId')" align="center" prop="stockId" /> <!-- 库存ID -->
<el-table-column :label="$t('checkJobOut.batchNo')" align="center" prop="batchNo" /> <!-- 批次号 -->
<el-table-column :label="$t('checkJobOut.inTime')" align="center" prop="inTime" width="180"> <!-- 入库时间 -->
<template slot-scope="scope">
<span>{{ parseTime(scope.row.inTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('checkJobOut.billId')" align="center" prop="billId" /> <!-- 单据ID -->
<el-table-column :label="$t('checkJobOut.subBillId')" align="center" prop="subBillId" /> <!-- 子单据ID -->
<el-table-column :label="$t('checkJobOut.materialGuid')" align="center" prop="materialGuid" /> <!-- 物料GUID -->
<el-table-column :label="$t('checkJobOut.materialCode')" align="center" prop="materialCode" /> <!-- 物料编码 -->
<el-table-column :label="$t('checkJobOut.stockStatus')" align="center" prop="stockStatus" /> <!-- 库存状态 -->
<el-table-column :label="$t('checkJobOut.inQty')" align="center" prop="inQty" /> <!-- 入库数量 -->
<el-table-column :label="$t('checkJobOut.productDate')" align="center" prop="productDate" width="180"> <!-- 生产日期 -->
<template slot-scope="scope">
<span>{{ parseTime(scope.row.productDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('checkJobOut.supplierId')" align="center" prop="supplierId" /> <!-- 供应商ID -->
<el-table-column label="生产日期" align="center" prop="printDate" />
<!-- <el-table-column label="客户ID" align="center" prop="customerId" />-->
<el-table-column label="供应商ID" align="center" prop="supplierId" />
<!-- <el-table-column label="备用字段1" align="center" prop="spare1" />
<el-table-column label="备用字段2" align="center" prop="spare2" />
<el-table-column label="备用字段3" align="center" prop="spare3" />
<el-table-column label="备用字段4" align="center" prop="spare4" />-->
<el-table-column :label="$t('checkJobOut.batchNo')" align="center" prop="lotNo" /> <!-- 批次号 -->
<!-- <el-table-column :label="$t('checkJobOut.inTime')" align="center" prop="inTime" width="180"> &lt;!&ndash; 入库时间 &ndash;&gt;-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ parseTime(scope.row.inTime, '{y}-{m}-{d}') }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column :label="$t('checkJobOut.billId')" align="center" prop="inOrOutId" /> <!-- 单据ID -->
<el-table-column :label="$t('checkJobOut.subBillId')" align="center" prop="productId" /> <!-- 子单据ID -->
<el-table-column :label="$t('checkJobOut.materialDesc')" align="center" prop="extraField.materialDesc" /> <!-- 物料编码 -->
<el-table-column :label="$t('checkJobOut.englishDesc')" align="center" prop="extraField.englishDesc" /> // 英文描述
<!-- <el-table-column :label="$t('checkJobOut.cartonNo')" align="center" prop="extraField.cartonNo" /> // 箱号-->
<!-- <el-table-column :label="$t('checkJobOut.packingMethod')" align="center" prop="extraField.packingMethod" /> // 包装方式-->
<el-table-column :label="$t('checkJobOut.netWeight')" align="center" prop="extraField.netWeight" /> // 净重
<!-- <el-table-column :label="$t('checkJobOut.totalNetWeight')" align="center" prop="extraField.totalNetWeight" /> // 总净重-->
<!-- <el-table-column :label="$t('checkJobOut.grossWeight')" align="center" prop="extraField.grossWeight" /> // 毛重-->
<el-table-column :label="$t('checkJobOut.outQuantity')" align="center" prop="outQuantity" /> // 出库数量
<el-table-column :label="$t('checkJobOut.pickQuantity')" align="center" prop="pickQuantity" /> // 拣选数量
</el-table>
<pagination
@@ -362,7 +345,7 @@
</template>
<script>
import { listMydoJob, getMydoJob, delMydoJob, addMydoJob, updateMydoJob } from "@/api/job/inmydoJob"
import { listMydoJobOut } from "@/api/job/OutmydoJob"
import { listMydoJobDetail } from "@/api/job/mydoJobDetail"
export default {
@@ -414,7 +397,7 @@ export default {
workshopId: null,
priority: null,
executionPhase: null,
inOrOut: '23',
inOrOut: null,
createTime: null,
startTime: null,
finishTime: null,
@@ -422,7 +405,8 @@ export default {
exitId: null,
classId: null,
warehouseId: null,
faultFlag: null
faultFlag: null,
inOut: '4'
},
queryDetailParams:{
pageNum: 1,
@@ -454,7 +438,7 @@ export default {
/** 查询任务表列表 */
getList() {
this.loading = true
listMydoJob(this.queryParams).then(response => {
listMydoJobOut(this.queryParams).then(response => {
this.mydoJobList = response.rows
this.total = response.total
this.loading = false

15
ruoyi-ui/src/views/check/stockCheck/index.vue
View File

@@ -260,7 +260,7 @@
</template>
<script>
import { listStockCheck, getStockCheck, delStockCheck, addStockCheck, updateStockCheck } from "@/api/check/stockCheck"
import { listStockCheck, getStockCheck, delStockCheck, addStockCheck, updateStockCheck,autoAllocation } from "@/api/check/stockCheck"
import { listStockCheckDetail } from "@/api/check/stockCheckDetail"
import { listWarehouse } from "@/api/bas/warehouse"
@@ -297,6 +297,8 @@ export default {
detailTotal: 0,
// 明细表格数据
stockCheckDetailList: [],
// 选中数据
selectedRows: [],
// 明细查询参数
queryDetailParams: {
pageNum: 1,
@@ -520,6 +522,17 @@ export default {
},
handleAutoAllocation(row){
if (this.ids.length !== 1){
this.$modal.msgError(this.$t('checkStockCheck.onlyOneCanAutoAllocation'))
}
const stockCheckData = {
"stockGuid": this.ids[0]
}
autoAllocation(stockCheckData).then(response => {
this.$modal.msgSuccess(this.$t('checkStockCheck.autoAllocationSuccess'))
this.getList()
})
}
}
}

5
ruoyi-ui/src/views/in/job/index.vue
View File

@@ -305,7 +305,7 @@
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('inJob.jobDetailId')" align="center" prop="jobDetailId" />
<!-- <el-table-column :label="$t('inJob.jobId')" align="center" prop="jobId" /> // 任务ID-->
<el-table-column :label="$t('inJob.jobId')" align="center" prop="jobId" /> // 任务ID
<!-- <el-table-column :label="$t('inJob.stockId')" align="center" prop="stockId" /> // 库存ID-->
<el-table-column :label="$t('inJob.lotNo')" align="center" prop="lotNo" /> // 批次号
<el-table-column :label="$t('inJob.inDate')" align="center" prop="inDate" width="180"> // 入库时间
@@ -408,7 +408,8 @@ export default {
exitId: null,
classId: null,
warehouseId: null,
faultFlag: null
faultFlag: null,
inOut:"1"
},
queryDetailParams:{
pageNum: 1,

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

@@ -239,7 +239,8 @@ export default {
exitId: null,
classId: null,
warehouseId: null,
faultFlag: null
faultFlag: null,
inOut:'2'
},
queryDetailParams:{
pageNum: 1,