zhouy/chem_mes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(rawstorageinventory): 优化原料库存查询界面并集成检验结果

Browse Source
This commit is contained in:
zxy 2026-06-08 17:09:42 +08:00
parent e43547ca14
commit d0732df41e
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/dal/dataobject/rawstoragelog/RawStorageLogDO.java
View File

@ -1,9 +1,9 @@
package com.ningxia.yunxi.chemmes.module.biz.dal.dataobject.rawstoragelog; package com.ningxia.yunxi.chemmes.module.biz.dal.dataobject.rawstoragelog;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.ningxia.yunxi.chemmes.framework.mybatis.core.dataobject.BaseDO;
import com.ningxia.yunxi.chemmes.framework.mybatis.core.dataobject.BaseDOWithoutLogic; import com.ningxia.yunxi.chemmes.framework.mybatis.core.dataobject.BaseDOWithoutLogic;
import lombok.*; import lombok.*;
@ -28,7 +28,7 @@ public class RawStorageLogDO extends BaseDOWithoutLogic {
/** /**
* 主键id * 主键id
*/ */
@TableId @TableId(type = IdType.AUTO)
private Integer id; private Integer id;
/** /**
* 入/出库Id * 入/出库Id
@ -159,9 +159,4 @@ public class RawStorageLogDO extends BaseDOWithoutLogic {
*/ */
private Integer relarionDetailId; private Integer relarionDetailId;
private String inventBillNo; private String inventBillNo;
} }

4
mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/rawstorage/RawStorageServiceImpl.java
View File

@ -366,8 +366,8 @@ public class RawStorageServiceImpl implements RawStorageService {
RawStorageInventoryDO rawStorageInventoryDO = new RawStorageInventoryDO(); RawStorageInventoryDO rawStorageInventoryDO = new RawStorageInventoryDO();
rawStorageInventoryDO.setStoreHouseId(purReceipt.getStoreHouseId()); rawStorageInventoryDO.setStoreHouseId(purReceipt.getStoreHouseId());
rawStorageInventoryDO.setStoreAreaId(detail.getStoreAreaId()); rawStorageInventoryDO.setStoreAreaId(detail.getStoreAreaId());
rawStorageInventoryDO.setStoreHouseCd(detail.getStoreAreCd()); rawStorageInventoryDO.setStoreHouseCd(purReceipt.getStoreHouseCd());
rawStorageInventoryDO.setStoreHouseName(detail.getStoreAreaName()); rawStorageInventoryDO.setStoreHouseName(purReceipt.getStoreHouseName());
rawStorageInventoryDO.setStoreAreCd(detail.getStoreAreCd()); rawStorageInventoryDO.setStoreAreCd(detail.getStoreAreCd());
rawStorageInventoryDO.setStoreAreaName(detail.getStoreAreaName()); rawStorageInventoryDO.setStoreAreaName(detail.getStoreAreaName());
rawStorageInventoryDO.setMaterialId(detail.getMaterialId()); rawStorageInventoryDO.setMaterialId(detail.getMaterialId());

6
mes-ui/mes-ui-admin-vue3/src/views/biz/rawstorageinventory/index.vue
View File

@ -73,7 +73,11 @@
<el-table-column label="原料名称" align="center" prop="matName" min-width="180px" /> <el-table-column label="原料名称" align="center" prop="matName" min-width="180px" />
<el-table-column label="规格型号" align="center" prop="spec" min-width="130px" /> <el-table-column label="规格型号" align="center" prop="spec" min-width="130px" />
<el-table-column label="批次号" align="center" prop="lotNo" min-width="140px" /> <el-table-column label="批次号" align="center" prop="lotNo" min-width="140px" />
<el-table-column label="检验结果" align="center" prop="checkResult" min-width="100px" /> <el-table-column label="检验结果" align="center" prop="checkResult" min-width="100px">
<template #default="scope">
{{ scope.row.checkResult === '0' ? '合格' : scope.row.checkResult === '1' ? '不合格' : scope.row.checkResult === '2' ? '让步接收' : scope.row.checkResult }}
</template>
</el-table-column>
<el-table-column label="库存数量" align="center" prop="yardQty" min-width="100px" /> <el-table-column label="库存数量" align="center" prop="yardQty" min-width="100px" />
<el-table-column label="最早入库时间" align="center" prop="earStoreDate" :formatter="dateFormatter2" min-width="150px" /> <el-table-column label="最早入库时间" align="center" prop="earStoreDate" :formatter="dateFormatter2" min-width="150px" />
<el-table-column label="单位" align="center" prop="unit" min-width="60px" :formatter="getUnitName" /> <el-table-column label="单位" align="center" prop="unit" min-width="60px" :formatter="getUnitName" />