From d5f99a48e0911d22fa8de9ae391b7979b23daf68 Mon Sep 17 00:00:00 2001 From: siontion Date: Sun, 21 Jan 2024 11:13:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=95=B0=E6=8D=AE=E4=BF=9D?= =?UTF-8?q?=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 库存数据保存 --- .../storagemat/StorageMatController.java | 13 ++++--- .../service/storagemat/StorageMatService.java | 2 ++ .../storagemat/StorageMatServiceImpl.java | 10 ++++++ .../src/api/heli/storagemat/index.ts | 4 +-- .../src/views/heli/storage/StorageForm.vue | 2 +- .../src/views/heli/storage/StorageOut.vue | 34 +++++++++---------- 6 files changed, 38 insertions(+), 27 deletions(-) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagemat/StorageMatController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagemat/StorageMatController.java index 18f7161b..00f3b61d 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagemat/StorageMatController.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagemat/StorageMatController.java @@ -48,14 +48,13 @@ public class StorageMatController { @PostMapping("/create-batch") @Operation(summary = "批量创建入/出库物料") @PreAuthorize("@ss.hasPermission('heli:storage-mat:create')") - public CommonResult createStorageMat(@Valid @RequestBody List createReqVO) { - for (StorageMatSaveReqVO item :createReqVO){ - if(item.getId() != null && item.getId()>0){ - storageMatService.deleteStorageMat(item.getId()); - item.setId(null); - } + public CommonResult createStorageMat(@Valid @RequestBody List createReqVO,@RequestParam("stockid") Long stockid) { + + storageMatService.deleteStorageMatList(stockid); + for (StorageMatSaveReqVO item : createReqVO) { + item.setId(null); storageMatService.createStorageMat(item); - }; + } return success(1L); } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagemat/StorageMatService.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagemat/StorageMatService.java index b1d35aac..f0703944 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagemat/StorageMatService.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagemat/StorageMatService.java @@ -59,4 +59,6 @@ public interface StorageMatService { */ List getStorageMatList(); + int deleteStorageMatList(Long stockid); + } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagemat/StorageMatServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagemat/StorageMatServiceImpl.java index 638a4b19..475850b8 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagemat/StorageMatServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagemat/StorageMatServiceImpl.java @@ -2,6 +2,7 @@ package com.chanko.yunxi.mes.module.heli.service.storagemat; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderDO; +import com.google.common.collect.Maps; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -81,4 +82,13 @@ public class StorageMatServiceImpl implements StorageMatService { return storageMatMapper.selectStorageMatValid(); } + @Override + public int deleteStorageMatList(Long stockid) { + //删除条件 + Map columnMap = Maps.newHashMap(); + columnMap.put("stock_id", stockid); + + return storageMatMapper.deleteByMap(columnMap); + } + } diff --git a/mes-ui/mes-ui-admin-vue3/src/api/heli/storagemat/index.ts b/mes-ui/mes-ui-admin-vue3/src/api/heli/storagemat/index.ts index b8bf86c8..8bc6f8fe 100644 --- a/mes-ui/mes-ui-admin-vue3/src/api/heli/storagemat/index.ts +++ b/mes-ui/mes-ui-admin-vue3/src/api/heli/storagemat/index.ts @@ -34,8 +34,8 @@ export const createStorageMat = async (data: StorageMatVO) => { } // 批量新增入/出库物料 -export const createStorageMatBatch = async (data: StorageMatVO[]) => { - return await request.post({ url: `/heli/storage-mat/create-batch`, data }) +export const createStorageMatBatch = async (data: StorageMatVO[],id:number) => { + return await request.post({ url: `/heli/storage-mat/create-batch?stockid=`+id, data }) } diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue index 9d47dba9..f3ea6e14 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue @@ -468,7 +468,7 @@ const submitForm = async () => { item.whId = formData.value.whId }) const dataMats = formData.value.matItemDOList as unknown as StorageMatApi.StorageMatVO[] - await StorageMatApi.createStorageMatBatch(dataMats) + await StorageMatApi.createStorageMatBatch(dataMats, storageid.value) //附件信息保存 matUploadFiles.value = { 'businessType': 'STORAGE', 'businessId': storageid, 'businessFileType': '' } diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue index 076a628c..10e35b46 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue @@ -126,7 +126,7 @@