From ac12a08045282450390c311654630604c9f8465a Mon Sep 17 00:00:00 2001 From: siontion Date: Tue, 13 Aug 2024 23:49:17 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90BOM=E6=9B=B4=E6=96=B0=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/module/biz/manager/ChanjetSchedule.java | 12 +++++++----- mes-server/src/main/resources/application-local.yaml | 8 ++++---- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/manager/ChanjetSchedule.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/manager/ChanjetSchedule.java index cb0976e2..09993bf8 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/manager/ChanjetSchedule.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/manager/ChanjetSchedule.java @@ -209,12 +209,12 @@ public class ChanjetSchedule { insertList.forEach(xo -> { // TplusLastestBomDO existTplusLastestBomDO = tplusLastestBomMapper.selectOne(new LambdaUpdateWrapper(){{ - eq(TplusLastestBomDO::getTopCode,xo.getTopCode()) + eq(TplusLastestBomDO::getTopCode,so.getProjectSubCode()) .eq(TplusLastestBomDO::getProjectSubCode,xo.getProjectSubCode()).last("limit 1"); }}); - if(procedureDOS.stream().filter(po->po.getName().equals(xo.getProcedureName()) && po.getCode().equals(xo.getProcedureCode())).count()>0){ - ProcedureDO procedureDO = procedureDOS.stream().filter(po->po.getName().equals(xo.getProcedureName()) && po.getCode().equals(xo.getProcedureCode())).collect(Collectors.toList()).get(0); + if(procedureDOS.stream().filter(po->po.getCode().equals(xo.getProcedureCode())).count()>0){ + ProcedureDO procedureDO = procedureDOS.stream().filter(po->po.getCode().equals(xo.getProcedureCode())).collect(Collectors.toList()).get(0); xo.setProcedureId(procedureDO.getId()).setProcedureCode(procedureDO.getCode()).setProcedureName(procedureDO.getName()); @@ -335,7 +335,7 @@ public class ChanjetSchedule { throw exception(CALL_API_ERROR); } if(CollUtil.isNotEmpty(result.getData())){ - QueryBomResVO topLayer = result.getData().get(0); + QueryBomResVO topLayer = result.getData().stream().filter(ko->!ko.isDisabled()).collect(Collectors.toList()).get(0); resultData = topLayer.getBOMChildDTOs(); if(CollUtil.isNotEmpty(resultData)){ for (BOMChildDTOs dto : resultData) { @@ -416,7 +416,9 @@ public class ChanjetSchedule { public List queryStock(List materialCodeList, Long warehouseId) throws ChanjetApiException { List dataList = new ArrayList<>(16); - List materialDOList = materialMapper.selectList(MaterialDO::getCode, materialCodeList); + List materialDOList = materialMapper.selectList(new LambdaUpdateWrapper(){{ + in(MaterialDO::getCode,materialCodeList); + }}); // 无存货信息，物料信息从物料表取 for (MaterialDO aDo : materialDOList) { diff --git a/mes-server/src/main/resources/application-local.yaml b/mes-server/src/main/resources/application-local.yaml index e8e340fd..978b9b2a 100644 --- a/mes-server/src/main/resources/application-local.yaml +++ b/mes-server/src/main/resources/application-local.yaml @@ -59,7 +59,7 @@ spring: redis: host: 222.71.165.188 # 地址 port: 6379 # 端口 - database: 3 # 数据库索引 + database: 4 # 数据库索引 password: 'qweasd,.123' # 密码，建议生产环境开启 --- #################### 定时任务相关配置 #################### @@ -221,7 +221,7 @@ chanjet: gatewayUrl: https://openapi.chanjet.com #开放平台网关地址 connectTimeout: 3000 #连接超时时间，单位ms readTimeout: 15000 #读取超时时间，单位ms - appKey: 4fwVPgzS #需要填写在开放平台申请的appKey - appSecret: 10A472641CDA5FB08ABA7178B190C7C5 #需要填写在开放平台申请的appSecret + appKey: AQT9tceb #需要填写在开放平台申请的appKey + appSecret: 30AD3E759DD15FFB1687C1B22BECF25A #需要填写在开放平台申请的appSecret secret: 1234567890123456 #秘钥，用于解密，需要去开放平台自主填写，然后配置在此处 - redirectUri: http://222.71.165.187:9031/admin-api/biz/chanjet/receiveCode #Oauth重定向地址，需要去开放平台自主填写，然后配置在此处 \ No newline at end of file + redirectUri: http://222.71.165.187:9021/admin-api/biz/chanjet/receiveCode #Oauth重定向地址，需要去开放平台自主填写，然后配置在此处