From 55cf372318360affa2c887969169606d2009a86c Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 20 May 2024 10:37:13 +0800 Subject: [PATCH 1/8] =?UTF-8?q?yfai=20=E6=95=B0=E6=8D=AE=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/mes/apiservice/cus_suit/CusProperties.java | 73 ++++++++++++++++++++++ .../ext/mes/apiservice/cus_suit/MesProperties.java | 70 +++++++++++++++++++++ .../mes/apiservice/cus_suit/yfas/YfasBusiTool.java | 65 +++++++++++++++++++ 3 files changed, 208 insertions(+) create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/cus_suit/CusProperties.java create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/cus_suit/MesProperties.java create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/cus_suit/yfas/YfasBusiTool.java diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/cus_suit/CusProperties.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/cus_suit/CusProperties.java new file mode 100644 index 0000000..4a8768a --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/cus_suit/CusProperties.java @@ -0,0 +1,73 @@ +package cn.estsh.i3plus.ext.mes.apiservice.cus_suit; + +import cn.estsh.i3plus.platform.common.util.CommonConstWords; +import cn.estsh.i3plus.platform.plugin.datasource.DynamicDataSourceProxy; +import lombok.Getter; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import java.util.concurrent.TimeUnit; + +/** + * @Description : 客户定制化配置，对应配置文件 + * @Reference : + * @Author : alwaysfrin + * @CreateDate : 2019-06-11 14:26 + * @Modify: + **/ +@Configuration +//@PropertySource(value="classpath:/cus_config/cus-datasource.properties",encoding = "UTF-8") +public class CusProperties { + + public static final Logger LOGGER = LoggerFactory.getLogger(CommonConstWords.SYSTEM_LOG); + + /*********************** + * 安道拓数据源配置 + */ + @Value("${impp.yfas.datasource.isopen}") + @Getter + private boolean yfasIsOpen; + + @Value("${impp.yfas.datasource.driver-class-name}") + @Getter + private String yfasDriverClassName; + + @Value("${impp.yfas.datasource.alias}") + @Getter + private String yfasDsAlias; + + @Value("${impp.yfas.datasource.jdbc-url}") + @Getter + private String yfasDsJdbcUrl; + + @Value("${impp.yfas.datasource.username}") + @Getter + private String yfasDsUsername; + + @Value("${impp.yfas.datasource.password}") + @Getter + private String yfasDsPassword; + + @ConditionalOnExpression("'${impp.yfas.datasource.isopen:false}' == 'true'") + @Bean(name = "yfasDataSource") + public DynamicDataSourceProxy initYfasCustomerSet(){ + LOGGER.info("【初始化客户定制化...】"); + + /** + * 注册客户定制数据源 + */ + LOGGER.info("【客户定制化：安道拓数据源加载...】"); + //安道拓定制业务 + DynamicDataSourceProxy yfasDataSource = DynamicDataSourceProxy.initDataSourceFactory(this.getYfasDriverClassName(), + this.getYfasDsJdbcUrl(),this.getYfasDsUsername(),this.getYfasDsPassword(),TimeUnit.MINUTES.toMillis(30)); + + //手动注册DataSource到spring中 + //SpringContextsUtil.registBean(this.getYfasDsAlias(),yfasDataSource); + + return yfasDataSource; + } +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/cus_suit/MesProperties.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/cus_suit/MesProperties.java new file mode 100644 index 0000000..f629e3e --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/cus_suit/MesProperties.java @@ -0,0 +1,70 @@ +package cn.estsh.i3plus.ext.mes.apiservice.cus_suit; + +import cn.estsh.i3plus.platform.common.util.CommonConstWords; +import cn.estsh.i3plus.platform.plugin.datasource.DynamicDataSourceProxy; +import lombok.Getter; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import java.util.concurrent.TimeUnit; + +/** + * @Description : mes 直连数据源 + * @Reference : + * @Author : Rock.Yu + * @CreateDate : 2019-06-13 20:40 + * @Modify: + **/ +@Configuration +//@PropertySource(value="classpath:/cus_config/cus-datasource.properties",encoding = "UTF-8") +public class MesProperties { + + public static final Logger LOGGER = LoggerFactory.getLogger(CommonConstWords.SYSTEM_LOG); + + /*********************** + * mes直连数据源配置 + */ + @Value("${impp.mes.datasource.isopen}") + @Getter + private boolean mesIsOpen; + + @Value("${impp.mes.datasource.driver-class-name}") + @Getter + private String mesDriverClassName; + + @Value("${impp.mes.datasource.alias}") + @Getter + private String mesDsAlias; + + @Value("${impp.mes.datasource.jdbc-url}") + @Getter + private String mesDsJdbcUrl; + + @Value("${impp.mes.datasource.username}") + @Getter + private String mesDsUsername; + + @Value("${impp.mes.datasource.password}") + @Getter + private String mesDsPassword; + + @ConditionalOnExpression("'${impp.mes.datasource.isopen:false}' == 'true'") + @Bean(name = "mesDataSource") + + public DynamicDataSourceProxy initmesCustomerSet(){ + LOGGER.info("【初始化客户定制化-mes直连...】"); + /** + * 注册客户定制数据源 + */ + LOGGER.info("【客户定制化：mes直连数据源加载...】"); + //安道拓定制业务 + DynamicDataSourceProxy mesDataSource = DynamicDataSourceProxy.initDataSourceFactory(this.getMesDriverClassName(), + this.getMesDsJdbcUrl(),this.getMesDsUsername(),this.getMesDsPassword(),TimeUnit.MINUTES.toMillis(30)); + + return mesDataSource; + } +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/cus_suit/yfas/YfasBusiTool.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/cus_suit/yfas/YfasBusiTool.java new file mode 100644 index 0000000..dbc8182 --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/cus_suit/yfas/YfasBusiTool.java @@ -0,0 +1,65 @@ +package cn.estsh.i3plus.ext.mes.apiservice.cus_suit.yfas; + +import cn.estsh.i3plus.platform.plugin.datasource.DynamicDataSourceProxy; +import cn.estsh.i3plus.pojo.mes.bean.BasVendor; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import java.sql.SQLException; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @Description : 安道拓服务 + * @Reference : 为了防止和原有事务Service拦截冲突，命名时注意不要使用service + * @Author : alwaysfrin + * @CreateDate : 2019-06-11 14:35 + * @Modify: + **/ +@Component +public class YfasBusiTool { + + @Resource(name="yfasDataSource") + private DynamicDataSourceProxy dataSourceProxy; + + public void execute(String sql) throws SQLException { + dataSourceProxy.execute(sql); + } + + public void insert(String tableName,HashMap objMap) throws SQLException { + dataSourceProxy.insert(tableName,objMap); + } + + public void update(String tableName,HashMap conditionMap,HashMap setValueMap) throws SQLException { + dataSourceProxy.update(tableName,conditionMap,setValueMap); + } + + public void detelte(String tableName,HashMap conditionMap) throws SQLException { + dataSourceProxy.delete(tableName,conditionMap); + } + + public List> listMap(String sql) throws SQLException { + return dataSourceProxy.queryMapList(sql); + } + + public BasVendor get(String sql) throws SQLException, IllegalAccessException, InstantiationException { + return dataSourceProxy.queryObject(sql,BasVendor.class); + } + + public List listObject(String sql) throws SQLException, IllegalAccessException, InstantiationException { + return dataSourceProxy.queryObjectList(sql,BasVendor.class); + } + + public BasVendor get(String tableName,HashMap conditionMap) throws SQLException, IllegalAccessException, InstantiationException { + return dataSourceProxy.queryObject(tableName,conditionMap,BasVendor.class); + } + + public List listObject(String tableName,HashMap conditionMap) throws SQLException, IllegalAccessException, InstantiationException { + return dataSourceProxy.queryObjectList(tableName,conditionMap,BasVendor.class); + } + + public int[] executeAsBatch(String[] sqlArr) throws SQLException { + return dataSourceProxy.executeAsBatch(sqlArr); + } +} From cc1138597988a5c662235cbd4a2a348a5f6ec2d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=AE=E7=AC=91=E7=9D=80=E9=9D=A2=E5=AF=B9=E6=98=8E?= =?UTF-8?q?=E5=A4=A9?= <752558143@qq.com> Date: Mon, 20 May 2024 10:46:25 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=B8=BB=E6=95=B0?= =?UTF-8?q?=E6=8D=AEbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus-ext-mes-apiservice/src/groovy/mesWorkOrderToSap.groovy | 6 +++--- .../i3plus/ext/mes/apiservice/dbinterface/MesSAPDbAdapter.java | 4 ++-- .../estsh/i3plus/ext/mes/apiservice/dbinterface/WmsSAPDbQuery.java | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/groovy/mesWorkOrderToSap.groovy b/modules/i3plus-ext-mes-apiservice/src/groovy/mesWorkOrderToSap.groovy index 8144391..a769785 100644 --- a/modules/i3plus-ext-mes-apiservice/src/groovy/mesWorkOrderToSap.groovy +++ b/modules/i3plus-ext-mes-apiservice/src/groovy/mesWorkOrderToSap.groovy @@ -25,11 +25,11 @@ class mesWorkOrderToSap { @Autowired private MesWorkOrderToSapRepository mesWorkOrderToSapRDao; - //@Resource(name = "yfasDataSource") + @Resource(name = "yfasDataSource") private DynamicDataSourceProxy yfasDataSource; - //@Resource(name = "mesDataSource") - //private DynamicDataSourceProxy mesDataSource; + @Resource(name = "mesDataSource") + private DynamicDataSourceProxy mesDataSource; @Getter @Setter diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/dbinterface/MesSAPDbAdapter.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/dbinterface/MesSAPDbAdapter.java index c00ec95..a2d28fe 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/dbinterface/MesSAPDbAdapter.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/dbinterface/MesSAPDbAdapter.java @@ -41,10 +41,10 @@ public class MesSAPDbAdapter { public static final Logger LOGGER = LoggerFactory.getLogger(WmsSAPDbWriter.class); - //@Resource(name = "yfasDataSource") + @Resource(name = "yfasDataSource") private DynamicDataSourceProxy sapDataSourceProxy; - //@Resource(name = "mesDataSource") + @Resource(name = "mesDataSource") private DynamicDataSourceProxy mesDataSourceProxy; @Value("${sync.redis.time:1800}") diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/dbinterface/WmsSAPDbQuery.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/dbinterface/WmsSAPDbQuery.java index f0baca2..247bed3 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/dbinterface/WmsSAPDbQuery.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/dbinterface/WmsSAPDbQuery.java @@ -26,10 +26,10 @@ import java.sql.Connection; public class WmsSAPDbQuery { public static final Logger LOGGER = LoggerFactory.getLogger(WmsSAPDbQuery.class); public static boolean needI18N = true; -// @Resource(name = "wmsDataSource") -// private DynamicDataSourceProxy wmsDataSourceProxy; + @Resource(name = "wmsDataSource") + private DynamicDataSourceProxy wmsDataSourceProxy; - //@Resource(name = "mesDataSource") + @Resource(name = "mesDataSource") private DynamicDataSourceProxy mesDataSourceProxy; @Autowired From d583285fea68a73cdbb9a7029a61df3b6a8c7830 Mon Sep 17 00:00:00 2001 From: jun Date: Mon, 20 May 2024 11:13:59 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-71.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/resources/application-71.properties b/modules/i3plus-ext-mes-apiservice/src/main/resources/application-71.properties index 220f79c..eebcf5a 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/resources/application-71.properties +++ b/modules/i3plus-ext-mes-apiservice/src/main/resources/application-71.properties @@ -212,7 +212,7 @@ spring.shardingsphere.datasource.names=master,slave ##?? spring.shardingsphere.datasource.master.type=com.zaxxer.hikari.HikariDataSource spring.shardingsphere.datasource.master.driver-class-name= com.mysql.jdbc.Driver -spring.shardingsphere.datasource.master.JdbcUrl=jdbc:mysql://10.195.88.71:3306/impp_i3_mes?autoReconnect=true&useSSL=false&characterEncoding=utf-8 +spring.shardingsphere.datasource.master.JdbcUrl=jdbc:mysql://10.195.88.71:3316/impp_i3_mes?autoReconnect=true&useSSL=false&characterEncoding=utf-8 spring.shardingsphere.datasource.master.username=root spring.shardingsphere.datasource.master.password=estsh123 @@ -228,7 +228,7 @@ spring.shardingsphere.datasource.master.keep-alive-time=3500000 ##?? spring.shardingsphere.datasource.slave.type=com.zaxxer.hikari.HikariDataSource spring.shardingsphere.datasource.slave.driver-class-name= com.mysql.jdbc.Driver -spring.shardingsphere.datasource.slave.JdbcUrl=jdbc:mysql://10.195.88.71:3306/impp_i3_mes?autoReconnect=true&useSSL=false&characterEncoding=utf-8 +spring.shardingsphere.datasource.slave.JdbcUrl=jdbc:mysql://10.195.88.71:3336/impp_i3_mes?autoReconnect=true&useSSL=false&characterEncoding=utf-8 spring.shardingsphere.datasource.slave.username=root spring.shardingsphere.datasource.slave.password=estsh123 From 71a2d40140bd07abf0ac14a17f79454d1fbfb399 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=AE=E7=AC=91=E7=9D=80=E9=9D=A2=E5=AF=B9=E6=98=8E?= =?UTF-8?q?=E5=A4=A9?= <752558143@qq.com> Date: Mon, 20 May 2024 11:25:21 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=B8=BB=E6=95=B0?= =?UTF-8?q?=E6=8D=AEbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/ext/mes/apiservice/dbinterface/WmsSAPDbQuery.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/dbinterface/WmsSAPDbQuery.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/dbinterface/WmsSAPDbQuery.java index 247bed3..f1d75b6 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/dbinterface/WmsSAPDbQuery.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/dbinterface/WmsSAPDbQuery.java @@ -26,8 +26,8 @@ import java.sql.Connection; public class WmsSAPDbQuery { public static final Logger LOGGER = LoggerFactory.getLogger(WmsSAPDbQuery.class); public static boolean needI18N = true; - @Resource(name = "wmsDataSource") - private DynamicDataSourceProxy wmsDataSourceProxy; + /*@Resource(name = "wmsDataSource") + private DynamicDataSourceProxy wmsDataSourceProxy;*/ @Resource(name = "mesDataSource") private DynamicDataSourceProxy mesDataSourceProxy; From b628c49ec1a8c556d533ac2e2bb63995d50aa91f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LML=E4=B8=B6?= Date: Mon, 20 May 2024 11:44:24 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E7=BC=96=E8=AF=91=E9=94=99=E8=AF=AF=20?= =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiservice/serviceimpl/base/MesShippingOrderManagementService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementService.java index 6225ec7..629c721 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementService.java @@ -123,8 +123,8 @@ public class MesShippingOrderManagementService extends BaseMesService Date: Mon, 20 May 2024 14:17:04 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E5=8F=91=E8=BF=90=E9=80=BB=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/MesShippingOrderManagementService.java | 61 ++++++++++++++++++---- 1 file changed, 52 insertions(+), 9 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementService.java index 629c721..13f36b3 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementService.java @@ -1,8 +1,8 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; import cn.estsh.i3plus.ext.mes.api.base.IMesConfigService; +import cn.estsh.i3plus.ext.mes.api.base.IMesPartService; import cn.estsh.i3plus.ext.mes.api.base.IMesShippingOrderManagementService; -import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil; import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.i3plus.platform.common.tool.TimeTool; @@ -13,6 +13,7 @@ import cn.estsh.i3plus.pojo.mes.bean.*; import cn.estsh.i3plus.pojo.mes.repository.MesJisShippingRepository; import cn.estsh.i3plus.pojo.mes.repository.MesPartRepository; import cn.estsh.i3plus.pojo.mes.repository.MesPartShippingGroupRepository; +import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.util.ValidatorBean; @@ -25,6 +26,8 @@ import org.springframework.util.StringUtils; import java.util.ArrayList; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; @Service @Slf4j @@ -47,6 +50,9 @@ public class MesShippingOrderManagementService extends BaseMesService { MesShippingOrderManagementDetail detail = new MesShippingOrderManagementDetail(); + MesPart part = partService.getPartByPartNo(k.getPartNo(), k.getOrganizeCode()); + detail.setPartName(part.getPartName()); + detail.setCustPartNo(k.getCustomerPartNo()); + detail.setPlanQty(1D); + detail.setActualQty(1); detail.setShippingOrderNo(finalBean.getShippingOrderNo()); detail.setOrganizeCode(k.getOrganizeCode()); detail.setStatus(MesExtEnumUtil.SHIPPING_ORDER_STATUS.CREATE.getValue()); @@ -259,12 +270,13 @@ public class MesShippingOrderManagementService extends BaseMesService detailDeleteList = detailService.findAll(detailPackBean); - ; + Map> detailMap = detailDeleteList.stream().collect(Collectors.groupingBy(k -> k.getPartNo())); + List jisShippingList = new ArrayList<>(); - detailDeleteList.forEach(k -> { + detailMap.forEach((k, v) -> { DdlPackBean packBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode()); - DdlPreparedPack.getStringEqualPack(k.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringEqualPack(v.get(0).getPartNo(), "partNo", packBean); MesPart part = partRepository.getByProperty(packBean); MesJisShipping jisShipping = new MesJisShipping(); @@ -277,13 +289,13 @@ public class MesShippingOrderManagementService extends BaseMesService { +// +// DdlPackBean packBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode()); +// DdlPreparedPack.getStringEqualPack(k.getPartNo(), "partNo", packBean); +// MesPart part = partRepository.getByProperty(packBean); +// +// MesJisShipping jisShipping = new MesJisShipping(); +// BeanUtils.copyProperties(originBean, jisShipping, "id"); +// BeanUtils.copyProperties(k, jisShipping, "id"); +// jisShipping.setFactoryCode(originBean.getOrganizeCode()); +// jisShipping.setCusCode(originBean.getCustCode()); +// jisShipping.setShippingTime(TimeTool.getNowTime(true)); +// jisShipping.setDock(originBean.getSendDockCode()); +// jisShipping.setErpWarerhouse(configService.getCfgValue(bean.getOrganizeCode(), "ERP_WARERHOUSE")); +// jisShipping.setErpWarehous(configService.getCfgValue(bean.getOrganizeCode(), "ERP_WAREHOUS")); +// jisShipping.setCusDock(originBean.getCustDockCode()); +// jisShipping.setCustOrderNo(k.getCustOrderNo()); +// jisShipping.setSerialNumber(k.getBarcode()); +// jisShipping.setQuantityPerCar(detailDeleteList.size()); +// jisShipping.setShippingOrderCode(originBean.getShippingOrderNo()); +// jisShipping.setVin(k.getVin()); +// jisShipping.setCarNo(k.getVin()); +// if(!StringUtils.isEmpty(part)){ +// jisShipping.setUnit(part.getUnit()); +// } +// jisShipping.setOffTime(TimeTool.getNowTime(true)); +// ConvertBean.serviceModelInitialize(jisShipping, AuthUtil.getSessionUser().getUserName()); +// jisShippingList.add(jisShipping); +// }); + //修改当前发运单状态 originBean.setStatus(MesExtEnumUtil.SHIPPING_ORDER_STATUS.SHIPPED.getValue()); From c5ddfe0c9fe4e619b0c58d8704faa74b1fc57580 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LML=E4=B8=B6?= Date: Mon, 20 May 2024 14:18:17 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E5=8F=91=E8=BF=90=E9=80=BB=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiservice/serviceimpl/base/MesShippingOrderManagementService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementService.java index 13f36b3..d7239a5 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementService.java @@ -291,7 +291,7 @@ public class MesShippingOrderManagementService extends BaseMesService Date: Mon, 20 May 2024 14:26:31 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E5=8F=91=E8=BF=90=E9=80=BB=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/MesShippingOrderManagementService.java | 31 ---------------------- 1 file changed, 31 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementService.java index d7239a5..0a31cf4 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementService.java @@ -303,37 +303,6 @@ public class MesShippingOrderManagementService extends BaseMesService { -// -// DdlPackBean packBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode()); -// DdlPreparedPack.getStringEqualPack(k.getPartNo(), "partNo", packBean); -// MesPart part = partRepository.getByProperty(packBean); -// -// MesJisShipping jisShipping = new MesJisShipping(); -// BeanUtils.copyProperties(originBean, jisShipping, "id"); -// BeanUtils.copyProperties(k, jisShipping, "id"); -// jisShipping.setFactoryCode(originBean.getOrganizeCode()); -// jisShipping.setCusCode(originBean.getCustCode()); -// jisShipping.setShippingTime(TimeTool.getNowTime(true)); -// jisShipping.setDock(originBean.getSendDockCode()); -// jisShipping.setErpWarerhouse(configService.getCfgValue(bean.getOrganizeCode(), "ERP_WARERHOUSE")); -// jisShipping.setErpWarehous(configService.getCfgValue(bean.getOrganizeCode(), "ERP_WAREHOUS")); -// jisShipping.setCusDock(originBean.getCustDockCode()); -// jisShipping.setCustOrderNo(k.getCustOrderNo()); -// jisShipping.setSerialNumber(k.getBarcode()); -// jisShipping.setQuantityPerCar(detailDeleteList.size()); -// jisShipping.setShippingOrderCode(originBean.getShippingOrderNo()); -// jisShipping.setVin(k.getVin()); -// jisShipping.setCarNo(k.getVin()); -// if(!StringUtils.isEmpty(part)){ -// jisShipping.setUnit(part.getUnit()); -// } -// jisShipping.setOffTime(TimeTool.getNowTime(true)); -// ConvertBean.serviceModelInitialize(jisShipping, AuthUtil.getSessionUser().getUserName()); -// jisShippingList.add(jisShipping); -// }); - //修改当前发运单状态 originBean.setStatus(MesExtEnumUtil.SHIPPING_ORDER_STATUS.SHIPPED.getValue());