From 2f396a9a71122d852df8b3974fa1714c20e22f49 Mon Sep 17 00:00:00 2001 From: liuxy Date: Tue, 25 Jun 2024 17:10:06 +0800 Subject: [PATCH] =?UTF-8?q?add=EF=BC=9A=E4=BB=93=E4=BD=8D=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=96=B0=E5=A2=9E=20=E5=B7=B7=E9=81=93=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../st/rest/StructattrController.java | 7 ++ .../st/service/StructattrService.java | 9 ++ .../service/impl/StructattrServiceImpl.java | 14 +++ .../views/wms/basedata/st/struct/index.vue | 99 ++++++++++++++++++- .../wms/basedata/st/struct/structattr.js | 10 +- 5 files changed, 137 insertions(+), 2 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/StructattrController.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/StructattrController.java index 30e651073..0b8011ab2 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/StructattrController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/StructattrController.java @@ -94,4 +94,11 @@ public class StructattrController { public ResponseEntity unLockPoint(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(structattrService.unLockPoint(whereJson), HttpStatus.OK); } + + @PostMapping("/tunConfirm") + @Log("二期禁用巷道") + public ResponseEntity tunConfirm(@RequestBody JSONObject json) { + structattrService.tunConfirm(json); + return new ResponseEntity<>(HttpStatus.OK); + } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/StructattrService.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/StructattrService.java index aa54af38d..e1b7e3421 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/StructattrService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/StructattrService.java @@ -98,4 +98,13 @@ public interface StructattrService { * @return */ JSONObject unLockPoint(JSONObject whereJson); + + /** + * 二期禁用巷道 + * @param json ：{ + * block_num： 巷道 + * is_used: 0-禁用，1-启用 + * } + */ + void tunConfirm(JSONObject json); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructattrServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructattrServiceImpl.java index e185a2736..85999f5f4 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructattrServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructattrServiceImpl.java @@ -10,6 +10,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.common.utils.MapOf; import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; @@ -513,4 +514,17 @@ public class StructattrServiceImpl implements StructattrService { return null; } + @Override + @Transactional(rollbackFor = Exception.class) + public void tunConfirm(JSONObject json) { + WQLObject tab = WQLObject.getWQLObject("st_ivt_structattr"); + + // 将这一巷道的所有仓位都禁用 + JSONObject param = new JSONObject(); + param.put("is_used", json.getString("is_used")); + + tab.update(param,"sect_id = '"+IOSEnum.SECT_ID.code("二期主存区")+"' AND block_num = '"+json.getString("block_num")+"' AND is_delete = '0'"); + + } + } diff --git a/lms/nladmin-ui/src/views/wms/basedata/st/struct/index.vue b/lms/nladmin-ui/src/views/wms/basedata/st/struct/index.vue index 8ca226768..72ac7a646 100644 --- a/lms/nladmin-ui/src/views/wms/basedata/st/struct/index.vue +++ b/lms/nladmin-ui/src/views/wms/basedata/st/struct/index.vue @@ -60,7 +60,67 @@ - + + + 巷道管理 + + + + + + + + + + + + + + + + + + + + + + 禁用 + + + + + 启用 + + + + + + { }) + }, + closeTun() { + this.dialogVisible2 = true + }, + tunOpen() { + if (!this.formMst.block_num) { + this.crud.notify('请选择巷道!', CRUD.NOTIFICATION_TYPE.INFO) + return + } + this.formMst.is_used = '1' + crudStructattr.tunConfirm(this.formMst).then(res => { + this.$refs['form2'].resetFields() + this.dialogVisible2 = false + this.crud.toQuery() + }) + }, + tunClose() { + if (!this.formMst.block_num) { + this.crud.notify('请选择巷道!', CRUD.NOTIFICATION_TYPE.INFO) + return + } + this.formMst.is_used = '0' + crudStructattr.tunConfirm(this.formMst).then(res => { + this.$refs['form2'].resetFields() + this.dialogVisible2 = false + this.crud.toQuery() + }) } } } diff --git a/lms/nladmin-ui/src/views/wms/basedata/st/struct/structattr.js b/lms/nladmin-ui/src/views/wms/basedata/st/struct/structattr.js index fbcd30c8e..a45a67635 100644 --- a/lms/nladmin-ui/src/views/wms/basedata/st/struct/structattr.js +++ b/lms/nladmin-ui/src/views/wms/basedata/st/struct/structattr.js @@ -32,4 +32,12 @@ export function changeActive(data) { }) } -export default { add, edit, del, changeActive } +export function tunConfirm(data) { + return request({ + url: 'api/structattr/tunConfirm', + method: 'post', + data + }) +} + +export default { add, edit, del, changeActive, tunConfirm }