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/2/head
zengchenxi 9 months ago
parent ac93990c07 8dfe8103c6
commit a29a37b4b1
7 changed files with 91 additions and 9 deletions
Show Stats Download Patch File Download Diff File

2
mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/publicDetail.vue
Unescape View File

@ -4,7 +4,7 @@
<span><span v-html="dialogTitle"></span>页</span>
</template>
<el-form label-width="120px" :model="formData" v-loading="formLoading">
<!-- 基础信息 3列 竖列布局 -->
<!-- 基础信息 竖列布局 -->
<el-card class="hl-card-info">
<template #header>
<div class="hl-card-info-icona"></div><span class="hl-card-info-text">基础信息</span>

2
mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/approve.vue
Unescape View File

@ -69,7 +69,7 @@
<el-form-item label="是否已变更" prop="hasAlter">
<el-select
v-model="queryParams.hasAlter"
placeholder="请选择是否有价格"
placeholder="请选择是否已变更"
clearable
class="!w-240px"
>

2
mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/archive.vue
Unescape View File

@ -67,7 +67,7 @@
<el-form-item label="是否已变更" prop="hasAlter">
<el-select
v-model="queryParams.hasAlter"
placeholder="请选择是否有价格"
placeholder="请选择是否已变更"
clearable
class="!w-240px"
>

2
mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/audit.vue
Unescape View File

@ -67,7 +67,7 @@
<el-form-item label="是否已变更" prop="hasAlter">
<el-select
v-model="queryParams.hasAlter"
placeholder="请选择是否有价格"
placeholder="请选择是否已变更"
clearable
class="!w-240px"
>

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

@ -67,7 +67,7 @@
<el-form-item label="是否已变更" prop="hasAlter">
<el-select
v-model="queryParams.hasAlter"
placeholder="请选择是否有价格"
placeholder="请选择是否已变更"
clearable
class="!w-240px"
>

8
mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/StorageCheckForm.vue
Unescape View File

