diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java index c9c399584..d8a3b2f93 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java @@ -136,7 +136,7 @@ public interface IDistributionParcelListClient { void updateTransferStatus(@RequestParam String orderCode, @RequestParam Long warehouseId, @RequestParam Integer isTransfer); @GetMapping(API_PREFIX+"/updateEntityByOpenOrder") - void updateEntityByOpenOrder(@RequestParam Long advanceId, @RequestParam Long warehouseId, @RequestParam Long waybillId); + void updateEntityByOpenOrder(@RequestParam Long advanceId, @RequestParam Long waybillId); @GetMapping(API_PREFIX+"/findByWaybillNumber") List findByWaybillNumber(@RequestParam String waybillNumber); @@ -146,4 +146,7 @@ public interface IDistributionParcelListClient { @GetMapping(API_PREFIX+"/getListByOrderPackageCode") List getListByOrderPackageCode(@RequestParam String orderPackageCode); + + @GetMapping(API_PREFIX+"/findAllStockListByOrderPackageCode") + List findAllStockListByOrderPackageCode(String orderPackageCode); } diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockArticleClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockArticleClient.java index b3c2ab3db..62f8fcc1d 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockArticleClient.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockArticleClient.java @@ -145,4 +145,7 @@ public interface IDistributionStockArticleClient { @GetMapping(API_PREFIX + "/maintenanceOrderStatus") Boolean maintenanceOrderStatus(String warehouseId); + + @PostMapping(API_PREFIX + "/updateByBatchId") + void updateByBatchId(@RequestBody List stockArticleEntities); } diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseAbnormalRecordEntity.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseAbnormalRecordEntity.java new file mode 100644 index 000000000..e34428481 --- /dev/null +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseAbnormalRecordEntity.java @@ -0,0 +1,90 @@ +package com.logpm.warehouse.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + +import java.util.Date; + +@Data +@TableName("logpm_warehouse_abnormal_record") +@ApiModel(value = "WarehouseAbnormalRecord对象", description = "异常记录表") +@EqualsAndHashCode(callSuper = true) +public class WarehouseAbnormalRecordEntity extends TenantEntity { + + /** 预留1 */ + @ApiModelProperty(name = "预留1",notes = "") + private String reserve1 ; + /** 预留2 */ + @ApiModelProperty(name = "预留2",notes = "") + private String reserve2 ; + /** 预留3 */ + @ApiModelProperty(name = "预留3",notes = "") + private String reserve3 ; + /** 预留4 */ + @ApiModelProperty(name = "预留4",notes = "") + private String reserve4 ; + /** 预留5 */ + @ApiModelProperty(name = "预留5",notes = "") + private String reserve5 ; + + @ApiModelProperty(name = "类型 1入库 2出库",notes = "") + private String type; + + + @ApiModelProperty(name = "异常类型 1无系统编码 2无装车计划 3无装车记录 4无卸车记录",notes = "") + private String abnormalType; + + @ApiModelProperty(name = "车类型 1干线",notes = "") + private String carType; + + @ApiModelProperty(name = "上报仓库id",notes = "") + private Long upWarehouseId; + + @ApiModelProperty(name = "上报仓库名称",notes = "") + private String upWarehouseName; + + @ApiModelProperty(name = "车次号",notes = "") + private String carsNo; + + @ApiModelProperty(name = "运单号",notes = "") + private String waybillNo; + + @ApiModelProperty(name = "订单号",notes = "") + private String orderCode; + + @ApiModelProperty(name = "包件码",notes = "") + private String orderPackageCode; + + + @ApiModelProperty(name = "上报用户id",notes = "") + private Long upUserId; + + @ApiModelProperty(name = "上报用户名称",notes = "") + private String upUserName; + + + @ApiModelProperty(name = "异常状态 0待处理 1完结",notes = "") + private Integer abnormalStatus; + + @ApiModelProperty(name = "上报时间",notes = "") + private Date upTime; + + @ApiModelProperty(name = "处理时间",notes = "") + private Date dealTime; + + + @ApiModelProperty(name = "处理用户id",notes = "") + private Long dealUserId; + + @ApiModelProperty(name = "处理用户名称",notes = "") + private String dealUserName; + + + @ApiModelProperty(name = "备注",notes = "") + private String remark; + +} diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseAbnormalRecordClient.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseAbnormalRecordClient.java new file mode 100644 index 000000000..4bd599bef --- /dev/null +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseAbnormalRecordClient.java @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions 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 distribution. + * 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.feign; + +import com.logpm.warehouse.entity.WarehouseAbnormalRecordEntity; +import org.springblade.common.constant.ModuleNameConstant; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +/** + * 货位 Feign接口类 + * + * @author lmy + * @since 2023-08-14 + */ +@FeignClient( + value = ModuleNameConstant.APPLICATION_WAREHOUSE_NAME +) +public interface IWarehouseAbnormalRecordClient { + + String API_PREFIX = "abormal/client"; + String TOP = API_PREFIX + "/top"; + + @PostMapping(API_PREFIX+"/addAbnormalRecord") + void addAbnormalRecord(@RequestBody WarehouseAbnormalRecordEntity warehouseAbnormalRecordEntity); + + + +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java index e6dd586fd..055e35f8c 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java @@ -280,13 +280,13 @@ public class DistributionParcelListClient implements IDistributionParcelListClie } @Override - public void updateEntityByOpenOrder(Long advanceId, Long warehouseId, Long waybillId) { + public void updateEntityByOpenOrder(Long advanceId, Long waybillId) { - Set set = distributionParcelListService.updateEntityByOpenOrder(advanceId, warehouseId, waybillId); + Set set = distributionParcelListService.updateEntityByOpenOrder(advanceId, waybillId); - for (String orderCode : set) { - distributionStockArticleService.updateOrderInfo(orderCode,warehouseId); - } +// for (String orderCode : set) { +// distributionStockArticleService.updateOrderInfo(orderCode,warehouseId); +// } } @@ -307,4 +307,13 @@ public class DistributionParcelListClient implements IDistributionParcelListClie return distributionParcelListService.list(queryWrapper); } + + @Override + public List findAllStockListByOrderPackageCode(String orderPackageCode) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("order_package_code",orderPackageCode) + .eq("order_package_status","20"); + + return distributionParcelListService.list(queryWrapper); + } } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockArticleClient.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockArticleClient.java index 89dd9977c..f735039fd 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockArticleClient.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockArticleClient.java @@ -301,4 +301,9 @@ public class DistributionStockArticleClient implements IDistributionStockArticle return distributionStockArticleService.maintenanceOrderInfoByWarehouseId(warehouseId); } + @Override + public void updateByBatchId(List stockArticleEntities) { + distributionStockArticleService.updateBatchById(stockArticleEntities); + } + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java index ce08b9eb9..83dd8f774 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java @@ -227,4 +227,6 @@ public interface DistributionParcelListMapper extends BaseMapper + select GROUP_CONCAT(DISTINCT ldpl.waybill_number) + from logpm_distribution_parcel_list ldpl + where ldpl.stock_article_id = #{orderId} + and ldpl.waybill_number is not null + and ldpl.waybill_number != '' + + + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java index d7d1372cf..ed2deaa7d 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java @@ -173,7 +173,7 @@ public interface IDistributionParcelListService extends BaseService updateEntityByOpenOrder(Long advanceId, Long warehouseId, Long waybillId); + Set updateEntityByOpenOrder(Long advanceId, Long waybillId); /** * 根据运单号找 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java index db92038b7..de462c1e8 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java @@ -674,7 +674,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl updateEntityByOpenOrder(Long advanceId, Long warehouseId, Long waybillId) { + public Set updateEntityByOpenOrder(Long advanceId, Long waybillId) { WarehouseWaybillEntity waybillEntity = warehouseWaybillClient.findByWaybillId(waybillId); if (Objects.isNull(waybillEntity)) { log.warn("############updateEntityByOpenOrder: 运单信息不存在 waybillId={}", waybillId); @@ -688,11 +688,11 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("advance_id", advanceId) - .eq("warehouse_id", warehouseId) .eq("is_deleted", 0); List listEntityList = baseMapper.selectList(queryWrapper); Set orderCodes = new TreeSet<>(); for (DistributionParcelListEntity parcelListEntity : listEntityList) { + Long packageWarehouseId = parcelListEntity.getWarehouseId(); parcelListEntity.setWaybillId(waybillId + ""); parcelListEntity.setWaybillNumber(waybillNo); parcelListEntity.setSendWarehouseId(departureWarehouseId); @@ -702,33 +702,37 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl stockArticleEntityQueryWrapper = new QueryWrapper<>(); stockArticleEntityQueryWrapper.eq("order_code", orderCode) - .eq("warehouse_id", warehouseId) .eq("is_deleted", 0); - DistributionStockArticleEntity stockArticleEntity = distributionStockArticleMapper.selectOne(stockArticleEntityQueryWrapper); - if (Objects.isNull(stockArticleEntity)) { - log.error("############updateEntityByOpenOrder: 未找到订单信息 orderCode={}", orderCode); - continue; + List stockArticleEntities = distributionStockArticleMapper.selectList(stockArticleEntityQueryWrapper); + for (DistributionStockArticleEntity stockArticleEntity : stockArticleEntities) { + Long orderId = stockArticleEntity.getId(); + String waybillNumber = baseMapper.findOrderWaybillNo(orderId); + stockArticleEntity.setWaybillNumber(waybillNumber); + stockArticleEntity.setMallId(consigneeId); + stockArticleEntity.setMallCode(basicdataClientEntity.getClientCode()); + stockArticleEntity.setMallName(basicdataClientEntity.getClientName()); + stockArticleEntity.setConsigneePerson(waybillEntity.getConsigneeName()); + stockArticleEntity.setConsigneeMobile(waybillEntity.getConsigneeMobile()); + stockArticleEntity.setConsigneeAddress(waybillEntity.getConsigneeAddress()); + stockArticleEntity.setConsigneeUnit(basicdataClientEntity.getClientName()); + distributionStockArticleMapper.updateById(stockArticleEntity); } - Long consigneeId = waybillEntity.getConsigneeId(); - BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findEntityById(consigneeId); - stockArticleEntity.setMallId(consigneeId); - stockArticleEntity.setMallCode(basicdataClientEntity.getClientCode()); - stockArticleEntity.setMallName(basicdataClientEntity.getClientName()); - stockArticleEntity.setConsigneePerson(waybillEntity.getConsigneeName()); - stockArticleEntity.setConsigneeMobile(waybillEntity.getConsigneeMobile()); - stockArticleEntity.setConsigneeAddress(waybillEntity.getConsigneeAddress()); - stockArticleEntity.setConsigneeUnit(basicdataClientEntity.getClientName()); - distributionStockArticleMapper.updateById(stockArticleEntity); } return orderCodes; } diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/receiver/SyncUpdownDataHandler.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/receiver/SyncUpdownDataHandler.java index dc8d9241f..febe6861e 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/receiver/SyncUpdownDataHandler.java +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/receiver/SyncUpdownDataHandler.java @@ -54,7 +54,4 @@ public class SyncUpdownDataHandler { } } - - - } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java index ac87468bb..20e950ad1 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java @@ -2174,4 +2174,36 @@ public class CarsLoadController { return R.fail(500,"系统异常"); } } + + + @ResponseBody + @PostMapping("/abnormalList") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "成本分摊", notes = "传入loadCarsDTO") + public R abnormalList(@RequestBody LoadCarsDTO loadCarsDTO) { + String method = "############abnormalList: "; + log.info(method + "请求参数{}", loadCarsDTO); + try{ + + //当前登录人选择的仓库 + BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); + if(Objects.isNull(myCurrentWarehouse)){ + log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse); + return R.fail(405,"仓库信息为空"); + } + loadCarsDTO.setWarehouseId(myCurrentWarehouse.getId()); + + return carsLoadService.abnormalList(loadCarsDTO); + }catch (CustomerException e){ + log.error(e.message,e); + return R.fail(e.code,e.message); + }catch (Exception e){ + log.error(method+"系统异常",e); + return R.fail(500,"系统异常"); + } + } + + + + } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.java index a4aea78bc..77afddf19 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.java @@ -99,4 +99,5 @@ public interface TrunklineCarsLoadScanMapper extends BaseMapper findListByLoadIdOrderByCreateTimeAsc(@Param("loadId") Long loadId); + IPage abnormalList(IPage page, @Param("loadCarsDTO") LoadCarsDTO loadCarsDTO); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml index b8d2e7238..f5857e744 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml @@ -462,4 +462,11 @@ order by create_time asc + + diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadScanService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadScanService.java index edb0d4943..d883f0c61 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadScanService.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadScanService.java @@ -94,4 +94,5 @@ public interface ITrunklineCarsLoadScanService extends BaseService findListByLoadIdOrderByCreateTimeAsc(Long loadId); + IPage abnormalList(IPage page, LoadCarsDTO loadCarsDTO); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadService.java index 300e5bdba..83a4d268c 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadService.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadService.java @@ -186,4 +186,6 @@ public interface ITrunklineCarsLoadService extends BaseService list = advanceDetailService.findList(advanceEntity.getId()); trunklineWaybillPackageService.saveList(list,waybillEntity); - distributionParcelListClient.updateEntityByOpenOrder(advanceId,warehouseId,waybillId); - orderCodes.add(advanceEntity.getOrderCode()); + distributionParcelListClient.updateEntityByOpenOrder(advanceId,waybillId); +// orderCodes.add(advanceEntity.getOrderCode()); advanceEntity.setWaybillStatus("1"); advanceEntity.setWaybillNo(waybillEntity.getWaybillNo()); } @@ -465,22 +465,23 @@ public class OpenOrderServiceImpl implements IOpenOrderService { // isTransfer = 0; // } - for (String orderCode : orderCodes) { - DistributionStockArticleEntity stockArticleEntity = distributionStockArticleClient.findStockArticleByOrderCodeAndWarehouseId(orderCode, warehouseId); - if(!Objects.isNull(stockArticleEntity)){ - stockArticleEntity.setConsigneeUnit(openOrderDTO.getConsignee()); - stockArticleEntity.setConsigneePerson(openOrderDTO.getConsigneeName()); - stockArticleEntity.setConsigneeMobile(openOrderDTO.getConsigneeMobile()); - stockArticleEntity.setConsigneeAddress(openOrderDTO.getConsigneeAddress()); - BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findEntityById(consigneeId); - if(Objects.isNull(basicdataClientEntity)){ - stockArticleEntity.setMallId(consigneeId); - stockArticleEntity.setMallCode(basicdataClientEntity.getClientCode()); - stockArticleEntity.setMallName(basicdataClientEntity.getClientName()); - } - distributionStockArticleClient.saveOrUpdate(stockArticleEntity); - } - } +// for (String orderCode : orderCodes) { +// List stockArticleEntities = distributionStockArticleClient.findListByOrderCode(orderCode); +// for (DistributionStockArticleEntity stockArticleEntity : stockArticleEntities) { +// Long orderWarehouseId = stockArticleEntity.getWarehouseId(); +// stockArticleEntity.setConsigneeUnit(openOrderDTO.getConsignee()); +// stockArticleEntity.setConsigneePerson(openOrderDTO.getConsigneeName()); +// stockArticleEntity.setConsigneeMobile(openOrderDTO.getConsigneeMobile()); +// stockArticleEntity.setConsigneeAddress(openOrderDTO.getConsigneeAddress()); +// BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findEntityById(consigneeId); +// if(!Objects.isNull(basicdataClientEntity)){ +// stockArticleEntity.setMallId(consigneeId); +// stockArticleEntity.setMallCode(basicdataClientEntity.getClientCode()); +// stockArticleEntity.setMallName(basicdataClientEntity.getClientName()); +// } +// } +// distributionStockArticleClient.updateByBatchId(stockArticleEntities); +// } //计算扫码入库的包件是否需要把运单和提货单挂上 List billladingPackageList = advanceDetailService.findBillladingPackageByAdvanceIdsAnd(advanceIds); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadScanServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadScanServiceImpl.java index 489a25de3..ba03dcbdf 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadScanServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadScanServiceImpl.java @@ -227,4 +227,9 @@ public class TrunklineCarsLoadScanServiceImpl extends BaseServiceImpl abnormalList(IPage page, LoadCarsDTO loadCarsDTO) { + return baseMapper.abnormalList(page,loadCarsDTO); + } + } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java index 5384b04c1..bfe71038b 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java @@ -24,10 +24,7 @@ import com.logpm.trunkline.service.*; import com.logpm.trunkline.vo.*; import com.logpm.warehouse.entity.WarehouseWayBillDetail; import com.logpm.warehouse.entity.WarehouseWaybillEntity; -import com.logpm.warehouse.feign.IWarehouseTrayTypeClient; -import com.logpm.warehouse.feign.IWarehouseUpdownTypeClient; -import com.logpm.warehouse.feign.IWarehouseWaybillClient; -import com.logpm.warehouse.feign.IWarehouseWaybillDetailClient; +import com.logpm.warehouse.feign.*; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringEscapeUtils; @@ -86,6 +83,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl loadCarsPageList(LoadCarsDTO loadCarsDTO) { @@ -756,6 +755,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl parcelListEntities = distributionParcelListClient.findAllStockListByOrderPackageCode(orderPackageCode); +// for (DistributionParcelListEntity listEntity : parcelListEntities) { +// listEntity.setOrderPackageStatus("60"); +// distributionParcelListClient.update(listEntity); +// Long warehouseId1 = listEntity.getWarehouseId(); +// updownTypeClient.downPackageOrDelTray(orderPackageCode,warehouseId1); +// } +// }catch (Exception e){ +// log.warn("################loadingScan: 下架及解托包件失败"); +// } + + carsLoadScanEntity.setIsData(1); isData = 1; Long otherPackageId = otherParcelListEntity.getId(); @@ -3773,6 +3813,17 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl page = new Page<>(); + page.setCurrent(loadCarsDTO.getPageNum()); + page.setSize(loadCarsDTO.getPageSize()); + + IPage ls = trunklineCarsLoadScanService.abnormalList(page,loadCarsDTO); + + return R.data(ls); + } + @Override public R loadingTrayInfo(LoadCarsDTO loadCarsDTO) { log.info("##############loadingTrayInfo: 查询托盘的货物信息"); @@ -4354,11 +4405,13 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl { + + + IPage findPageList(IPage page, @Param("param") AbnormalRecordDTO abnormalRecordDTO); + +} diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseAbnormalRecordMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseAbnormalRecordMapper.xml new file mode 100644 index 000000000..e88e03d7a --- /dev/null +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseAbnormalRecordMapper.xml @@ -0,0 +1,11 @@ + + + + + + + diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseAbnormalRecordService.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseAbnormalRecordService.java new file mode 100644 index 000000000..04752e7e1 --- /dev/null +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseAbnormalRecordService.java @@ -0,0 +1,12 @@ +package com.logpm.warehouse.service; + +import com.logpm.warehouse.dto.AbnormalRecordDTO; +import com.logpm.warehouse.entity.WarehouseAbnormalRecordEntity; +import org.springblade.core.mp.base.BaseService; +import org.springblade.core.tool.api.R; + +public interface IWarehouseAbnormalRecordService extends BaseService { + R findPageList(AbnormalRecordDTO abnormalRecordDTO); + + +} diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseAbnormalRecordServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseAbnormalRecordServiceImpl.java new file mode 100644 index 000000000..83e88378f --- /dev/null +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseAbnormalRecordServiceImpl.java @@ -0,0 +1,31 @@ +package com.logpm.warehouse.service.impl; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.logpm.warehouse.dto.AbnormalRecordDTO; +import com.logpm.warehouse.entity.WarehouseAbnormalRecordEntity; +import com.logpm.warehouse.mapper.WarehouseAbnormalRecordMapper; +import com.logpm.warehouse.service.IWarehouseAbnormalRecordService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.core.tool.api.R; +import org.springframework.stereotype.Service; + +@Slf4j +@Service +@AllArgsConstructor +public class WarehouseAbnormalRecordServiceImpl extends BaseServiceImpl implements IWarehouseAbnormalRecordService { + + + @Override + public R findPageList(AbnormalRecordDTO abnormalRecordDTO) { + IPage page = new Page<>(); + page.setCurrent(abnormalRecordDTO.getPageNum()); + page.setSize(abnormalRecordDTO.getPageSize()); + + IPage pageList = baseMapper.findPageList(page,abnormalRecordDTO); + + return R.data(pageList); + } +}