diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseScanRecordVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseScanRecordVO.java index 168a42d67..e9e3d1a7e 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseScanRecordVO.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseScanRecordVO.java @@ -26,6 +26,12 @@ public class WarehouseScanRecordVO extends WarehouseScanRecordEntity { * 操作人 */ @ApiModelProperty(value = "操作人") + private Long operatorId; + + /** + * 操作人(Name) + */ + @ApiModelProperty(value = "操作人(Name)") private String operatorName; /** @@ -33,4 +39,16 @@ public class WarehouseScanRecordVO extends WarehouseScanRecordEntity { */ @ApiModelProperty(value = "扫描相亲") private String scanNodeMsg; + + /** + * 二级扫描类型(扫描详情) + */ + @ApiModelProperty(value = "扫描详情") + private String scanNodeType; + +// /** +// * 二级扫描类型（name） +// */ +// @ApiModelProperty(value = "二级扫描类型(name)") +// private String scanNodeTypeName; } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java index 30d008e18..34aff4ef4 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java @@ -167,11 +167,13 @@ public class BasicdataGoodsAreaServiceImpl extends BaseServiceImpl myWarehouseList = basicdataWarehouseService.getMyWarehouseList(); - myWarehouseList.forEach(w->{ - LambdaQueryWrapper qw = Wrappers.query().lambda().eq(BasicdataGoodsAreaEntity::getWarehouseId, w.getId()); - List basicdataGoodsAreaEntities = basicdataGoodsAreaMapper.selectList(qw); - w.setChildren(basicdataGoodsAreaEntities); - }); + if (Func.isNotEmpty(myWarehouseList)){ + myWarehouseList.forEach(w->{ + LambdaQueryWrapper qw = Wrappers.query().lambda().eq(BasicdataGoodsAreaEntity::getWarehouseId, w.getId()); + List basicdataGoodsAreaEntities = basicdataGoodsAreaMapper.selectList(qw); + w.setChildren(basicdataGoodsAreaEntities); + }); + } // //查询一级仓库节点信息 // List basicdataWarehouseVOList = baseMapper.selectFirstNode(); // //获取二节点的货区 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-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java index 0c650d22f..0fb72b06d 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java @@ -327,7 +327,6 @@ public class DistributionDeliveryListController extends BladeController { @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "customArgs") public R> selectDiscussStockArticleInfoList(@ApiIgnore @RequestParam Map params, Query query) { - IPage distributionStockArticle = distributionDeliveryListService.selectDiscussStockArticleInfoList(params,query); return R.data(distributionStockArticle); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java index 76b6c50c3..9ef992ca9 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java @@ -312,7 +312,6 @@ public class DistributionReservationController extends BladeController { @ApiOperation(value = "详情", notes = "传入distrbutionReservation") public R> selectUpdateAvailableStockArticle(@ApiIgnore @RequestParam Long id, Query query,@ApiIgnore @RequestParam Map distributionStockArticle) { IPage page = Condition.getPage(query); - List stockArticleVOS = reservationService.selectUpdateAvailableStockArticle(id,distributionStockArticle); page.setRecords(stockArticleVOS); page.setTotal(stockArticleVOS.size()); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index 5f904e695..4c660c7df 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -1384,7 +1384,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl { + clientNum.getAndIncrement(); //判断原始客户中是否存在 if (Func.isEmpty(originalClient.get(k))) { //不存在，意味这里应该进行客户的新增 @@ -1417,6 +1420,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl { + orderNum.getAndIncrement(); mallName.add(s.getMallName()); DistributionStockArticleDTO stockArticleDTO = Func.copy(s, DistributionStockArticleDTO.class); List packageListInfo = stockArticleDTO.getPackageListInfo(); @@ -1479,6 +1483,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl reservationStockarticleEntityList = distributionDeliveryListMapper.selectStockArticleById(deliveryListEntityId,k); Map> oldStockArticle = reservationStockarticleEntityList.stream().collect(Collectors.groupingBy(DistributionReservationStockarticleEntity::getStockArticleId)); v.forEach(s -> { + orderNum.getAndIncrement(); //根据配送和客户名称查询预约 AtomicInteger packageNum = new AtomicInteger(); AtomicInteger reduceNum = new AtomicInteger(); @@ -1628,6 +1633,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl reservationEntities = originalClient.get(f); + reservationEntities.forEach(r->{ + distributionSignforMapper.deleteByReservationAndDeliveryId(r.getId(),deliveryListEntityId); + }); }); String kind = deliveryListEntity.getKind(); switch (kind) { @@ -1675,6 +1684,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl 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} + + diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseStockMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseStockMapper.xml index 9a911d971..afc214504 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseStockMapper.xml +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseStockMapper.xml @@ -46,9 +46,42 @@ diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseStockServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseStockServiceImpl.java index cc74532a7..09bf20876 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseStockServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseStockServiceImpl.java @@ -22,11 +22,13 @@ import com.logpm.warehouse.vo.WarehouseStockVO; import com.logpm.warehouse.excel.WarehouseStockExcel; import com.logpm.warehouse.mapper.WarehouseStockMapper; import com.logpm.warehouse.service.IWarehouseStockService; +import org.springblade.core.tool.utils.SpringUtil; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseServiceImpl; import java.util.List; +import org.springblade.system.feign.IUserClient; /** * 备货扫描记录 服务实现类 @@ -39,7 +41,13 @@ public class WarehouseStockServiceImpl extends BaseServiceImpl selectWarehouseStockPage(IPage page, WarehouseStockVO WarehouseStock) { - return page.setRecords(baseMapper.selectWarehouseStockPage(page, WarehouseStock)); + List warehouseScanRecordVOS = baseMapper.selectWarehouseStockPage(page, WarehouseStock); + IUserClient userCliient = SpringUtil.getBean(IUserClient.class); + for (WarehouseScanRecordVO warehouseScanRecordVO : warehouseScanRecordVOS) { + warehouseScanRecordVO.setOperatorName(userCliient.userInfoById(warehouseScanRecordVO.getOperatorId()).getData().getName()); + warehouseScanRecordVO.getNodeName().equals("上下架"); + } + return page.setRecords(warehouseScanRecordVOS); } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/wrapper/WarehouseStockRecordWrapper.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/wrapper/WarehouseStockRecordWrapper.java new file mode 100644 index 000000000..faf3fba5f --- /dev/null +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/wrapper/WarehouseStockRecordWrapper.java @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * ReWarehouse and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * ReWarehouses of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * ReWarehouses in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the Warehouse. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.warehouse.wrapper; + +import com.logpm.warehouse.entity.WarehouseStockEntity; +import com.logpm.warehouse.vo.WarehouseScanRecordVO; +import com.logpm.warehouse.vo.WarehouseStockVO; +import lombok.extern.log4j.Log4j2; +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; + +import java.util.Objects; + +/** + * 备货扫描记录 包装类,返回视图层所需的字段 + * + * @author lmy + * @since 2023-08-24 + */ +@Log4j2 +public class WarehouseStockRecordWrapper extends BaseEntityWrapper { + + public static WarehouseStockRecordWrapper build() { + return new WarehouseStockRecordWrapper(); + } + + @Override + public WarehouseScanRecordVO entityVO(WarehouseScanRecordVO WarehouseStock) { + log.info("WarehouseStock>>>>>>>>>>>{}",WarehouseStock); + + return WarehouseStock; + } + + +}