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 8419eb78f..10d467fde 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 @@ -106,6 +106,13 @@ public class StructattrController { @Log("校验前缀是否可用") public ResponseEntity blurQuery(@RequestBody JSONObject whereJson) { structattrService.blurQuery(whereJson); - return new ResponseEntity<>( HttpStatus.OK); + return new ResponseEntity<>(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 6e8d4296c..ecc0a1d28 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 @@ -117,4 +117,13 @@ public interface StructattrService { * } */ void blurQuery(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 42207f4aa..f9e4266cf 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; @@ -686,4 +687,16 @@ public class StructattrServiceImpl implements StructattrService { } } + @Override + 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 42e5ed991..97d5208e6 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 @@ -104,8 +104,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 1f0e417e8..3de5680e5 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 @@ -40,6 +40,14 @@ export function oneCreate(data) { }) } +export function tunConfirm(data) { + return request({ + url: 'api/structattr/tunConfirm', + method: 'post', + data + }) +} + export function blurQuery(data) { return request({ url: 'api/structattr/blurQuery', @@ -48,4 +56,4 @@ export function blurQuery(data) { }) } -export default { add, edit, del, changeActive, oneCreate, blurQuery } +export default { add, edit, del, changeActive, oneCreate, blurQuery, tunConfirm }