hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java
@@ -8,6 +8,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -35,5 +36,13 @@ log.info("显示工位上的玻璃信息:{}", glass); return Result.build(200, "", glass); } @ApiOperation("点击选择工程保存后进行调用,传入工程号") @GetMapping("/saveUpPattenUsage") //查询现在上片机的玻璃信息 public Result<List<UpPattenUsage>> saveUpPattenUsage(@RequestBody String engineeringId) { List<UpPattenUsage> glass = upPattenUsageService.saveUpPattenUsage(engineeringId); log.info("显示工位上的玻璃信息:{}", glass); return Result.build(200, "", glass); } } hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java
@@ -14,4 +14,7 @@ */ public interface UpPattenUsageService extends IService<UpPattenUsage> { List<UpPattenUsage> prioritylist(int state); List<UpPattenUsage> saveUpPattenUsage(String engineeringId); } hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java
@@ -8,6 +8,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import java.util.Collections; import java.util.List; /** @@ -30,6 +31,16 @@ return this.list(wrapper); } @Override public List<UpPattenUsage> saveUpPattenUsage(String engineeringId) { List<UpPattenUsage> list = this.list(); if (engineeringId != null) { LambdaQueryWrapper<UpPattenUsage> wrapper = new LambdaQueryWrapper<>(); wrapper.eq(UpPattenUsage::getEngineeringId,engineeringId); return this.list(wrapper); } return Collections.emptyList(); } } hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/controller/UpWorkstationController.java
@@ -37,7 +37,7 @@ //新增工位信息修改一条工位信息,接收实例类字段为宽高厚膜系数量工位id //删除工位信息也用这个,除了工位id玻璃信息传null @ApiOperation("修改工位表增加玻璃信息或者删除玻璃信息") @ApiOperation("修改工位表增加玻璃信息或者删除玻璃信息,传递Upworkstation类,只修改宽高厚数量膜系") @PostMapping("/updateGlassMessage") @ResponseBody public void updateGlassMessage(@RequestBody UpWorkstation upwork) {