From fbd9703421e94bd9669695c6611dcc5f50e2eb5e Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Tue, 26 Mar 2024 17:40:54 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E6=9B=B4=E6=96=B0remark?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/op/mes/domain/MesReportWork.java | 8 ++++---- .../main/java/com/op/mes/mapper/MesReportWorkMapper.java | 2 ++ .../op/mes/service/impl/MesReportWorkServiceImpl.java | 4 +++- .../main/resources/mapper/mes/MesReportWorkMapper.xml | 9 +++++++-- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWork.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWork.java index 468fe2f5..4d2c1129 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWork.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWork.java @@ -179,10 +179,10 @@ public class MesReportWork extends BaseEntity { private String routeCode; private String sac1; private String sac2; - private String sac3; - private String sac4; - private String sac5; - private String sac6; + private String sac3; + private String sac4; + private String sac5; + private String sac6; private String prodType; private String createTimeStart; private String createTimeEnd; diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java index 0aa76436..8a406f0f 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java @@ -144,4 +144,6 @@ public interface MesReportWorkMapper { List getUpdateAttr1Boms(MesReportWork workorderCode); int updateAttr2(MesReportWork workorder); + + void updateReportRemark(@Param("list") List mesReportWork); } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java index defff4bf..c5f546fc 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java @@ -8,7 +8,6 @@ import java.util.*; import com.alibaba.fastjson2.JSONArray; import com.baomidou.dynamic.datasource.annotation.DS; -import com.op.common.core.constant.SecurityConstants; import com.op.common.core.domain.R; import com.op.common.core.utils.DateUtils; import com.op.common.core.utils.ServletUtils; @@ -260,6 +259,9 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService { mesReportWork.setUpdateTime(nowTime); mesReportWork.setUpdateBy(updateBy); } + //会更新好几次//着急发布后面再说 + mesReportWorkMapper.updateReportRemark(mesReportWorks); + return mesReportWorkMapper.submitReportPS(mesReportWorks); } diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml index 31a3c187..a4d36bcf 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml @@ -868,8 +868,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" work_time = #{item.workTime}, use_man = #{item.useMan}, update_by = #{item.updateBy}, - update_time = #{item.updateTime}, - remark = #{item.remark} + update_time = #{item.updateTime} where id = #{item.id} @@ -886,6 +885,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" set attr2 = '1' where parent_order = #{workorderCode} and attr1= '1' + + + update mes_report_work set remark = #{item.remark} + where workorder_code = #{item.workorderCode} + + update mes_report_work set del_flag = '1' where id = #{id} From 0717f35d64de3897db0f7c50e05f66b4afa182fa Mon Sep 17 00:00:00 2001 From: Yangwl <1726150332@qq.com> Date: Wed, 27 Mar 2024 09:20:51 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E8=AE=A1=E4=BB=B6=E5=B7=A5=E8=B5=84?= =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF=E7=BB=B4=E6=8A=A4=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/MesUnitPriceServiceImpl.java | 31 +------------------ .../mapper/mes/MesUnitPriceMapper.xml | 7 ++++- 2 files changed, 7 insertions(+), 31 deletions(-) diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesUnitPriceServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesUnitPriceServiceImpl.java index 6e9af3eb..4323c4fc 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesUnitPriceServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesUnitPriceServiceImpl.java @@ -112,7 +112,7 @@ public class MesUnitPriceServiceImpl implements IMesUnitPriceService { @DS("#header.poolName") public String importMesUnitPrice(List UnitPriceList, Boolean updateSupport, String operName) { if (StringUtils.isNull(UnitPriceList) || UnitPriceList.size() == 0) { - throw new ServiceException("导入用户数据不能为空！"); + throw new ServiceException("导入计件薪酬基础数据不能为空！"); } int successNum = 0; int failureNum = 0; @@ -146,34 +146,5 @@ public class MesUnitPriceServiceImpl implements IMesUnitPriceService { successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下："); } return successMsg.toString(); -// if (StringUtils.isNull(UnitPriceList) || UnitPriceList.size() == 0) { -// throw new ServiceException("导入数据不能为空！"); -// } -// int successNum = 0; -// int failureNum = 0; -// StringBuilder successMsg = new StringBuilder(); -// StringBuilder failureMsg = new StringBuilder(); -// for (MesUnitPrice mesUnitPrice : UnitPriceList) { -// try { -// // 验证是否存在这个产线产品 -// mesUnitPrice.setPicId(IdUtils.simpleUUID()); -// mesUnitPriceMapper.insertMesUnitPrice(mesUnitPrice); -// successNum++; -// successMsg.append("导入成功"); -// -// } catch (Exception e) { -// failureNum++; -// String msg = "导入失败："; -// failureMsg.append(msg + e.getMessage()); -// log.error(msg, e); -// } -// } -// if (failureNum > 0) { -// failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下："); -// throw new ServiceException(failureMsg.toString()); -// } else { -// successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下："); -// } -// return successMsg.toString(); } } diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesUnitPriceMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesUnitPriceMapper.xml index a561e158..e392cf8a 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesUnitPriceMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesUnitPriceMapper.xml @@ -60,7 +60,12 @@ From ca51dbda0ca9550f8d79e7b6b16eb53e08149949 Mon Sep 17 00:00:00 2001 From: A0010407 Date: Wed, 27 Mar 2024 15:20:50 +0800 Subject: [PATCH 3/6] =?UTF-8?q?2024-3-27=20=E5=9F=BA=E7=A1=80=E4=BF=A1?= =?UTF-8?q?=E6=81=AF-=E8=AE=BE=E5=A4=87-=E5=8E=BB=E6=8E=89=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E5=90=8D=E7=A7=B0=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/op/wms/controller/BaseEquipmentController.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseEquipmentController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseEquipmentController.java index e39cbc74..6bc925aa 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseEquipmentController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseEquipmentController.java @@ -95,9 +95,7 @@ public class BaseEquipmentController extends BaseController { public AjaxResult add(@RequestBody BaseEquipment baseEquipment) { if (baseEquipmentService.checkEquipmentCodeUnique(baseEquipment)) { return AjaxResult.error("设备编码已存在！"); - } else if (baseEquipmentService.checkEquipmentNameUnique(baseEquipment)) { - return AjaxResult.error("设备名称已存在！"); - } else { + }else{ return toAjax(baseEquipmentService.insertBaseEquipment(baseEquipment)); } } From fb85f305b9d0749236b3c86e99fcff0b95008736 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Wed, 27 Mar 2024 15:34:07 +0800 Subject: [PATCH 4/6] =?UTF-8?q?qc=20bug=E4=BF=AE=E6=94=B91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/mes/controller/MesBoardController.java | 28 ++++-- .../main/java/com/op/mes/domain/MesBoard.java | 18 ++++ .../java/com/op/mes/mapper/MesMapper.java | 7 ++ .../com/op/mes/service/IMesBoradService.java | 6 ++ .../mes/service/impl/MesBoradServiceImpl.java | 90 ++++++++++++++++++- .../main/resources/mapper/mes/MesMapper.xml | 19 ++++ .../controller/QcInterfaceController.java | 1 + .../com/op/quality/domain/QcInterface.java | 9 ++ .../quality/service/IQcInterfaceService.java | 1 + .../impl/QcCheckTaskIncomeServiceImpl.java | 6 +- 10 files changed, 175 insertions(+), 10 deletions(-) diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesBoardController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesBoardController.java index e3cb8f10..51311973 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesBoardController.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesBoardController.java @@ -1,19 +1,21 @@ 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.MesBoard; import com.op.mes.service.IMesBoradService; import com.op.system.api.domain.dto.BoardDTO; 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 org.springframework.web.bind.annotation.*; + +import java.util.List; @RestController @RequestMapping("/mesborad") -public class MesBoardController { +public class MesBoardController extends BaseController { @Autowired private IMesBoradService iMesBoradService; @@ -25,5 +27,21 @@ public class MesBoardController { public AjaxResult finishProductBoard(@RequestBody BoardDTO boardDTO) { return iMesBoradService.finishProductBoard(boardDTO); } + /******************************自动化产线方案看板****************************************/ + /**根据工厂获取产线**/ + @GetMapping("/getLineList") + public List getLineList(BoardDTO mesBoard) { + return iMesBoradService.getLineList(mesBoard); + } + @PostMapping("/getProduction15Days") + public AjaxResult getProduction15Days(BoardDTO mesBoard) { + if (StringUtils.isBlank(mesBoard.getFactoryCode())) { + return error("[facotryCode] 不能为空"); + } + if (StringUtils.isBlank(mesBoard.getEquCode())) { + return error("[equCode] 不能为空"); + } + return success(iMesBoradService.getProduction15Days(mesBoard)); + } } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesBoard.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesBoard.java index 39748bb2..135ad8c6 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesBoard.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesBoard.java @@ -19,6 +19,24 @@ public class MesBoard { private List files; private String workshopCode; private String workshopName; + private String lineCode; + private String lineName; + + public String getLineCode() { + return lineCode; + } + + public void setLineCode(String lineCode) { + this.lineCode = lineCode; + } + + public String getLineName() { + return lineName; + } + + public void setLineName(String lineName) { + this.lineName = lineName; + } public String getWorkshopCode() { return workshopCode; 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 d3a0049e..3377fceb 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 @@ -2,6 +2,7 @@ package com.op.mes.mapper; import com.op.common.core.domain.BaseFileData; import com.op.mes.domain.MesBoard; +import com.op.mes.domain.MesReportWork; import com.op.mes.domain.dto.BaseEquipmentDto; import com.op.mes.domain.dto.LGInfoDto; import com.op.system.api.domain.SysDept; @@ -9,6 +10,7 @@ import com.op.system.api.domain.SysSapLog; 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.MapKey; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -72,4 +74,9 @@ public interface MesMapper { List> daySenvenProduction(); List> ProductionInProgress(); + + List getLineList(BoardDTO boardDTO); + + @MapKey("dayStr") + Map getProduction15Days(BoardDTO boardDTO); } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/IMesBoradService.java b/op-modules/op-mes/src/main/java/com/op/mes/service/IMesBoradService.java index dc5ea48c..175b7cc2 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/IMesBoradService.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/IMesBoradService.java @@ -3,6 +3,12 @@ package com.op.mes.service; import com.op.common.core.web.domain.AjaxResult; import com.op.system.api.domain.dto.BoardDTO; +import java.util.List; + public interface IMesBoradService { public AjaxResult finishProductBoard(BoardDTO boardDTO); + + public List getLineList(BoardDTO boardDTO); + + public BoardDTO getProduction15Days(BoardDTO mesBoard); } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesBoradServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesBoradServiceImpl.java index 1be43cb6..e09a7e99 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesBoradServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesBoradServiceImpl.java @@ -1,17 +1,19 @@ package com.op.mes.service.impl; +import com.alibaba.fastjson2.JSONObject; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; +import com.op.common.core.utils.DateUtils; import com.op.common.core.web.domain.AjaxResult; +import com.op.mes.domain.MesReportWork; import com.op.mes.mapper.MesMapper; import com.op.mes.service.IMesBoradService; import com.op.system.api.domain.dto.BoardDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.text.SimpleDateFormat; +import java.util.*; @Service public class MesBoradServiceImpl implements IMesBoradService { @@ -34,4 +36,86 @@ public class MesBoradServiceImpl implements IMesBoradService { map.put("ProductionInProgress", ProductionInProgress); return AjaxResult.success(map); } + + @Override + public List getLineList(BoardDTO boardDTO) { + DynamicDataSourceContextHolder.push(boardDTO.getFactoryCode()); + boardDTO.setEquipmentTypeCode("equ_type_bzx"); + List lineList = mesMapper.getLineList(boardDTO); + return lineList; + } + + @Override + public BoardDTO getProduction15Days(BoardDTO boardDTO) { + DynamicDataSourceContextHolder.push(boardDTO.getFactoryCode()); + BoardDTO dto = new BoardDTO(); + + String nowDate = DateUtils.getDate(); + + List days = this.getDays(15); + //days + dto.setDays(days); + boardDTO.setStartTime(days.get(0)); + boardDTO.setEndTime(days.get(days.size()-1)); + Map pros15 = mesMapper.getProduction15Days(boardDTO); + MesReportWork todaydto = pros15.get(nowDate); + if(todaydto != null){ + dto.setPlanProduction(todaydto.getQuantity().toString().replace(".00","")); + dto.setActProduction(todaydto.getQuantityFeedback().toString()); + }else{ + dto.setPlanProduction("0"); + dto.setActProduction("0"); + } + //plans; + List plans = new ArrayList<>(); + List acts = new ArrayList<>(); + //acts; + for(String dayStr:days){ + MesReportWork workR = pros15.get(dayStr); + if(workR != null){ + plans.add(workR.getQuantity().toString()); + acts.add(workR.getQuantityFeedback().toString()); + }else{ + plans.add("0"); + acts.add("0"); + } + } + dto.setPlans(plans); + dto.setActs(acts); + return dto; + } + + //获取当前日期前几天 + private List getDays(int dayNum){ + List days = new ArrayList<>(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + + Calendar cal = Calendar.getInstance(); + //获取前面的时间用-负号 + Date date = new Date(); + for(int num=0;num days = new ArrayList<>(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + + Calendar cal = Calendar.getInstance(); + //获取前面的时间用-负号 + Date date = new Date(); + for(int num=0;num<15;num++){ + cal.setTime(date); + cal.add(Calendar.DAY_OF_MONTH, -num); + days.add(sdf.format(cal.getTime())); + } + Collections.reverse(days); + + System.out.println(JSONObject.toJSONString(days)); + } } 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 f5124317..56844260 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 @@ -286,4 +286,23 @@ A.unit, C.equipment_name; + + + diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcInterfaceController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcInterfaceController.java index cc974f12..0a7b00e2 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcInterfaceController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcInterfaceController.java @@ -1,5 +1,6 @@ package com.op.quality.controller; +import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; import com.op.common.core.utils.StringUtils; import com.op.quality.domain.QcCheckType; import com.op.quality.domain.QcInterface; diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcInterface.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcInterface.java index e838e645..908cfe8f 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcInterface.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcInterface.java @@ -52,6 +52,15 @@ public class QcInterface extends BaseEntity { private String nameDate; private List dataBarArrays; private List dataLineArrays; + private String equipmentTypeCode; + + public String getEquipmentTypeCode() { + return equipmentTypeCode; + } + + public void setEquipmentTypeCode(String equipmentTypeCode) { + this.equipmentTypeCode = equipmentTypeCode; + } public List getDataBarArrays() { return dataBarArrays; diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcInterfaceService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcInterfaceService.java index 72b53a3e..ddf9d41c 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcInterfaceService.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcInterfaceService.java @@ -37,4 +37,5 @@ public interface IQcInterfaceService { List getMonthOfYearContrast(QcInterface qcInterface); QcLineChartDto getLineQcData(QcInterface qcInterface); + } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java index e88e9018..008c4aa4 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java @@ -667,8 +667,10 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { } } } - n= qcCheckTaskIncomeMapper.addQcCheckTaskDefects(defects); - logger.info("qc_check_task_defect:"+n); + if(!CollectionUtils.isEmpty(defects)){ + n= qcCheckTaskIncomeMapper.addQcCheckTaskDefects(defects); + logger.info("qc_check_task_defect:"+n); + } if("material".equals(qcCheckTaskIncome.getTypeCode())){ qcCheckTaskIncome.setCheckResult(result.equals("Y")?"1":"2"); From abd0d6a62ef8d3b2655d9b1ea7400327b9982dbb Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Wed, 27 Mar 2024 15:35:38 +0800 Subject: [PATCH 5/6] =?UTF-8?q?qc=20bug=E4=BF=AE=E6=94=B91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/system/api/domain/dto/BoardDTO.java | 81 +++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/BoardDTO.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/BoardDTO.java index 85bb73cd..98af7995 100644 --- a/op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/BoardDTO.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/BoardDTO.java @@ -11,6 +11,87 @@ public class BoardDTO { private String equTypeCode; private String equTypeName; private String shiftId; + private String factoryCode; + private String equipmentTypeCode; + private String planProduction; + private String actProduction; + private List plans; + private List acts; + private List days; + private String startTime; + private String endTime; + + public String getStartTime() { + return startTime; + } + + public void setStartTime(String startTime) { + this.startTime = startTime; + } + + public String getEndTime() { + return endTime; + } + + public void setEndTime(String endTime) { + this.endTime = endTime; + } + + public List getDays() { + return days; + } + + public void setDays(List days) { + this.days = days; + } + + public String getPlanProduction() { + return planProduction; + } + + public void setPlanProduction(String planProduction) { + this.planProduction = planProduction; + } + + public String getActProduction() { + return actProduction; + } + + public void setActProduction(String actProduction) { + this.actProduction = actProduction; + } + + public List getPlans() { + return plans; + } + + public void setPlans(List plans) { + this.plans = plans; + } + + public List getActs() { + return acts; + } + + public void setActs(List acts) { + this.acts = acts; + } + + public String getEquipmentTypeCode() { + return equipmentTypeCode; + } + + public void setEquipmentTypeCode(String equipmentTypeCode) { + this.equipmentTypeCode = equipmentTypeCode; + } + + public String getFactoryCode() { + return factoryCode; + } + + public void setFactoryCode(String factoryCode) { + this.factoryCode = factoryCode; + } public String getShiftId() { return shiftId; From b0c2ef28cfba2066919151167f8822b80007518e Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Wed, 27 Mar 2024 16:35:39 +0800 Subject: [PATCH 6/6] =?UTF-8?q?qc=20bug=E4=BF=AE=E6=94=B92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/op/open/service/impl/OpenServiceImpl.java | 2 +- .../op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java b/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java index 52b75d54..f4e5a02a 100644 --- a/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java +++ b/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java @@ -379,7 +379,7 @@ public class OpenServiceImpl implements OpenService { QcMaterialGroupDetailDTO group = openMapper.getGroupByMaterial(qcCheckTaskProduce.getMaterialCode()); if (group == null) { group = new QcMaterialGroupDetailDTO(); - group.setGroupId("3dc0655fea3449c59c76a01cc5b91565"); + group.setGroupId("3dc0655fea3449c59c76a01cc5b91565");//成品蚊香物料组 } qctp.setGroupId(group.getGroupId());//共性 List itemsGG = openMapper.getTPByTypeGroup(qctp); diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java index 008c4aa4..4aa0e757 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java @@ -722,7 +722,7 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { n = qcCheckUnqualifiedMapper.insertQcCheckUnqualified(unqualified); logger.info("qc_check_unqualified:" + n); } - return n ; + return 1 ; } @Override