From e43178dc194ed733e04e2a4d160d4752654bde12 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期日, 20 十月 2024 21:06:50 +0800
Subject: [PATCH] 移除无用代码
---
/dev/null | 167 -------------------------------------------------------
1 files changed, 0 insertions(+), 167 deletions(-)
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/loadposition/controller/LoadPositionController.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/loadposition/controller/LoadPositionController.java
deleted file mode 100644
index ce8fea2..0000000
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/loadposition/controller/LoadPositionController.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.mes.loadposition.controller;
-
-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;
-import io.swagger.annotations.ApiResponses;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- *
- *
- * @author system
- * @since 2024-07-09 14:51:27
- */
-@RestController
-@RequestMapping("/api/loadPosition")
-@Api(tags = " 鎺у埗鍣�")
-public class LoadPositionController {
-
- @Autowired
- private LoadPositionService loadPositionService;
-
- /**
- * 鍒楄〃鏌ヨ
- *
- * @param params
- * @return
- */
- @ApiOperation(value = "鍒楄〃鏌ヨ",notes = "鍒楄〃鏌ヨ",produces = "application/json")
- @ApiResponses({@ApiResponse(code = 200, message = "鏌ヨ鎴愬姛")})
- @PostMapping("/findList")
- public Result findList(@RequestBody LoadPosition params) {
- List<LoadPosition> result = loadPositionService.findList(params);
- return Result.success(result);
- }
-
- /**
- * 鏌ヨ
- *
- * @param id
- * @return
- */
- @ApiOperation(value = "鏌ヨ", notes = "鏌ヨ璇︽儏")
- @ApiResponses({@ApiResponse(code = 200, message = "鏌ヨ鎴愬姛")})
- @GetMapping("/{id}")
- public Result findById(@PathVariable("id") Long id) {
- LoadPosition loadPosition = loadPositionService.getBaseMapper().selectById(id);
- return Result.success(loadPosition);
- }
-
- /**
- * 鏂板
- *
- * @param loadPosition
- * @return
- */
- @ApiOperation(value = "鏂板", notes = "鏂板鏁版嵁")
- @ApiResponses({@ApiResponse(code = 200, message = "鎿嶄綔鎴愬姛")})
- @PostMapping
- public Result insert( @RequestBody LoadPosition loadPosition) {
- boolean result = loadPositionService.save(loadPosition);
- return Result.success(result);
- }
-
- /**
- * 淇敼
- *
- * @param loadPosition
- * @return
- */
- @ApiOperation(value = "淇敼", notes = "淇敼鏁版嵁")
- @ApiResponses({@ApiResponse(code = 200, message = "鎿嶄綔鎴愬姛")})
- @PutMapping
- public Result update( @RequestBody LoadPosition loadPosition) {
- boolean result = loadPositionService.updateById(loadPosition);
- return Result.success(result);
- }
-
- /**
- * 鍒犻櫎
- *
- * @param id
- * @return
- */
- @ApiOperation(value = "鍒犻櫎", notes = "鍒犻櫎鏁版嵁")
- @DeleteMapping("/{id}")
- public Result delete(@PathVariable("id") Long id) {
- int result = loadPositionService.getBaseMapper().deleteById(id);
- return Result.success(result);
- }
-
-}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/loadposition/entity/LoadPosition.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/loadposition/entity/LoadPosition.java
deleted file mode 100644
index 99f32ec..0000000
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/loadposition/entity/LoadPosition.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.mes.loadposition.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-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;
-
-/**
- *
- *
- * @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{
-
- private static final long serialVersionUID=1L;
-
- /**
- *
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- /**
- * 鏋跺瓙缂栧彿
- */
- @ApiModelProperty("鏋跺瓙缂栧彿")
- private String number;
-
- /**
- * 鏈哄櫒缂栧彿
- */
- @ApiModelProperty("鏈哄櫒缂栧彿")
- private Long machineId;
-
- /**
- * 鍚敤鏍囪
- */
- @ApiModelProperty("鍚敤鏍囪")
- private String flag;
-
- /**
- * 宸ヤ綔鐘舵��
- */
- @ApiModelProperty("宸ヤ綔鐘舵��")
- private String state;
-
- /**
- * 浠撳偍浠诲姟缂栧彿
- */
- @ApiModelProperty("浠撳偍浠诲姟缂栧彿")
- private Integer storageTaskId;
-
- /**
- * 涓婄墖浣嶇被鍨�
- */
- @ApiModelProperty("涓婄墖浣嶇被鍨�")
- private Integer typeFlag;
-
- /**
- * 绾胯矾
- */
- @ApiModelProperty("绾胯矾")
- private Integer routeGroup;
-
-
-
-}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/loadposition/mapper/LoadPositionMapper.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/loadposition/mapper/LoadPositionMapper.java
deleted file mode 100644
index ab8c084..0000000
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/loadposition/mapper/LoadPositionMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.mes.loadposition.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.mes.loadposition.entity.LoadPosition;
-
-/**
- *
- *
- * @author system
- * @since 2024-07-09 14:51:27
- *
- */
-
-public interface LoadPositionMapper extends BaseMapper<LoadPosition> {
-
-}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/loadposition/mapper/LoadPositionMapper.xml b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/loadposition/mapper/LoadPositionMapper.xml
deleted file mode 100644
index 5c46518..0000000
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/loadposition/mapper/LoadPositionMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.mes.mapper.LoadPositionMapper">
-
-</mapper>
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/loadposition/service/LoadPositionService.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/loadposition/service/LoadPositionService.java
deleted file mode 100644
index a1df98c..0000000
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/loadposition/service/LoadPositionService.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.mes.loadposition.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.mes.loadposition.entity.LoadPosition;
-
-
-import java.util.List;
-
-/**
- * @author system
- * @since 2024-07-09 14:51:27
- */
-public interface LoadPositionService extends IService<LoadPosition> {
-
- List<LoadPosition> findList(LoadPosition params);
-
-
-
-}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/loadposition/service/impl/LoadPositionServiceImpl.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/loadposition/service/impl/LoadPositionServiceImpl.java
deleted file mode 100644
index 92bae55..0000000
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/loadposition/service/impl/LoadPositionServiceImpl.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.mes.loadposition.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.mes.loadposition.entity.LoadPosition;
-
-import com.mes.loadposition.service.LoadPositionService;
-import com.mes.loadposition.mapper.LoadPositionMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * @author system
- * @since 2024-07-09 14:51:27
- */
-@Service
-public class LoadPositionServiceImpl extends ServiceImpl<LoadPositionMapper, LoadPosition> implements LoadPositionService {
-
- @Autowired
- private LoadPositionMapper loadPositionMapper;
-
- @Override
- public List<LoadPosition> findList(LoadPosition params){
- LambdaQueryWrapper<LoadPosition> query = Wrappers.lambdaQuery(LoadPosition.class);
- return loadPositionMapper.selectList(query);
- }
-
-
-}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawusage/controller/RawUsageController.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawusage/controller/RawUsageController.java
deleted file mode 100644
index 1518f75..0000000
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawusage/controller/RawUsageController.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package com.mes.rawusage.controller;
-
-import com.mes.shelfrack.entity.request.RawUsageAndShelfRack;
-import com.mes.utils.Result;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import org.springframework.web.bind.annotation.*;
-import com.mes.rawusage.entity.RawUsage;
-import com.mes.rawusage.service.RawUsageService;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import java.util.List;
-
-/**
- *
- *
- * @author system
- * @since 2024-07-09 14:51:27
- */
-@RestController
-@RequestMapping("/api/rawUsage")
-@Api(tags = " 鎺у埗鍣�")
-public class RawUsageController {
-
- @Autowired
- private RawUsageService rawUsageService;
-
- /**
- * 鍒楄〃鏌ヨ
- *
- * @param params
- * @return
- */
- @ApiOperation(value = "鍒楄〃鏌ヨ",notes = "鍒楄〃鏌ヨ",produces = "application/json")
- @ApiResponses({@ApiResponse(code = 200, message = "鏌ヨ鎴愬姛")})
- @PostMapping("/findList")
- public Result findList(@RequestBody RawUsage params) {
- List<RawUsage> result = rawUsageService.findList(params);
- return Result.success(result);
- }
-
- /**
- * 鏌ヨ
- *
- * @param id
- * @return
- */
- @ApiOperation(value = "鏌ヨ", notes = "鏌ヨ璇︽儏")
- @ApiResponses({@ApiResponse(code = 200, message = "鏌ヨ鎴愬姛")})
- @GetMapping("/{id}")
- public Result findById(@PathVariable("id") Long id) {
- RawUsage rawUsage = rawUsageService.getById(id);
- return Result.success(rawUsage);
- }
-
- /**
- * 鏂板
- *
- * @param rawUsage
- * @return
- */
- @ApiOperation(value = "鏂板", notes = "鏂板鏁版嵁")
- @ApiResponses({@ApiResponse(code = 200, message = "鎿嶄綔鎴愬姛")})
- @PostMapping
- public Result insert( @RequestBody RawUsage rawUsage) {
- boolean result = rawUsageService.save(rawUsage);
- return Result.success(result);
- }
-
- /**
- * 淇敼
- *
- * @param rawUsage
- * @return
- */
- @ApiOperation(value = "淇敼", notes = "淇敼鏁版嵁")
- @ApiResponses({@ApiResponse(code = 200, message = "鎿嶄綔鎴愬姛")})
- @PostMapping("/updaterawUsage")
- public Result updaterawUsage(@RequestBody RawUsage rawUsage) {
- boolean result = rawUsageService.updateById(rawUsage);
- return Result.success(result);
- }
-
- /**
- * 鍒犻櫎
- *
- * @param
- * @return
- */
- @ApiOperation(value = "鍒犻櫎", notes = "鍒犻櫎鏁版嵁")
- @PostMapping("/id")
- public Result delete(@RequestBody RawUsage rawUsage) {
- rawUsageService.updateRawPackageAndStorageRack(rawUsage);
- return Result.success();
- }
-
- @ApiOperation(value = "鍏ュ簱", notes = "鍏ュ簱")
- @PostMapping("/inStorage")
- public Result inStorage(@RequestBody RawUsageAndShelfRack rawUsage) {
- rawUsageService.inStorage(rawUsage);
- return Result.success();
- }
-
- @ApiOperation(value = "鍑哄簱", notes = "鍑哄簱")
- @PostMapping("/outStorage")
- public Result outStorage(@RequestBody RawUsageAndShelfRack rawUsage) {
- rawUsageService.outStorage(rawUsage);
- return Result.success();
- }
-
-
-
-}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawusage/entity/RawUsage.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawusage/entity/RawUsage.java
deleted file mode 100644
index de0b617..0000000
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawusage/entity/RawUsage.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package com.mes.rawusage.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-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;
-
-/**
- *
- *
- * @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{
-
- private static final long serialVersionUID=1L;
-
- /**
- *
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- /**
- * 鐜荤拑绫诲瀷
- */
- @ApiModelProperty("鐜荤拑绫诲瀷")
- private String rawType;
-
- /**
- * 瀹藉害
- */
- @ApiModelProperty("瀹藉害")
- private Float rawWidth;
-
- /**
- * 楂樺害
- */
- @ApiModelProperty("楂樺害")
- private Float rawHeight;
-
- /**
- * 鍘氬害
- */
- @ApiModelProperty("鍘氬害")
- private Float rawThickness;
-
- /**
- * 鐘舵��
- */
- @ApiModelProperty("鐘舵��")
- private String state;
-
- /**
- * 棰滆壊
- */
- @ApiModelProperty("棰滆壊")
- private String color;
-
- /**
- * 鎬绘暟閲�
- */
- @ApiModelProperty("鎬绘暟閲�")
- private Integer pieces;
-
- /**
- * 鍓╀綑鏁伴噺
- */
- @ApiModelProperty("鍓╀綑鏁伴噺")
- private Integer leftPieces;
-
- /**
- * 鐗╂枡缂栫爜
- */
- @ApiModelProperty("鐗╂枡缂栫爜")
- private String qrcode;
-
- /**
- * 鍒涘缓鏃堕棿
- */
- @ApiModelProperty("鍒涘缓鏃堕棿")
- private Date createTime;
-
- /**
- * 鐢熶骇鏃ユ湡
- */
- @ApiModelProperty("鐢熶骇鏃ユ湡")
- private Date productionTime;
-
- /**
- * 鎵规鍙�
- */
- @ApiModelProperty("鎵规鍙�")
- private String batchId;
-
-
-
-}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawusage/mapper/RawUsageMapper.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawusage/mapper/RawUsageMapper.java
deleted file mode 100644
index 5eb15ee..0000000
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawusage/mapper/RawUsageMapper.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.mes.rawusage.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.mes.rawusage.entity.RawUsage;
-/**
- *
- *
- * @author system
- * @since 2024-07-09 14:51:27
- *
- */
-
-public interface RawUsageMapper extends BaseMapper<RawUsage> {
-
-}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawusage/mapper/RawUsageMapper.xml b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawusage/mapper/RawUsageMapper.xml
deleted file mode 100644
index e276227..0000000
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawusage/mapper/RawUsageMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.mes.rawusage.mapper.RawUsageMapper">
-
-</mapper>
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawusage/service/RawUsageService.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawusage/service/RawUsageService.java
deleted file mode 100644
index 900e4a1..0000000
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawusage/service/RawUsageService.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.mes.rawusage.service;
-
-import com.mes.rawusage.entity.RawUsage;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.mes.shelfrack.entity.ShelfRack;
-import com.mes.shelfrack.entity.request.RawUsageAndShelfRack;
-
-import java.util.List;
-/**
- * @author system
- * @since 2024-07-09 14:51:27
- */
-public interface RawUsageService extends IService<RawUsage> {
-
- List<RawUsage> findList(RawUsage params);
-
- /**
- * @param raw
- * 淇敼
- */
- void updateRawPackageAndStorageRack(RawUsage raw);
-
- /**
- * @param raw
- * 鍏ュ簱
- */
- void inStorage(RawUsageAndShelfRack raw);
-
-
- /**
- * @param raw
- * 鍑哄簱
- */
- void outStorage(RawUsageAndShelfRack raw);
-
-}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawusage/service/impl/RawUsageServiceImpl.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawusage/service/impl/RawUsageServiceImpl.java
deleted file mode 100644
index 69f120f..0000000
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawusage/service/impl/RawUsageServiceImpl.java
+++ /dev/null
@@ -1,138 +0,0 @@
-package com.mes.rawusage.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.mes.rawusage.mapper.RawUsageMapper;
-import com.mes.rawusage.entity.RawUsage;
-import com.mes.rawusage.service.RawUsageService;
-import com.mes.shelfrack.entity.ShelfRack;
-import com.mes.shelfrack.entity.request.RawUsageAndShelfRack;
-import com.mes.shelfrack.mapper.ShelfRackMapper;
-import com.mes.storagetask.entity.StorageTask;
-import com.mes.storagetask.mapper.StorageTaskMapper;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.lang.reflect.InvocationTargetException;
-import java.time.LocalDateTime;
-import java.util.List;
-
-import static cn.hutool.core.date.DateTime.now;
-
-/**
- * @author system
- * @since 2024-07-09 14:51:27
- */
-@Service
-public class RawUsageServiceImpl extends ServiceImpl<RawUsageMapper, RawUsage> implements RawUsageService {
-
- @Autowired
- private RawUsageMapper rawUsageMapper;
- @Autowired
- private ShelfRackMapper shelfRackMapper;
- @Autowired
- private StorageTaskMapper storageTaskMapper;
-
- @Override
- public List<RawUsage> findList(RawUsage params){
- LambdaQueryWrapper<RawUsage> query = Wrappers.lambdaQuery(RawUsage.class);
- return rawUsageMapper.selectList(query);
- }
-
- @Override
- public void updateRawPackageAndStorageRack(RawUsage raw) {
- // Step 1: 鏌ヨraw_package_id
- LambdaQueryWrapper<ShelfRack> queryWrapper = Wrappers.lambdaQuery(ShelfRack.class)
- .eq(ShelfRack::getNumber, raw.getId());
- ShelfRack shelfRack = shelfRackMapper.selectOne(queryWrapper);
- if (shelfRack == null) {
- throw new RuntimeException("鏈壘鍒颁笌鎸囧畾璐ф灦ID鍏宠仈鐨勫師鏂欏寘淇℃伅");
- }
-
-
- // Step 2: 鏇存柊raw_package琛�
- RawUsage rawUsage=new RawUsage();
-
- rawUsage.setState("绌洪棽");
- rawUsage.setId(shelfRack.getRawPackageId());
- rawUsageMapper.updateById(rawUsage);
-
- // Step 3: 鏇存柊storage_rack琛�
-
- ShelfRack rack = new ShelfRack();
- rack.setState("绌洪棽");
- rack.setRawPackageId(null); // 璁剧疆RawPackageId涓虹壒瀹氱殑绌哄�硷紝渚嬪0
- LambdaQueryWrapper<ShelfRack> queryWrapper2 = Wrappers.lambdaQuery(ShelfRack.class)
- .eq(ShelfRack::getNumber, raw.getId());
- shelfRackMapper.update(rack, queryWrapper2);
-
-
- }
-
-
-
-
-
- @Override
- public void inStorage(RawUsageAndShelfRack raw) {
- RawUsage rawPackage = new RawUsage();
- BeanUtils.copyProperties(raw,rawPackage);
- rawPackage.setRawType(raw.getRawThickness() + raw.getColor());
- rawPackage.setState("浣跨敤涓�");
- rawPackage.setLeftPieces(rawPackage.getPieces());
- rawUsageMapper.insert(rawPackage);
-
- // 鏇存柊鏋惰〃
- ShelfRack rack = new ShelfRack();
- rack.setState("浣跨敤涓�");
- rack.setRawPackageId(rawPackage.getId()); // 璁剧疆RawPackageId涓虹壒瀹氱殑绌哄�硷紝渚嬪0
- LambdaQueryWrapper<ShelfRack> queryWrapper = Wrappers.lambdaQuery(ShelfRack.class)
- .eq(ShelfRack::getNumber, raw.getNumber());
- shelfRackMapper.update(rack, queryWrapper);
- StorageTask storageTask=new StorageTask();
- storageTask.setTaskState("绛夊緟涓�");
- storageTask.setTaskType("浠庝粨浣嶅埌鍚婅浣�");
- storageTask.setLoadRack(raw.getLoadRack());
- storageTask.setShelfRack(raw.getNumber());
- storageTask.setRouteGroup(1);
- storageTask.setStartTime(now());
- storageTask.setFinishTime(now());
- insertTask(storageTask);
-
-
- }
-
-
- @Override
- public void outStorage(RawUsageAndShelfRack raw) {
- ShelfRack rack = new ShelfRack();
- rack.setState("绛夊緟鍑哄簱");
- rack.setRawPackageId(null); // 璁剧疆RawPackageId涓虹壒瀹氱殑绌哄�硷紝渚嬪0
- LambdaQueryWrapper<ShelfRack> queryWrapper = Wrappers.lambdaQuery(ShelfRack.class)
- .eq(ShelfRack::getNumber, raw.getNumber());
- shelfRackMapper.update(rack, queryWrapper);
-
-
- StorageTask storageTask=new StorageTask();
- storageTask.setTaskState("绛夊緟涓�");
- storageTask.setTaskType("浠庝粨浣嶅埌鍚婅浣�");
- storageTask.setLoadRack(raw.getLoadRack());
- storageTask.setShelfRack(raw.getNumber());
- storageTask.setRouteGroup(1);
- storageTask.setStartTime(now());
- storageTask.setFinishTime(now());
- insertTask(storageTask);
- }
-
-
- public void insertTask(StorageTask storageTask) {
- storageTaskMapper.insert(storageTask);
-
- }
-
-
-
-
-}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/controller/ShelfRackController.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/controller/ShelfRackController.java
deleted file mode 100644
index 91ad4a7..0000000
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/controller/ShelfRackController.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package com.mes.shelfrack.controller;
-
-import com.mes.shelfrack.entity.request.RawUsageAndShelfRack;
-import com.mes.utils.Result;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import org.springframework.web.bind.annotation.*;
-import com.mes.shelfrack.entity.ShelfRack;
-import com.mes.shelfrack.service.ShelfRackService;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import java.util.List;
-import java.util.Map;
-
-/**
- *
- *
- * @author system
- * @since 2024-07-09 14:51:27
- */
-@RestController
-@RequestMapping("/api/shelfRack")
-@Api(tags = " 鎺у埗鍣�")
-public class ShelfRackController {
-
- @Autowired
- private ShelfRackService shelfRackService;
-
- /**
- * 鍒楄〃鏌ヨ
- *
- * @param params
- * @return
- */
- @ApiOperation(value = "鍒楄〃鏌ヨ",notes = "鍒楄〃鏌ヨ",produces = "application/json")
- @ApiResponses({@ApiResponse(code = 200, message = "鏌ヨ鎴愬姛")})
- @PostMapping("/findList")
- public Result findList(@RequestBody ShelfRack params) {
- List<ShelfRack> result = shelfRackService.findList(params);
- return Result.success(result);
- }
-
- /**
- * 鏌ヨ
- *
- * @param id
- * @return
- */
- @ApiOperation(value = "鏌ヨ", notes = "鏌ヨ璇︽儏")
- @ApiResponses({@ApiResponse(code = 200, message = "鏌ヨ鎴愬姛")})
- @GetMapping("/{id}")
- public Result findById(@PathVariable("id") Long id) {
- ShelfRack shelfRack = shelfRackService.getBaseMapper().selectById(id);
- return Result.success(shelfRack);
- }
-
- /**
- * 鏂板
- *
- * @param shelfRack
- * @return
- */
- @ApiOperation(value = "鏂板", notes = "鏂板鏁版嵁")
- @ApiResponses({@ApiResponse(code = 200, message = "鎿嶄綔鎴愬姛")})
- @PostMapping
- public Result insert( @RequestBody ShelfRack shelfRack) {
- boolean result = shelfRackService.save(shelfRack);
- return Result.success(result);
- }
-
- /**
- * 淇敼
- *
- * @param shelfRack
- * @return
- */
- @ApiOperation(value = "淇敼", notes = "淇敼鏁版嵁")
- @ApiResponses({@ApiResponse(code = 200, message = "鎿嶄綔鎴愬姛")})
- @PutMapping
- public Result update( @RequestBody ShelfRack shelfRack) {
- boolean result = shelfRackService.updateById(shelfRack);
- return Result.success(result);
- }
-
- /**
- * 鍒犻櫎
- *
- * @param id
- * @return
- */
- @ApiOperation(value = "鍒犻櫎", notes = "鍒犻櫎鏁版嵁")
- @DeleteMapping("/{id}")
- public Result delete(@PathVariable("id") Long id) {
- int result = shelfRackService.getBaseMapper().deleteById(id);
- return Result.success(result);
- }
-
-
- @ApiOperation(value = "鏋跺瓙琛ㄦ牸鏌ヨ",notes = "鏋跺瓙琛ㄦ牸鏌ヨ",produces = "application/json")
- @ApiResponses({@ApiResponse(code = 200, message = "鏌ヨ鎴愬姛")})
- @GetMapping("/findshelfrack")
- public Result findshelfrack() {
- List<RawUsageAndShelfRack> result = shelfRackService.selectshelf_rack();
- return Result.success(result);
- }
-
-}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/entity/ShelfRack.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/entity/ShelfRack.java
deleted file mode 100644
index f01efbf..0000000
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/entity/ShelfRack.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.mes.shelfrack.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-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;
-
-/**
- *
- *
- * @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{
-
- private static final long serialVersionUID=1L;
-
- /**
- *
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- /**
- * 鏋跺瓙缂栧彿
- */
- @ApiModelProperty("鏋跺瓙缂栧彿")
- private String number;
-
- /**
- * 宸ヤ綔鐘舵��
- */
- @ApiModelProperty("宸ヤ綔鐘舵��")
- private String state;
-
- /**
- * 鍖呭彿缂栧彿
- */
- @ApiModelProperty("鍖呭彿缂栧彿")
- private Integer rawPackageId;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty("淇敼鏃堕棿")
- private Date modTime;
-
- /**
- * 鍚敤鐘舵��
- */
- @ApiModelProperty("鍚敤鐘舵��")
- private String enableState;
-
-
-
-}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/entity/request/RawUsageAndShelfRack.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/entity/request/RawUsageAndShelfRack.java
deleted file mode 100644
index 2af2aca..0000000
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/entity/request/RawUsageAndShelfRack.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.mes.shelfrack.entity.request;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-
-@EqualsAndHashCode(callSuper = false)
-public class RawUsageAndShelfRack {
-
- private static final long serialVersionUID = 1L;
-
- @ApiModelProperty("ID")
- private Integer id;
-
- @ApiModelProperty("鐜荤拑绫诲瀷")
- private String rawType;
-
- @ApiModelProperty("瀹藉害")
- private Float rawWidth;
-
- @ApiModelProperty("楂樺害")
- private Float rawHeight;
-
- @ApiModelProperty("鍘氬害")
- private Float rawThickness;
-
- @ApiModelProperty("棰滆壊")
- private String color;
-
- @ApiModelProperty("鎬绘暟閲�")
- private Integer pieces;
-
- @ApiModelProperty("鍓╀綑鏁伴噺")
- private Integer leftPieces;
-
- @ApiModelProperty("鐗╂枡缂栫爜")
- private String qrcode;
-
- @ApiModelProperty("鍒涘缓鏃堕棿")
-
- private Date createTime;
-
-
-
- private Date productionTime;
-
- @ApiModelProperty("鎵规鍙�")
- private String batchId;
-
- @ApiModelProperty("鏋跺瓙缂栧彿")
- private String number;
-
- @ApiModelProperty("宸ヤ綔鐘舵��")
- private String state;
-
- @ApiModelProperty("鍖呭彿缂栧彿")
- private Integer rawPackageId;
-
-
- private Date modTime;
-
- @ApiModelProperty("鍚敤鐘舵��")
- private String enableState;
-
- @ApiModelProperty("涓婄墖浣嶇紪鍙�")
- private String loadRack;
-
-
-}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/mapper/ShelfRackMapper.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/mapper/ShelfRackMapper.java
deleted file mode 100644
index 87bbbfd..0000000
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/mapper/ShelfRackMapper.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.mes.shelfrack.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.github.yulichang.base.MPJBaseMapper;
-import com.mes.shelfrack.entity.ShelfRack;
-import com.mes.shelfrack.entity.request.RawUsageAndShelfRack;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- *
- *
- * @author system
- * @since 2024-07-09 14:51:27
- *
- */
-
-public interface ShelfRackMapper extends MPJBaseMapper<ShelfRack> {
-
-
- List<RawUsageAndShelfRack> selectshelf_rack();
-}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/service/ShelfRackService.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/service/ShelfRackService.java
deleted file mode 100644
index 39102e0..0000000
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/service/ShelfRackService.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.mes.shelfrack.service;
-
-import com.mes.shelfrack.entity.ShelfRack;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.mes.shelfrack.entity.request.RawUsageAndShelfRack;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author system
- * @since 2024-07-09 14:51:27
- */
-public interface ShelfRackService extends IService<ShelfRack> {
-
- List<ShelfRack> findList(ShelfRack params);
-
- List<RawUsageAndShelfRack> selectshelf_rack();
-
-}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/service/impl/ShelfRackServiceImpl.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/service/impl/ShelfRackServiceImpl.java
deleted file mode 100644
index 8171037..0000000
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/service/impl/ShelfRackServiceImpl.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.mes.shelfrack.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.yulichang.toolkit.JoinWrappers;
-import com.mes.common.config.Const;
-import com.mes.rawusage.entity.RawUsage;
-import com.mes.shelfrack.entity.request.RawUsageAndShelfRack;
-import com.mes.shelfrack.mapper.ShelfRackMapper;
-import com.mes.shelfrack.entity.ShelfRack;
-import com.mes.shelfrack.service.ShelfRackService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author system
- * @since 2024-07-09 14:51:27
- */
-@Service
-public class ShelfRackServiceImpl extends ServiceImpl<ShelfRackMapper, ShelfRack> implements ShelfRackService {
-
- @Autowired
- private ShelfRackMapper shelfRackMapper;
-
- @Override
- public List<ShelfRack> findList(ShelfRack params){
- LambdaQueryWrapper<ShelfRack> query = Wrappers.lambdaQuery(ShelfRack.class);
- return shelfRackMapper.selectList(query);
- }
-
-//
-// public void yourMethodName() {
-// List<Map<String, Object>> resultList = shelfRackMapper.selectMaps(
-// new LambdaQueryWrapper<ShelfRack>()
-// .select(ShelfRack::getNumber, RawUsage::getRawType, RawUsage::getRawWidth,
-// RawUsage::getRawHeight, RawUsage::getRawThickness, ShelfRack::getModTime,
-// ShelfRack::getEnableState, RawUsage::getPieces, RawUsage::getLeftPieces,
-// "(datediff(now(), raw_usage.create_time)) as rukuTime",
-// "(concat(if(ROUND(raw_usage.left_pieces / #{param1} * 100, 0) < 20, 20, ROUND(raw_usage.left_pieces / #{param1} * 100, 0)), '%')) as bfb")
-// .leftJoin(RawUsage.class, RawUsage::getId, ShelfRack::getRawPackageId)
-// .orderByAsc(ShelfRack::getNumber)
-// );
-//
-// // Process resultList as needed
-// }
-
-
-
- @Override
- public List<RawUsageAndShelfRack> selectshelf_rack() {
- return baseMapper.selectshelf_rack();
- }
-
-
-
-}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/controller/StorageTaskController.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/controller/StorageTaskController.java
deleted file mode 100644
index 0157fee..0000000
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/controller/StorageTaskController.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package com.mes.storagetask.controller;
-
-import com.mes.shelfrack.entity.request.RawUsageAndShelfRack;
-import com.mes.storagetask.entity.request.StorageTaskRequest;
-import com.mes.utils.Result;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import org.springframework.web.bind.annotation.*;
-import com.mes.storagetask.entity.StorageTask;
-import com.mes.storagetask.service.StorageTaskService;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
-/**
- *
- *
- * @author system
- * @since 2024-07-09 14:51:27
- */
-@RestController
-@RequestMapping("/api/storageTask")
-@Api(tags = " 鎺у埗鍣�")
-public class StorageTaskController {
-
- @Autowired
- private StorageTaskService storageTaskService;
-
- /**
- * 鍒楄〃鏌ヨ
- *
- * @param params
- * @return
- */
- @ApiOperation(value = "鍒楄〃鏌ヨ",notes = "鍒楄〃鏌ヨ",produces = "application/json")
- @ApiResponses({@ApiResponse(code = 200, message = "鏌ヨ鎴愬姛")})
- @PostMapping("/findList")
- public Result findList(@RequestBody StorageTask params) {
- List<StorageTask> result = storageTaskService.findList(params);
- return Result.success(result);
- }
-
- /**
- * 鏌ヨ
- *
- * @param id
- * @return
- */
- @ApiOperation(value = "鏌ヨ", notes = "鏌ヨ璇︽儏")
- @ApiResponses({@ApiResponse(code = 200, message = "鏌ヨ鎴愬姛")})
- @GetMapping("/{id}")
- public Result findById(@PathVariable("id") Long id) {
- StorageTask storageTask = storageTaskService.getBaseMapper().selectById(id);
- return Result.success(storageTask);
- }
-
- /**
- * 鏂板
- *
- * @param storageTask
- * @return
- */
- @ApiOperation(value = "鏂板", notes = "鏂板鏁版嵁")
- @ApiResponses({@ApiResponse(code = 200, message = "鎿嶄綔鎴愬姛")})
- @PostMapping
- public Result insert( @RequestBody StorageTask storageTask) {
- boolean result = storageTaskService.save(storageTask);
- return Result.success(result);
- }
-
- /**
- * 淇敼
- *
- * @param storageTask
- * @return
- */
- @ApiOperation(value = "淇敼", notes = "淇敼鏁版嵁")
- @ApiResponses({@ApiResponse(code = 200, message = "鎿嶄綔鎴愬姛")})
- @PutMapping
- public Result update( @RequestBody StorageTask storageTask) {
- boolean result = storageTaskService.updateById(storageTask);
- return Result.success(result);
- }
-
- /**
- * 鍒犻櫎
- *
- * @param id
- * @return
- */
- @ApiOperation(value = "鍒犻櫎", notes = "鍒犻櫎鏁版嵁")
- @DeleteMapping("/{id}")
- public Result delete(@PathVariable("id") Long id) {
- int result = storageTaskService.getBaseMapper().deleteById(id);
- return Result.success(result);
- }
-
-
- @ApiOperation(value = "浠诲姟鏌ヨ",notes = "浠诲姟鏌ヨ",produces = "application/json")
- @ApiResponses({@ApiResponse(code = 200, message = "鏌ヨ鎴愬姛")})
- @GetMapping("/findTasks")
- public Result findLatestTasks() {
- List<StorageTaskRequest> result = storageTaskService.Tasks();
- return Result.success(result);
- }
-
-
-
- @ApiOperation(value = "浠诲姟鎿嶄綔", notes = "浠诲姟鎿嶄綔")
- @PostMapping("/taskUpdate")
- public Result taskUpdate(@RequestBody Map<String, Object> storageTaskMap) {
-
- StorageTask task = new StorageTask();
- task.setType((String) storageTaskMap.get("Type")); // 鍋囪Type鏄瓨鍌ㄥ湪Map涓殑涓�涓敭
- task.setId((int) storageTaskMap.get("id"));
- storageTaskService.taskUpdate(task);
- return Result.success();
- }
-
-
-}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/entity/StorageTask.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/entity/StorageTask.java
deleted file mode 100644
index e037a41..0000000
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/entity/StorageTask.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.mes.storagetask.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.apache.xmlbeans.impl.xb.xsdschema.Public;
-import org.springframework.stereotype.Component;
-
-/**
- *
- *
- * @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{
-
- private static final long serialVersionUID=1L;
-
- /**
- *
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 浠诲姟绫诲瀷
- */
- @ApiModelProperty("浠诲姟绫诲瀷")
- private String taskType;
-
- /**
- * 宸ヤ綔鐘舵��
- */
- @ApiModelProperty("宸ヤ綔鐘舵��")
- private String taskState;
-
- /**
- * 浠撳偍鏋跺彿
- */
- @ApiModelProperty("浠撳偍鏋跺彿")
- private String shelfRack;
-
- /**
- * 涓婄墖浣嶇紪鍙�
- */
- @ApiModelProperty("涓婄墖浣嶇紪鍙�")
- private String loadRack;
-
- /**
- * 绾胯矾
- */
- @ApiModelProperty("绾胯矾")
- private Integer routeGroup;
-
- /**
- * 鍒涘缓鏃堕棿
- */
- @ApiModelProperty("鍒涘缓鏃堕棿")
- private Date startTime;
-
- /**
- * 瀹屾垚鏃堕棿
- */
- @ApiModelProperty("瀹屾垚鏃堕棿")
- private Date finishTime;
-
- @ApiModelProperty("鍓嶇浠诲姟绫诲瀷")
- private String Type;
-
-
-}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/entity/request/StorageTaskRequest.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/entity/request/StorageTaskRequest.java
deleted file mode 100644
index 9c7dd09..0000000
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/entity/request/StorageTaskRequest.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.mes.storagetask.entity.request;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class StorageTaskRequest {
-
-
- private static final long serialVersionUID = 1L;
-
- /**
- *
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 浠诲姟绫诲瀷
- */
- @ApiModelProperty("浠诲姟绫诲瀷")
- private String taskType;
-
-
-
- @ApiModelProperty("鍓嶇浠诲姟绫诲瀷")
- private String Type;
-
- /**
- * 宸ヤ綔鐘舵��
- */
- @ApiModelProperty("宸ヤ綔鐘舵��")
- private String taskState;
-
- /**
- * 浠撳偍鏋跺彿
- */
- @ApiModelProperty("浠撳偍鏋跺彿")
- private String shelfRack;
-
- /**
- * 涓婄墖浣嶇紪鍙�
- */
- @ApiModelProperty("涓婄墖浣嶇紪鍙�")
- private String loadRack;
-
- /**
- * 绾胯矾
- */
- @ApiModelProperty("绾胯矾")
- private Integer routeGroup;
-
- /**
- * 鍒涘缓鏃堕棿
- */
- @ApiModelProperty("鍒涘缓鏃堕棿")
- private Date startTime;
-
- /**
- * 瀹屾垚鏃堕棿
- */
- @ApiModelProperty("瀹屾垚鏃堕棿")
- private Date finishTime;
-
- @ApiModelProperty("棰滆壊")
- private String color;
-
- @ApiModelProperty("鍘氬害")
- private Float rawThickness;
-
-
-}
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/mapper/StorageTaskMapper.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/mapper/StorageTaskMapper.java
deleted file mode 100644
index ca5a765..0000000
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/mapper/StorageTaskMapper.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.mes.storagetask.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.mes.storagetask.entity.StorageTask;
-import com.mes.storagetask.entity.request.StorageTaskRequest;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- *
- *
- * @author system
- * @since 2024-07-09 14:51:27
- *
- */
-@Repository
-public interface StorageTaskMapper extends BaseMapper<StorageTask> {
-
-
- List<StorageTaskRequest> selectTasks();
-
-}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/service/StorageTaskService.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/service/StorageTaskService.java
deleted file mode 100644
index b46250b..0000000
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/service/StorageTaskService.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.mes.storagetask.service;
-
-import com.mes.storagetask.entity.StorageTask;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.mes.storagetask.entity.request.StorageTaskRequest;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
-/**
- * @author system
- * @since 2024-07-09 14:51:27
- */
-public interface StorageTaskService extends IService<StorageTask> {
-
- List<StorageTask> findList(StorageTask params);
-
- Map<String, Optional<StorageTask>> findLatestTasks();
-
- List<StorageTaskRequest> Tasks();
-
- void taskUpdate(StorageTask storageTask);
-}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/service/impl/StorageTaskServiceImpl.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/service/impl/StorageTaskServiceImpl.java
deleted file mode 100644
index 876d202..0000000
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/service/impl/StorageTaskServiceImpl.java
+++ /dev/null
@@ -1,167 +0,0 @@
-package com.mes.storagetask.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.mes.loadposition.entity.LoadPosition;
-import com.mes.loadposition.mapper.LoadPositionMapper;
-import com.mes.rawusage.entity.RawUsage;
-import com.mes.rawusage.mapper.RawUsageMapper;
-import com.mes.shelfrack.entity.ShelfRack;
-import com.mes.shelfrack.entity.request.RawUsageAndShelfRack;
-import com.mes.shelfrack.mapper.ShelfRackMapper;
-import com.mes.storagetask.entity.request.StorageTaskRequest;
-import com.mes.storagetask.mapper.StorageTaskMapper;
-import com.mes.storagetask.entity.StorageTask;
-import com.mes.storagetask.service.StorageTaskService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
-/**
- * @author system
- * @since 2024-07-09 14:51:27
- */
-@Service
-@Slf4j
-public class StorageTaskServiceImpl extends ServiceImpl<StorageTaskMapper, StorageTask> implements StorageTaskService {
-
- @Autowired
- private StorageTaskMapper storageTaskMapper;
- @Autowired
- private LoadPositionMapper loadPositionMapper;
- @Autowired
- private ShelfRackMapper shelfRackMapper;
- @Autowired
- private RawUsageMapper rawUsageMapper;
-
-
- @Override
- public List<StorageTask> findList(StorageTask params){
- LambdaQueryWrapper<StorageTask> query = Wrappers.lambdaQuery(StorageTask.class);
- return storageTaskMapper.selectList(query);
- }
-
-
- public Map<String, Optional<StorageTask>> findLatestTasks() {
- Map<String, Optional<StorageTask>> latestTasks = new HashMap<>();
-
- // 鏌ヨ鏈�鏂扮殑宸插畬鎴愪换鍔�
- LambdaQueryWrapper<StorageTask> completedWrapper = new LambdaQueryWrapper<>();
- completedWrapper.eq(StorageTask::getTaskType, "宸插畬鎴�")
- .orderByDesc(StorageTask::getId)
- .last("LIMIT 1");
- Optional<StorageTask> latestCompletedTask = Optional.ofNullable(storageTaskMapper.selectOne(completedWrapper));
- latestTasks.put("宸插畬鎴�", latestCompletedTask);
-
- // 鏌ヨ鏈�鏂扮殑绛夊緟涓换鍔�
- LambdaQueryWrapper<StorageTask> pendingWrapper = new LambdaQueryWrapper<>();
- pendingWrapper.eq(StorageTask::getTaskType, "绛夊緟涓�")
- .orderByDesc(StorageTask::getId);
- Optional<StorageTask> latestPendingTask = Optional.ofNullable(storageTaskMapper.selectOne(pendingWrapper));
- latestTasks.put("绛夊緟涓�", latestPendingTask);
- log.info(latestTasks+"");
- return latestTasks;
- }
-
-
- @Override
- public List<StorageTaskRequest> Tasks() {
- return baseMapper.selectTasks();
- }
-
-
-
- @Override
- public void taskUpdate(StorageTask request) {
- Integer taskId = request.getId();
- String taskType = request.getTaskType();
- String Type = request.getType();
- String taskState = request.getTaskState();
- String shelfRack = request.getShelfRack();
- String loadRack = request.getLoadRack();
-
- if ("閲嶆柊寮�濮�".equals(Type)) {
- StorageTask storageTask = new StorageTask();
- storageTask.setTaskState("绛夊緟涓�");
- LambdaQueryWrapper<StorageTask> queryWrapper = Wrappers.lambdaQuery(StorageTask.class)
- .eq(StorageTask::getId, request.getId());
- storageTaskMapper.update(request,queryWrapper);
- } else if ("瀹屾垚".equals(Type)) {
- StorageTask existingTask = storageTaskMapper.selectById(taskId);
- if (existingTask != null && "姝ｅ湪宸ヤ綔".equals(existingTask.getTaskState())) {
- if ("浠庝粨浣嶅埌涓婄墖浣�".equals(taskType) || "浠庝粨浣嶅埌鍚婅浣�".equals(taskType)) {
- LoadPosition loadPosition = new LoadPosition();
- loadPosition.setState("姝ｅ湪浣跨敤");
- loadPosition.setStorageTaskId(request.getId());
- LambdaQueryWrapper<LoadPosition> queryWrapper = Wrappers.lambdaQuery(LoadPosition.class)
- .eq(LoadPosition::getNumber, request.getLoadRack());
- loadPositionMapper.update(loadPosition, queryWrapper);
- StorageTask storageTask = new StorageTask();
- storageTask.setTaskState("姝ｅ湪浣跨敤");
- LambdaQueryWrapper<StorageTask> StorageTaskqueryWrapper = Wrappers.lambdaQuery(StorageTask.class)
- .eq(StorageTask::getId, request.getId());
- storageTaskMapper.update(request,StorageTaskqueryWrapper);
- } else if ("浠庝笂鐗囦綅鍒颁粨浣�".equals(taskType)) {
- LoadPosition loadPosition = new LoadPosition();
- loadPosition.setState("浣跨敤涓�");
- loadPosition.setStorageTaskId(null);
- LambdaQueryWrapper<LoadPosition> queryWrapper = Wrappers.lambdaQuery(LoadPosition.class)
- .eq(LoadPosition::getNumber, request.getLoadRack());
- loadPositionMapper.update(loadPosition, queryWrapper);
- ShelfRack loshelfRack = new ShelfRack();
- LambdaQueryWrapper<RawUsage> RawUsagequeryWrapper = Wrappers.lambdaQuery(RawUsage.class)
- .eq(RawUsage::getId,loshelfRack.getRawPackageId());
- RawUsage RawUsage = rawUsageMapper.selectOne(RawUsagequeryWrapper);
- if(RawUsage.getLeftPieces()==0){
- loshelfRack.setState("绌洪棽");
- }else {
- loshelfRack.setState("浣跨敤涓�");
- }
- LambdaQueryWrapper<ShelfRack> loshelfRackqueryWrapper = Wrappers.lambdaQuery(ShelfRack.class)
- .eq(ShelfRack::getNumber, request.getLoadRack());
- shelfRackMapper.update(loshelfRack, loshelfRackqueryWrapper);
- } else if ("浠庡悐瑁呬綅鍒颁粨浣�".equals(taskType)) {
- LoadPosition loadPosition = new LoadPosition();
- loadPosition.setState("绌洪棽");
- loadPosition.setStorageTaskId(null);
- LambdaQueryWrapper<LoadPosition> queryWrapper = Wrappers.lambdaQuery(LoadPosition.class)
- .eq(LoadPosition::getNumber, request.getLoadRack());
- loadPositionMapper.update(loadPosition, queryWrapper);
- ShelfRack loshelfRack = new ShelfRack();
- LambdaQueryWrapper<RawUsage> RawUsagequeryWrapper = Wrappers.lambdaQuery(RawUsage.class)
- .eq(RawUsage::getId,loshelfRack.getRawPackageId());
- RawUsage RawUsage = rawUsageMapper.selectOne(RawUsagequeryWrapper);
- if(RawUsage.getLeftPieces()==1){
- loshelfRack.setEnableState("鍚敤");
- }else {
- loshelfRack.setEnableState(loshelfRack.getEnableState());
- }
- loadPosition.setState("浣跨敤涓�");
- LambdaQueryWrapper<ShelfRack> loshelfRackqueryWrapper = Wrappers.lambdaQuery(ShelfRack.class)
- .eq(ShelfRack::getNumber, request.getLoadRack());
- shelfRackMapper.update(loshelfRack, loshelfRackqueryWrapper);
- }
- StorageTask storageTask = new StorageTask();
- storageTask.setTaskState("宸插畬鎴�");
- LambdaQueryWrapper<StorageTask> StorageTaskqueryWrapper = Wrappers.lambdaQuery(StorageTask.class)
- .eq(StorageTask::getId, request.getId());
- storageTaskMapper.update(storageTask, StorageTaskqueryWrapper);
- }
- } else if ("鍒犻櫎".equals(Type)) {
-
- LambdaQueryWrapper<StorageTask> StorageTaskqueryWrapper = Wrappers.lambdaQuery(StorageTask.class)
- .eq(StorageTask::getId, request.getId());
- storageTaskMapper.delete(StorageTaskqueryWrapper);
- }
- }
-
-
-
-
-}
\ No newline at end of file
--
Gitblit v1.8.0