root/lanzhouhailiang_two
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev：仓储

Browse Source
This commit is contained in:
liuxy
2024-04-02 14:03:36 +08:00
parent 620dba9b38
commit 26e6207e61
14 changed files with 29 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/subpackage/service/dao/PdmBiSubpackagerelation.java
View File

@@ -21,13 +21,13 @@ import java.math.BigDecimal;
@TableName("pdm_bi_subpackagerelation")
public class PdmBiSubpackagerelation implements Serializable {
private static final long serialVersionUID = 1L;
private static final Long serialVersionUID = 1L;
/**
* 子卷包装标识
*/
@TableId
private Long workorder_id;
private String workorder_id;
/**
* 木箱唯一码
@@ -142,7 +142,7 @@ public class PdmBiSubpackagerelation implements Serializable {
/**
* 创建人
*/
private Long create_id;
private String create_id;
/**
* 创建人姓名

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java
View File

@@ -142,7 +142,7 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
// 组织主表数据
StIvtIostorinv mstDao = StIvtIostorinv.builder()
.iostorinv_id(IdUtil.getStringId())
.bill_code(CodeUtil.getNewCode("IO_CODE"))
.bill_code(CodeUtil.getNewCode("IN_IVN_CODE"))
.bill_status(IOSEnum.BILL_STATUS.code("生成"))
.create_mode(IOSEnum.CREATE_MODE.code("PC产生"))
.io_type(IOSEnum.IO_TYPE.code("入库"))

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvdtlServiceImpl.java
View File

@@ -83,8 +83,8 @@ public class StIvtIostorinvdtlServiceImpl extends ServiceImpl<StIvtIostorinvdtlM
MdBaseMaterial materDao = materialList.stream()
.filter(row -> row.getMaterial_code().equals(json.getString("material_code")))
.collect(Collectors.toList()).get(0);
if (ObjectUtil.isEmpty(materDao)) throw new BadRequestException("物料不存在"+json.getString("material_code"));
.findFirst().orElse(null);
if (ObjectUtil.isEmpty(materDao)) throw new BadRequestException("物料不存在：【"+json.getString("material_code") +"】");
StIvtIostorinvdtl dtlDao = StIvtIostorinvdtl.builder()
.iostorinvdtl_id(IdUtil.getStringId())

36
lms/nladmin-ui/src/views/wms/basedata/st/stor/index.vue
View File

@@ -41,17 +41,6 @@
<el-input v-model="form.simple_name" style="width: 200px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="所属部门" prop="sysdeptid">
<treeselect
v-model="form.sysdeptid"
:options="depts"
:load-options="loadDepts"
style="width: 200px"
placeholder="选择部门"
/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
@@ -369,31 +358,6 @@ export default {
this.depts = date
})
},
buildDepts(depts) {
depts.forEach(data => {
if (data.children) {
this.buildDepts(data.children)
}
if (data.hasChildren && !data.children) {
data.children = null
}
})
},
loadDepts({ action, parentNode, callback }) {
if (action === LOAD_CHILDREN_OPTIONS) {
getDepts({ enabled: true, pid: parentNode.id }).then(res => {
parentNode.children = res.content.map(function(obj) {
if (obj.hasChildren) {
obj.children = null
}
return obj
})
setTimeout(() => {
callback()
}, 200)
})
}
},
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
return true

4
lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/AddDialog.vue
View File

@@ -72,7 +72,7 @@
disabled
>
<el-option
v-for="item in dict.io_bill_status"
v-for="item in dict.IO_BILL_STATUS"
:key="item.id"
:label="item.label"
:value="item.value"
@@ -189,7 +189,7 @@ export default {
name: 'AddDialog',
components: { AddDtl },
mixins: [crud(), form(defaultForm)],
dicts: ['io_bill_status', 'ST_INV_IN_TYPE'],
dicts: ['IO_BILL_STATUS', 'ST_INV_IN_TYPE'],
props: {
dialogShow: {
type: Boolean,

4
lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/DivDialog.vue
View File

@@ -54,7 +54,7 @@
:disabled="true"
>
<el-option
v-for="item in dict.io_bill_status"
v-for="item in dict.IO_BILL_STATUS"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -189,7 +189,7 @@ export default {
name: 'DivDialog',
components: { },
mixins: [crud()],
dicts: ['io_bill_status'],
dicts: ['IO_BILL_STATUS'],
props: {
dialogShow: {
type: Boolean,

2
lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/TaskDialog.vue
View File

@@ -125,7 +125,7 @@ export default {
name: 'TaskDialog',
components: {},
mixins: [crud()],
dicts: ['io_bill_status', 'task_status'],
dicts: ['IO_BILL_STATUS', 'task_status'],
props: {
dialogShow: {
type: Boolean,

6
lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/ViewDialog.vue
View File

@@ -58,7 +58,7 @@
disabled
>
<el-option
v-for="item in dict.io_bill_status"
v-for="item in dict.IO_BILL_STATUS"
:key="item.id"
:label="item.label"
:value="item.value"
@@ -160,7 +160,7 @@ export default {
name: 'ViewDialog',
components: { },
mixins: [crud()],
dicts: ['io_bill_status', 'work_status', 'task_status', 'ST_INV_IN_TYPE'],
dicts: ['IO_BILL_STATUS', 'work_status', 'task_status', 'ST_INV_IN_TYPE'],
props: {
dialogShow: {
type: Boolean,
@@ -215,7 +215,7 @@ export default {
this.$emit('TaskChanged')
},
bill_statusFormat(row) {
return this.dict.label.io_bill_status[row.bill_status]
return this.dict.label.IO_BILL_STATUS[row.bill_status]
},
task_statusFormat(row) {
return this.dict.label.task_status[row.task_status]

6
lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/index.vue
View File

@@ -77,7 +77,7 @@
@change="crud.toQuery"
>
<el-option
v-for="item in dict.io_bill_status"
v-for="item in dict.IO_BILL_STATUS"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -249,7 +249,7 @@ export default {
},
mixins: [presenter(), header(), crud()],
// 数据字典
dicts: ['io_bill_status', 'ST_CREATE_MODE', 'ST_INV_IN_TYPE'],
dicts: ['IO_BILL_STATUS', 'ST_CREATE_MODE', 'ST_INV_IN_TYPE'],
data() {
return {
height: document.documentElement.clientHeight - 180 + 'px;',
@@ -330,7 +330,7 @@ export default {
})
},
stateFormat(row, column) {
return this.dict.label.io_bill_status[row.bill_status]
return this.dict.label.IO_BILL_STATUS[row.bill_status]
},
create_modeFormat(row, column) {
return this.dict.label.ST_CREATE_MODE[row.create_mode]

4
lms/nladmin-ui/src/views/wms/storage_manage/ios/outbill/AddDialog.vue
View File

@@ -73,7 +73,7 @@
disabled
>
<el-option
v-for="item in dict.io_bill_status"
v-for="item in dict.IO_BILL_STATUS"
:key="item.id"
:label="item.label"
:value="item.value"
@@ -208,7 +208,7 @@ export default {
default: false
}
},
dicts: ['io_bill_status', 'ST_INV_OUT_TYPE'],
dicts: ['IO_BILL_STATUS', 'ST_INV_OUT_TYPE'],
data() {
return {
dialogVisible: false,

4
lms/nladmin-ui/src/views/wms/storage_manage/ios/outbill/DivDialog.vue
View File

@@ -265,7 +265,7 @@ export default {
name: 'DivDialog',
components: { StructIvt },
mixins: [crud()],
dicts: ['io_bill_status', 'work_status'],
dicts: ['IO_BILL_STATUS', 'work_status'],
props: {
dialogShow: {
type: Boolean,
@@ -349,7 +349,7 @@ export default {
this.$emit('update:dialogShow', false)
},
bill_statusFormat(row, column) {
return this.dict.label.io_bill_status[row.bill_status]
return this.dict.label.IO_BILL_STATUS[row.bill_status]
},
invtypeFormat(row, column) {
for (const item of this.invtypelist) {

4
lms/nladmin-ui/src/views/wms/storage_manage/ios/outbill/TaskDialog.vue
View File

@@ -125,7 +125,7 @@ export default {
name: 'TaskDialog',
components: { },
mixins: [crud()],
dicts: ['task_status', 'io_bill_status'],
dicts: ['task_status', 'IO_BILL_STATUS'],
props: {
dialogShow: {
type: Boolean,
@@ -185,7 +185,7 @@ export default {
this.$emit('TaskChanged')
},
bill_statusFormat(row) {
return this.dict.label.io_bill_status[row.bill_status]
return this.dict.label.IO_BILL_STATUS[row.bill_status]
},
task_statusFormat(row) {
return this.dict.label.task_status[row.task_status]

6
lms/nladmin-ui/src/views/wms/storage_manage/ios/outbill/ViewDialog.vue
View File

@@ -59,7 +59,7 @@
disabled
>
<el-option
v-for="item in dict.io_bill_status"
v-for="item in dict.IO_BILL_STATUS"
:key="item.id"
:label="item.label"
:value="item.value"
@@ -180,7 +180,7 @@ export default {
name: 'ViewDialog',
components: { },
mixins: [crud()],
dicts: ['io_bill_status', 'work_status', 'task_status', 'ST_INV_OUT_TYPE'],
dicts: ['IO_BILL_STATUS', 'work_status', 'task_status', 'ST_INV_OUT_TYPE'],
props: {
dialogShow: {
type: Boolean,
@@ -228,7 +228,7 @@ export default {
this.$emit('AddChanged')
},
bill_statusFormat(row) {
return this.dict.label.io_bill_status[row.bill_status]
return this.dict.label.IO_BILL_STATUS[row.bill_status]
},
task_statusFormat(row) {
return this.dict.label.task_status[row.task_status]

6
lms/nladmin-ui/src/views/wms/storage_manage/ios/outbill/index.vue
View File

@@ -48,7 +48,7 @@
@change="crud.toQuery"
>
<el-option
v-for="item in dict.io_bill_status"
v-for="item in dict.IO_BILL_STATUS"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -299,7 +299,7 @@ export default {
},
mixins: [presenter(), header(), crud()],
// 数据字典
dicts: ['io_bill_status', 'ST_CREATE_MODE', 'ST_INV_OUT_TYPE', 'TrueOrFalse'],
dicts: ['IO_BILL_STATUS', 'ST_CREATE_MODE', 'ST_INV_OUT_TYPE', 'TrueOrFalse'],
data() {
return {
height: document.documentElement.clientHeight - 180 + 'px;',
@@ -391,7 +391,7 @@ export default {
}
},
stateFormat(row) {
return this.dict.label.io_bill_status[row.bill_status]
return this.dict.label.IO_BILL_STATUS[row.bill_status]
},
bill_typeFormat(row) {
return this.dict.label.ST_INV_OUT_TYPE[row.bill_type]