库存盘点 新增跳转处理

库存盘点 新增跳转处理

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<MaterialPlanDO> {
         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);

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<StorageCheckDO> {
                 .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())

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);
   }
 }

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 () => {

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();
 

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 () => {

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);
   }
 }