From 958c5da48a66f9e01778f94f8a518c134391dd73 Mon Sep 17 00:00:00 2001 From: liuxy Date: Wed, 28 May 2025 16:49:58 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E5=8E=9F=E6=9D=90=E6=96=99?= =?UTF-8?q?=E5=BA=93=E5=AD=98=EF=BC=8C=E6=A1=B6=E6=A0=87=E7=AD=BE=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../master/rest/BucketrecordController.java | 20 ++++++++++++++----- .../master/service/BucketrecordService.java | 7 +++++++ .../service/impl/BucketrecordServiceImpl.java | 7 +++++++ .../nl/wms/statistics/wql/Qivt_query_01.wql | 1 + .../api/wms/basedata/master/bucketrecord.js | 10 +++++++++- .../basedata/master/bucketrecord/index.vue | 4 ++-- .../views/wms/statistics/ivtQuery/index.vue | 19 ++++++++++++++++++ 7 files changed, 60 insertions(+), 8 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/BucketrecordController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/BucketrecordController.java index c8b17925..3471e51b 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/BucketrecordController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/BucketrecordController.java @@ -4,20 +4,21 @@ package org.nl.wms.basedata.master.rest; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.nl.annotation.Log; import org.nl.wms.basedata.master.eum.RecordStatusEnum; import org.nl.wms.basedata.master.service.BucketrecordService; import org.nl.wms.basedata.master.service.dto.BucketrecordDto; import org.springframework.data.domain.Pageable; -import lombok.RequiredArgsConstructor; -import org.nl.annotation.Log; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.*; + import java.util.Map; -import lombok.extern.slf4j.Slf4j; /** * @author Liuxy @@ -97,4 +98,13 @@ public class BucketrecordController { public ResponseEntity getIvtList() { return new ResponseEntity<>(bucketrecordService.getIvtList(),HttpStatus.OK); } + + @PutMapping("/delIvt") + @Log("删除库存") + @ApiOperation("删除库存") + //@PreAuthorize("@el.check('store:edit')") + public ResponseEntity delIvt(@RequestBody JSONObject json) { + bucketrecordService.delIvt(json); + return new ResponseEntity<>(HttpStatus.OK); + } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/BucketrecordService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/BucketrecordService.java index afa6f4d2..ac9bdb87 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/BucketrecordService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/BucketrecordService.java @@ -2,6 +2,7 @@ package org.nl.wms.basedata.master.service; import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import org.nl.wms.basedata.master.service.dto.BucketrecordDto; import org.springframework.data.domain.Pageable; @@ -79,4 +80,10 @@ public interface BucketrecordService { * 获取库存等级 */ JSONArray getIvtList(); + + /** + * 删除库存 + * @param whereJson 入参 + */ + void delIvt(JSONObject whereJson); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/BucketrecordServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/BucketrecordServiceImpl.java index 39f0aad4..3c902c72 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/BucketrecordServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/BucketrecordServiceImpl.java @@ -214,4 +214,11 @@ wo.update(json); return jsonArr; } + @Override + @Transactional(rollbackFor = Exception.class) + public void delIvt(JSONObject whereJson) { + WQLObject.getWQLObject("st_ivt_structivt") + .delete("stockrecord_id = '"+whereJson.getString("stockrecord_id")+"'"); + } + } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/Qivt_query_01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/Qivt_query_01.wql index e36772f4..a72bf51a 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/Qivt_query_01.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/Qivt_query_01.wql @@ -74,6 +74,7 @@ ivt.frozen_qty, ivt.warehousing_qty, ivt.qty_unit_name, + ivt.stockrecord_id, ivt.instorage_time FROM ST_IVT_StructIvt ivt diff --git a/mes/qd/src/api/wms/basedata/master/bucketrecord.js b/mes/qd/src/api/wms/basedata/master/bucketrecord.js index 4c43f3ad..4773b91c 100644 --- a/mes/qd/src/api/wms/basedata/master/bucketrecord.js +++ b/mes/qd/src/api/wms/basedata/master/bucketrecord.js @@ -52,4 +52,12 @@ export function getIvtList() { }) } -export default { add, edit, del, getStatusList, getType, getQualityList, getIvtList } +export function delIvt(data) { + return request({ + url: 'api/bucketrecord/delIvt', + method: 'put', + data + }) +} + +export default { add, edit, del, getStatusList, getType, getQualityList, getIvtList, delIvt } diff --git a/mes/qd/src/views/wms/basedata/master/bucketrecord/index.vue b/mes/qd/src/views/wms/basedata/master/bucketrecord/index.vue index 11af2f0d..4251d0a4 100644 --- a/mes/qd/src/views/wms/basedata/master/bucketrecord/index.vue +++ b/mes/qd/src/views/wms/basedata/master/bucketrecord/index.vue @@ -323,9 +323,9 @@ export default { } }, doDelete(rows) { - if (rows.status !== '01') { + /*if (rows.status !== '01') { return this.crud.notify('不为生成状态不可删除', CRUD.NOTIFICATION_TYPE.INFO) - } + }*/ const msg = '删除此条记录，是否继续！' this.$confirm(msg, '提示', { confirmButtonText: '确定', diff --git a/mes/qd/src/views/wms/statistics/ivtQuery/index.vue b/mes/qd/src/views/wms/statistics/ivtQuery/index.vue index f2e904c4..e56688e9 100644 --- a/mes/qd/src/views/wms/statistics/ivtQuery/index.vue +++ b/mes/qd/src/views/wms/statistics/ivtQuery/index.vue @@ -181,6 +181,11 @@ + + + @@ -203,6 +208,7 @@ import '@riophae/vue-treeselect/dist/vue-treeselect.css' import crudMaterialbase from '@/api/wms/basedata/master/materialbase' import { download } from '@/api/data' import { downloadFile } from '@/utils' +import crudBucketrecord from '@/api/wms/basedata/master/bucketrecord' export default { name: 'IvtQuery', @@ -330,6 +336,19 @@ export default { return obj }) }) + }, + doDelete(row) { + const msg = '删除此条库存记录，是否继续！' + this.$confirm(msg, '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + crudBucketrecord.delIvt(row).then(res => { + this.crud.notify('删除成功', CRUD.NOTIFICATION_TYPE.SUCCESS) + this.crud.toQuery() + }) + }) } } }