@ -4,12 +4,12 @@
<el-form-item label="盘点单号" prop="stockNo" class="!w-800px">
<el-input v-model="formData.stockNo" placeholder="系统自动生成" disabled/>
</el-form-item>
<el-form-item label="单据状态" prop="status" >
<!-- <el-form-item label="单据状态" prop="status" >
<el-select v-model="formData.status" placeholder="单据状态" disabled class="!w-600px">
<el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_MAT_CHECK_STATUS)" :key="dict.value"
:label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
</el-form-item> -->
<el-form-item label="盘点类型" prop="checkType" class="!w-800px">
<el-select v-model="formData.checkType" placeholder="盘点类型" class="!w-700px">
<el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_MAT_CHECK_TYPE)" :key="dict.value"
@ -65,7 +65,7 @@ const formData = ref({
checkTime: undefined,
noZero: 1,
description: undefined,
status: undefined,
status: 1,
whId: undefined,
})
const formRules = reactive({
@ -138,7 +138,7 @@ const resetForm = () => {
checkTime: undefined,
noZero: 1,
description: undefined,
status: undefined,
status: 1,
whId: undefined,
}
formRef.value?.resetFields()

82
sql/v1.2.0/1.structure.sql
Unescape View File

@ -63,3 +63,85 @@ CREATE TABLE `project_deliver_order_sub` (
`tenant_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '租户编号',
PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB COMMENT='发货订单子项表';
DROP TABLE IF EXISTS `wms_storage_check`;
CREATE TABLE `wms_storage_check` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键id',
`stock_no` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '盘点单号',
`check_type` tinyint(1) DEFAULT NULL COMMENT '盘点类型：1部分盘点2整体盘点',
`check_time` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '盘点开始时间',
`no_zero` tinyint(1) DEFAULT NULL COMMENT '排除库存为0的物料：1是2否',
`description` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '备注',
`status` tinyint(1) DEFAULT NULL COMMENT '状态：1已保存；2已提交；3已删除',
`wh_id` bigint(19) NOT NULL COMMENT '仓库Id，对应 wms_wh 表中的Id',
`deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '逻辑删除 1.是,0.否',
`creator` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '记录的创建人,对应员工表中的 Id',
`create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`updater` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '记录的修改人,对应员工表中的 Id',
`update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
`tenant_id` bigint(20) NOT NULL COMMENT '租户编号',
`keeper` bigint(20) DEFAULT NULL COMMENT '入库人',
`keeper_time` datetime DEFAULT NULL COMMENT '入库时间',
`outbound` bigint(20) DEFAULT NULL COMMENT '出库人',
`outbound_time` datetime DEFAULT NULL COMMENT '出库时间',
`cancel` bigint(20) DEFAULT NULL COMMENT '作废人',
`cancel_time` datetime DEFAULT NULL COMMENT '作废时间',
PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='入/出库盘点表';
DROP TABLE IF EXISTS `wms_storage_check_mat`;
CREATE TABLE `wms_storage_check_mat` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键id',
`check_id` bigint(20) NOT NULL COMMENT '盘点Id',
`mat_id` bigint(19) NOT NULL COMMENT '物料 Id,对应 base_material表中的 Id 列',
`wh_id` bigint(19) NOT NULL COMMENT '仓库 Id，对应 wms_wh 表中的Id',
`rg_id` bigint(19) NOT NULL COMMENT '库区 Id，对应 wms_rg 表中的Id',
`pn_id` bigint(19) NOT NULL COMMENT '库区 Id，对应 wms_rg 表中的Id',
`storage_ok_qty` decimal(11,2) DEFAULT NULL COMMENT '盘点数量',
`mat_rest` decimal(10,2) DEFAULT NULL COMMENT '物料当前库存数量',
`lot_no` varchar(50) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '批次号',
`deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '逻辑删除 1.是,0.否',
`creator` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '记录的创建人,对应员工表中的 Id',
`create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`updater` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '记录的修改人,对应员工表中的 Id',
`update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
`tenant_id` bigint(20) NOT NULL COMMENT '租户编号',
PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB AUTO_INCREMENT=122 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='盘点物料表';
CREATE ALGORITHM = UNDEFINED DEFINER = `root` @`%` SQL SECURITY DEFINER VIEW `v_storage_material_log` AS
select 0 AS `deleted`,`lg`.`id` AS `id`,`lg`.`creator` AS `creator`,`lg`.`create_time` AS `create_time`,`lg`.`updater` AS `updater`,`lg`.`update_time` AS `update_time`,
`lg`.`tenant_id` AS `tenant_id`,`lg`.`status` AS `status`,`mat`.`code` AS `mat_code`,`mat`.`name` AS `mat_name`,
(select `system_dict_data`.`label` from `system_dict_data` where ((`system_dict_data`.`dict_type` = 'heli_material_type') and (`system_dict_data`.`value` = `mat`.`material_type`))) AS `mat_type`,
(case when (isnull(`mat`.`short_name`) = TRUE) then '' else `mat`.`short_name` end) AS `short_name`,
(case when (isnull(`mat`.`spec`) = TRUE) then '' else `mat`.`spec` end) AS `mat_spec`,
(case when (isnull(`mat`.`brand`) = TRUE) then '' else `mat`.`brand` end) AS `mat_brand`,
(select `system_dict_data`.`label` from `system_dict_data` where ((`system_dict_data`.`dict_type` = 'heli_material_unit') and (`system_dict_data`.`value` = `mat`.`unit`))) AS `mat_unit`,
`st`.`stock_no` AS `stock_no`,`st`.`stock_type` AS `stock_type`,
(case when (`st`.`stock_type` = 1) then (select `system_dict_data`.`label` from `system_dict_data` where ((`system_dict_data`.`dict_type` = 'heli_storage_in_type') and (`system_dict_data`.`value` = `st`.`stock_in_type`))) else (select `system_dict_data`.`label` from `system_dict_data` where ((`system_dict_data`.`dict_type` = 'heli_storage_out_type') and (`system_dict_data`.`value` = `st`.`stock_in_type`))) end) AS `stock_type_name`,(case when (isnull(`st`.`header_no`) = TRUE) then '' else `st`.`header_no` end) AS `header_no`,
`wh`.`wh_name` AS `wh_name`,`rg`.`rg_name` AS `rg_name`,`pn`.`pn_name` AS `pn_name`,
(case when (isnull(`lg`.`lot_no`) = 1) then '' else `lg`.`lot_no` end) AS `lot_no`,(case when ((`st`.`stock_type` = 1) and (`lg`.`status` = 2)) then `lg`.`storage_ok_qty` when ((`st`.`stock_type` = 1) and (`lg`.`status` = 3)) then (-(1) * `lg`.`storage_ok_qty`) when ((`st`.`stock_type` = 2) and (`lg`.`status` = 2)) then (-(1) * `lg`.`storage_ok_qty`) when ((`st`.`stock_type` = 2) and (`lg`.`status` = 3)) then `lg`.`storage_ok_qty` else `lg`.`storage_ok_qty` end) AS `storage_ok_qty`
from (((((`wms_storage_log` `lg`
left join `wms_storage` `st` on((`lg`.`stock_id` = `st`.`id`)))
left join `base_material` `mat` on((`lg`.`mat_id` = `mat`.`id`)))
left join `wms_wh` `wh` on((`lg`.`wh_id` = `wh`.`id`)))
left join `wms_rg` `rg` on((`lg`.`rg_id` = `rg`.`id`)))
left join `wms_pn` `pn` on((`lg`.`pn_id` = `pn`.`id`)))
where ((`st`.`deleted` = 0) and (`mat`.`deleted` = 0) and (`wh`.`deleted` = 0) and (`rg`.`deleted` = 0) and (`pn`.`deleted` = 0));
CREATE ALGORITHM = UNDEFINED DEFINER = `root` @`%` SQL SECURITY DEFINER VIEW `v_storage_material_now` AS
select `t`.`deleted` AS `deleted`,`t`.`id` AS `id`,`t`.`creator` AS `creator`,`t`.`create_time` AS `create_time`,`t`.`updater` AS `updater`,`t`.`update_time` AS `update_time`,`t`.`tenant_id` AS `tenant_id`,
`t`.`mat_code` AS `mat_code`,`t`.`mat_name` AS `mat_name`,`t`.`mat_type` AS `mat_type`,`t`.`mat_spec` AS `mat_spec`,`t`.`mat_unit` AS `mat_unit`,`t`.`mat_brand` AS `mat_brand`,
`t`.`wh_id` AS `wh_id`,`t`.`wh_name` AS `wh_name`,`t`.`rg_id` AS `rg_id`,`t`.`rg_name` AS `rg_name`,`t`.`pn_id` AS `pn_id`,`t`.`pn_name` AS `pn_name`,`t`.`lot_no` AS `lot_no`,`t`.`short_name` AS `short_name`,
sum(`t`.`storage_ok_qty`) AS `storage_ok_qty`
from (
select 0 AS `deleted`,`mat`.`id` AS `id`,`mat`.`creator` AS `creator`,`mat`.`create_time` AS `create_time`,`mat`.`updater` AS `updater`,`mat`.`update_time` AS `update_time`,`mat`.`tenant_id` AS `tenant_id`,
`mat`.`code` AS `mat_code`,`mat`.`name` AS `mat_name`,(select `mes-heli`.`system_dict_data`.`label`
from `mes-heli`.`system_dict_data`
where ((`mes-heli`.`system_dict_data`.`dict_type` = 'heli_material_type') and (`mes-heli`.`system_dict_data`.`value` = `mat`.`material_type`))) AS `mat_type`,
(case when (isnull(`mat`.`short_name`) = TRUE) then '' else `mat`.`short_name` end) AS `short_name`,(case when (isnull(`mat`.`spec`) = TRUE) then '' else `mat`.`spec` end) AS `mat_spec`,
(case when (isnull(`mat`.`brand`) = TRUE) then '' else `mat`.`brand` end) AS `mat_brand`,(select `mes-heli`.`system_dict_data`.`label` from `mes-heli`.`system_dict_data` where ((`mes-heli`.`system_dict_data`.`dict_type` = 'heli_material_unit') and (`mes-heli`.`system_dict_data`.`value` = `mat`.`unit`))) AS `mat_unit`,
`wh`.`id` AS `wh_id`,`wh`.`wh_name` AS `wh_name`,`rg`.`id` AS `rg_id`,`rg`.`rg_name` AS `rg_name`,`pn`.`id` AS `pn_id`,`pn`.`pn_name` AS `pn_name`,
(case when (isnull(`lg`.`lot_no`) = 1) then '' else `lg`.`lot_no` end) AS `lot_no`,(case when ((`st`.`stock_type` = 1) and (`lg`.`status` = 2)) then `lg`.`storage_ok_qty` when ((`st`.`stock_type` = 1) and (`lg`.`status` = 3)) then (-(1) * `lg`.`storage_ok_qty`) when ((`st`.`stock_type` = 2) and (`lg`.`status` = 2)) then (-(1) * `lg`.`storage_ok_qty`) when ((`st`.`stock_type` = 2) and (`lg`.`status` = 3)) then `lg`.`storage_ok_qty` else `lg`.`storage_ok_qty` end) AS `storage_ok_qty`
from (((((`mes-heli`.`wms_storage_log` `lg` left join `mes-heli`.`wms_storage` `st` on((`lg`.`stock_id` = `st`.`id`))) left join `mes-heli`.`base_material` `mat` on((`lg`.`mat_id` = `mat`.`id`))) left join `mes-heli`.`wms_wh` `wh` on((`lg`.`wh_id` = `wh`.`id`))) left join `mes-heli`.`wms_rg` `rg` on((`lg`.`rg_id` = `rg`.`id`))) left join `mes-heli`.`wms_pn` `pn` on((`lg`.`pn_id` = `pn`.`id`))) where ((`st`.`deleted` = 0) and (`mat`.`deleted` = 0) and (`wh`.`deleted` = 0) and (`rg`.`deleted` = 0) and (`pn`.`deleted` = 0))) `t`
group by `t`.`deleted`,`t`.`id`,`t`.`creator`,`t`.`create_time`,`t`.`updater`,`t`.`update_time`,`t`.`tenant_id`,`t`.`mat_code`,`t`.`mat_name`,`t`.`mat_type`,`t`.`mat_spec`,`t`.`mat_unit`,`t`.`mat_brand`,`t`.`wh_id`,`t`.`wh_name`,`t`.`rg_id`,`t`.`rg_name`,`t`.`pn_id`,`t`.`pn_name`,`t`.`lot_no`,`t`.`short_name`;
Write Preview
Loading…
Cancel
Save