From 7a824573ee323182817726426a2b3a36fc7222d8 Mon Sep 17 00:00:00 2001 From: siontion Date: Tue, 27 Feb 2024 10:38:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=9B=98=E7=82=B9=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=B7=B3=E8=BD=AC=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 库存盘点 新增跳转处理 --- .../heli/dal/mysql/materialplan/MaterialPlanMapper.java | 2 +- .../heli/dal/mysql/storagecheck/StorageCheckMapper.java | 1 + .../mes-ui-admin-vue3/src/views/heli/materialplan/add.vue | 2 ++ .../mes-ui-admin-vue3/src/views/heli/materialplan/edit.vue | 2 +- .../mes-ui-admin-vue3/src/views/heli/purchaseorder/add.vue | 1 + .../mes-ui-admin-vue3/src/views/heli/purchaseorder/edit.vue | 1 + .../src/views/heli/storagecheck/StorageCheckForm.vue | 6 +++++- 7 files changed, 12 insertions(+), 3 deletions(-) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/materialplan/MaterialPlanMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/materialplan/MaterialPlanMapper.java index f0b75169..912aa8aa 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/materialplan/MaterialPlanMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/materialplan/MaterialPlanMapper.java @@ -36,7 +36,7 @@ public interface MaterialPlanMapper extends BaseMapperX { query.like(!StringUtils.isEmpty(reqVO.getProjectMaterialPlanNo()), MaterialPlanDO::getProjectMaterialPlanNo, reqVO.getProjectMaterialPlanNo()) .like(!StringUtils.isEmpty(reqVO.getProjectName()), "p.project_name", reqVO.getProjectName()) .like(!StringUtils.isEmpty(reqVO.getPlanNo()), "pl.plan_no", reqVO.getPlanNo()) - .apply(reqVO.getCreateTime() != null, "DATE_FORMAT(t.create_time,'%Y-%m-%d') = {0}", reqVO.getCreateTime()) + .apply(reqVO.getCreateTime() != null && !reqVO.getCreateTime().equals("Invalid Date"), "DATE_FORMAT(t.create_time,'%Y-%m-%d') = {0}", reqVO.getCreateTime()) .eq(reqVO.getStatus() != null, MaterialPlanDO::getStatus, reqVO.getStatus()); return selectPage(reqVO, query); diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storagecheck/StorageCheckMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storagecheck/StorageCheckMapper.java index 7f3a49c7..c8ced4c5 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storagecheck/StorageCheckMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storagecheck/StorageCheckMapper.java @@ -25,6 +25,7 @@ public interface StorageCheckMapper extends BaseMapperX { .eqIfPresent(StorageCheckDO::getNoZero, reqVO.getNoZero()) .eqIfPresent(StorageCheckDO::getDescription, reqVO.getDescription()) .eqIfPresent(StorageCheckDO::getStatus, reqVO.getStatus()) + .neIfPresent(StorageCheckDO::getStatus, 3) .eqIfPresent(StorageCheckDO::getWhId, reqVO.getWhId()) .eqIfPresent(StorageCheckDO::getCreator, reqVO.getCreator()) .betweenIfPresent(StorageCheckDO::getCreateTime, reqVO.getCreateTime()) diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/add.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/add.vue index bbe26aaf..b00597da 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/add.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/add.vue @@ -95,6 +95,7 @@ import { Search, Plus } from '@element-plus/icons-vue' import { useTagsViewStore } from "@/store/modules/tagsView" import ProjectPlanDialog from '@/views/heli/materialplan/ProjectPlanDialog.vue' + const { t } = useI18n() // 国际化 const message = useMessage() // 消息弹窗 const router = useRouter() @@ -152,6 +153,7 @@ const submitForm = async () => { dialogVisible.value = false } finally { formLoading.value = false + router.push({ path: '/purchase/purchaseorder' }) tagsViewStore.delVisitedView(currentTag); } } diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/edit.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/edit.vue index e4c4d801..2cd21369 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/edit.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/edit.vue @@ -517,8 +517,8 @@ const deleteForm = async () =>{ await message.confirm('确认删除当前物料需求计划?') await MaterialPlanApi.deleteMaterialPlan(formData.value.id) - router.push({ path: '/purchase/materialplan' }) + tagsViewStore.delVisitedView(router.currentRoute.value); } // 保存按钮数据提交 const saveForm = async () => { diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/add.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/add.vue index 6c413b55..5f44b839 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/add.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/add.vue @@ -196,6 +196,7 @@ const submitForm = async () => { dialogVisible.value = false } finally { formLoading.value = false + router.push({ path: '/purchase/purchaseorder' }) tagsViewStore.delVisitedView(currentTag) //this.$tab.closePage(); diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/edit.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/edit.vue index 11c71d5e..90ed96e9 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/edit.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/edit.vue @@ -580,6 +580,7 @@ const deleteForm = async () =>{ await PurchaseOrderApi.deletePurchaseOrder(formData.value.id) router.push({ path: '/purchase/purchaseorder' }) + tagsViewStore.delVisitedView(router.currentRoute.value); } // 保存按钮数据提交 const saveForm = async () => { diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/StorageCheckForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/StorageCheckForm.vue index d4a88032..55937d65 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/StorageCheckForm.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/StorageCheckForm.vue @@ -46,6 +46,8 @@ import * as WarehouseApi from '@/api/heli/warehouse' const { t } = useI18n() // 国际化 const message = useMessage() // 消息弹窗 +const router = useRouter() + const dialogVisible = ref(false) // 弹窗的是否展示 const dialogTitle = ref('') // 弹窗的标题 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用 @@ -105,7 +107,7 @@ const submitForm = async () => { const data = formData.value as unknown as StorageCheckApi.StorageCheckVO data.status = 1 if (formType.value === 'create') { - await StorageCheckApi.createStorageCheck(data) + formData.value.id = await StorageCheckApi.createStorageCheck(data) message.success(t('common.createSuccess')) } else { await StorageCheckApi.updateStorageCheck(data) @@ -116,6 +118,8 @@ const submitForm = async () => { emit('success') } finally { formLoading.value = false + router.push({ path: '/inventory/check',query:{type:'update',id:formData.value.id}}) + //tagsViewStore.delVisitedView(router.currentRoute.value); } }