hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/loadposition/controller/LoadPositionController.java
@@ -2,6 +2,7 @@ import com.mes.loadposition.entity.LoadPosition; import com.mes.loadposition.service.LoadPositionService; import com.mes.utils.Result; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiResponse; @@ -35,9 +36,9 @@ @ApiOperation(value = "列表查询",notes = "列表查询",produces = "application/json") @ApiResponses({@ApiResponse(code = 200, message = "查询成功")}) @PostMapping("/findList") public ResponseEntity<List<LoadPosition>> findList(@RequestBody LoadPosition params) { public Result findList(@RequestBody LoadPosition params) { List<LoadPosition> result = loadPositionService.findList(params); return ResponseEntity.ok(result); return Result.success(result); } /** @@ -49,9 +50,9 @@ @ApiOperation(value = "查询", notes = "查询详情") @ApiResponses({@ApiResponse(code = 200, message = "查询成功")}) @GetMapping("/{id}") public ResponseEntity<LoadPosition> findById(@PathVariable("id") Long id) { LoadPosition loadPosition = loadPositionService.findById(id); return ResponseEntity.ok(loadPosition); public Result findById(@PathVariable("id") Long id) { LoadPosition loadPosition = loadPositionService.getBaseMapper().selectById(id); return Result.success(loadPosition); } /** @@ -63,9 +64,9 @@ @ApiOperation(value = "新增", notes = "新增数据") @ApiResponses({@ApiResponse(code = 200, message = "操作成功")}) @PostMapping public ResponseEntity<Boolean> insert( @RequestBody LoadPosition loadPosition) { boolean result = loadPositionService.insert(loadPosition); return ResponseEntity.ok(result); public Result insert( @RequestBody LoadPosition loadPosition) { boolean result = loadPositionService.save(loadPosition); return Result.success(result); } /** @@ -77,9 +78,9 @@ @ApiOperation(value = "修改", notes = "修改数据") @ApiResponses({@ApiResponse(code = 200, message = "操作成功")}) @PutMapping public ResponseEntity<Boolean> update( @RequestBody LoadPosition loadPosition) { boolean result = loadPositionService.update(loadPosition); return ResponseEntity.ok(result); public Result update( @RequestBody LoadPosition loadPosition) { boolean result = loadPositionService.updateById(loadPosition); return Result.success(result); } /** @@ -90,9 +91,9 @@ */ @ApiOperation(value = "删除", notes = "删除数据") @DeleteMapping("/{id}") public ResponseEntity<Integer> delete(@PathVariable("id") Long id) { int result = loadPositionService.delete(id); return ResponseEntity.ok(result); public Result delete(@PathVariable("id") Long id) { int result = loadPositionService.getBaseMapper().deleteById(id); return Result.success(result); } } hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/loadposition/entity/LoadPosition.java
@@ -3,6 +3,9 @@ import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import org.springframework.stereotype.Component; import java.io.Serializable; @@ -12,6 +15,9 @@ * @author system * @since 2024-07-09 14:51:27 */ @Data @Component @EqualsAndHashCode(callSuper = false) @TableName("load_position") @ApiModel(value = "LoadPosition", description = " ") public class LoadPosition implements Serializable{ @@ -67,68 +73,5 @@ private Integer routeGroup; public Long getId() { return id; } public void setId(Long id) { this.id = id; } public String getNumber() { return number; } public void setNumber(String number) { this.number = number; } public Long getMachineId() { return machineId; } public void setMachineId(Long machineId) { this.machineId = machineId; } public String getFlag() { return flag; } public void setFlag(String flag) { this.flag = flag; } public String getState() { return state; } public void setState(String state) { this.state = state; } public Long getStorageTaskId() { return storageTaskId; } public void setStorageTaskId(Long storageTaskId) { this.storageTaskId = storageTaskId; } public Integer getTypeFlag() { return typeFlag; } public void setTypeFlag(Integer typeFlag) { this.typeFlag = typeFlag; } public Integer getRouteGroup() { return routeGroup; } public void setRouteGroup(Integer routeGroup) { this.routeGroup = routeGroup; } } hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/loadposition/service/LoadPositionService.java
@@ -14,12 +14,6 @@ List<LoadPosition> findList(LoadPosition params); LoadPosition findById(Long id); boolean insert(LoadPosition loadPosition); boolean update(LoadPosition loadPosition); int delete(Long id); } hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/loadposition/service/impl/LoadPositionServiceImpl.java
@@ -28,24 +28,5 @@ return loadPositionMapper.selectList(query); } @Override public LoadPosition findById(Long id) { return loadPositionMapper.selectById(id); } @Override public boolean insert(LoadPosition loadPosition) { return save(loadPosition); } @Override public boolean update(LoadPosition loadPosition) { return updateById(loadPosition); } @Override public int delete(Long id) { return loadPositionMapper.deleteById(id); } } hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawusage/controller/RawUsageController.java
@@ -1,5 +1,6 @@ package com.mes.rawusage.controller; import com.mes.utils.Result; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import io.swagger.annotations.ApiOperation; @@ -38,9 +39,9 @@ @ApiOperation(value = "列表查询",notes = "列表查询",produces = "application/json") @ApiResponses({@ApiResponse(code = 200, message = "查询成功")}) @PostMapping("/findList") public ResponseEntity<List<RawUsage>> findList(@RequestBody RawUsage params) { public Result findList(@RequestBody RawUsage params) { List<RawUsage> result = rawUsageService.findList(params); return ResponseEntity.ok(result); return Result.success(result); } /** @@ -52,9 +53,9 @@ @ApiOperation(value = "查询", notes = "查询详情") @ApiResponses({@ApiResponse(code = 200, message = "查询成功")}) @GetMapping("/{id}") public ResponseEntity<RawUsage> findById(@PathVariable("id") Long id) { RawUsage rawUsage = rawUsageService.findById(id); return ResponseEntity.ok(rawUsage); public Result findById(@PathVariable("id") Long id) { RawUsage rawUsage = rawUsageService.getById(id); return Result.success(rawUsage); } /** @@ -66,9 +67,9 @@ @ApiOperation(value = "新增", notes = "新增数据") @ApiResponses({@ApiResponse(code = 200, message = "操作成功")}) @PostMapping public ResponseEntity<Boolean> insert( @RequestBody RawUsage rawUsage) { boolean result = rawUsageService.insert(rawUsage); return ResponseEntity.ok(result); public Result insert( @RequestBody RawUsage rawUsage) { boolean result = rawUsageService.save(rawUsage); return Result.success(result); } /** @@ -80,9 +81,9 @@ @ApiOperation(value = "修改", notes = "修改数据") @ApiResponses({@ApiResponse(code = 200, message = "操作成功")}) @PutMapping public ResponseEntity<Boolean> update( @RequestBody RawUsage rawUsage) { boolean result = rawUsageService.update(rawUsage); return ResponseEntity.ok(result); public Result update( @RequestBody RawUsage rawUsage) { boolean result = rawUsageService.updateById(rawUsage); return Result.success(result); } /** @@ -93,9 +94,9 @@ */ @ApiOperation(value = "删除", notes = "删除数据") @DeleteMapping("/{id}") public ResponseEntity<Integer> delete(@PathVariable("id") Long id) { int result = rawUsageService.delete(id); return ResponseEntity.ok(result); public Result delete(@PathVariable("id") Long id) { int result = rawUsageService.getBaseMapper().deleteById(id); return Result.success(result); } } hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawusage/entity/RawUsage.java
@@ -5,6 +5,9 @@ import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import org.springframework.stereotype.Component; /** * @@ -12,6 +15,9 @@ * @author system * @since 2024-07-09 14:51:27 */ @Data @Component @EqualsAndHashCode(callSuper = false) @TableName("raw_usage") @ApiModel(value = "RawUsage", description = " ") public class RawUsage implements Serializable{ @@ -97,108 +103,5 @@ private String batchId; public Long getId() { return id; } public void setId(Long id) { this.id = id; } public String getRawType() { return rawType; } public void setRawType(String rawType) { this.rawType = rawType; } public Float getRawWidth() { return rawWidth; } public void setRawWidth(Float rawWidth) { this.rawWidth = rawWidth; } public Float getRawHeight() { return rawHeight; } public void setRawHeight(Float rawHeight) { this.rawHeight = rawHeight; } public Float getRawThickness() { return rawThickness; } public void setRawThickness(Float rawThickness) { this.rawThickness = rawThickness; } public String getState() { return state; } public void setState(String state) { this.state = state; } public String getColor() { return color; } public void setColor(String color) { this.color = color; } public Integer getPieces() { return pieces; } public void setPieces(Integer pieces) { this.pieces = pieces; } public Integer getLeftPieces() { return leftPieces; } public void setLeftPieces(Integer leftPieces) { this.leftPieces = leftPieces; } public String getQrcode() { return qrcode; } public void setQrcode(String qrcode) { this.qrcode = qrcode; } public Date getCreateTime() { return createTime; } public void setCreateTime(Date createTime) { this.createTime = createTime; } public Date getProductionTime() { return productionTime; } public void setProductionTime(Date productionTime) { this.productionTime = productionTime; } public String getBatchId() { return batchId; } public void setBatchId(String batchId) { this.batchId = batchId; } } hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawusage/service/RawUsageService.java
@@ -12,12 +12,6 @@ List<RawUsage> findList(RawUsage params); RawUsage findById(Long id); boolean insert(RawUsage rawUsage); boolean update(RawUsage rawUsage); int delete(Long id); } hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawusage/service/impl/RawUsageServiceImpl.java
@@ -26,24 +26,6 @@ return rawUsageMapper.selectList(query); } @Override public RawUsage findById(Long id) { return rawUsageMapper.selectById(id); } @Override public boolean insert(RawUsage rawUsage) { return save(rawUsage); } @Override public boolean update(RawUsage rawUsage) { return updateById(rawUsage); } @Override public int delete(Long id) { return rawUsageMapper.deleteById(id); } } hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/controller/ShelfRackController.java
@@ -1,5 +1,6 @@ package com.mes.shelfrack.controller; import com.mes.utils.Result; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import io.swagger.annotations.ApiOperation; @@ -38,9 +39,9 @@ @ApiOperation(value = "列表查询",notes = "列表查询",produces = "application/json") @ApiResponses({@ApiResponse(code = 200, message = "查询成功")}) @PostMapping("/findList") public ResponseEntity<List<ShelfRack>> findList(@RequestBody ShelfRack params) { public Result findList(@RequestBody ShelfRack params) { List<ShelfRack> result = shelfRackService.findList(params); return ResponseEntity.ok(result); return Result.success(result); } /** @@ -52,9 +53,9 @@ @ApiOperation(value = "查询", notes = "查询详情") @ApiResponses({@ApiResponse(code = 200, message = "查询成功")}) @GetMapping("/{id}") public ResponseEntity<ShelfRack> findById(@PathVariable("id") Long id) { ShelfRack shelfRack = shelfRackService.findById(id); return ResponseEntity.ok(shelfRack); public Result findById(@PathVariable("id") Long id) { ShelfRack shelfRack = shelfRackService.getBaseMapper().selectById(id); return Result.success(shelfRack); } /** @@ -66,9 +67,9 @@ @ApiOperation(value = "新增", notes = "新增数据") @ApiResponses({@ApiResponse(code = 200, message = "操作成功")}) @PostMapping public ResponseEntity<Boolean> insert( @RequestBody ShelfRack shelfRack) { boolean result = shelfRackService.insert(shelfRack); return ResponseEntity.ok(result); public Result insert( @RequestBody ShelfRack shelfRack) { boolean result = shelfRackService.save(shelfRack); return Result.success(result); } /** @@ -80,9 +81,9 @@ @ApiOperation(value = "修改", notes = "修改数据") @ApiResponses({@ApiResponse(code = 200, message = "操作成功")}) @PutMapping public ResponseEntity<Boolean> update( @RequestBody ShelfRack shelfRack) { boolean result = shelfRackService.update(shelfRack); return ResponseEntity.ok(result); public Result update( @RequestBody ShelfRack shelfRack) { boolean result = shelfRackService.updateById(shelfRack); return Result.success(result); } /** @@ -93,9 +94,9 @@ */ @ApiOperation(value = "删除", notes = "删除数据") @DeleteMapping("/{id}") public ResponseEntity<Integer> delete(@PathVariable("id") Long id) { int result = shelfRackService.delete(id); return ResponseEntity.ok(result); public Result delete(@PathVariable("id") Long id) { int result = shelfRackService.getBaseMapper().deleteById(id); return Result.success(result); } } hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/entity/ShelfRack.java
@@ -5,6 +5,9 @@ import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import org.springframework.stereotype.Component; /** * @@ -12,6 +15,9 @@ * @author system * @since 2024-07-09 14:51:27 */ @Data @Component @EqualsAndHashCode(callSuper = false) @TableName("shelf_rack") @ApiModel(value = "ShelfRack", description = " ") public class ShelfRack implements Serializable{ @@ -55,52 +61,5 @@ private String enableState; public Long getId() { return id; } public void setId(Long id) { this.id = id; } public String getNumber() { return number; } public void setNumber(String number) { this.number = number; } public String getState() { return state; } public void setState(String state) { this.state = state; } public Long getRawPackageId() { return rawPackageId; } public void setRawPackageId(Long rawPackageId) { this.rawPackageId = rawPackageId; } public Date getModTime() { return modTime; } public void setModTime(Date modTime) { this.modTime = modTime; } public String getEnableState() { return enableState; } public void setEnableState(String enableState) { this.enableState = enableState; } } hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/service/ShelfRackService.java
@@ -12,12 +12,6 @@ List<ShelfRack> findList(ShelfRack params); ShelfRack findById(Long id); boolean insert(ShelfRack shelfRack); boolean update(ShelfRack shelfRack); int delete(Long id); } hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/service/impl/ShelfRackServiceImpl.java
@@ -26,24 +26,6 @@ return shelfRackMapper.selectList(query); } @Override public ShelfRack findById(Long id) { return shelfRackMapper.selectById(id); } @Override public boolean insert(ShelfRack shelfRack) { return save(shelfRack); } @Override public boolean update(ShelfRack shelfRack) { return updateById(shelfRack); } @Override public int delete(Long id) { return shelfRackMapper.deleteById(id); } } hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/controller/StorageTaskController.java
@@ -1,5 +1,6 @@ package com.mes.storagetask.controller; import com.mes.utils.Result; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import io.swagger.annotations.ApiOperation; @@ -38,9 +39,9 @@ @ApiOperation(value = "列表查询",notes = "列表查询",produces = "application/json") @ApiResponses({@ApiResponse(code = 200, message = "查询成功")}) @PostMapping("/findList") public ResponseEntity<List<StorageTask>> findList(@RequestBody StorageTask params) { public Result findList(@RequestBody StorageTask params) { List<StorageTask> result = storageTaskService.findList(params); return ResponseEntity.ok(result); return Result.success(result); } /** @@ -52,9 +53,9 @@ @ApiOperation(value = "查询", notes = "查询详情") @ApiResponses({@ApiResponse(code = 200, message = "查询成功")}) @GetMapping("/{id}") public ResponseEntity<StorageTask> findById(@PathVariable("id") Long id) { StorageTask storageTask = storageTaskService.findById(id); return ResponseEntity.ok(storageTask); public Result findById(@PathVariable("id") Long id) { StorageTask storageTask = storageTaskService.getBaseMapper().selectById(id); return Result.success(storageTask); } /** @@ -66,9 +67,9 @@ @ApiOperation(value = "新增", notes = "新增数据") @ApiResponses({@ApiResponse(code = 200, message = "操作成功")}) @PostMapping public ResponseEntity<Boolean> insert( @RequestBody StorageTask storageTask) { boolean result = storageTaskService.insert(storageTask); return ResponseEntity.ok(result); public Result insert( @RequestBody StorageTask storageTask) { boolean result = storageTaskService.save(storageTask); return Result.success(result); } /** @@ -80,9 +81,9 @@ @ApiOperation(value = "修改", notes = "修改数据") @ApiResponses({@ApiResponse(code = 200, message = "操作成功")}) @PutMapping public ResponseEntity<Boolean> update( @RequestBody StorageTask storageTask) { boolean result = storageTaskService.update(storageTask); return ResponseEntity.ok(result); public Result update( @RequestBody StorageTask storageTask) { boolean result = storageTaskService.updateById(storageTask); return Result.success(result); } /** @@ -93,9 +94,9 @@ */ @ApiOperation(value = "删除", notes = "删除数据") @DeleteMapping("/{id}") public ResponseEntity<Integer> delete(@PathVariable("id") Long id) { int result = storageTaskService.delete(id); return ResponseEntity.ok(result); public Result delete(@PathVariable("id") Long id) { int result = storageTaskService.getBaseMapper().deleteById(id); return Result.success(result); } } hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/entity/StorageTask.java
@@ -5,6 +5,9 @@ import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import org.springframework.stereotype.Component; /** * @@ -12,6 +15,9 @@ * @author system * @since 2024-07-09 14:51:27 */ @Data @Component @EqualsAndHashCode(callSuper = false) @TableName("storage_task") @ApiModel(value = "StorageTask", description = " ") public class StorageTask implements Serializable{ @@ -67,68 +73,5 @@ private Date finishTime; public Long getId() { return id; } public void setId(Long id) { this.id = id; } public String getTaskType() { return taskType; } public void setTaskType(String taskType) { this.taskType = taskType; } public String getTaskState() { return taskState; } public void setTaskState(String taskState) { this.taskState = taskState; } public String getShelfRack() { return shelfRack; } public void setShelfRack(String shelfRack) { this.shelfRack = shelfRack; } public String getLoadRack() { return loadRack; } public void setLoadRack(String loadRack) { this.loadRack = loadRack; } public Integer getRouteGroup() { return routeGroup; } public void setRouteGroup(Integer routeGroup) { this.routeGroup = routeGroup; } public Date getStartTime() { return startTime; } public void setStartTime(Date startTime) { this.startTime = startTime; } public Date getFinishTime() { return finishTime; } public void setFinishTime(Date finishTime) { this.finishTime = finishTime; } } hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/service/StorageTaskService.java
@@ -12,12 +12,5 @@ List<StorageTask> findList(StorageTask params); StorageTask findById(Long id); boolean insert(StorageTask storageTask); boolean update(StorageTask storageTask); int delete(Long id); } hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/service/impl/StorageTaskServiceImpl.java
@@ -26,24 +26,6 @@ return storageTaskMapper.selectList(query); } @Override public StorageTask findById(Long id) { return storageTaskMapper.selectById(id); } @Override public boolean insert(StorageTask storageTask) { return save(storageTask); } @Override public boolean update(StorageTask storageTask) { return updateById(storageTask); } @Override public int delete(Long id) { return storageTaskMapper.deleteById(id); } }