liuxy/HuaDongYiYaoWMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add：增加库区策略

Browse Source
This commit is contained in:
liuxy
2025-11-25 20:12:13 +08:00
parent b3b9761884
commit a62bcf4338
27 changed files with 310 additions and 350 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
wms/nladmin-ui/src/views/wms/basedata/group/AddDtl.vue
View File

@@ -32,8 +32,8 @@
<el-row>
<el-col :span="8">
<el-form-item label="载具编码" prop="storagevehicle_code">
<el-input v-model="formMst.storagevehicle_code" style="width: 200px;" />
<el-form-item label="载具编码" prop="vehicle_code">
<el-input v-model="formMst.vehicle_code" style="width: 200px;" />
</el-form-item>
</el-col>
@@ -187,7 +187,7 @@ export default {
handler(newValue, oldValue) {
this.dialogVisible = newValue
this.formMst = this.openParam
this.formMst.storagevehicle_code = ''
this.formMst.vehicle_code = ''
this.formMst.pcsn = null
this.formMst.qty = 1
}
@@ -197,7 +197,7 @@ export default {
return {
formMst: {
group_id: null,
storagevehicle_code: null,
vehicle_code: null,
material_id: null,
pcsn: null,
qty_unit_id: null,
@@ -225,7 +225,7 @@ export default {
material_code: [
{ required: true, message: '物料不能为空', trigger: 'blur' }
],
storagevehicle_code: [
vehicle_code: [
{ required: true, message: '载具不能为空', trigger: 'blur' }
],
supp_code: [
@@ -263,7 +263,7 @@ export default {
})
},
copySave() {
if (this.formMst.storagevehicle_code === '') {
if (this.formMst.vehicle_code === '') {
this.crud.notify('载具不能为空！', CRUD.NOTIFICATION_TYPE.INFO)
return
}

20
wms/nladmin-ui/src/views/wms/basedata/group/index.vue
View File

@@ -112,8 +112,8 @@
<el-row>
<el-col :span="8">
<el-form-item label="载具编码" prop="storagevehicle_code">
<el-input v-model="form.storagevehicle_code" :disabled="crud.status.edit > 0" @change="checkVehicle" style="width: 200px;" />
<el-form-item label="载具编码" prop="vehicle_code">
<el-input v-model="form.vehicle_code" :disabled="crud.status.edit > 0" @change="checkVehicle" style="width: 200px;" />
</el-form-item>
</el-col>
@@ -232,7 +232,7 @@
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55" />
<el-table-column prop="storagevehicle_code" label="载具编码" :min-width="flexWidth('storagevehicle_code',crud.data,'载具编码')" />
<el-table-column prop="vehicle_code" label="载具编码" :min-width="flexWidth('vehicle_code',crud.data,'载具编码')" />
<el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
<el-table-column prop="material_name" label="物料名称" :min-width="flexWidth('material_name',crud.data,'物料名称')" />
<el-table-column prop="material_spec" label="物料规格" :min-width="flexWidth('material_spec',crud.data,'物料规格')" />
@@ -240,12 +240,6 @@
<el-table-column prop="status" label="状态" :formatter="formattStatus" :min-width="flexWidth('status',crud.data,'状态')" />
<el-table-column prop="qty" label="组盘重量" :formatter="crud.formatNum3" :min-width="100" />
<el-table-column prop="supp_code" label="供应商" :min-width="flexWidth('supp_code',crud.data,'供应商')" />
<el-table-column prop="quality_time" label="有效日期" :min-width="flexWidth('quality_time',crud.data,'有效日期')" />
<el-table-column prop="produce_time" label="生产日期" :min-width="flexWidth('produce_time',crud.data,'生产日期')" />
<el-table-column prop="bake_num" label="烘干次数" :min-width="flexWidth('bake_num',crud.data,'烘干次数')" />
<el-table-column prop="quality_type" label="品质类型" :formatter="formattQuality" :min-width="flexWidth('quality_type',crud.data,'品质类型')" />
<el-table-column prop="box_type" label="料箱类型" :formatter="formattBoxType" :min-width="flexWidth('box_type',crud.data,'料箱类型')" />
<el-table-column prop="execution_stand" label="执行标准" :min-width="flexWidth('execution_stand',crud.data,'执行标准')" />
<el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
<el-table-column prop="create_name" label="组盘人" :min-width="flexWidth('create_name',crud.data,'组盘人')" />
<el-table-column prop="create_time" label="组盘时间" :min-width="flexWidth('create_time',crud.data,'组盘时间')" />
@@ -285,7 +279,7 @@ import { getLodop } from '@/assets/js/lodop/LodopFuncs'
const defaultForm = {
group_id: null,
storagevehicle_code: null,
vehicle_code: null,
material_id: null,
pcsn: null,
qty_unit_id: null,
@@ -338,7 +332,7 @@ export default {
material_code: [
{ required: true, message: '物料不能为空', trigger: 'blur' }
],
storagevehicle_code: [
vehicle_code: [
{ required: true, message: '载具不能为空', trigger: 'blur' }
],
pcsn: [
@@ -379,9 +373,9 @@ export default {
})
},
checkVehicle(value) {
crudGroup.checkVehicle({ 'storagevehicle_code': value }).then(row => {
crudGroup.checkVehicle({ 'vehicle_code': value }).then(row => {
}).catch(() => {
this.form.storagevehicle_code = ''
this.form.vehicle_code = ''
})
},
formattStatus(row) {

7
wms/nladmin-ui/src/views/wms/decision_manage/strategy/index.vue
View File

@@ -45,7 +45,7 @@
</el-table-column>
<el-table-column prop="strategy_name" label="策略名称" />
<el-table-column prop="strategy_code" label="策略编码" />
<el-table-column prop="strategy_type" label="决策类型" />
<el-table-column prop="strategy_type" label="决策类型" :formatter="strateyType" />
<el-table-column prop="class_type" label="策略执行器" />
<el-table-column prop="param" show-overflow-tooltip label="参数" />
<el-table-column prop="remark" show-overflow-tooltip label="描述" />
@@ -95,7 +95,7 @@ import pagination from '@crud/Pagination'
export default {
name: 'Strategy',
dicts: [],
dicts: ['STRATEGY_TYPE'],
components: { pagination, crudOperation, rrOperation, udOperation, AddDialog },
mixins: [presenter(), header(), crud()],
cruds() {
@@ -130,6 +130,9 @@ export default {
format_is_used(is_used) {
return is_used==true
},
strateyType(row) {
return this.dict.label.STRATEGY_TYPE[row.strategy_type]
},
changeEnabled(data, val) {
let msg = '此操作将停用，是否继续！'
if (val !== '1') {

10
wms/nladmin-ui/src/views/wms/st/inbill/AddDtl.vue
View File

@@ -52,7 +52,7 @@
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55" />
<el-table-column show-overflow-tooltip width="150" prop="storagevehicle_code" label="载具编码" />
<el-table-column show-overflow-tooltip width="150" prop="vehicle_code" label="载具编码" />
<el-table-column show-overflow-tooltip width="150" prop="material_code" label="物料编码" />
<el-table-column show-overflow-tooltip width="150" prop="material_name" label="物料名称" />
<el-table-column show-overflow-tooltip width="150" prop="material_spec" label="物料规格" />
@@ -60,9 +60,6 @@
<el-table-column show-overflow-tooltip width="170" prop="qty" label="数量" />
<el-table-column show-overflow-tooltip width="170" prop="qty_unit_name" label="计量单位名称" />
<el-table-column show-overflow-tooltip width="170" prop="supp_name" label="供应商" />
<el-table-column show-overflow-tooltip width="170" prop="produce_time" label="生产日期" />
<el-table-column show-overflow-tooltip width="100" prop="bake_num" label="烘干次数" />
<el-table-column show-overflow-tooltip width="150" prop="box_type" label="料箱类型" :formatter="formattBoxType"/>
</el-table>
<!--分页组件-->
<pagination />
@@ -88,7 +85,7 @@ const start = new Date()
export default {
name: 'AddDtl',
components: { crudOperation, rrOperation, pagination, DateRangePicker },
dicts: ['BOX_TYPE'],
dicts: [],
cruds() {
return CRUD({
title: '用户',
@@ -149,9 +146,6 @@ export default {
close() {
this.$emit('update:dialogShow', false)
},
formattBoxType(row) {
return this.dict.label.BOX_TYPE[row.box_type]
},
submit() {
this.$emit('update:dialogShow', false)
this.rows = this.$refs.multipleTable.selection

7
wms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue
View File

@@ -120,7 +120,7 @@
>
添加库内库存
</el-button>
<el-button
<!--<el-button
slot="left"
class="filter-item"
type="primary"
@@ -129,7 +129,7 @@
@click="queryDtlIos()"
>
添加生产工单
</el-button>
</el-button>-->
</span>
</div>
@@ -163,7 +163,7 @@
</template>
</el-table-column>
<el-table-column prop="qty_unit_name" label="单位" align="center" />
<el-table-column prop="source_bill_code" label="来源单据号" align="center" min-width="150px" show-overflow-tooltip />
<!-- <el-table-column prop="source_bill_code" label="来源单据号" align="center" min-width="150px" show-overflow-tooltip />-->
<el-table-column show-overflow-tooltip prop="remark" label="明细备注" align="center">
<template scope="scope">
<el-input v-model="scope.row.remark" size="mini" />
@@ -178,7 +178,6 @@
</el-table>
<AddDtl :dialog-show.sync="dtlShow" :stor-id="storId" @tableChanged="tableChanged" />
<AddDtlIos :dialog-show.sync="dtlIosShow" :bom-type="bom_type" @tableChanged="tableChanged2" />
</el-dialog>
</template>

3
wms/nladmin-ui/src/views/wms/statement/structivt/index.vue
View File

@@ -94,9 +94,6 @@
<el-table-column prop="canuse_qty" label="可用数" :formatter="crud.formatNum3" :min-width="100" />
<el-table-column prop="frozen_qty" label="冻结数" :formatter="crud.formatNum3" :min-width="100" />
<el-table-column prop="qty_unit_name" label="计量单位" :min-width="flexWidth('qty_unit_name',crud.data,'计量单位')" />
<el-table-column prop="produce_time" label="生产日期" :min-width="flexWidth('produce_time',crud.data,'生产日期')" />
<el-table-column prop="quality_time" label="有效日期" :min-width="flexWidth('quality_time',crud.data,'有效日期')" />
<el-table-column prop="bake_num" label="烘干次数" :min-width="flexWidth('bake_num',crud.data,'烘干次数')" />
<el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
<el-table-column prop="insert_time" label="入库时间" :min-width="flexWidth('insert_time',crud.data,'入库时间')" />
</el-table>