From c5866a95c6268bc4ccb38157b6dd9b6a113684f6 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Mon, 25 Sep 2023 23:45:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E6=8C=81=E6=8E=A5=E5=8F=A3+=E8=AE=A2?= =?UTF-8?q?=E5=8D=95bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/op/mes/controller/PDAController.java | 57 +++ .../controller/WCSInterfaceController.java | 4 +- .../op/mes/domain/dto/BaseEquipmentDto.java | 454 ++++++++++++++++++ .../java/com/op/mes/mapper/MesMapper.java | 4 + .../op/mes/service/IWCSInterfaceService.java | 10 +- .../java/com/op/mes/service/PDAService.java | 19 + .../service/impl/IWCInterfaceServiceImpl.java | 2 + .../op/mes/service/impl/PDAServiceImpl.java | 54 +++ .../main/resources/mapper/mes/MesMapper.xml | 55 +++ .../java/com/op/plan/domain/ProOrder.java | 10 +- .../service/impl/ProOrderServiceImpl.java | 12 +- .../impl/ProOrderWorkorderServiceImpl.java | 1 + .../resources/mapper/plan/ProOrderMapper.xml | 6 +- .../op/quality/controller/QuaController.java | 2 +- op-modules/op-sap/op-modules-sap.iml | 2 +- .../resources/mapper/sap/SapBomMapper.xml | 2 +- .../controller/ProRouteController.java | 3 +- 17 files changed, 677 insertions(+), 20 deletions(-) create mode 100644 op-modules/op-mes/src/main/java/com/op/mes/controller/PDAController.java create mode 100644 op-modules/op-mes/src/main/java/com/op/mes/domain/dto/BaseEquipmentDto.java create mode 100644 op-modules/op-mes/src/main/java/com/op/mes/service/PDAService.java create mode 100644 op-modules/op-mes/src/main/java/com/op/mes/service/impl/PDAServiceImpl.java diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/PDAController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/PDAController.java new file mode 100644 index 00000000..902f326c --- /dev/null +++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/PDAController.java @@ -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 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)); + } +} diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/WCSInterfaceController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/WCSInterfaceController.java index ec1bfd24..834db50f 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/controller/WCSInterfaceController.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/WCSInterfaceController.java @@ -5,12 +5,15 @@ import com.op.common.core.web.controller.BaseController; import com.op.common.core.web.domain.AjaxResult; import com.op.common.log.annotation.Log; import com.op.common.log.enums.BusinessType; +import com.op.mes.domain.dto.BaseEquipmentDto; import com.op.system.api.domain.dto.WCSDTO; import com.op.mes.service.IWCSInterfaceService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * 工厂数据库Controller * @@ -41,5 +44,4 @@ public class WCSInterfaceController extends BaseController { } return WCInterfaceService.requestDestinationStations(wcsdto); } - } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/dto/BaseEquipmentDto.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/dto/BaseEquipmentDto.java new file mode 100644 index 00000000..dd3cda1e --- /dev/null +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/dto/BaseEquipmentDto.java @@ -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(); + } +} diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesMapper.java index 1e3b68d7..c228fd7c 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesMapper.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesMapper.java @@ -1,5 +1,6 @@ package com.op.mes.mapper; +import com.op.mes.domain.dto.BaseEquipmentDto; import com.op.system.api.domain.dto.WCSDTO; import com.op.system.api.domain.dto.WCSDataItemsDTO; import org.apache.ibatis.annotations.Mapper; @@ -18,4 +19,7 @@ public interface MesMapper { List getWetPlanDetail(WCSDTO wcsdto); + List getAllEquipments(BaseEquipmentDto baseEquipmentDto); + + int saveRfidWithEquip(BaseEquipmentDto baseEquipmentDto); } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/IWCSInterfaceService.java b/op-modules/op-mes/src/main/java/com/op/mes/service/IWCSInterfaceService.java index d23feb76..f09dd968 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/IWCSInterfaceService.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/IWCSInterfaceService.java @@ -1,6 +1,7 @@ package com.op.mes.service; import com.op.common.core.web.domain.AjaxResult; +import com.op.mes.domain.dto.BaseEquipmentDto; import com.op.system.api.domain.dto.WCSDTO; import java.util.List; @@ -13,13 +14,6 @@ import java.util.List; */ public interface IWCSInterfaceService { -// WCSDTO requestMaterialLoadNo(WCSDTO wcsdto); -// -// WCSDTO loadMaterialCompleted(WCSDTO wcsdto); -// -// WCSDTO requestMaterialUnLoadNo(WCSDTO wcsdto); -// -// WCSDTO stationArrive(WCSDTO wcsdto); - WCSDTO requestDestinationStations(WCSDTO wcsdto); + } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/PDAService.java b/op-modules/op-mes/src/main/java/com/op/mes/service/PDAService.java new file mode 100644 index 00000000..cdaa1d8c --- /dev/null +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/PDAService.java @@ -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 getAllEquipments(BaseEquipmentDto baseEquipmentDto); + + int saveRfidWithEquip(BaseEquipmentDto baseEquipmentDto); +} diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java index 9115f00d..7edfd17b 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java @@ -7,6 +7,7 @@ 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.MesStationArrive; +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; @@ -134,6 +135,7 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { } return dto; } + public static void main(String args[]){ String machinecode1 = "[[\"GX01\",\"LG2\"],[\"GX01\",\"LG3\"],[\"GX02\",\"S1\"],[\"GX02\",\"S2\"],[\"GX03\",\"HF01\"],[\"GX04\",\"SPJ01\"]]"; JSONArray codeArray1 = JSONArray.parseArray(machinecode1); diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/PDAServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/PDAServiceImpl.java new file mode 100644 index 00000000..71a4e331 --- /dev/null +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/PDAServiceImpl.java @@ -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 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); + } + +} diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml index 85b585b3..36aa133d 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml @@ -3,6 +3,42 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + + insert into mes_next_machine + + record_id, + rfid, + next_machine_code, + status, + remark, + attr1, + attr2, + attr3, + attr4, + create_by, + create_time, + update_by, + update_time, + factory_code, + + + #{recordId}, + #{rfid}, + #{nextMachineCode}, + #{status}, + #{remark}, + #{attr1}, + #{attr2}, + #{attr3}, + #{attr4}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{factoryCode}, + + + + diff --git a/op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrder.java b/op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrder.java index 282f3de9..41f5d641 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrder.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrder.java @@ -61,7 +61,7 @@ public class ProOrder extends TreeEntity { private String workerOrder; private String bomBo; - + private String syncUser; public String getBomBo() { return bomBo; } @@ -150,6 +150,14 @@ public class ProOrder extends TreeEntity { this.carNum = carNum; } + public String getSyncUser() { + return syncUser; + } + + public void setSyncUser(String syncUser) { + this.syncUser = syncUser; + } + @Override public Date getCreateTime() { return createTime; diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java index e6f20f83..0b5ea938 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java @@ -219,6 +219,7 @@ public class ProOrderServiceImpl implements IProOrderService { wetDetail.setPlanTime(splitOrderDTO.getProductDate()); wetDetail.setCreateBy(SecurityUtils.getUsername()); wetDetail.setCreateTime(DateUtils.getNowDate()); + wetDetail.setStatus("N"); //获取当前所选工厂 HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); String key = "#header.poolName"; @@ -440,18 +441,20 @@ public class ProOrderServiceImpl implements IProOrderService { List newOrders = rSapProOrder.getData(); - syncSAPFunc(newOrders); + syncSAPFunc(newOrders,SecurityUtils.getUsername()); return success(); } - public String syncSAPFunc(List newOrders){ + public String syncSAPFunc(List newOrders,String syncUser){ String failOrder = ""; ProOrder proOrder = null; for (SapProOrder sapProOrder:newOrders) { //工单生产后整个订单就被锁定//订单存在就更新，不存在就插入 proOrder = new ProOrder(); BeanUtils.copyProperties(sapProOrder, proOrder); + proOrder.setSyncUser(syncUser); + proOrder.setProdType("prod");//只有白坯有导入 failOrder += syncFunc(proOrder); } return failOrder; @@ -460,6 +463,7 @@ public class ProOrderServiceImpl implements IProOrderService { public String syncImportFunc(List newOrders){ String failOrder = ""; for (ProOrder proOrder:newOrders) { + proOrder.setProdType("white");//只有白坯有导入 failOrder += syncFunc(proOrder)+","; } return failOrder; @@ -472,8 +476,6 @@ public class ProOrderServiceImpl implements IProOrderService { ProOrder orderExit = proOrderMapper.selectProOrderByOrderCode(proOrder.getOrderCode()); if (orderExit==null) {//不存在就插入 proOrder.setId(IdUtils.fastSimpleUUID()); - //proOrder.setCreateTime(nowDate); - proOrder.setCreateBy(SecurityUtils.getUsername()); proOrderMapper.insertProOrder(proOrder); } else {//存在，如果没活动更新，否则不允许更新，关闭订单 proOrder.setId(orderExit.getId()); @@ -703,7 +705,7 @@ public class ProOrderServiceImpl implements IProOrderService { if(CollectionUtils.isEmpty(newOrders)){ logger.error("无"+sapqo.getErdat()+"之后的最新订单"); } - syncSAPFunc(newOrders); + syncSAPFunc(newOrders,"Job"); } /** diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java index 46674a83..78b9c450 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java @@ -674,6 +674,7 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService { wetDetail.setPlanTime(splitOrderDTO.getProductDate()); wetDetail.setCreateBy(SecurityUtils.getUsername()); wetDetail.setCreateTime(DateUtils.getNowDate()); + wetDetail.setStatus("N"); //获取当前所选工厂 HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); String key = "#header.poolName"; diff --git a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderMapper.xml b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderMapper.xml index 8b01596f..e51f9e40 100644 --- a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderMapper.xml +++ b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderMapper.xml @@ -223,7 +223,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" prod_type, prod_spc, car_num, - sync_time, + sync_user, + from_sap_time, #{id}, @@ -251,6 +252,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{prodType}, #{prodSpc}, #{carNum}, + #{syncUser}, GETDATE(), @@ -281,6 +283,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time = #{updateTime}, prod_type = #{prodType}, prod_spc = #{prodSpc}, + from_sap_time = GETDATE(), + sync_user = #{syncUser}, where id = #{id} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java index f0acbc2a..e2fb989b 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java @@ -70,7 +70,7 @@ public class QuaController extends BaseController { /** - * 获取烘房下拉列表 + * 获取字典下拉列表 */ @GetMapping(value = "getDictList") public AjaxResult getDictList(QcProCheck qcProCheck) { diff --git a/op-modules/op-sap/op-modules-sap.iml b/op-modules/op-sap/op-modules-sap.iml index 48dfc644..d18e0495 100644 --- a/op-modules/op-sap/op-modules-sap.iml +++ b/op-modules/op-sap/op-modules-sap.iml @@ -216,7 +216,7 @@ - + diff --git a/op-modules/op-sap/src/main/resources/mapper/sap/SapBomMapper.xml b/op-modules/op-sap/src/main/resources/mapper/sap/SapBomMapper.xml index fc0875c5..0226dbc3 100644 --- a/op-modules/op-sap/src/main/resources/mapper/sap/SapBomMapper.xml +++ b/op-modules/op-sap/src/main/resources/mapper/sap/SapBomMapper.xml @@ -66,7 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by production_version desc