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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
pull/1/head
zengchenxi 9 months ago
parent 4ae2692b95 5c507f3f51
commit a7dbb0f7e4
7 changed files with 70 additions and 47 deletions
Show Stats Download Patch File Download Diff File

3
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagemat/vo/StorageMatPageReqVO.java
Unescape View File

@ -37,6 +37,9 @@ public class StorageMatPageReqVO extends PageParam {
@Schema(description = "批次号")
private String lotNo;
@Schema(description = "子项目编号")
private String projectNo;
@Schema(description = "备注", example = "你猜")
private String description;

4
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagemat/vo/StorageMatRespVO.java
Unescape View File

@ -46,6 +46,10 @@ public class StorageMatRespVO {
@ExcelProperty("批次号")
private String lotNo;
@Schema(description = "子项目编号")
@ExcelProperty("子项目编号")
private String projectNo;
@Schema(description = "备注", example = "你猜")
@ExcelProperty("备注")
private String description;

95
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagemat/vo/StorageMatSaveReqVO.java
Unescape View File

@ -1,46 +1,49 @@
package com.chanko.yunxi.mes.module.heli.controller.admin.storagemat.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import javax.validation.constraints.*;
import java.util.*;
import java.math.BigDecimal;
@Schema(description = "管理后台 - 入/出库物料新增/修改 Request VO")
@Data
public class StorageMatSaveReqVO {
@Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "29383")
private Long id;
@Schema(description = "入/出库Id", requiredMode = Schema.RequiredMode.REQUIRED, example = "19477")
@NotNull(message = "入/出库Id不能为空")
private Long stockId;
@Schema(description = "物料 Id,对应 base_material表中的 Id 列", requiredMode = Schema.RequiredMode.REQUIRED, example = "3400")
@NotNull(message = "物料 Id,对应 base_material表中的 Id 列不能为空")
private Long matId;
@Schema(description = "仓库 Id，对应 wms_wh 表中的Id", requiredMode = Schema.RequiredMode.REQUIRED, example = "31860")
@NotNull(message = "仓库 Id，对应 wms_wh 表中的Id不能为空")
private Long whId;
@Schema(description = "库区 Id，对应 wms_rg 表中的Id", requiredMode = Schema.RequiredMode.REQUIRED, example = "13060")
@NotNull(message = "库区 Id，对应 wms_rg 表中的Id不能为空")
private Long rgId;
@Schema(description = "库区 Id，对应 wms_rg 表中的Id", requiredMode = Schema.RequiredMode.REQUIRED, example = "25544")
@NotNull(message = "库区 Id，对应 wms_rg 表中的Id不能为空")
private Long pnId;
@Schema(description = "库存良品数量")
private BigDecimal storageOkQty;
@Schema(description = "批次号")
private String lotNo;
@Schema(description = "备注", example = "你猜")
private String description;
}
package com.chanko.yunxi.mes.module.heli.controller.admin.storagemat.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import javax.validation.constraints.*;
import java.util.*;
import java.math.BigDecimal;
@Schema(description = "管理后台 - 入/出库物料新增/修改 Request VO")
@Data
public class StorageMatSaveReqVO {
@Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "29383")
private Long id;
@Schema(description = "入/出库Id", requiredMode = Schema.RequiredMode.REQUIRED, example = "19477")
@NotNull(message = "入/出库Id不能为空")
private Long stockId;
@Schema(description = "物料 Id,对应 base_material表中的 Id 列", requiredMode = Schema.RequiredMode.REQUIRED, example = "3400")
@NotNull(message = "物料 Id,对应 base_material表中的 Id 列不能为空")
private Long matId;
@Schema(description = "仓库 Id，对应 wms_wh 表中的Id", requiredMode = Schema.RequiredMode.REQUIRED, example = "31860")
@NotNull(message = "仓库 Id，对应 wms_wh 表中的Id不能为空")
private Long whId;
@Schema(description = "库区 Id，对应 wms_rg 表中的Id", requiredMode = Schema.RequiredMode.REQUIRED, example = "13060")
@NotNull(message = "库区 Id，对应 wms_rg 表中的Id不能为空")
private Long rgId;
@Schema(description = "库区 Id，对应 wms_rg 表中的Id", requiredMode = Schema.RequiredMode.REQUIRED, example = "25544")
@NotNull(message = "库区 Id，对应 wms_rg 表中的Id不能为空")
private Long pnId;
@Schema(description = "库存良品数量")
private BigDecimal storageOkQty;
@Schema(description = "批次号")
private String lotNo;
@Schema(description = "子项目编号")
private String projectNo;
@Schema(description = "备注", example = "你猜")
private String description;
}

4
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/storagemat/StorageMatDO.java
Unescape View File

@ -56,6 +56,10 @@ public class StorageMatDO extends BaseDO {
* 批次号
*/
private String lotNo;
/**
* 子项目编号
*/
private String projectNo;
/**
* 备注
*/

1
mes-ui/mes-ui-admin-vue3/src/api/heli/storagemat/index.ts
Unescape View File

@ -9,6 +9,7 @@ export interface StorageMatVO {
pnId: number
storageOkQty: number
lotNo: string
projectNo: string
description: string
}

8
mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue
Unescape View File

@ -162,6 +162,12 @@
<el-input v-model="scope.row.lotNo" />
</template>
</el-table-column>
<el-table-column prop="projectNo" width="120" label="子项目编号">
<template #default="scope">
<el-input v-model="scope.row.projectNo" />
</template>
</el-table-column>
<el-table-column prop="description" width="150" label="备注">
<template #default="scope">
<el-input v-model="scope.row.description" />
@ -499,6 +505,7 @@ const onAddItem = () => {
pnlist: ref([]),
storageOkQty: '',
lotNo: '',
projectNo: '',
description: '',
productBomItemValueDOList: []
}
@ -528,6 +535,7 @@ const handlefuke = (index, item) => {
pnlist: item.pnlist,
storageOkQty: item.storageOkQty,
lotNo: item.lotNo,
projectNo: '',
description: item.description,
productBomItemValueDOList: []
}

2
mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue
Unescape View File

@ -706,7 +706,7 @@ onMounted(async () => {
item.cid = matCount
item.matId = matVos.list.find((record) => record.id === item.matId)?.id
//item.matCode = matVos.list.find( (record) => record.id === item.matId)?.id
item.matName = matVos.list.find((record) => record.id === item.matId)?.name
item.matCode = matVos.list.find((record) => record.id === item.matId)?.code
item.matSpec = matVos.list.find((record) => record.id === item.matId)?.spec
item.matType = matVos.list.find((record) => record.id === item.matId)?.materialType
item.matUnit = matVos.list.find((record) => record.id === item.matId)?.unit

Write Preview
Loading…
Cancel
Save