From 18871210591ae8345d49467d63ee917001e9a647 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Tue, 2 Apr 2024 14:28:27 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=8F=96=E6=B6=88=E8=87=AA=E6=8F=90?= =?UTF-8?q?=E5=B9=B6=E5=8F=96=E6=B6=88=E5=A4=87=E8=B4=A7=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E3=80=81=E8=87=AA=E6=8F=90=E5=A4=87=E8=B4=A7=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=B7=B2=E5=8F=96=E6=B6=88=E5=A4=87=E8=B4=A7?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/DistributionStockupMapper.xml | 12 +++++++++++- .../impl/DistrilbutionBillLadingServiceImpl.java | 13 +++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml index fdac8b71b..5b55b224d 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml @@ -366,8 +366,18 @@ LEFT JOIN logpm_distribution_parcel_list ldpl on ldpl.stock_article_id = ldbs.stock_article_id LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldpl.id LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldpl.id + LEFT JOIN ( + SELECT + IFNULL(COUNT( b.reservation_id ),0 )AS aaa, + b.stockup_id AS stockup_id + FROM + logpm_distribution_stockup AS a + LEFT JOIN logpm_distribution_stockup_info AS b ON a.id = b.stockup_id + WHERE b.stock_status != 4 + GROUP BY b.stockup_id + ) AS aa ON aa.stockup_id = lds.id - lds.is_deleted = 0 + lds.is_deleted = 0 AND aa.aaa >0 AND ldsi.stock_status != 4 and lds.type_service = #{param.typeService} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java index fc399b0e1..5438fe577 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java @@ -679,6 +679,19 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl entityList = distributionStockupInfoService.list(Wrappers.query().lambda() + .in(DistributionStockupInfoEntity::getReservationId, ids) + .ne(DistributionStockupInfoEntity::getStockStatus, "4") + .eq(DistributionStockupInfoEntity::getStockUpType, "3") + ); + if (Func.isNotEmpty(entityList)){ + for (DistributionStockupInfoEntity distributionStockupInfoEntity : entityList) { + //取消备货任务 + distributionStockupInfoEntity.setStockStatus("4"); + distributionStockupInfoService.updateById(distributionStockupInfoEntity); + } + } return R.status(true); case 1: return R.fail("未授权!!!"); From 24c903847a26087dc7b483b2139e82eaad6519c5 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Tue, 2 Apr 2024 14:37:23 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E8=87=AA=E6=8F=90=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E5=AE=8C=E7=BB=93=E5=A4=87=E8=B4=A7=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistributionStockupInfoServiceImpl.java | 2 -- .../service/impl/DistrilbutionBillLadingServiceImpl.java | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupInfoServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupInfoServiceImpl.java index 0c6e79d0d..b8895e6db 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupInfoServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupInfoServiceImpl.java @@ -128,7 +128,6 @@ public class DistributionStockupInfoServiceImpl extends BaseServiceImpl billLadingentityList = this.list(Wrappers.query().lambda() .eq(DistributionStockupInfoEntity::getReservationId, reservationId) @@ -143,7 +142,6 @@ public class DistributionStockupInfoServiceImpl extends BaseServiceImpl stockupInfoEntityList = this.list(Wrappers.query().lambda() .eq(DistributionStockupInfoEntity::getStockupId, distributionStockupInfoEntity.getStockupId()) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java index 5438fe577..2383d3fc5 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java @@ -2157,6 +2157,8 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl ladingScanEntities = distributionBillLadingScanService.list(Wrappers.query().lambda().eq(DistributionBillLadingScanEntity::getBillLadingId, Long.parseLong(s))); From 6bb9dc23c381ecdbbe89ebca9803cf97b8d2e076 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Tue, 2 Apr 2024 16:19:41 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E8=87=AA=E6=8F=90PDA=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/basicdata/excel/BasicDataClienImporter.java | 1 + .../distribution/mapper/DistrilbutionBillLadingMapper.xml | 8 +++++--- .../service/impl/DistributionParcelListServiceImpl.java | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicDataClienImporter.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicDataClienImporter.java index f4d83869e..c663173e0 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicDataClienImporter.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicDataClienImporter.java @@ -9,6 +9,7 @@ import java.util.List; public class BasicDataClienImporter implements ExcelImporter { private final IBasicdataClientService service; + private final Boolean isCovered; diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml index 7b1c05567..e0c67dd6b 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml @@ -514,9 +514,11 @@ + diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/ITaskQuestService.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/ITaskQuestService.java index 8479466fc..9509d101b 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/ITaskQuestService.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/ITaskQuestService.java @@ -26,6 +26,7 @@ import com.logpm.warehouse.entity.QuestDetailChildEntity; import com.logpm.warehouse.entity.QuestDetailEntity; import com.logpm.warehouse.entity.TaskQuestEntity; import com.logpm.warehouse.excel.QuestContrastExcel; +import com.logpm.warehouse.excel.TaskQueryDataExcel; import com.logpm.warehouse.excel.TaskQuestExcel; import com.logpm.warehouse.vo.*; import org.springblade.core.mp.base.BaseService; @@ -295,4 +296,10 @@ public interface ITaskQuestService extends BaseService { List findStockList(TaskSearchDTO taskSearchDTO); + /** + * 导出未盘点数据 + * @param questDetailDTO + * @return + */ + List exportContrastStockInfo(QuestDetailDTO questDetailDTO); } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java index 532d18661..c10533d4b 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java @@ -38,6 +38,7 @@ import com.logpm.warehouse.dto.TaskQuestDTO; import com.logpm.warehouse.dto.TaskSearchDTO; import com.logpm.warehouse.entity.*; import com.logpm.warehouse.excel.QuestContrastExcel; +import com.logpm.warehouse.excel.TaskQueryDataExcel; import com.logpm.warehouse.excel.TaskQuestExcel; import com.logpm.warehouse.mapper.TaskQuestMapper; import com.logpm.warehouse.mapper.WarehouseTrayGoodsMapper; @@ -924,53 +925,9 @@ public class TaskQuestServiceImpl extends BaseServiceImpl questDetailEntityIPage = baseMapper.selectTaskInfoIPage(page, questDetailDTO.getQuestNum(), questDetail); IPage page1 = new Page<>(); List questDetailVOS = new ArrayList<>(); - questDetailEntityIPage.getRecords().stream().forEach(i -> { + questDetailEntityIPage.getRecords().forEach(i -> { QuestDetailVO questDetailVO = new QuestDetailVO(); BeanUtil.copyProperties(i, questDetailVO); - //查询包件信息 - /*if(ObjectUtils.isNotNull(i.getOrderPackageId()) ){ - - DistributionParcelListEntity parcelListId = distributionParcelListClient.getParcelListId(String.valueOf(i.getOrderPackageId())); - if(ObjectUtils.isNotNull(parcelListId)){ - questDetailVO.setFirsts(parcelListId.getFirsts()); - questDetailVO.setSecond(parcelListId.getSecond()); - questDetailVO.setThirdProduct(parcelListId.getThirdProduct()); - questDetailVO.setMaterialName(parcelListId.getMaterialName()); - questDetailVO.setMaterialCode(parcelListId.getMaterialCode()); - questDetailVO.setBrandName(parcelListId.getBrandName()); - } - }else*/ - /* if(i.getQuestTarget().equals(2)){ - //零担 - DistributionStockArticleEntity stockArticleEntity = new DistributionStockArticleEntity(); - stockArticleEntity.setWarehouseId(i.getWarehouseId()); - stockArticleEntity.setId(i.getOrderId()); - List stockArticleInfo = distributionStockArticleClient.getStockArticleInfo(stockArticleEntity); - if(!stockArticleInfo.isEmpty()){ - // - questDetailVO.setOrderCode(stockArticleInfo.get(0).getOrderCode()); - questDetailVO.setFirsts(stockArticleInfo.get(0).getDescriptionGoods()); - questDetailVO.setDescriptionGoods(stockArticleInfo.get(0).getDescriptionGoods()); - - } - - }else if(i.getQuestTarget().equals(3) && ObjectUtils.isNull(i.getOrderPackageId())){ - //库存平 无数据的 - DistributionStockListEntity stockListById = distributionStockListClient.getStockListById(i.getStockId()); - if(ObjectUtils.isNotNull( stockListById)){ - questDetailVO.setOrderCode(stockListById.getIncomingBatch()); - questDetailVO.setMaterialName(stockListById.getDescriptionGoods() ); - questDetailVO.setMaterialCode(stockListById.getCargoNumber () ); - questDetailVO.setBrandName(stockListById.getBrandName()); - } - }*/ - /*if(ObjectUtils.isNotNull(i.getTrayId())){ - //查询托盘名称 - List trayEntityList = basicdataTrayClient.getTrayEntityList(i.getTrayId()); - if(ObjectUtils.isNotNull(trayEntityList)){ - questDetailVO.setTrayName(trayEntityList.get(0).getPalletName()); - } - }*/ if (!i.getQuestStatus().equals(0)) { R> listR = userSearchClient.listByUser(String.valueOf(i.getUpdateUser())); if (ObjectUtils.isNotNull(listR.getData())) { @@ -3365,6 +3322,16 @@ public class TaskQuestServiceImpl extends BaseServiceImpl exportContrastStockInfo(QuestDetailDTO questDetailDTO) { + + + List datas =baseMapper.selectContrastStockInfo( questDetailDTO.getQuestNum()); + return datas; + + + + } private String getQuestNum(String warehouseCode) { SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd"); @@ -3398,4 +3365,6 @@ public class TaskQuestServiceImpl extends BaseServiceImpl Date: Tue, 2 Apr 2024 22:01:26 +0800 Subject: [PATCH 8/8] =?UTF-8?q?add:=E5=A2=9E=E5=8A=A0=20=E9=87=8D=E5=BA=86?= =?UTF-8?q?=E5=92=8C=20=E6=B8=85=E8=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/constant/OldSystemDataPushConfig.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java b/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java index d7a10e9ef..95d0c11a6 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java @@ -41,6 +41,12 @@ public class OldSystemDataPushConfig { // 西安 warehourseIds.add("145"); + // 重庆 + warehourseIds.add("42"); + + // 清远 + warehourseIds.add("68"); + }