root/wq-wms-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opt:优化倒扣逻辑改成同步EAS一起过账，EAS非库存的失败标记过账失败

Browse Source
This commit is contained in:
zhangzq
2026-08-04 20:36:14 +08:00
parent 9a2cda2fc7
commit b5d10b26f1
12 changed files with 257 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
nladmin-ui/src/views/wms/pm_manage/receiveOutReturn/index.vue
View File

@@ -67,24 +67,22 @@
<udOperation :data="scope.row" :permission="permission" />
</template>
</el-table-column>
<el-table-column prop="billno" label="工单号" min-width="140">
<el-table-column prop="billno" label="工单号" min-width="160">
<template slot-scope="scope">
<el-link type="primary" @click="toView(scope.row)">{{ scope.row.billno }}</el-link>
</template>
</el-table-column>
<el-table-column prop="sn" label="序列码" min-width="140" />
<el-table-column prop="trackNo" label="跟踪号" min-width="100" />
<el-table-column prop="workArea" label="产线" min-width="100" />
<el-table-column prop="status" label="回传状态" width="100">
<el-table-column prop="sn" label="序列码" min-width="110" />
<el-table-column prop="trackNo" label="跟踪号" min-width="110" />
<el-table-column prop="workArea" label="产线" min-width="60" />
<el-table-column prop="status" label="过账状态" width="80">
<template slot-scope="scope">
<el-tag :type="statusTagType(scope.row.status)" size="mini">{{ statusLabel(scope.row.status) }}</el-tag>
</template>
</el-table-column>
<el-table-column prop="remark" label="备注" min-width="180" show-overflow-tooltip />
<el-table-column prop="requestId" label="出入库单号" min-width="140" />
<el-table-column prop="biztime" label="业务时间" min-width="160" />
<el-table-column prop="createTime" label="创建时间" min-width="160" />
<el-table-column prop="reportParam" label="报工参数" min-width="200" show-overflow-tooltip />
<el-table-column prop="biztime" label="业务时间" min-width="140" />
<el-table-column prop="updateTime" label="更新时间" min-width="140" />
</el-table>
<pagination />
</div>
@@ -115,23 +113,23 @@
<div slot="footer" class="dialog-footer"><el-button type="text" @click="crud.cancelCU">取消</el-button><el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button></div>
</el-dialog>
<el-dialog :visible.sync="viewShow" title="倒扣回传详情" width="1200px" :close-on-click-modal="false">
<el-dialog :visible.sync="viewShow" title="倒扣回传详情" width="1300px" :close-on-click-modal="false">
<el-descriptions :column="2" border size="mini">
<el-descriptions-item label="工单号">{{ currentRow.billno }}</el-descriptions-item>
<el-descriptions-item label="工单">{{ currentRow.billno }}</el-descriptions-item>
<el-descriptions-item label="序列码">{{ currentRow.sn }}</el-descriptions-item>
<el-descriptions-item label="跟踪号">{{ currentRow.trackNo }}</el-descriptions-item>
<el-descriptions-item label="产线">{{ currentRow.workArea }}</el-descriptions-item>
<el-descriptions-item label="跟踪号">{{ currentRow.trackNo }}</el-descriptions-item>
<el-descriptions-item label="备注">{{ currentRow.comment }}</el-descriptions-item>
<el-descriptions-item label="回传状态">{{ statusLabel(currentRow.status) }}</el-descriptions-item>
<el-descriptions-item label="回传备注" :span="2">{{ currentRow.remark }}</el-descriptions-item>
<el-descriptions-item label="机构编号">{{ currentRow.orgno }}</el-descriptions-item>
<el-descriptions-item label="业务类型">{{ currentRow.biztype }}</el-descriptions-item>
<el-descriptions-item label="机构">{{ currentRow.orgno }}</el-descriptions-item>
<el-descriptions-item label="业务">{{ currentRow.biztype }}</el-descriptions-item>
<el-descriptions-item label="库存方案">{{ currentRow.invscheme }}</el-descriptions-item>
<el-descriptions-item label="交易类型">{{ currentRow.transtype }}</el-descriptions-item>
<el-descriptions-item label="业务时间">{{ currentRow.biztime }}</el-descriptions-item>
<el-descriptions-item label="创建时间">{{ currentRow.createTime }}</el-descriptions-item>
<el-descriptions-item label="出入库单号">{{ currentRow.requestId }}</el-descriptions-item>
<el-descriptions-item label=""></el-descriptions-item>
<el-descriptions-item label="更新时间">{{ currentRow.updateTime }}</el-descriptions-item>
<el-descriptions-item label="出入库单号" :span="2">{{ currentRow.requestId }}</el-descriptions-item>
<el-descriptions-item label="报工参数" :span="2">{{ currentRow.reportParam }}</el-descriptions-item>
</el-descriptions>
<el-table :data="pagedDetails" size="mini" style="width: 100%; margin-top: 12px;">
@@ -152,7 +150,7 @@
<!-- <el-table-column prop="tracknumber" label="追踪号" min-width="120" />-->
<el-table-column prop="updateTime" label="更新时间" min-width="130" />
<!-- 新增操作列 -->
<el-table-column label="操作" width="120" align="center" fixed="right">
<el-table-column label="操作" width="140" align="center" fixed="right">
<template slot-scope="scope">
<el-button
size="mini"
@@ -240,10 +238,10 @@ export default {
del: ['purchasemst:del']
},
statusOptions: [
{ value: '0', label: '待回传' },
{ value: '1', label: '回传成功' },
{ value: '2', label: '回传失败' },
{ value: '3', label: '回传异常' },
{ value: '0', label: '待过账' },
{ value: '1', label: '过账成功' },
{ value: '2', label: '过账中' },
{ value: '3', label: '过账异常' },
{ value: '4', label: '忽略过账' },
],
rules: {