From 1c18904137615b65df56e7b5f0a406b42f821d5b Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" <123456> Date: Mon, 28 Aug 2023 11:02:57 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E4=B8=80=E4=BA=9B=E6=97=A0?= =?UTF-8?q?=E5=85=B3=E7=AB=9F=E8=A6=81=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- blade-service/logpm-distribution/pom.xml | 16 ++++-- .../service/impl/AsyncDataServiceImpl.java | 20 +++++-- .../java/com/logpm/factory/TestService.java | 56 ++++++++++++++++--- .../com/logpm/factory/excel/ExcelMode.java | 13 +++++ blade-service/logpm-warehouse/pom.xml | 15 +++-- 5 files changed, 99 insertions(+), 21 deletions(-) create mode 100644 blade-service/logpm-factory/src/test/java/com/logpm/factory/excel/ExcelMode.java diff --git a/blade-service/logpm-distribution/pom.xml b/blade-service/logpm-distribution/pom.xml index b11ef77eb..1d290685d 100644 --- a/blade-service/logpm-distribution/pom.xml +++ b/blade-service/logpm-distribution/pom.xml @@ -12,7 +12,7 @@ org.springblade logpm-distribution - 3.1.0.RELEASE + ${bladex.project.version} @@ -35,7 +35,7 @@ org.springblade logpm-distribution-api - 3.1.0.RELEASE + ${bladex.project.version} org.springblade @@ -45,12 +45,12 @@ org.springblade logpm-basic-api - 3.1.0.RELEASE + ${bladex.project.version} org.springblade logpm-warehouse-api - 3.1.0.RELEASE + ${bladex.project.version} @@ -75,7 +75,7 @@ org.springblade logpm-basicdata-api - 3.1.0.RELEASE + ${bladex.project.version} compile @@ -85,6 +85,12 @@ ${bladex.project.version} + + org.springblade + blade-user-api + ${bladex.project.version} + + diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java index ed5f8bc5e..3e89a9097 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java @@ -12,12 +12,10 @@ import com.logpm.factory.mt.service.IMtFactoryOrderMainService; import com.logpm.factory.mt.service.IMtFactoryOrderService; import com.logpm.factory.mt.service.IMtPackageInfoService; import com.logpm.factory.oupai.entity.FactoryOrderEntity; +import com.logpm.factory.oupai.entity.FactoryPackageDetailEntity; import com.logpm.factory.oupai.entity.FactoryPackageEntity; import com.logpm.factory.oupai.entity.ReceivingOrderEntity; -import com.logpm.factory.oupai.service.IFactoryOrderService; -import com.logpm.factory.oupai.service.IFactoryPackageService; -import com.logpm.factory.oupai.service.IOuPaiFactoryService; -import com.logpm.factory.oupai.service.IReceivingOrderService; +import com.logpm.factory.oupai.service.*; import com.logpm.factory.pan.service.IPanFactoryOrderService; import com.logpm.factory.pan.service.IPanPackageInfoService; import com.logpm.factory.pan.service.IPanPackageListService; @@ -93,6 +91,8 @@ public class AsyncDataServiceImpl implements IAsyncDataService { private final IReceivingOrderService receivingOrderService; + private final IFactoryPackageDetailService factoryPackageDetailService; + //工厂查询 private final IOuPaiFactoryService ouPaiFactoryService; @@ -509,6 +509,11 @@ public class AsyncDataServiceImpl implements IAsyncDataService { //更新包件 advanceDetailClient.updateAdvanceDetail(advanceDetailEntity); + + + + + } else { advanceDetailEntity = new AdvanceDetailEntity(); advanceDetailEntity.setAdvanceId(advanceEntity.getId());//预仓id @@ -556,6 +561,13 @@ public class AsyncDataServiceImpl implements IAsyncDataService { advanceDetailEntity.setRemark("");//备注 advanceDetailEntity.setOldId(0);// Integer detailId = advanceDetailClient.addAdvanceDetail(advanceDetailEntity); + advanceDetailEntity.setId(detailId); + // 物料明细 + + List factoryPackageDetailEntities = factoryPackageDetailService.lambdaQuery().eq(FactoryPackageDetailEntity::getPackageId, factoryPackageEntity.getId()).list(); + + // todo 保存物料明细 + if (detailId > 0) { //修改数据状态 factoryPackageEntity.setTurnStatus(2); diff --git a/blade-service/logpm-factory/src/test/java/com/logpm/factory/TestService.java b/blade-service/logpm-factory/src/test/java/com/logpm/factory/TestService.java index f048883a4..019d6d717 100644 --- a/blade-service/logpm-factory/src/test/java/com/logpm/factory/TestService.java +++ b/blade-service/logpm-factory/src/test/java/com/logpm/factory/TestService.java @@ -1,11 +1,21 @@ package com.logpm.factory; +import cn.hutool.http.HttpResponse; +import cn.hutool.http.HttpUtil; +import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.EasyExcelFactory; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.metadata.BaseRowModel; +import com.alibaba.excel.metadata.Sheet; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.extension.conditions.update.UpdateChainWrapper; import com.fasterxml.jackson.core.JsonProcessingException; import com.logpm.factory.comfac.controller.FactoryCommonController; import com.logpm.factory.comfac.dto.UnloadCarDTO; +import com.logpm.factory.excel.ExcelMode; import com.logpm.factory.mt.entity.MtFactoryOrderMain; import com.logpm.factory.mt.entity.MtPushData; import com.logpm.factory.mt.service.IMtFactoryDataService; @@ -17,6 +27,7 @@ import com.logpm.factory.snm.vo.MTOrderPackageRelationVO; import com.logpm.oldproject.entity.AdvanceDetailEntity; import com.logpm.oldproject.feign.IAdvanceDetailClient; import com.rabbitmq.client.Channel; +import lombok.Data; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.springblade.core.test.BladeBootTest; @@ -28,13 +39,12 @@ import org.springframework.amqp.core.Message; import org.springframework.amqp.rabbit.annotation.RabbitHandler; import org.springframework.beans.factory.annotation.Autowired; +import java.io.FileInputStream; +import java.io.FileNotFoundException; import java.security.NoSuchAlgorithmException; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; import java.util.stream.Collectors; @ExtendWith(BladeSpringExtension.class) @@ -47,10 +57,40 @@ public class TestService { // // // -// @Test -// public void test2() { + public void test2() { // ouPaiFactoryService.findOuPaiFactoryOrderDTOByCarCarNumber("LCD230505047"); -// -// } + + // 获取Excle + Sheet sheet = new Sheet(1, 1, ExcelMode.class); + + try { + List readList = EasyExcelFactory.read(new FileInputStream("f://order_status_log.xlsx"), sheet); + + + List list = new ArrayList(); + for (Object obj : readList) { + ExcelMode t = (ExcelMode) obj; + + JSONObject json = JSONObject.parseObject(t.getArgs()); + + System.out.println(json.getString("unitNo")); + //HttpResponse execute = HttpUtil.createPost("http://h5u.huitongys.com/api/logpm-factory/factory/common/sendOrderStatus").body(t.getArgs()).execute(); + //System.out.println(execute.body()); + + + } + + + + + + + } catch (FileNotFoundException e) { + e.printStackTrace(); + } + + + } } + diff --git a/blade-service/logpm-factory/src/test/java/com/logpm/factory/excel/ExcelMode.java b/blade-service/logpm-factory/src/test/java/com/logpm/factory/excel/ExcelMode.java new file mode 100644 index 000000000..260c65f5f --- /dev/null +++ b/blade-service/logpm-factory/src/test/java/com/logpm/factory/excel/ExcelMode.java @@ -0,0 +1,13 @@ +package com.logpm.factory.excel; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.metadata.BaseRowModel; +import lombok.Data; + +@Data +public class ExcelMode extends BaseRowModel { + + @ExcelProperty(index = 1) + private String args; + +} diff --git a/blade-service/logpm-warehouse/pom.xml b/blade-service/logpm-warehouse/pom.xml index 2088f96b1..868b4ce8c 100644 --- a/blade-service/logpm-warehouse/pom.xml +++ b/blade-service/logpm-warehouse/pom.xml @@ -37,7 +37,7 @@ org.springblade logpm-warehouse-api - 3.1.0.RELEASE + ${bladex.project.version} compile @@ -48,13 +48,13 @@ org.springblade logpm-basicdata-api - 3.1.0.RELEASE + ${bladex.project.version} compile org.springblade logpm-distribution-api - 3.1.0.RELEASE + ${bladex.project.version} compile @@ -70,9 +70,16 @@ org.springblade logpm-old-project-api - 3.1.0.RELEASE + ${bladex.project.version} compile + + + org.springblade + blade-user-api + ${bladex.project.version} + +