You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
1156 lines
37 KiB
1156 lines
37 KiB
package com.gaotao.modules.schedule.controller;
|
|
|
|
import com.gaotao.common.utils.R;
|
|
import com.gaotao.modules.schedule.data.*;
|
|
import com.gaotao.modules.schedule.service.ScheduleService;
|
|
import com.gaotao.modules.shopOrder.entity.OperatorData;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.web.bind.annotation.PostMapping;
|
|
import org.springframework.web.bind.annotation.RequestBody;
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
import java.text.ParseException;
|
|
import java.util.List;
|
|
import java.util.Map;
|
|
|
|
/**
|
|
* 生产订单排产
|
|
* @author LR
|
|
* @date 2021/10/20 11:04
|
|
**/
|
|
@RestController
|
|
@RequestMapping(value = "/schedule")
|
|
public class ScheduleController {
|
|
|
|
@Autowired
|
|
private ScheduleService scheduleService;
|
|
/**
|
|
* TODO 获取排产班次的休息时间
|
|
* @author LR
|
|
* @date 2021/10/25 14:04
|
|
* @param inData
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@PostMapping(value = "getResourceRestList")
|
|
public R getResourceRestList(@RequestBody SearchScheduleData inData){
|
|
List<ShiftInfoData> resultList = scheduleService.getResourceRestList(inData);
|
|
return R.ok()
|
|
.put("code", 200)
|
|
.put("msg", "操作成功!")
|
|
.put("rows", resultList)
|
|
.put("total", resultList.size());
|
|
}
|
|
|
|
/**
|
|
* TODO 按照条件查询工单的数据
|
|
* @author LR
|
|
* @date 2021/10/25 14:23
|
|
* @param inData
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "getShopOrderList")
|
|
public R getShopOrderList(@RequestBody SearchScheduleData inData){
|
|
List<ShopOrderOutData> resultList = scheduleService.getShopOrderList(inData);
|
|
// Float requireScheduleTime = scheduleService.getRequireScheduleTime(inData);
|
|
return R.ok()
|
|
.put("code", 200)
|
|
.put("msg", "操作成功!")
|
|
//.put("requireScheduleTime", requireScheduleTime)
|
|
.put("rows", resultList)
|
|
.put("total", resultList.size());
|
|
}
|
|
|
|
/**
|
|
* TODO 查询派工单的数据
|
|
* @author LR
|
|
* @date 2021/10/25 16:07
|
|
* @param inData
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "getOrderScheduleList")
|
|
public R getOrderScheduleList(@RequestBody SearchScheduleData inData){
|
|
List<ScheduleData> resultList = scheduleService.getOrderScheduleList(inData);
|
|
return R.ok()
|
|
.put("code", 200)
|
|
.put("msg", "操作成功!")
|
|
.put("rows", resultList)
|
|
.put("total", resultList.size());
|
|
}
|
|
|
|
/**
|
|
* TODO 查询-待生产工单
|
|
* @author LR
|
|
* @date 2021/10/28 16:46
|
|
* @param inData
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "getProduceScheduleData")
|
|
public R getProduceScheduleData(@RequestBody SearchScheduleData inData){
|
|
List<ScheduleData> resultList = scheduleService.getProduceScheduleData(inData);
|
|
return R.ok()
|
|
.put("code", 200)
|
|
.put("msg", "操作成功!")
|
|
.put("rows", resultList)
|
|
.put("total", resultList.size());
|
|
}
|
|
|
|
/**
|
|
* TODO 获取操作员的列表信息
|
|
* @author LR
|
|
* @date 2021/11/4 11:41
|
|
* @param inData
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "getOperatorList")
|
|
public R getOperatorList(@RequestBody OperatorData inData){
|
|
List<OperatorData> resultList = scheduleService.getOperatorList(inData);
|
|
return R.ok()
|
|
.put("code", 200)
|
|
.put("msg", "操作成功!")
|
|
.put("rows", resultList)
|
|
.put("total", resultList.size());
|
|
}
|
|
|
|
/**
|
|
* TODO 获取操作员信息
|
|
* @author LR
|
|
* @date 2021/11/4 11:37
|
|
* @param inData
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "getOperatorData")
|
|
public R getOperatorData(@RequestBody OperatorOutData inData){
|
|
OperatorOutData result = scheduleService.getOperatorData(inData);
|
|
return R.ok()
|
|
.put("code", 200)
|
|
.put("msg", "操作成功!")
|
|
.put("row", result);
|
|
}
|
|
|
|
/**
|
|
* TODO 按照派工单号查询派工单的数据
|
|
* @author LR
|
|
* @date 2021/11/8 14:23
|
|
* @param seqNo
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "getScheduleDataBySeqNo")
|
|
public R getScheduleDataBySeqNo(@RequestBody String seqNo){
|
|
ScheduleData result = scheduleService.getScheduleDataBySeqNo(seqNo);
|
|
return R.ok()
|
|
.put("code", 200)
|
|
.put("msg", "操作成功!")
|
|
.put("row", result);
|
|
}
|
|
|
|
/**
|
|
* TODO 获取当前的上机卷信息
|
|
* @author LR
|
|
* @date 2021/11/9 16:02
|
|
* @param inData
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "getCurrentRollOpsBySeqNo")
|
|
public R getCurrentRollOpsBySeqNo(@RequestBody BaseRollData inData){
|
|
SfdcRollOpsData result = scheduleService.getCurrentRollOpsBySeqNo(inData);
|
|
return R.ok()
|
|
.put("code", 200)
|
|
.put("msg", "操作成功!")
|
|
.put("row", result);
|
|
}
|
|
|
|
/**
|
|
* TODO 查询派工单的时间记录
|
|
* @author LR
|
|
* @date 2021/11/10 15:13
|
|
* @param inData
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "getSfdcTimeByCon")
|
|
public R getSfdcTimeByCon(@RequestBody SearchScheduleData inData){
|
|
List<SfdcTimeData> resultList = scheduleService.getSfdcTimeByCon(inData);
|
|
return R.ok()
|
|
.put("code", 200)
|
|
.put("msg", "操作成功!")
|
|
.put("rows", resultList)
|
|
.put("total", resultList.size());
|
|
}
|
|
|
|
/**
|
|
* TODO 查询工单的工具信息
|
|
* @author LR
|
|
* @date 2021/11/11 14:05
|
|
* @param inData
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "getOrderToolByCon")
|
|
public R getOrderToolByCon(@RequestBody SearchScheduleData inData){
|
|
List<ToolInstanceData> resultList = scheduleService.getOrderToolByCon(inData);
|
|
return R.ok()
|
|
.put("code", 200)
|
|
.put("msg", "操作成功!")
|
|
.put("rows", resultList)
|
|
.put("total", resultList.size());
|
|
}
|
|
|
|
/**
|
|
* TODO 查询派工单工具的数据
|
|
* @author LR
|
|
* @date 2021/11/10 16:29
|
|
* @param inData
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "getSfdcToolByCon")
|
|
public R getSfdcToolByCon(@RequestBody SearchScheduleData inData){
|
|
List<SfdcToolData> resultList = scheduleService.getSfdcToolByCon(inData);
|
|
return R.ok()
|
|
.put("code", 200)
|
|
.put("msg", "操作成功!")
|
|
.put("rows", resultList)
|
|
.put("total", resultList.size());
|
|
}
|
|
|
|
/**
|
|
* TODO 获取工单的BOM信息
|
|
* @author LR
|
|
* @date 2021/11/11 17:20
|
|
* @param inData
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "getOrderBomByCon")
|
|
public R getOrderBomByCon(@RequestBody SearchScheduleData inData){
|
|
List<OrderBomData> resultList = scheduleService.getOrderBomByCon(inData);
|
|
return R.ok()
|
|
.put("code", 200)
|
|
.put("msg", "操作成功!")
|
|
.put("rows", resultList)
|
|
.put("total", resultList.size());
|
|
}
|
|
|
|
/**
|
|
* TODO 查询派工单材料上机的数据
|
|
* @author LR
|
|
* @date 2021/11/10 16:56
|
|
* @param inData
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "getSfdcMaterialByCon")
|
|
public R getSfdcMaterialByCon(@RequestBody SearchScheduleData inData){
|
|
List<SfdcMaterialData> resultList = scheduleService.getSfdcMaterialByCon(inData);
|
|
return R.ok()
|
|
.put("code", 200)
|
|
.put("msg", "操作成功!")
|
|
.put("rows", resultList)
|
|
.put("total", resultList.size());
|
|
}
|
|
|
|
/**
|
|
* TODO 查询上机卷的记录数据
|
|
* @author LR
|
|
* @date 2021/11/9 16:24
|
|
* @param inData
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "getSfdcRollOpsByCon")
|
|
public R getSfdcRollOpsByCon(@RequestBody SearchScheduleData inData){
|
|
List<SfdcRollOpsData> resultList = scheduleService.getSfdcRollOpsByCon(inData);
|
|
return R.ok()
|
|
.put("code", 200)
|
|
.put("msg", "操作成功!")
|
|
.put("rows", resultList)
|
|
.put("total", resultList.size());
|
|
}
|
|
|
|
/**
|
|
* TODO 查询派工单的不良卷信息
|
|
* @author LR
|
|
* @date 2021/11/10 17:18
|
|
* @param inData
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "getSfdcDefectByCon")
|
|
public R getSfdcDefectByCon(@RequestBody SearchScheduleData inData){
|
|
List<SfdcDefectData> resultList = scheduleService.getSfdcDefectByCon(inData);
|
|
return R.ok()
|
|
.put("code", 200)
|
|
.put("msg", "操作成功!")
|
|
.put("rows", resultList)
|
|
.put("total", resultList.size());
|
|
}
|
|
|
|
/**
|
|
* TODO 查询下机卷数据
|
|
* @author LR
|
|
* @date 2021/11/10 17:58
|
|
* @param inData
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "getSfdcRollByCon")
|
|
public R getSfdcRollByCon(@RequestBody SearchScheduleData inData){
|
|
List<SfdcRollData> resultList = scheduleService.getSfdcRollByCon(inData);
|
|
return R.ok()
|
|
.put("code", 200)
|
|
.put("msg", "操作成功!")
|
|
.put("rows", resultList)
|
|
.put("total", resultList.size());
|
|
}
|
|
|
|
/**
|
|
* TODO 获取卷的报工数据
|
|
* @author LR
|
|
* @date 2021/11/25 18:02
|
|
* @param inData
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "getSfdcDataByCon")
|
|
public R getSfdcDataByCon(@RequestBody SearchScheduleData inData){
|
|
List<SfdcData> resultList = scheduleService.getSfdcDataByCon(inData);
|
|
return R.ok()
|
|
.put("code", 200)
|
|
.put("msg", "操作成功!")
|
|
.put("rows", resultList)
|
|
.put("total", resultList.size());
|
|
}
|
|
|
|
/**
|
|
* TODO 查询sfdc_rolls表中的汇总报工数据
|
|
* @author LR
|
|
* @date 2021/11/26 16:13
|
|
* @param inData
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "getSfdcRollReportedQty")
|
|
public R getSfdcRollReportedQty(@RequestBody SearchScheduleData inData){
|
|
Float reportedQty = scheduleService.getSfdcRollReportedQty(inData);
|
|
return R.ok()
|
|
.put("code", 200)
|
|
.put("msg", "操作成功!")
|
|
.put("reportedQty", reportedQty);
|
|
}
|
|
|
|
/**
|
|
* TODO 查询当前是否存在报工的数据
|
|
* @author LR
|
|
* @date 2021/11/26 16:14
|
|
* @param inData
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "countSfdcRollByRollNo")
|
|
public R countSfdcRollByRollNo(@RequestBody SearchScheduleData inData){
|
|
Integer countNums = scheduleService.countSfdcRollByRollNo(inData);
|
|
return R.ok()
|
|
.put("code", 200)
|
|
.put("msg", "操作成功!")
|
|
.put("countNums", countNums);
|
|
}
|
|
|
|
/**
|
|
* TODO 查询报告的不良数据
|
|
* @author LR
|
|
* @date 2021/11/26 16:17
|
|
* @param inData
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "getSfdcDefectDefectedQty")
|
|
public R getSfdcDefectDefectedQty(@RequestBody SearchScheduleData inData){
|
|
Float defectedQty = scheduleService.getSfdcDefectDefectedQty(inData);
|
|
return R.ok()
|
|
.put("code", 200)
|
|
.put("msg", "操作成功!")
|
|
.put("defectedQty", defectedQty);
|
|
}
|
|
|
|
/**
|
|
* TODO 查询sfdc_time的时间汇总数据
|
|
* @author LR
|
|
* @date 2021/11/26 16:20
|
|
* @param inData
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "countSfdcTimeQty")
|
|
public R countSfdcTimeQty(@RequestBody SearchScheduleData inData){
|
|
Map<String, Object> result = scheduleService.countSfdcTimeQty(inData);
|
|
return R.ok()
|
|
.put("code", 200)
|
|
.put("msg", "操作成功!")
|
|
.put("row", result);
|
|
}
|
|
|
|
/**
|
|
* TODO 查询sfdc_time的最大和最小以及一些汇总数据
|
|
* @author LR
|
|
* @date 2021/11/26 16:21
|
|
* @param inData
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "getSfdcTimeMaxAndMinTime")
|
|
public R getSfdcTimeMaxAndMinTime(@RequestBody SearchScheduleData inData){
|
|
Map<String, Object> result = scheduleService.getSfdcTimeMaxAndMinTime(inData);
|
|
return R.ok()
|
|
.put("code", 200)
|
|
.put("msg", "操作成功!")
|
|
.put("row", result);
|
|
}
|
|
|
|
/**
|
|
* TODO 获取上机卷的报工数据
|
|
* @author LR
|
|
* @date 2021/11/29 17:11
|
|
* @param inData
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "getSfdcRollOpsReportedQty")
|
|
public R getSfdcRollOpsReportedQty(@RequestBody SearchScheduleData inData){
|
|
Map<String, Object> result = scheduleService.getSfdcRollOpsReportedQty(inData);
|
|
return R.ok()
|
|
.put("code", 200)
|
|
.put("msg", "操作成功!")
|
|
.put("row", result);
|
|
}
|
|
|
|
/**
|
|
* TODO 获取当前的报工汇总信息
|
|
* @author LR
|
|
* @date 2021/11/30 13:31
|
|
* @param inData
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "getCurrentRollReportedQty")
|
|
public R getCurrentRollReportedQty(@RequestBody SearchScheduleData inData){
|
|
Map<String, Object> result = scheduleService.getCurrentRollReportedQty(inData);
|
|
return R.ok()
|
|
.put("code", 200)
|
|
.put("msg", "操作成功!")
|
|
.put("row", result);
|
|
}
|
|
|
|
/**
|
|
* TODO 获取派工单的班次信息
|
|
* @author LR
|
|
* @date 2021/12/1 10:08
|
|
* @param inData
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "getScheduleShiftData")
|
|
public R getScheduleShiftData(@RequestBody SearchScheduleData inData) throws ParseException {
|
|
Map<String, Object> result = scheduleService.getScheduleShiftData(inData);
|
|
return R.ok()
|
|
.put("code", 200)
|
|
.put("msg", "操作成功!")
|
|
.put("row", result);
|
|
}
|
|
|
|
/**
|
|
* TODO 获取sfdc表的时间汇总
|
|
* @author LR
|
|
* @date 2021/12/1 15:29
|
|
* @param inData
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "getSfdcTimeData")
|
|
public R getSfdcTimeData(@RequestBody SearchScheduleData inData){
|
|
Map<String, Object> result = scheduleService.getSfdcTimeData(inData);
|
|
return R.ok()
|
|
.put("code", 200)
|
|
.put("msg", "操作成功!")
|
|
.put("row", result);
|
|
}
|
|
|
|
/**
|
|
* TODO 获取sfdc的报工数据以及时间的数据
|
|
* @author LR
|
|
* @date 2021/12/7 9:18
|
|
* @param inData
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "getSfdcReportedData")
|
|
public R getSfdcReportedData(@RequestBody SearchScheduleData inData){
|
|
SfdcData result = scheduleService.getSfdcReportedData(inData);
|
|
return R.ok()
|
|
.put("code", 200)
|
|
.put("msg", "操作成功!")
|
|
.put("row", result);
|
|
}
|
|
|
|
/**
|
|
* TODO 查询当前卷的材料上机记录--在线的
|
|
* @author LR
|
|
* @date 2021/12/7 10:21
|
|
* @param inData
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "getSfdcMaterialByRollNo")
|
|
public R getSfdcMaterialByRollNo(@RequestBody SearchScheduleData inData){
|
|
List<SfdcMaterialData> resultList = scheduleService.getSfdcMaterialByRollNo(inData);
|
|
return R.ok()
|
|
.put("code", 200)
|
|
.put("msg", "操作成功!")
|
|
.put("rows", resultList)
|
|
.put("total", resultList.size());
|
|
}
|
|
|
|
/**
|
|
* TODO 刷新页面的按钮的控制
|
|
* @author LR
|
|
* @date 2021/12/10 16:41
|
|
* @param inData
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "refreshWorkPlatformButtons")
|
|
public R refreshWorkPlatformButtons(@RequestBody SearchScheduleData inData){
|
|
Map<String, Object> resultMap = scheduleService.refreshWorkPlatformButtons(inData);
|
|
return R.ok()
|
|
.put("code", 200)
|
|
.put("msg", "操作成功!")
|
|
.put("resultMap", resultMap);
|
|
}
|
|
|
|
/**
|
|
* TODO 检查工作台的各种按钮
|
|
* @author LR
|
|
* @date 2021/12/10 18:08
|
|
* @param inData
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "checkScheduleButton")
|
|
public R checkScheduleButton(@RequestBody SearchScheduleData inData){
|
|
Map<String, Object> resultMap = scheduleService.checkScheduleButton(inData);
|
|
return R.ok()
|
|
.put("code", 200)
|
|
.put("msg", "操作成功!")
|
|
.put("resultMap", resultMap);
|
|
}
|
|
|
|
/**
|
|
* TODO 创建新卷的功能
|
|
* @author LR
|
|
* @date 2021/12/13 9:20
|
|
* @param inData
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "createNewRoll")
|
|
public R createNewRoll(@RequestBody SearchScheduleData inData){
|
|
scheduleService.createNewRoll(inData);
|
|
return R.ok()
|
|
.put("code", 200)
|
|
.put("success", true)
|
|
.put("msg", "操作成功!");
|
|
}
|
|
|
|
/**
|
|
* TODO 开始调机
|
|
* @author LR
|
|
* @date 2021/12/27 14:54
|
|
* @param inData
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "startTuning")
|
|
public R startTuning(@RequestBody SearchScheduleData inData){
|
|
scheduleService.startTuning(inData);
|
|
return R.ok()
|
|
.put("code", 200)
|
|
.put("success", true)
|
|
.put("msg", "操作成功!");
|
|
}
|
|
|
|
/**
|
|
* TODO 检验停机代码
|
|
* @author LR
|
|
* @date 2021/12/27 11:42
|
|
* @param inData
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "checkDownTimeCode")
|
|
public R checkDownTimeCode(@RequestBody SearchScheduleData inData){
|
|
Map<String, Object> resultMap = scheduleService.checkDownTimeCode(inData);
|
|
return R.ok()
|
|
.put("resultMap", resultMap);
|
|
}
|
|
|
|
/**
|
|
* TODO 报告停机代码
|
|
* @author LR
|
|
* @date 2021/12/27 17:16
|
|
* @param inData
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "reportDownTime")
|
|
public R reportDownTime(@RequestBody SearchScheduleData inData){
|
|
scheduleService.reportDownTime(inData);
|
|
return R.ok()
|
|
.put("code", 200)
|
|
.put("success", true)
|
|
.put("msg", "操作成功!");
|
|
}
|
|
|
|
/**
|
|
* TODO 查询派工单的不良记录
|
|
* @author LR
|
|
* @date 2021/12/28 15:09
|
|
* @param inData
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "getScheduleDefectHist")
|
|
public R getScheduleDefectHist(@RequestBody SearchScheduleData inData){
|
|
List<SfdcDefectData> resultList = scheduleService.getScheduleDefectHist(inData);
|
|
return R.ok()
|
|
.put("code", 200)
|
|
.put("msg", "操作成功!")
|
|
.put("rows", resultList);
|
|
}
|
|
|
|
/**
|
|
* TODO 检查不良代码
|
|
* @author LR
|
|
* @date 2021/12/28 11:31
|
|
* @param inData
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "checkDefectCode")
|
|
public R checkDefectCode(@RequestBody SearchScheduleData inData){
|
|
Map<String, Object> resultMap = scheduleService.checkDefectCode(inData);
|
|
return R.ok()
|
|
.put("resultMap", resultMap);
|
|
}
|
|
|
|
|
|
/**
|
|
* TODO 报告不良代码
|
|
* @author LR
|
|
* @date 2021/12/28 16:47
|
|
* @param inData
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "reportDefectCode")
|
|
public R reportDefectCode(@RequestBody SearchScheduleData inData){
|
|
scheduleService.reportDefectCode(inData);
|
|
return R.ok()
|
|
.put("code", 200)
|
|
.put("success", true)
|
|
.put("msg", "操作成功!");
|
|
}
|
|
|
|
/**
|
|
* TODO 检查工具实例的编码
|
|
* @author LR
|
|
* @date 2021/12/28 18:33
|
|
* @param inData
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "checkToolInstanceId")
|
|
public R checkToolInstanceId(@RequestBody SearchScheduleData inData){
|
|
Map<String, Object> resultMap = scheduleService.checkToolInstanceId(inData);
|
|
return R.ok()
|
|
.put("resultMap", resultMap);
|
|
}
|
|
|
|
/**
|
|
* TODO 添加工具实例
|
|
* @author LR
|
|
* @date 2021/12/28 18:45
|
|
* @param inData
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "addToolInstanceId")
|
|
public R addToolInstanceId(@RequestBody SearchScheduleData inData){
|
|
scheduleService.addToolInstanceId(inData);
|
|
return R.ok()
|
|
.put("code", 200)
|
|
.put("success", true)
|
|
.put("msg", "操作成功!");
|
|
}
|
|
|
|
/**
|
|
* @Author LR
|
|
* @Description 根据工单和物料自动获取bom行数据
|
|
* @DateTime 2021/12/20 10:59
|
|
* @Param [inData]
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "getBomItemNosByPartNo")
|
|
public R getBomItemNosByPartNo(@RequestBody SearchScheduleData inData){
|
|
List<Map<String, Object>> resultList = scheduleService.getBomItemNosByPartNo(inData);
|
|
return R.ok()
|
|
.put("code", 200)
|
|
.put("msg", "操作成功!")
|
|
.put("rows", resultList);
|
|
}
|
|
|
|
/**
|
|
* TODO 检查是否可以上当前的材料卷
|
|
* @author LR
|
|
* @date 2021/12/30 11:48
|
|
* @param inData
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "checkFeedingMaterialRoll")
|
|
public R checkMaterialRoll(@RequestBody SearchScheduleData inData){
|
|
Map<String, Object> resultMap = scheduleService.checkFeedingMaterialRoll(inData);
|
|
return R.ok()
|
|
.put("resultMap", resultMap);
|
|
}
|
|
|
|
/**
|
|
* @Author LR
|
|
* @Description 保存材料上机的记录数据
|
|
* @DateTime 2021/12/20 16:34
|
|
* @Param [inData]
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "feedingMaterialRoll")
|
|
public R feedingMaterialRoll(@RequestBody SearchScheduleData inData){
|
|
scheduleService.feedingMaterialRoll(inData);
|
|
return R.ok()
|
|
.put("code", 200)
|
|
.put("success", true)
|
|
.put("msg", "操作成功!");
|
|
}
|
|
|
|
/**
|
|
* TODO 检查是否可以开始生产
|
|
* @author LR
|
|
* @date 2021/12/31 11:22
|
|
* @param inData
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "checkStartProduce")
|
|
public R checkStartProduce(@RequestBody SearchScheduleData inData){
|
|
Map<String, Object> resultMap = scheduleService.checkStartProduce(inData);
|
|
return R.ok()
|
|
.put("resultMap", resultMap);
|
|
}
|
|
|
|
/**
|
|
* TODO 开始生产的业务
|
|
* @author LR
|
|
* @date 2022/1/6 17:24
|
|
* @param inData
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "startProduce")
|
|
public R startProduce(@RequestBody SearchScheduleData inData){
|
|
scheduleService.startProduce(inData);
|
|
return R.ok()
|
|
.put("code", 200)
|
|
.put("success", true)
|
|
.put("msg", "操作成功!");
|
|
}
|
|
|
|
/**
|
|
* TODO 结束调机和开始生产
|
|
* @author LR
|
|
* @date 2022/1/12 14:01
|
|
* @param inMap
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "endTuningAndStartProduce")
|
|
public R endTuningAndStartProduce(@RequestBody Map<String, Object> inMap){
|
|
scheduleService.endTuningAndStartProduce(inMap);
|
|
return R.ok()
|
|
.put("code", 200)
|
|
.put("success", true)
|
|
.put("msg", "操作成功!");
|
|
}
|
|
|
|
/**
|
|
* TODO 工具的使用的数量
|
|
* @author LR
|
|
* @date 2022/1/18 14:10
|
|
* @param inData
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "countToolUsedQty")
|
|
public R countToolUsedQty(@RequestBody SearchScheduleData inData){
|
|
Float usedQty = scheduleService.countToolUsedQty(inData);
|
|
return R.ok()
|
|
.put("code", 200)
|
|
.put("usedQty", usedQty)
|
|
.put("success", true)
|
|
.put("msg", "操作成功!");
|
|
}
|
|
|
|
/**
|
|
* TODO 刀模切换检查
|
|
* @author LR
|
|
* @date 2022/1/19 10:32
|
|
* @param inData
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "checkConnectToolInstanceId")
|
|
public R checkConnectToolInstanceId(@RequestBody SearchScheduleData inData){
|
|
Map<String, Object> resultMap = scheduleService.checkConnectToolInstanceId(inData);
|
|
return R.ok()
|
|
.put("resultMap", resultMap);
|
|
}
|
|
|
|
/**
|
|
* TODO换刀操作
|
|
* @author LR
|
|
* @date 2022/1/19 14:46
|
|
* @param inData
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "connectToolInstanceId")
|
|
public R connectToolInstanceId(@RequestBody SearchScheduleData inData){
|
|
scheduleService.connectToolInstanceId(inData);
|
|
return R.ok()
|
|
.put("code", 200)
|
|
.put("success", true)
|
|
.put("msg", "操作成功!");
|
|
}
|
|
|
|
/**
|
|
* TODO 材料切换检查
|
|
* @author LR
|
|
* @date 2022/1/19 10:32
|
|
* @param inData
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "checkConnectMaterialRoll")
|
|
public R checkConnectMaterialRoll(@RequestBody SearchScheduleData inData){
|
|
Map<String, Object> resultMap = scheduleService.checkConnectMaterialRoll(inData);
|
|
return R.ok()
|
|
.put("resultMap", resultMap);
|
|
}
|
|
|
|
/**
|
|
* TODO 换料操作
|
|
* @author LR
|
|
* @date 2022/1/19 14:46
|
|
* @param inData
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "connectMaterialRoll")
|
|
public R connectMaterialRoll(@RequestBody SearchScheduleData inData){
|
|
scheduleService.connectMaterialRoll(inData);
|
|
return R.ok()
|
|
.put("code", 200)
|
|
.put("success", true)
|
|
.put("msg", "操作成功!");
|
|
}
|
|
|
|
/**
|
|
* @Author LR 结束卷校验--非FQC和最后一道
|
|
* @Description
|
|
* @DateTime 2022/1/25 13:30
|
|
* @Param [inMap]
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "checkFinishRollWithNoFqc")
|
|
public R checkFinishRollWithNoFqc(@RequestBody Map<String, Object> inMap){
|
|
Map<String, Object> resultMap = scheduleService.checkFinishRollWithNoFqc(inMap);
|
|
return R.ok()
|
|
.put("resultMap", resultMap);
|
|
}
|
|
|
|
/**
|
|
* TODO 结束卷操作--非FQC和最后一道
|
|
* @author LR
|
|
* @date 2022/1/19 14:46
|
|
* @param inMap
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "finishRollWithNoFqc")
|
|
public R finishRollWithNoFqc(@RequestBody Map<String, Object> inMap){
|
|
scheduleService.finishRollWithNoFqc(inMap);
|
|
return R.ok()
|
|
.put("code", 200)
|
|
.put("success", true)
|
|
.put("msg", "操作成功!");
|
|
}
|
|
|
|
/**
|
|
* @Author LR
|
|
* @Description 获取关单页面的参数数据
|
|
* @DateTime 2022/2/4 11:07
|
|
* @Param [inData]
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "getFinishSchedulePageData")
|
|
public R getFinishSchedulePageData(@RequestBody SearchScheduleData inData){
|
|
Map<String, Object> resultMap = scheduleService.getFinishSchedulePageData(inData);
|
|
return R.ok()
|
|
.put("resultMap", resultMap);
|
|
}
|
|
|
|
/**
|
|
* @Author LR
|
|
* @Description 获取派工单的时间记录的数据
|
|
* @DateTime 2022/2/4 15:28
|
|
* @Param [inData]
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "getSfdcTimeHistBySeqNo")
|
|
public R getSfdcTimeHistBySeqNo(@RequestBody SearchScheduleData inData) {
|
|
List<SfdcTimeData> resultList = scheduleService.getSfdcTimeHistBySeqNo(inData);
|
|
return R.ok()
|
|
.put("code", 200)
|
|
.put("msg", "操作成功!")
|
|
.put("rows", resultList);
|
|
}
|
|
|
|
/**
|
|
* @Author LR
|
|
* @Description 获取派工单的工具记录的数据
|
|
* @DateTime 2022/2/4 15:29
|
|
* @Param [inData]
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "getSfdcToolHistBySeqNo")
|
|
public R getSfdcToolHistBySeqNo(@RequestBody SearchScheduleData inData) {
|
|
List<SfdcToolData> resultList = scheduleService.getSfdcToolHistBySeqNo(inData);
|
|
return R.ok()
|
|
.put("code", 200)
|
|
.put("msg", "操作成功!")
|
|
.put("rows", resultList);
|
|
}
|
|
|
|
/**
|
|
* @Author LR
|
|
* @Description 获取派工单的材料记录
|
|
* @DateTime 2022/2/4 15:30
|
|
* @Param [inData]
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "getSfdcMaterialHistBySeqNo")
|
|
public R getSfdcMaterialHistBySeqNo(@RequestBody SearchScheduleData inData) {
|
|
List<SfdcMaterialData> resultList = scheduleService.getSfdcMaterialHistBySeqNo(inData);
|
|
return R.ok()
|
|
.put("code", 200)
|
|
.put("msg", "操作成功!")
|
|
.put("rows", resultList);
|
|
}
|
|
|
|
/**
|
|
* @Author LR
|
|
* @Description 派工单结束检查
|
|
* @DateTime 2022/2/8 9:56
|
|
* @Param [inData]
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "checkFinishScheduleWithNoFqc")
|
|
public R checkFinishScheduleWithNoFqc(@RequestBody SearchScheduleData inData) {
|
|
Map<String, Object> resultMap = scheduleService.checkFinishScheduleWithNoFqc(inData);
|
|
return R.ok()
|
|
.put("code", 200)
|
|
.put("msg", "操作成功!")
|
|
.put("resultMap", resultMap);
|
|
}
|
|
/**
|
|
* @Author LR
|
|
* @Description 结束非FQC的派工单
|
|
* @DateTime 2022/2/8 11:24
|
|
* @Param [inData]
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "finishScheduleWithNoFqc")
|
|
public R finishScheduleWithNoFqc(@RequestBody SearchScheduleData inData) {
|
|
scheduleService.finishScheduleWithNoFqc(inData);
|
|
return R.ok()
|
|
.put("code", 200)
|
|
.put("msg", "操作成功!");
|
|
}
|
|
|
|
/**
|
|
* @Author LR
|
|
* @Description 查询校验是否可以下料功能
|
|
* @DateTime 2022/2/15 16:40
|
|
* @Param [inData]
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "checkCuttingMaterial")
|
|
public R checkCuttingMaterial(@RequestBody SearchScheduleData inData) {
|
|
Map<String, Object> resultMap = scheduleService.checkCuttingMaterial(inData);
|
|
return R.ok()
|
|
.put("code", 200)
|
|
.put("msg", "操作成功!")
|
|
.put("resultMap", resultMap);
|
|
}
|
|
|
|
/**
|
|
* @Author LR
|
|
* @Description 处理材料下料功能
|
|
* @DateTime 2022/2/15 17:12
|
|
* @Param [inData]
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "processCuttingMaterialRoll")
|
|
public R processCuttingMaterialRoll(@RequestBody SearchScheduleData inData) {
|
|
scheduleService.processCuttingMaterialRoll(inData);
|
|
return R.ok()
|
|
.put("code", 200)
|
|
.put("msg", "操作成功!");
|
|
}
|
|
|
|
/**
|
|
* TODO 重新打开当前下架卷的数据
|
|
* @author LR
|
|
* @date 2022/2/16 14:24
|
|
* @param inData
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "reopenSfdcRolls")
|
|
public R reopenSfdcRolls(@RequestBody SearchScheduleData inData) {
|
|
scheduleService.reopenSfdcRolls(inData);
|
|
return R.ok()
|
|
.put("code", 200)
|
|
.put("msg", "操作成功!");
|
|
}
|
|
|
|
/**
|
|
* TODO 删除sfdcRolls卷的操作
|
|
* @author LR
|
|
* @date 2022/2/16 16:07
|
|
* @param inData
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "deleteSfdcRolls")
|
|
public R deleteSfdcRolls(@RequestBody SearchScheduleData inData) {
|
|
scheduleService.deleteSfdcRolls(inData);
|
|
return R.ok()
|
|
.put("code", 200)
|
|
.put("msg", "操作成功!");
|
|
}
|
|
|
|
/**
|
|
* TODO 校验切换卷是否可以进行
|
|
* @author LR
|
|
* @date 2022/2/16 17:19
|
|
* @param inData
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "checkSwitchSfdcRoll")
|
|
public R checkSwitchSfdcRoll(@RequestBody SearchScheduleData inData) {
|
|
Map<String, Object> resultMap = scheduleService.checkSwitchSfdcRoll(inData);
|
|
return R.ok()
|
|
.put("code", 200)
|
|
.put("msg", "操作成功!")
|
|
.put("resultMap", resultMap);
|
|
}
|
|
|
|
/**
|
|
* TODO 切换卷操作
|
|
* @author LR
|
|
* @date 2022/2/16 18:25
|
|
* @Param [inData]
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "switchSfdcRoll")
|
|
public R switchSfdcRoll(@RequestBody SearchScheduleData inData) {
|
|
scheduleService.switchSfdcRoll(inData);
|
|
return R.ok()
|
|
.put("code", 200)
|
|
.put("msg", "操作成功!");
|
|
}
|
|
|
|
/**
|
|
* @Author LR
|
|
* @Description 检查是否可以创建分卷
|
|
* @DateTime 2022/2/17 11:45
|
|
* @Param [inData]
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "checkCreateSplitSfdcRoll")
|
|
public R checkCreateSplitSfdcRoll(@RequestBody SearchScheduleData inData) {
|
|
Map<String, Object> resultMap = scheduleService.checkCreateSplitSfdcRoll(inData);
|
|
return R.ok()
|
|
.put("code", 200)
|
|
.put("msg", "操作成功!")
|
|
.put("resultMap", resultMap);
|
|
}
|
|
|
|
/**
|
|
* @Author LR
|
|
* @Description 执行创建分卷的业务逻辑
|
|
* @DateTime 2022/2/17 11:45
|
|
* @Param [inData]
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "createSplitSfdcRoll")
|
|
public R createSplitSfdcRoll(@RequestBody SearchScheduleData inData) {
|
|
scheduleService.createSplitSfdcRoll(inData);
|
|
return R.ok()
|
|
.put("code", 200)
|
|
.put("msg", "操作成功!");
|
|
}
|
|
|
|
/**
|
|
* @Author LR
|
|
* @Description 查询合并卷页面的参数
|
|
* @DateTime 2022/2/17 16:20
|
|
* @Param [inData]
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "getMergeRollPageData")
|
|
public R getMergeRollPageData(@RequestBody SearchScheduleData inData){
|
|
Map<String, Object> resultRow = scheduleService.getMergeRollPageData(inData);
|
|
return R.ok()
|
|
.put("code", 200)
|
|
.put("msg", "操作成功!")
|
|
.put("row", resultRow);
|
|
}
|
|
|
|
/**
|
|
* @Author LR
|
|
* @Description 处理结束工具使用的方法
|
|
* @DateTime 2022/2/18 9:53
|
|
* @Param [inData]
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "processFinishTool")
|
|
public R processFinishTool(@RequestBody SearchScheduleData inData){
|
|
scheduleService.processFinishTool(inData);
|
|
return R.ok()
|
|
.put("code", 200)
|
|
.put("msg", "操作成功!");
|
|
}
|
|
|
|
/**
|
|
* @Author LR
|
|
* @Description 材料卷结束使用 且没有剩余
|
|
* @DateTime 2022/2/18 10:50
|
|
* @Param [inData]
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "processFinishMaterialWithNoRemainder")
|
|
public R processFinishMaterialWithNoRemainder(@RequestBody SearchScheduleData inData){
|
|
scheduleService.processFinishMaterialWithNoRemainder(inData);
|
|
return R.ok()
|
|
.put("code", 200)
|
|
.put("msg", "操作成功!");
|
|
}
|
|
|
|
|
|
/**
|
|
* @Author LR
|
|
* @Description 产量报告 --检查报告一部分卷数量
|
|
* @DateTime 2022/2/18 17:31
|
|
* @Param [inMap]
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "checkFinishPartRollWithNoFqc")
|
|
public R checkFinishPartRollWithNoFqc(@RequestBody Map<String, Object> inMap){
|
|
Map<String, Object> resultMap = scheduleService.checkFinishPartRollWithNoFqc(inMap);
|
|
return R.ok()
|
|
.put("resultMap", resultMap);
|
|
}
|
|
|
|
/**
|
|
* @Author LR
|
|
* @Description 产量报告 --提前报告一部分卷数量
|
|
* @DateTime 2022/2/18 17:31
|
|
* @Param [inMap]
|
|
* @return com.gaotao.common.utils.R
|
|
**/
|
|
@RequestMapping(value = "finishPartRollWithNoFqc")
|
|
public R finishPartRollWithNoFqc(@RequestBody Map<String, Object> inMap){
|
|
scheduleService.finishPartRollWithNoFqc(inMap);
|
|
return R.ok()
|
|
.put("code", 200)
|
|
.put("success", true)
|
|
.put("msg", "操作成功!");
|
|
}
|
|
|
|
|
|
}
|