From ff3c8805287711518fc84b9ad8f28614285226fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=81=92=E6=9D=B0?= <2658502433@qq.com> Date: Sat, 14 Jun 2025 18:13:29 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E5=8F=91=E7=89=88=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- op-modules/op-device/push-device.bat | 2 +- op-modules/op-mes/push-mes.bat | 2 +- op-modules/op-open/push-open.bat | 3 +-- op-modules/op-quality/push-quality.bat | 3 +-- op-modules/op-system/push-system.bat | 3 +-- op-modules/op-wms/push-wms.bat | 2 +- 6 files changed, 6 insertions(+), 9 deletions(-) diff --git a/op-modules/op-device/push-device.bat b/op-modules/op-device/push-device.bat index e96795b15..b219b1858 100644 --- a/op-modules/op-device/push-device.bat +++ b/op-modules/op-device/push-device.bat @@ -27,7 +27,7 @@ if exist %df% ( ) echo --------------------------------创建Dockerfile-------------------------------- ::echo FROM 192.168.202.36:30002/library/openjdk:8u131-jdk-alpine >> Dockerfile -echo FROM 192.168.202.36:30002/library/openjdk:8-sw66>> Dockerfile +echo FROM openjdk:8u131-jdk >> Dockerfile echo COPY %jarName% /application.jar >> Dockerfile echo RUN echo "Asia/Shanghai" ^> /etc/timezone >> Dockerfile echo CMD ["java", "-jar", "-Dspring.profiles.active=%profile%", "application.jar"] >> Dockerfile diff --git a/op-modules/op-mes/push-mes.bat b/op-modules/op-mes/push-mes.bat index 83e172073..5cf02b260 100644 --- a/op-modules/op-mes/push-mes.bat +++ b/op-modules/op-mes/push-mes.bat @@ -26,7 +26,7 @@ if exist %df% ( del /f /s /q .\Dockerfile ) echo --------------------------------创建Dockerfile-------------------------------- -echo FROM 192.168.202.36:30002/library/openjdk:8u131-jdk-alpine >> Dockerfile +echo FROM openjdk:8u131-jdk >> Dockerfile echo COPY %jarName% /application.jar >> Dockerfile echo RUN echo "Asia/Shanghai" ^> /etc/timezone >> Dockerfile echo CMD ["java", "-jar", "-Dspring.profiles.active=%profile%", "application.jar"] >> Dockerfile diff --git a/op-modules/op-open/push-open.bat b/op-modules/op-open/push-open.bat index 70672bb89..131941be6 100644 --- a/op-modules/op-open/push-open.bat +++ b/op-modules/op-open/push-open.bat @@ -26,8 +26,7 @@ if exist %df% ( del /f /s /q .\Dockerfile ) echo --------------------------------创建Dockerfile-------------------------------- -::echo FROM 192.168.202.36:30002/library/openjdk:8u131-jdk-alpine >> Dockerfile -echo FROM 192.168.202.36:30002/library/openjdk:8-sw66>> Dockerfile +echo FROM openjdk:8u131-jdk >> Dockerfile echo COPY %jarName% /application.jar >> Dockerfile echo RUN echo "Asia/Shanghai" ^> /etc/timezone >> Dockerfile echo CMD ["java", "-jar", "-Dspring.profiles.active=%profile%", "application.jar"] >> Dockerfile diff --git a/op-modules/op-quality/push-quality.bat b/op-modules/op-quality/push-quality.bat index d690a5411..2c82b3f7b 100644 --- a/op-modules/op-quality/push-quality.bat +++ b/op-modules/op-quality/push-quality.bat @@ -26,8 +26,7 @@ if exist %df% ( del /f /s /q .\Dockerfile ) echo --------------------------------创建Dockerfile-------------------------------- -::echo FROM 192.168.202.36:30002/library/openjdk:8u131-jdk-alpine >> Dockerfile -echo FROM 192.168.202.36:30002/library/openjdk:8-sw66>> Dockerfile +echo FROM openjdk:8u131-jdk >> Dockerfile echo COPY %jarName% /application.jar >> Dockerfile echo RUN echo "Asia/Shanghai" ^> /etc/timezone >> Dockerfile echo CMD ["java", "-jar", "-Dspring.profiles.active=%profile%", "application.jar"] >> Dockerfile diff --git a/op-modules/op-system/push-system.bat b/op-modules/op-system/push-system.bat index 9f041629f..d238b2f91 100644 --- a/op-modules/op-system/push-system.bat +++ b/op-modules/op-system/push-system.bat @@ -26,8 +26,7 @@ if exist %df% ( del /f /s /q .\Dockerfile ) echo --------------------------------创建Dockerfile-------------------------------- -::echo FROM 192.168.202.36:30002/library/openjdk:8u131-jdk-alpine >> Dockerfile -echo FROM 192.168.202.36:30002/library/openjdk:8-sw66>> Dockerfile +echo FROM openjdk:8u131-jdk >> Dockerfile echo COPY %jarName% /application.jar >> Dockerfile echo RUN echo "Asia/Shanghai" ^> /etc/timezone >> Dockerfile echo CMD ["java", "-jar", "-Dspring.profiles.active=%profile%", "application.jar"] >> Dockerfile diff --git a/op-modules/op-wms/push-wms.bat b/op-modules/op-wms/push-wms.bat index 8e87e6d48..3b996fcd4 100644 --- a/op-modules/op-wms/push-wms.bat +++ b/op-modules/op-wms/push-wms.bat @@ -27,7 +27,7 @@ if exist %df% ( ) echo --------------------------------创建Dockerfile-------------------------------- ::echo FROM 192.168.202.36:30002/library/openjdk:8u131-jdk-alpine >> Dockerfile -echo FROM 192.168.202.36:30002/library/openjdk:8-sw66>> Dockerfile +echo FROM openjdk:8u131-jdk >> Dockerfile echo COPY %jarName% /application.jar >> Dockerfile echo RUN echo "Asia/Shanghai" ^> /etc/timezone >> Dockerfile echo CMD ["java", "-jar", "-Dspring.profiles.active=%profile%", "application.jar"] >> Dockerfile From e587614c3f4ad5608de28e5d0e27f200f59a5d9a Mon Sep 17 00:00:00 2001 From: Yangwl <1726150332@qq.com> Date: Fri, 20 Jun 2025 17:04:14 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E4=B8=8E=E8=AE=BE=E5=A4=87=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E7=BB=91=E5=AE=9A=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EquFaultDescriptionController.java | 12 ++- .../op/device/domain/EquFaultDescription.java | 11 +++ .../com/op/device/domain/EquFaultdesDict.java | 22 ++++++ .../com/op/device/domain/EquOperation.java | 18 +++++ .../mapper/EquFaultDescriptionMapper.java | 9 +++ .../op/device/mapper/EquOperationMapper.java | 3 + .../service/IEquFaultDescriptionService.java | 2 + .../impl/EquFaultDescriptionServiceImpl.java | 39 ++++++++++ .../service/impl/EquOperationServiceImpl.java | 17 +++- .../impl/EquRepairWorkOrderServiceImpl.java | 16 ++-- .../device/EquFaultDescriptionMapper.xml | 23 ++++++ .../mapper/device/EquOperationMapper.xml | 6 +- .../mapper/device/EquRepairOrderMapper.xml | 2 +- op-modules/op-printservice/pom.xml | 15 ++++ .../controller/QcCheckWechartController.java | 29 +++++++ .../quality/mapper/QcCheckWechartMapper.java | 10 +++ .../service/QcCheckWechartService.java | 8 ++ .../impl/QcCheckSampleTaskServiceImpl.java | 14 ++-- .../impl/QcCheckWechartServiceImpl.java | 77 +++++++++++++++++++ .../mapper/quality/QcCheckWechartMapper.xml | 10 +++ 20 files changed, 325 insertions(+), 18 deletions(-) create mode 100644 op-modules/op-device/src/main/java/com/op/device/domain/EquFaultdesDict.java create mode 100644 op-modules/op-printservice/pom.xml create mode 100644 op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckWechartController.java create mode 100644 op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckWechartMapper.java create mode 100644 op-modules/op-quality/src/main/java/com/op/quality/service/QcCheckWechartService.java create mode 100644 op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckWechartServiceImpl.java create mode 100644 op-modules/op-quality/src/main/resources/mapper/quality/QcCheckWechartMapper.xml diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/EquFaultDescriptionController.java b/op-modules/op-device/src/main/java/com/op/device/controller/EquFaultDescriptionController.java index d17a4db7c..027c82975 100644 --- a/op-modules/op-device/src/main/java/com/op/device/controller/EquFaultDescriptionController.java +++ b/op-modules/op-device/src/main/java/com/op/device/controller/EquFaultDescriptionController.java @@ -1,6 +1,9 @@ package com.op.device.controller; +import java.util.ArrayList; +import java.util.Collections; import java.util.List; +import java.util.Map; import javax.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; @@ -63,7 +66,14 @@ public class EquFaultDescriptionController extends BaseController { @RequiresPermissions("device:faultDescription:query") @GetMapping(value = "/{faultId}") public AjaxResult getInfo(@PathVariable("faultId") String faultId) { - return success(equFaultDescriptionService.selectEquFaultDescriptionByFaultId(faultId)); + AjaxResult ajaxResult = AjaxResult.success(); + EquFaultDescription EquFaultDescriptionInfo= equFaultDescriptionService.selectEquFaultDescriptionByFaultId(faultId); + ajaxResult.put("info",EquFaultDescriptionInfo); + // List arry = equFaultDescriptionService.selectFaultdesDictByfaultIds(faultId); + ajaxResult.put("dictValues", equFaultDescriptionService.selectFaultdesDictByfaultIds(faultId)); + +// return success(equFaultDescriptionService.selectEquFaultDescriptionByFaultId(faultId)); + return ajaxResult; } /** diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquFaultDescription.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquFaultDescription.java index e94a4ecba..4f1522a6d 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquFaultDescription.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquFaultDescription.java @@ -93,6 +93,17 @@ public class EquFaultDescription extends BaseEntity { // 鍒涘缓鏃ユ湡缁撴潫 private String createTimeEnd; + /** 璁惧绫诲瀷缁 */ + private String[] dictValues; + + public String[] getDictValues() { + return dictValues; + } + + public void setDictValues(String[] dictValues) { + this.dictValues = dictValues; + } + public void setFaultId(String faultId) { this.faultId = faultId; } diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquFaultdesDict.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquFaultdesDict.java new file mode 100644 index 000000000..5e2563224 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquFaultdesDict.java @@ -0,0 +1,22 @@ +package com.op.device.domain; + +public class EquFaultdesDict { + private String faultId; + private String dictValue; + + public String getFaultId() { + return faultId; + } + + public void setFaultId(String faultId) { + this.faultId = faultId; + } + + public String getDictValue() { + return dictValue; + } + + public void setDictValue(String dictValue) { + this.dictValue = dictValue; + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquOperation.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquOperation.java index 9a9ab0622..ced230946 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquOperation.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquOperation.java @@ -23,6 +23,9 @@ public class EquOperation extends BaseEntity { */ private String id; + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd") + private Date createTime; /** * 杞﹂棿 */ @@ -125,6 +128,11 @@ public class EquOperation extends BaseEntity { @Excel(name = "宸ュ巶") private String factoryCode; + + + + + /** * 澶囩敤瀛楁1 */ @@ -192,6 +200,16 @@ public class EquOperation extends BaseEntity { private String poolName; + @Override + public Date getCreateTime() { + return createTime; + } + + @Override + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + public String getCreateTimeStart() { return createTimeStart; } diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquFaultDescriptionMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquFaultDescriptionMapper.java index 2e90ab3e1..45e0a8dc5 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquFaultDescriptionMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquFaultDescriptionMapper.java @@ -4,6 +4,7 @@ import java.util.List; import com.op.device.domain.EquFaultDescription; import com.op.device.domain.EquFaultType; +import com.op.device.domain.EquFaultdesDict; /** * 鏁呴殰鎻忚堪Mapper鎺ュ彛 @@ -63,4 +64,12 @@ public interface EquFaultDescriptionMapper { int selectSerialNumber(); List selectFaultDescriptionList(EquFaultDescription equFaultDescription); + + void deleteFaultdesDictByfaultId(String faultId); + + void batchFaultdesDict(List list); + + void deleteFaultdesDictByfaultIds(String[] faultIds); + + List selectFaultdesDictByfaultId(String faultId); } diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOperationMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOperationMapper.java index dc12598ac..20a63bec6 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOperationMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOperationMapper.java @@ -1,6 +1,7 @@ package com.op.device.mapper; import java.util.List; +import java.util.Map; import com.baomidou.dynamic.datasource.annotation.DS; import com.op.device.domain.EquOperation; @@ -93,4 +94,6 @@ public interface EquOperationMapper { * @return */ public EquOperation selectEquipmentIntegrityRate(@Param("time") String time, @Param("equipmentCode") String equipmentCode); + + String getInfoByUserName(String part); } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/IEquFaultDescriptionService.java b/op-modules/op-device/src/main/java/com/op/device/service/IEquFaultDescriptionService.java index 1e1f0b2c7..8fa5e94da 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/IEquFaultDescriptionService.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/IEquFaultDescriptionService.java @@ -59,4 +59,6 @@ public interface IEquFaultDescriptionService { * @return 缁撴灉 */ public int deleteEquFaultDescriptionByFaultId(String faultId); + + List selectFaultdesDictByfaultIds(String faultId); } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquFaultDescriptionServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquFaultDescriptionServiceImpl.java index b64e5ca16..b3f0412bd 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquFaultDescriptionServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquFaultDescriptionServiceImpl.java @@ -1,14 +1,17 @@ package com.op.device.service.impl; import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.List; import com.baomidou.dynamic.datasource.annotation.DS; import com.op.common.core.context.SecurityContextHolder; import com.op.common.core.utils.DateUtils; +import com.op.common.core.utils.StringUtils; import com.op.common.core.utils.uuid.IdUtils; import com.op.common.core.web.domain.AjaxResult; import com.op.device.domain.EquFaultType; +import com.op.device.domain.EquFaultdesDict; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.op.device.mapper.EquFaultDescriptionMapper; @@ -112,6 +115,7 @@ public class EquFaultDescriptionServiceImpl implements IEquFaultDescriptionServi equFaultDescription.setUpdateBy(SecurityContextHolder.getUserName()); equFaultDescription.setUpdateTime(DateUtils.getNowDate()); equFaultDescriptionMapper.insertEquFaultDescription(equFaultDescription); + this.insertFaultdesDict(equFaultDescription); return success("鏂板鏁呴殰鎻忚堪鎴愬姛锛"); } @@ -140,9 +144,35 @@ public class EquFaultDescriptionServiceImpl implements IEquFaultDescriptionServi equFaultDescription.setUpdateTime(DateUtils.getNowDate()); // 鎻掑叆鏁版嵁搴 equFaultDescriptionMapper.updateEquFaultDescription(equFaultDescription); + String faultId = equFaultDescription.getFaultId(); + // 鍒犻櫎鍏宠仈 + equFaultDescriptionMapper.deleteFaultdesDictByfaultId(faultId); + // 鏂板鍏宠仈 + insertFaultdesDict(equFaultDescription); return success("淇敼鎴愬姛锛"); } + public void insertFaultdesDict(EquFaultDescription equFaultDescription) { + this.insertFaultdesDict(equFaultDescription, equFaultDescription.getDictValues()); + } + /** + * 鏂板鏁呴殰鎻忚堪鍜岃澶囩被鍨嬪叧绯 + * + * @param equFaultDescription + */ + public void insertFaultdesDict(EquFaultDescription equFaultDescription,String[] dictValues) { + if (StringUtils.isNotEmpty(dictValues)) { + // 鏂板鐢ㄦ埛涓庡矖浣嶇鐞 + List list = new ArrayList(); + for (String dictValue : dictValues) { + EquFaultdesDict up = new EquFaultdesDict(); + up.setFaultId(equFaultDescription.getFaultId()); + up.setDictValue(dictValue); + list.add(up); + } + equFaultDescriptionMapper.batchFaultdesDict(list); + } + } /** * 鎵归噺鍒犻櫎鏁呴殰鎻忚堪 * @@ -152,6 +182,8 @@ public class EquFaultDescriptionServiceImpl implements IEquFaultDescriptionServi @Override @DS("#header.poolName") public int deleteEquFaultDescriptionByFaultIds(String[] faultIds) { + // 鍒犻櫎鐢ㄦ埛涓庡矖浣嶅叧鑱 + equFaultDescriptionMapper.deleteFaultdesDictByfaultIds(faultIds); return equFaultDescriptionMapper.deleteEquFaultDescriptionByFaultIds(faultIds); } @@ -164,6 +196,13 @@ public class EquFaultDescriptionServiceImpl implements IEquFaultDescriptionServi @Override @DS("#header.poolName") public int deleteEquFaultDescriptionByFaultId(String faultId) { + equFaultDescriptionMapper.deleteFaultdesDictByfaultId(faultId); return equFaultDescriptionMapper.deleteEquFaultDescriptionByFaultId(faultId); } + + @Override + @DS("#header.poolName") + public List selectFaultdesDictByfaultIds(String faultId) { + return equFaultDescriptionMapper.selectFaultdesDictByfaultId(faultId); + } } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOperationServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOperationServiceImpl.java index bd35262dd..f931bf9f5 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOperationServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOperationServiceImpl.java @@ -5,6 +5,7 @@ import java.math.RoundingMode; import java.text.DecimalFormat; import java.text.SimpleDateFormat; import java.util.List; +import java.util.Map; import com.baomidou.dynamic.datasource.annotation.DS; import com.op.common.core.utils.DateUtils; @@ -56,7 +57,21 @@ public class EquOperationServiceImpl implements IEquOperationService { equOperation.setCreateTimeEnd(formatter.format(equOperation.getCreateTimeArray().get(1))); } } - return equOperationMapper.selectEquOperationList(equOperation); + List operationList = equOperationMapper.selectEquOperationList(equOperation); + if (operationList != null && operationList.size() > 0){ + for (EquOperation operation:operationList) { + if (operation.getRepairPerson() != null){ + String[] parts = operation.getRepairPerson().split(";"); + String names = ""; + for (String part : parts) { + String name=equOperationMapper.getInfoByUserName(part); + names = names+name+";"; + } + operation.setRepairPerson(names); + } + } + } + return operationList; } /** diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairWorkOrderServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairWorkOrderServiceImpl.java index 5070ac324..2b75f000c 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairWorkOrderServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairWorkOrderServiceImpl.java @@ -519,24 +519,24 @@ public class EquRepairWorkOrderServiceImpl implements IEquRepairWorkOrderService String GZCS = equOperation.getHandlingMethod();//缁翠慨鎺柦 String WXR = equOperation.getRepairPerson();//缁翠慨浜 if (GZMS != null) { - equOperation.setFailureDescription(GZMS + formattedDate + ":" + equRepairWorkOrder.getWorkFaultDesc() + ";"); + equOperation.setFailureDescription(GZMS + equRepairWorkOrder.getWorkFaultDesc() + ";"); } else { - equOperation.setFailureDescription(formattedDate + ":" + equRepairWorkOrder.getWorkFaultDesc() + ";"); + equOperation.setFailureDescription(equRepairWorkOrder.getWorkFaultDesc() + ";"); } if (GZYY != null) { - equOperation.setReasonAnalyze(GZYY + formattedDate + ":" + equRepairWorkOrder.getWorkReason() + ";"); + equOperation.setReasonAnalyze(GZYY + equRepairWorkOrder.getWorkReason() + ";"); } else { - equOperation.setReasonAnalyze(formattedDate + ":" + equRepairWorkOrder.getWorkReason() + ";"); + equOperation.setReasonAnalyze(equRepairWorkOrder.getWorkReason() + ";"); } if (GZCS != null) { - equOperation.setHandlingMethod(GZCS + formattedDate + ":" + equRepairWorkOrder.getRepairMeasures() + ";"); + equOperation.setHandlingMethod(GZCS + equRepairWorkOrder.getRepairMeasures() + ";"); } else { - equOperation.setHandlingMethod(formattedDate + ":" + equRepairWorkOrder.getRepairMeasures() + ";"); + equOperation.setHandlingMethod(equRepairWorkOrder.getRepairMeasures() + ";"); } if (WXR != null) { - equOperation.setRepairPerson(WXR + formattedDate + ":" + equRepairWorkOrder.getWorkPerson() + ";"); + equOperation.setRepairPerson(WXR + equRepairWorkOrder.getWorkPerson() + ";"); } else { - equOperation.setRepairPerson(formattedDate + ":" + equRepairWorkOrder.getWorkPerson() + ";"); + equOperation.setRepairPerson(equRepairWorkOrder.getWorkPerson() + ";"); } } //褰撹幏鍙栫殑璁惧杩愯璁板綍涓虹┖鐨勬椂鍊欙紝浠ｈ〃娌℃湁鐢熸垚锛岃繖鍧楄涓婁綅鏈哄崱浣 todo diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquFaultDescriptionMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquFaultDescriptionMapper.xml index 121889ea8..dfc2642b6 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquFaultDescriptionMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquFaultDescriptionMapper.xml @@ -91,6 +91,12 @@ #{updateTime}, + + insert into equ_faultdes_dict(fault_id, dict_value) values + + (#{item.faultId},#{item.dictValue}) + + update equ_fault_description @@ -122,10 +128,27 @@ #{faultId} + + delete from equ_faultdes_dict where fault_id=#{faultId} + + + + + delete from equ_faultdes_dict where fault_id in + + #{faultId} + + + diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquOperationMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquOperationMapper.xml index cb968da28..b5380a081 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquOperationMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquOperationMapper.xml @@ -85,7 +85,7 @@ and reason_analyze = #{reasonAnalyze} and handling_method = #{handlingMethod} - and repair_person concat('%', #{repairPerson}, + and repair_person like concat('%', #{repairPerson}, '%') and equ_status_des = #{equStatusDes} @@ -279,5 +279,7 @@ and equipment_code = #{equipmentCode} and del_flag = '0' - + diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquRepairOrderMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquRepairOrderMapper.xml index 3b65845fe..32d436ecb 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquRepairOrderMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquRepairOrderMapper.xml @@ -115,7 +115,7 @@ and order_code like concat('%', #{orderCode}, '%') - and equipment_code like concat('%',#{equipmentCode}, '%') + and ero.equipment_code like concat('%',#{equipmentCode}, '%') and order_desc like concat('%', #{orderDesc}, '%') and CONVERT(date,order_breakdown_time) >= #{orderBreakdownTimeStart} diff --git a/op-modules/op-printservice/pom.xml b/op-modules/op-printservice/pom.xml new file mode 100644 index 000000000..d60d0c7f8 --- /dev/null +++ b/op-modules/op-printservice/pom.xml @@ -0,0 +1,15 @@ + + + + op-modules + com.op + 0.0.1 + + 4.0.0 + + op-printservice + + + diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckWechartController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckWechartController.java new file mode 100644 index 000000000..73e94dbfc --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckWechartController.java @@ -0,0 +1,29 @@ +package com.op.quality.controller; + +import com.op.common.core.web.controller.BaseController; +import com.op.common.core.web.domain.AjaxResult; +import com.op.quality.service.QcCheckWechartService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.Map; + +/** + * + * 璐ㄦ淇℃伅浼佷笟寰俊鎺ㄩ + * @author YangWANLI + * @date 2025-04-19 + */ +@RestController +@RequestMapping("/qualityWechart") +public class QcCheckWechartController extends BaseController { + @Autowired + private QcCheckWechartService qcCheckWechartService; + //鏌ヨ鍓嶄竴澶╁寘鏉愩佹垚鍝佽川妫淇℃伅 + @GetMapping("/qualityCheckInfoByday") + public AjaxResult qualityCheckInfoByday() { + return AjaxResult.success(qcCheckWechartService.qualityCheckInfoByday()); + } +} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckWechartMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckWechartMapper.java new file mode 100644 index 000000000..b6214e638 --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckWechartMapper.java @@ -0,0 +1,10 @@ +package com.op.quality.mapper; + +import org.apache.ibatis.annotations.Mapper; + +import java.util.Map; + +@Mapper +public interface QcCheckWechartMapper { + Map qualityCheckInfoByday(); +} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/QcCheckWechartService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/QcCheckWechartService.java new file mode 100644 index 000000000..d5c011d11 --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/QcCheckWechartService.java @@ -0,0 +1,8 @@ +package com.op.quality.service; + +import java.util.Map; + +public interface QcCheckWechartService { + + Map qualityCheckInfoByday(); +} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckSampleTaskServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckSampleTaskServiceImpl.java index 98fc5e3ad..1c1919853 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckSampleTaskServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckSampleTaskServiceImpl.java @@ -75,12 +75,16 @@ public class QcCheckSampleTaskServiceImpl implements IQcCheckSampleTaskService { public AjaxResult createCheckSampleTask() { // 杩欐槸鏁版嵁婧愮殑key DynamicDataSourceContextHolder.push("ds_1000"); - List list = qcCheckSampleTaskMapper.selectScTaskListByDay(); - if (!CollectionUtils.isEmpty(list)) { - for (QcCheckSampleTask item : list) { - item.setId(IdUtils.fastSimpleUUID()); + try { + List list = qcCheckSampleTaskMapper.selectScTaskListByDay(); + if (!CollectionUtils.isEmpty(list)) { + for (QcCheckSampleTask item : list) { + item.setId(IdUtils.fastSimpleUUID()); + } + qcCheckSampleTaskMapper.batchInsertQcCheckSampleTask(list); } - qcCheckSampleTaskMapper.batchInsertQcCheckSampleTask(list); + }finally { + DynamicDataSourceContextHolder.poll(); } return success(); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckWechartServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckWechartServiceImpl.java new file mode 100644 index 000000000..95c56b7be --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckWechartServiceImpl.java @@ -0,0 +1,77 @@ +package com.op.quality.service.impl; + +import com.alibaba.fastjson2.JSONObject; +import com.baomidou.dynamic.datasource.annotation.DS; +import com.op.common.core.utils.StringUtils; +import com.op.common.core.web.domain.AjaxResult; +import com.op.quality.mapper.QcCheckTaskIncomeMapper; +import com.op.quality.mapper.QcCheckWechartMapper; +import com.op.quality.service.QcCheckWechartService; +import com.op.system.api.RemoteOpenService; +import com.op.system.api.domain.SysNoticeGroup; +import com.op.system.api.domain.dto.WechartDTO; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +@Service +public class QcCheckWechartServiceImpl implements QcCheckWechartService { + + protected Logger logger = LoggerFactory.getLogger(getClass()); + @Autowired + private QcCheckWechartMapper qcCheckWechartMapper; + @Autowired + private QcCheckTaskIncomeMapper qcCheckTaskIncomeMapper; + + @Autowired + private RemoteOpenService remoteOpenService; + @Override + @DS("#header.poolName") + public Map qualityCheckInfoByday() { + // Map map=qcCheckWechartMapper.qualityCheckInfoByday(); + Map map = qcCheckWechartMapper.qualityCheckInfoByday(); + map.replaceAll((key, value) -> { + if (value instanceof Number) { + return String.valueOf(value); + } + return value; // 闈炴暟瀛楃被鍨嬩繚鐣欏師鍊 + }); + SysNoticeGroup noticeQo = new SysNoticeGroup(); + if(map != null){ + noticeQo.setNoticeId(25L); + List notices = qcCheckTaskIncomeMapper.getNoticesGroup(noticeQo); + System.out.println(notices); + sendWeChartMessage(noticeQo,map); + } + return map; + } + + private void sendWeChartMessage(SysNoticeGroup noticeQo,Map map){ + + List notices = qcCheckTaskIncomeMapper.getNoticesGroup(noticeQo); + if(!CollectionUtils.isEmpty(notices) && notices.size() > 0) { + List wecharts = new ArrayList<>(); + for (SysNoticeGroup noticedto : notices) { + WechartDTO wechart0 = new WechartDTO(); + wechart0.setUserId(noticedto.getWxId()); + String contentInfo = notices.get(0).getNoticeContent(); + String message=StringUtils.format(contentInfo,map); + wechart0.setText(message); + wecharts.add(wechart0); + } + // logger.info("浠诲姟缂栧彿涓:"+ checkNoList + "鐨"+ message + ",浼佷笟寰俊浜屾鎻愰啋璇锋眰锛" + JSONObject.toJSONString(wecharts)); + if (!CollectionUtils.isEmpty(wecharts)) { + new Thread(() -> { + AjaxResult result = remoteOpenService.sendWeChartMessage(wecharts); + logger.info("浼佷笟寰俊鍙戦佽川妫鎯呭喌锛" + JSONObject.toJSONString(result)); + }).start(); + } + } + } +} diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckWechartMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckWechartMapper.xml new file mode 100644 index 000000000..945914a08 --- /dev/null +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckWechartMapper.xml @@ -0,0 +1,10 @@ + + + + + + From 93dbc28e752f9a80527daf2a06cb4e84a5218171 Mon Sep 17 00:00:00 2001 From: Yangwl <1726150332@qq.com> Date: Wed, 25 Jun 2025 18:05:51 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=BB=E9=94=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java index 2fbef9bd9..9f181c179 100644 --- a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java +++ b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java @@ -1336,7 +1336,7 @@ public class SapItemSyncImpl implements SapItemSyncService { } for (SapZmesGetMchb sapZmesGetMchb1: sapZmesGetMchbs) { - SapZmesGetMchb sapZmesGetMchb2=new SapZmesGetMchb();// + SapZmesGetMchb sapZmesGetMchb2=new SapZmesGetMchb();// sapZmesGetMchb2.setMatnr(sapZmesGetMchb1.getMatnr()); sapZmesGetMchb2.setWerks(sapZmesGetMchb1.getWerks()); sapZmesGetMchb2.setLgort(sapZmesGetMchb1.getLgort()); @@ -1352,6 +1352,7 @@ public class SapItemSyncImpl implements SapItemSyncService { sapZmesGetMchb1.setCeinm(sapZmesGetMchb1.getCeinm()); sapZmesGetMchb1.setCspem(sapZmesGetMchb1.getCspem()); sapZmesGetMchb1.setStorageId(sapZmesGetMchb3.getStorageId()); + sapZmesGetMchb1.setCreateBy("task"); sapZmesGetMchb1.setGmtCreate(new Date()); sapBaseProductMapper.UpdateSapZmesGetMchb(sapZmesGetMchb1); From 5f8b805cab95bae9cdaf7be78758a02e14b43a17 Mon Sep 17 00:00:00 2001 From: Yangwl <1726150332@qq.com> Date: Thu, 26 Jun 2025 16:25:53 +0800 Subject: [PATCH 04/11] =?UTF-8?q?SAP=E6=8A=A5=E5=B7=A5=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=97=A5=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/op/system/api/domain/sap/SapRFW.java | 9 +++++ .../com/op/common/core/utils/DateUtils.java | 7 ++++ .../java/com/op/mes/domain/MesReportWork.java | 1 + .../service/impl/IWCInterfaceServiceImpl.java | 40 ++++++++++--------- .../mapper/mes/MesReportWorkMapper.xml | 1 + .../op/sap/service/impl/SapItemSyncImpl.java | 16 +++++++- .../sap/service/impl/SapOrderServiceImpl.java | 2 + 7 files changed, 57 insertions(+), 19 deletions(-) diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapRFW.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapRFW.java index 9eb490e09..93b01ff2e 100644 --- a/op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapRFW.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapRFW.java @@ -9,10 +9,19 @@ public class SapRFW { private String aufnr; private String gamng; private String anzma; + private String budat; private String remark; private lt_gs lt_gs; private List lt_hwList; + public String getBudat() { + return budat; + } + + public void setBudat(String budat) { + this.budat = budat; + } + public String getRemark() { return remark; } diff --git a/op-common/op-common-core/src/main/java/com/op/common/core/utils/DateUtils.java b/op-common/op-common-core/src/main/java/com/op/common/core/utils/DateUtils.java index fd0b60f3a..140fca580 100644 --- a/op-common/op-common-core/src/main/java/com/op/common/core/utils/DateUtils.java +++ b/op-common/op-common-core/src/main/java/com/op/common/core/utils/DateUtils.java @@ -159,4 +159,11 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils { ZonedDateTime zdt = localDateTime.atZone(ZoneId.systemDefault()); return Date.from(zdt.toInstant()); } + public static String formatToYYYYMMDD(String inputDate, String inputFormat) throws Exception { + SimpleDateFormat inputFormatter = new SimpleDateFormat(inputFormat); + SimpleDateFormat outputFormatter = new SimpleDateFormat("yyyyMMdd"); + + Date date = inputFormatter.parse(inputDate); + return outputFormatter.format(date); + } } 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 347786051..a927fdb10 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 @@ -29,6 +29,7 @@ public class MesReportWork extends BaseEntity { @Excel(name = "鐢熶骇宸ュ崟缂栫爜") private String workorderCode; + /** SAP璁㈠崟鍙 */ @Excel(name = "SAP璁㈠崟鍙") private String workorderCodeSap; 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 d3416c3da..96e8dcebf 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 @@ -36,6 +36,7 @@ import org.springframework.util.CollectionUtils; import java.math.BigDecimal; import java.math.RoundingMode; +import java.text.SimpleDateFormat; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.LocalTime; @@ -580,11 +581,12 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { } } return sapRson; - }finally { + } catch (Exception e) { + return R.fail("鎶ュ伐澶辫触锛"+e.getMessage()); + } finally { DynamicDataSourceContextHolder.poll(); } - } @Override @@ -808,7 +810,7 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { * @param workOrder * @return */ - private R reportHzToSap(MesReportWork workOrder) { + private R reportHzToSap(MesReportWork workOrder) throws Exception { Date nowTime = DateUtils.getNowDate(); SapRFW sapRFW = new SapRFW(); sapRFW.setAufnr(workOrder.getWorkorderCodeSap());//铏氭嫙宸ュ崟鍙 @@ -847,6 +849,7 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { } sapRFW.setLt_hwList(lt_hwList); sapRFW.setAnzma(workOrder.getSapCode());//浜х嚎缂栧彿 + sapRFW.setBudat(DateUtils.formatToYYYYMMDD(workOrder.getProductDate(),"yyyy-MM-dd")); sapRFW.setRemark(workOrder.getRemark());//澶囨敞 logger.info(workOrder.getWorkorderCodeSap() + "sap宸ュ崟鎶ュ伐璇锋眰锛" + JSONObject.toJSONString(sapRFW)); R r = remoteSapService.sapRFWOrder(sapRFW); @@ -872,7 +875,7 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { * @param workOrder * @return */ - private R reportHzToSap3(MesReportWork workOrder) { + private R reportHzToSap3(MesReportWork workOrder) throws Exception { Date nowTime = DateUtils.getNowDate(); SapRFW sapRFW = new SapRFW(); sapRFW.setAufnr(workOrder.getWorkorderCodeSap());//铏氭嫙宸ュ崟鍙 @@ -909,6 +912,7 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { } sapRFW.setLt_hwList(lt_hwList); sapRFW.setAnzma(workOrder.getSapCode());//浜х嚎缂栧彿 + sapRFW.setBudat(DateUtils.formatToYYYYMMDD(workOrder.getProductDate(),"yyyy-MM-dd")); sapRFW.setRemark(workOrder.getRemark());//澶囨敞 logger.info(workOrder.getWorkorderCodeSap() + "sap宸ュ崟鎶ュ伐璇锋眰锛" + JSONObject.toJSONString(sapRFW)); //R r= R.ok(); @@ -1310,18 +1314,18 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { } - public static void main(String args[]){ - List days = new ArrayList<>(); - // 鑾峰彇褰撳墠鏃ユ湡 - LocalDate today = LocalDate.now(); - // 瀹氫箟涓涓棩鏈熸牸寮忓寲鍣 - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); - // 鎵撳嵃鏈杩戜竷澶╃殑鏃ユ湡 - for (int i = 0; i < 7; i++) { - LocalDate date = today.minusDays(i); - days.add(date.format(formatter)); - } - Collections.reverse(days); - System.out.println(days); - } +// public static void main(String args[]){ +// List days = new ArrayList<>(); +// // 鑾峰彇褰撳墠鏃ユ湡 +// LocalDate today = LocalDate.now(); +// // 瀹氫箟涓涓棩鏈熸牸寮忓寲鍣 +// DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); +// // 鎵撳嵃鏈杩戜竷澶╃殑鏃ユ湡 +// for (int i = 0; i < 7; i++) { +// LocalDate date = today.minusDays(i); +// days.add(date.format(formatter)); +// } +// Collections.reverse(days); +// System.out.println(days); +// } } 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 a9b93f9bc..227c9d2d1 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 @@ -706,6 +706,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select ow.workorder_code workorderCode, ow.workorder_code_sap workorderCodeSap, + ow.product_date, mrw.quantity_feedback quantityFeedback, mrw.product_code productCode, mrw.product_name productName, diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java index 9f181c179..096ad1663 100644 --- a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java +++ b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java @@ -17,18 +17,32 @@ import com.op.sap.mapper.SapBaseProductMapper; import com.op.sap.service.SapItemSyncService; import com.op.system.api.RemoteUserService; import com.sap.conn.jco.*; +import org.apache.poi.ss.usermodel.Sheet; +import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.ss.usermodel.WorkbookFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.stereotype.Service; +import javax.print.*; +import javax.print.attribute.HashPrintRequestAttributeSet; +import javax.print.attribute.standard.Copies; +import javax.print.attribute.standard.MediaSizeName; import javax.validation.Validator; +import java.awt.*; +import java.awt.print.PageFormat; +import java.awt.print.Printable; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; import java.math.BigDecimal; import java.text.SimpleDateFormat; import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.util.*; +import java.util.List; @Component @Service @@ -1380,5 +1394,5 @@ public class SapItemSyncImpl implements SapItemSyncService { } } - } + diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java index 694a65468..45c6078b9 100644 --- a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java +++ b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java @@ -294,6 +294,8 @@ public class SapOrderServiceImpl implements SapOrderService { jCoParameterList.setValue("P_ANZMA", sapRFW.getAnzma()); //澶囨敞 jCoParameterList.setValue("P_TEXT", sapRFW.getRemark()); + //璁拌处鏃ユ湡鏍煎紡涓篩YYYMMDD + jCoParameterList.setValue("P_BUDAT", sapRFW.getBudat()); if (sapRFW.getLt_gs() == null) { return R.fail("鐢熶骇璁㈠崟鎶ュ伐宸ユ椂涓虹┖"); } From 846b2fb053a2d16635e2f0dd0190fa7994634662 Mon Sep 17 00:00:00 2001 From: Yangwl <1726150332@qq.com> Date: Thu, 26 Jun 2025 18:34:53 +0800 Subject: [PATCH 05/11] =?UTF-8?q?SAP=E6=8A=A5=E5=B7=A5=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=97=A5=E6=9C=9F=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- op-modules/op-mes/src/main/resources/bootstrap.yml | 2 +- .../src/main/resources/mapper/mes/MesReportWorkMapper.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/op-modules/op-mes/src/main/resources/bootstrap.yml b/op-modules/op-mes/src/main/resources/bootstrap.yml index a0e1c0df2..527b3d9e7 100644 --- a/op-modules/op-mes/src/main/resources/bootstrap.yml +++ b/op-modules/op-mes/src/main/resources/bootstrap.yml @@ -15,7 +15,7 @@ spring: discovery: #鍛藉悕绌洪棿 namespace: lanju-op-test - group: test + group: ywl # 鏈嶅姟娉ㄥ唽鍦板潃 server-addr: 192.168.202.20:8848 config: 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 227c9d2d1..53e999263 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 @@ -706,7 +706,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select ow.workorder_code workorderCode, ow.workorder_code_sap workorderCodeSap, - ow.product_date, + ow.product_date productDate, mrw.quantity_feedback quantityFeedback, mrw.product_code productCode, mrw.product_name productName, From d100f04c2501e04d74ae62a215667f82e77221da Mon Sep 17 00:00:00 2001 From: Yangwl <1726150332@qq.com> Date: Fri, 27 Jun 2025 17:06:53 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/service/impl/IWCInterfaceServiceImpl.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) 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 96e8dcebf..0904dd195 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 @@ -36,10 +36,9 @@ import org.springframework.util.CollectionUtils; import java.math.BigDecimal; import java.math.RoundingMode; -import java.text.SimpleDateFormat; import java.time.LocalDate; import java.time.LocalDateTime; -import java.time.LocalTime; + import java.time.format.DateTimeFormatter; import java.time.temporal.ChronoUnit; import java.util.*; @@ -849,7 +848,8 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { } sapRFW.setLt_hwList(lt_hwList); sapRFW.setAnzma(workOrder.getSapCode());//浜х嚎缂栧彿 - sapRFW.setBudat(DateUtils.formatToYYYYMMDD(workOrder.getProductDate(),"yyyy-MM-dd")); + String productDate = workOrder.getProductDate().replace("-", ""); + sapRFW.setBudat(productDate); sapRFW.setRemark(workOrder.getRemark());//澶囨敞 logger.info(workOrder.getWorkorderCodeSap() + "sap宸ュ崟鎶ュ伐璇锋眰锛" + JSONObject.toJSONString(sapRFW)); R r = remoteSapService.sapRFWOrder(sapRFW); @@ -912,7 +912,8 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { } sapRFW.setLt_hwList(lt_hwList); sapRFW.setAnzma(workOrder.getSapCode());//浜х嚎缂栧彿 - sapRFW.setBudat(DateUtils.formatToYYYYMMDD(workOrder.getProductDate(),"yyyy-MM-dd")); + String productDate = workOrder.getProductDate().replace("-", ""); + sapRFW.setBudat(productDate); sapRFW.setRemark(workOrder.getRemark());//澶囨敞 logger.info(workOrder.getWorkorderCodeSap() + "sap宸ュ崟鎶ュ伐璇锋眰锛" + JSONObject.toJSONString(sapRFW)); //R r= R.ok(); @@ -939,7 +940,7 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { * @param workOrder * @return */ - private R preReportToSap(MesReportWork workOrder) { + private R preReportToSap(MesReportWork workOrder) throws Exception { Date nowTime = DateUtils.getNowDate(); SapRFW sapRFW = new SapRFW(); sapRFW.setAufnr(workOrder.getWorkorderCodeSap());//铏氭嫙宸ュ崟鍙 @@ -971,6 +972,8 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { // } sapRFW.setLt_hwList(lt_hwList); sapRFW.setAnzma(workOrder.getSapCode());//浜х嚎缂栧彿 + String productDate = workOrder.getProductDate().replace("-", ""); + sapRFW.setBudat(productDate); sapRFW.setRemark(workOrder.getRemark());//澶囨敞 logger.info(workOrder.getWorkorderCodeSap() + "sap宸ュ崟棰勬姤宸ヨ姹傦細" + JSONObject.toJSONString(sapRFW)); R r = remoteSapService.sapRFWOrder(sapRFW); From 77dc8ea64bafcef46158fabc778171beca77788e Mon Sep 17 00:00:00 2001 From: Yangwl <1726150332@qq.com> Date: Fri, 27 Jun 2025 17:35:27 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E6=96=B9=E6=B3=952?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/op/common/core/utils/DateUtils.java | 6 ------ .../op/mes/controller/MesLineAssistantQtyController.java | 7 +------ .../main/java/com/op/mes/service/IWCSInterfaceService.java | 2 +- .../com/op/mes/service/impl/IWCInterfaceServiceImpl.java | 3 ++- 4 files changed, 4 insertions(+), 14 deletions(-) diff --git a/op-common/op-common-core/src/main/java/com/op/common/core/utils/DateUtils.java b/op-common/op-common-core/src/main/java/com/op/common/core/utils/DateUtils.java index 140fca580..93cf0c102 100644 --- a/op-common/op-common-core/src/main/java/com/op/common/core/utils/DateUtils.java +++ b/op-common/op-common-core/src/main/java/com/op/common/core/utils/DateUtils.java @@ -159,11 +159,5 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils { ZonedDateTime zdt = localDateTime.atZone(ZoneId.systemDefault()); return Date.from(zdt.toInstant()); } - public static String formatToYYYYMMDD(String inputDate, String inputFormat) throws Exception { - SimpleDateFormat inputFormatter = new SimpleDateFormat(inputFormat); - SimpleDateFormat outputFormatter = new SimpleDateFormat("yyyyMMdd"); - Date date = inputFormatter.parse(inputDate); - return outputFormatter.format(date); - } } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesLineAssistantQtyController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesLineAssistantQtyController.java index 947070557..915986566 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesLineAssistantQtyController.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesLineAssistantQtyController.java @@ -7,14 +7,10 @@ import java.util.Map; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; -import com.op.common.core.domain.ExcelCol; -import com.op.common.core.utils.poi.ExcelMapUtil; -import com.op.common.core.utils.poi.ExcelMesDayEffMapUtil; + import com.op.mes.domain.MesLineAssistant; -import com.op.mes.domain.vo.DynamicColumnVo; import com.op.mes.domain.vo.MesDailyEfficiencyVo; import com.op.mes.domain.vo.MesLineAssistantQtyVo; -import org.apache.poi.xssf.streaming.SXSSFWorkbook; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -26,7 +22,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import com.op.common.log.annotation.Log; import com.op.common.log.enums.BusinessType; -import com.op.common.security.annotation.RequiresPermissions; import com.op.mes.domain.MesLineAssistantQty; import com.op.mes.service.IMesLineAssistantQtyService; import com.op.common.core.web.controller.BaseController; 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 dcb6c3a84..2453036a6 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 @@ -43,7 +43,7 @@ public interface IWCSInterfaceService { AjaxResult changeTransferResultTask(); - R prReportWork(MesReportWork mesReportWork); + R prReportWork(MesReportWork mesReportWork) throws Exception; Map getWhiteBoardEquPro7Days(BoardDTO boardDTO); 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 0904dd195..666e059e2 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 @@ -39,6 +39,7 @@ import java.math.RoundingMode; import java.time.LocalDate; import java.time.LocalDateTime; +import java.time.LocalTime; import java.time.format.DateTimeFormatter; import java.time.temporal.ChronoUnit; import java.util.*; @@ -589,7 +590,7 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { } @Override - public R prReportWork(MesReportWork mesReportWork) { + public R prReportWork(MesReportWork mesReportWork) throws Exception { //鏍规嵁belong_work_order鎵惧埌sap宸ュ崟(瀛愬瓙姣) List workOrders = mesReportWorkMapper.getSapWorkOrderByReport(mesReportWork.getReportCode()); From a799e801a01d2cfa06a48e78484ad1b0dad94341 Mon Sep 17 00:00:00 2001 From: Yangwl <1726150332@qq.com> Date: Fri, 27 Jun 2025 18:47:44 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/op/mes/controller/MesReportWorkController.java | 2 +- .../src/main/java/com/op/mes/service/IMesReportWorkService.java | 2 +- .../java/com/op/mes/service/impl/MesReportWorkServiceImpl.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java index a3cb852c9..00aec6351 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java @@ -750,7 +750,7 @@ public class MesReportWorkController extends BaseController { /**鎵规棰勬姤宸ユ暟鎹**/ @PostMapping("/preReportRow") - public AjaxResult preReportRow(@RequestBody MesReportWork mesReportWork) { + public AjaxResult preReportRow(@RequestBody MesReportWork mesReportWork) throws Exception { R r = mesReportWorkService.preReportRow(mesReportWork); if(r.getCode()==200){ return AjaxResult.success(); diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorkService.java b/op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorkService.java index 664a327ba..43106cdbc 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorkService.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorkService.java @@ -135,7 +135,7 @@ public interface IMesReportWorkService { int deleteReportNow(String reportCode); - R preReportRow(MesReportWork mesReportWork); + R preReportRow(MesReportWork mesReportWork) throws Exception; List getDailyReportNew(MesDailyReportVo mesDailyReportVo); List getDailyReportExportNew(MesDailyReportVo mesDailyReportVo); 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 b1c4a962f..9bfd31d1c 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 @@ -839,7 +839,7 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService { @Override @DS("#header.poolName") - public R preReportRow(MesReportWork mesReportWork) { + public R preReportRow(MesReportWork mesReportWork) throws Exception { mesReportWork.setFactoryCode(ServletUtils.getRequest().getHeader("PoolName")); R s = iWCSInterfaceService.prReportWork(mesReportWork); return s; From ec3a22b30b051bec8933d52ba720452ace0cbc0d Mon Sep 17 00:00:00 2001 From: Yangwl <1726150332@qq.com> Date: Tue, 1 Jul 2025 16:12:00 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=A7=E7=BA=BF?= =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E4=BA=A7=E7=BA=BF=E6=9F=A5=E8=AF=A2=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/op/mes/mapper/MesMapper.java | 2 + .../mes/service/impl/MesBoradServiceImpl.java | 286 ++++++++++-------- .../main/resources/mapper/mes/MesMapper.xml | 10 +- 3 files changed, 164 insertions(+), 134 deletions(-) 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 b6857862b..a3661b9f6 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 @@ -120,4 +120,6 @@ public interface MesMapper { Map getProductionNumberPLC(BoardDTO mesBoard); + + List getproductLineList(); } 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 1cc6dd759..d6204d340 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 @@ -55,6 +55,15 @@ public class MesBoradServiceImpl implements IMesBoradService { try { boardDTO.setEquipmentTypeCode("equ_type_bzx"); List lineList = mesMapper.getLineList(boardDTO); + if (boardDTO.getIsqua()!=null){ + //鏌ヨ褰撳ぉ鐢熶骇鐨勪骇绾 + List productLineList = mesMapper.getproductLineList(); + // 浣跨敤Stream杩囨护lineList锛屽彧淇濈暀equCode鍦╬roductLineList涓殑鏁版嵁 + lineList = lineList.stream() + .filter(item -> productLineList.contains(item.getEquCode())) + .collect(Collectors.toList()); + } + return lineList; }finally { DynamicDataSourceContextHolder.poll(); @@ -65,157 +74,180 @@ public class MesBoradServiceImpl implements IMesBoradService { @Override public BoardDTO getProduction15Days(BoardDTO boardDTO) { DynamicDataSourceContextHolder.push(boardDTO.getFactoryCode()); - BoardDTO dto = new BoardDTO(); + try { + BoardDTO dto = new BoardDTO(); - String nowDate = DateUtils.getDate(); + 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 pros15Plan = mesMapper.getProduction15Days(boardDTO); - Map pros15Act = mesMapper.getProduction15DaysAct(boardDTO); - MesReportWork todayPlandto = pros15Plan.get(nowDate); - MesReportWork todayActdto = pros15Act.get(nowDate); - if(todayPlandto != null){ - dto.setPlanProduction(todayPlandto.getQuantity().toString().replace(".00","")); - }else{ - dto.setPlanProduction("0"); - } - if(todayActdto != null){ - dto.setActProduction(todayActdto.getQuantityFeedback().toString().replace(".00","")); - }else{ - dto.setActProduction("0"); - } - //plans; - List plans = new ArrayList<>(); - List acts = new ArrayList<>(); - //acts; - for(String dayStr:days){ - MesReportWork workPlanR = pros15Plan.get(dayStr); - MesReportWork workActR = pros15Act.get(dayStr); - if(workPlanR != null){ - plans.add(workPlanR.getQuantity().toString()); + List days = this.getDays(15); + //days + dto.setDays(days); + boardDTO.setStartTime(days.get(0)); + boardDTO.setEndTime(days.get(days.size()-1)); + Map pros15Plan = mesMapper.getProduction15Days(boardDTO); + Map pros15Act = mesMapper.getProduction15DaysAct(boardDTO); + MesReportWork todayPlandto = pros15Plan.get(nowDate); + MesReportWork todayActdto = pros15Act.get(nowDate); + if(todayPlandto != null){ + dto.setPlanProduction(todayPlandto.getQuantity().toString().replace(".00","")); }else{ - plans.add("0"); + dto.setPlanProduction("0"); } - if(workActR != null){ - acts.add(workActR.getQuantityFeedback().toString()); + if(todayActdto != null){ + dto.setActProduction(todayActdto.getQuantityFeedback().toString().replace(".00","")); }else{ - acts.add("0"); + dto.setActProduction("0"); } + //plans; + List plans = new ArrayList<>(); + List acts = new ArrayList<>(); + //acts; + for(String dayStr:days){ + MesReportWork workPlanR = pros15Plan.get(dayStr); + MesReportWork workActR = pros15Act.get(dayStr); + if(workPlanR != null){ + plans.add(workPlanR.getQuantity().toString()); + }else{ + plans.add("0"); + } + if(workActR != null){ + acts.add(workActR.getQuantityFeedback().toString()); + }else{ + acts.add("0"); + } + } + dto.setPlans(plans); + dto.setActs(acts); + return dto; + }finally { + DynamicDataSourceContextHolder.poll(); } - dto.setPlans(plans); - dto.setActs(acts); - return dto; + } @Override public Map getProductionLineInfo(BoardDTO boardDTO) { DynamicDataSourceContextHolder.push(boardDTO.getFactoryCode()); - Map dtoMap = new HashMap<>(); - //褰撳墠宸ュ崟淇℃伅 - BoardDTO workOrder = mesMapper.getWorkOrder(boardDTO); + try { + Map dtoMap = new HashMap<>(); + //褰撳墠宸ュ崟淇℃伅 + BoardDTO workOrder = mesMapper.getWorkOrder(boardDTO); + + if(workOrder == null || StringUtils.isEmpty(workOrder.getWorkorderCode())){ + return dtoMap; + } + + boardDTO.setWorkorderCode(workOrder.getWorkorderCode()); + boardDTO.setProductCode(workOrder.getProductCode()); + MesLine meslineInfo = mesMapper.getMesLineInfo(boardDTO); + + QuantityDto quantityDto = new QuantityDto(); + quantityDto.setWorkorderCode(boardDTO.getWorkorderCode()); + quantityDto.setMachineCode(boardDTO.getEquCode()); + quantityDto.setBoard("1"); + QuantityDto parentMesReport = mesReportWorkMapper.getRealQuantity(quantityDto); + QuantityDto sonMesReport = mesReportWorkMapper.getSumQuantity(quantityDto); + if(sonMesReport == null){//鍗曞眰宸ュ崟鐨勬儏鍐 + sonMesReport = mesReportWorkMapper.getSumQuantityOne(quantityDto); + } + if(sonMesReport != null){//瀹為檯鐢ㄤ汉 + workOrder.setActMan(sonMesReport.getUseMan()); + }else{ + workOrder.setActMan(new BigDecimal("0")); + } + if(parentMesReport!=null){//瀹為檯鏁堢巼 = 瀹為檯姣嶅崟浜ч噺/瀛愭诲伐鏃 + BigDecimal manAvgActual = new BigDecimal(parentMesReport.getQuantityFeedbackSum()) + .divide(sonMesReport.getWorkTime(),2,BigDecimal.ROUND_HALF_UP); + workOrder.setActXl(manAvgActual); + }else{ + workOrder.setActXl(new BigDecimal("0")); + } + + if(meslineInfo != null){ + workOrder.setStandarMan(meslineInfo.getStandarMan()); + workOrder.setStandarXl(meslineInfo.getStandarXl()); + }else{ + workOrder.setStandarMan(new BigDecimal("0")); + workOrder.setStandarXl(new BigDecimal("0")); + } + + dtoMap.put("workOrder",workOrder); + + QcCheckTaskDTO taskDTO = mesMapper.getTaskInfo(boardDTO); + BoardDTO task2 = new BoardDTO(); + if(taskDTO.getQuality() != null){ + task2.setTaskNum(taskDTO.getQuality().toString()); + }else{ + task2.setTaskNum("0"); + } + dtoMap.put("taskNum",task2);//宸℃娆℃暟 + + BoardDTO task3 = new BoardDTO(); + if(taskDTO.getSampleQuality() != null){ + task3.setTaskSampleNum(taskDTO.getSampleQuality().toString()); + }else{ + task3.setTaskSampleNum("0"); + } + dtoMap.put("taskSampleNum",task3);//宸℃鎶芥牱鏁伴噺 + + BoardDTO task4 = new BoardDTO(); + List checkList = mesMapper.getCheckList(boardDTO); + if(!CollectionUtils.isEmpty(checkList)){ + task4.setCheckList(checkList); + } + dtoMap.put("piedata",task4);//宸℃缁撴灉 - if(workOrder == null || StringUtils.isEmpty(workOrder.getWorkorderCode())){ return dtoMap; + }finally { + DynamicDataSourceContextHolder.poll(); } - boardDTO.setWorkorderCode(workOrder.getWorkorderCode()); - boardDTO.setProductCode(workOrder.getProductCode()); - MesLine meslineInfo = mesMapper.getMesLineInfo(boardDTO); - - QuantityDto quantityDto = new QuantityDto(); - quantityDto.setWorkorderCode(boardDTO.getWorkorderCode()); - quantityDto.setMachineCode(boardDTO.getEquCode()); - quantityDto.setBoard("1"); - QuantityDto parentMesReport = mesReportWorkMapper.getRealQuantity(quantityDto); - QuantityDto sonMesReport = mesReportWorkMapper.getSumQuantity(quantityDto); - if(sonMesReport == null){//鍗曞眰宸ュ崟鐨勬儏鍐 - sonMesReport = mesReportWorkMapper.getSumQuantityOne(quantityDto); - } - if(sonMesReport != null){//瀹為檯鐢ㄤ汉 - workOrder.setActMan(sonMesReport.getUseMan()); - }else{ - workOrder.setActMan(new BigDecimal("0")); - } - if(parentMesReport!=null){//瀹為檯鏁堢巼 = 瀹為檯姣嶅崟浜ч噺/瀛愭诲伐鏃 - BigDecimal manAvgActual = new BigDecimal(parentMesReport.getQuantityFeedbackSum()) - .divide(sonMesReport.getWorkTime(),2,BigDecimal.ROUND_HALF_UP); - workOrder.setActXl(manAvgActual); - }else{ - workOrder.setActXl(new BigDecimal("0")); - } - - if(meslineInfo != null){ - workOrder.setStandarMan(meslineInfo.getStandarMan()); - workOrder.setStandarXl(meslineInfo.getStandarXl()); - }else{ - workOrder.setStandarMan(new BigDecimal("0")); - workOrder.setStandarXl(new BigDecimal("0")); - } - - dtoMap.put("workOrder",workOrder); - - QcCheckTaskDTO taskDTO = mesMapper.getTaskInfo(boardDTO); - BoardDTO task2 = new BoardDTO(); - if(taskDTO.getQuality() != null){ - task2.setTaskNum(taskDTO.getQuality().toString()); - }else{ - task2.setTaskNum("0"); - } - dtoMap.put("taskNum",task2);//宸℃娆℃暟 - - BoardDTO task3 = new BoardDTO(); - if(taskDTO.getSampleQuality() != null){ - task3.setTaskSampleNum(taskDTO.getSampleQuality().toString()); - }else{ - task3.setTaskSampleNum("0"); - } - dtoMap.put("taskSampleNum",task3);//宸℃鎶芥牱鏁伴噺 - - BoardDTO task4 = new BoardDTO(); - List checkList = mesMapper.getCheckList(boardDTO); - if(!CollectionUtils.isEmpty(checkList)){ - task4.setCheckList(checkList); - } - dtoMap.put("piedata",task4);//宸℃缁撴灉 - - return dtoMap; } @Override public List getPorOrderList(BoardDTO boardDTO) { DynamicDataSourceContextHolder.push(boardDTO.getFactoryCode()); - List dtos = mesMapper.getPorOrderList(boardDTO); - return dtos; + try{ + List dtos = mesMapper.getPorOrderList(boardDTO); + return dtos; + }finally { + DynamicDataSourceContextHolder.poll(); + } } @Override public List getHFProInfo(BoardDTO boardDTO) { DynamicDataSourceContextHolder.push(boardDTO.getFactoryCode()); - List dtos = mesMapper.getHFProInfo(boardDTO); - return dtos; + try { + List dtos = mesMapper.getHFProInfo(boardDTO); + return dtos; + }finally { + DynamicDataSourceContextHolder.poll(); + } } @Override public List getHFQcInfo(BoardDTO boardDTO) { DynamicDataSourceContextHolder.push(boardDTO.getFactoryCode()); - List dtos = mesMapper.getHFQcInfo(boardDTO); -// if(!CollectionUtils.isEmpty(dtos)){ -// //涓嶅悎鏍 -// List isquas = dtos.stream().filter(a -> a.getIsqua().equals("0")).collect(Collectors.toList()); -// dtos.get(0).setTaskNum(isquas.size()+""); -// } - return dtos; + try { + List dtos = mesMapper.getHFQcInfo(boardDTO); + return dtos; + }finally { + DynamicDataSourceContextHolder.poll(); + } + } @Override public List getHFxlInfo(BoardDTO boardDTO) { DynamicDataSourceContextHolder.push(boardDTO.getFactoryCode()); - List dtos = mesMapper.getHFxlInfo(boardDTO); - return dtos; + try { + List dtos = mesMapper.getHFxlInfo(boardDTO); + return dtos; + }finally { + DynamicDataSourceContextHolder.poll(); + } + } @@ -240,24 +272,12 @@ public class MesBoradServiceImpl implements IMesBoradService { @Override public Map getProductionNumberPLC(BoardDTO mesBoard) { DynamicDataSourceContextHolder.push(mesBoard.getFactoryCode()); - Map mapList = mesMapper.getProductionNumberPLC(mesBoard); - return mapList; - } - - public static void main(String[] args){ - List 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())); + try { + Map mapList = mesMapper.getProductionNumberPLC(mesBoard); + return mapList; + }finally { + DynamicDataSourceContextHolder.poll(); } - 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 3054cc29f..87788053c 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 @@ -387,7 +387,7 @@ and del_flag = '0' group by workorder_code,batch )t on t0.workorderCode = t.workorder_code and t0.batchCode = t.batch - order by t0.batchCode + order by t0.workorderCodeSap ASC,t0.batchCode + From 520ca5a284314c2b8236db0de0f922212a6151b0 Mon Sep 17 00:00:00 2001 From: Yangwl <1726150332@qq.com> Date: Fri, 4 Jul 2025 16:41:06 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=85=E9=9A=9C=E6=8F=8F=E8=BF=B0=E5=92=8C?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=B1=BB=E5=9E=8B=E7=BB=91=E5=AE=9A=EF=BC=8C?= =?UTF-8?q?=E8=B4=A8=E9=87=8F=E6=A8=A1=E5=9D=97=E6=9D=A5=E6=96=99=E6=8A=A5?= =?UTF-8?q?=E5=91=8A=E5=AF=BC=E5=87=BA=E8=B0=83=E6=95=B4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/utils/poi/ExcelReportMapUtil.java | 744 +++++++++--------- .../com/op/device/domain/EquTeamUser.java | 25 + .../service/impl/DevicePDAServiceImpl.java | 1 + .../service/impl/DeviceTaskServiceImpl.java | 1 + .../service/impl/EquTeamServiceImpl.java | 4 +- .../mapper/device/EquRepairOrderMapper.xml | 2 +- .../resources/mapper/device/EquTeamMapper.xml | 14 +- .../mapper/plan/ProOrderWorkorderMapper.xml | 10 +- .../QcCheckTaskIncomeController.java | 2 +- .../impl/QcCheckTaskIncomeServiceImpl.java | 1 + 10 files changed, 420 insertions(+), 384 deletions(-) diff --git a/op-common/op-common-core/src/main/java/com/op/common/core/utils/poi/ExcelReportMapUtil.java b/op-common/op-common-core/src/main/java/com/op/common/core/utils/poi/ExcelReportMapUtil.java index 3c9423db2..5e00dc2b2 100644 --- a/op-common/op-common-core/src/main/java/com/op/common/core/utils/poi/ExcelReportMapUtil.java +++ b/op-common/op-common-core/src/main/java/com/op/common/core/utils/poi/ExcelReportMapUtil.java @@ -25,240 +25,240 @@ import java.util.Map; * @author OP */ public class ExcelReportMapUtil { - //涓嬭浇 - public static SXSSFWorkbook initWorkbook(String sheetName , String title, List excelCol , List data, Map detailMap) throws IOException { - SXSSFWorkbook workbook = new SXSSFWorkbook(); - int colSize = excelCol.size(); + //涓嬭浇 + public static SXSSFWorkbook initWorkbook(String sheetName , String title, List excelCol , List data, Map detailMap) throws IOException { + SXSSFWorkbook workbook = new SXSSFWorkbook(); + int colSize = excelCol.size(); - //鍒涘缓Sheet锛堝伐浣滅翱锛 - Sheet sheet = null; - if (!StringUtils.hasText(sheetName)){ - sheet = workbook.createSheet(); - }else{ - sheet = workbook.createSheet(sheetName); - } + //鍒涘缓Sheet锛堝伐浣滅翱锛 + Sheet sheet = null; + if (!StringUtils.hasText(sheetName)){ + sheet = workbook.createSheet(); + }else{ + sheet = workbook.createSheet(sheetName); + } - // 浠巖esources鐩綍鑾峰彇鍥剧墖瀛楄妭鏁扮粍 - byte[] imageBytes = getImageBytesFromResources("image/logo.png"); - /**logo**/ - int pictureIdx = workbook.addPicture(imageBytes, Workbook.PICTURE_TYPE_PNG); - CreationHelper helper = workbook.getCreationHelper(); - Drawing drawing = sheet.createDrawingPatriarch(); - ClientAnchor anchor = helper.createClientAnchor(); - anchor.setCol1(0); // B鍒 - anchor.setRow1(0); // 绗2琛岋紙Excel鐨勮鍜屽垪閮芥槸浠0寮濮嬭鏁扮殑锛 - anchor.setCol2(1); // C鍒楋紙鍥剧墖瀹藉害璺ㄨ秺鐨勫垪鏁帮紝杩欓噷璁剧疆涓1鍒楀锛 - anchor.setRow2(2); // 绗6琛岋紙鍥剧墖楂樺害璺ㄨ秺鐨勮鏁帮紝杩欓噷璁剧疆涓4琛岄珮锛屽彲浠ユ牴鎹浘鐗囧ぇ灏忚皟鏁达級 - Picture pict = drawing.createPicture(anchor, pictureIdx); - pict.resize(); // 鏍规嵁鍥剧墖鐨勫疄闄呭ぇ灏忚皟鏁村浘鐗囧湪Excel涓殑鏄剧ず澶у皬 - /**鎶ュ憡鏍囬**/ - sheet.addMergedRegion(new CellRangeAddress(0, 1, 2, 11)); - // 鑾峰彇鍚堝苟鍚庣殑鍗曞厓鏍肩殑绗竴涓崟鍏冩牸锛堝嵆C1锛夛紝骞惰缃 - Row row1 = sheet.getRow(0); // 鑾峰彇绗1琛岋紙绱㈠紩涓0锛 - if (row1 == null) {row1 = sheet.createRow(0); // 濡傛灉绗1琛屼笉瀛樺湪锛屽垯鍒涘缓瀹 - } - Cell cell = row1.getCell(2); // 鑾峰彇C鍒楋紙绱㈠紩涓2锛夌殑鍗曞厓鏍 - if (cell == null) { - cell = row1.createCell(2); // 濡傛灉C鍒楃殑鍗曞厓鏍间笉瀛樺湪锛屽垯鍒涘缓瀹 - } - cell.setCellValue("涓北姒勮強鏃ュ寲瀹炰笟鏈夐檺鍏徃"); // 璁剧疆鍗曞厓鏍肩殑鍊 - cell.setCellStyle(getTitelStyle(workbook)); // 搴旂敤鏍峰紡鍒板崟鍏冩牸 - /**鎶ュ憡浜岀骇鏍囬銆佹楠屾爣鍑**/ - // 鍚堝苟C3鍒癐4鐨勫崟鍏冩牸锛屽苟璁剧疆鏍峰紡 - mergeAndStyleCells(sheet, new CellRangeAddress(2, 3, 2, 8), detailMap.get("title")); - // 鍚堝苟J3鍒癓4鐨勫崟鍏冩牸锛屽苟璁剧疆鏍峰紡 - mergeAndStyleCells(sheet, new CellRangeAddress(2, 3, 9, 12), "缂栫爜锛"+detailMap.get("fileNo")); - /**宸﹀彸琛ㄦ牸1**/ - //鐢昏竟妗 - for(int r5=4;r5<13;r5++){ - Row row05 = sheet.getRow(r5); - if (row05 == null) {row05 = sheet.createRow(r5);} - for (int col = 0; col < 14; col++) { - Cell cell1 = row05.createCell(col); - cell1.setCellStyle(getRowStyle(sheet)); - } - } - for(int d5=13;d5<(13+data.size());d5++){ - Row row05 = sheet.getRow(d5); - if (row05 == null) {row05 = sheet.createRow(d5);} - for (int col = 0; col < 14; col++) { - Cell cell1 = row05.createCell(col); - cell1.setCellStyle(getDataStyle(sheet)); - } - } + // 浠巖esources鐩綍鑾峰彇鍥剧墖瀛楄妭鏁扮粍 + byte[] imageBytes = getImageBytesFromResources("image/logo.png"); + /**logo**/ + int pictureIdx = workbook.addPicture(imageBytes, Workbook.PICTURE_TYPE_PNG); + CreationHelper helper = workbook.getCreationHelper(); + Drawing drawing = sheet.createDrawingPatriarch(); + ClientAnchor anchor = helper.createClientAnchor(); + anchor.setCol1(0); // B鍒 + anchor.setRow1(0); // 绗2琛岋紙Excel鐨勮鍜屽垪閮芥槸浠0寮濮嬭鏁扮殑锛 + anchor.setCol2(1); // C鍒楋紙鍥剧墖瀹藉害璺ㄨ秺鐨勫垪鏁帮紝杩欓噷璁剧疆涓1鍒楀锛 + anchor.setRow2(2); // 绗6琛岋紙鍥剧墖楂樺害璺ㄨ秺鐨勮鏁帮紝杩欓噷璁剧疆涓4琛岄珮锛屽彲浠ユ牴鎹浘鐗囧ぇ灏忚皟鏁达級 + Picture pict = drawing.createPicture(anchor, pictureIdx); + pict.resize(); // 鏍规嵁鍥剧墖鐨勫疄闄呭ぇ灏忚皟鏁村浘鐗囧湪Excel涓殑鏄剧ず澶у皬 + /**鎶ュ憡鏍囬**/ + sheet.addMergedRegion(new CellRangeAddress(0, 1, 2, 11)); + // 鑾峰彇鍚堝苟鍚庣殑鍗曞厓鏍肩殑绗竴涓崟鍏冩牸锛堝嵆C1锛夛紝骞惰缃 + Row row1 = sheet.getRow(0); // 鑾峰彇绗1琛岋紙绱㈠紩涓0锛 + if (row1 == null) {row1 = sheet.createRow(0); // 濡傛灉绗1琛屼笉瀛樺湪锛屽垯鍒涘缓瀹 + } + Cell cell = row1.getCell(2); // 鑾峰彇C鍒楋紙绱㈠紩涓2锛夌殑鍗曞厓鏍 + if (cell == null) { + cell = row1.createCell(2); // 濡傛灉C鍒楃殑鍗曞厓鏍间笉瀛樺湪锛屽垯鍒涘缓瀹 + } + cell.setCellValue("涓北姒勮強鏃ュ寲瀹炰笟鏈夐檺鍏徃"); // 璁剧疆鍗曞厓鏍肩殑鍊 + cell.setCellStyle(getTitelStyle(workbook)); // 搴旂敤鏍峰紡鍒板崟鍏冩牸 + /**鎶ュ憡浜岀骇鏍囬銆佹楠屾爣鍑**/ + // 鍚堝苟C3鍒癐4鐨勫崟鍏冩牸锛屽苟璁剧疆鏍峰紡 + mergeAndStyleCells(sheet, new CellRangeAddress(2, 3, 2, 8), detailMap.get("title")); + // 鍚堝苟J3鍒癓4鐨勫崟鍏冩牸锛屽苟璁剧疆鏍峰紡 + mergeAndStyleCells(sheet, new CellRangeAddress(2, 3, 9, 12), "缂栫爜锛"+detailMap.get("fileNo")); + /**宸﹀彸琛ㄦ牸1**/ + //鐢昏竟妗 + for(int r5=4;r5<13;r5++){ + Row row05 = sheet.getRow(r5); + if (row05 == null) {row05 = sheet.createRow(r5);} + for (int col = 0; col < 14; col++) { + Cell cell1 = row05.createCell(col); + cell1.setCellStyle(getRowStyle(sheet)); + } + } + for(int d5=13;d5<(13+data.size());d5++){ + Row row05 = sheet.getRow(d5); + if (row05 == null) {row05 = sheet.createRow(d5);} + for (int col = 0; col < 14; col++) { + Cell cell1 = row05.createCell(col); + cell1.setCellStyle(getDataStyle(sheet)); + } + } - Row row5 = sheet.getRow(4); - // 鍚堝苟A5鍒癇6鐨勫崟鍏冩牸锛屽苟璁剧疆鏍峰紡鍜屽唴瀹 - mergeAndStyleCells2(sheet,row5, new CellRangeAddress(4, 5, 0, 1), "鏉ユ枡绫诲埆", true, true, IndexedColors.GREY_25_PERCENT); - // 鍚堝苟C5鍒癉6鐨勫崟鍏冩牸锛屽苟璁剧疆鏍峰紡锛堟棤鑳屾櫙鑹诧紝鍙湁杈规鍜屽唴瀹瑰眳涓級 - mergeAndStyleCells2(sheet,row5, new CellRangeAddress(4, 5, 2, 3), detailMap.get("productGroupName"), true, false, null); - // 鍚堝苟E5鍒癋6鐨勫崟鍏冩牸锛屽苟璁剧疆鏍峰紡鍜屽唴瀹 - mergeAndStyleCells2(sheet,row5, new CellRangeAddress(4, 5, 4, 5), "鐢熶骇鎵瑰彿", true, true, IndexedColors.GREY_25_PERCENT); - // 鍚堝苟G5鍒癐6鐨勫崟鍏冩牸锛屽苟璁剧疆鏍峰紡锛堟棤鑳屾櫙鑹诧紝鍙湁杈规鍜屽唴瀹瑰眳涓級 - mergeAndStyleCells2(sheet,row5, new CellRangeAddress(4, 5, 6, 8), detailMap.get("incomeBatchNo"), true, false, null); - // 鍚堝苟J5鍒癒6鐨勫崟鍏冩牸锛屽苟璁剧疆鏍峰紡鍜屽唴瀹 - mergeAndStyleCells2(sheet,row5, new CellRangeAddress(4, 5, 9, 10), "鎶ュ憡缂栧彿", true, true, IndexedColors.GREY_25_PERCENT); - // 鍚堝苟L5鍒癗6鐨勫崟鍏冩牸锛屽苟璁剧疆鏍峰紡锛堟棤鑳屾櫙鑹诧紝鍙湁杈规鍜屽唴瀹瑰眳涓級 - mergeAndStyleCells2(sheet,row5, new CellRangeAddress(4, 5, 11, 13), detailMap.get("checkNo"), true, false, null); - Row row7 = sheet.getRow(6); - // 鍚堝苟A7鍒癇8鐨勫崟鍏冩牸锛屽苟璁剧疆鏍峰紡鍜屽唴瀹 - mergeAndStyleCells2(sheet,row7, new CellRangeAddress(6, 7, 0, 1), "鐗╂枡鍚嶇О", true, true, IndexedColors.GREY_25_PERCENT); - // 鍚堝苟C5鍒癉6鐨勫崟鍏冩牸锛屽苟璁剧疆鏍峰紡锛堟棤鑳屾櫙鑹诧紝鍙湁杈规鍜屽唴瀹瑰眳涓級 - mergeAndStyleCells2(sheet,row7, new CellRangeAddress(6, 7, 2, 3), detailMap.get("materialName"), true, false, null); - // 鍚堝苟E5鍒癋6鐨勫崟鍏冩牸锛屽苟璁剧疆鏍峰紡鍜屽唴瀹 - mergeAndStyleCells2(sheet,row7, new CellRangeAddress(6, 7, 4, 5), "鐗╂枡缂栫爜", true, true, IndexedColors.GREY_25_PERCENT); - // 鍚堝苟G5鍒癐6鐨勫崟鍏冩牸锛屽苟璁剧疆鏍峰紡锛堟棤鑳屾櫙鑹诧紝鍙湁杈规鍜屽唴瀹瑰眳涓級 - mergeAndStyleCells2(sheet,row7, new CellRangeAddress(6, 7, 6, 8), detailMap.get("materialCode"), true, false, null); - // 鍚堝苟J5鍒癒6鐨勫崟鍏冩牸锛屽苟璁剧疆鏍峰紡鍜屽唴瀹 - mergeAndStyleCells2(sheet,row7, new CellRangeAddress(6, 7, 9, 10), "渚涘簲鍗曚綅", true, true, IndexedColors.GREY_25_PERCENT); - // 鍚堝苟L5鍒癗6鐨勫崟鍏冩牸锛屽苟璁剧疆鏍峰紡锛堟棤鑳屾櫙鑹诧紝鍙湁杈规鍜屽唴瀹瑰眳涓級 - mergeAndStyleCells2(sheet,row7, new CellRangeAddress(6, 7, 11, 13), detailMap.get("supplierName"), true, false, null); - Row row9 = sheet.getRow(8); - // 鍚堝苟A7鍒癇8鐨勫崟鍏冩牸锛屽苟璁剧疆鏍峰紡鍜屽唴瀹 - mergeAndStyleCells2(sheet,row9, new CellRangeAddress(8, 9, 0, 1), "渚涘簲缂栫爜", true, true, IndexedColors.GREY_25_PERCENT); - // 鍚堝苟C5鍒癉6鐨勫崟鍏冩牸锛屽苟璁剧疆鏍峰紡锛堟棤鑳屾櫙鑹诧紝鍙湁杈规鍜屽唴瀹瑰眳涓級 - mergeAndStyleCells2(sheet,row9, new CellRangeAddress(8, 9, 2, 3), detailMap.get("supplierCode"), true, false, null); - // 鍚堝苟E5鍒癋6鐨勫崟鍏冩牸锛屽苟璁剧疆鏍峰紡鍜屽唴瀹 - mergeAndStyleCells2(sheet,row9, new CellRangeAddress(8, 9, 4, 5), "鏉ユ枡鏁伴噺", true, true, IndexedColors.GREY_25_PERCENT); - // 鍚堝苟G5鍒癐6鐨勫崟鍏冩牸锛屽苟璁剧疆鏍峰紡锛堟棤鑳屾櫙鑹诧紝鍙湁杈规鍜屽唴瀹瑰眳涓級 - mergeAndStyleCells2(sheet,row9, new CellRangeAddress(8, 9,6, 8), detailMap.get("quality"), true, false, null); - // 鍚堝苟J5鍒癒6鐨勫崟鍏冩牸锛屽苟璁剧疆鏍峰紡鍜屽唴瀹 - mergeAndStyleCells2(sheet,row9, new CellRangeAddress(8, 9, 9, 10), "鍗曚綅", true, true, IndexedColors.GREY_25_PERCENT); - // 鍚堝苟L5鍒癗6鐨勫崟鍏冩牸锛屽苟璁剧疆鏍峰紡锛堟棤鑳屾櫙鑹诧紝鍙湁杈规鍜屽唴瀹瑰眳涓級 - mergeAndStyleCells2(sheet,row9, new CellRangeAddress(8, 9, 11, 13), detailMap.get("unit"), true, false, null); - Row row10 = sheet.getRow(10); - // 鍚堝苟A7鍒癇8鐨勫崟鍏冩牸锛屽苟璁剧疆鏍峰紡鍜屽唴瀹 - mergeAndStyleCells2(sheet,row10, new CellRangeAddress(10, 11, 0, 1), "鐗╂枡鏉ユ簮", true, true, IndexedColors.GREY_25_PERCENT); - // 鍚堝苟C5鍒癉6鐨勫崟鍏冩牸锛屽苟璁剧疆鏍峰紡锛堟棤鑳屾櫙鑹诧紝鍙湁杈规鍜屽唴瀹瑰眳涓級 - mergeAndStyleCells2(sheet,row10, new CellRangeAddress(10, 11, 2, 3), detailMap.get("checkType"), true, false, null); - // 鍚堝苟E5鍒癋6鐨勫崟鍏冩牸锛屽苟璁剧疆鏍峰紡鍜屽唴瀹 - mergeAndStyleCells2(sheet,row10, new CellRangeAddress(10, 11, 4, 5), "妫楠屼緷鎹", true, true, IndexedColors.GREY_25_PERCENT); - // 鍚堝苟G5鍒癐6鐨勫崟鍏冩牸锛屽苟璁剧疆鏍峰紡锛堟棤鑳屾櫙鑹诧紝鍙湁杈规鍜屽唴瀹瑰眳涓級 - mergeAndStyleCells2(sheet,row10, new CellRangeAddress(10, 11,6, 8), detailMap.get("standardNo"), true, false, null); - // 鍚堝苟J5鍒癒6鐨勫崟鍏冩牸锛屽苟璁剧疆鏍峰紡鍜屽唴瀹 - mergeAndStyleCells2(sheet,row10, new CellRangeAddress(10, 11, 9, 10), "鎶ユ鏃ユ湡", true, true, IndexedColors.GREY_25_PERCENT); - // 鍚堝苟L5鍒癗6鐨勫崟鍏冩牸锛屽苟璁剧疆鏍峰紡锛堟棤鑳屾櫙鑹诧紝鍙湁杈规鍜屽唴瀹瑰眳涓級 - mergeAndStyleCells2(sheet,row10, new CellRangeAddress(10, 11, 11, 13), detailMap.get("incomeTime"), true, false, null); - /**涓婁笅琛ㄦ牸2**/ - Row row12 = sheet.getRow(12); - if (row12 == null) {row12 = sheet.createRow(12);} - Cell cellA13 = row12.createCell(0); - cellA13.setCellValue("搴忓彿"); - cellA13.setCellStyle(getRowStyle(sheet)); - mergeAndStyleCells(sheet, new CellRangeAddress(12, 12, 1, 4), "妫楠岄」鐩"); - mergeAndStyleCells(sheet, new CellRangeAddress(12, 12, 5, 8), "鏍囧噯瑕佹眰"); - mergeAndStyleCells(sheet, new CellRangeAddress(12, 12, 9, 10), "瀹炴祴缁撴灉"); - Cell cellL13 = row12.createCell(11); - cellL13.setCellValue("鍒ゅ畾"); - cellL13.setCellStyle(getRowStyle(sheet)); - mergeAndStyleCells(sheet, new CellRangeAddress(12, 12, 12, 13), "闄勪欢"); - //灏哾ata涓殑鍊煎～鍏呭埌excel - int rowNum = 13; - if(!CollectionUtils.isEmpty(data)){ - Iterator iterator = data.iterator(); - //閬嶅巻鏁版嵁 - for (;iterator.hasNext();){ + Row row5 = sheet.getRow(4); + // 鍚堝苟A5鍒癇6鐨勫崟鍏冩牸锛屽苟璁剧疆鏍峰紡鍜屽唴瀹 + mergeAndStyleCells2(sheet,row5, new CellRangeAddress(4, 5, 0, 1), "鏉ユ枡绫诲埆", true, true, IndexedColors.GREY_25_PERCENT); + // 鍚堝苟C5鍒癉6鐨勫崟鍏冩牸锛屽苟璁剧疆鏍峰紡锛堟棤鑳屾櫙鑹诧紝鍙湁杈规鍜屽唴瀹瑰眳涓級 + mergeAndStyleCells2(sheet,row5, new CellRangeAddress(4, 5, 2, 3), detailMap.get("productGroupName"), true, false, null); + // 鍚堝苟E5鍒癋6鐨勫崟鍏冩牸锛屽苟璁剧疆鏍峰紡鍜屽唴瀹 + mergeAndStyleCells2(sheet,row5, new CellRangeAddress(4, 5, 4, 5), "鐢熶骇鎵瑰彿", true, true, IndexedColors.GREY_25_PERCENT); + // 鍚堝苟G5鍒癐6鐨勫崟鍏冩牸锛屽苟璁剧疆鏍峰紡锛堟棤鑳屾櫙鑹诧紝鍙湁杈规鍜屽唴瀹瑰眳涓級 + mergeAndStyleCells2(sheet,row5, new CellRangeAddress(4, 5, 6, 8), detailMap.get("incomeBatchNo"), true, false, null); + // 鍚堝苟J5鍒癒6鐨勫崟鍏冩牸锛屽苟璁剧疆鏍峰紡鍜屽唴瀹 + mergeAndStyleCells2(sheet,row5, new CellRangeAddress(4, 5, 9, 10), "鎶ュ憡缂栧彿", true, true, IndexedColors.GREY_25_PERCENT); + // 鍚堝苟L5鍒癗6鐨勫崟鍏冩牸锛屽苟璁剧疆鏍峰紡锛堟棤鑳屾櫙鑹诧紝鍙湁杈规鍜屽唴瀹瑰眳涓級 + mergeAndStyleCells2(sheet,row5, new CellRangeAddress(4, 5, 11, 13), detailMap.get("checkNo"), true, false, null); + Row row7 = sheet.getRow(6); + // 鍚堝苟A7鍒癇8鐨勫崟鍏冩牸锛屽苟璁剧疆鏍峰紡鍜屽唴瀹 + mergeAndStyleCells2(sheet,row7, new CellRangeAddress(6, 7, 0, 1), "鐗╂枡鍚嶇О", true, true, IndexedColors.GREY_25_PERCENT); + // 鍚堝苟C5鍒癉6鐨勫崟鍏冩牸锛屽苟璁剧疆鏍峰紡锛堟棤鑳屾櫙鑹诧紝鍙湁杈规鍜屽唴瀹瑰眳涓級 + mergeAndStyleCells2(sheet,row7, new CellRangeAddress(6, 7, 2, 3), detailMap.get("materialName"), true, false, null); + // 鍚堝苟E5鍒癋6鐨勫崟鍏冩牸锛屽苟璁剧疆鏍峰紡鍜屽唴瀹 + mergeAndStyleCells2(sheet,row7, new CellRangeAddress(6, 7, 4, 5), "鐗╂枡缂栫爜", true, true, IndexedColors.GREY_25_PERCENT); + // 鍚堝苟G5鍒癐6鐨勫崟鍏冩牸锛屽苟璁剧疆鏍峰紡锛堟棤鑳屾櫙鑹诧紝鍙湁杈规鍜屽唴瀹瑰眳涓級 + mergeAndStyleCells2(sheet,row7, new CellRangeAddress(6, 7, 6, 8), detailMap.get("materialCode"), true, false, null); + // 鍚堝苟J5鍒癒6鐨勫崟鍏冩牸锛屽苟璁剧疆鏍峰紡鍜屽唴瀹 + mergeAndStyleCells2(sheet,row7, new CellRangeAddress(6, 7, 9, 10), "渚涘簲鍗曚綅", true, true, IndexedColors.GREY_25_PERCENT); + // 鍚堝苟L5鍒癗6鐨勫崟鍏冩牸锛屽苟璁剧疆鏍峰紡锛堟棤鑳屾櫙鑹诧紝鍙湁杈规鍜屽唴瀹瑰眳涓級 + mergeAndStyleCells2(sheet,row7, new CellRangeAddress(6, 7, 11, 13), detailMap.get("supplierName"), true, false, null); + Row row9 = sheet.getRow(8); + // 鍚堝苟A7鍒癇8鐨勫崟鍏冩牸锛屽苟璁剧疆鏍峰紡鍜屽唴瀹 + mergeAndStyleCells2(sheet,row9, new CellRangeAddress(8, 9, 0, 1), "渚涘簲缂栫爜", true, true, IndexedColors.GREY_25_PERCENT); + // 鍚堝苟C5鍒癉6鐨勫崟鍏冩牸锛屽苟璁剧疆鏍峰紡锛堟棤鑳屾櫙鑹诧紝鍙湁杈规鍜屽唴瀹瑰眳涓級 + mergeAndStyleCells2(sheet,row9, new CellRangeAddress(8, 9, 2, 3), detailMap.get("supplierCode"), true, false, null); + // 鍚堝苟E5鍒癋6鐨勫崟鍏冩牸锛屽苟璁剧疆鏍峰紡鍜屽唴瀹 + mergeAndStyleCells2(sheet,row9, new CellRangeAddress(8, 9, 4, 5), "鏉ユ枡鏁伴噺", true, true, IndexedColors.GREY_25_PERCENT); + // 鍚堝苟G5鍒癐6鐨勫崟鍏冩牸锛屽苟璁剧疆鏍峰紡锛堟棤鑳屾櫙鑹诧紝鍙湁杈规鍜屽唴瀹瑰眳涓級 + mergeAndStyleCells2(sheet,row9, new CellRangeAddress(8, 9,6, 8), detailMap.get("quality"), true, false, null); + // 鍚堝苟J5鍒癒6鐨勫崟鍏冩牸锛屽苟璁剧疆鏍峰紡鍜屽唴瀹 + mergeAndStyleCells2(sheet,row9, new CellRangeAddress(8, 9, 9, 10), "鍗曚綅", true, true, IndexedColors.GREY_25_PERCENT); + // 鍚堝苟L5鍒癗6鐨勫崟鍏冩牸锛屽苟璁剧疆鏍峰紡锛堟棤鑳屾櫙鑹诧紝鍙湁杈规鍜屽唴瀹瑰眳涓級 + mergeAndStyleCells2(sheet,row9, new CellRangeAddress(8, 9, 11, 13), detailMap.get("unit"), true, false, null); + Row row10 = sheet.getRow(10); + // 鍚堝苟A7鍒癇8鐨勫崟鍏冩牸锛屽苟璁剧疆鏍峰紡鍜屽唴瀹 + mergeAndStyleCells2(sheet,row10, new CellRangeAddress(10, 11, 0, 1), "鐗╂枡鏉ユ簮", true, true, IndexedColors.GREY_25_PERCENT); + // 鍚堝苟C5鍒癉6鐨勫崟鍏冩牸锛屽苟璁剧疆鏍峰紡锛堟棤鑳屾櫙鑹诧紝鍙湁杈规鍜屽唴瀹瑰眳涓級 + mergeAndStyleCells2(sheet,row10, new CellRangeAddress(10, 11, 2, 3), detailMap.get("checkType"), true, false, null); + // 鍚堝苟E5鍒癋6鐨勫崟鍏冩牸锛屽苟璁剧疆鏍峰紡鍜屽唴瀹 + mergeAndStyleCells2(sheet,row10, new CellRangeAddress(10, 11, 4, 5), "妫楠屼緷鎹", true, true, IndexedColors.GREY_25_PERCENT); + // 鍚堝苟G5鍒癐6鐨勫崟鍏冩牸锛屽苟璁剧疆鏍峰紡锛堟棤鑳屾櫙鑹诧紝鍙湁杈规鍜屽唴瀹瑰眳涓級 + mergeAndStyleCells2(sheet,row10, new CellRangeAddress(10, 11,6, 8), detailMap.get("standardNo"), true, false, null); + // 鍚堝苟J5鍒癒6鐨勫崟鍏冩牸锛屽苟璁剧疆鏍峰紡鍜屽唴瀹 + mergeAndStyleCells2(sheet,row10, new CellRangeAddress(10, 11, 9, 10), "鎶ユ鏃ユ湡", true, true, IndexedColors.GREY_25_PERCENT); + // 鍚堝苟L5鍒癗6鐨勫崟鍏冩牸锛屽苟璁剧疆鏍峰紡锛堟棤鑳屾櫙鑹诧紝鍙湁杈规鍜屽唴瀹瑰眳涓級 + mergeAndStyleCells2(sheet,row10, new CellRangeAddress(10, 11, 11, 13), detailMap.get("incomeTime"), true, false, null); + /**涓婁笅琛ㄦ牸2**/ + Row row12 = sheet.getRow(12); + if (row12 == null) {row12 = sheet.createRow(12);} + Cell cellA13 = row12.createCell(0); + cellA13.setCellValue("搴忓彿"); + cellA13.setCellStyle(getRowStyle(sheet)); + mergeAndStyleCells(sheet, new CellRangeAddress(12, 12, 1, 4), "妫楠岄」鐩"); + mergeAndStyleCells(sheet, new CellRangeAddress(12, 12, 5, 8), "鏍囧噯瑕佹眰"); + mergeAndStyleCells(sheet, new CellRangeAddress(12, 12, 9, 10), "瀹炴祴缁撴灉"); + Cell cellL13 = row12.createCell(11); + cellL13.setCellValue("鍒ゅ畾"); + cellL13.setCellStyle(getRowStyle(sheet)); + mergeAndStyleCells(sheet, new CellRangeAddress(12, 12, 12, 13), "闄勪欢"); + //灏哾ata涓殑鍊煎～鍏呭埌excel + int rowNum = 13; + if(!CollectionUtils.isEmpty(data)){ + Iterator iterator = data.iterator(); + //閬嶅巻鏁版嵁 + for (;iterator.hasNext();){ - T obj = iterator.next();//鑾峰彇褰撳墠琛屽搴旂殑鏁版嵁 - JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(obj)); + T obj = iterator.next();//鑾峰彇褰撳墠琛屽搴旂殑鏁版嵁 + JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(obj)); - Row dataRow = sheet.getRow(rowNum);//鍒涘缓琛 - // 鍋囪浣跨敤浜嗛粯璁ゅ瓧浣撳拰瀛楃瀹藉害鏉ヨ绠楄楂橈紙杩欐槸涓涓畝鍖栫殑绀轰緥锛 - int cellHeight = (int) (cell.getStringCellValue().length() * 6); // 姣忎釜瀛楃澶х害15涓崟浣嶉珮搴 - dataRow.setHeightInPoints(Math.max(dataRow.getHeightInPoints(), cellHeight)); + Row dataRow = sheet.getRow(rowNum);//鍒涘缓琛 + // 鍋囪浣跨敤浜嗛粯璁ゅ瓧浣撳拰瀛楃瀹藉害鏉ヨ绠楄楂橈紙杩欐槸涓涓畝鍖栫殑绀轰緥锛 + int cellHeight = (int) (cell.getStringCellValue().length() * 6); // 姣忎釜瀛楃澶х害15涓崟浣嶉珮搴 + dataRow.setHeightInPoints(Math.max(dataRow.getHeightInPoints(), cellHeight)); - Cell cellData0 = dataRow.getCell(0); - cellData0.setCellValue(rowNum-12); - cellData0.setCellStyle(getDataStyle(sheet)); + Cell cellData0 = dataRow.getCell(0); + cellData0.setCellValue(rowNum-12); + cellData0.setCellStyle(getDataStyle(sheet)); - Cell cellData1 = dataRow.getCell(1); - cellData1.setCellValue(getValue(jsonObject.get(excelCol.get(0).getField()))); - cellData1.setCellStyle(getDataStyle(sheet)); + Cell cellData1 = dataRow.getCell(1); + cellData1.setCellValue(getValue(jsonObject.get(excelCol.get(0).getField()))); + cellData1.setCellStyle(getDataStyle(sheet)); - Cell cellData2 = dataRow.getCell(5); - cellData2.setCellValue(getValue(jsonObject.get(excelCol.get(1).getField()))); - cellData2.setCellStyle(getDataStyle(sheet)); - sheet.addMergedRegion(new CellRangeAddress(rowNum, rowNum, 5, 8)); + Cell cellData2 = dataRow.getCell(5); + cellData2.setCellValue(getValue(jsonObject.get(excelCol.get(1).getField()))); + cellData2.setCellStyle(getDataStyle(sheet)); + sheet.addMergedRegion(new CellRangeAddress(rowNum, rowNum, 5, 8)); - Cell cellData3 = dataRow.getCell(9); - cellData3.setCellValue(getValue(jsonObject.get(excelCol.get(2).getField()))); - cellData3.setCellStyle(getDataStyle(sheet)); - sheet.addMergedRegion(new CellRangeAddress(rowNum, rowNum, 9, 10)); + Cell cellData3 = dataRow.getCell(9); + cellData3.setCellValue(getValue(jsonObject.get(excelCol.get(3).getField()))); + cellData3.setCellStyle(getDataStyle(sheet)); + sheet.addMergedRegion(new CellRangeAddress(rowNum, rowNum, 9, 10)); - Cell cellData4 = dataRow.getCell(11); - cellData4.setCellValue(getValue(jsonObject.get(excelCol.get(3).getField()))); - cellData4.setCellStyle(getDataStyle(sheet)); + Cell cellData4 = dataRow.getCell(11); + cellData4.setCellValue(getValue(jsonObject.get(excelCol.get(4).getField()))); + cellData4.setCellStyle(getDataStyle(sheet)); - Cell cellData5 = dataRow.getCell(12); - cellData5.setCellValue(getValue(jsonObject.get(excelCol.get(4).getField()))); - cellData5.setCellStyle(getDataStyle(sheet)); - sheet.addMergedRegion(new CellRangeAddress(rowNum, rowNum, 12, 13)); - iterator.remove(); - rowNum++; - } - } + Cell cellData5 = dataRow.getCell(12); + cellData5.setCellValue(getValue(jsonObject.get(excelCol.get(2).getField()))); + cellData5.setCellStyle(getDataStyle(sheet)); + sheet.addMergedRegion(new CellRangeAddress(rowNum, rowNum, 12, 13)); + iterator.remove(); + rowNum++; + } + } - // 鎸囧畾瑕佹鏌ョ殑鍒楃储寮曪紙渚嬪锛孊鍒楃殑绱㈠紩鏄1锛 - int columnIndex = 1; - // 閬嶅巻鎵鏈夎锛屼粠绗簩琛屽紑濮嬶紙绱㈠紩1锛夛紝鍥犱负绗竴琛屽彲鑳芥槸鏍囬琛 - for (int rowIndex = 13; rowIndex <= sheet.getLastRowNum(); ) { - Row currentRow = sheet.getRow(rowIndex); - if (currentRow != null) { - Cell currentCell = currentRow.getCell(columnIndex); - if (currentCell != null && currentCell.getCellType() == CellType.STRING) { // 鍋囪鎴戜滑澶勭悊瀛楃涓茬被鍨嬬殑鍗曞厓鏍 - String currentValue = currentCell.getStringCellValue(); + // 鎸囧畾瑕佹鏌ョ殑鍒楃储寮曪紙渚嬪锛孊鍒楃殑绱㈠紩鏄1锛 + int columnIndex = 1; + // 閬嶅巻鎵鏈夎锛屼粠绗簩琛屽紑濮嬶紙绱㈠紩1锛夛紝鍥犱负绗竴琛屽彲鑳芥槸鏍囬琛 + for (int rowIndex = 13; rowIndex <= sheet.getLastRowNum(); ) { + Row currentRow = sheet.getRow(rowIndex); + if (currentRow != null) { + Cell currentCell = currentRow.getCell(columnIndex); + if (currentCell != null && currentCell.getCellType() == CellType.STRING) { // 鍋囪鎴戜滑澶勭悊瀛楃涓茬被鍨嬬殑鍗曞厓鏍 + String currentValue = currentCell.getStringCellValue(); - // 鏌ユ壘杩炵画鐩稿悓鍊肩殑琛 - int lastRowIndex = rowIndex; - while (lastRowIndex + 1 <= sheet.getLastRowNum()) { - Row nextRow = sheet.getRow(lastRowIndex + 1); - if (nextRow != null) { - Cell nextCell = nextRow.getCell(columnIndex); - if (nextCell != null && nextCell.getCellType() == CellType.STRING && - nextCell.getStringCellValue().equals(currentValue)) { - lastRowIndex++; // 缁х画鍚戜笅鏌ユ壘 - } else { - break; // 鎵惧埌涓嶅悓鍊硷紝鍋滄鏌ユ壘 - } - } else { - break; // 娌℃湁鏇村琛岋紝鍋滄鏌ユ壘 - } - } + // 鏌ユ壘杩炵画鐩稿悓鍊肩殑琛 + int lastRowIndex = rowIndex; + while (lastRowIndex + 1 <= sheet.getLastRowNum()) { + Row nextRow = sheet.getRow(lastRowIndex + 1); + if (nextRow != null) { + Cell nextCell = nextRow.getCell(columnIndex); + if (nextCell != null && nextCell.getCellType() == CellType.STRING && + nextCell.getStringCellValue().equals(currentValue)) { + lastRowIndex++; // 缁х画鍚戜笅鏌ユ壘 + } else { + break; // 鎵惧埌涓嶅悓鍊硷紝鍋滄鏌ユ壘 + } + } else { + break; // 娌℃湁鏇村琛岋紝鍋滄鏌ユ壘 + } + } - // 鍚堝苟鎵惧埌鐨勮 - if (rowIndex != lastRowIndex) { // 鍙湁鍦ㄦ壘鍒拌繛缁浉鍚屽肩殑琛屾椂鎵嶈繘琛屽悎骞 - sheet.addMergedRegion(new CellRangeAddress(rowIndex, lastRowIndex, 1, 4)); - }else{ - sheet.addMergedRegion(new CellRangeAddress(rowIndex, rowIndex, 1, 4)); - } + // 鍚堝苟鎵惧埌鐨勮 + if (rowIndex != lastRowIndex) { // 鍙湁鍦ㄦ壘鍒拌繛缁浉鍚屽肩殑琛屾椂鎵嶈繘琛屽悎骞 + sheet.addMergedRegion(new CellRangeAddress(rowIndex, lastRowIndex, 1, 4)); + }else{ + sheet.addMergedRegion(new CellRangeAddress(rowIndex, rowIndex, 1, 4)); + } - // 鏇存柊rowIndex浠ヨ烦杩囧凡鍚堝苟鐨勮 - rowIndex = lastRowIndex + 1; // 浠庝笅涓涓湭鍚堝苟鐨勮寮濮嬬户缁亶鍘 - } else { - // 濡傛灉褰撳墠鍗曞厓鏍间笉鏄瓧绗︿覆绫诲瀷锛屽垯鐩存帴璺冲埌涓嬩竴琛 - rowIndex++; - } - } else { - // 濡傛灉褰撳墠琛屼负绌猴紝鍒欑洿鎺ヨ烦鍒颁笅涓琛 - rowIndex++; - } - } + // 鏇存柊rowIndex浠ヨ烦杩囧凡鍚堝苟鐨勮 + rowIndex = lastRowIndex + 1; // 浠庝笅涓涓湭鍚堝苟鐨勮寮濮嬬户缁亶鍘 + } else { + // 濡傛灉褰撳墠鍗曞厓鏍间笉鏄瓧绗︿覆绫诲瀷锛屽垯鐩存帴璺冲埌涓嬩竴琛 + rowIndex++; + } + } else { + // 濡傛灉褰撳墠琛屼负绌猴紝鍒欑洿鎺ヨ烦鍒颁笅涓琛 + rowIndex++; + } + } - Row rowEnd1 = sheet.createRow(rowNum+2); - mergeAndStyleCellsNoBorder(sheet,rowEnd1, new CellRangeAddress(rowNum+2, rowNum+3, 0, 1), "缁煎悎妫楠岀粨璁", true, true, IndexedColors.GREY_25_PERCENT); - mergeAndStyleCellsNoBorder(sheet,rowEnd1, new CellRangeAddress(rowNum+2, rowNum+3, 2, 3), detailMap.get("checkResult"), true, false, null); - mergeAndStyleCellsNoBorder(sheet,rowEnd1, new CellRangeAddress(rowNum+2, rowNum+3, 5, 10), "澶囨敞:鍒ゅ畾鍚堟牸鎵撯溾垰鈥濓紝涓嶅悎鏍兼墦鈥溍椻", true, true, null); - Row rowEnd2 = sheet.createRow(rowNum+5); - mergeAndStyleCellsNoBorder(sheet,rowEnd2, new CellRangeAddress(rowNum+5, rowNum+5, 0, 1), "鍝佺缁忕悊/涓讳换", true, true, IndexedColors.GREY_25_PERCENT); - mergeAndStyleCellsNoBorder(sheet,rowEnd2, new CellRangeAddress(rowNum+5, rowNum+5, 2, 3), "", true, false, null); - mergeAndStyleCellsNoBorder(sheet,rowEnd2, new CellRangeAddress(rowNum+5, rowNum+5, 5, 6), "鍝佽川涓荤", true, true, IndexedColors.GREY_25_PERCENT); - mergeAndStyleCellsNoBorder(sheet,rowEnd2, new CellRangeAddress(rowNum+5, rowNum+5, 7, 8), "", true, false, null); - mergeAndStyleCellsNoBorder(sheet,rowEnd2, new CellRangeAddress(rowNum+5, rowNum+5, 10, 11), "鍝佺鍛", true, true, IndexedColors.GREY_25_PERCENT); - mergeAndStyleCellsNoBorder(sheet,rowEnd2, new CellRangeAddress(rowNum+5, rowNum+5, 12, 13), detailMap.get("checkManName"), true, false, null); + Row rowEnd1 = sheet.createRow(rowNum+2); + mergeAndStyleCellsNoBorder(sheet,rowEnd1, new CellRangeAddress(rowNum+2, rowNum+3, 0, 1), "缁煎悎妫楠岀粨璁", true, true, IndexedColors.GREY_25_PERCENT); + mergeAndStyleCellsNoBorder(sheet,rowEnd1, new CellRangeAddress(rowNum+2, rowNum+3, 2, 3), detailMap.get("checkResult"), true, false, null); + mergeAndStyleCellsNoBorder(sheet,rowEnd1, new CellRangeAddress(rowNum+2, rowNum+3, 5, 10), "澶囨敞:鍒ゅ畾鍚堟牸鎵撯溾垰鈥濓紝涓嶅悎鏍兼墦鈥溍椻", true, true, null); + Row rowEnd2 = sheet.createRow(rowNum+5); + mergeAndStyleCellsNoBorder(sheet,rowEnd2, new CellRangeAddress(rowNum+5, rowNum+5, 0, 1), "鍝佺缁忕悊/涓讳换", true, true, IndexedColors.GREY_25_PERCENT); + mergeAndStyleCellsNoBorder(sheet,rowEnd2, new CellRangeAddress(rowNum+5, rowNum+5, 2, 3), "", true, false, null); + mergeAndStyleCellsNoBorder(sheet,rowEnd2, new CellRangeAddress(rowNum+5, rowNum+5, 5, 6), "鍝佽川涓荤", true, true, IndexedColors.GREY_25_PERCENT); + mergeAndStyleCellsNoBorder(sheet,rowEnd2, new CellRangeAddress(rowNum+5, rowNum+5, 7, 8), "", true, false, null); + mergeAndStyleCellsNoBorder(sheet,rowEnd2, new CellRangeAddress(rowNum+5, rowNum+5, 10, 11), "鍝佺鍛", true, true, IndexedColors.GREY_25_PERCENT); + mergeAndStyleCellsNoBorder(sheet,rowEnd2, new CellRangeAddress(rowNum+5, rowNum+5, 12, 13), detailMap.get("checkManName"), true, false, null); - Row rowEnd3 = sheet.createRow(rowNum+4); - mergeAndStyleCellsNoBorder(sheet, rowEnd3, new CellRangeAddress(rowNum+4, rowNum+4, 0, 1), "澶囨敞", true, true, IndexedColors.GREY_25_PERCENT); - mergeAndStyleCellsNoBorder(sheet, rowEnd3, new CellRangeAddress(rowNum+4, rowNum+4, 2, 13), detailMap.get("remark"), true, false, null); + Row rowEnd3 = sheet.createRow(rowNum+4); + mergeAndStyleCellsNoBorder(sheet, rowEnd3, new CellRangeAddress(rowNum+4, rowNum+4, 0, 1), "澶囨敞", true, true, IndexedColors.GREY_25_PERCENT); + mergeAndStyleCellsNoBorder(sheet, rowEnd3, new CellRangeAddress(rowNum+4, rowNum+4, 2, 13), detailMap.get("remark"), true, false, null); // Row rowEnd3 = sheet.createRow(rowNum+8); // mergeAndStyleCellsNoBorder(sheet,rowEnd3, new CellRangeAddress(rowNum+5, rowNum+5, 0, 1), "鍝佺缁忕悊/涓讳换", true, true, IndexedColors.GREY_25_PERCENT); @@ -266,8 +266,8 @@ public class ExcelReportMapUtil { // mergeAndStyleCellsNoBorder(sheet,rowEnd2, new CellRangeAddress(rowNum+6, rowNum+6, 2, 13), detailMap.get("remark"), true, false, null); - return workbook; - } + return workbook; + } // //鏍囬鏍峰紡 // public static CellStyle getHeaderFont(Workbook workbook){ @@ -291,7 +291,7 @@ public class ExcelReportMapUtil { // return cellStyle; // } -// //鍐呭鏍峰紡 + // //鍐呭鏍峰紡 // public static CellStyle getDataFont(Workbook workbook){ // Font font = workbook.createFont(); // font.setFontHeightInPoints((short) 12);//瀛椾綋澶у皬 @@ -304,15 +304,15 @@ public class ExcelReportMapUtil { // return cellStyle; // } // - //澶勭悊鏁版嵁 - public static String getValue(Object object){ - if (object==null){ - return ""; - }else { - return object.toString(); - } - } -// //澶勭悊鏁版嵁 + //澶勭悊鏁版嵁 + public static String getValue(Object object){ + if (object==null){ + return ""; + }else { + return object.toString(); + } + } + // //澶勭悊鏁版嵁 // public static Integer getValueNum(Object object){ // if (object==null){ // return 0; @@ -320,163 +320,163 @@ public class ExcelReportMapUtil { // return Integer.parseInt(object.toString()); // } // } - // 浠巖esources鐩綍鑾峰彇鍥剧墖鐨勫瓧鑺傛暟缁 - private static byte[] getImageBytesFromResources(String resourceName) { - try (InputStream inputStream = ExcelReportMapUtil.class.getClassLoader().getResourceAsStream(resourceName); - ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) { + // 浠巖esources鐩綍鑾峰彇鍥剧墖鐨勫瓧鑺傛暟缁 + private static byte[] getImageBytesFromResources(String resourceName) { + try (InputStream inputStream = ExcelReportMapUtil.class.getClassLoader().getResourceAsStream(resourceName); + ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) { - if (inputStream == null) { - throw new RuntimeException("鎵句笉鍒拌祫婧: " + resourceName); - } + if (inputStream == null) { + throw new RuntimeException("鎵句笉鍒拌祫婧: " + resourceName); + } - IOUtils.copy(inputStream, byteArrayOutputStream); - return byteArrayOutputStream.toByteArray(); + IOUtils.copy(inputStream, byteArrayOutputStream); + return byteArrayOutputStream.toByteArray(); - } catch (IOException e) { - throw new RuntimeException("璇诲彇璧勬簮鏃跺嚭閿: " + resourceName, e); - } - } - //鎶ュ憡澶ф爣棰樻牱寮-1 - public static CellStyle getTitelStyle(Workbook workbook){ - Font font = workbook.createFont(); - // 璁剧疆瀛椾綋涓哄姞绮 - font.setBold(true); - // 璁剧疆瀛椾綋澶у皬锛堜緥濡傦紝璁剧疆涓16锛 - font.setFontHeightInPoints((short) 24); - CellStyle cellStyle = workbook.createCellStyle(); - cellStyle.setFont(font); - cellStyle.setAlignment(HorizontalAlignment.CENTER_SELECTION);//璁剧疆姘村钩灞呬腑 - cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);//璁剧疆鍨傜洿灞呬腑 - cellStyle.setWrapText(true);//璁剧疆鍗曞厓鏍煎唴瀹硅嚜鍔ㄦ崲琛 - return cellStyle; - } - public static CellStyle getRowStyle(Sheet sheet){ - CellStyle style = sheet.getWorkbook().createCellStyle(); - // 璁剧疆杈规绾 - style.setBorderBottom(BorderStyle.THIN); - style.setBorderLeft(BorderStyle.THIN); - style.setBorderRight(BorderStyle.THIN); - style.setBorderTop(BorderStyle.THIN); - // 璁剧疆姘村钩灞呬腑 - style.setAlignment(HorizontalAlignment.CENTER); - style.setWrapText(true);//璁剧疆鍗曞厓鏍煎唴瀹硅嚜鍔ㄦ崲琛 - // 璁剧疆鍨傜洿灞呬腑 - style.setVerticalAlignment(VerticalAlignment.CENTER); - Font font = sheet.getWorkbook().createFont(); - font.setBold(true); - // 璁剧疆瀛椾綋澶у皬锛堜緥濡傦紝璁剧疆涓14锛 - font.setFontHeightInPoints((short) 14); - style.setFont(font); - return style; - } - public static CellStyle getDataStyle(Sheet sheet){ - CellStyle style = sheet.getWorkbook().createCellStyle(); - // 璁剧疆杈规绾 - style.setBorderBottom(BorderStyle.THIN); - style.setBorderLeft(BorderStyle.THIN); - style.setBorderRight(BorderStyle.THIN); - style.setBorderTop(BorderStyle.THIN); - Font font = sheet.getWorkbook().createFont(); + } catch (IOException e) { + throw new RuntimeException("璇诲彇璧勬簮鏃跺嚭閿: " + resourceName, e); + } + } + //鎶ュ憡澶ф爣棰樻牱寮-1 + public static CellStyle getTitelStyle(Workbook workbook){ + Font font = workbook.createFont(); + // 璁剧疆瀛椾綋涓哄姞绮 + font.setBold(true); + // 璁剧疆瀛椾綋澶у皬锛堜緥濡傦紝璁剧疆涓16锛 + font.setFontHeightInPoints((short) 24); + CellStyle cellStyle = workbook.createCellStyle(); + cellStyle.setFont(font); + cellStyle.setAlignment(HorizontalAlignment.CENTER_SELECTION);//璁剧疆姘村钩灞呬腑 + cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);//璁剧疆鍨傜洿灞呬腑 + cellStyle.setWrapText(true);//璁剧疆鍗曞厓鏍煎唴瀹硅嚜鍔ㄦ崲琛 + return cellStyle; + } + public static CellStyle getRowStyle(Sheet sheet){ + CellStyle style = sheet.getWorkbook().createCellStyle(); + // 璁剧疆杈规绾 + style.setBorderBottom(BorderStyle.THIN); + style.setBorderLeft(BorderStyle.THIN); + style.setBorderRight(BorderStyle.THIN); + style.setBorderTop(BorderStyle.THIN); + // 璁剧疆姘村钩灞呬腑 + style.setAlignment(HorizontalAlignment.CENTER); + style.setWrapText(true);//璁剧疆鍗曞厓鏍煎唴瀹硅嚜鍔ㄦ崲琛 + // 璁剧疆鍨傜洿灞呬腑 + style.setVerticalAlignment(VerticalAlignment.CENTER); + Font font = sheet.getWorkbook().createFont(); + font.setBold(true); + // 璁剧疆瀛椾綋澶у皬锛堜緥濡傦紝璁剧疆涓14锛 + font.setFontHeightInPoints((short) 14); + style.setFont(font); + return style; + } + public static CellStyle getDataStyle(Sheet sheet){ + CellStyle style = sheet.getWorkbook().createCellStyle(); + // 璁剧疆杈规绾 + style.setBorderBottom(BorderStyle.THIN); + style.setBorderLeft(BorderStyle.THIN); + style.setBorderRight(BorderStyle.THIN); + style.setBorderTop(BorderStyle.THIN); + Font font = sheet.getWorkbook().createFont(); - // 璁剧疆瀛椾綋澶у皬锛堜緥濡傦紝璁剧疆涓14锛 - font.setFontHeightInPoints((short) 14); - style.setFont(font); - style.setWrapText(true);//璁剧疆鍗曞厓鏍煎唴瀹硅嚜鍔ㄦ崲琛 - // 璁剧疆姘村钩灞呬腑 - style.setAlignment(HorizontalAlignment.LEFT); - // 璁剧疆鍨傜洿灞呬腑 - style.setVerticalAlignment(VerticalAlignment.CENTER); - return style; - } - private static void mergeAndStyleCells(Sheet sheet, CellRangeAddress cellRangeAddress, String cellValue) { - // 鍚堝苟鍗曞厓鏍 - sheet.addMergedRegion(cellRangeAddress); + // 璁剧疆瀛椾綋澶у皬锛堜緥濡傦紝璁剧疆涓14锛 + font.setFontHeightInPoints((short) 14); + style.setFont(font); + style.setWrapText(true);//璁剧疆鍗曞厓鏍煎唴瀹硅嚜鍔ㄦ崲琛 + // 璁剧疆姘村钩灞呬腑 + style.setAlignment(HorizontalAlignment.LEFT); + // 璁剧疆鍨傜洿灞呬腑 + style.setVerticalAlignment(VerticalAlignment.CENTER); + return style; + } + private static void mergeAndStyleCells(Sheet sheet, CellRangeAddress cellRangeAddress, String cellValue) { + // 鍚堝苟鍗曞厓鏍 + sheet.addMergedRegion(cellRangeAddress); - // 鍒涘缓涓涓崟鍏冩牸鏍峰紡 - CellStyle style = sheet.getWorkbook().createCellStyle(); + // 鍒涘缓涓涓崟鍏冩牸鏍峰紡 + CellStyle style = sheet.getWorkbook().createCellStyle(); - // 璁剧疆瀛椾綋涓哄姞绮 - Font font = sheet.getWorkbook().createFont(); - font.setBold(true); - // 璁剧疆瀛椾綋澶у皬锛堜緥濡傦紝璁剧疆涓14锛 - font.setFontHeightInPoints((short) 14); - style.setFont(font); + // 璁剧疆瀛椾綋涓哄姞绮 + Font font = sheet.getWorkbook().createFont(); + font.setBold(true); + // 璁剧疆瀛椾綋澶у皬锛堜緥濡傦紝璁剧疆涓14锛 + font.setFontHeightInPoints((short) 14); + style.setFont(font); - // 璁剧疆姘村钩灞呬腑 - style.setAlignment(HorizontalAlignment.CENTER); - // 璁剧疆鍨傜洿灞呬腑 - style.setVerticalAlignment(VerticalAlignment.CENTER); - style.setWrapText(true);//璁剧疆鍗曞厓鏍煎唴瀹硅嚜鍔ㄦ崲琛 - // 鑾峰彇鍚堝苟鍚庣殑鍗曞厓鏍肩殑绗竴涓崟鍏冩牸锛屽苟璁剧疆鍊 - Row row = sheet.getRow(cellRangeAddress.getFirstRow()); - if (row == null) { - row = sheet.createRow(cellRangeAddress.getFirstRow()); - } - Cell cell = row.getCell(cellRangeAddress.getFirstColumn()); - if (cell == null) { - cell = row.createCell(cellRangeAddress.getFirstColumn()); - } - cell.setCellValue(cellValue); // 璁剧疆鍗曞厓鏍肩殑鍊 - cell.setCellStyle(style); // 搴旂敤鏍峰紡鍒板崟鍏冩牸 - } - private static void mergeAndStyleCells2(Sheet sheet,Row row, CellRangeAddress cellRangeAddress, String cellValue, boolean centered, boolean hasBackground, IndexedColors backgroundColor) { - // 鍚堝苟鍗曞厓鏍 - sheet.addMergedRegion(cellRangeAddress); + // 璁剧疆姘村钩灞呬腑 + style.setAlignment(HorizontalAlignment.CENTER); + // 璁剧疆鍨傜洿灞呬腑 + style.setVerticalAlignment(VerticalAlignment.CENTER); + style.setWrapText(true);//璁剧疆鍗曞厓鏍煎唴瀹硅嚜鍔ㄦ崲琛 + // 鑾峰彇鍚堝苟鍚庣殑鍗曞厓鏍肩殑绗竴涓崟鍏冩牸锛屽苟璁剧疆鍊 + Row row = sheet.getRow(cellRangeAddress.getFirstRow()); + if (row == null) { + row = sheet.createRow(cellRangeAddress.getFirstRow()); + } + Cell cell = row.getCell(cellRangeAddress.getFirstColumn()); + if (cell == null) { + cell = row.createCell(cellRangeAddress.getFirstColumn()); + } + cell.setCellValue(cellValue); // 璁剧疆鍗曞厓鏍肩殑鍊 + cell.setCellStyle(style); // 搴旂敤鏍峰紡鍒板崟鍏冩牸 + } + private static void mergeAndStyleCells2(Sheet sheet,Row row, CellRangeAddress cellRangeAddress, String cellValue, boolean centered, boolean hasBackground, IndexedColors backgroundColor) { + // 鍚堝苟鍗曞厓鏍 + sheet.addMergedRegion(cellRangeAddress); - // 鍒涘缓涓涓崟鍏冩牸鏍峰紡 - CellStyle style = sheet.getWorkbook().createCellStyle(); + // 鍒涘缓涓涓崟鍏冩牸鏍峰紡 + CellStyle style = sheet.getWorkbook().createCellStyle(); - // 璁剧疆瀛椾綋灞呬腑 - if (centered) { - style.setAlignment(HorizontalAlignment.CENTER); - style.setVerticalAlignment(VerticalAlignment.CENTER); - } + // 璁剧疆瀛椾綋灞呬腑 + if (centered) { + style.setAlignment(HorizontalAlignment.CENTER); + style.setVerticalAlignment(VerticalAlignment.CENTER); + } - // 璁剧疆鑳屾櫙棰滆壊锛堝鏋滄湁锛 - if (hasBackground && backgroundColor != null) { - style.setFillForegroundColor(backgroundColor.getIndex()); - style.setFillPattern(FillPatternType.SOLID_FOREGROUND); - } + // 璁剧疆鑳屾櫙棰滆壊锛堝鏋滄湁锛 + if (hasBackground && backgroundColor != null) { + style.setFillForegroundColor(backgroundColor.getIndex()); + style.setFillPattern(FillPatternType.SOLID_FOREGROUND); + } - // 璁剧疆杈规绾 - style.setBorderBottom(BorderStyle.THIN); - style.setBorderLeft(BorderStyle.THIN); - style.setBorderRight(BorderStyle.THIN); - style.setBorderTop(BorderStyle.THIN); + // 璁剧疆杈规绾 + style.setBorderBottom(BorderStyle.THIN); + style.setBorderLeft(BorderStyle.THIN); + style.setBorderRight(BorderStyle.THIN); + style.setBorderTop(BorderStyle.THIN); - // 鑾峰彇鍚堝苟鍚庣殑鍗曞厓鏍肩殑绗竴涓崟鍏冩牸锛屽苟璁剧疆鍊 - Cell cell = row.getCell(cellRangeAddress.getFirstColumn()); - if (cell == null) { - cell = row.createCell(cellRangeAddress.getFirstColumn()); - } - cell.setCellValue(cellValue); // 璁剧疆鍗曞厓鏍肩殑鍊 - cell.setCellStyle(style); // 搴旂敤鏍峰紡鍒板崟鍏冩牸 - } - private static void mergeAndStyleCellsNoBorder(Sheet sheet,Row row, CellRangeAddress cellRangeAddress, String cellValue, boolean centered, boolean hasBackground, IndexedColors backgroundColor) { - // 鍚堝苟鍗曞厓鏍 - sheet.addMergedRegion(cellRangeAddress); + // 鑾峰彇鍚堝苟鍚庣殑鍗曞厓鏍肩殑绗竴涓崟鍏冩牸锛屽苟璁剧疆鍊 + Cell cell = row.getCell(cellRangeAddress.getFirstColumn()); + if (cell == null) { + cell = row.createCell(cellRangeAddress.getFirstColumn()); + } + cell.setCellValue(cellValue); // 璁剧疆鍗曞厓鏍肩殑鍊 + cell.setCellStyle(style); // 搴旂敤鏍峰紡鍒板崟鍏冩牸 + } + private static void mergeAndStyleCellsNoBorder(Sheet sheet,Row row, CellRangeAddress cellRangeAddress, String cellValue, boolean centered, boolean hasBackground, IndexedColors backgroundColor) { + // 鍚堝苟鍗曞厓鏍 + sheet.addMergedRegion(cellRangeAddress); - // 鍒涘缓涓涓崟鍏冩牸鏍峰紡 - CellStyle style = sheet.getWorkbook().createCellStyle(); + // 鍒涘缓涓涓崟鍏冩牸鏍峰紡 + CellStyle style = sheet.getWorkbook().createCellStyle(); - // 璁剧疆瀛椾綋灞呬腑 - if (centered) { - style.setAlignment(HorizontalAlignment.CENTER); - style.setVerticalAlignment(VerticalAlignment.CENTER); - } + // 璁剧疆瀛椾綋灞呬腑 + if (centered) { + style.setAlignment(HorizontalAlignment.CENTER); + style.setVerticalAlignment(VerticalAlignment.CENTER); + } - // 璁剧疆鑳屾櫙棰滆壊锛堝鏋滄湁锛 - if (hasBackground && backgroundColor != null) { - style.setFillForegroundColor(backgroundColor.getIndex()); - style.setFillPattern(FillPatternType.SOLID_FOREGROUND); - } + // 璁剧疆鑳屾櫙棰滆壊锛堝鏋滄湁锛 + if (hasBackground && backgroundColor != null) { + style.setFillForegroundColor(backgroundColor.getIndex()); + style.setFillPattern(FillPatternType.SOLID_FOREGROUND); + } - // 鑾峰彇鍚堝苟鍚庣殑鍗曞厓鏍肩殑绗竴涓崟鍏冩牸锛屽苟璁剧疆鍊 - Cell cell = row.getCell(cellRangeAddress.getFirstColumn()); - if (cell == null) { - cell = row.createCell(cellRangeAddress.getFirstColumn()); - } - cell.setCellValue(cellValue); // 璁剧疆鍗曞厓鏍肩殑鍊 - cell.setCellStyle(style); // 搴旂敤鏍峰紡鍒板崟鍏冩牸 - } + // 鑾峰彇鍚堝苟鍚庣殑鍗曞厓鏍肩殑绗竴涓崟鍏冩牸锛屽苟璁剧疆鍊 + Cell cell = row.getCell(cellRangeAddress.getFirstColumn()); + if (cell == null) { + cell = row.createCell(cellRangeAddress.getFirstColumn()); + } + cell.setCellValue(cellValue); // 璁剧疆鍗曞厓鏍肩殑鍊 + cell.setCellStyle(style); // 搴旂敤鏍峰紡鍒板崟鍏冩牸 + } } diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquTeamUser.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquTeamUser.java index 75267764e..0c6d311ea 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquTeamUser.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquTeamUser.java @@ -2,6 +2,7 @@ package com.op.device.domain; import com.op.common.core.annotation.Excel; import com.op.common.core.web.domain.BaseEntity; +import com.op.system.api.domain.SysDept; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -61,6 +62,30 @@ public class EquTeamUser extends BaseEntity { @Excel(name = "鎵嬫満鍙") private String phonenumber; + private SysDept dept; + + + + private Long deptId; + + @Override + public Long getDeptId() { + return deptId; + } + + @Override + public void setDeptId(Long deptId) { + this.deptId = deptId; + } + + public SysDept getDept() { + return dept; + } + + public void setDept(SysDept dept) { + this.dept = dept; + } + public void setId(String id) { this.id = id; } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java index 32bd04428..4d95043a8 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java @@ -720,6 +720,7 @@ public class DevicePDAServiceImpl implements IDevicePDAService { return success("鏂板鎶ヤ慨璁板綍鎴愬姛锛"); } catch (Exception e) { + logger.error(e.getMessage()); return error(); } } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.java index cf9419ee2..36f686180 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.java @@ -470,6 +470,7 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService { EquOrder order = new EquOrder(); //婧->鐩爣 BeanUtils.copyProperties(plan, order); + order.setOrderId(IdUtils.fastSimpleUUID()); order.setCreateBy(createBy); order.setCreateTime(nowtime); diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquTeamServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquTeamServiceImpl.java index bd2a1275f..cf68ff103 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquTeamServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquTeamServiceImpl.java @@ -7,6 +7,7 @@ import com.baomidou.dynamic.datasource.annotation.DS; import com.op.common.core.utils.DateUtils; import com.op.common.core.utils.uuid.IdUtils; import com.op.common.core.web.domain.AjaxResult; +import com.op.common.datascope.annotation.DataScope; import com.op.common.security.utils.SecurityUtils; import com.op.device.domain.EquTeamUser; import com.op.device.mapper.EquTeamUserMapper; @@ -188,6 +189,7 @@ public class EquTeamServiceImpl implements IEquTeamService { @Override @DS("#master") public List selectTeamMembers(EquTeamUser equTeamUser) { - return equTeamMapper.selectTeamMembers(equTeamUser); + List equTeamUserList =equTeamMapper.selectTeamMembers(equTeamUser); + return equTeamUserList; } } diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquRepairOrderMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquRepairOrderMapper.xml index 32d436ecb..fcfe21697 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquRepairOrderMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquRepairOrderMapper.xml @@ -389,7 +389,7 @@ LEFT JOIN base_equipment B ON A.equipment_code = B.equipment_code WHERE A.auxiliary_equipment_code = #{equipmentCode} - + AND A.del_flag='0'