From 45a5f33fe8d250c852d310920a62358be3dc1e1f Mon Sep 17 00:00:00 2001 From: Yangwl <1726150332@qq.com> Date: Tue, 28 May 2024 20:34:20 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E4=BB=B6=E5=B7=A5=E8=B5=84=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E3=80=81=E8=83=BD=E6=BA=90=E6=A8=A1=E5=9D=97=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=95=B0=E6=8D=AE=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/system/api/RemoteEnergyService.java | 21 +++++++++++++ .../system/api/domain/sap/SapBaseProduct.java | 22 +++++++++++++ .../api/domain/sap/SapPurchaseOrderQuery.java | 21 +++++++++++++ .../factory/RemoteEnergyFallbackFactory.java | 31 +++++++++++++++++++ .../core/constant/ServiceNameConstants.java | 4 +++ .../java/com/op/mes/domain/MesUnitPrice.java | 13 +++++--- .../op/mes/service/IMesUnitPriceService.java | 2 +- .../service/impl/MesUnitPriceServiceImpl.java | 18 ++++++++--- .../impl/MesUnitpriceReportServiceImpl.java | 1 + .../mapper/mes/MesUnitPriceMapper.xml | 10 +++--- .../mapper/mes/MesUnitpriceReportMapper.xml | 15 +++------ .../op/sap/service/impl/SapItemSyncImpl.java | 7 +++-- .../sap/service/impl/SapOrderServiceImpl.java | 11 +++---- .../mapper/sap/SapBaseProductMapper.xml | 8 +++++ .../impl/SysDatasourceServiceImpl.java | 6 ++++ 15 files changed, 156 insertions(+), 34 deletions(-) create mode 100644 op-api/op-api-system/src/main/java/com/op/system/api/RemoteEnergyService.java create mode 100644 op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteEnergyFallbackFactory.java diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/RemoteEnergyService.java b/op-api/op-api-system/src/main/java/com/op/system/api/RemoteEnergyService.java new file mode 100644 index 00000000..4659648a --- /dev/null +++ b/op-api/op-api-system/src/main/java/com/op/system/api/RemoteEnergyService.java @@ -0,0 +1,21 @@ +package com.op.system.api; + +import com.op.common.core.constant.ServiceNameConstants; +import com.op.common.core.domain.R; +import com.op.system.api.domain.DataSourcePropertyDTO; +import com.op.system.api.factory.RemoteEnergyFallbackFactory; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +/** auth YangWl + * 能源服务 + */ +@FeignClient(contextId = "remoteEnergyService", value = ServiceNameConstants.ENERGY_SERVICE, fallbackFactory = RemoteEnergyFallbackFactory.class) +public interface RemoteEnergyService { + @PostMapping("/energy/addDatasource") + public R addDatasource(@RequestBody DataSourcePropertyDTO dataSourceProperty); + + @PostMapping("/energy/removeDatasource") + public R removeDatasource(@RequestBody DataSourcePropertyDTO dataSourceProperty); +} diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapBaseProduct.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapBaseProduct.java index 68b0eb5d..d0a376ac 100644 --- a/op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapBaseProduct.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapBaseProduct.java @@ -170,6 +170,28 @@ public class SapBaseProduct extends BaseEntity { @Excel(name = "基本计量单位") private String meins; + @Excel(name = "基本计量单位转换分子") + private BigDecimal umrez; + + @Excel(name = "基本计量单位转换分母") + private BigDecimal umren; + + + public BigDecimal getUmrez() { + return umrez; + } + + public void setUmrez(BigDecimal umrez) { + this.umrez = umrez; + } + + public BigDecimal getUmren() { + return umren; + } + + public void setUmren(BigDecimal umren) { + this.umren = umren; + } public String getMeins() { return meins; diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapPurchaseOrderQuery.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapPurchaseOrderQuery.java index c85d3581..49fd0134 100644 --- a/op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapPurchaseOrderQuery.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapPurchaseOrderQuery.java @@ -159,4 +159,25 @@ public class SapPurchaseOrderQuery { public void setPwerk(String pwerk) { this.pwerk = pwerk; } + + @Override + public String toString() { + return "SapPurchaseOrderQuery{" + + "ebeln='" + ebeln + '\'' + + ", ebelp='" + ebelp + '\'' + + ", matnr='" + matnr + '\'' + + ", pwerk='" + pwerk + '\'' + + ", maktx='" + maktx + '\'' + + ", menge='" + menge + '\'' + + ", meins='" + meins + '\'' + + ", zmenge='" + zmenge + '\'' + + ", zmeins='" + zmeins + '\'' + + ", lifnr='" + lifnr + '\'' + + ", werks='" + werks + '\'' + + ", lgort='" + lgort + '\'' + + ", eindt='" + eindt + '\'' + + ", elikz='" + elikz + '\'' + + ", beizhu='" + beizhu + '\'' + + '}'; + } } diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteEnergyFallbackFactory.java b/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteEnergyFallbackFactory.java new file mode 100644 index 00000000..ce4d4ecf --- /dev/null +++ b/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteEnergyFallbackFactory.java @@ -0,0 +1,31 @@ +package com.op.system.api.factory; + +import com.op.common.core.domain.R; +import com.op.system.api.RemoteEnergyService; +import com.op.system.api.RemoteWmsService; +import com.op.system.api.domain.DataSourcePropertyDTO; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.cloud.openfeign.FallbackFactory; +import org.springframework.stereotype.Component; + +@Component +public class RemoteEnergyFallbackFactory implements FallbackFactory { + private static final Logger log = LoggerFactory.getLogger(RemoteEnergyFallbackFactory.class); + + @Override + public RemoteEnergyService create(Throwable throwable) { + log.error("能源服务调用失败:{}", throwable.getMessage()); + return new RemoteEnergyService() { + @Override + public R addDatasource(DataSourcePropertyDTO dataSourceProperty) { + return R.fail("mes数据源创建失败:" + throwable.getMessage()); + } + + @Override + public R removeDatasource(DataSourcePropertyDTO dataSourceProperty) { + return R.fail("mes数据源删除失败:" + throwable.getMessage()); + } + }; + } +} diff --git a/op-common/op-common-core/src/main/java/com/op/common/core/constant/ServiceNameConstants.java b/op-common/op-common-core/src/main/java/com/op/common/core/constant/ServiceNameConstants.java index 42e0f23f..e13cfc85 100644 --- a/op-common/op-common-core/src/main/java/com/op/common/core/constant/ServiceNameConstants.java +++ b/op-common/op-common-core/src/main/java/com/op/common/core/constant/ServiceNameConstants.java @@ -51,6 +51,10 @@ public class ServiceNameConstants { /**质量模块**/ public static final String QMS_SERVICE = "op-quality"; + + /**能源模块**/ + public static final String ENERGY_SERVICE = "op-energy"; + /** * 接口模块的serviceid */ diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesUnitPrice.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesUnitPrice.java index cae9d356..76a87c98 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesUnitPrice.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesUnitPrice.java @@ -4,6 +4,9 @@ import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.op.common.core.annotation.Excel; import com.op.common.core.web.domain.BaseEntity; +import org.apache.poi.hpsf.Decimal; + +import java.math.BigDecimal; /** * ${subTable.functionName}对象 mes_unit_price @@ -71,7 +74,7 @@ public class MesUnitPrice extends BaseEntity { * 预留字段1 */ @Excel(name = "工序单价（元/pc）") - private String attr1; + private BigDecimal attr1; /** * 预留字段2 @@ -163,12 +166,12 @@ public class MesUnitPrice extends BaseEntity { return childprocessName; } - public void setAttr1(String attr1) { - this.attr1 = attr1; + public BigDecimal getAttr1() { + return attr1; } - public String getAttr1() { - return attr1; + public void setAttr1(BigDecimal attr1) { + this.attr1 = attr1; } public void setAttr2(String attr2) { diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/IMesUnitPriceService.java b/op-modules/op-mes/src/main/java/com/op/mes/service/IMesUnitPriceService.java index efde0140..d281fea3 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/IMesUnitPriceService.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/IMesUnitPriceService.java @@ -61,5 +61,5 @@ public interface IMesUnitPriceService { public int deleteMesUnitPriceByPicId(String picId); - public String importMesUnitPrice(List UnitPriceList, Boolean updateSupport, String operName); + public String importMesUnitPrice(List UnitPriceList, Boolean isUpdateSupport, String operName); } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesUnitPriceServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesUnitPriceServiceImpl.java index 8471aebb..47b8c2d1 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesUnitPriceServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesUnitPriceServiceImpl.java @@ -114,7 +114,7 @@ public class MesUnitPriceServiceImpl implements IMesUnitPriceService { @Override @DS("#header.poolName") - public String importMesUnitPrice(List UnitPriceList, Boolean updateSupport, String operName) { + public String importMesUnitPrice(List UnitPriceList, Boolean isUpdateSupport, String operName) { if (StringUtils.isNull(UnitPriceList) || UnitPriceList.size() == 0) { throw new ServiceException("导入计件薪酬基础数据不能为空！"); } @@ -130,9 +130,18 @@ public class MesUnitPriceServiceImpl implements IMesUnitPriceService { BeanValidators.validateWithException(validator, mesUnitPrice); mesUnitPrice.setPicId(IdUtils.simpleUUID()); mesUnitPrice.setCreateBy(SecurityUtils.getUsername()); + mesUnitPrice.setCreateTime(DateUtils.getNowDate()); mesUnitPriceMapper.insertMesUnitPrice(mesUnitPrice); successNum++; - successMsg.append("
" + successNum + mesUnitPrice.getProductName() + "-" + mesUnitPrice.getChildprocessName() + " 导入成功"); + } else if (isUpdateSupport) { + BeanValidators.validateWithException(validator, mesUnitPrice); + if (!u.getAttr1().equals(mesUnitPrice.getAttr1())){ + mesUnitPrice.setPicId(u.getPicId()); + mesUnitPrice.setUpdateBy(operName); + mesUnitPrice.setUpdateTime(DateUtils.getNowDate()); + mesUnitPriceMapper.updateMesUnitPrice(mesUnitPrice); + successNum++; + } } else { failureNum++; failureMsg.append("
" + failureNum + "、产品 " + mesUnitPrice.getProductName() + " 已存在"); @@ -144,11 +153,12 @@ public class MesUnitPriceServiceImpl implements IMesUnitPriceService { log.error(msg, e); } } + if (failureNum > 0) { - failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下："); + failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确"); throw new ServiceException(failureMsg.toString()); } else { - successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下："); + successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条"); } return successMsg.toString(); } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesUnitpriceReportServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesUnitpriceReportServiceImpl.java index 13a2260a..08f2b666 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesUnitpriceReportServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesUnitpriceReportServiceImpl.java @@ -7,6 +7,7 @@ import com.op.common.core.context.SecurityContextHolder; import com.op.common.core.utils.DateUtils; import com.op.common.security.utils.SecurityUtils; import com.op.mes.domain.MesUnitpriceReport; +import com.op.mes.domain.ProOrderWorkorder; import com.op.mes.mapper.MesUnitpriceReportMapper; import com.op.mes.service.IMesUnitpriceReportService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesUnitPriceMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesUnitPriceMapper.xml index ea9930a1..f1eb00a0 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesUnitPriceMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesUnitPriceMapper.xml @@ -29,9 +29,9 @@