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-07-21 08:55:21 +08:00
parent 230d8ea118
commit 47f173d79f
7 changed files with 14 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetail/service/impl/ReceiveStockinDetailServiceImpl.java
View File

@@ -87,7 +87,7 @@ public class ReceiveStockinDetailServiceImpl implements IReceiveStockinDetailSer
.filter(detail -> !"1".equals(detail.getStockStatus()))
.collect(Collectors.toList());
if (receiveStockinDetails.size() == 0) {
if (receiveStockinDetails.isEmpty()) {
ReceiveStockCreateInVo receiveStockCreateInVo = new ReceiveStockCreateInVo();
List<String> strings = new ArrayList<>();
strings.add(receiveStockinDetail.getStockinGuid());

1
ruoyi-admin/src/main/resources/mapper/in/InStockinFinishMapper.xml
View File

@@ -145,6 +145,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
)
</if>
</where>
order by is2.create_date desc
</select>
<insert id="insertInStockinFinish" parameterType="InStockinFinish">

1
ruoyi-admin/src/main/resources/mapper/in/InStockinMapper.xml
View File

@@ -105,6 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach>
</if>
</where>
order by is2.create_date desc
</select>
<select id="selectInStockinByStockinGuid" parameterType="String" resultMap="InStockinResult">

1
ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinFinishMapper.xml
View File

@@ -146,6 +146,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
)
</if>
</where>
order by rs.create_date desc
</select>
<insert id="insertReceiveStockinFinish" parameterType="ReceiveStockinFinish">

1
ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinMapper.xml
View File

@@ -98,6 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
)
</if>
</where>
order by rs.create_date desc
</select>
<select id="selectReceiveStockinByStockinGuid" parameterType="String" resultMap="ReceiveStockinResult">

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

@@ -257,26 +257,24 @@
<dict-tag :options="dict.type.mydo_job_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column :label="$t('checkJobOut.onLineType')" align="left" prop="onLineType"> <!-- 上线类型 -->
<template slot-scope="scope">
<dict-tag :options="dict.type.on_line_type" :value="scope.row.onLineType"/>
</template>
</el-table-column>
<el-table-column :label="$t('checkJobOut.jobType')" align="left" prop="inOrOut"> <!-- 任务类型 -->
<template slot-scope="scope">
<dict-tag :options="dict.type.check_out_job_type" :value="scope.row.inOrOut"/>
</template>
</el-table-column>
<el-table-column :label="$t('checkJobOut.taskNo')" align="left" prop="taskNo" /> <!-- 任务号 -->
<el-table-column :label="$t('checkJobOut.departmentId')" align="left" prop="departmentId" /> <!-- 部门ID -->
<el-table-column :label="$t('checkJobOut.department')" align="left" prop="departmentName" /> <!-- 部门ID -->
<el-table-column :label="$t('checkJobOut.trayCode')" align="left" prop="trayCode" /> <!-- 托盘码 -->
<el-table-column :label="$t('checkJobOut.cargoSpaceId')" align="left" prop="cargoSpaceId" /> <!-- 货位ID -->
<el-table-column :label="$t('checkJobOut.cargoSpaceId')" align="left" prop="cargoSpaceName" /> <!-- 货位ID -->
<el-table-column :label="$t('checkJobOut.priority')" align="right" prop="priority" /> <!-- 优先级 -->
<el-table-column :label="$t('checkJobOut.executionPhase')" align="left" prop="executionPhase"> <!-- 执行阶段 -->
<template slot-scope="scope">
<dict-tag :options="dict.type.execution_phase_type" :value="scope.row.executionPhase"/>
</template>
</el-table-column>
<el-table-column :label="$t('checkJobOut.createTime')" align="left" prop="createTime" width="180"> <!-- 创建时间 -->
</el-table-column>
<el-table-column :label="$t('checkJobOut.startTime')" align="left" prop="startTime" width="180"> <!-- 开始时间 -->
<template slot-scope="scope">
<span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
@@ -288,23 +286,8 @@
</template>
</el-table-column>
<el-table-column :label="$t('checkJobOut.exitId')" align="left" prop="exitId" /> <!-- 出口ID -->
<el-table-column :label="$t('checkJobOut.warehouse')" align="left" prop="warehouseId" /> <!-- 仓库 -->
<el-table-column :label="$t('checkJobOut.operation')" align="center" class-name="small-padding fixed-width"> <!-- 操作 -->
<template slot-scope="scope">
<el-button
size="mini"
type="text"
@click="handleManualFinish(scope.row)"
v-hasPermi="['job:checkMydoJob:OuthandFinish']"
>{{$t('checkJobOut.manualFinish')}}</el-button> <!-- 手动完成 -->
<el-button
size="mini"
type="text"
@click="handleManualInvalid(scope.row)"
v-hasPermi="['job:checkMydoJob:OuthandInvalidation']"
>{{$t('checkJobOut.manualInvalid')}}</el-button> <!-- 手动作废 -->
</template>
</el-table-column>
<el-table-column :label="$t('checkJobOut.warehouse')" align="left" prop="warehouseName" /> <!-- 仓库 -->
</el-table>
<pagination
@@ -320,7 +303,6 @@
<el-table-column :label="$t('checkJobOut.subJobId')" align="left" prop="jobDetailId" /> <!-- 子任务ID -->
<el-table-column :label="$t('checkJobOut.jobId')" align="left" prop="jobId" /> <!-- 任务ID -->
<el-table-column :label="$t('checkJobOut.stockId')" align="left" prop="stockId" /> <!-- 库存ID -->
<el-table-column :label="$t('checkJobOut.batchNo')" align="left" prop="lotNo" /> <!-- 批次号 -->
<el-table-column :label="$t('checkJobOut.billId')" align="left" prop="inOrOutId" /> <!-- 单据ID -->
<el-table-column :label="$t('checkJobOut.subBillId')" align="left" prop="inOrOutDId" /> <!-- 单据ID -->
<el-table-column :label="$t('checkJobOut.productId')" align="left" prop="productId" /> <!-- 物料id -->

4
ruoyi-ui/src/views/in/receive/index.vue
View File

@@ -668,10 +668,10 @@ export default {
getWarehouseList() {
listWarehouse(this.queryWarehouseParams).then(response => {
this.warehouseOptions = response.rows;
if (this.warehouseOptions.length > 0) {
/*if (this.warehouseOptions.length > 0) {
this.queryParams.warehouseId = this.warehouseOptions[0].warehouseId;
this.handleQuery();
}
}*/
});
},
}