From d19159a2f3d965a606d39c07ac97b13d6e2bca6b Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 12 Oct 2023 14:53:45 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E6=8E=A5=E5=8F=A32?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WCSInterfaceController.java | 22 ++++ .../java/com/op/mes/domain/dto/LGInfoDto.java | 104 ++++++++++++++++++ .../java/com/op/mes/mapper/MesMapper.java | 4 + .../op/mes/service/IWCSInterfaceService.java | 3 + .../service/impl/IWCInterfaceServiceImpl.java | 14 +++ .../main/resources/mapper/mes/MesMapper.xml | 22 +++- 6 files changed, 167 insertions(+), 2 deletions(-) create mode 100644 op-modules/op-mes/src/main/java/com/op/mes/domain/dto/LGInfoDto.java 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 f6b1216a1..9c04657a2 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 @@ -7,11 +7,13 @@ 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.mes.domain.dto.LGInfoDto; import com.op.system.api.domain.dto.BoardDTO; import com.op.system.api.domain.dto.WCSDTO; import com.op.mes.service.IWCSInterfaceService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -55,6 +57,18 @@ public class WCSInterfaceController extends BaseController { return success(WCInterfaceService.requestDestinationStations(wcsdto)); } + @Log(title = "获取料罐用量", businessType = BusinessType.GRANT) + @PostMapping("/saveLGusedLog") + public AjaxResult saveLGusedLog(@RequestBody List lgdtos) { + if(CollectionUtils.isEmpty(lgdtos)){ + return error("参数信息为空"); + } + if(StringUtils.isNotBlank(lgdtos.get(0).getFactoryCode())){ + return error("工厂信息为空"); + } + return success(WCInterfaceService.saveLGusedLog(lgdtos)); + } + /** * MES看板 */ @@ -72,6 +86,14 @@ public class WCSInterfaceController extends BaseController { if(StringUtils.isEmpty(boardDTO.getYmd())){ boardDTO.setYmd(DateUtils.getDate()); } + + if(StringUtils.isEmpty(boardDTO.getEquTypeCode())){ + return error("[equTypeCode] is not null"); + } return success(WCInterfaceService.getMesBoardEquProductionToday(boardDTO)); } + + public static void main(String args[]){ + System.out.println(DateUtils.getDate()); + } } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/dto/LGInfoDto.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/dto/LGInfoDto.java new file mode 100644 index 000000000..b6d1a0b5d --- /dev/null +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/dto/LGInfoDto.java @@ -0,0 +1,104 @@ +package com.op.mes.domain.dto; + +import java.util.Date; +import java.util.List; + +/** + * 料罐接口数据 + * + * @author Open Platform + * @date 2023-07-03 + */ +public class LGInfoDto { + + private String deviceCode; + private String deviceName; + private String id; + private String used; + private String usedUnit; + private String createDate; + private Date lgCreateTime; + private Date createTime; + private String factoryCode; + private String delFlag; + + public Date getLgCreateTime() { + return lgCreateTime; + } + + public void setLgCreateTime(Date lgCreateTime) { + this.lgCreateTime = lgCreateTime; + } + + public String getCreateDate() { + return createDate; + } + + public void setCreateDate(String createDate) { + this.createDate = createDate; + } + + public String getDeviceCode() { + return deviceCode; + } + + public void setDeviceCode(String deviceCode) { + this.deviceCode = deviceCode; + } + + public String getUsed() { + return used; + } + + public void setUsed(String used) { + this.used = used; + } + + public String getUsedUnit() { + return usedUnit; + } + + public void setUsedUnit(String usedUnit) { + this.usedUnit = usedUnit; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public String getFactoryCode() { + return factoryCode; + } + + public void setFactoryCode(String factoryCode) { + this.factoryCode = factoryCode; + } + + public String getDelFlag() { + return delFlag; + } + + public void setDelFlag(String delFlag) { + this.delFlag = delFlag; + } + + public String getDeviceName() { + return deviceName; + } + + public void setDeviceName(String deviceName) { + this.deviceName = deviceName; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } +} 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 f32158f44..ce5353788 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,11 +1,13 @@ package com.op.mes.mapper; import com.op.mes.domain.dto.BaseEquipmentDto; +import com.op.mes.domain.dto.LGInfoDto; import com.op.system.api.domain.SysDept; import com.op.system.api.domain.dto.BoardDTO; import com.op.system.api.domain.dto.WCSDTO; import com.op.system.api.domain.dto.WCSDataItemsDTO; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -30,4 +32,6 @@ public interface MesMapper { List getEveryNum(BoardDTO boardDTO); List getBoardFactory(BoardDTO boardDTO); + + int addBatchLGInfo(@Param("list") List lgdtos); } 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 a1bfd1e32..9c74e4be4 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 @@ -2,6 +2,7 @@ package com.op.mes.service; import com.op.common.core.web.domain.AjaxResult; import com.op.mes.domain.dto.BaseEquipmentDto; +import com.op.mes.domain.dto.LGInfoDto; import com.op.system.api.domain.SysDept; import com.op.system.api.domain.dto.BoardDTO; import com.op.system.api.domain.dto.WCSDTO; @@ -22,4 +23,6 @@ public interface IWCSInterfaceService { Map getMesBoardEquProductionToday(BoardDTO boardDTO); List getBoardFactory(BoardDTO boardDTO); + + String saveLGusedLog(List lgdtos); } 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 aecdfd31d..490efdbe3 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 @@ -8,6 +8,7 @@ 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.domain.dto.LGInfoDto; import com.op.mes.mapper.MesMapper; import com.op.mes.mapper.MesStationArriveMapper; import com.op.mes.mapper.ProRfidProcessDetailMapper; @@ -162,6 +163,19 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { return mesMapper.getBoardFactory(boardDTO); } + @Override + public String saveLGusedLog(List lgdtos) { + DynamicDataSourceContextHolder.push("ds_"+lgdtos.get(0).getFactoryCode());// 这是数据源的key + Date nowTime = DateUtils.getNowDate(); + for(LGInfoDto lgdto:lgdtos){ + lgdto.setId(IdUtils.simpleUUID()); + lgdto.setCreateTime(nowTime); + } + int saveNum = mesMapper.addBatchLGInfo(lgdtos); + + return "保存成功条数："+saveNum; + } + public static void main(String args[]){ System.out.println(DateUtils.getDate()); 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 785a10f5c..136e73d90 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 @@ -39,6 +39,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{factoryCode}, + + insert into pro_lg_used_log( + id,device_code, + used,used_unit, + createDate,lg_create_time, + factory_code,create_time + ) values + + ( + #{item.id},#{item.deviceCode}, + #{item.used},#{item.usedUnit}, + #{item.createDate},#{item.lgCreateTime}, + #{item.factoryCode},#{item.createTime}, + ) + + @@ -84,7 +101,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" equ.equipment_type_code equTypeCode from mes_material_transfer_result mt left join base_equipment equ on mt.equipmentCode = equ.equipment_code - where CONVERT(varchar(10),mt.create_time, 120) = #{ymd} and equ.equipment_name is not null + where CONVERT(varchar(10),mt.update_time, 120) = #{ymd} and equ.equipment_name is not null + and equ.equipment_type_code = #{equTypeCode} group by mt.equipmentCode, equ.equipment_name, equ.equipment_type_code