zyr/FT546MWS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source 
# Conflicts:
#	ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToErpApiController.java
#	ruoyi-admin/src/main/java/com/ruoyi/api/domain/CallBackErpItems.java
#	ruoyi-admin/src/main/java/com/ruoyi/api/domain/DeliveryNoticeItemVo.java
#	ruoyi-admin/src/main/java/com/ruoyi/api/domain/RequestEnter.java
#	ruoyi-admin/src/main/java/com/ruoyi/api/service/IToErpService.java
#	ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java
#	ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java
#	ruoyi-admin/src/main/java/com/ruoyi/in/stockin/domain/InStockin.java
#	ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/IInStockinService.java
#	ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/domain/InStockinDetail.java
#	ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/mapper/MydoJobMapper.java
#	ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java
#	ruoyi-admin/src/main/java/com/ruoyi/log/service/IRequestLogService.java
#	ruoyi-admin/src/main/java/com/ruoyi/log/service/impl/RequestLogServiceImpl.java
#	ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/controller/OutStockoutController.java
#	ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/service/IOutStockoutService.java
#	ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/service/impl/OutStockoutServiceImpl.java
#	ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java
#	ruoyi-admin/src/main/java/com/ruoyi/pda/domain/TrayCodeMakeSure.java
#	ruoyi-admin/src/main/java/com/ruoyi/pda/mapper/PdaMapper.java
#	ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaService.java
#	ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java
#	ruoyi-admin/src/main/java/com/ruoyi/stock/stock/mapper/BasStockMapper.java
#	ruoyi-admin/src/main/resources/application-druid.yml
#	ruoyi-admin/src/main/resources/application.yml
#	ruoyi-admin/src/main/resources/mapper/agv/AgvContainerTaskMapper.xml
#	ruoyi-admin/src/main/resources/mapper/bas/AgvPointMapper.xml
#	ruoyi-admin/src/main/resources/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml
#	ruoyi-admin/src/main/resources/mapper/in/InStockinFinishMapper.xml
#	ruoyi-admin/src/main/resources/mapper/in/InStockinMapper.xml
#	ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailMapper.xml
#	ruoyi-admin/src/main/resources/mapper/job/MydoJobFinishMapper.xml
#	ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml
#	ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailMapper.xml
#	ruoyi-admin/src/main/resources/mapper/out/OutStockoutFinishMapper.xml
#	ruoyi-admin/src/main/resources/mapper/out/OutStockoutMapper.xml
#	ruoyi-admin/src/main/resources/mapper/out/ViewHandAllotStockMapper.xml
#	ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml
#	ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml
#	ruoyi-ui/src/views/bas/traycode/index.vue
#	ruoyi-ui/src/views/in/stockIn/index.vue
#	ruoyi-ui/src/views/out/outStockoutManage.vue
#	ruoyi-ui/src/views/stock/management/index.vue
This commit is contained in:
zgw
2026-07-24 08:52:44 +08:00
parent 98db537218 b32da3e05f
commit bb682623db
91 changed files with 15402 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -135,7 +135,7 @@
<el-table v-loading="loading" :data="mydoJobList" @selection-change="handleSelectionChange" @row-click="handleRowClick" highlight-current-row :current-row="currentRow"
max-height="400">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="作业编码" align="left" prop="jobId" fixed width="140" />
<el-table-column label="作业编码" align="left" prop="jobId" fixed width="160" />
<el-table-column label="状态" align="left" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.mydo_job_status" :value="scope.row.status"/>
@@ -249,7 +249,7 @@ export default {
pageNum: 1,
pageSize: 10,
jobId: null,
status: '1',
status: null,
onLineType: null,
taskNo: null,
supplierId: null,