手持接口+订单bug修复
zhaoxiaolin
1 year ago
parent
5fc7a1e415
commit
c5866a95c6
@ -0,0 +1,57 @@
|
||||
package com.op.mes.controller;
|
||||
|
||||
import com.op.common.core.utils.StringUtils;
|
||||
import com.op.common.core.web.controller.BaseController;
|
||||
import com.op.common.core.web.domain.AjaxResult;
|
||||
import com.op.mes.domain.ProEmbryoScrap;
|
||||
import com.op.mes.domain.dto.BaseEquipmentDto;
|
||||
import com.op.mes.service.PDAService;
|
||||
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.util.List;
|
||||
|
||||
/**
|
||||
* 工厂数据库Controller
|
||||
*
|
||||
* @author sf
|
||||
* @date 2023-05-18
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/pda")
|
||||
public class PDAController extends BaseController {
|
||||
|
||||
@Autowired
|
||||
private PDAService pdaService;
|
||||
|
||||
/**
|
||||
* 手持人工进行下一机台设备列表
|
||||
*/
|
||||
@PostMapping("/getAllEquipments")
|
||||
public List<BaseEquipmentDto> getAllEquipments(@RequestBody BaseEquipmentDto baseEquipmentDto) {
|
||||
if(StringUtils.isBlank(baseEquipmentDto.getFactoryCode())){
|
||||
return null;
|
||||
}
|
||||
return pdaService.getAllEquipments(baseEquipmentDto);
|
||||
}
|
||||
|
||||
/**
|
||||
* 提交rfid和设备的绑定关系
|
||||
* @param baseEquipmentDto
|
||||
* @return
|
||||
*/
|
||||
@PostMapping("/saveRfidWithEquip")
|
||||
public AjaxResult saveRfidWithEquip(@RequestBody BaseEquipmentDto baseEquipmentDto) {
|
||||
if(StringUtils.isBlank(baseEquipmentDto.getFactoryCode())){
|
||||
return error("[factoryCode]不能为空");
|
||||
}
|
||||
if(StringUtils.isBlank(baseEquipmentDto.getEquipmentCode())){
|
||||
return error("[equipmentCode]不能为空");
|
||||
}
|
||||
|
||||
return toAjax(pdaService.saveRfidWithEquip(baseEquipmentDto));
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,454 @@
|
||||
package com.op.mes.domain.dto;
|
||||
|
||||
import com.op.common.core.annotation.Excel;
|
||||
import com.op.common.core.web.domain.BaseEntity;
|
||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||
|
||||
/**
|
||||
* 设备管理对象 base_equipment
|
||||
*
|
||||
* @author Open Platform
|
||||
* @date 2023-07-20
|
||||
*/
|
||||
public class BaseEquipmentDto extends BaseEntity {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** 设备类型ID */
|
||||
private Long equipmentId;
|
||||
|
||||
/** 设备类型编码 */
|
||||
@Excel(name = "设备类型编码")
|
||||
private String equipmentCode;
|
||||
|
||||
private String recordId;
|
||||
private String rfidNo;
|
||||
|
||||
/** 设备类型名称 */
|
||||
@Excel(name = "设备类型名称")
|
||||
private String equipmentName;
|
||||
|
||||
/** 品牌 */
|
||||
@Excel(name = "品牌")
|
||||
private String equipmentBrand;
|
||||
|
||||
/** 规格型号 */
|
||||
@Excel(name = "规格型号")
|
||||
private String equipmentSpec;
|
||||
|
||||
/** 设备类型ID */
|
||||
@Excel(name = "设备类型ID")
|
||||
private Long equipmentTypeId;
|
||||
|
||||
/** 设备类型编码 */
|
||||
@Excel(name = "设备类型编码")
|
||||
private String equipmentTypeCode;
|
||||
|
||||
/** 设备类型名称 */
|
||||
@Excel(name = "设备类型名称")
|
||||
private String equipmentTypeName;
|
||||
|
||||
/** 所属车间ID */
|
||||
@Excel(name = "所属车间ID")
|
||||
private Long workshopId;
|
||||
|
||||
/** 所属车间编码 */
|
||||
@Excel(name = "所属车间编码")
|
||||
private String workshopCode;
|
||||
|
||||
/** 所属车间名称 */
|
||||
@Excel(name = "所属车间名称")
|
||||
private String workshopName;
|
||||
|
||||
/** 设备状态 */
|
||||
@Excel(name = "设备状态")
|
||||
private String status;
|
||||
|
||||
/** 预留字段1 */
|
||||
@Excel(name = "预留字段1")
|
||||
private String attr1;
|
||||
|
||||
/** 预留字段2 */
|
||||
@Excel(name = "预留字段2")
|
||||
private String attr2;
|
||||
|
||||
/** 预留字段3 */
|
||||
@Excel(name = "预留字段3")
|
||||
private Long attr3;
|
||||
|
||||
/** 预留字段4 */
|
||||
@Excel(name = "预留字段4")
|
||||
private Long attr4;
|
||||
|
||||
/** 单台能力工时 */
|
||||
@Excel(name = "单台能力工时")
|
||||
private String unitWorkingHours;
|
||||
|
||||
/** 工段 */
|
||||
@Excel(name = "工段")
|
||||
private String workshopSection;
|
||||
|
||||
/** 设备位置 */
|
||||
@Excel(name = "设备位置")
|
||||
private String equipmentLocation;
|
||||
|
||||
/** 工时单价 */
|
||||
@Excel(name = "工时单价")
|
||||
private String hourlyUnitPrice;
|
||||
|
||||
//附属字段
|
||||
/** 成型机存料状态 */
|
||||
@Excel(name = "成型机存料状态")
|
||||
private String starving;
|
||||
|
||||
/** 该成型机存放的物料 */
|
||||
@Excel(name = "该成型机存放的物料")
|
||||
private String material;
|
||||
|
||||
/** 烘房是否开门 */
|
||||
@Excel(name = "烘房是否开门")
|
||||
private String isOpen;
|
||||
|
||||
/** 烘房2门前小车数量 */
|
||||
@Excel(name = "烘房2门前小车数量")
|
||||
private String dollyNumber;
|
||||
|
||||
/** 烘房温度 */
|
||||
@Excel(name = "烘房温度")
|
||||
private String temperature;
|
||||
|
||||
/** 烘房压强 */
|
||||
@Excel(name = "烘房压强")
|
||||
private String intensityOfPressure;
|
||||
|
||||
/** 烘房湿度 */
|
||||
@Excel(name = "烘房湿度")
|
||||
private String humidity;
|
||||
|
||||
/** 烘房状态 */
|
||||
@Excel(name = "烘房状态")
|
||||
private String state;
|
||||
|
||||
/** 删除标志 */
|
||||
@Excel(name = "删除标志")
|
||||
private String delFlag;
|
||||
|
||||
/** 属性 */
|
||||
@Excel(name = "属性")
|
||||
private String property;
|
||||
|
||||
/** 说明 */
|
||||
@Excel(name = "说明")
|
||||
private String explain;
|
||||
|
||||
/** IP */
|
||||
@Excel(name = "IP")
|
||||
private String plcIp;
|
||||
|
||||
/** 端口号 */
|
||||
@Excel(name = "端口号")
|
||||
private String plcPort;
|
||||
|
||||
public String getRfidNo() {
|
||||
return rfidNo;
|
||||
}
|
||||
|
||||
public void setRfidNo(String rfidNo) {
|
||||
this.rfidNo = rfidNo;
|
||||
}
|
||||
|
||||
private String factoryCode;
|
||||
|
||||
public String getRecordId() {
|
||||
return recordId;
|
||||
}
|
||||
|
||||
public void setRecordId(String recordId) {
|
||||
this.recordId = recordId;
|
||||
}
|
||||
|
||||
public String getFactoryCode() {
|
||||
return factoryCode;
|
||||
}
|
||||
|
||||
public void setFactoryCode(String factoryCode) {
|
||||
this.factoryCode = factoryCode;
|
||||
}
|
||||
|
||||
public void setPlcIp(String plcIp) {
|
||||
this.plcIp = plcIp;
|
||||
}
|
||||
public String getPlcIp() {
|
||||
return plcIp;
|
||||
}
|
||||
|
||||
public void setPlcPort(String plcPort) {
|
||||
this.plcPort = plcPort;
|
||||
}
|
||||
public String getPlcPort() {
|
||||
return plcPort;
|
||||
}
|
||||
|
||||
public void setExplain(String explain) {
|
||||
this.explain = explain;
|
||||
}
|
||||
public String getExplain() {
|
||||
return explain;
|
||||
}
|
||||
|
||||
public void setProperty(String property) {
|
||||
this.property = property;
|
||||
}
|
||||
public String getProperty() {
|
||||
return property;
|
||||
}
|
||||
|
||||
public void setDelFlag(String delFlag) {
|
||||
this.delFlag = delFlag;
|
||||
}
|
||||
public String getDelFlag() {
|
||||
return delFlag;
|
||||
}
|
||||
|
||||
public void setStarving(String starving) {
|
||||
this.starving = starving;
|
||||
}
|
||||
public String getStarving() {
|
||||
return starving;
|
||||
}
|
||||
|
||||
public void setMaterial(String material) {
|
||||
this.material = material;
|
||||
}
|
||||
public String getMaterial() {
|
||||
return material;
|
||||
}
|
||||
|
||||
public void setIsOpen(String isOpen) {
|
||||
this.isOpen = isOpen;
|
||||
}
|
||||
public String getIsOpen() {
|
||||
return isOpen;
|
||||
}
|
||||
|
||||
public void setDollyNumber(String dollyNumber) {
|
||||
this.dollyNumber = dollyNumber;
|
||||
}
|
||||
public String getDollyNumber() {
|
||||
return dollyNumber;
|
||||
}
|
||||
|
||||
public void setTemperature(String temperature) {
|
||||
this.temperature = temperature;
|
||||
}
|
||||
public String getTemperature() {
|
||||
return temperature;
|
||||
}
|
||||
|
||||
public void setIntensityOfPressure(String intensityOfPressure) {
|
||||
this.intensityOfPressure = intensityOfPressure;
|
||||
}
|
||||
public String getIntensityOfPressure() {
|
||||
return intensityOfPressure;
|
||||
}
|
||||
|
||||
public void setHumidity(String humidity) {
|
||||
this.humidity = humidity;
|
||||
}
|
||||
public String getHumidity() {
|
||||
return humidity;
|
||||
}
|
||||
|
||||
public void setState(String state) {
|
||||
this.state = state;
|
||||
}
|
||||
public String getState() {
|
||||
return state;
|
||||
}
|
||||
|
||||
public void setEquipmentId(Long equipmentId) {
|
||||
this.equipmentId = equipmentId;
|
||||
}
|
||||
|
||||
public Long getEquipmentId() {
|
||||
return equipmentId;
|
||||
}
|
||||
public void setEquipmentCode(String equipmentCode) {
|
||||
this.equipmentCode = equipmentCode;
|
||||
}
|
||||
|
||||
public String getEquipmentCode() {
|
||||
return equipmentCode;
|
||||
}
|
||||
public void setEquipmentName(String equipmentName) {
|
||||
this.equipmentName = equipmentName;
|
||||
}
|
||||
|
||||
public String getEquipmentName() {
|
||||
return equipmentName;
|
||||
}
|
||||
public void setEquipmentBrand(String equipmentBrand) {
|
||||
this.equipmentBrand = equipmentBrand;
|
||||
}
|
||||
|
||||
public String getEquipmentBrand() {
|
||||
return equipmentBrand;
|
||||
}
|
||||
public void setEquipmentSpec(String equipmentSpec) {
|
||||
this.equipmentSpec = equipmentSpec;
|
||||
}
|
||||
|
||||
public String getEquipmentSpec() {
|
||||
return equipmentSpec;
|
||||
}
|
||||
public void setEquipmentTypeId(Long equipmentTypeId) {
|
||||
this.equipmentTypeId = equipmentTypeId;
|
||||
}
|
||||
|
||||
public Long getEquipmentTypeId() {
|
||||
return equipmentTypeId;
|
||||
}
|
||||
public void setEquipmentTypeCode(String equipmentTypeCode) {
|
||||
this.equipmentTypeCode = equipmentTypeCode;
|
||||
}
|
||||
|
||||
public String getEquipmentTypeCode() {
|
||||
return equipmentTypeCode;
|
||||
}
|
||||
public void setEquipmentTypeName(String equipmentTypeName) {
|
||||
this.equipmentTypeName = equipmentTypeName;
|
||||
}
|
||||
|
||||
public String getEquipmentTypeName() {
|
||||
return equipmentTypeName;
|
||||
}
|
||||
public void setWorkshopId(Long workshopId) {
|
||||
this.workshopId = workshopId;
|
||||
}
|
||||
|
||||
public Long getWorkshopId() {
|
||||
return workshopId;
|
||||
}
|
||||
public void setWorkshopCode(String workshopCode) {
|
||||
this.workshopCode = workshopCode;
|
||||
}
|
||||
|
||||
public String getWorkshopCode() {
|
||||
return workshopCode;
|
||||
}
|
||||
public void setWorkshopName(String workshopName) {
|
||||
this.workshopName = workshopName;
|
||||
}
|
||||
|
||||
public String getWorkshopName() {
|
||||
return workshopName;
|
||||
}
|
||||
public void setStatus(String status) {
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
public void setAttr1(String attr1) {
|
||||
this.attr1 = attr1;
|
||||
}
|
||||
|
||||
public String getAttr1() {
|
||||
return attr1;
|
||||
}
|
||||
public void setAttr2(String attr2) {
|
||||
this.attr2 = attr2;
|
||||
}
|
||||
|
||||
public String getAttr2() {
|
||||
return attr2;
|
||||
}
|
||||
public void setAttr3(Long attr3) {
|
||||
this.attr3 = attr3;
|
||||
}
|
||||
|
||||
public Long getAttr3() {
|
||||
return attr3;
|
||||
}
|
||||
public void setAttr4(Long attr4) {
|
||||
this.attr4 = attr4;
|
||||
}
|
||||
|
||||
public Long getAttr4() {
|
||||
return attr4;
|
||||
}
|
||||
public void setUnitWorkingHours(String unitWorkingHours) {
|
||||
this.unitWorkingHours = unitWorkingHours;
|
||||
}
|
||||
|
||||
public String getUnitWorkingHours() {
|
||||
return unitWorkingHours;
|
||||
}
|
||||
public void setWorkshopSection(String workshopSection) {
|
||||
this.workshopSection = workshopSection;
|
||||
}
|
||||
|
||||
public String getWorkshopSection() {
|
||||
return workshopSection;
|
||||
}
|
||||
public void setEquipmentLocation(String equipmentLocation) {
|
||||
this.equipmentLocation = equipmentLocation;
|
||||
}
|
||||
|
||||
public String getEquipmentLocation() {
|
||||
return equipmentLocation;
|
||||
}
|
||||
public void setHourlyUnitPrice(String hourlyUnitPrice) {
|
||||
this.hourlyUnitPrice = hourlyUnitPrice;
|
||||
}
|
||||
|
||||
public String getHourlyUnitPrice() {
|
||||
return hourlyUnitPrice;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||
.append("equipmentId", getEquipmentId())
|
||||
.append("equipmentCode", getEquipmentCode())
|
||||
.append("equipmentName", getEquipmentName())
|
||||
.append("equipmentBrand", getEquipmentBrand())
|
||||
.append("equipmentSpec", getEquipmentSpec())
|
||||
.append("equipmentTypeId", getEquipmentTypeId())
|
||||
.append("equipmentTypeCode", getEquipmentTypeCode())
|
||||
.append("equipmentTypeName", getEquipmentTypeName())
|
||||
.append("workshopId", getWorkshopId())
|
||||
.append("workshopCode", getWorkshopCode())
|
||||
.append("workshopName", getWorkshopName())
|
||||
.append("status", getStatus())
|
||||
.append("remark", getRemark())
|
||||
.append("attr1", getAttr1())
|
||||
.append("attr2", getAttr2())
|
||||
.append("attr3", getAttr3())
|
||||
.append("attr4", getAttr4())
|
||||
.append("createBy", getCreateBy())
|
||||
.append("createTime", getCreateTime())
|
||||
.append("updateBy", getUpdateBy())
|
||||
.append("updateTime", getUpdateTime())
|
||||
.append("unitWorkingHours", getUnitWorkingHours())
|
||||
.append("workshopSection", getWorkshopSection())
|
||||
.append("equipmentLocation", getEquipmentLocation())
|
||||
.append("hourlyUnitPrice", getHourlyUnitPrice())
|
||||
.append("delFlag", getDelFlag())
|
||||
|
||||
.append("humidity", getHumidity())
|
||||
.append("intensityOfPressure", getIntensityOfPressure())
|
||||
.append("starving", getStarving())
|
||||
.append("humidity", getHumidity())
|
||||
.append("temperature", getTemperature())
|
||||
.append("starving", getStarving())
|
||||
.append("material", getMaterial())
|
||||
.append("isOpen", getIsOpen())
|
||||
.append("property", getProperty())
|
||||
.append("explain", getExplain())
|
||||
.append("plcIp", getPlcIp())
|
||||
.append("plcPort", getPlcPort())
|
||||
.toString();
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,19 @@
|
||||
package com.op.mes.service;
|
||||
|
||||
import com.op.mes.domain.dto.BaseEquipmentDto;
|
||||
import com.op.system.api.domain.dto.WCSDTO;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* pda Service接口
|
||||
*
|
||||
* @author Open Platform
|
||||
* @date 2023-07-13
|
||||
*/
|
||||
public interface PDAService {
|
||||
|
||||
List<BaseEquipmentDto> getAllEquipments(BaseEquipmentDto baseEquipmentDto);
|
||||
|
||||
int saveRfidWithEquip(BaseEquipmentDto baseEquipmentDto);
|
||||
}
|
||||
@ -0,0 +1,54 @@
|
||||
package com.op.mes.service.impl;
|
||||
|
||||
import com.alibaba.fastjson2.JSONArray;
|
||||
import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
|
||||
import com.op.common.core.utils.DateUtils;
|
||||
import com.op.common.core.utils.bean.BeanUtils;
|
||||
import com.op.common.core.utils.uuid.IdUtils;
|
||||
import com.op.common.security.utils.SecurityUtils;
|
||||
import com.op.mes.domain.dto.BaseEquipmentDto;
|
||||
import com.op.mes.mapper.MesMapper;
|
||||
import com.op.mes.mapper.MesStationArriveMapper;
|
||||
import com.op.mes.mapper.ProRfidProcessDetailMapper;
|
||||
import com.op.mes.service.IWCSInterfaceService;
|
||||
import com.op.mes.service.PDAService;
|
||||
import com.op.system.api.domain.dto.WCSDTO;
|
||||
import com.op.system.api.domain.dto.WCSDataDTO;
|
||||
import com.op.system.api.domain.mes.ProRfidProcessDetail;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* wcs接口业务层处理
|
||||
*
|
||||
* @author Open Platform
|
||||
* @date 2023-07-13
|
||||
*/
|
||||
@Service
|
||||
public class PDAServiceImpl implements PDAService {
|
||||
|
||||
@Autowired
|
||||
private MesMapper mesMapper;
|
||||
|
||||
@Override
|
||||
public List<BaseEquipmentDto> getAllEquipments(BaseEquipmentDto baseEquipmentDto) {
|
||||
DynamicDataSourceContextHolder.push("ds_" + baseEquipmentDto.getFactoryCode());
|
||||
return mesMapper.getAllEquipments(baseEquipmentDto);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int saveRfidWithEquip(BaseEquipmentDto baseEquipmentDto) {
|
||||
DynamicDataSourceContextHolder.push("ds_" + baseEquipmentDto.getFactoryCode());
|
||||
baseEquipmentDto.setRecordId(IdUtils.fastSimpleUUID());
|
||||
baseEquipmentDto.setCreateBy(SecurityUtils.getUsername());
|
||||
baseEquipmentDto.setCreateTime(DateUtils.getNowDate());
|
||||
return mesMapper.saveRfidWithEquip(baseEquipmentDto);
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Reference in New Issue