Merge remote-tracking branch 'origin/main'
# 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:
@@ -17,6 +17,14 @@
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="托盘条码" prop="trayCode"><!-- 品名 -->
|
||||
<el-input
|
||||
v-model="queryParams.trayCode"
|
||||
placeholder="请输入托盘条码"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="项目号" prop="spare4"><!-- 品名 -->
|
||||
<el-input
|
||||
v-model="queryParams.spare4"
|
||||
@@ -79,20 +87,20 @@
|
||||
|
||||
<el-table v-loading="loading" :data="managementList" @selection-change="handleSelectionChange" max-height="650">
|
||||
<el-table-column type="selection" width="55" align="center"/>
|
||||
<el-table-column label="库存编码" align="center" prop="stockId" width="120"/>
|
||||
<el-table-column label="库存编码" align="center" prop="stockId" width="160"/>
|
||||
<el-table-column label="货位名称" align="center" prop="cargoSpaceName" width="120"/>
|
||||
<el-table-column label="入库日期" align="center" prop="inDate" width="160" />
|
||||
<el-table-column label="批次号" align="center" prop="lotNo"/>
|
||||
<el-table-column label="托盘条码" align="center" prop="trayCode" width="130" />
|
||||
<el-table-column label="存货编码" align="center" prop="productId" />
|
||||
<el-table-column label="存货名称" align="center" prop="productName"/>
|
||||
<el-table-column label="存货名称" align="center" prop="productName" width="120"/>
|
||||
<el-table-column label="层级关系" align="center" prop="spare1"/>
|
||||
<el-table-column label="上层物料" align="center" prop="spare2"/>
|
||||
<el-table-column label="顶层物料" align="center" prop="spare3"/>
|
||||
<el-table-column label="项目号" align="center" prop="spare4"/>
|
||||
<el-table-column label="合同号" align="center" prop="spare5"/>
|
||||
<el-table-column label="销售订单" align="center" prop="spare6"/>
|
||||
<el-table-column label="供应商编码" align="center" prop="voltage"/>
|
||||
<el-table-column label="供应商编码" align="center" prop="voltage" width="120"/>
|
||||
<el-table-column label="规格型号" align="center" prop="power"/>
|
||||
<el-table-column label="计量单位" align="center" prop="phase"/>
|
||||
<el-table-column label="数量" align="center" prop="quantity"/>
|
||||
@@ -244,8 +252,8 @@ export default {
|
||||
},
|
||||
// 出口选项
|
||||
exitOptions: [
|
||||
{exitId: '1', exitName: '一楼'},
|
||||
{exitId: '2', exitName: '二楼'},
|
||||
{exitId: '1', exitName: '缓存'},
|
||||
{exitId: '2', exitName: '线边'},
|
||||
|
||||
],
|
||||
|
||||
|
||||
Reference in New Issue
Block a user