From c5f0487ade6c95f1c1fb3621a5fb550b1755ee58 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Sat, 27 Jul 2024 10:43:03 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E5=BC=82=E6=AD=A5=E6=89=A7=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/QcCheckTaskProduceServiceImpl.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java index 9a4c1882..3c18292d 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java @@ -7,10 +7,7 @@ import java.time.Duration; import java.time.LocalDateTime; import java.time.LocalTime; import java.util.*; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.LinkedBlockingQueue; -import java.util.concurrent.ThreadPoolExecutor; -import java.util.concurrent.TimeUnit; +import java.util.concurrent.*; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; @@ -309,11 +306,11 @@ public class QcCheckTaskProduceServiceImpl implements IQcCheckTaskProduceService } logger.info("质检检验企业微信提醒请求：" + JSONObject.toJSONString(wecharts)); if (!CollectionUtils.isEmpty(wecharts)) { - new Thread(() -> { + CompletableFuture.runAsync(() -> { + System.out.println("异步执行企业微信发送"); AjaxResult result = remoteOpenService.sendWeChartMessage(wecharts); logger.info("质检检验企业微信提醒结果：" + JSONObject.toJSONString(result)); - - }).start(); + }); } //发企业微信--------------------结束 } From 64c0c150f08279c1b86a0e2ec23b32b5f9e188c6 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Sat, 27 Jul 2024 10:43:48 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E5=BC=82=E6=AD=A5=E6=89=A7=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/api/domain/mes/BaseProductDTO.java | 40 +++++++++++++++++ .../op/open/controller/OpenController.java | 6 +++ .../java/com/op/open/service/OpenService.java | 3 ++ .../op/open/service/impl/OpenServiceImpl.java | 44 ++++++++++++++++++- 4 files changed, 91 insertions(+), 2 deletions(-) diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/mes/BaseProductDTO.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/mes/BaseProductDTO.java index ca164f14..288abdcd 100644 --- a/op-api/op-api-system/src/main/java/com/op/system/api/domain/mes/BaseProductDTO.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/mes/BaseProductDTO.java @@ -233,6 +233,46 @@ public class BaseProductDTO extends BaseEntity { /** 其它 */ @Excel(name = "其它") private String other; + /**标准模板**/ + private String mvgr5; + /**单位**/ + private String meins; + //转换分子 + private String umrez; + //转换分母 + private String umren; + + public String getUmren() { + return umren; + } + + public void setUmren(String umren) { + this.umren = umren; + } + + public String getUmrez() { + return umrez; + } + + public void setUmrez(String umrez) { + this.umrez = umrez; + } + + public String getMeins() { + return meins; + } + + public void setMeins(String meins) { + this.meins = meins; + } + + public String getMvgr5() { + return mvgr5; + } + + public void setMvgr5(String mvgr5) { + this.mvgr5 = mvgr5; + } public void setCategory(String category) { this.category = category; diff --git a/op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java b/op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java index 7137fcaa..6a1acdf5 100644 --- a/op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java +++ b/op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java @@ -12,6 +12,7 @@ import com.op.system.api.domain.DataSourcePropertyDTO; import com.op.system.api.domain.device.EquRepairOrderDTO; import com.op.system.api.domain.dto.WCSDTO; import com.op.system.api.domain.dto.WechartDTO; +import com.op.system.api.domain.mes.BaseProductDTO; import com.op.system.api.domain.quality.QcCheckTaskProduceDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -250,4 +251,9 @@ public class OpenController extends BaseController { public AjaxResult getDeliveryNoteDetail(@RequestBody Map paramMap) { return openService.getDeliveryNoteDetail(paramMap); } + //给oa提供的物料建议标准更新 + @PostMapping("/sendProductCheckNo") + public AjaxResult sendProductCheckNo(@RequestBody List dots) { + return openService.sendProductCheckNo(dots); + } } diff --git a/op-modules/op-open/src/main/java/com/op/open/service/OpenService.java b/op-modules/op-open/src/main/java/com/op/open/service/OpenService.java index f0d1f62c..6b4caf76 100644 --- a/op-modules/op-open/src/main/java/com/op/open/service/OpenService.java +++ b/op-modules/op-open/src/main/java/com/op/open/service/OpenService.java @@ -5,6 +5,7 @@ import com.op.common.core.web.domain.AjaxResult; import com.op.system.api.domain.device.EquRepairOrderDTO; import com.op.system.api.domain.dto.WCSDTO; import com.op.system.api.domain.dto.WechartDTO; +import com.op.system.api.domain.mes.BaseProductDTO; import com.op.system.api.domain.mes.MesReportWorkDTO; import com.op.system.api.domain.quality.QcCheckTaskDTO; import com.op.system.api.domain.quality.QcCheckTaskProduceDTO; @@ -43,4 +44,6 @@ public interface OpenService { AjaxResult sendWeChartMessage(List wechartDTO); AjaxResult getDeliveryNoteDetail(Map paramMap); + + AjaxResult sendProductCheckNo(List dots); } diff --git a/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java b/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java index 37379384..a1f7633a 100644 --- a/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java +++ b/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java @@ -21,8 +21,10 @@ import com.op.system.api.domain.device.EquRepairOrderDTO; import com.op.system.api.domain.dto.WCSDTO; import com.op.system.api.domain.dto.WCSDataDTO; import com.op.system.api.domain.dto.WechartDTO; +import com.op.system.api.domain.mes.BaseProductDTO; import com.op.system.api.domain.mes.ProRfidProcessDetail; import com.op.system.api.domain.quality.*; +import com.op.system.api.domain.sap.SapSupplier; import org.apache.commons.lang.StringUtils; import java.text.SimpleDateFormat; @@ -615,7 +617,7 @@ public class OpenServiceImpl implements OpenService { @Override public AjaxResult sendWeChartMessage(List dtos) { try { - logger.info(JSONObject.toJSONString("open企业微信发送参数"+dtos)); + logger.info("open企业微信发送参数："+JSONObject.toJSONString(dtos)); String result = HttpUtils.sendPostWechart(weChartUrl, JSON.toJSONString(dtos)); return success(result); } catch (Exception e) { @@ -624,7 +626,45 @@ public class OpenServiceImpl implements OpenService { } } - + /** + * 物料编码+productCode + * 物料描述+productDescZh + * 物料组编码+productGroup + * 物料组名称+productGroupName + * 单位+meins + * 规格+productModel + * 计量转换分子+umrez + * 分母UMREZ+umren + * 检验标准+ mvgr5 + * 毛重（无\0）+ grosseight + * 体积 volume + * **/ + @Override + public AjaxResult sendProductCheckNo(List dtos) { + try { + logger.info("oa更新检验标准发送参数"+JSONObject.toJSONString(dtos)); +// int allsize = dtos.size(); +// if(CollectionUtils.isEmpty(dtos)){ +// return error("oa更新检验标准发送参数为空"); +// } +// int inserttimes = allsize / 100 + 1; +// for (int m = 0; m < inserttimes; m++) { +// List everyList; +// if (m < (inserttimes - 1)) { +// everyList = dtos.subList(m * 100, (m + 1) * 100); +// } else { +// everyList = dtos.subList(m * 100, allsize); +// } +// if (everyList.size() > 0) { +// sapBomMapper.addSupplierBatchs(everyList); +// } +// } + return success(); + } catch (Exception e) { + e.printStackTrace(); + return error(e.getMessage()); + } + } protected Boolean oneMinHas(Date lastData){ if(lastData != null){ From 53764c857ddeee695106cfb411beb985975baec6 Mon Sep 17 00:00:00 2001 From: yinq Date: Mon, 29 Jul 2024 09:54:19 +0800 Subject: [PATCH 3/4] =?UTF-8?q?update=20-=20ems=E6=B0=B4=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/report/ReportPointWaterMapper.xml | 39 +++++++++---------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/op-modules/op-energy/src/main/resources/mapper/report/ReportPointWaterMapper.xml b/op-modules/op-energy/src/main/resources/mapper/report/ReportPointWaterMapper.xml index 9b22b75d..1cdab4a6 100644 --- a/op-modules/op-energy/src/main/resources/mapper/report/ReportPointWaterMapper.xml +++ b/op-modules/op-energy/src/main/resources/mapper/report/ReportPointWaterMapper.xml @@ -75,16 +75,16 @@ and price = #{price} and (report_point_water.monitor_id = #{monitorSubset} OR report_point_water.monitor_id IN - (SELECT t.monitor_id FROM base_monitor_info t WHERE FIND_IN_SET(#{monitorSubset}, ancestors))) + (SELECT t.monitor_id FROM base_monitor_info t WHERE dbo.FIND_IN_SET(#{monitorSubset}, ancestors) > 0)) - and begin_time between #{params.beginBeginTime} and #{params.endBeginTime} + and CONVERT(VARCHAR(17), begin_time, 120) between #{params.beginBeginTime} and #{params.endBeginTime} - and begin_time between #{params.startTime} and #{params.endTime} + and CONVERT(VARCHAR(17), begin_time, 120) between #{params.startTime} and #{params.endTime} - and begin_time between #{params.beginCollectTime} and #{params.endCollectTime} + and CONVERT(VARCHAR(17), begin_time, 120) between #{params.beginCollectTime} and #{params.endCollectTime} and begin_time = #{beginTime} and end_time = #{endTime} @@ -116,9 +116,9 @@ where report_point_water.objid = #{objid} select ert.monitor_id, ert.monitor_name, ert.pointTime, sum(if(ert.expend is null, 0, ert.expend)) expend from ( - select rpd.monitor_id, m.monitor_name, left(rpd.begin_time, 10) pointTime, rpd.expend + select rpd.monitor_id, m.monitor_name, left(CONVERT(VARCHAR(17), rpd.begin_time, 120), 10) pointTime, rpd.expend from report_point_water rpd left join base_monitor_info m on m.monitor_id = rpd.monitor_id @@ -158,7 +158,7 @@ and rpd.begin_time between #{startTime} and #{endTime} - and left(rpd.begin_time, 10) between #{startDay} and #{endDay} + and left(CONVERT(VARCHAR(17), rpd.begin_time, 120), 10) between #{startDay} and #{endDay} ) ert @@ -168,21 +168,21 @@ @@ -385,6 +406,22 @@ ) + + insert into base_product( + product_code,product_desc_zh,product_group,product_group_name, + meins,product_model,umrez,umren,mvgr5, + gross_weight,volume + ,create_by,create_time + ) values + + ( + #{item.productCode},#{item.productDescZh},#{item.productGroup},#{item.productGroupName}, + #{item.meins},#{item.productModel},#{item.umrez},#{item.umren},#{item.mvgr5}, + #{item.grossWeight},#{item.volume}, + 'oa',GETDATE() + ) + + +