From 0926a39aef0c9fdcee823e189bac2e532c6f0d4b Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期日, 20 十月 2024 21:06:51 +0800 Subject: [PATCH] 1、对接原片仓储opc 2、关闭liquibase,仅需要有脚本变动的时候开启在执行,避免启动报错 3、原片仓储新增入库请求、出库情况,调整整体逻辑,增加格子号架子号,任务表、详情表、工位表都需要记录架子信息,用于任务执行过程中,架子在执行过程中可返回架子对应的工位上,避免架子乱放后格子架子号不对应的情况发生。 --- hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/controller/RawGlassStorageStationController.java | 27 ++++++++++++++++++++------- 1 files changed, 20 insertions(+), 7 deletions(-) diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/controller/RawGlassStorageStationController.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/controller/RawGlassStorageStationController.java index 1b6dc42..b94c59a 100644 --- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/controller/RawGlassStorageStationController.java +++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/controller/RawGlassStorageStationController.java @@ -1,21 +1,34 @@ package com.mes.rawglassstation.controller; +import com.mes.rawglassstation.service.RawGlassStorageStationService; +import com.mes.utils.Result; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; +import javax.annotation.Resource; /** - * <p> - * 鍓嶇鎺у埗鍣� - * </p> + * 鍓嶇鎺у埗鍣� * * @author wf * @since 2024-09-10 */ @RestController -@RequestMapping("/raw-glass-storage-station") +@RequestMapping("/rawGlassStorageStation") public class RawGlassStorageStationController { + @Resource RawGlassStorageStationService rawGlassStorageStationService; + + @ApiOperation("宸ヤ綅鐘舵��") + @PostMapping("/updateSlotState") + @ResponseBody + public Result<Boolean> updateSlotState(@RequestParam(value = "state")int enableState, @RequestParam(value = "slot")int slot) { + boolean result = rawGlassStorageStationService.updateSlotState(slot, enableState); + if (enableState == 1) { + return Result.build(200, "鍚敤", result); + } else { + return Result.build(200, "绂佺敤", result); + } + } } -- Gitblit v1.8.0