diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/WorkNodeEnums.java b/blade-biz-common/src/main/java/org/springblade/common/constant/WorkNodeEnums.java index 5f49f1a6c..fdb7aa2fa 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/WorkNodeEnums.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/WorkNodeEnums.java @@ -16,7 +16,7 @@ public enum WorkNodeEnums implements Serializable { INITIAL_DATA_ENTRY(101010, "数据入库"), INITIAL_WAREHOUSE_ENTRY(101020, "始发仓入库"), - BILLING(102010, "开单"), + OPEN_ORDER(102010, "开单"), CHANGE_ORDER(102020, "改单"), REVIEW_ORDER(102030, "审单"), @@ -37,6 +37,7 @@ public enum WorkNodeEnums implements Serializable { CANCEL_TRIPARTITE_TRANSFER_DEPART(104020, "三方中转取消发车"), ARRICE_TRIPARTITE_TRANSFER_DEPART(104030, "三方中转到达"), SIGN_TRIPARTITE_TRANSFER_DEPART(104040, "三方中转签收"), + UNLOAD_TRIPARTITE_TRANSFER_DEPART(104050, "三方中转卸车"), UNLOAD_INCOMING_WAREHOUSE(105010,"卸车入库"), TRANSFER_WAREHOUSE_UNLOADING(105020, "卸车确认"), diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataBrandClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataBrandClient.java index fa19bf326..5ed98cadf 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataBrandClient.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataBrandClient.java @@ -22,9 +22,12 @@ import org.springblade.common.constant.ModuleNameConstant; import org.springblade.core.mp.support.BladePage; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; import java.util.List; +import java.util.Set; /** * 基础品牌表 Feign接口类 @@ -55,4 +58,7 @@ public interface IBasicdataBrandClient { @GetMapping(API_PREFIX+"/findEntityByName") BasicdataBrandEntity findEntityByName(@RequestParam("brand") String brand); + + @PostMapping(API_PREFIX+"/findListByNames") + List findListByNames(@RequestBody Set brandSet); } diff --git a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IOrderDetailClient.java b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IOrderDetailClient.java index 52846cc43..dfbe015ea 100644 --- a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IOrderDetailClient.java +++ b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IOrderDetailClient.java @@ -22,6 +22,7 @@ import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; +import java.util.Date; import java.util.List; /** @@ -45,4 +46,7 @@ public interface IOrderDetailClient { @GetMapping(API_PREFIX + "/findEntityByUnitNoAndOldWarehosueId") OrderDetailEntity findEntityByUnitNoAndOldWarehosueId(@RequestParam String unitNo, @RequestParam Integer oldWarehouseId); + + @GetMapping(API_PREFIX + "/findRukuTime") + Date findRukuTime(@RequestParam String unitNo, @RequestParam Integer oldWarehouseId); } diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java index 584ac8f4c..974f8f4b9 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java @@ -39,6 +39,7 @@ public class LoadCarsDTO implements Serializable { private String settlementPerson; private Long warehouseId; + private List warehouseIds; private Integer startCarType; private Integer loadingType; diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineCarsLoadVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineCarsLoadVO.java index 61878dbde..082215244 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineCarsLoadVO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineCarsLoadVO.java @@ -50,6 +50,7 @@ public class TrunklineCarsLoadVO extends TrunklineCarsLoadEntity { private Integer lastStartCarStatus; private Integer planUnloadNum; private Integer totalLoadingNum; + private Integer stockCarsNum; private String loadCarsNo; private String unloadStatus; diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataBrandClient.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataBrandClient.java index 618b33e8f..e16ee2598 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataBrandClient.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataBrandClient.java @@ -30,6 +30,7 @@ import org.springframework.web.bind.annotation.RestController; import springfox.documentation.annotations.ApiIgnore; import java.util.List; +import java.util.Set; /** * 基础品牌表 Feign实现类 @@ -68,4 +69,14 @@ public class BasicdataBrandClient implements IBasicdataBrandClient { return basicdataBrandService.getOne(queryWrapper); } + @Override + public List findListByNames(Set brandSet) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("brand_name",brandSet) + .eq("is_deleted",0); + List list = basicdataBrandService.list(queryWrapper); + + return list; + } + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml index afe056c7f..ae459a3af 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml @@ -142,14 +142,8 @@ (select IFNULL(sum(lds.stock_quantity),0) from logpm_distribution_stock lds where lds.stock_article = ldbs.stock_article_id AND lds.bill_lading_id = ldbl.id ) preparedQuantity , - (select COALESCE(GROUP_CONCAT(DISTINCT lwtg.tray_code SEPARATOR ','), '') - from logpm_distribution_parcel_list ldpl - LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldpl.id and lwtg.association_type = '3' - where ldpl.stock_article_id = ldbs.stock_article_id) pallet , - (select COALESCE(GROUP_CONCAT(DISTINCT lwug.allocation_title SEPARATOR ','), '') - from logpm_distribution_parcel_list ldpl - LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldpl.id and lwug.association_type = '3' - where ldpl.stock_article_id = ldbs.stock_article_id) goodsAllocation, + ldsa.trays pallet , + ldsa.allocation goodsAllocation, ldsa.service_number serviceNumber,ldsa.waybill_number waybillNumber,ldsa.train_number trainNumber,ldsa.send_warehouse_name sendWarehouseName, GROUP_CONCAT(DISTINCT ldbls.scan_user) AS scanUser ,MAX(ldbls.create_time) AS signingTime from @@ -177,8 +171,8 @@ ldpl.send_warehouse_name sendWarehouseName, ldpl.order_code orderCode, ldpl.service_number serviceNumber, - lwtg.tray_code pallet, - lwug.allocation_title goodsAllocation, + ldpl.pallet pallet, + ldpl.goods_allocation goodsAllocation, ldpl.order_package_status orderPackageStatus, case when lds.id is null then '未备货' diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java index 3c867c190..0dd6a4b49 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java @@ -77,6 +77,7 @@ import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.BeanUtil; import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.ObjectUtil; +import org.springblade.core.tool.utils.StringUtil; import org.springblade.system.cache.DictBizCache; import org.springblade.system.entity.DictBiz; import org.springblade.system.entity.User; @@ -2596,16 +2597,24 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl { - + Date findRukuTime(@Param("unitNo") String unitNo, @Param("oldWarehouseId") Integer oldWarehouseId); } diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/OrderDetailMapper.xml b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/OrderDetailMapper.xml index d07b619fd..849aa143e 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/OrderDetailMapper.xml +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/OrderDetailMapper.xml @@ -3,5 +3,14 @@ + + diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/IOrderDetailService.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/IOrderDetailService.java index f92b11ddc..4f48c2db4 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/IOrderDetailService.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/IOrderDetailService.java @@ -2,6 +2,7 @@ package com.logpm.oldproject.service; import com.logpm.oldproject.entity.OrderDetailEntity; +import java.util.Date; import java.util.List; public interface IOrderDetailService { @@ -11,4 +12,6 @@ public interface IOrderDetailService { List findByOrderCode(String orderCode,Integer oldWarehouseId); OrderDetailEntity findEntityByUnitNoAndOldWarehosueId(String unitNo, Integer oldWarehouseId); + + Date findRukuTime(String unitNo, Integer oldWarehouseId); } diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/OrderDetailServiceImpl.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/OrderDetailServiceImpl.java index e84ea14c8..b8af93483 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/OrderDetailServiceImpl.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/OrderDetailServiceImpl.java @@ -7,6 +7,7 @@ import com.logpm.oldproject.service.IOrderDetailService; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; +import java.util.Date; import java.util.List; @Service @@ -40,4 +41,9 @@ public class OrderDetailServiceImpl implements IOrderDetailService { return orderDetailMapper.selectOne(queryWrapper); } + + @Override + public Date findRukuTime(String unitNo, Integer oldWarehouseId) { + return orderDetailMapper.findRukuTime(unitNo,oldWarehouseId); + } } diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java index 7e97d03b0..eb888343b 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java @@ -1626,7 +1626,7 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService { Integer carsType = orderDetailEntity.getCarsType(); Integer signState = orderDetailEntity.getSignState(); waybillNo = orderDetailEntity.getWaybillNo(); - Date rukuTime = orderDetailEntity.getUpdateTime(); + Date rukuTime = orderDetailClient.findRukuTime(unitNo,oldWarehouseId); if(StringUtil.isBlank(waybillNo)){ Integer advanceId = orderDetailEntity.getAdvanceId(); AdvanceEntity advanceEntity = advanceClient.fingById(advanceId); 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 a7bf6b131..c363140f2 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 @@ -24,6 +24,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.math.BigDecimal; +import java.util.ArrayList; import java.util.Enumeration; import java.util.List; import java.util.Objects; @@ -2396,12 +2397,14 @@ public class CarsLoadController { log.info(method + "请求参数{}", loadCarsDTO); try{ //当前登录人选择的仓库 + List warehouseIds = new ArrayList<>(); BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); if(Objects.isNull(myCurrentWarehouse)){ - log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse); - return R.fail(405,"多仓权限无法操作，请选择仓库"); + List myWatchWarehouse = warehouseClient.getMyWatchWarehouse(); + myWatchWarehouse.forEach(warehouse -> warehouseIds.add(warehouse.getId())); + }else{ + warehouseIds.add(myCurrentWarehouse.getId()); } - loadCarsDTO.setWarehouseId(myCurrentWarehouse.getId()); return carsLoadService.findSignOrderPageList(loadCarsDTO); }catch (CustomerException e){ diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml index 473071363..5c97a077f 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml @@ -507,7 +507,7 @@ where ltcl.is_deleted = 0 and ltcl.load_type != '4' and ltcl.load_status != '100' - and ltcl.start_warehouse_id = #{param.warehouseId} + and (ltcl.start_warehouse_id = #{param.warehouseId} or Locate(#{param.warehouseId},ltcl.end_warehouse_ids) > 0 ) and Locate(#{param.carsNo},ltcl.cars_no) > 0 @@ -518,10 +518,10 @@ and ltcl.create_time <= #{param.endTime} - and ltcl.load_status = '0' + and ltcl.load_status in ('0','20') - and ltcl.load_status != '0' + and ltcl.load_status not in ('0','20') order by ltcl.create_time desc diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineLoadSignOrderMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineLoadSignOrderMapper.xml index fcda70922..cb58060fa 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineLoadSignOrderMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineLoadSignOrderMapper.xml @@ -131,7 +131,15 @@ left join logpm_trunkline_cars_load ltcl on ltcl.id = ltlso.load_id LEFT JOIN logpm_trunkline_cars_order ltco on ltco.sign_order_id = ltlso.id - and (ltlso.warehouse_id = #{param.warehouseId} or ltlso.final_node_id = #{param.warehouseId}) + + and (ltlso.warehouse_id in + + #{item} + + or ltlso.final_node_id in + + #{item} + ) and ltlso.load_id = #{param.loadId} diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java index 55a138644..487221bea 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java @@ -56,6 +56,7 @@ import java.io.InputStream; import java.math.BigDecimal; import java.util.*; import java.util.concurrent.CompletableFuture; +import java.util.function.Function; import java.util.stream.Collectors; @Slf4j @@ -1186,6 +1187,15 @@ public class OpenOrderServiceImpl implements IOpenOrderService { return R.data(advanceEntityList); } + //把pacakgeDetailExcelDTOS中所有brand放入一个Set集合 + Set brandSet = pacakgeDetailExcelDTOS.stream().map(PacakgeDetailExcelDTO::getBrand).collect(Collectors.toSet()); + brandSet.add("其他"); + + List basicdataBrandEntities = basicdataBrandClient.findListByNames(brandSet); + + //把basicdataBrandEntities转化成brandName为key的Map + Map brandMap = basicdataBrandEntities.stream().collect(Collectors.toMap(BasicdataBrandEntity::getBrandName, a -> a, (k1, k2) -> k1)); + Map> listMap = pacakgeDetailExcelDTOS.parallelStream().collect(Collectors.groupingBy(a -> a.getOrderCode() + "&" + a.getTrainNumber())); listMap.remove("null&null"); @@ -1243,6 +1253,10 @@ public class OpenOrderServiceImpl implements IOpenOrderService { advanceEntity.setArea(pacakgeDetailExcelDTO.getArea()); String brand = pacakgeDetailExcelDTO.getBrand(); advanceEntity.setBrand(brand); + BasicdataBrandEntity basicdataBrandEntity = brandMap.get(brand); + if(Objects.isNull(basicdataBrandEntity)){ + advanceEntity.setBrand("其他"); + } advanceEntity.setTotalNum(excelDTOS.size()); String firsts = pacakgeDetailExcelDTO.getFirsts(); advanceEntity.setPackName(firsts); @@ -1352,7 +1366,12 @@ public class OpenOrderServiceImpl implements IOpenOrderService { advanceDetailModel.setAdvanceId(advanceId); advanceDetailModel.setOrderCode(orderCode); advanceDetailModel.setOrderPackageCode(orderPackageCode); - advanceDetailModel.setBrand(pacakgeDetailExcelDTO.getBrand()); + String brand = advanceEntity.getBrand(); + BasicdataBrandEntity brandEntity = brandMap.get(brand); + if(Objects.isNull(brandEntity)){ + brandEntity = brandMap.get("其他"); + advanceDetailModel.setBrand(brandEntity.getBrandName()); + } advanceDetailModel.setSystemType("线上"); advanceDetailModel.setTrainNumber(advanceEntity.getTrainNumber()); String firsts = pacakgeDetailExcelDTO.getFirsts(); @@ -2263,6 +2282,15 @@ public class OpenOrderServiceImpl implements IOpenOrderService { List importOrderNoPackageExcelDTOS = EasyExcel.read(inputStream).head(ImportOrderNoPackageExcelDTO.class).sheet(0).headRowNumber(2).doReadSync(); + //把importOrderNoPackageExcelDTOS中所有brand放入一个Set + Set brands = importOrderNoPackageExcelDTOS.parallelStream().map(ImportOrderNoPackageExcelDTO::getBrand).collect(Collectors.toSet()); + + List brandEntities = basicdataBrandClient.findListByNames(brands); + + //把brandEntities转化成以brandName为key的Map + Map brandMap = brandEntities.stream().collect(Collectors.toMap(BasicdataBrandEntity::getBrandName, Function.identity())); + + Map orderCodeCounts = importOrderNoPackageExcelDTOS.stream() .collect(Collectors.groupingBy(a->(a.getOrderCode()+"&"+a.getFirsts()), Collectors.counting())); @@ -2322,7 +2350,12 @@ public class OpenOrderServiceImpl implements IOpenOrderService { advanceEntity.setServiceNum(importOrderNoPackageExcelDTO.getServiceNum()); advanceEntity.setOrderCode(orderCode); advanceEntity.setArea(importOrderNoPackageExcelDTO.getArea()); - advanceEntity.setBrand(importOrderNoPackageExcelDTO.getBrand()); + String brand = importOrderNoPackageExcelDTO.getBrand(); + advanceEntity.setBrand(brand); + BasicdataBrandEntity basicdataBrandEntity = brandMap.get(brand); + if(Objects.isNull(basicdataBrandEntity)){ + advanceEntity.setBrand("其他"); + } advanceEntity.setTotalNum(Integer.parseInt(importOrderNoPackageExcelDTO.getCount())); advanceEntity.setPackName(importOrderNoPackageExcelDTO.getFirsts()); advanceEntity.setDealerCode(importOrderNoPackageExcelDTO.getDealerCode()); @@ -2464,6 +2497,13 @@ public class OpenOrderServiceImpl implements IOpenOrderService { List importOrderNoPackageExcelDTOS = EasyExcel.read(inputStream).head(ImportOrderNoPackageExcelDTO.class).sheet(0).headRowNumber(2).doReadSync(); + //把importOrderNoPackageExcelDTOS中所有brand放入一个Set + Set brands = importOrderNoPackageExcelDTOS.parallelStream().map(ImportOrderNoPackageExcelDTO::getBrand).collect(Collectors.toSet()); + List brandEntities = basicdataBrandClient.findListByNames(brands); + //把brandEntities转化成brandName为Key的Map + Map brandEntityMap = brandEntities.stream().collect(Collectors.toMap(BasicdataBrandEntity::getBrandName, Function.identity())); + + //把importOrderNoPackageExcelDTOS中的orderCode存入一个set集合 // Set orderCodes = importOrderNoPackageExcelDTOS.parallelStream().map(ImportOrderNoPackageExcelDTO::getOrderCode).collect(Collectors.toSet()); // @@ -2562,7 +2602,18 @@ public class OpenOrderServiceImpl implements IOpenOrderService { advanceEntity.setServiceNum(importOrderNoPackageExcelDTO.getServiceNum()); advanceEntity.setOrderCode(orderCode); advanceEntity.setArea(importOrderNoPackageExcelDTO.getArea()); - advanceEntity.setBrand(importOrderNoPackageExcelDTO.getBrand()); + String brand = importOrderNoPackageExcelDTO.getBrand(); + advanceEntity.setBrand(brand); + + if(StringUtil.isNotBlank(brand)){ + BasicdataBrandEntity basicdataBrandEntity = brandEntityMap.get(brand); + if(Objects.isNull(basicdataBrandEntity)){ + advanceEntity.setBrand("其他"); + } + } + + + advanceEntity.setTotalNum(Integer.parseInt(importOrderNoPackageExcelDTO.getCount())); advanceEntity.setPackName(importOrderNoPackageExcelDTO.getFirsts()); advanceEntity.setDealerCode(importOrderNoPackageExcelDTO.getDealerCode()); 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 814caa3ae..880c40ae5 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 @@ -3731,6 +3731,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl orderPackageCodeList = new ArrayList<>(); + orderPackageCodeList.add(orderPackageCode); + packageTrackLogAsyncService.addPackageTrackLog(AuthUtil.getTenantId(), AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getNickName(), orderPackageCodeList, warehouseId, warehouseName, WorkNodeEnums.UNLOAD_TRIPARTITE_TRANSFER_DEPART.getCode(), content); + JSONObject jsonObject = trunklineCarsLoadScanService.findUnloadNumAudio(loadId, warehouseId); Integer totalUnloadNum = jsonObject.getInteger("totalUnloadNum"); Integer abnormalUnloadNum = jsonObject.getInteger("abnormalUnloadNum"); @@ -4691,9 +4696,9 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl StringUtil.isNotBlank(carsOrderVO.getMallPerson())).map(TrunklineCarsOrderVO::getMallPerson).distinct().collect(Collectors.joining(","))); + trunklineLoadSignOrderEntity.setMallMobile(trunklineCarsOrderVOS.stream().filter(carsOrderVO-> StringUtil.isNotBlank(carsOrderVO.getMallMobile())).map(TrunklineCarsOrderVO::getMallMobile).distinct().collect(Collectors.joining(","))); + trunklineLoadSignOrderEntity.setMallAddress(trunklineCarsOrderVOS.stream().filter(carsOrderVO-> StringUtil.isNotBlank(carsOrderVO.getMallAddress())).map(TrunklineCarsOrderVO::getMallAddress).distinct().collect(Collectors.joining(","))); trunklineLoadSignOrderEntity.setBelongToWarehouseId(warehouseId); trunklineLoadSignOrderEntity.setBelongToWarehouseName(warehouseName); //把trunklineCarsOrderVOS中所有元素的planNum求和 @@ -5610,6 +5615,9 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl { trunklineCarsLoadingLogService.savaLoadingLog(warehouseId, warehouseName, loadId, e.getLoadCode(), e.getWaybillId(), e.getWaybillNo(), e.getOrderCode(), e.getScanCode(), 1, 1, 1, 0, null, null, null, e.getFromWarehouseId(), e.getId(), remark); + + updownTypeClient.downPackageOrDelTray(e.getScanCode(),e.getFromWarehouseId(),"手动批量装车下架解托"); + }); packageTrackLogAsyncService.addBatchPackageTrackLog(addPackageTrackLogList, orderPackageCodes, WorkNodeEnums.INITIAL_WAREHOUSE_LOADING.getCode(), null); @@ -6450,9 +6458,6 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl loadScanOrderList = trunklineCarsOrderService.findLoadScanPackageWithOrder(loadId, warehouseId); @@ -6472,7 +6477,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl orderPackageCodes, Integer workNode, Long warehouseId, Map map) { - BasicdataWarehouseEntity warehouseEntity = warehouseClient.getEntityWarehouseId(warehouseId); - if(!Objects.isNull(warehouseEntity)){ - //更新所有包件的当前所在仓 - if(CollUtil.isNotEmpty(orderPackageCodes)){ - List advanceDetailEntities = advanceDetailService.findListByOrderPackageCodeList(orderPackageCodes); - advanceDetailEntities.forEach(advanceDetailEntity -> { - advanceDetailEntity.setNowWarehouseId(warehouseId); - advanceDetailEntity.setNowWarehouseName(warehouseEntity.getName()); - }); - advanceDetailService.updateBatchById(advanceDetailEntities); + if(!workNode.equals(WorkNodeEnums.OPEN_ORDER.getCode())){ + BasicdataWarehouseEntity warehouseEntity = warehouseClient.getEntityWarehouseId(warehouseId); + if(!Objects.isNull(warehouseEntity)){ + //更新所有包件的当前所在仓 + if(CollUtil.isNotEmpty(orderPackageCodes)){ + List advanceDetailEntities = advanceDetailService.findListByOrderPackageCodeList(orderPackageCodes); + advanceDetailEntities.forEach(advanceDetailEntity -> { + advanceDetailEntity.setNowWarehouseId(warehouseId); + advanceDetailEntity.setNowWarehouseName(warehouseEntity.getName()); + }); + advanceDetailService.updateBatchById(advanceDetailEntities); + } } } - Integer packageStatus = null; if(WorkNodeEnums.INITIAL_WAREHOUSE_DEPART.getCode().equals(workNode)){ //始发仓发车