main
			
			
		
		
							parent
							
								
									0e8c52fc4a
								
							
						
					
					
						commit
						0ec60f5264
					
				| 
						 | 
					@ -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;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
| 
						 | 
					@ -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<ZcData> zcInfo;
 | 
				
			||||||
 | 
					    @ApiModelProperty(value ="下发时间",required = true,example = "2023-07-03 00:00:00")
 | 
				
			||||||
 | 
					    String createTime;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
| 
						 | 
					@ -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;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
| 
						 | 
					@ -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<ZcData> blzc;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
| 
						 | 
					@ -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<ItemDate> blzcmx;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
| 
						 | 
					@ -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;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
| 
						 | 
					@ -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;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
| 
						 | 
					@ -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;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
| 
						 | 
					@ -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<Object> 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<Object> sjBom(@Validated @RequestBody SjBom sjBom){
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        return new ResponseEntity<>(ApiResult.result(200,"成功",null), HttpStatus.OK);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    @PostMapping("/zpjlZj")
 | 
				
			||||||
 | 
					    @Log("mes-其他整件叫料")
 | 
				
			||||||
 | 
					    @ApiOperation("mes-其他整件叫料")
 | 
				
			||||||
 | 
					    @AnonymousAccess
 | 
				
			||||||
 | 
					    public ResponseEntity<Object> zpjlZj(@Validated @RequestBody ZpjlZj zpjlZj){
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        return new ResponseEntity<>(ApiResult.result(200,"成功",null), HttpStatus.OK);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    @PostMapping("/zpjlCt")
 | 
				
			||||||
 | 
					    @Log("mes-成套叫料")
 | 
				
			||||||
 | 
					    @ApiOperation("mes-成套叫料")
 | 
				
			||||||
 | 
					    @AnonymousAccess
 | 
				
			||||||
 | 
					    public ResponseEntity<Object> zpjlCt(@Validated @RequestBody ZpjlCt zpjlCt){
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        return new ResponseEntity<>(ApiResult.result(200,"成功",null), HttpStatus.OK);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    @PostMapping("/zpjlJj")
 | 
				
			||||||
 | 
					    @Log("mes-紧急叫料")
 | 
				
			||||||
 | 
					    @ApiOperation("mes-紧急叫料")
 | 
				
			||||||
 | 
					    @AnonymousAccess
 | 
				
			||||||
 | 
					    public ResponseEntity<Object> zpjlJj(@Validated @RequestBody ZpjlJj zpjlJj){
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        return new ResponseEntity<>(ApiResult.result(200,"成功",null), HttpStatus.OK);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    @PostMapping("/transTask")
 | 
				
			||||||
 | 
					    @Log("mes-搬运任务")
 | 
				
			||||||
 | 
					    @ApiOperation("mes-搬运任务")
 | 
				
			||||||
 | 
					    @AnonymousAccess
 | 
				
			||||||
 | 
					    public ResponseEntity<Object> transTask(@Validated @RequestBody TransTask transTask){
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        return new ResponseEntity<>(ApiResult.result(200,"成功",null), HttpStatus.OK);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
		Loading…
	
		Reference in New Issue