licq/heli-mes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(heli): 新增出入库单据生成功能

Browse Source
This commit is contained in:
zxy 2026-04-08 10:50:26 +08:00
parent 37f40e1c16
commit 0beec72e20
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storagelog/StorageLogMapper.java
View File

@ -67,8 +67,7 @@ public interface StorageLogMapper extends BaseMapperX<StorageLogDO> {
.orderByDesc(StorageLogDO::getId); .orderByDesc(StorageLogDO::getId);
query query
.ne(WarehouseDO::getWhName, "虚拟仓库") .and(w -> w.ne(WarehouseDO::getWhName, "虚拟仓库").or().isNull(WarehouseDO::getWhName))
// .notIn(StorageLogDO::getStockMode, 24, 14)
.like(!StringUtils.isEmpty(reqVO.getMatName()), StorageLogDO::getMatName, reqVO.getMatName()) .like(!StringUtils.isEmpty(reqVO.getMatName()), StorageLogDO::getMatName, reqVO.getMatName())
.like(!StringUtils.isEmpty(reqVO.getMatCode()), MaterialDO::getCode, reqVO.getMatCode()) .like(!StringUtils.isEmpty(reqVO.getMatCode()), MaterialDO::getCode, reqVO.getMatCode())
.eq(!StringUtils.isEmpty(reqVO.getStockType()), StorageLogDO::getStockType, reqVO.getStockType()) .eq(!StringUtils.isEmpty(reqVO.getStockType()), StorageLogDO::getStockType, reqVO.getStockType())

2
mes-ui/mes-ui-admin-vue3/src/views/heli/xzdstoragelog/index.vue
View File

@ -206,7 +206,7 @@
/> />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="物料名称" align="center" prop="matName" min-width="120" /> <el-table-column label="物料名称" align="center" prop="matName" min-width="190" />
<el-table-column label="单价" align="center" prop="price" min-width="120" /> <el-table-column label="单价" align="center" prop="price" min-width="120" />
<el-table-column label="供应商简称" align="center" prop="brief" min-width="200" /> <el-table-column label="供应商简称" align="center" prop="brief" min-width="200" />
<el-table-column label="数量" align="center" prop="storageOkQty" min-width="140" /> <el-table-column label="数量" align="center" prop="storageOkQty" min-width="140" />