diff --git a/youchain-system/src/main/java/com/youchain/RequestData/ItemDate.java b/youchain-system/src/main/java/com/youchain/RequestData/ItemDate.java new file mode 100644 index 0000000..2553f91 --- /dev/null +++ b/youchain-system/src/main/java/com/youchain/RequestData/ItemDate.java @@ -0,0 +1,14 @@ +package com.youchain.RequestData; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class ItemDate { + @ApiModelProperty(value ="物料代码",required = true,example = "物料代码") + String itemCode; + @ApiModelProperty(value ="物料名称",required = true,example = "物料名称") + String itemName; + @ApiModelProperty(value ="物料数量",required = true,example = "物料数量") + Double itemQty=0d; +} diff --git a/youchain-system/src/main/java/com/youchain/RequestData/SjBom.java b/youchain-system/src/main/java/com/youchain/RequestData/SjBom.java new file mode 100644 index 0000000..adaa663 --- /dev/null +++ b/youchain-system/src/main/java/com/youchain/RequestData/SjBom.java @@ -0,0 +1,14 @@ +package com.youchain.RequestData; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Set; + +@Data +public class SjBom { + @ApiModelProperty(value ="总成数据",required = true) + Set zcInfo; + @ApiModelProperty(value ="下发时间",required = true,example = "2023-07-03 00:00:00") + String createTime; +} diff --git a/youchain-system/src/main/java/com/youchain/RequestData/TransTask.java b/youchain-system/src/main/java/com/youchain/RequestData/TransTask.java new file mode 100644 index 0000000..2749c54 --- /dev/null +++ b/youchain-system/src/main/java/com/youchain/RequestData/TransTask.java @@ -0,0 +1,19 @@ +package com.youchain.RequestData; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@Api(tags = "搬运任务") +public class TransTask { + @ApiModelProperty(value ="任务号",required = true,example = "任务号") + String taskCode; + @ApiModelProperty(value ="下发时间",required = true,example = "2023-07-03 00:00:00") + String createTime; + @ApiModelProperty(value ="点位",required = true,example = "点位") + String pointCode; + @ApiModelProperty(value ="任务类型",required = true,example = "任务类型(Cp_Off_Line成品下线、Fx_Off_Line返修下线、Fx_Back返修载具送回)") + String taskType; + +} diff --git a/youchain-system/src/main/java/com/youchain/RequestData/Yclbl.java b/youchain-system/src/main/java/com/youchain/RequestData/Yclbl.java new file mode 100644 index 0000000..ddd11d3 --- /dev/null +++ b/youchain-system/src/main/java/com/youchain/RequestData/Yclbl.java @@ -0,0 +1,23 @@ +package com.youchain.RequestData; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; +import java.util.Set; + +@Data +public class Yclbl { + @ApiModelProperty(value ="任务号",required = true,example = "任务号") + String taskCode; + @ApiModelProperty(value ="工单号",required = true,example = "工单号") + String orderNo; + @ApiModelProperty(value ="工单时间",required = true,example = "2023-07-03 00:00:00") + String orderTime; + @ApiModelProperty(value ="需求工位",required = true) + String station; + @ApiModelProperty(value ="下发时间",required = true,example = "2023-07-03 00:00:00") + String createTime; + @ApiModelProperty(value ="总成明细",required = true) + Set blzc; +} diff --git a/youchain-system/src/main/java/com/youchain/RequestData/ZcData.java b/youchain-system/src/main/java/com/youchain/RequestData/ZcData.java new file mode 100644 index 0000000..228f92a --- /dev/null +++ b/youchain-system/src/main/java/com/youchain/RequestData/ZcData.java @@ -0,0 +1,19 @@ +package com.youchain.RequestData; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; +import java.util.Set; + +@Data +public class ZcData { + @ApiModelProperty(value ="总成代码",required = true,example = "总成代码") + String completeCode; + @ApiModelProperty(value ="总成名称",required = true,example = "总成名称") + String completeName; + @ApiModelProperty(value ="总成套数",required = true,example = "总成套数") + double completeQty=0d; + @ApiModelProperty(value ="总成明细",required = true,example = "总成明细") + Set blzcmx; +} diff --git a/youchain-system/src/main/java/com/youchain/RequestData/ZpjlCt.java b/youchain-system/src/main/java/com/youchain/RequestData/ZpjlCt.java new file mode 100644 index 0000000..732a0e4 --- /dev/null +++ b/youchain-system/src/main/java/com/youchain/RequestData/ZpjlCt.java @@ -0,0 +1,25 @@ +package com.youchain.RequestData; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@Api(tags = "装配线叫料(散-成套)") +public class ZpjlCt { + @ApiModelProperty(value ="任务号",required = true,example = "任务号") + String taskCode; + @ApiModelProperty(value ="工单号",required = true,example = "工单号") + String orderNo; + @ApiModelProperty(value ="下发时间",required = true,example = "2023-07-03 00:00:00") + String createTime; + @ApiModelProperty(value ="总成代码",required = true) + String completeCode; + @ApiModelProperty(value ="总成名称",required = true) + String completeName; + @ApiModelProperty(value ="需求工位",required = true) + String station; + @ApiModelProperty(value ="需求点位",required = true) + String pointCode; + +} diff --git a/youchain-system/src/main/java/com/youchain/RequestData/ZpjlJj.java b/youchain-system/src/main/java/com/youchain/RequestData/ZpjlJj.java new file mode 100644 index 0000000..eb16b2c --- /dev/null +++ b/youchain-system/src/main/java/com/youchain/RequestData/ZpjlJj.java @@ -0,0 +1,27 @@ +package com.youchain.RequestData; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@Api(tags = "装配线叫料(紧急)") +public class ZpjlJj { + @ApiModelProperty(value ="任务号",required = true,example = "任务号") + String taskCode; + @ApiModelProperty(value ="工单号",required = true,example = "工单号") + String orderNo; + @ApiModelProperty(value ="下发时间",required = true,example = "2023-07-03 00:00:00") + String createTime; + @ApiModelProperty(value ="物料代码",required = true,example = "物料代码") + String itemCode; + @ApiModelProperty(value ="物料名称",required = true,example = "物料名称") + String itemName; + @ApiModelProperty(value ="物料数量",required = true,example = "物料数量(紧急叫料输入)") + Double itemQty=0d; + @ApiModelProperty(value ="需求工位",required = true) + String station; + @ApiModelProperty(value ="需求点位",required = true) + String pointCode; + +} diff --git a/youchain-system/src/main/java/com/youchain/RequestData/ZpjlZj.java b/youchain-system/src/main/java/com/youchain/RequestData/ZpjlZj.java new file mode 100644 index 0000000..39a636d --- /dev/null +++ b/youchain-system/src/main/java/com/youchain/RequestData/ZpjlZj.java @@ -0,0 +1,25 @@ +package com.youchain.RequestData; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@Api(tags = "装配线叫料(整)") +public class ZpjlZj { + @ApiModelProperty(value ="任务号",required = true,example = "任务号") + String taskCode; + @ApiModelProperty(value ="工单号",required = true,example = "工单号") + String orderNo; + @ApiModelProperty(value ="下发时间",required = true,example = "2023-07-03 00:00:00") + String createTime; + @ApiModelProperty(value ="物料代码",required = true,example = "物料代码") + String itemCode; + @ApiModelProperty(value ="物料名称",required = true,example = "物料名称") + String itemName; + @ApiModelProperty(value ="需求工位",required = true) + String station; + @ApiModelProperty(value ="需求点位",required = true) + String pointCode; + +} diff --git a/youchain-system/src/main/java/com/youchain/businessdata/rest/MesController.java b/youchain-system/src/main/java/com/youchain/businessdata/rest/MesController.java new file mode 100644 index 0000000..250e18a --- /dev/null +++ b/youchain-system/src/main/java/com/youchain/businessdata/rest/MesController.java @@ -0,0 +1,73 @@ +package com.youchain.businessdata.rest; + +import com.youchain.RequestData.*; +import com.youchain.annotation.AnonymousAccess; +import com.youchain.annotation.Log; +import com.youchain.businessdata.service.dto.TaskQueryCriteria; +import com.youchain.exception.handler.ApiResult; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiResponse; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequiredArgsConstructor +@Api(tags = "mes接口管理") +@RequestMapping("/api/mes") +@Slf4j +public class MesController { + @PostMapping("/yclbl") + @Log("mes-原材料备料") + @ApiOperation("mes-原材料备料") + @AnonymousAccess + public ResponseEntity yclbl(@Validated @RequestBody Yclbl yclbl){ + log.info(ApiResult.result(200,"成功",null).toString()); + return new ResponseEntity<>(HttpStatus.OK); + } + + @PostMapping("/sjBom") + @Log("mes-散件BOM同步") + @ApiOperation("mes-散件BOM同步") + @AnonymousAccess + public ResponseEntity sjBom(@Validated @RequestBody SjBom sjBom){ + + return new ResponseEntity<>(ApiResult.result(200,"成功",null), HttpStatus.OK); + } + @PostMapping("/zpjlZj") + @Log("mes-其他整件叫料") + @ApiOperation("mes-其他整件叫料") + @AnonymousAccess + public ResponseEntity zpjlZj(@Validated @RequestBody ZpjlZj zpjlZj){ + + return new ResponseEntity<>(ApiResult.result(200,"成功",null), HttpStatus.OK); + } + @PostMapping("/zpjlCt") + @Log("mes-成套叫料") + @ApiOperation("mes-成套叫料") + @AnonymousAccess + public ResponseEntity zpjlCt(@Validated @RequestBody ZpjlCt zpjlCt){ + + return new ResponseEntity<>(ApiResult.result(200,"成功",null), HttpStatus.OK); + } + @PostMapping("/zpjlJj") + @Log("mes-紧急叫料") + @ApiOperation("mes-紧急叫料") + @AnonymousAccess + public ResponseEntity zpjlJj(@Validated @RequestBody ZpjlJj zpjlJj){ + + return new ResponseEntity<>(ApiResult.result(200,"成功",null), HttpStatus.OK); + } + @PostMapping("/transTask") + @Log("mes-搬运任务") + @ApiOperation("mes-搬运任务") + @AnonymousAccess + public ResponseEntity transTask(@Validated @RequestBody TransTask transTask){ + + return new ResponseEntity<>(ApiResult.result(200,"成功",null), HttpStatus.OK); + } +}