diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/BusinessPreOrderDataQueueHandler.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/BusinessPreOrderDataQueueHandler.java index e1795c42c..446f3f924 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/BusinessPreOrderDataQueueHandler.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/BusinessPreOrderDataQueueHandler.java @@ -12,6 +12,7 @@ import com.rabbitmq.client.Channel; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.common.constant.RabbitConstant; +import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.BeanUtil; import org.springblade.core.tool.utils.ObjectUtil; @@ -51,12 +52,28 @@ public class BusinessPreOrderDataQueueHandler { @RabbitHandler public void businessPreOrderDataHandler(Map map, Message message, Channel channel) { +// // plantA(map); + + R tenant1 = sysClient.getTenant(AuthUtil.getTenantId()); + + if(tenant1.isSuccess() && tenant1.getData() != null ){ + Tenant data = tenant1.getData(); + if(1==data.getTenantType()){ + log.info(">>>>>>>>> 当前作业对象 {} 未 商家对象",data.getTenantName() ); + return ; + } + } + + R> tenantList = sysClient.getTenantList(); if (tenantList.isSuccess()) { List data = tenantList.getData(); data.forEach(tenant -> { + + + if (!ObjectUtil.isEmpty(tenant.getTenantType())) { if (2 == tenant.getTenantType()) { List basicdataClientEntitysTenantId = basicdataClientClient.findBasicdataClientEntitysTenantId(tenant.getTenantId()); 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 36294174f..0c35302ef 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 @@ -744,22 +744,22 @@ public class OpenOrderServiceImpl implements IOpenOrderService { distributionParcelListClient.updateList(parcelListEntities); //根据订单id获取每个订单的运单拼接数据 + if(!stockArticleIds.isEmpty()){ + List stockArticleEntities = distributionStockArticleClient.findWaybillNoByOrderIds(stockArticleIds); - List stockArticleEntities = distributionStockArticleClient.findWaybillNoByOrderIds(stockArticleIds); - - stockArticleEntities.forEach(stockArticleEntity -> { - stockArticleEntity.setMallId(consigneeId1); - stockArticleEntity.setMallCode(basicdataClientEntity.getClientCode()); - stockArticleEntity.setMallName(basicdataClientEntity.getClientName()); - stockArticleEntity.setTypeService(basicdataClientEntity.getTypeService()+""); - stockArticleEntity.setConsigneePerson(waybillEntity.getConsigneeName()); - stockArticleEntity.setConsigneeMobile(waybillEntity.getConsigneeMobile()); - stockArticleEntity.setConsigneeAddress(waybillEntity.getConsigneeAddress()); - stockArticleEntity.setConsigneeUnit(basicdataClientEntity.getClientName()); - }); - - if(CollUtil.isNotEmpty(stockArticleEntities)){ - distributionStockArticleClient.updateByBatchId(stockArticleEntities); + stockArticleEntities.forEach(stockArticleEntity -> { + stockArticleEntity.setMallId(consigneeId1); + stockArticleEntity.setMallCode(basicdataClientEntity.getClientCode()); + stockArticleEntity.setMallName(basicdataClientEntity.getClientName()); + stockArticleEntity.setTypeService(basicdataClientEntity.getTypeService()+""); + stockArticleEntity.setConsigneePerson(waybillEntity.getConsigneeName()); + stockArticleEntity.setConsigneeMobile(waybillEntity.getConsigneeMobile()); + stockArticleEntity.setConsigneeAddress(waybillEntity.getConsigneeAddress()); + stockArticleEntity.setConsigneeUnit(basicdataClientEntity.getClientName()); + }); + if(CollUtil.isNotEmpty(stockArticleEntities)){ + distributionStockArticleClient.updateByBatchId(stockArticleEntities); + } } } 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 c35c63105..d74e9d2f9 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 @@ -10719,8 +10719,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl unloadScanOrderList = trunklineCarsLoadScanService.findPackageWithOrderList(loadId, warehouseId); if(CollUtil.isNotEmpty(unloadScanOrderList)){ //把unloadScanOrderList中所有元素转化成以orderCode为key的map - Map unloadScanOrderMap = unloadScanOrderList.stream().collect(Collectors.toMap(UnloadScanOrderVO::getOrderCode, Function.identity())); - Set orderCodeSet = unloadScanOrderMap.keySet(); +// Map> unloadScanOrderMap = unloadScanOrderList.stream().collect(Collectors.toMap(UnloadScanOrderVO::getOrderCode, Function.identity())); + Set orderCodeSet = unloadScanOrderList.stream().map(UnloadScanOrderVO::getOrderCode).collect(Collectors.toSet()); +// Map> unloadScanOrderMap =unloadScanOrderList.stream().map(UnloadScanOrderVO::getOrderCode).collect(Collectors.toList()) +// Set orderCodeSet = unloadScanOrderMap.keySet(); List orderCodeNumList = trunklineAdvanceDetailService.findTotalNumByOrderCodes(orderCodeSet); //把orderCodeNumList中所有元素转化成以orderCode为key的map Map orderCodeNumMap = orderCodeNumList.stream().collect(Collectors.toMap(OrderCodeNumVO::getOrderCode, Function.identity())); @@ -10798,7 +10800,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl orderPageList(TrayTypeDTO trayTypeDTO,Long warehouseId) { + public IPage orderPageList(TrayTypeDTO trayTypeDTO, Long warehouseId) { IPage page = new Page<>(); page.setCurrent(trayTypeDTO.getPageNum()); page.setSize(trayTypeDTO.getPageSize()); @@ -154,11 +154,11 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl pageList = baseMapper.orderPageList(page,trayTypeDTO,warehouseId); + IPage pageList = baseMapper.orderPageList(page, trayTypeDTO, warehouseId); IPage warehouseTrayTypeVOIPage = WarehouseTrayTypeWrapper.build().pageVO(pageList); List records = warehouseTrayTypeVOIPage.getRecords(); - for (WarehouseTrayTypeVO warehouseTrayTypeVO:records){ + for (WarehouseTrayTypeVO warehouseTrayTypeVO : records) { String value = DictBizCache.getValue(DictBizConstant.PALLET_ORDER_TYPE, warehouseTrayTypeVO.getTrayType()); warehouseTrayTypeVO.setTrayTypeName(value); String trayCode = warehouseTrayTypeVO.getTrayCode(); @@ -184,30 +184,30 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl queryTrayTypeWrapper = new QueryWrapper<>(); - queryTrayTypeWrapper.eq("is_deleted",0) - .eq("tray_code",trayCode); + queryTrayTypeWrapper.eq("is_deleted", 0) + .eq("tray_code", trayCode); WarehouseTrayTypeEntity trayTypeEntity = baseMapper.selectOne(queryTrayTypeWrapper); - if(Objects.isNull(trayTypeEntity)){ + if (Objects.isNull(trayTypeEntity)) { //没有查询到托盘打托信息 return null; } @@ -215,9 +215,9 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl packageList = warehouseTrayGoodsService.getListByTrayTypeId(trayTypeId,warehouseId);//订制品列表 + List packageList = warehouseTrayGoodsService.getListByTrayTypeId(trayTypeId, warehouseId);//订制品列表 trayTypeDataVO.setPackageList(packageList); - List zeroList = warehouseTrayGoodsService.getZeroListByTrayTypeId(trayTypeId,warehouseId);//零担列表 + List zeroList = warehouseTrayGoodsService.getZeroListByTrayTypeId(trayTypeId, warehouseId);//零担列表 trayTypeDataVO.setZeroList(zeroList); - List stockList = warehouseTrayGoodsService.getStockListByTrayTypeId(trayTypeId,warehouseId);//库存品列表 + List stockList = warehouseTrayGoodsService.getStockListByTrayTypeId(trayTypeId, warehouseId);//库存品列表 trayTypeDataVO.setStockList(stockList); // if(PalletProductTypeConstant.CUSTOMIZED.equals(type)){//订制品打托 @@ -275,28 +275,28 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl queryTrayTypeWrapper = new QueryWrapper<>(); - queryTrayTypeWrapper.eq("tray_code",trayCode) - .eq("is_deleted",0); + queryTrayTypeWrapper.eq("tray_code", trayCode) + .eq("is_deleted", 0); WarehouseTrayTypeEntity trayTypeEntity = baseMapper.selectOne(queryTrayTypeWrapper); - if(Objects.isNull(trayTypeEntity)){ + if (Objects.isNull(trayTypeEntity)) { //没有查询到托盘打托信息 return null; } @@ -323,16 +323,16 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl packageList = warehouseTrayGoodsService.getListByTrayTypeId(trayTypeId,wId);//订制品列表 + List packageList = warehouseTrayGoodsService.getListByTrayTypeId(trayTypeId, wId);//订制品列表 trayTypeDataVO.setPackageList(packageList); - List zeroList = warehouseTrayGoodsService.getZeroListByTrayTypeId(trayTypeId,wId);//零担列表 + List zeroList = warehouseTrayGoodsService.getZeroListByTrayTypeId(trayTypeId, wId);//零担列表 trayTypeDataVO.setZeroList(zeroList); - List stockList = warehouseTrayGoodsService.getStockListByTrayTypeId(trayTypeId,wId);//库存品列表 + List stockList = warehouseTrayGoodsService.getStockListByTrayTypeId(trayTypeId, wId);//库存品列表 trayTypeDataVO.setStockList(stockList); // if(PalletProductTypeConstant.CUSTOMIZED.equals(type)){//订制品打托 @@ -365,28 +365,28 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl queryTrayTypeWrapper = new QueryWrapper<>(); - queryTrayTypeWrapper.eq("tray_code",trayCode) - .eq("is_deleted",0); + queryTrayTypeWrapper.eq("tray_code", trayCode) + .eq("is_deleted", 0); WarehouseTrayTypeEntity trayTypeEntity = baseMapper.selectOne(queryTrayTypeWrapper); - if(Objects.isNull(trayTypeEntity)){ + if (Objects.isNull(trayTypeEntity)) { //没有查询到托盘打托信息 return null; } @@ -407,11 +407,11 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl packageList = warehouseTrayGoodsService.getListByTrayTypeId(trayTypeId,wid);//订制品列表 + List packageList = warehouseTrayGoodsService.getListByTrayTypeId(trayTypeId, wid);//订制品列表 trayTypeDataVO.setPackageList(packageList); - List zeroList = warehouseTrayGoodsService.getZeroListByTrayTypeId(trayTypeId,wid);//零担列表 + List zeroList = warehouseTrayGoodsService.getZeroListByTrayTypeId(trayTypeId, wid);//零担列表 trayTypeDataVO.setZeroList(zeroList); - List stockList = warehouseTrayGoodsService.getStockListByTrayTypeId(trayTypeId,wid);//库存品列表 + List stockList = warehouseTrayGoodsService.getStockListByTrayTypeId(trayTypeId, wid);//库存品列表 trayTypeDataVO.setStockList(stockList); @@ -442,65 +442,72 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl qw = new QueryWrapper<>(); - qw.eq("association_value",orderPackageCode); + qw.eq("association_value", orderPackageCode); WarehouseTrayGoodsEntity trayGoodsEntity = warehouseTrayGoodsService.getOne(qw); - if(!Objects.isNull(trayGoodsEntity)){ + if (!Objects.isNull(trayGoodsEntity)) { + String oldTrayCode = trayGoodsEntity.getTrayCode(); - if(oldTrayCode.equals(trayCode)){ - log.warn("##############orderScanOrderPackageCode: 该包条已打托 trayCode={}",trayCode); - return Resp.scanFail(4001,"该包条已打托","已扫描"); + String trayName = oldTrayCode; + if (oldTrayCode.equals(trayCode)) { + log.warn("##############orderScanOrderPackageCode: 该包条已打托 trayCode={}", trayCode); + return Resp.scanFail(4001, "该包条已打托", "已扫描"); + } + + if (StringUtil.isNotBlank(oldTrayCode)) { + // 查询托盘名称 + BasicdataTrayEntity trayByTrayCode = basicdataTrayClient.getTrayByTrayCode(oldTrayCode); + trayName = trayByTrayCode.getPalletName(); } - log.warn("#########orderScanOrderPackageCode: 包件已打托 orderPackageCode={}",orderPackageCode); - return Resp.scanFail(2001,"包件已打托","已在"+oldTrayCode+"托盘绑定"); + log.warn("#########orderScanOrderPackageCode: 包件已打托 orderPackageCode={}", orderPackageCode); + return Resp.scanFail(2001, "包件已打托", "已在" + trayName + "托盘绑定"); } QueryWrapper updownGoodsEntityQueryWrapper = new QueryWrapper<>(); - updownGoodsEntityQueryWrapper.eq("association_value",orderPackageCode); + updownGoodsEntityQueryWrapper.eq("association_value", orderPackageCode); WarehouseUpdownGoodsEntity updownGoodsEntity = warehouseUpdownGoodsService.getOne(updownGoodsEntityQueryWrapper); - if(!Objects.isNull(updownGoodsEntity)){ + if (!Objects.isNull(updownGoodsEntity)) { String positionCode = updownGoodsEntity.getPositionCode(); - log.warn("#########orderScanOrderPackageCode: 包件已上架 orderPackageCode={}",orderPackageCode); - return Resp.scanFail(2001,"包件已上架","包件已上架"+positionCode+"，请先下架或进行移库绑定"); + log.warn("#########orderScanOrderPackageCode: 包件已上架 orderPackageCode={}", orderPackageCode); + return Resp.scanFail(2001, "包件已上架", "包件已上架" + positionCode + "，请先下架或进行移库绑定"); } BasicdataTrayEntity basicdataTrayEntity = basicdataTrayClient.getTrayByTrayCode(trayCode); - if(Objects.isNull(basicdataTrayEntity)){ - log.warn("#########orderScanOrderPackageCode: 未找到托盘信息 trayCode={}",trayCode); - return Resp.scanFail(2001,"未找到托盘信息","未找到托盘信息"); + if (Objects.isNull(basicdataTrayEntity)) { + log.warn("#########orderScanOrderPackageCode: 未找到托盘信息 trayCode={}", trayCode); + return Resp.scanFail(2001, "未找到托盘信息", "未找到托盘信息"); } Integer disableType = basicdataTrayEntity.getDisableType(); Long trayId = basicdataTrayEntity.getId(); String trayName = basicdataTrayEntity.getPalletName(); - if(disableType == 2){ - log.warn("###############orderScanOrderPackageCode: 该托盘已被禁用 trayCode={}",trayCode); - return Resp.scanFail(2001,"该托盘已被禁用","该托盘已被禁用"); + if (disableType == 2) { + log.warn("###############orderScanOrderPackageCode: 该托盘已被禁用 trayCode={}", trayCode); + return Resp.scanFail(2001, "该托盘已被禁用", "该托盘已被禁用"); } - DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode,warehouseId); - if(Objects.isNull(parcelListEntity)){ - log.warn("##############orderScanOrderPackageCode: 包件不存在 orderPackageCode={} warehouseId={}",orderPackageCode,warehouseId); - return Resp.scanFail(2001,"包件不存在","系统无编码"); + DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode, warehouseId); + if (Objects.isNull(parcelListEntity)) { + log.warn("##############orderScanOrderPackageCode: 包件不存在 orderPackageCode={} warehouseId={}", orderPackageCode, warehouseId); + return Resp.scanFail(2001, "包件不存在", "系统无编码"); } String orderPackageStatus = parcelListEntity.getOrderPackageStatus(); - if(!"20".equals(orderPackageStatus)){ - log.warn("##############orderScanOrderPackageCode: 包件已不在库 orderPackageCode={} warehouseId={}",orderPackageCode,warehouseId); - return Resp.scanFail(2001,"包件已不在库","包件已不在库"); + if (!"20".equals(orderPackageStatus)) { + log.warn("##############orderScanOrderPackageCode: 包件已不在库 orderPackageCode={} warehouseId={}", orderPackageCode, warehouseId); + return Resp.scanFail(2001, "包件已不在库", "包件已不在库"); } String orderCode = parcelListEntity.getOrderCode();//订单自编码 Long wid = parcelListEntity.getWarehouseId(); Integer conditions = parcelListEntity.getConditions(); - if(!wid.equals(warehouseId)){ - log.warn("##############orderScanOrderPackageCode: 包件不在当前仓 orderPackageCode={} wid={} warehouseId={}",orderPackageCode,wid,warehouseId); - return Resp.scanFail(2001,"包件不在当前仓","包件不在当前仓"); + if (!wid.equals(warehouseId)) { + log.warn("##############orderScanOrderPackageCode: 包件不在当前仓 orderPackageCode={} wid={} warehouseId={}", orderPackageCode, wid, warehouseId); + return Resp.scanFail(2001, "包件不在当前仓", "包件不在当前仓"); } // if(conditions.equals(2)){ @@ -508,10 +515,10 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("tray_code",trayCode) - .eq("is_deleted",0); + queryWrapper.eq("tray_code", trayCode) + .eq("is_deleted", 0); WarehouseTrayTypeEntity trayTypeEntity = baseMapper.selectOne(queryWrapper); - if(Objects.isNull(trayTypeEntity)){ + if (Objects.isNull(trayTypeEntity)) { //如果为空则该托盘为空 //第一次存入数据 - trayTypeEntity = saveTrayTypeByOrderPackageCode(trayType, trayCode, trayId,parcelListEntity,stockArticleEntity,warehouseId); + trayTypeEntity = saveTrayTypeByOrderPackageCode(trayType, trayCode, trayId, parcelListEntity, stockArticleEntity, warehouseId); } String tt = trayTypeEntity.getTrayType(); Long filterId = trayTypeEntity.getFilterId(); String filterValue = trayTypeEntity.getFilterValue(); - if(StringUtil.isBlank(filterValue)){ + if (StringUtil.isBlank(filterValue)) { filterValue = ""; } Long trayTypeId = trayTypeEntity.getId(); Long trayTypeEntityWarehouseId = trayTypeEntity.getWarehouseId(); - if(!trayTypeEntityWarehouseId.equals(warehouseId)){ - log.warn("##############orderScanOrderPackageCode: 托盘已在其他仓库打托 {}={}",trayTypeEntityWarehouseId,warehouseId); - return Resp.scanFail(2001,"托盘已在其他仓库打托","托盘已在其他仓库打托"); + if (!trayTypeEntityWarehouseId.equals(warehouseId)) { + log.warn("##############orderScanOrderPackageCode: 托盘已在其他仓库打托 {}={}", trayTypeEntityWarehouseId, warehouseId); + return Resp.scanFail(2001, "托盘已在其他仓库打托", "托盘已在其他仓库打托"); } - if(!tt.equals(trayType)){ - log.warn("##############orderScanOrderPackageCode: 打托方式不正确 {}={}",trayType,tt); - return Resp.scanFail(2001,"打托方式不正确","打托方式不正确"); + if (!tt.equals(trayType)) { + log.warn("##############orderScanOrderPackageCode: 打托方式不正确 {}={}", trayType, tt); + return Resp.scanFail(2001, "打托方式不正确", "打托方式不正确"); } - if(StringUtil.isBlank(filterValue)){ - if("10".equals(trayType)){//服务号 + if (StringUtil.isBlank(filterValue)) { + if ("10".equals(trayType)) {//服务号 trayTypeEntity.setFilterValue(stockArticleEntity.getServiceNumber()); - }else if("20".equals(trayType)){//订单自编号 + } else if ("20".equals(trayType)) {//订单自编号 trayTypeEntity.setFilterId(stockArticleEntity.getId()); trayTypeEntity.setFilterValue(stockArticleEntity.getOrderCode()); - }else if("30".equals(trayType)){//商场 + } else if ("30".equals(trayType)) {//商场 Long mallId = stockArticleEntity.getMallId(); - if(!Objects.isNull(mallId)){ + if (!Objects.isNull(mallId)) { trayTypeEntity.setFilterId(stockArticleEntity.getMallId()); trayTypeEntity.setFilterValue(stockArticleEntity.getMallName()); - }else{ + } else { String dealerName = stockArticleEntity.getDealerName(); String brand = stockArticleEntity.getBrand(); Long clientId = basicdataTripartiteMallClient.getClientIdByNameAndBrand(dealerName, brand); - if(!Objects.isNull(clientId)){ + if (!Objects.isNull(clientId)) { BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findEntityById(clientId); - if(Objects.isNull(basicdataClientEntity)){ - log.error("#############saveTrayTypeByOrderPackageCode: 未找到三方商场对应的汇通商场 clientId={}",clientId); - throw new CustomerException(405,"未找到三方商场对应的汇通商场"); + if (Objects.isNull(basicdataClientEntity)) { + log.error("#############saveTrayTypeByOrderPackageCode: 未找到三方商场对应的汇通商场 clientId={}", clientId); + throw new CustomerException(405, "未找到三方商场对应的汇通商场"); } trayTypeEntity.setFilterId(basicdataClientEntity.getId()); trayTypeEntity.setFilterValue(basicdataClientEntity.getClientName()); - }else{ + } else { trayTypeEntity.setFilterValue(dealerName); } } - }else if("40".equals(trayType)){//门店 + } else if ("40".equals(trayType)) {//门店 trayTypeEntity.setFilterId(stockArticleEntity.getStoreId()); trayTypeEntity.setFilterValue(stockArticleEntity.getStoreName()); - }else if("50".equals(trayType)){//客户 - trayTypeEntity.setFilterValue(stockArticleEntity.getCustomerName()+stockArticleEntity.getCustomerTelephone()); - }else if("60".equals(trayType)){//仓库 + } else if ("50".equals(trayType)) {//客户 + trayTypeEntity.setFilterValue(stockArticleEntity.getCustomerName() + stockArticleEntity.getCustomerTelephone()); + } else if ("60".equals(trayType)) {//仓库 trayTypeEntity.setFilterId(stockArticleEntity.getWarehouseId()); trayTypeEntity.setFilterValue(stockArticleEntity.getWarehouse()); } @@ -598,95 +605,95 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl orderPackageCodes = new ArrayList<>(); orderPackageCodes.add(orderPackageCode); - jsonObject.put("orderPackageCodes",orderPackageCodes); - jsonObject.put("warehouseId",warehouseId); - jsonObject.put("trayName",trayName); + jsonObject.put("orderPackageCodes", orderPackageCodes); + jsonObject.put("warehouseId", warehouseId); + jsonObject.put("trayName", trayName); FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.warehouse.TRAYTYPE.EXCHANGE).msg(jsonObject.toJSONString()).build(); sendFanoutService.sendFanoutMsg(fanoutMsg); - if(CollUtil.isNotEmpty(orderPackageCodes)){ + if (CollUtil.isNotEmpty(orderPackageCodes)) { BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(warehouseId); String warehouseName = warehouseEntity.getName(); - String content = "包件在 "+warehouseName+" 打托，托盘 "+trayName; - warehousePackageTrackLogService.addBatchLog(orderPackageCodes,content,warehouseId,warehouseName,AuthUtil.getNickName(), WorkNodeEnums.SORTING_TRAYS.getCode()); + String content = "包件在 " + warehouseName + " 打托，托盘 " + trayName; + warehousePackageTrackLogService.addBatchLog(orderPackageCodes, content, warehouseId, warehouseName, AuthUtil.getNickName(), WorkNodeEnums.SORTING_TRAYS.getCode()); } - }catch (Exception e){ + } catch (Exception e) { log.warn("###########saveTrayTypeByOrderPackageCode: 发送打托广播失败"); } - redis.del(RedisKeyConstant.BUSINESS_IN_CARNUMBER+trayCode); - redis.del(RedisKeyConstant.BUSINESS_INEXCE_CARNUMBER+trayCode); + redis.del(RedisKeyConstant.BUSINESS_IN_CARNUMBER + trayCode); + redis.del(RedisKeyConstant.BUSINESS_INEXCE_CARNUMBER + trayCode); - if(chuanFlag){ - log.warn("#########orderScanOrderPackageCode: 不属于同一个"+msg+" 串货 filterValue={} orderPackageCode={}",filterValue,orderPackageCode); - return Resp.scanFail(2001,"不属于同一个"+msg,"窜货，扫描当前托盘"+msg+"，窜货1件"); - }else{ - Map map = new HashMap<>(); - map.put("orderCode",orderCode); + if (chuanFlag) { + log.warn("#########orderScanOrderPackageCode: 不属于同一个" + msg + " 串货 filterValue={} orderPackageCode={}", filterValue, orderPackageCode); + return Resp.scanFail(2001, "不属于同一个" + msg, "窜货，扫描当前托盘" + msg + "，窜货1件"); + } else { + Map map = new HashMap<>(); + map.put("orderCode", orderCode); return R.data(map); } } - @Override - public void orderScanOrderPackageCodeList(WarehouseTrayTypeEntity trayTypeEntity, List parcelListEntityList,Long warehouseId,String remark) { + public void orderScanOrderPackageCodeList(WarehouseTrayTypeEntity trayTypeEntity, List parcelListEntityList, Long warehouseId, String remark) { String tt = trayTypeEntity.getTrayType(); Long filterId = trayTypeEntity.getFilterId(); String filterValue = trayTypeEntity.getFilterValue(); - if(StringUtil.isBlank(filterValue)){ + if (StringUtil.isBlank(filterValue)) { filterValue = ""; } Long trayTypeId = trayTypeEntity.getId(); Long trayTypeEntityWarehouseId = trayTypeEntity.getWarehouseId(); - if(!trayTypeEntityWarehouseId.equals(warehouseId)){ - log.warn("##############orderScanOrderPackageCode: 托盘已在其他仓库打托 {}={}",trayTypeEntityWarehouseId,warehouseId); - throw new CustomerException(2001,"托盘已在其他仓库打托"); + if (!trayTypeEntityWarehouseId.equals(warehouseId)) { + log.warn("##############orderScanOrderPackageCode: 托盘已在其他仓库打托 {}={}", trayTypeEntityWarehouseId, warehouseId); + throw new CustomerException(2001, "托盘已在其他仓库打托"); } //只留下包件状态为20的 @@ -775,91 +781,91 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl { String orderPackageCode = parcelListEntity.getOrderPackageCode(); Integer chuanFlag = orderPackageChuanMap.get(orderPackageCode); - if(Objects.isNull(chuanFlag)){ + if (Objects.isNull(chuanFlag)) { chuanFlag = 1; } Date date = new Date(); WarehouseTrayGoodsEntity trayGoodsEntity = new WarehouseTrayGoodsEntity(); BladeUser user = AuthUtil.getUser(); - if(user==null){ - trayGoodsEntity.setTenantId(StringUtil.isEmpty(AuthUtil.getTenantId())?TenantNum.HUITONGCODE:AuthUtil.getTenantId()); + if (user == null) { + trayGoodsEntity.setTenantId(StringUtil.isEmpty(AuthUtil.getTenantId()) ? TenantNum.HUITONGCODE : AuthUtil.getTenantId()); trayGoodsEntity.setCreateUser(1714696768639311873L); trayGoodsEntity.setUpdateUser(1714696768639311873L); trayGoodsEntity.setCreateDept(1649331096241836033L); @@ -892,16 +898,16 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl> parcelListEntityMap = parcelListEntityList.stream().collect(Collectors.groupingBy(DistributionParcelListEntity::getConditions)); + Map> parcelListEntityMap = parcelListEntityList.stream().collect(Collectors.groupingBy(DistributionParcelListEntity::getConditions)); parcelListEntityMap.keySet().forEach(conditions -> { List ls = parcelListEntityMap.get(conditions); JSONObject jsonObject = new JSONObject(); - jsonObject.put("dataType",1); - jsonObject.put("conditions",conditions); - jsonObject.put("operation",1); + jsonObject.put("dataType", 1); + jsonObject.put("conditions", conditions); + jsonObject.put("operation", 1); //把ls中所有元素的orderPackageCode装入一个Set中 Set orderPackageCodeSet = ls.stream().map(DistributionParcelListEntity::getOrderPackageCode).collect(Collectors.toSet()); - jsonObject.put("orderPackageCodes",new ArrayList<>(orderPackageCodeSet)); - jsonObject.put("warehouseId",warehouseId); - jsonObject.put("trayName",trayName); + jsonObject.put("orderPackageCodes", new ArrayList<>(orderPackageCodeSet)); + jsonObject.put("warehouseId", warehouseId); + jsonObject.put("trayName", trayName); FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.warehouse.TRAYTYPE.EXCHANGE).msg(jsonObject.toJSONString()).build(); sendFanoutService.sendFanoutMsg(fanoutMsg); - if(CollUtil.isNotEmpty(orderPackageCodeSet)){ + if (CollUtil.isNotEmpty(orderPackageCodeSet)) { BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(warehouseId); String warehouseName = warehouseEntity.getName(); - String content = "包件在 "+warehouseName+" 打托，托盘 "+trayName; - warehousePackageTrackLogService.addBatchLog(new ArrayList<>(orderPackageCodeSet),content,warehouseId,warehouseName,AuthUtil.getNickName(), WorkNodeEnums.SORTING_TRAYS.getCode()); + String content = "包件在 " + warehouseName + " 打托，托盘 " + trayName; + warehousePackageTrackLogService.addBatchLog(new ArrayList<>(orderPackageCodeSet), content, warehouseId, warehouseName, AuthUtil.getNickName(), WorkNodeEnums.SORTING_TRAYS.getCode()); } }); - }catch (Exception e){ + } catch (Exception e) { log.warn("###########saveTrayTypeByOrderPackageCode: 发送打托广播失败"); } @@ -970,50 +976,50 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("association_value",orderPackageCode) - .eq("association_type","3"); + queryWrapper.eq("association_value", orderPackageCode) + .eq("association_type", "3"); WarehouseTrayGoodsEntity trayGoodsEntity = warehouseTrayGoodsService.getOne(queryWrapper); - if(Objects.isNull(trayGoodsEntity)){ - log.warn("##########findPackageTrayInfo: 包件暂未打托 orderPackageCode={}",orderPackageCode); - return R.fail(405,"包件暂未打托"); + if (Objects.isNull(trayGoodsEntity)) { + log.warn("##########findPackageTrayInfo: 包件暂未打托 orderPackageCode={}", orderPackageCode); + return R.fail(405, "包件暂未打托"); } DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode, warehouseId); - if(Objects.isNull(parcelListEntity)){ - log.warn("##########findPackageTrayInfo: 包件暂未入库 orderPackageCode={}",orderPackageCode); - return R.fail(405,"包件暂未入库"); + if (Objects.isNull(parcelListEntity)) { + log.warn("##########findPackageTrayInfo: 包件暂未入库 orderPackageCode={}", orderPackageCode); + return R.fail(405, "包件暂未入库"); } Long trayWarehouseId = trayGoodsEntity.getWarehouseId();//打托仓库 BasicdataWarehouseEntity trayWarehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(trayWarehouseId); - if(Objects.isNull(trayWarehouseEntity)){ - log.warn("##########findPackageTrayInfo: 仓库信息为空 trayWarehouseId={}",trayWarehouseId); - return R.fail(405,"仓库信息为空"); + if (Objects.isNull(trayWarehouseEntity)) { + log.warn("##########findPackageTrayInfo: 仓库信息为空 trayWarehouseId={}", trayWarehouseId); + return R.fail(405, "仓库信息为空"); } String trayWarehouseName = trayWarehouseEntity.getName(); String trayCode = trayGoodsEntity.getTrayCode(); Long trayId = trayGoodsEntity.getTrayId(); BasicdataTrayEntity trayEntity = basicdataTrayClient.getTrayByTrayCode(trayCode); - if(Objects.isNull(trayEntity)){ - log.warn("##########findPackageTrayInfo: 托盘信息不存在 trayCode={}",trayCode); - return R.fail(405,"托盘信息不存在"); + if (Objects.isNull(trayEntity)) { + log.warn("##########findPackageTrayInfo: 托盘信息不存在 trayCode={}", trayCode); + return R.fail(405, "托盘信息不存在"); } String trayName = trayEntity.getPalletName(); Long trayAllocationId = warehouseTaryAllocationService.getAllocationIdByTrayId(trayId); - if(!Objects.isNull(trayAllocationId)){ - log.warn("##########findPackageTrayInfo: 包件已在 {} 上架",trayWarehouseName); - return R.fail(405,"包件已在"+trayWarehouseName+"上架"); + if (!Objects.isNull(trayAllocationId)) { + log.warn("##########findPackageTrayInfo: 包件已在 {} 上架", trayWarehouseName); + return R.fail(405, "包件已在" + trayWarehouseName + "上架"); } - Map map = new HashMap<>(); - map.put("waybillNo",parcelListEntity.getWaybillNumber()); - map.put("orderCode",parcelListEntity.getOrderCode()); - map.put("orderPackageCode",orderPackageCode); - map.put("trayName",trayName); - map.put("trayWarehouseId",trayWarehouseId); - map.put("trayWarehouseName",trayWarehouseName); + Map map = new HashMap<>(); + map.put("waybillNo", parcelListEntity.getWaybillNumber()); + map.put("orderCode", parcelListEntity.getOrderCode()); + map.put("orderPackageCode", orderPackageCode); + map.put("trayName", trayName); + map.put("trayWarehouseId", trayWarehouseId); + map.put("trayWarehouseName", trayWarehouseName); return R.data(map); } @@ -1021,14 +1027,14 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl downPackageCodeDTOS, Long warehouseId) { //把downPackageCodeDTOS中元素通过warehouseId进行分组 - Map> downPackageCodeDTOSMap = downPackageCodeDTOS.stream().collect(Collectors.groupingBy(DownPackageCodeDTO::getWarehouseId)); + Map> downPackageCodeDTOSMap = downPackageCodeDTOS.stream().collect(Collectors.groupingBy(DownPackageCodeDTO::getWarehouseId)); downPackageCodeDTOSMap.keySet().forEach(trayWarehouseId -> { List downPackageCodeDTOSList = downPackageCodeDTOSMap.get(trayWarehouseId); - if(CollUtil.isNotEmpty(downPackageCodeDTOSList)){ + if (CollUtil.isNotEmpty(downPackageCodeDTOSList)) { //把downPackageCodeDTOSList中所有元素的orderPackageCode放入一个List List orderPackageCodeList = downPackageCodeDTOSList.stream().map(DownPackageCodeDTO::getOrderPackageCode).collect(Collectors.toList()); - downPackageByOrderPackageCodeList(orderPackageCodeList,"手动远程批量解托",trayWarehouseId); + downPackageByOrderPackageCodeList(orderPackageCodeList, "手动远程批量解托", trayWarehouseId); } }); return R.success("解绑成功"); @@ -1036,60 +1042,60 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl qw = new QueryWrapper<>(); - qw.eq("association_value",orderPackageCode); + qw.eq("association_value", orderPackageCode); WarehouseTrayGoodsEntity trayGoodsEntity = warehouseTrayGoodsService.getOne(qw); - if(!Objects.isNull(trayGoodsEntity)){ + if (!Objects.isNull(trayGoodsEntity)) { String oldTrayCode = trayGoodsEntity.getTrayCode(); - if(oldTrayCode.equals(trayCode)){ - log.warn("##############orderScanOrderPackageCode: 该包条已打托 trayCode={}",trayCode); - return R.fail(4001,"该包条已打托"); + if (oldTrayCode.equals(trayCode)) { + log.warn("##############orderScanOrderPackageCode: 该包条已打托 trayCode={}", trayCode); + return R.fail(4001, "该包条已打托"); } - log.warn("#########orderScanOrderPackageCode: 包件已打托 orderPackageCode={}",orderPackageCode); - return R.fail(4002,"包件已打托"); + log.warn("#########orderScanOrderPackageCode: 包件已打托 orderPackageCode={}", orderPackageCode); + return R.fail(4002, "包件已打托"); } QueryWrapper updownGoodsEntityQueryWrapper = new QueryWrapper<>(); - updownGoodsEntityQueryWrapper.eq("association_value",orderPackageCode); + updownGoodsEntityQueryWrapper.eq("association_value", orderPackageCode); WarehouseUpdownGoodsEntity updownGoodsEntity = warehouseUpdownGoodsService.getOne(updownGoodsEntityQueryWrapper); - if(!Objects.isNull(updownGoodsEntity)){ + if (!Objects.isNull(updownGoodsEntity)) { String positionCode = updownGoodsEntity.getPositionCode(); - log.warn("#########orderScanOrderPackageCode: 包件已上架 orderPackageCode={}",orderPackageCode); - return R.fail(4003,"包件已上架"); + log.warn("#########orderScanOrderPackageCode: 包件已上架 orderPackageCode={}", orderPackageCode); + return R.fail(4003, "包件已上架"); } BasicdataTrayEntity basicdataTrayEntity = basicdataTrayClient.getTrayByTrayCode(trayCode); - if(Objects.isNull(basicdataTrayEntity)){ - log.warn("#########orderScanOrderPackageCode: 未找到托盘信息 trayCode={}",trayCode); - return R.fail(2001,"未找到托盘信息"); + if (Objects.isNull(basicdataTrayEntity)) { + log.warn("#########orderScanOrderPackageCode: 未找到托盘信息 trayCode={}", trayCode); + return R.fail(2001, "未找到托盘信息"); } Integer disableType = basicdataTrayEntity.getDisableType(); Long trayId = basicdataTrayEntity.getId(); - if(disableType == 2){ - log.warn("###############orderScanOrderPackageCode: 该托盘已被禁用 trayCode={}",trayCode); - return R.fail(2001,"该托盘已被禁用"); + if (disableType == 2) { + log.warn("###############orderScanOrderPackageCode: 该托盘已被禁用 trayCode={}", trayCode); + return R.fail(2001, "该托盘已被禁用"); } - DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode,warehouseId); - if(Objects.isNull(parcelListEntity)){ - log.warn("##############orderScanOrderPackageCode: 包件不存在 orderPackageCode={} warehouseId={}",orderPackageCode,warehouseId); - return R.fail(2001,"包件不存在"); + DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode, warehouseId); + if (Objects.isNull(parcelListEntity)) { + log.warn("##############orderScanOrderPackageCode: 包件不存在 orderPackageCode={} warehouseId={}", orderPackageCode, warehouseId); + return R.fail(2001, "包件不存在"); } String orderCode = parcelListEntity.getOrderCode();//订单自编码 Long wid = parcelListEntity.getWarehouseId(); Integer conditions = parcelListEntity.getConditions(); - if(!wid.equals(warehouseId)){ - log.warn("##############orderScanOrderPackageCode: 包件不在当前仓 orderPackageCode={} wid={} warehouseId={}",orderPackageCode,wid,warehouseId); - return R.fail(2001,"包件不在当前仓"); + if (!wid.equals(warehouseId)) { + log.warn("##############orderScanOrderPackageCode: 包件不在当前仓 orderPackageCode={} wid={} warehouseId={}", orderPackageCode, wid, warehouseId); + return R.fail(2001, "包件不在当前仓"); } String orderPackageStatus = parcelListEntity.getOrderPackageStatus(); - if(!"20".equals(orderPackageStatus)){ - log.warn("##############orderScanOrderPackageCode: 包件已不在库 orderPackageCode={} warehouseId={}",orderPackageCode,warehouseId); - return R.fail(2001,"包件已不在库"); + if (!"20".equals(orderPackageStatus)) { + log.warn("##############orderScanOrderPackageCode: 包件已不在库 orderPackageCode={} warehouseId={}", orderPackageCode, warehouseId); + return R.fail(2001, "包件已不在库"); } // if(conditions.equals(2)){ @@ -1097,10 +1103,10 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("tray_code",trayCode) - .eq("is_deleted",0); + queryWrapper.eq("tray_code", trayCode) + .eq("is_deleted", 0); WarehouseTrayTypeEntity trayTypeEntity = baseMapper.selectOne(queryWrapper); - if(Objects.isNull(trayTypeEntity)){ + if (Objects.isNull(trayTypeEntity)) { //如果为空则该托盘为空 //第一次存入数据 - trayTypeEntity = saveTrayTypeByOrderPackageCode(trayType, trayCode, trayId,parcelListEntity,stockArticleEntity,warehouseId); + trayTypeEntity = saveTrayTypeByOrderPackageCode(trayType, trayCode, trayId, parcelListEntity, stockArticleEntity, warehouseId); } String tt = trayTypeEntity.getTrayType(); Long filterId = trayTypeEntity.getFilterId(); String filterValue = trayTypeEntity.getFilterValue(); - if(StringUtil.isBlank(filterValue)){ + if (StringUtil.isBlank(filterValue)) { filterValue = ""; } Long trayTypeId = trayTypeEntity.getId(); Long trayTypeEntityWarehouseId = trayTypeEntity.getWarehouseId(); - if(!trayTypeEntityWarehouseId.equals(warehouseId)){ - log.warn("##############orderScanOrderPackageCode: 托盘已在其他仓库打托 {}={}",trayTypeEntityWarehouseId,warehouseId); - return R.fail(2001,"托盘已在其他仓库打托"); + if (!trayTypeEntityWarehouseId.equals(warehouseId)) { + log.warn("##############orderScanOrderPackageCode: 托盘已在其他仓库打托 {}={}", trayTypeEntityWarehouseId, warehouseId); + return R.fail(2001, "托盘已在其他仓库打托"); } - if(!tt.equals(trayType)){ - log.warn("##############orderScanOrderPackageCode: 打托方式不正确 {}={}",trayType,tt); - return R.fail(4004,"打托方式不正确"); + if (!tt.equals(trayType)) { + log.warn("##############orderScanOrderPackageCode: 打托方式不正确 {}={}", trayType, tt); + return R.fail(4004, "打托方式不正确"); } - if(StringUtil.isBlank(filterValue)){ - if("10".equals(trayType)){//服务号 + if (StringUtil.isBlank(filterValue)) { + if ("10".equals(trayType)) {//服务号 trayTypeEntity.setFilterValue(stockArticleEntity.getServiceNumber()); - }else if("20".equals(trayType)){//订单自编号 + } else if ("20".equals(trayType)) {//订单自编号 trayTypeEntity.setFilterId(stockArticleEntity.getId()); trayTypeEntity.setFilterValue(stockArticleEntity.getOrderCode()); - }else if("30".equals(trayType)){//商场 + } else if ("30".equals(trayType)) {//商场 Long mallId = stockArticleEntity.getMallId(); - if(!Objects.isNull(mallId)){ + if (!Objects.isNull(mallId)) { trayTypeEntity.setFilterId(stockArticleEntity.getMallId()); trayTypeEntity.setFilterValue(stockArticleEntity.getMallName()); - }else{ + } else { String dealerName = stockArticleEntity.getDealerName(); String brand = stockArticleEntity.getBrand(); Long clientId = basicdataTripartiteMallClient.getClientIdByNameAndBrand(dealerName, brand); - if(!Objects.isNull(clientId)){ + if (!Objects.isNull(clientId)) { BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findEntityById(clientId); - if(Objects.isNull(basicdataClientEntity)){ - log.error("#############saveTrayTypeByOrderPackageCode: 未找到三方商场对应的汇通商场 clientId={}",clientId); - throw new CustomerException(405,"未找到三方商场对应的汇通商场"); + if (Objects.isNull(basicdataClientEntity)) { + log.error("#############saveTrayTypeByOrderPackageCode: 未找到三方商场对应的汇通商场 clientId={}", clientId); + throw new CustomerException(405, "未找到三方商场对应的汇通商场"); } trayTypeEntity.setFilterId(basicdataClientEntity.getId()); trayTypeEntity.setFilterValue(basicdataClientEntity.getClientName()); - }else{ + } else { trayTypeEntity.setFilterValue(dealerName); } } - }else if("40".equals(trayType)){//门店 + } else if ("40".equals(trayType)) {//门店 trayTypeEntity.setFilterId(stockArticleEntity.getStoreId()); trayTypeEntity.setFilterValue(stockArticleEntity.getStoreName()); - }else if("50".equals(trayType)){//客户 - trayTypeEntity.setFilterValue(stockArticleEntity.getCustomerName()+stockArticleEntity.getCustomerTelephone()); + } else if ("50".equals(trayType)) {//客户 + trayTypeEntity.setFilterValue(stockArticleEntity.getCustomerName() + stockArticleEntity.getCustomerTelephone()); } updateById(trayTypeEntity); } @@ -1184,95 +1190,95 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl orderPackageCodes = new ArrayList<>(); orderPackageCodes.add(orderPackageCode); - jsonObject.put("orderPackageCodes",orderPackageCodes); - jsonObject.put("warehouseId",warehouseId); - jsonObject.put("trayName",basicdataTrayEntity.getPalletName()); + jsonObject.put("orderPackageCodes", orderPackageCodes); + jsonObject.put("warehouseId", warehouseId); + jsonObject.put("trayName", basicdataTrayEntity.getPalletName()); FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.warehouse.TRAYTYPE.EXCHANGE).msg(jsonObject.toJSONString()).build(); sendFanoutService.sendFanoutMsg(fanoutMsg); - if(CollUtil.isNotEmpty(orderPackageCodes)){ + if (CollUtil.isNotEmpty(orderPackageCodes)) { BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(warehouseId); String warehouseName = warehouseEntity.getName(); - String content = "包件在 "+warehouseName+" 打托，托盘 "+basicdataTrayEntity.getPalletName(); - warehousePackageTrackLogService.addBatchLog(new ArrayList<>(orderPackageCodes),content,warehouseId,warehouseName,AuthUtil.getNickName(), WorkNodeEnums.SORTING_TRAYS.getCode()); + String content = "包件在 " + warehouseName + " 打托，托盘 " + basicdataTrayEntity.getPalletName(); + warehousePackageTrackLogService.addBatchLog(new ArrayList<>(orderPackageCodes), content, warehouseId, warehouseName, AuthUtil.getNickName(), WorkNodeEnums.SORTING_TRAYS.getCode()); } - }catch (Exception e){ + } catch (Exception e) { log.warn("###########saveTrayTypeByOrderPackageCode: 发送打托广播失败"); } - redis.del(RedisKeyConstant.BUSINESS_IN_CARNUMBER+trayCode); - redis.del(RedisKeyConstant.BUSINESS_INEXCE_CARNUMBER+trayCode); + redis.del(RedisKeyConstant.BUSINESS_IN_CARNUMBER + trayCode); + redis.del(RedisKeyConstant.BUSINESS_INEXCE_CARNUMBER + trayCode); - if(chuanFlag){ - log.warn("#########orderScanOrderPackageCode: 不属于同一个"+msg+" 串货 filterValue={} orderPackageCode={}",filterValue,orderPackageCode); + if (chuanFlag) { + log.warn("#########orderScanOrderPackageCode: 不属于同一个" + msg + " 串货 filterValue={} orderPackageCode={}", filterValue, orderPackageCode); JSONObject jsonObject = new JSONObject(); - jsonObject.put("audio","串货"); + jsonObject.put("audio", "串货"); return R.data(jsonObject.toJSONString()); - }else{ + } else { return R.success("扫描成功"); } } @@ -1331,39 +1337,39 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl orderPackageCodes,Long warehouseId) { + public R deleteScanOrderPackageCode(String trayCode, List orderPackageCodes, Long warehouseId) { //删除托盘与包件关联关系 QueryWrapper trayTypeEntityQueryWrapper = new QueryWrapper<>(); - trayTypeEntityQueryWrapper.eq("tray_code",trayCode) - .eq("is_deleted",0); + trayTypeEntityQueryWrapper.eq("tray_code", trayCode) + .eq("is_deleted", 0); WarehouseTrayTypeEntity trayTypeEntity = baseMapper.selectOne(trayTypeEntityQueryWrapper); - if(Objects.isNull(trayTypeEntity)){ - log.warn("#############deleteScanOrderPackageCode: 该托盘尚未有打托数据 trayCode={}",trayCode); - return R.fail(403,"该托盘尚未有打托数据"); + if (Objects.isNull(trayTypeEntity)) { + log.warn("#############deleteScanOrderPackageCode: 该托盘尚未有打托数据 trayCode={}", trayCode); + return R.fail(403, "该托盘尚未有打托数据"); } Long trayTypeId = trayTypeEntity.getId(); Long trayId = trayTypeEntity.getId(); @@ -1375,74 +1381,74 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl parcelListEntityList = new ArrayList<>(); - for (String orderPackageCode:orderPackageCodes){ - WarehouseTrayGoodsEntity trayGoodsEntity = warehouseTrayGoodsService.findByTrayTypeIdAndAssociationValue(trayTypeId,orderPackageCode); - if(Objects.isNull(trayGoodsEntity)){ - log.warn("#############deleteScanOrderPackageCode: 该托盘上没有该包件数据 trayCode={} orderPackageCode={}",trayCode,orderPackageCode); - return R.fail(403,"该托盘上没有该包件数据"); + for (String orderPackageCode : orderPackageCodes) { + WarehouseTrayGoodsEntity trayGoodsEntity = warehouseTrayGoodsService.findByTrayTypeIdAndAssociationValue(trayTypeId, orderPackageCode); + if (Objects.isNull(trayGoodsEntity)) { + log.warn("#############deleteScanOrderPackageCode: 该托盘上没有该包件数据 trayCode={} orderPackageCode={}", trayCode, orderPackageCode); + return R.fail(403, "该托盘上没有该包件数据"); } Long trayGoodsId = trayGoodsEntity.getId(); - DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode,warehouseId); - if(Objects.isNull(parcelListEntity)){ - log.warn("##############deleteScanOrderPackageCode: 包件不存在 orderPackageCode={} warehouseId={}",orderPackageCode,warehouseId); - return R.fail(403,"包件不存在"); + DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode, warehouseId); + if (Objects.isNull(parcelListEntity)) { + log.warn("##############deleteScanOrderPackageCode: 包件不存在 orderPackageCode={} warehouseId={}", orderPackageCode, warehouseId); + return R.fail(403, "包件不存在"); } parcelListEntityList.add(parcelListEntity); //添加下托日志 - warehouseTrayGoodsLogService.saveLogPackage(parcelListEntity,trayTypeEntity,"0","解绑打托","2"); + warehouseTrayGoodsLogService.saveLogPackage(parcelListEntity, trayTypeEntity, "0", "解绑打托", "2"); //修改打托方式上的值 // changeTotalNumByTrayTypeId(parcelListEntity,trayTypeEntity.getId(),2);//addSub 1加 2减 //删除绑定关系并返回剩余数量 - Integer num = warehouseTrayGoodsService.deleteByTrayGoodsId(trayGoodsId,warehouseId); + Integer num = warehouseTrayGoodsService.deleteByTrayGoodsId(trayGoodsId, warehouseId); - if(num == 0){ + if (num == 0) { //空置托盘 removeById(trayTypeId); //更新托盘状态 - basicdataTrayClient.updateTrayStatus(trayId,1); + basicdataTrayClient.updateTrayStatus(trayId, 1); } //更新打托方式上的值 updateNumByTrayTypeId(trayTypeEntity); } - try{ + try { BasicdataTrayEntity trayEntity = basicdataTrayClient.getTrayByTrayCode(trayCode); String trayName = trayEntity.getPalletName(); //把parcelListEntityList通过conditions分组为conditions为key的Map - Map> parcelListEntityMap = parcelListEntityList.stream().collect(Collectors.groupingBy(DistributionParcelListEntity::getConditions)); + Map> parcelListEntityMap = parcelListEntityList.stream().collect(Collectors.groupingBy(DistributionParcelListEntity::getConditions)); Long finalWarehouseId = warehouseId; parcelListEntityMap.keySet().forEach(conditions -> { List ls = parcelListEntityMap.get(conditions); JSONObject jsonObject = new JSONObject(); - jsonObject.put("dataType",1); - jsonObject.put("conditions",conditions); - jsonObject.put("operation",2); + jsonObject.put("dataType", 1); + jsonObject.put("conditions", conditions); + jsonObject.put("operation", 2); //把ls中所有元素的orderPackageCode装入一个Set中 List orderPackageCodeList = ls.stream().map(DistributionParcelListEntity::getOrderPackageCode).collect(Collectors.toList()); - jsonObject.put("orderPackageCodes",orderPackageCodeList); + jsonObject.put("orderPackageCodes", orderPackageCodeList); jsonObject.put("warehouseId", finalWarehouseId); FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.warehouse.TRAYTYPE.EXCHANGE).msg(jsonObject.toJSONString()).build(); sendFanoutService.sendFanoutMsg(fanoutMsg); - if(CollUtil.isNotEmpty(orderPackageCodes)){ + if (CollUtil.isNotEmpty(orderPackageCodes)) { BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(finalWarehouseId); String warehouseName = warehouseEntity.getName(); - String content = "包件在 "+warehouseName+" 解托，托盘 "+trayName; - warehousePackageTrackLogService.addBatchLog(new ArrayList<>(orderPackageCodes),content,finalWarehouseId,warehouseName,AuthUtil.getNickName(), WorkNodeEnums.UN_SORTING_TRAYS.getCode()); + String content = "包件在 " + warehouseName + " 解托，托盘 " + trayName; + warehousePackageTrackLogService.addBatchLog(new ArrayList<>(orderPackageCodes), content, finalWarehouseId, warehouseName, AuthUtil.getNickName(), WorkNodeEnums.UN_SORTING_TRAYS.getCode()); } }); - }catch (Exception e){ + } catch (Exception e) { log.warn("###########saveTrayTypeByOrderPackageCode: 发送打托广播失败"); } @@ -1460,33 +1466,33 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl ls = warehouseTrayGoodsService.getListByTrayTypeIdAndOrderCode(trayTypeId,orderCode); + List ls = warehouseTrayGoodsService.getListByTrayTypeIdAndOrderCode(trayTypeId, orderCode); DistributionStockArticleEntity stockArticleEntity = distributionStockArticleClient.findStockArticleByOrderCode(orderCode); - if(Objects.isNull(stockArticleEntity)){ - log.warn("#########changeTotalNumByTrayTypeId: 未找到订单信息 orderCode={}",orderCode); - throw new CustomerException(403,"未找到订单信息"); + if (Objects.isNull(stockArticleEntity)) { + log.warn("#########changeTotalNumByTrayTypeId: 未找到订单信息 orderCode={}", orderCode); + throw new CustomerException(403, "未找到订单信息"); } Integer totalNumber = stockArticleEntity.getTotalNumber(); - if(addSub == 1){ - if(ls.size() == 0){ + if (addSub == 1) { + if (ls.size() == 0) { //需要同时添加订单总数量到打托方式 - baseMapper.changeTotalNumAndOrderTotalNumByTrayTypeId(quantity,totalNumber,trayTypeId); - }else{ - baseMapper.changeTotalNumByTrayTypeId(quantity,trayTypeId); + baseMapper.changeTotalNumAndOrderTotalNumByTrayTypeId(quantity, totalNumber, trayTypeId); + } else { + baseMapper.changeTotalNumByTrayTypeId(quantity, trayTypeId); } - }else if(addSub == 2){ - if(ls.size() > 1){ + } else if (addSub == 2) { + if (ls.size() > 1) { //至少有两条该订单的数据，所以不用去减掉订单的总数量 - baseMapper.changeTotalNumByTrayTypeId(-quantity,trayTypeId); - }else { - baseMapper.changeTotalNumAndOrderTotalNumByTrayTypeId(-quantity,-totalNumber,trayTypeId); + baseMapper.changeTotalNumByTrayTypeId(-quantity, trayTypeId); + } else { + baseMapper.changeTotalNumAndOrderTotalNumByTrayTypeId(-quantity, -totalNumber, trayTypeId); } - }else{ + } else { log.warn("############changeTotalNumByTrayTypeId：未知的计算类型"); } } @@ -1494,15 +1500,16 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl zeroPageList(TrayTypeDTO trayTypeDTO,Long warehouseId) { + public IPage zeroPageList(TrayTypeDTO trayTypeDTO, Long warehouseId) { IPage page = new Page<>(); page.setCurrent(trayTypeDTO.getPageNum()); page.setSize(trayTypeDTO.getPageSize()); @@ -1604,11 +1609,11 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl pageList = baseMapper.orderPageList(page,trayTypeDTO,warehouseId); + IPage pageList = baseMapper.orderPageList(page, trayTypeDTO, warehouseId); IPage warehouseTrayTypeVOIPage = WarehouseTrayTypeWrapper.build().pageVO(pageList); List records = warehouseTrayTypeVOIPage.getRecords(); - for (WarehouseTrayTypeVO warehouseTrayTypeVO:records){ + for (WarehouseTrayTypeVO warehouseTrayTypeVO : records) { String value = DictBizCache.getValue(DictBizConstant.PALLET_ZERO_TYPE, warehouseTrayTypeVO.getTrayType()); warehouseTrayTypeVO.setTrayTypeName(value); String trayCode = warehouseTrayTypeVO.getTrayCode(); @@ -1620,17 +1625,17 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl getZeroOrderByWaybillCode(String waybillCode,Long warehouseId) { - List zeroOrderByWaybillCode = baseMapper.getZeroOrderByWaybillCode(waybillCode,warehouseId); - for (TrayTypeDataListVO trayTypeDataListVO:zeroOrderByWaybillCode){ + public List getZeroOrderByWaybillCode(String waybillCode, Long warehouseId) { + List zeroOrderByWaybillCode = baseMapper.getZeroOrderByWaybillCode(waybillCode, warehouseId); + for (TrayTypeDataListVO trayTypeDataListVO : zeroOrderByWaybillCode) { Long orderId = trayTypeDataListVO.getDataId(); Integer orderTotalNum = trayTypeDataListVO.getOrderTotalNum(); Integer residueNum = orderTotalNum; //查询该零担的库位数据 - List updownGoodsEntities = warehouseUpdownGoodsService.getUpdownGoodsByZeroOrderId(orderId,warehouseId); - List trayGoodsEntities = warehouseTrayGoodsService.getTrayGoodsByZeroOrderIdNoAllocationId(orderId,warehouseId); + List updownGoodsEntities = warehouseUpdownGoodsService.getUpdownGoodsByZeroOrderId(orderId, warehouseId); + List trayGoodsEntities = warehouseTrayGoodsService.getTrayGoodsByZeroOrderIdNoAllocationId(orderId, warehouseId); updownGoodsEntities.addAll(trayGoodsEntities); - for (PositionVO positionVO:updownGoodsEntities){ + for (PositionVO positionVO : updownGoodsEntities) { Integer num = positionVO.getNum(); residueNum = residueNum - num; } @@ -1645,52 +1650,52 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl zeroList,Long warehouseId,String remark) { - if(Objects.isNull(zeroList)){ - log.warn("##############enterZeroOrderByTrayCode: 数据为空 zeroList={}",zeroList); - return R.fail(403,"数据为空"); + public R enterZeroOrderByTrayCode(String trayType, String trayCode, List zeroList, Long warehouseId, String remark) { + if (Objects.isNull(zeroList)) { + log.warn("##############enterZeroOrderByTrayCode: 数据为空 zeroList={}", zeroList); + return R.fail(403, "数据为空"); } - if(zeroList.size() == 0){ - log.warn("##############enterZeroOrderByTrayCode: 数据为空 zeroList={}",zeroList); - return R.fail(403,"数据为空"); + if (zeroList.size() == 0) { + log.warn("##############enterZeroOrderByTrayCode: 数据为空 zeroList={}", zeroList); + return R.fail(403, "数据为空"); } BasicdataTrayEntity trayEntity = basicdataTrayClient.getTrayByTrayCode(trayCode); - if(Objects.isNull(trayEntity)){ - log.warn("#########saveTrayTypeByZeroList: 未找到托盘信息 trayCode={}",trayCode); - throw new CustomerException(403,"未找到托盘信息"); + if (Objects.isNull(trayEntity)) { + log.warn("#########saveTrayTypeByZeroList: 未找到托盘信息 trayCode={}", trayCode); + throw new CustomerException(403, "未找到托盘信息"); } Long trayId = trayEntity.getId(); //查询零担订单数据 String ocode = zeroList.get(0).getOrderCode();//订单编码 - DistributionStockArticleEntity sae = distributionStockArticleClient.findZeroByOrderCodeAndWarehouseId(ocode,warehouseId); - if(Objects.isNull(sae)){ - log.warn("#########saveTrayTypeByZeroList: 未找到订单信息 orderCode={} warehouseId={}",ocode,warehouseId); - throw new CustomerException(403,"未找到订单信息"); + DistributionStockArticleEntity sae = distributionStockArticleClient.findZeroByOrderCodeAndWarehouseId(ocode, warehouseId); + if (Objects.isNull(sae)) { + log.warn("#########saveTrayTypeByZeroList: 未找到订单信息 orderCode={} warehouseId={}", ocode, warehouseId); + throw new CustomerException(403, "未找到订单信息"); } //查询托盘信息 QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("tray_code",trayCode) - .eq("is_deleted",0); + queryWrapper.eq("tray_code", trayCode) + .eq("is_deleted", 0); WarehouseTrayTypeEntity trayTypeEntity = baseMapper.selectOne(queryWrapper); - if(Objects.isNull(trayTypeEntity)){ + if (Objects.isNull(trayTypeEntity)) { //如果为空则该托盘为空 //第一次存入数据 - trayTypeEntity = saveTrayTypeByZeroList(trayType, trayCode, trayId,sae,warehouseId); + trayTypeEntity = saveTrayTypeByZeroList(trayType, trayCode, trayId, sae, warehouseId); } String tt = trayTypeEntity.getTrayType(); Long filterId = trayTypeEntity.getFilterId(); String filterValue = trayTypeEntity.getFilterValue(); Long wid = trayTypeEntity.getWarehouseId(); - if(!wid.equals(warehouseId)){ - log.warn("##############enterZeroOrderByTrayCode: 托盘已在其他仓库打托 {}={}",wid,warehouseId); - return R.fail(403,"托盘已在其他仓库打托"); + if (!wid.equals(warehouseId)) { + log.warn("##############enterZeroOrderByTrayCode: 托盘已在其他仓库打托 {}={}", wid, warehouseId); + return R.fail(403, "托盘已在其他仓库打托"); } - if(!tt.equals(trayType)){ - log.warn("##############enterZeroOrderByTrayCode: 打托方式不正确 {}={}",trayType,tt); - return R.fail(403,"打托方式不正确"); + if (!tt.equals(trayType)) { + log.warn("##############enterZeroOrderByTrayCode: 打托方式不正确 {}={}", trayType, tt); + return R.fail(403, "打托方式不正确"); } //判断串货 @@ -1698,20 +1703,20 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl orderCodes = new ArrayList<>(); - for(ZeroOrderVO zeroOrderVO:zeroList){ + for (ZeroOrderVO zeroOrderVO : zeroList) { String orderCode = zeroOrderVO.getOrderCode();//订单自编码 orderCodes.add(orderCode); Long orderId = zeroOrderVO.getOrderId(); Integer num = zeroOrderVO.getNum(); - if(num == 0){ - log.warn("#########enterZeroOrderByTrayCode: 请输入正确的数量 orderCode={} num={}",orderCode,num); - return R.fail(403,"请输入正确的数量"); + if (num == 0) { + log.warn("#########enterZeroOrderByTrayCode: 请输入正确的数量 orderCode={} num={}", orderCode, num); + return R.fail(403, "请输入正确的数量"); } - DistributionStockArticleEntity stockArticleEntity = distributionStockArticleClient.findZeroByOrderCodeAndWarehouseId(orderCode,warehouseId); - if(Objects.isNull(stockArticleEntity)){ - log.warn("#########enterZeroOrderByTrayCode: 未找到订单信息 orderCode={} warehouseId={}",orderCode,warehouseId); - return R.fail(403,"未找到订单信息"); + DistributionStockArticleEntity stockArticleEntity = distributionStockArticleClient.findZeroByOrderCodeAndWarehouseId(orderCode, warehouseId); + if (Objects.isNull(stockArticleEntity)) { + log.warn("#########enterZeroOrderByTrayCode: 未找到订单信息 orderCode={} warehouseId={}", orderCode, warehouseId); + return R.fail(403, "未找到订单信息"); } boolean flag = false; // if("10".equals(tt)) {//运单号 @@ -1731,12 +1736,12 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl zeroList,Long warehouseId,String remark) { - if(Objects.isNull(zeroList)){ - log.warn("##############enterZeroOrderByTrayCode: 数据为空 zeroList={}",zeroList); - return R.fail(403,"数据为空"); + public R enterZeroOrderByTrayCodeSync(String trayType, String trayCode, List zeroList, Long warehouseId, String remark) { + if (Objects.isNull(zeroList)) { + log.warn("##############enterZeroOrderByTrayCode: 数据为空 zeroList={}", zeroList); + return R.fail(403, "数据为空"); } - if(zeroList.size() == 0){ - log.warn("##############enterZeroOrderByTrayCode: 数据为空 zeroList={}",zeroList); - return R.fail(403,"数据为空"); + if (zeroList.size() == 0) { + log.warn("##############enterZeroOrderByTrayCode: 数据为空 zeroList={}", zeroList); + return R.fail(403, "数据为空"); } BasicdataTrayEntity trayEntity = basicdataTrayClient.getTrayByTrayCode(trayCode); - if(Objects.isNull(trayEntity)){ - log.warn("#########saveTrayTypeByZeroList: 未找到托盘信息 trayCode={}",trayCode); - throw new CustomerException(403,"未找到托盘信息"); + if (Objects.isNull(trayEntity)) { + log.warn("#########saveTrayTypeByZeroList: 未找到托盘信息 trayCode={}", trayCode); + throw new CustomerException(403, "未找到托盘信息"); } Long trayId = trayEntity.getId(); //查询零担订单数据 String ocode = zeroList.get(0).getOrderCode();//订单编码 - DistributionStockArticleEntity sae = distributionStockArticleClient.findZeroByOrderCodeAndWarehouseId(ocode,warehouseId); - if(Objects.isNull(sae)){ - log.warn("#########saveTrayTypeByZeroList: 未找到订单信息 orderCode={} warehouseId={}",ocode,warehouseId); - throw new CustomerException(403,"未找到订单信息"); + DistributionStockArticleEntity sae = distributionStockArticleClient.findZeroByOrderCodeAndWarehouseId(ocode, warehouseId); + if (Objects.isNull(sae)) { + log.warn("#########saveTrayTypeByZeroList: 未找到订单信息 orderCode={} warehouseId={}", ocode, warehouseId); + throw new CustomerException(403, "未找到订单信息"); } //查询托盘信息 QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("tray_code",trayCode) - .eq("is_deleted",0); + queryWrapper.eq("tray_code", trayCode) + .eq("is_deleted", 0); WarehouseTrayTypeEntity trayTypeEntity = baseMapper.selectOne(queryWrapper); - if(Objects.isNull(trayTypeEntity)){ + if (Objects.isNull(trayTypeEntity)) { //如果为空则该托盘为空 //第一次存入数据 - trayTypeEntity = saveTrayTypeByZeroList(trayType, trayCode, trayId,sae,warehouseId); + trayTypeEntity = saveTrayTypeByZeroList(trayType, trayCode, trayId, sae, warehouseId); } String tt = trayTypeEntity.getTrayType(); Long filterId = trayTypeEntity.getFilterId(); String filterValue = trayTypeEntity.getFilterValue(); Long wid = trayTypeEntity.getWarehouseId(); - if(!wid.equals(warehouseId)){ - log.warn("##############enterZeroOrderByTrayCode: 托盘已在其他仓库打托 {}={}",wid,warehouseId); - return R.fail(403,"托盘已在其他仓库打托"); + if (!wid.equals(warehouseId)) { + log.warn("##############enterZeroOrderByTrayCode: 托盘已在其他仓库打托 {}={}", wid, warehouseId); + return R.fail(403, "托盘已在其他仓库打托"); } - if(!tt.equals(trayType)){ - log.warn("##############enterZeroOrderByTrayCode: 打托方式不正确 {}={}",trayType,tt); - return R.fail(403,"打托方式不正确"); + if (!tt.equals(trayType)) { + log.warn("##############enterZeroOrderByTrayCode: 打托方式不正确 {}={}", trayType, tt); + return R.fail(403, "打托方式不正确"); } //判断串货 @@ -1828,20 +1833,20 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl orderCodes = new ArrayList<>(); - for(ZeroOrderVO zeroOrderVO:zeroList){ + for (ZeroOrderVO zeroOrderVO : zeroList) { String orderCode = zeroOrderVO.getOrderCode();//订单自编码 orderCodes.add(orderCode); Long orderId = zeroOrderVO.getOrderId(); Integer num = zeroOrderVO.getNum(); - if(num == 0 || Objects.isNull(num)){ - log.warn("#########enterZeroOrderByTrayCode: 请输入正确的数量 orderCode={} num={}",orderCode,num); - return R.fail(403,"请输入正确的数量"); + if (num == 0 || Objects.isNull(num)) { + log.warn("#########enterZeroOrderByTrayCode: 请输入正确的数量 orderCode={} num={}", orderCode, num); + return R.fail(403, "请输入正确的数量"); } - DistributionStockArticleEntity stockArticleEntity = distributionStockArticleClient.findZeroByOrderCodeAndWarehouseId(orderCode,warehouseId); - if(Objects.isNull(stockArticleEntity)){ - log.warn("#########enterZeroOrderByTrayCode: 未找到订单信息 orderCode={} warehouseId={}",orderCode,warehouseId); - return R.fail(403,"未找到订单信息"); + DistributionStockArticleEntity stockArticleEntity = distributionStockArticleClient.findZeroByOrderCodeAndWarehouseId(orderCode, warehouseId); + if (Objects.isNull(stockArticleEntity)) { + log.warn("#########enterZeroOrderByTrayCode: 未找到订单信息 orderCode={} warehouseId={}", orderCode, warehouseId); + return R.fail(403, "未找到订单信息"); } boolean flag = false; // if("10".equals(tt)) {//运单号 @@ -1861,12 +1866,12 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("tray_code",trayCode) - .eq("is_deleted",0); + queryWrapper.eq("tray_code", trayCode) + .eq("is_deleted", 0); WarehouseTrayTypeEntity trayTypeEntity = baseMapper.selectOne(queryWrapper); - if(Objects.isNull(trayTypeEntity)){ + if (Objects.isNull(trayTypeEntity)) { log.warn("#########deleteZeroOrderByTrayCode: 未知的托盘打托信息 trayCode={}", trayCode); - return R.fail(403,"未知的托盘打托信息"); + return R.fail(403, "未知的托盘打托信息"); } Long trayTypeId = trayTypeEntity.getId(); Long wid = trayTypeEntity.getWarehouseId(); - if(!wid.equals(warehouseId)){ - log.warn("#########deleteZeroOrderByTrayCode: 托盘已在其他仓库打托 wid={} warehouseId={}", wid,warehouseId); - return R.fail(403,"托盘已在其他仓库打托"); + if (!wid.equals(warehouseId)) { + log.warn("#########deleteZeroOrderByTrayCode: 托盘已在其他仓库打托 wid={} warehouseId={}", wid, warehouseId); + return R.fail(403, "托盘已在其他仓库打托"); } - DistributionStockArticleEntity stockArticleEntity = distributionStockArticleClient.findZeroByOrderCodeAndWarehouseId(orderCode,warehouseId); - if(Objects.isNull(stockArticleEntity)){ + DistributionStockArticleEntity stockArticleEntity = distributionStockArticleClient.findZeroByOrderCodeAndWarehouseId(orderCode, warehouseId); + if (Objects.isNull(stockArticleEntity)) { log.warn("#########deleteZeroOrderByTrayCode: 未找到订单信息 orderCode={}", orderCode); - return R.fail(403,"未找到订单信息"); + return R.fail(403, "未找到订单信息"); } - WarehouseTrayGoodsEntity trayGoodsEntity = warehouseTrayGoodsService.getZeroByTrayTypeIdAndOrderCode(trayTypeId, orderCode,warehouseId); - if(Objects.isNull(trayGoodsEntity)){ - log.warn("#########deleteZeroOrderByTrayCode: 未找到订单绑定托盘信息 orderCode={} trayTypeId={} warehouseId={}", orderCode,trayTypeId,warehouseId); - return R.fail(403,"未找到订单绑定托盘信息"); + WarehouseTrayGoodsEntity trayGoodsEntity = warehouseTrayGoodsService.getZeroByTrayTypeIdAndOrderCode(trayTypeId, orderCode, warehouseId); + if (Objects.isNull(trayGoodsEntity)) { + log.warn("#########deleteZeroOrderByTrayCode: 未找到订单绑定托盘信息 orderCode={} trayTypeId={} warehouseId={}", orderCode, trayTypeId, warehouseId); + return R.fail(403, "未找到订单绑定托盘信息"); } Integer num = trayGoodsEntity.getNum(); Long trayGoodsId = trayGoodsEntity.getId(); Long trayId = trayGoodsEntity.getTrayId(); //添加下托日志 - warehouseTrayGoodsLogService.saveLogZero(stockArticleEntity,trayTypeEntity,num,"0",remark+"并解托","2"); + warehouseTrayGoodsLogService.saveLogZero(stockArticleEntity, trayTypeEntity, num, "0", remark + "并解托", "2"); //修改打托方式上的值 // changeZeroTotalNumByTrayTypeId(stockArticleEntity, trayTypeId,num, 1);//addSub 1加 2减 //解除绑定 - Integer residueNum = warehouseTrayGoodsService.deleteByTrayGoodsId(trayGoodsId,warehouseId); + Integer residueNum = warehouseTrayGoodsService.deleteByTrayGoodsId(trayGoodsId, warehouseId); - if(residueNum == 0){ + if (residueNum == 0) { //空置托盘 baseMapper.deleteById(trayTypeId); //更新托盘状态 - basicdataTrayClient.updateTrayStatus(trayId,1); + basicdataTrayClient.updateTrayStatus(trayId, 1); Long allocationIdByTrayId = warehouseTaryAllocationService.getAllocationIdByTrayId(trayId); - if(!Objects.isNull(allocationIdByTrayId)){ - warehouseTaryAllocationService.deleteByTrayIdAndAllocationId(trayId,allocationIdByTrayId); + if (!Objects.isNull(allocationIdByTrayId)) { + warehouseTaryAllocationService.deleteByTrayIdAndAllocationId(trayId, allocationIdByTrayId); } } updateNumByTrayTypeId(trayTypeEntity); - try{ + try { BasicdataTrayEntity trayEntity = basicdataTrayClient.getTrayByTrayCode(trayCode); JSONObject jsonObject = new JSONObject(); - jsonObject.put("dataType",2); - jsonObject.put("operation",2); + jsonObject.put("dataType", 2); + jsonObject.put("operation", 2); List orderCodes = new ArrayList<>(); orderCodes.add(orderCode); - jsonObject.put("orderCodes",orderCodes); - jsonObject.put("warehouseId",warehouseId); - jsonObject.put("trayName",trayEntity.getPalletName()); + jsonObject.put("orderCodes", orderCodes); + jsonObject.put("warehouseId", warehouseId); + jsonObject.put("trayName", trayEntity.getPalletName()); FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.warehouse.TRAYTYPE.EXCHANGE).msg(jsonObject.toJSONString()).build(); sendFanoutService.sendFanoutMsg(fanoutMsg); - }catch (Exception e){ + } catch (Exception e) { log.warn("###########saveTrayTypeByOrderPackageCode: 发送打托广播失败"); } @@ -2008,8 +2013,8 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("tray_code",trayCode) - .eq("is_deleted",0); + queryWrapper.eq("tray_code", trayCode) + .eq("is_deleted", 0); WarehouseTrayTypeEntity trayTypeEntity = baseMapper.selectOne(queryWrapper); - if(Objects.isNull(trayTypeEntity)){ - log.warn("#########updateEntityNumByOrderCodeAndTrayCode: 未找到打托信息 trayCode={}",trayCode); - return R.fail(403,"未找到打托信息"); + if (Objects.isNull(trayTypeEntity)) { + log.warn("#########updateEntityNumByOrderCodeAndTrayCode: 未找到打托信息 trayCode={}", trayCode); + return R.fail(403, "未找到打托信息"); } Long trayTypeId = trayTypeEntity.getId(); Long wid = trayTypeEntity.getWarehouseId(); - if(!wid.equals(warehouseId)){ - log.warn("#########updateEntityNumByOrderCodeAndTrayCode: 托盘已在其他仓库打托 wid={} warehouseId={}",wid,warehouseId); - return R.fail(403,"托盘已在其他仓库打托"); + if (!wid.equals(warehouseId)) { + log.warn("#########updateEntityNumByOrderCodeAndTrayCode: 托盘已在其他仓库打托 wid={} warehouseId={}", wid, warehouseId); + return R.fail(403, "托盘已在其他仓库打托"); } - WarehouseTrayGoodsEntity trayGoodsEntity = warehouseTrayGoodsService.getZeroByTrayTypeIdAndOrderCode(trayTypeId, orderCode,warehouseId); - if(Objects.isNull(trayGoodsEntity)){ - log.warn("#########updateEntityNumByOrderCodeAndTrayCode: 未找到货物绑定关系信息 trayTypeId={} orderCode={}",trayTypeId,orderCode); - return R.fail(403,"未找到货物绑定关系信息"); + WarehouseTrayGoodsEntity trayGoodsEntity = warehouseTrayGoodsService.getZeroByTrayTypeIdAndOrderCode(trayTypeId, orderCode, warehouseId); + if (Objects.isNull(trayGoodsEntity)) { + log.warn("#########updateEntityNumByOrderCodeAndTrayCode: 未找到货物绑定关系信息 trayTypeId={} orderCode={}", trayTypeId, orderCode); + return R.fail(403, "未找到货物绑定关系信息"); } Long trayGoodsId = trayGoodsEntity.getId(); Integer oldNum = trayGoodsEntity.getNum();//原始数量 Integer difference = num - oldNum; - log.info("#########updateEntityNumByOrderCodeAndTrayCode: 差额difference={}",difference); - if(difference == 0){ - log.warn("#########updateEntityNumByOrderCodeAndTrayCode: 数量未变动不需要更新 difference={}",difference); - return R.fail(403,"数量未变动不需要更新"); + log.info("#########updateEntityNumByOrderCodeAndTrayCode: 差额difference={}", difference); + if (difference == 0) { + log.warn("#########updateEntityNumByOrderCodeAndTrayCode: 数量未变动不需要更新 difference={}", difference); + return R.fail(403, "数量未变动不需要更新"); } - updateZeroEntityNum(trayGoodsEntity,difference); + updateZeroEntityNum(trayGoodsEntity, difference); return R.success("更新成功"); } @@ -2096,31 +2101,31 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl 0){ - warehouseTrayGoodsLogService.saveLogZero(stockArticleEntity,trayTypeEntity,Math.abs(difference),"1","分拣打托:数量修改","2"); - }else{ - warehouseTrayGoodsLogService.saveLogZero(stockArticleEntity,trayTypeEntity,Math.abs(difference),"0","分拣打托:数量修改","2"); + DistributionStockArticleEntity stockArticleEntity = distributionStockArticleClient.findZeroByOrderCodeAndWarehouseId(orderCode, trayTypeEntity.getWarehouseId()); + if (difference > 0) { + warehouseTrayGoodsLogService.saveLogZero(stockArticleEntity, trayTypeEntity, Math.abs(difference), "1", "分拣打托:数量修改", "2"); + } else { + warehouseTrayGoodsLogService.saveLogZero(stockArticleEntity, trayTypeEntity, Math.abs(difference), "0", "分拣打托:数量修改", "2"); } //更新打托方式表数量 - baseMapper.updateTotalNumByTrayTypeId(trayTypeId,difference); + baseMapper.updateTotalNumByTrayTypeId(trayTypeId, difference); } @Override public void zeroOrderUpdateRemark(String trayCode, String remark) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("tray_code",trayCode) - .eq("is_deleted",0); + queryWrapper.eq("tray_code", trayCode) + .eq("is_deleted", 0); WarehouseTrayTypeEntity trayTypeEntity = baseMapper.selectOne(queryWrapper); - if(Objects.isNull(trayTypeEntity)){ - log.warn("#########zeroOrderUpdateRemark: 未找到打托信息 trayCode={}",trayCode); - throw new CustomerException(403,"未找到打托信息"); + if (Objects.isNull(trayTypeEntity)) { + log.warn("#########zeroOrderUpdateRemark: 未找到打托信息 trayCode={}", trayCode); + throw new CustomerException(403, "未找到打托信息"); } trayTypeEntity.setRemark(remark); updateById(trayTypeEntity); @@ -2131,7 +2136,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl stockPageList(TrayTypeDTO trayTypeDTO,Long warehouseId) { + public IPage stockPageList(TrayTypeDTO trayTypeDTO, Long warehouseId) { IPage page = new Page<>(); page.setCurrent(trayTypeDTO.getPageNum()); page.setSize(trayTypeDTO.getPageSize()); @@ -2140,12 +2145,12 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl pageList = baseMapper.orderPageList(page,trayTypeDTO,warehouseId); + IPage pageList = baseMapper.orderPageList(page, trayTypeDTO, warehouseId); IPage warehouseTrayTypeVOIPage = WarehouseTrayTypeWrapper.build().pageVO(pageList); List records = warehouseTrayTypeVOIPage.getRecords(); - for (WarehouseTrayTypeVO warehouseTrayTypeVO:records){ + for (WarehouseTrayTypeVO warehouseTrayTypeVO : records) { String palletTypeName = DictBizCache.getValue(DictBizConstant.PALLET_STOCK_TYPE, warehouseTrayTypeVO.getTrayType()); warehouseTrayTypeVO.setTrayTypeName(palletTypeName); String trayCode = warehouseTrayTypeVO.getTrayCode(); @@ -2157,25 +2162,25 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl updownGoodsByStock = warehouseUpdownGoodsService.getUpdownGoodsByStock(marketId,materialCode,orderCode,warehouseId); - List traynGoodsByStock = warehouseTrayGoodsService.getTrayGoodsByStockNoAllocationId(marketId,materialCode,orderCode,warehouseId); + List updownGoodsByStock = warehouseUpdownGoodsService.getUpdownGoodsByStock(marketId, materialCode, orderCode, warehouseId); + List traynGoodsByStock = warehouseTrayGoodsService.getTrayGoodsByStockNoAllocationId(marketId, materialCode, orderCode, warehouseId); updownGoodsByStock.addAll(traynGoodsByStock); - for (PositionVO positionVO:updownGoodsByStock){ + for (PositionVO positionVO : updownGoodsByStock) { Integer num = positionVO.getNum(); useStock = useStock + num; } - if(quantityStock < (useStock + 1)){ - log.warn("#########scanStockOrderPackageCode: 数量异常 quantityStock={} useStock={}",quantityStock,useStock + 1); - return R.fail(403,"数量异常"); + if (quantityStock < (useStock + 1)) { + log.warn("#########scanStockOrderPackageCode: 数量异常 quantityStock={} useStock={}", quantityStock, useStock + 1); + return R.fail(403, "数量异常"); } QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("tray_code",trayCode) - .eq("is_deleted",0); + queryWrapper.eq("tray_code", trayCode) + .eq("is_deleted", 0); WarehouseTrayTypeEntity trayTypeEntity = baseMapper.selectOne(queryWrapper); - if(Objects.isNull(trayTypeEntity)){ + if (Objects.isNull(trayTypeEntity)) { //如果为空则该托盘为空 //第一次存入数据 - trayTypeEntity = saveTrayTypeByStock(trayType, trayCode,trayId, materialId,materialName,materialCode,marketId,marketName,warehouseId); + trayTypeEntity = saveTrayTypeByStock(trayType, trayCode, trayId, materialId, materialName, materialCode, marketId, marketName, warehouseId); } String tt = trayTypeEntity.getTrayType(); Long filterId = trayTypeEntity.getFilterId(); @@ -2233,18 +2238,18 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("tray_type_id",trayTypeId) - .eq("association_type",4); + queryWrapper.eq("tray_type_id", trayTypeId) + .eq("association_type", 4); List list = warehouseTrayGoodsService.list(queryWrapper); - if(list.isEmpty()){ + if (list.isEmpty()) { trayTypeEntity.setMarketId(null); trayTypeEntity.setMarketName(null); updateById(trayTypeEntity); @@ -2350,41 +2355,41 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl stockListIds = new ArrayList<>(); stockListIds.add(stockListId); - jsonObject.put("stockListIds",stockListIds); - jsonObject.put("warehouseId",warehouseId); - jsonObject.put("trayName",trayName); + jsonObject.put("stockListIds", stockListIds); + jsonObject.put("warehouseId", warehouseId); + jsonObject.put("trayName", trayName); FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.warehouse.TRAYTYPE.EXCHANGE).msg(jsonObject.toJSONString()).build(); sendFanoutService.sendFanoutMsg(fanoutMsg); - }catch (Exception e){ + } catch (Exception e) { log.warn("###########saveTrayTypeByOrderPackageCode: 发送打托广播失败"); } @@ -2415,8 +2420,8 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl().lambda() - .eq(WarehouseTrayTypeEntity::getTrayId,id) + .eq(WarehouseTrayTypeEntity::getTrayId, id) ); return delete > 0; } @Override - public IPage stockNoDataPageList(TrayTypeDTO trayTypeDTO,Long warehouseId) { + public IPage stockNoDataPageList(TrayTypeDTO trayTypeDTO, Long warehouseId) { IPage page = new Page<>(); page.setCurrent(trayTypeDTO.getPageNum()); page.setSize(trayTypeDTO.getPageSize()); @@ -2491,7 +2496,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl pageList = baseMapper.orderPageList(page,trayTypeDTO,warehouseId); + IPage pageList = baseMapper.orderPageList(page, trayTypeDTO, warehouseId); IPage warehouseTrayTypeVOIPage = WarehouseTrayTypeWrapper.build().pageVO(pageList); @@ -2508,9 +2513,9 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl noDataStockListDTOS, Long warehouseId, String remark) { //查询托盘信息 BasicdataTrayEntity trayEntity = basicdataTrayClient.getTrayByTrayCode(trayCode); - if(Objects.isNull(trayEntity)){ - log.warn("#########saveTrayTypeByStockNoData: 未找到托盘信息 trayCode={}",trayCode); - throw new CustomerException(403,"未找到托盘信息"); + if (Objects.isNull(trayEntity)) { + log.warn("#########saveTrayTypeByStockNoData: 未找到托盘信息 trayCode={}", trayCode); + throw new CustomerException(403, "未找到托盘信息"); } Long trayId = trayEntity.getId(); String trayName = trayEntity.getPalletName(); @@ -2518,10 +2523,10 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("tray_code",trayCode) - .eq("is_deleted",0); + queryWrapper.eq("tray_code", trayCode) + .eq("is_deleted", 0); WarehouseTrayTypeEntity trayTypeEntity = baseMapper.selectOne(queryWrapper); - if(Objects.isNull(trayTypeEntity)){ + if (Objects.isNull(trayTypeEntity)) { //如果为空则该托盘为空 //第一次存入数据 - trayTypeEntity = saveTrayTypeByStockNoData(trayType, trayCode,trayId,stockListEntity.getMaterialId(),materialName,stockListEntity.getCargoNumber(),stockListEntity.getMarketId(),stockListEntity.getMarketName(),warehouseId); + trayTypeEntity = saveTrayTypeByStockNoData(trayType, trayCode, trayId, stockListEntity.getMaterialId(), materialName, stockListEntity.getCargoNumber(), stockListEntity.getMarketId(), stockListEntity.getMarketName(), warehouseId); } Integer totalNum = 0; @@ -2555,10 +2560,10 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl trayGoodsQueryWrapper = new QueryWrapper<>(); - DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode,warehouseId); - trayGoodsQueryWrapper.eq("association_type","3") - .eq("association_value",orderPackageCode); + DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode, warehouseId); + trayGoodsQueryWrapper.eq("association_type", "3") + .eq("association_value", orderPackageCode); WarehouseTrayGoodsEntity trayGoodsEntity = warehouseTrayGoodsService.getOne(trayGoodsQueryWrapper); StringBuffer stringBuffer = new StringBuffer(); - if (!Objects.isNull(trayGoodsEntity)){ + if (!Objects.isNull(trayGoodsEntity)) { Long trayGoodsId = trayGoodsEntity.getId(); Long trayTypeId = trayGoodsEntity.getTrayTypeId(); Long trayId = trayGoodsEntity.getTrayId(); @@ -2655,64 +2660,64 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl orderPackageCodes = new ArrayList<>(); orderPackageCodes.add(orderPackageCode); - jsonObject.put("orderPackageCodes",orderPackageCodes); - jsonObject.put("warehouseId",warehouseId); - jsonObject.put("trayName",trayName); + jsonObject.put("orderPackageCodes", orderPackageCodes); + jsonObject.put("warehouseId", warehouseId); + jsonObject.put("trayName", trayName); FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.warehouse.TRAYTYPE.EXCHANGE).msg(jsonObject.toJSONString()).build(); sendFanoutService.sendFanoutMsg(fanoutMsg); - if(CollUtil.isNotEmpty(orderPackageCodes)){ + if (CollUtil.isNotEmpty(orderPackageCodes)) { BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(warehouseId); String warehouseName = warehouseEntity.getName(); - String content = "包件在 "+warehouseName+" 解托，托盘 "+trayName; - warehousePackageTrackLogService.addBatchLog(orderPackageCodes,content,warehouseId,warehouseName,AuthUtil.getNickName(), WorkNodeEnums.UN_SORTING_TRAYS.getCode()); + String content = "包件在 " + warehouseName + " 解托，托盘 " + trayName; + warehousePackageTrackLogService.addBatchLog(orderPackageCodes, content, warehouseId, warehouseName, AuthUtil.getNickName(), WorkNodeEnums.UN_SORTING_TRAYS.getCode()); } - }catch (Exception e){ + } catch (Exception e) { log.warn("###########saveTrayTypeByOrderPackageCode: 发送打托广播失败"); } - }else { + } else { stringBuffer.append(orderPackageCode); } - if (Func.isNotEmpty(stringBuffer)){ - log.error("托盘商品不存在,trayId：{}",stringBuffer.toString()); + if (Func.isNotEmpty(stringBuffer)) { + log.error("托盘商品不存在,trayId：{}", stringBuffer.toString()); } } @Transactional(rollbackFor = Exception.class) - public void downPackageByOrderPackageCodeNoFanout(String orderPackageCode,String remark,Long warehouseId) { + public void downPackageByOrderPackageCodeNoFanout(String orderPackageCode, String remark, Long warehouseId) { QueryWrapper trayGoodsQueryWrapper = new QueryWrapper<>(); - DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode,warehouseId); - trayGoodsQueryWrapper.eq("association_type","3") - .eq("association_value",orderPackageCode); + DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode, warehouseId); + trayGoodsQueryWrapper.eq("association_type", "3") + .eq("association_value", orderPackageCode); WarehouseTrayGoodsEntity trayGoodsEntity = warehouseTrayGoodsService.getOne(trayGoodsQueryWrapper); StringBuffer stringBuffer = new StringBuffer(); - if (!Objects.isNull(trayGoodsEntity)){ + if (!Objects.isNull(trayGoodsEntity)) { Long trayGoodsId = trayGoodsEntity.getId(); Long trayTypeId = trayGoodsEntity.getTrayTypeId(); Long trayId = trayGoodsEntity.getTrayId(); @@ -2723,33 +2728,31 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl orderPackageCodeList,String remark,Long warehouseId) { + public void downPackageByOrderPackageCodeList(List orderPackageCodeList, String remark, Long warehouseId) { // List distributionParcelListEntities = distributionParcelListClient.findListByOrderPackageCodeList(orderPackageCodeList,warehouseId); // //把distributionParcelListEntities转化成orderPackageCode为key的Map @@ -2757,8 +2760,8 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl entity1)); QueryWrapper trayGoodsQueryWrapper = new QueryWrapper<>(); - trayGoodsQueryWrapper.eq("association_type","3") - .in("association_value",orderPackageCodeList); + trayGoodsQueryWrapper.eq("association_type", "3") + .in("association_value", orderPackageCodeList); List trayGoodsEntityList = warehouseTrayGoodsService.list(trayGoodsQueryWrapper); //把trayGoodsEntityList通过trayTypeId进行分组 @@ -2766,8 +2769,8 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl trayTypeIds = trayTypeIdToTrayGoodsListMap.keySet(); - if(trayTypeIds.isEmpty()){ - return ; + if (trayTypeIds.isEmpty()) { + return; } List warehouseTrayTypeEntities = baseMapper.selectBatchIds(trayTypeIds); @@ -2781,7 +2784,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl { List warehouseTrayGoodsEntities = trayTypeIdToTrayGoodsListMap.get(trayTypeId); - if(!warehouseTrayGoodsEntities.isEmpty()){ + if (!warehouseTrayGoodsEntities.isEmpty()) { WarehouseTrayTypeEntity trayTypeEntity = trayTypeMap.get(trayTypeId); Long trayId = trayTypeEntity.getTrayId(); String trayCode = trayTypeEntity.getTrayCode(); @@ -2805,16 +2808,16 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl listEntityList = conditionsToParcelListMap.get(conditions); JSONObject jsonObject = new JSONObject(); - jsonObject.put("dataType",1); - jsonObject.put("conditions",conditions); - jsonObject.put("operation",2); + jsonObject.put("dataType", 1); + jsonObject.put("conditions", conditions); + jsonObject.put("operation", 2); //把listEntityList中所有元素的orderPackageCode放入一个List List packageCodes = listEntityList.stream() .map(DistributionParcelListEntity::getOrderPackageCode) .collect(Collectors.toList()); - jsonObject.put("orderPackageCodes",packageCodes); - jsonObject.put("warehouseId",warehouseId); - jsonObject.put("trayName",trayName); + jsonObject.put("orderPackageCodes", packageCodes); + jsonObject.put("warehouseId", warehouseId); + jsonObject.put("trayName", trayName); FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.warehouse.TRAYTYPE.EXCHANGE).msg(jsonObject.toJSONString()).build(); sendFanoutService.sendFanoutMsg(fanoutMsg); - if(CollUtil.isNotEmpty(orderPackageCodes)){ + if (CollUtil.isNotEmpty(orderPackageCodes)) { BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(warehouseId); String warehouseName = warehouseEntity.getName(); - String content = "包件在 "+warehouseName+" 解托，托盘 "+trayName; - warehousePackageTrackLogService.addBatchLog(orderPackageCodes,content,warehouseId,warehouseName,AuthUtil.getNickName(), WorkNodeEnums.UN_SORTING_TRAYS.getCode()); + String content = "包件在 " + warehouseName + " 解托，托盘 " + trayName; + warehousePackageTrackLogService.addBatchLog(orderPackageCodes, content, warehouseId, warehouseName, AuthUtil.getNickName(), WorkNodeEnums.UN_SORTING_TRAYS.getCode()); } }); - }catch (Exception e){ + } catch (Exception e) { log.warn("###########saveTrayTypeByOrderPackageCode: 发送打托广播失败"); } @@ -2873,15 +2876,15 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl { WarehouseTrayTypeEntity trayTypeEntity = trayTypeMap.get(trayTypeId); - if(!Objects.isNull(trayTypeEntity)){ + if (!Objects.isNull(trayTypeEntity)) { updateNumByTrayTypeId(trayTypeEntity); } }); @@ -2916,7 +2919,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("tray_id",trayId) - .eq("is_deleted",0); + queryWrapper.eq("tray_id", trayId) + .eq("is_deleted", 0); //打托方式 WarehouseTrayTypeEntity trayTypeEntity = baseMapper.selectOne(queryWrapper); - if(Objects.isNull(trayTypeEntity)){ - log.warn("##########downTrayGoodsByTrayId: 托盘没有打托数据 trayId={}",trayId); - throw new CustomerException(403,"托盘没有打托数据"); + if (Objects.isNull(trayTypeEntity)) { + log.warn("##########downTrayGoodsByTrayId: 托盘没有打托数据 trayId={}", trayId); + throw new CustomerException(403, "托盘没有打托数据"); } Long trayTypeId = trayTypeEntity.getId(); String trayCode = trayTypeEntity.getTrayCode(); Long warehouseId = trayTypeEntity.getWarehouseId(); QueryWrapper trayGoodsEntityQueryWrapper = new QueryWrapper<>(); - trayGoodsEntityQueryWrapper.eq("tray_type_id",trayTypeId); + trayGoodsEntityQueryWrapper.eq("tray_type_id", trayTypeId); List trayGoodsList = warehouseTrayGoodsService.list(trayGoodsEntityQueryWrapper); //存入下托记录 - saveTrayGoodsLog(trayGoodsList,trayTypeEntity,"0",remark,"1"); + saveTrayGoodsLog(trayGoodsList, trayTypeEntity, "0", remark, "1"); //删除绑定关系 warehouseTrayGoodsService.deleteByIdList(trayGoodsList); //删除打托方式 @@ -2963,10 +2966,10 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl { List trayGoodsEntities = map.get(associationType); - if("1".equals(associationType)){ + if ("1".equals(associationType)) { List orderCodes = trayGoodsEntities.stream().map(WarehouseTrayGoodsEntity::getAssociationValue).collect(Collectors.toList()); JSONObject jsonObject = new JSONObject(); - jsonObject.put("dataType",2); - jsonObject.put("operation",2); - jsonObject.put("orderCodes",orderCodes); - jsonObject.put("warehouseId",warehouseId); - jsonObject.put("trayName",trayEntity.getPalletName()); + jsonObject.put("dataType", 2); + jsonObject.put("operation", 2); + jsonObject.put("orderCodes", orderCodes); + jsonObject.put("warehouseId", warehouseId); + jsonObject.put("trayName", trayEntity.getPalletName()); FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.warehouse.TRAYTYPE.EXCHANGE).msg(jsonObject.toJSONString()).build(); sendFanoutService.sendFanoutMsg(fanoutMsg); - }else if("3".equals(associationType)){ + } else if ("3".equals(associationType)) { //获取trayGoodsEntities所有元素的associationValue放入一个List集合 List orderPackageCodes = trayGoodsEntities.stream().map(WarehouseTrayGoodsEntity::getAssociationValue).collect(Collectors.toList()); @@ -3006,45 +3009,45 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl { List ls = parcelListEntityMap.get(conditions); JSONObject jsonObject = new JSONObject(); - jsonObject.put("dataType",1); - jsonObject.put("conditions",conditions); - jsonObject.put("operation",2); + jsonObject.put("dataType", 1); + jsonObject.put("conditions", conditions); + jsonObject.put("operation", 2); //把ls中所有元素的orderPackageCode装入一个Set中 List orderPackageCodeList = ls.stream().map(DistributionParcelListEntity::getOrderPackageCode).collect(Collectors.toList()); - jsonObject.put("orderPackageCodes",orderPackageCodeList); + jsonObject.put("orderPackageCodes", orderPackageCodeList); jsonObject.put("warehouseId", finalWarehouseId); FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.warehouse.TRAYTYPE.EXCHANGE).msg(jsonObject.toJSONString()).build(); sendFanoutService.sendFanoutMsg(fanoutMsg); - if(CollUtil.isNotEmpty(orderPackageCodeList)){ + if (CollUtil.isNotEmpty(orderPackageCodeList)) { BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(finalWarehouseId); String warehouseName = warehouseEntity.getName(); - String content = "包件在 "+warehouseName+" 解托，托盘 "+trayName; - warehousePackageTrackLogService.addBatchLog(orderPackageCodeList,content,finalWarehouseId,warehouseName,AuthUtil.getNickName(), WorkNodeEnums.UN_SORTING_TRAYS.getCode()); + String content = "包件在 " + warehouseName + " 解托，托盘 " + trayName; + warehousePackageTrackLogService.addBatchLog(orderPackageCodeList, content, finalWarehouseId, warehouseName, AuthUtil.getNickName(), WorkNodeEnums.UN_SORTING_TRAYS.getCode()); } }); - }else if("4".equals(associationType)){ + } else if ("4".equals(associationType)) { List stockListIds = new ArrayList<>(); trayGoodsEntities.forEach(trayGoodsEntity -> { String materialCode = trayGoodsEntity.getAssociationValue(); String incomingBatch = trayGoodsEntity.getIncomingBatch(); Long marketId = trayGoodsEntity.getMarketId(); DistributionStockListEntity stockListEntity = distributionStockListClient.getEntityByMarketIdAndMaterialCodeAndIncomingBatch(marketId, materialCode, incomingBatch, warehouseId); - if(!Objects.isNull(stockListEntity)){ + if (!Objects.isNull(stockListEntity)) { stockListIds.add(stockListEntity.getId()); } }); JSONObject jsonObject = new JSONObject(); - jsonObject.put("dataType",3); - jsonObject.put("operation",2); - jsonObject.put("stockListIds",stockListIds); - jsonObject.put("warehouseId",warehouseId); - jsonObject.put("trayName",trayName); + jsonObject.put("dataType", 3); + jsonObject.put("operation", 2); + jsonObject.put("stockListIds", stockListIds); + jsonObject.put("warehouseId", warehouseId); + jsonObject.put("trayName", trayName); FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.warehouse.TRAYTYPE.EXCHANGE).msg(jsonObject.toJSONString()).build(); @@ -3052,12 +3055,11 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("tray_id",trayId) - .eq("is_deleted",0); + queryWrapper.eq("tray_id", trayId) + .eq("is_deleted", 0); WarehouseTrayTypeEntity trayTypeEntity = baseMapper.selectOne(queryWrapper); - if(Objects.isNull(trayTypeEntity)){ - log.warn("################scanSourceTrayCode: 托盘没有打托方式 trayId={}",trayId); - return R.fail(403,"托盘未绑定数据"); + if (Objects.isNull(trayTypeEntity)) { + log.warn("################scanSourceTrayCode: 托盘没有打托方式 trayId={}", trayId); + return R.fail(403, "托盘未绑定数据"); } - Map map = new HashMap<>(); + Map map = new HashMap<>(); String type = trayTypeEntity.getType(); Long trayTypeId = trayTypeEntity.getId(); Integer totalNum = trayTypeEntity.getTotalNum(); @@ -3127,9 +3129,9 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl packageList = warehouseTrayGoodsService.getUpListByTrayTypeId(trayTypeId); @@ -3148,7 +3150,6 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl trayListVOS = null; // if(PalletProductTypeConstant.CUSTOMIZED.equals(type)){//订制品打托 // trayListVOS = warehouseTrayGoodsService.getReCheckPackageByTrayTypeId(trayTypeId); @@ -3161,49 +3162,49 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl sourceQueryWapper = new QueryWrapper<>(); - sourceQueryWapper.eq("tray_code",sourceTrayCode) - .eq("is_deleted",0); + sourceQueryWapper.eq("tray_code", sourceTrayCode) + .eq("is_deleted", 0); WarehouseTrayTypeEntity sourceTrayTypeEntity = baseMapper.selectOne(sourceQueryWapper); - if(Objects.isNull(sourceTrayTypeEntity)){ - log.warn("################mergeTray: 来源托盘信息有误 sourceTrayCode={}",sourceTrayCode); - return R.fail(403,"来源托盘信息有误"); + if (Objects.isNull(sourceTrayTypeEntity)) { + log.warn("################mergeTray: 来源托盘信息有误 sourceTrayCode={}", sourceTrayCode); + return R.fail(403, "来源托盘信息有误"); } QueryWrapper targetQueryWapper = new QueryWrapper<>(); - targetQueryWapper.eq("tray_code",targetTrayCode) - .eq("is_deleted",0); + targetQueryWapper.eq("tray_code", targetTrayCode) + .eq("is_deleted", 0); WarehouseTrayTypeEntity targetTrayTypeEntity = baseMapper.selectOne(targetQueryWapper); String sourceType = sourceTrayTypeEntity.getType(); Long sourceTrayId = sourceTrayTypeEntity.getTrayId(); @@ -3211,24 +3212,24 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("tray_type_id",sourceTrayTypeId); + queryWrapper.eq("tray_type_id", sourceTrayTypeId); List sourceTrayGoodsList = warehouseTrayGoodsService.list(queryWrapper); - if(Objects.isNull(targetTrayTypeEntity)){ + if (Objects.isNull(targetTrayTypeEntity)) { targetTrayTypeEntity = new WarehouseTrayTypeEntity(); - BeanUtil.copy(sourceTrayTypeEntity,targetTrayTypeEntity); + BeanUtil.copy(sourceTrayTypeEntity, targetTrayTypeEntity); targetTrayTypeEntity.setTrayId(targetTrayId); targetTrayTypeEntity.setTrayCode(targetTrayCode); targetTrayTypeEntity.setId(null); save(targetTrayTypeEntity);//保存打托方式 //空置来源托盘 - downTrayGoodsByTrayId(sourceTrayId,"合托:下托"); + downTrayGoodsByTrayId(sourceTrayId, "合托:下托"); //先把来源托盘数据合到目标托盘 - copyTrayGoodsToTargetTray(targetTrayTypeEntity,sourceTrayGoodsList); + copyTrayGoodsToTargetTray(targetTrayTypeEntity, sourceTrayGoodsList); - }else{ + } else { // String targetType = targetTrayTypeEntity.getType(); // if(!sourceType.equals(targetType)){ // log.warn("################mergeTray: 托盘货物类型不同 sourceType={} targetType={}",sourceType,targetType); @@ -3236,10 +3237,10 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("tray_id",trayId) - .eq("is_deleted",0); + queryWrapper.eq("tray_id", trayId) + .eq("is_deleted", 0); WarehouseTrayTypeEntity trayTypeEntity = baseMapper.selectOne(queryWrapper); - if(Objects.isNull(trayTypeEntity)){ - log.warn("################orderDetail: 打托方式不存在 trayId={}",trayId); - throw new CustomerException(403,"打托方式不存在"); + if (Objects.isNull(trayTypeEntity)) { + log.warn("################orderDetail: 打托方式不存在 trayId={}", trayId); + throw new CustomerException(403, "打托方式不存在"); } Long trayTypeId = trayTypeEntity.getId(); OrderDetailVO orderDetailVO = new OrderDetailVO(); - DistributionStockArticleEntity stockArticleEntity = distributionStockArticleClient.findStockArticleByOrderCodeAndWarehouseId(orderCode,warehouseId); - if(Objects.isNull(stockArticleEntity)){ - log.warn("################orderDetail: 订单不存在 orderCode={}",orderCode); - throw new CustomerException(403,"订单不存在"); + DistributionStockArticleEntity stockArticleEntity = distributionStockArticleClient.findStockArticleByOrderCodeAndWarehouseId(orderCode, warehouseId); + if (Objects.isNull(stockArticleEntity)) { + log.warn("################orderDetail: 订单不存在 orderCode={}", orderCode); + throw new CustomerException(403, "订单不存在"); } orderDetailVO.setOrderCode(orderCode); orderDetailVO.setTotalNumber(stockArticleEntity.getTotalNumber()); - Integer scanNum = warehouseTrayGoodsService.findScanPracelListNum(orderCode,trayTypeId,warehouseId); + Integer scanNum = warehouseTrayGoodsService.findScanPracelListNum(orderCode, trayTypeId, warehouseId); orderDetailVO.setScanNum(scanNum); - List list = warehouseTrayGoodsService.findAllPackageDetailByOrderCode(orderCode,warehouseId); - for (ParcelListVO parcelListVO:list){ + List list = warehouseTrayGoodsService.findAllPackageDetailByOrderCode(orderCode, warehouseId); + for (ParcelListVO parcelListVO : list) { String trayCode1 = parcelListVO.getTrayCode(); - if(trayCode.equals(trayCode1)){ + if (trayCode.equals(trayCode1)) { parcelListVO.setDeletedStatus(1); - }else{ + } else { parcelListVO.setDeletedStatus(0); } } @@ -3382,56 +3383,56 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("tray_id",trayId) - .eq("is_deleted",0); + queryWrapper.eq("tray_id", trayId) + .eq("is_deleted", 0); WarehouseTrayTypeEntity trayTypeEntity = baseMapper.selectOne(queryWrapper); - if(Objects.isNull(trayTypeEntity)){ - log.warn("################deleteOrderCode: 打托方式不存在 trayId={}",trayId); - throw new CustomerException(403,"打托方式不存在"); + if (Objects.isNull(trayTypeEntity)) { + log.warn("################deleteOrderCode: 打托方式不存在 trayId={}", trayId); + throw new CustomerException(403, "打托方式不存在"); } Long trayTypeId = trayTypeEntity.getId(); Long wid = trayTypeEntity.getWarehouseId(); - if(!wid.equals(warehouseId)){ - log.warn("################deleteOrderCode: 托盘已在其他仓库打托 wid={} warehouseId={}",wid,warehouseId); - throw new CustomerException(403,"托盘已在其他仓库打托"); + if (!wid.equals(warehouseId)) { + log.warn("################deleteOrderCode: 托盘已在其他仓库打托 wid={} warehouseId={}", wid, warehouseId); + throw new CustomerException(403, "托盘已在其他仓库打托"); } - List ls = warehouseTrayGoodsService.findPackageByTrayTypeIdAndOrdeCode(orderCode,trayTypeId,warehouseId); + List ls = warehouseTrayGoodsService.findPackageByTrayTypeIdAndOrdeCode(orderCode, trayTypeId, warehouseId); List orderPackageCodes = new ArrayList<>(); - for (WarehouseTrayGoodsEntity trayGoodsEntity:ls){ + for (WarehouseTrayGoodsEntity trayGoodsEntity : ls) { String orderPackageCode = trayGoodsEntity.getAssociationValue(); orderPackageCodes.add(orderPackageCode); } - deleteScanOrderPackageCode(trayCode,orderPackageCodes,warehouseId); + deleteScanOrderPackageCode(trayCode, orderPackageCodes, warehouseId); return R.success("删除成功"); } @Override - public R selectStockByMaterialCodeAndMarketId(Long marketId, String materialCode,Long warehouseId) { + public R selectStockByMaterialCodeAndMarketId(Long marketId, String materialCode, Long warehouseId) { List ls = new ArrayList<>(); //根据商场id和物料编码查询对应的库存品 - List stockListEntityList = distributionStockListClient.getListByMarketIdAndMaterialCode(marketId, materialCode,warehouseId); - if(Objects.isNull(stockListEntityList) || stockListEntityList.size() == 0){ - log.warn("################selectStockByMaterialCodeAndMarketId: 库存品不存在 marketId={} materialCode={}",marketId,materialCode); - return R.fail(403,"库存品不存在"); + List stockListEntityList = distributionStockListClient.getListByMarketIdAndMaterialCode(marketId, materialCode, warehouseId); + if (Objects.isNull(stockListEntityList) || stockListEntityList.size() == 0) { + log.warn("################selectStockByMaterialCodeAndMarketId: 库存品不存在 marketId={} materialCode={}", marketId, materialCode); + return R.fail(403, "库存品不存在"); } - for(DistributionStockListEntity stockListEntity:stockListEntityList){ + for (DistributionStockListEntity stockListEntity : stockListEntityList) { StockListVO stockListVO = new StockListVO(); - BeanUtil.copy(stockListEntity,stockListVO); + BeanUtil.copy(stockListEntity, stockListVO); Integer quantityStock = stockListEntity.getQuantityStock();//在数量 String incomingBatch = stockListEntity.getIncomingBatch(); String cargoNumber = stockListEntity.getCargoNumber(); - List updownGoodsByStock = warehouseUpdownGoodsService.getUpdownGoodsByStock(marketId,cargoNumber,incomingBatch,warehouseId); - List traynGoodsByStock = warehouseTrayGoodsService.getTrayGoodsByStockNoAllocationId(marketId,cargoNumber,incomingBatch,warehouseId); + List updownGoodsByStock = warehouseUpdownGoodsService.getUpdownGoodsByStock(marketId, cargoNumber, incomingBatch, warehouseId); + List traynGoodsByStock = warehouseTrayGoodsService.getTrayGoodsByStockNoAllocationId(marketId, cargoNumber, incomingBatch, warehouseId); updownGoodsByStock.addAll(traynGoodsByStock); - for (PositionVO positionVO:updownGoodsByStock){ + for (PositionVO positionVO : updownGoodsByStock) { Integer num = positionVO.getNum(); quantityStock = quantityStock - num; } @@ -3443,35 +3444,35 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("tray_id",trayId) - .eq("is_deleted",0); + queryWrapper.eq("tray_id", trayId) + .eq("is_deleted", 0); WarehouseTrayTypeEntity trayTypeEntity = baseMapper.selectOne(queryWrapper); - if(Objects.isNull(trayTypeEntity)){ - log.info("################scanTargetTrayCode: 托盘未绑定数据 trayId={}",trayId); + if (Objects.isNull(trayTypeEntity)) { + log.info("################scanTargetTrayCode: 托盘未绑定数据 trayId={}", trayId); return R.success("托盘未绑定数据"); - }else{ - Map map = new HashMap<>(); + } else { + Map map = new HashMap<>(); String type = trayTypeEntity.getType(); Long trayTypeId = trayTypeEntity.getId(); Integer totalNum = trayTypeEntity.getTotalNum(); @@ -3479,8 +3480,8 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl queryTrayTypeWrapper = new QueryWrapper<>(); - queryTrayTypeWrapper.eq("tray_code",trayCode) - .eq("is_deleted",0); + queryTrayTypeWrapper.eq("tray_code", trayCode) + .eq("is_deleted", 0); WarehouseTrayTypeEntity trayTypeEntity = baseMapper.selectOne(queryTrayTypeWrapper); - if(Objects.isNull(trayTypeEntity)){ + if (Objects.isNull(trayTypeEntity)) { //没有查询到托盘打托信息 trayTypeDataVO.setTrayCode(trayCode); trayTypeDataVO.setTrayNum(0); @@ -3567,9 +3568,9 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl trayGoodsEntityQueryWrapper = new QueryWrapper<>(); - trayGoodsEntityQueryWrapper.eq("association_value",orderPackageCode) - .eq("warehouse_id",warehouseId); + trayGoodsEntityQueryWrapper.eq("association_value", orderPackageCode) + .eq("warehouse_id", warehouseId); WarehouseTrayGoodsEntity trayGoodsEntity = warehouseTrayGoodsService.getOne(trayGoodsEntityQueryWrapper); - if(Objects.isNull(trayGoodsEntity)){ - log.warn("#################moveTrayScanPackage: 包件未打托 orderPackageCode={}",orderPackageCode); - throw new CustomerException(403,"包件未打托"); + if (Objects.isNull(trayGoodsEntity)) { + log.warn("#################moveTrayScanPackage: 包件未打托 orderPackageCode={}", orderPackageCode); + throw new CustomerException(403, "包件未打托"); } String oldTrayCode = trayGoodsEntity.getTrayCode(); - if(oldTrayCode.equals(trayCode)){ - log.warn("#################moveTrayScanPackage: 包件已打托目标托盘 orderPackageCode={}",orderPackageCode); - throw new CustomerException(403,"包件已打托目标托盘"); + if (oldTrayCode.equals(trayCode)) { + log.warn("#################moveTrayScanPackage: 包件已打托目标托盘 orderPackageCode={}", orderPackageCode); + throw new CustomerException(403, "包件已打托目标托盘"); } QueryWrapper updownGoodsEntityQueryWrapper = new QueryWrapper<>(); - updownGoodsEntityQueryWrapper.eq("association_value",orderPackageCode) - .eq("warehouse_id",warehouseId); + updownGoodsEntityQueryWrapper.eq("association_value", orderPackageCode) + .eq("warehouse_id", warehouseId); WarehouseUpdownGoodsEntity updownGoodsEntity = warehouseUpdownGoodsService.getOne(updownGoodsEntityQueryWrapper); - if(!Objects.isNull(updownGoodsEntity)){ - log.warn("#################moveTrayScanPackage: 包件已上架 orderPackageCode={}",orderPackageCode); - throw new CustomerException(403,"包件已上架"); + if (!Objects.isNull(updownGoodsEntity)) { + log.warn("#################moveTrayScanPackage: 包件已上架 orderPackageCode={}", orderPackageCode); + throw new CustomerException(403, "包件已上架"); } - DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode,warehouseId); - if(Objects.isNull(parcelListEntity)){ - log.warn("#################moveTrayScanPackage: 包件信息不存在 orderPackageCode={}",orderPackageCode); - throw new CustomerException(403,"包件信息不存在"); + DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode, warehouseId); + if (Objects.isNull(parcelListEntity)) { + log.warn("#################moveTrayScanPackage: 包件信息不存在 orderPackageCode={}", orderPackageCode); + throw new CustomerException(403, "包件信息不存在"); } Long wid = parcelListEntity.getWarehouseId(); - if(!wid.equals(warehouseId)){ - log.warn("#################moveTrayScanPackage: 包件不在当前仓 orderPackageCode={}",orderPackageCode); - throw new CustomerException(403,"包件不在当前仓"); + if (!wid.equals(warehouseId)) { + log.warn("#################moveTrayScanPackage: 包件不在当前仓 orderPackageCode={}", orderPackageCode); + throw new CustomerException(403, "包件不在当前仓"); } WarehouseTrayGoodsVO trayGoodsVO = new WarehouseTrayGoodsVO(); - BeanUtil.copy(trayGoodsEntity,trayGoodsVO); + BeanUtil.copy(trayGoodsEntity, trayGoodsVO); trayGoodsVO.setOrderCode(parcelListEntity.getOrderCode()); trayGoodsVO.setMaterialCode(parcelListEntity.getMaterialCode()); trayGoodsVO.setMaterialName(parcelListEntity.getMaterialName()); @@ -3636,26 +3637,26 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl trayGoodsIds,String trayCode,Long warehouseId) { + public R moveTrayPackages(List trayGoodsIds, String trayCode, Long warehouseId) { AtomicReference allNum = new AtomicReference<>(0); QueryWrapper trayTypeEntityQueryWrapper = new QueryWrapper<>(); - trayTypeEntityQueryWrapper.eq("tray_code",trayCode) - .eq("is_deleted",0); + trayTypeEntityQueryWrapper.eq("tray_code", trayCode) + .eq("is_deleted", 0); WarehouseTrayTypeEntity trayTypeEntity = baseMapper.selectOne(trayTypeEntityQueryWrapper); - if(!Objects.isNull(trayTypeEntity)){ + if (!Objects.isNull(trayTypeEntity)) { Long wid = trayTypeEntity.getWarehouseId(); - if(!wid.equals(warehouseId)){ - log.warn("#################moveTrayPackages: 托盘已在其他仓库打托 wid={} warehouseId={}",wid,warehouseId); - throw new CustomerException(403,"托盘已在其他仓库打托"); + if (!wid.equals(warehouseId)) { + log.warn("#################moveTrayPackages: 托盘已在其他仓库打托 wid={} warehouseId={}", wid, warehouseId); + throw new CustomerException(403, "托盘已在其他仓库打托"); } - }else{ + } else { Long firstTrayGoodsId = trayGoodsIds.get(0); WarehouseTrayGoodsEntity trayGoodsEntity = warehouseTrayGoodsService.getById(firstTrayGoodsId); Long trayTypeId = trayGoodsEntity.getTrayTypeId(); //如果托盘没有打托方式就以第一件货物的打托方式为准 WarehouseTrayTypeEntity oldTrayType = baseMapper.selectById(trayTypeId); WarehouseTrayTypeEntity newTrayType = new WarehouseTrayTypeEntity(); - BeanUtil.copy(oldTrayType,newTrayType); + BeanUtil.copy(oldTrayType, newTrayType); newTrayType.setId(null); newTrayType.setTotalNum(0); newTrayType.setOrderTotalNum(0); @@ -3667,9 +3668,9 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl orderPackageCodes = trayGoodsEntityList.stream().map(WarehouseTrayGoodsEntity::getAssociationValue).collect(Collectors.toList()); orderPackageCodes.forEach(orderPackageCode -> { //下托日志 - downPackageByOrderPackageCode(orderPackageCode,"移托:解除绑定",warehouseId); + downPackageByOrderPackageCode(orderPackageCode, "移托:解除绑定", warehouseId); moveTrayOrderPackageCode(finalTrayTypeEntity, orderPackageCode); @@ -3726,28 +3727,28 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl ls = new ArrayList<>(); //根据商场id和物料编码查询对应的库存品 - List stockListEntityList = distributionStockListClient.getListByMarketIdAndMaterialName(marketId, materialName,warehouseId); - if(Objects.isNull(stockListEntityList) || stockListEntityList.size() == 0){ - log.warn("################selectStockByMaterialNameAndMarketId: 库存品不存在 marketId={} materialName={}",marketId,materialName); - return R.fail(403,"库存品不存在"); + List stockListEntityList = distributionStockListClient.getListByMarketIdAndMaterialName(marketId, materialName, warehouseId); + if (Objects.isNull(stockListEntityList) || stockListEntityList.size() == 0) { + log.warn("################selectStockByMaterialNameAndMarketId: 库存品不存在 marketId={} materialName={}", marketId, materialName); + return R.fail(403, "库存品不存在"); } - for(DistributionStockListEntity stockListEntity:stockListEntityList){ + for (DistributionStockListEntity stockListEntity : stockListEntityList) { StockListVO stockListVO = new StockListVO(); - BeanUtil.copy(stockListEntity,stockListVO); + BeanUtil.copy(stockListEntity, stockListVO); Integer quantityStock = stockListEntity.getQuantityStock();//在数量 String incomingBatch = stockListEntity.getIncomingBatch(); String cargoNumber = stockListEntity.getCargoNumber(); - List updownGoodsByStock = warehouseUpdownGoodsService.getUpdownGoodsByStock(marketId,cargoNumber,incomingBatch,warehouseId); - List traynGoodsByStock = warehouseTrayGoodsService.getTrayGoodsByStockNoAllocationId(marketId,cargoNumber,incomingBatch,warehouseId); + List updownGoodsByStock = warehouseUpdownGoodsService.getUpdownGoodsByStock(marketId, cargoNumber, incomingBatch, warehouseId); + List traynGoodsByStock = warehouseTrayGoodsService.getTrayGoodsByStockNoAllocationId(marketId, cargoNumber, incomingBatch, warehouseId); updownGoodsByStock.addAll(traynGoodsByStock); - for (PositionVO positionVO:updownGoodsByStock){ + for (PositionVO positionVO : updownGoodsByStock) { Integer num = positionVO.getNum(); quantityStock = quantityStock - num; } @@ -3761,28 +3762,28 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl queryTrayTypeWrapper = new QueryWrapper<>(); - queryTrayTypeWrapper.eq("is_deleted",0) - .eq("tray_code",trayCode); + queryTrayTypeWrapper.eq("is_deleted", 0) + .eq("tray_code", trayCode); WarehouseTrayTypeEntity trayTypeEntity = baseMapper.selectOne(queryTrayTypeWrapper); - if(Objects.isNull(trayTypeEntity)){ + if (Objects.isNull(trayTypeEntity)) { //没有查询到托盘打托信息 return null; } @@ -3804,8 +3805,8 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl queryWrapper =new QueryWrapper<>(); - queryWrapper.eq("tray_type_id",trayTypeId); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("tray_type_id", trayTypeId); List goodsList = warehouseTrayGoodsService.list(queryWrapper); trayTypeDataVO.setGoodsLsit(goodsList); @@ -3841,14 +3842,14 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl queryTrayTypeWrapper = new QueryWrapper<>(); - queryTrayTypeWrapper.eq("is_deleted",0) - .eq("tray_code",trayCode); + queryTrayTypeWrapper.eq("is_deleted", 0) + .eq("tray_code", trayCode); WarehouseTrayTypeEntity trayTypeEntity = baseMapper.selectOne(queryTrayTypeWrapper); - if(Objects.isNull(trayTypeEntity)){ + if (Objects.isNull(trayTypeEntity)) { //没有查询到托盘打托信息 return null; } @@ -3874,9 +3875,9 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl queryWrapper =new QueryWrapper<>(); - queryWrapper.eq("tray_type_id",trayTypeId); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("tray_type_id", trayTypeId); List goodsList = warehouseTrayGoodsService.list(queryWrapper); trayTypeDataVO.setGoodsLsit(goodsList); @@ -3924,15 +3925,15 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl findAllGoodsByTrayCodeAndWarehouseId(String trayCode, Long warehouseId) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("tray_code",trayCode) - .eq("warehouse_id",warehouseId); + queryWrapper.eq("tray_code", trayCode) + .eq("warehouse_id", warehouseId); List list = warehouseTrayGoodsService.list(queryWrapper); List ls = new ArrayList<>(); - for (WarehouseTrayGoodsEntity trayGoodsEntity:list){ + for (WarehouseTrayGoodsEntity trayGoodsEntity : list) { JSONObject jsonObject = new JSONObject(); - jsonObject.put("associationType",trayGoodsEntity.getAssociationType()); - jsonObject.put("associationValue",trayGoodsEntity.getAssociationValue()); - jsonObject.put("num",trayGoodsEntity.getNum()); + jsonObject.put("associationType", trayGoodsEntity.getAssociationType()); + jsonObject.put("associationValue", trayGoodsEntity.getAssociationValue()); + jsonObject.put("num", trayGoodsEntity.getNum()); ls.add(jsonObject); } return ls; @@ -3942,28 +3943,26 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("tray_code",trayCode) - .eq("is_deleted",0); + queryWrapper.eq("tray_code", trayCode) + .eq("is_deleted", 0); WarehouseTrayTypeEntity trayTypeEntity = baseMapper.selectOne(queryWrapper); trayTypeEntity.setWarehouseId(warehouseId); updateById(trayTypeEntity); Long trayTypeId = trayTypeEntity.getId(); - warehouseTrayGoodsService.updeteWarehouseIdByTrayTypeId(trayTypeId,warehouseId); - - + warehouseTrayGoodsService.updeteWarehouseIdByTrayTypeId(trayTypeId, warehouseId); QueryWrapper trayGoodsEntityQueryWrapper = new QueryWrapper<>(); - trayGoodsEntityQueryWrapper.eq("tray_type_id",trayTypeId); + trayGoodsEntityQueryWrapper.eq("tray_type_id", trayTypeId); List trayGoodsEntities = warehouseTrayGoodsService.list(trayGoodsEntityQueryWrapper); List updateStockArticleList = new ArrayList<>(); @@ -3975,30 +3974,30 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl> map = trayGoodsEntities.stream().collect(Collectors.groupingBy(WarehouseTrayGoodsEntity::getAssociationType)); map.keySet().forEach(associationType -> { List warehouseTrayGoodsEntities = map.get(associationType); - if("1".equals(associationType)){ + if ("1".equals(associationType)) { //把warehouseTrayGoodsEntities中所有的associationId放入一个Set Set orderIdSet = warehouseTrayGoodsEntities.stream().map(WarehouseTrayGoodsEntity::getAssociationId).collect(Collectors.toSet()); List stockArticleEntityList = distributionStockArticleClient.findStockListByIds(new ArrayList<>(orderIdSet)); stockArticleEntityList.forEach(stockArticleEntity -> { String trays = stockArticleEntity.getTrays(); - if(!StringUtil.isBlank(trays)){ - if(trays.contains(palletName)){ + if (!StringUtil.isBlank(trays)) { + if (trays.contains(palletName)) { List list = Arrays.asList(trays.split(trays)); List trayList = new ArrayList<>(list); trayList.remove(palletName); - if(CollUtil.isNotEmpty(trayList)){ + if (CollUtil.isNotEmpty(trayList)) { DistributionStockArticleEntity updateStockArticle = new DistributionStockArticleEntity(); updateStockArticle.setId(stockArticleEntity.getId()); - updateStockArticle.setTrays(StringUtil.join(trayList.toArray(),",")); + updateStockArticle.setTrays(StringUtil.join(trayList.toArray(), ",")); updateStockArticleList.add(updateStockArticle); - }else{ + } else { clearStockArticleIdList.add(stockArticleEntity.getId()); } } } }); - }else if ("3".equals(associationType)){ + } else if ("3".equals(associationType)) { //把trayGoodsEntities中的所有元素的associationId放入一个List List orderPackageIdList = warehouseTrayGoodsEntities.stream().map(WarehouseTrayGoodsEntity::getAssociationId).collect(Collectors.toList()); @@ -4012,17 +4011,17 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl oldStockArticleList = distributionStockArticleClient.findStockListByIds(new ArrayList<>(stockArticleIdSet)); oldStockArticleList.forEach(stockArticleEntity -> { String trays = stockArticleEntity.getTrays(); - if(!StringUtil.isBlank(trays)){ - if(trays.contains(palletName)){ + if (!StringUtil.isBlank(trays)) { + if (trays.contains(palletName)) { List list = Arrays.asList(trays.split(trays)); List trayList = new ArrayList<>(list); trayList.remove(palletName); - if(CollUtil.isNotEmpty(trayList)){ + if (CollUtil.isNotEmpty(trayList)) { DistributionStockArticleEntity updateStockArticle = new DistributionStockArticleEntity(); updateStockArticle.setId(stockArticleEntity.getId()); - updateStockArticle.setTrays(StringUtil.join(trayList.toArray(),",")); + updateStockArticle.setTrays(StringUtil.join(trayList.toArray(), ",")); updateStockArticleList.add(updateStockArticle); - }else{ + } else { clearStockArticleIdList.add(stockArticleEntity.getId()); } } @@ -4054,7 +4053,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl orderCodeSet = warehouseTrayGoodsEntities.stream().map(WarehouseTrayGoodsEntity::getAssociationValue).collect(Collectors.toSet()); FindParamterDTO findParamterDTO = new FindParamterDTO(); @@ -4063,23 +4062,23 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl stockArticleEntityList = distributionStockArticleClient.findListByOrderCodesAndWarehouseId(findParamterDTO); stockArticleEntityList.forEach(stockArticleEntity -> { WarehouseTrayGoodsEntity warehouseTrayGoodsEntity = warehouseTrayGoodsMap.get(stockArticleEntity.getOrderCode()); - if(!Objects.isNull(warehouseTrayGoodsEntity)){ + if (!Objects.isNull(warehouseTrayGoodsEntity)) { warehouseTrayGoodsEntity.setAssociationId(stockArticleEntity.getId()); warehouseTrayGoodsEntity.setWarehouseId(warehouseId); updateTrayGoodsList.add(warehouseTrayGoodsEntity); } String trays = stockArticleEntity.getTrays(); - if(!StringUtil.isBlank(trays)){ - if(!trays.contains(palletName)){ + if (!StringUtil.isBlank(trays)) { + if (!trays.contains(palletName)) { List list = Arrays.asList(trays.split(trays)); List trayList = new ArrayList<>(list); trayList.add(palletName); DistributionStockArticleEntity updateStockArticle = new DistributionStockArticleEntity(); updateStockArticle.setId(stockArticleEntity.getId()); - updateStockArticle.setTrays(StringUtil.join(trayList.toArray(),",")); + updateStockArticle.setTrays(StringUtil.join(trayList.toArray(), ",")); updateStockArticleList.add(updateStockArticle); } - }else{ + } else { DistributionStockArticleEntity updateStockArticle = new DistributionStockArticleEntity(); updateStockArticle.setId(stockArticleEntity.getId()); updateStockArticle.setTrays(palletName); @@ -4087,7 +4086,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl orderPackageCodeSet = warehouseTrayGoodsEntities.stream().map(WarehouseTrayGoodsEntity::getAssociationValue).collect(Collectors.toSet()); @@ -4106,7 +4105,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl { DistributionParcelListEntity parcelList = parcelListEntityMap.get(warehouseTrayGoodsEntity.getAssociationValue()); - if(!Objects.isNull(parcelList)){ + if (!Objects.isNull(parcelList)) { warehouseTrayGoodsEntity.setAssociationId(parcelList.getId()); warehouseTrayGoodsEntity.setWarehouseId(warehouseId); updateTrayGoodsList.add(warehouseTrayGoodsEntity); @@ -4127,17 +4126,17 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl stockArticleEntityList = distributionStockArticleClient.findListByOrderCodesAndWarehouseId(findParamterDTO); stockArticleEntityList.forEach(stockArticleEntity -> { String trays = stockArticleEntity.getTrays(); - if(!StringUtil.isBlank(trays)){ - if(trays.contains(palletName)){ + if (!StringUtil.isBlank(trays)) { + if (trays.contains(palletName)) { List list = Arrays.asList(trays.split(trays)); List trayList = new ArrayList<>(list); trayList.remove(palletName); - if(CollUtil.isNotEmpty(trayList)){ + if (CollUtil.isNotEmpty(trayList)) { DistributionStockArticleEntity updateStockArticle = new DistributionStockArticleEntity(); updateStockArticle.setId(stockArticleEntity.getId()); - updateStockArticle.setTrays(StringUtil.join(trayList.toArray(),",")); + updateStockArticle.setTrays(StringUtil.join(trayList.toArray(), ",")); updateStockArticleList.add(updateStockArticle); - }else{ + } else { clearStockArticleIdList.add(stockArticleEntity.getId()); } } @@ -4146,21 +4145,21 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("tray_code",trayCode) - .eq("is_deleted",0); + queryWrapper.eq("tray_code", trayCode) + .eq("is_deleted", 0); WarehouseTrayTypeEntity trayTypeEntity = baseMapper.selectOne(queryWrapper); - if(Objects.isNull(trayTypeEntity)){ + if (Objects.isNull(trayTypeEntity)) { trayTypeVO.setTrayName(trayEntity.getPalletName()); trayTypeVO.setTrayCode(trayCode); trayTypeVO.setTotalNum(0); @@ -4197,10 +4196,10 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl map = new HashMap<>(); + Map map = new HashMap<>(); //查询所有托盘包件信息 Set set = new TreeSet<>(); List orderPackageList = new ArrayList<>(); List trayScanDesEntityList = trayScanDesClient.findListByTrayId(trayId, oldWarehouseId); - if(trayScanDesEntityList.size() == 0){ + if (trayScanDesEntityList.size() == 0) { return R.data(map); } Integer trayScanId = null; @@ -4248,41 +4246,41 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl list = baseMapper.findOrderPackageList(orderPackageList); - map.put("packageList",list); - map.put("trayType",newTrayType); - map.put("trayTypeName",value); - map.put("trayCode",trayCode); - map.put("trayName",trayEntity.getPalletName()); + map.put("packageList", list); + map.put("trayType", newTrayType); + map.put("trayTypeName", value); + map.put("trayCode", trayCode); + map.put("trayName", trayEntity.getPalletName()); return R.data(map); } @Override - public R syncOldTrayData(String trayCode ,String trayType, List orderPackageCodes, Long warehouseId,String remark) { + public R syncOldTrayData(String trayCode, String trayType, List orderPackageCodes, Long warehouseId, String remark) { - try{ + try { //先空置托盘 - trayToNull(trayCode,remark); - }catch (Exception e){ + trayToNull(trayCode, remark); + } catch (Exception e) { log.warn("##############syncOldTrayData: 空置失败"); } @@ -4315,9 +4313,9 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl parcelListEntityList = distributionParcelListClient.findListByOrderPackageCodeList(findParamterDTO); - if(parcelListEntityList.isEmpty()){ + if (parcelListEntityList.isEmpty()) { log.warn("##############syncOldTrayData: 包件数据不存在"); - return R.fail(405,"没有可以同步的包件"); + return R.fail(405, "没有可以同步的包件"); } DistributionParcelListEntity parcelListEntity = parcelListEntityList.get(0); @@ -4327,7 +4325,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("tray_code",trayCode) - .eq("warehouse_id",warehouseId); + queryWrapper.eq("tray_code", trayCode) + .eq("warehouse_id", warehouseId); WarehouseTrayTypeEntity trayTypeEntity = baseMapper.selectOne(queryWrapper); - if(Objects.isNull(trayTypeEntity)){ - log.warn("#################findTrayData: 托盘未有打托数据 trayCode={}",trayCode); - return R.fail(405,"托盘未有打托数据"); + if (Objects.isNull(trayTypeEntity)) { + log.warn("#################findTrayData: 托盘未有打托数据 trayCode={}", trayCode); + return R.fail(405, "托盘未有打托数据"); } BasicdataTrayEntity trayEntity = basicdataTrayClient.getTrayByTrayCode(trayCode); //查询托盘货物 - List packageList = warehouseTrayGoodsService.findPackageDetailList(trayCode,warehouseId); - List zeroOrderList = warehouseTrayGoodsService.findZeroOrderDetailList(trayCode,warehouseId); - List stockOrderList = warehouseTrayGoodsService.findStockOrderDetailList(trayCode,warehouseId); + List packageList = warehouseTrayGoodsService.findPackageDetailList(trayCode, warehouseId); + List zeroOrderList = warehouseTrayGoodsService.findZeroOrderDetailList(trayCode, warehouseId); + List stockOrderList = warehouseTrayGoodsService.findStockOrderDetailList(trayCode, warehouseId); - Map map = new HashMap<>(); - map.put("trayTyprInfo",trayTypeEntity); - map.put("trayEntity",trayEntity); - map.put("packageList",packageList); - map.put("zeroOrderList",zeroOrderList); - map.put("stockOrderList",stockOrderList); + Map map = new HashMap<>(); + map.put("trayTyprInfo", trayTypeEntity); + map.put("trayEntity", trayEntity); + map.put("packageList", packageList); + map.put("zeroOrderList", zeroOrderList); + map.put("stockOrderList", stockOrderList); return R.data(map); } @@ -4371,31 +4369,31 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl updownGoodsEntities = warehouseUpdownGoodsService.getUpdownGoodsByZeroOrderId(orderId,warehouseId); - //查询在托盘上还未进行上架的零担订单信息 - List trayGoodsEntities = warehouseTrayGoodsService.getTrayGoodsByZeroOrderIdNoAllocationId(orderId,warehouseId); - updownGoodsEntities.addAll(trayGoodsEntities); - for (PositionVO positionVO:updownGoodsEntities){ - Integer num = positionVO.getNum(); - residueNum = residueNum - num; - } - if (residueNum == 0){ - //无可用数量，说明该零担订单此时处于上架和在托的情况 - return 0; - }else if (residueNum > 0){ - return residueNum; - }else { - //出现脏数据的情况 - log.error("此零担订单数据错误,需要维护数据,订单ID:{}",orderId); - return -1; - } + //总数 + Integer orderTotalNum = zeroOrderByWaybillCode.getOrderTotalNum(); + // + Integer residueNum = orderTotalNum; + //查询该零担的库位数据 + List updownGoodsEntities = warehouseUpdownGoodsService.getUpdownGoodsByZeroOrderId(orderId, warehouseId); + //查询在托盘上还未进行上架的零担订单信息 + List trayGoodsEntities = warehouseTrayGoodsService.getTrayGoodsByZeroOrderIdNoAllocationId(orderId, warehouseId); + updownGoodsEntities.addAll(trayGoodsEntities); + for (PositionVO positionVO : updownGoodsEntities) { + Integer num = positionVO.getNum(); + residueNum = residueNum - num; + } + if (residueNum == 0) { + //无可用数量，说明该零担订单此时处于上架和在托的情况 + return 0; + } else if (residueNum > 0) { + return residueNum; + } else { + //出现脏数据的情况 + log.error("此零担订单数据错误,需要维护数据,订单ID:{}", orderId); + return -1; + } } @@ -4413,11 +4411,11 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl orderDetailList = orderDetailClient.findByOrderCode(orderCode,oldWarehouseId); - for (OrderDetailEntity orderDetailEntity:orderDetailList){ + List orderDetailList = orderDetailClient.findByOrderCode(orderCode, oldWarehouseId); + for (OrderDetailEntity orderDetailEntity : orderDetailList) { String unitNo = orderDetailEntity.getUnitNo(); - DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(unitNo,basicdataWarehouseEntity.getId()); - if(!Objects.isNull(parcelListEntity)){ - log.info("###########saveOrderPackage: 包条已存在，不同步 unitNo={}",unitNo); + DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(unitNo, basicdataWarehouseEntity.getId()); + if (!Objects.isNull(parcelListEntity)) { + log.info("###########saveOrderPackage: 包条已存在，不同步 unitNo={}", unitNo); continue; } @@ -4588,7 +4586,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl>>>>>> 查询客户的配送类型{}", basicdataStoreBusinessEntity); - if(ObjectUtil.isEmpty(basicdataStoreBusinessEntity)){ + if (ObjectUtil.isEmpty(basicdataStoreBusinessEntity)) { return null; } return basicdataStoreBusinessEntity.getMold(); @@ -4764,8 +4761,8 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl waybillOrderList = waybillOrderClient.findListByWaybillNo(waybillNo); - if(waybillOrderList.isEmpty()){ + if (waybillOrderList.isEmpty()) { //没有关联订单数据 //查老系统的运单关联哪些订单 List advanceIds = wayBillClient.findAdvanceIdsByWaybillNo(waybillNo); - if(advanceIds.isEmpty()){ - log.warn("#############saveAdvanceData: 老系统运单未有关联订单 waybillNo={}",waybillNo); - throw new CustomerException(405,"老系统运单未有关联订单"); + if (advanceIds.isEmpty()) { + log.warn("#############saveAdvanceData: 老系统运单未有关联订单 waybillNo={}", waybillNo); + throw new CustomerException(405, "老系统运单未有关联订单"); } List advanceList = advanceClient.findListByAdvanceIds(advanceIds); for (AdvanceEntity advanceEntity : advanceList) { @@ -4951,31 +4948,31 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl orderPackageCodes = new ArrayList<>(); orderPackageCodes.add(orderPackageCode); - jsonObject.put("orderPackageCodes",orderPackageCodes); - jsonObject.put("warehouseId",wid); - jsonObject.put("trayName",trayName); + jsonObject.put("orderPackageCodes", orderPackageCodes); + jsonObject.put("warehouseId", wid); + jsonObject.put("trayName", trayName); FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.warehouse.TRAYTYPE.EXCHANGE).msg(jsonObject.toJSONString()).build(); sendFanoutService.sendFanoutMsg(fanoutMsg); - if(CollUtil.isNotEmpty(orderPackageCodes)){ + if (CollUtil.isNotEmpty(orderPackageCodes)) { BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(wid); String warehouseName = warehouseEntity.getName(); - String content = "包件在 "+warehouseName+" 打托，托盘 "+trayName; - warehousePackageTrackLogService.addBatchLog(orderPackageCodes,content,wid,warehouseName,AuthUtil.getNickName(), WorkNodeEnums.SORTING_TRAYS.getCode()); + String content = "包件在 " + warehouseName + " 打托，托盘 " + trayName; + warehousePackageTrackLogService.addBatchLog(orderPackageCodes, content, wid, warehouseName, AuthUtil.getNickName(), WorkNodeEnums.SORTING_TRAYS.getCode()); } - - }catch (Exception e){ + } catch (Exception e) { log.warn("###########saveTrayTypeByOrderPackageCode: 发送打托广播失败"); } @@ -5169,8 +5165,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl sourceTrayGoodsList) { + private void copyTrayGoodsToTargetTray(WarehouseTrayTypeEntity targetTrayTypeEntity, List sourceTrayGoodsList) { String type = targetTrayTypeEntity.getType();//数据类型 Long warehouseId = targetTrayTypeEntity.getWarehouseId(); @@ -5182,18 +5177,18 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl> map = sourceTrayGoodsList.stream().collect(Collectors.groupingBy(WarehouseTrayGoodsEntity::getAssociationType)); - map.keySet().forEach(associationType->{ + map.keySet().forEach(associationType -> { List trayGoodsEntities = map.get(associationType); - if("1".equals(associationType)){ + if ("1".equals(associationType)) { List orderCodes = trayGoodsEntities.stream().map(WarehouseTrayGoodsEntity::getAssociationValue).collect(Collectors.toList()); JSONObject jsonObject = new JSONObject(); - jsonObject.put("dataType",2); - jsonObject.put("operation",1); - jsonObject.put("orderCodes",orderCodes); - jsonObject.put("warehouseId",warehouseId); - jsonObject.put("trayName",trayName); + jsonObject.put("dataType", 2); + jsonObject.put("operation", 1); + jsonObject.put("orderCodes", orderCodes); + jsonObject.put("warehouseId", warehouseId); + jsonObject.put("trayName", trayName); FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.warehouse.TRAYTYPE.EXCHANGE).msg(jsonObject.toJSONString()).build(); sendFanoutService.sendFanoutMsg(fanoutMsg); - }else if("3".equals(associationType)){ + } else if ("3".equals(associationType)) { //获取trayGoodsEntities所有元素的associationValue放入一个List集合 List orderPackageCodes = trayGoodsEntities.stream().map(WarehouseTrayGoodsEntity::getAssociationValue).collect(Collectors.toList()); @@ -5272,44 +5267,44 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl { List ls = parcelListEntityMap.get(conditions); JSONObject jsonObject = new JSONObject(); - jsonObject.put("dataType",1); - jsonObject.put("conditions",conditions); - jsonObject.put("operation",1); + jsonObject.put("dataType", 1); + jsonObject.put("conditions", conditions); + jsonObject.put("operation", 1); //把ls中所有元素的orderPackageCode装入一个Set中 List orderPackageCodeSet = ls.stream().map(DistributionParcelListEntity::getOrderPackageCode).collect(Collectors.toList()); - jsonObject.put("orderPackageCodes",orderPackageCodeSet); + jsonObject.put("orderPackageCodes", orderPackageCodeSet); jsonObject.put("warehouseId", finalWarehouseId); FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.warehouse.TRAYTYPE.EXCHANGE).msg(jsonObject.toJSONString()).build(); sendFanoutService.sendFanoutMsg(fanoutMsg); - if(CollUtil.isNotEmpty(orderPackageCodeSet)){ + if (CollUtil.isNotEmpty(orderPackageCodeSet)) { BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(finalWarehouseId); String warehouseName = warehouseEntity.getName(); - String content = "包件在 "+warehouseName+" 打托，托盘 "+trayName; - warehousePackageTrackLogService.addBatchLog(orderPackageCodeSet,content,finalWarehouseId,warehouseName,AuthUtil.getNickName(), WorkNodeEnums.SORTING_TRAYS.getCode()); + String content = "包件在 " + warehouseName + " 打托，托盘 " + trayName; + warehousePackageTrackLogService.addBatchLog(orderPackageCodeSet, content, finalWarehouseId, warehouseName, AuthUtil.getNickName(), WorkNodeEnums.SORTING_TRAYS.getCode()); } }); - }else if("4".equals(associationType)){ + } else if ("4".equals(associationType)) { List stockListIds = new ArrayList<>(); trayGoodsEntities.forEach(trayGoodsEntity -> { String materialCode = trayGoodsEntity.getAssociationValue(); String incomingBatch = trayGoodsEntity.getIncomingBatch(); Long marketId = trayGoodsEntity.getMarketId(); DistributionStockListEntity stockListEntity = distributionStockListClient.getEntityByMarketIdAndMaterialCodeAndIncomingBatch(marketId, materialCode, incomingBatch, warehouseId); - if(!Objects.isNull(stockListEntity)){ + if (!Objects.isNull(stockListEntity)) { stockListIds.add(stockListEntity.getId()); } }); JSONObject jsonObject = new JSONObject(); - jsonObject.put("dataType",3); - jsonObject.put("operation",1); - jsonObject.put("stockListIds",stockListIds); - jsonObject.put("warehouseId",warehouseId); - jsonObject.put("trayName",trayName); + jsonObject.put("dataType", 3); + jsonObject.put("operation", 1); + jsonObject.put("stockListIds", stockListIds); + jsonObject.put("warehouseId", warehouseId); + jsonObject.put("trayName", trayName); FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.warehouse.TRAYTYPE.EXCHANGE).msg(jsonObject.toJSONString()).build(); @@ -5318,34 +5313,34 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl sourceTrayGoodsList, Long filterId, String filterValue,WarehouseTrayTypeEntity targetTrayTypeEntity) { + private void panduanStockByMaterialId(List sourceTrayGoodsList, Long filterId, String filterValue, WarehouseTrayTypeEntity targetTrayTypeEntity) { Long trayId = targetTrayTypeEntity.getTrayId(); String trayCode = targetTrayTypeEntity.getTrayCode(); Long trayTypeId = targetTrayTypeEntity.getId(); List addList = new ArrayList<>(); - for (WarehouseTrayGoodsEntity trayGoodsEntity:sourceTrayGoodsList){ + for (WarehouseTrayGoodsEntity trayGoodsEntity : sourceTrayGoodsList) { Long associationId = trayGoodsEntity.getAssociationId(); String associationValue = trayGoodsEntity.getAssociationValue(); Long marketId = trayGoodsEntity.getMarketId(); String incomingBatch = trayGoodsEntity.getIncomingBatch(); Integer newNum = trayGoodsEntity.getNum(); QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("association_id",associationId) - .eq("association_value",associationValue) - .eq("market_id",marketId) - .eq("incoming_batch",incomingBatch) - .eq("tray_type_id",trayTypeId); + queryWrapper.eq("association_id", associationId) + .eq("association_value", associationValue) + .eq("market_id", marketId) + .eq("incoming_batch", incomingBatch) + .eq("tray_type_id", trayTypeId); WarehouseTrayGoodsEntity oldTrayGoodsEntity = warehouseTrayGoodsService.getOne(queryWrapper); - if(!Objects.isNull(oldTrayGoodsEntity)){ + if (!Objects.isNull(oldTrayGoodsEntity)) { Integer num = oldTrayGoodsEntity.getNum(); - oldTrayGoodsEntity.setNum(num+newNum); + oldTrayGoodsEntity.setNum(num + newNum); warehouseTrayGoodsService.updateById(oldTrayGoodsEntity); // addList.add(oldTrayGoodsEntity); // sourceTrayGoodsList.remove(trayGoodsEntity); @@ -5353,7 +5348,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl sourceTrayGoodsList, Long filterId, String filterValue,WarehouseTrayTypeEntity targetTrayTypeEntity) { + private void panduanStockByMaterialName(List sourceTrayGoodsList, Long filterId, String filterValue, WarehouseTrayTypeEntity targetTrayTypeEntity) { Long trayId = targetTrayTypeEntity.getTrayId(); String trayCode = targetTrayTypeEntity.getTrayCode(); Long trayTypeId = targetTrayTypeEntity.getId(); List addList = new ArrayList<>(); - for (WarehouseTrayGoodsEntity trayGoodsEntity:sourceTrayGoodsList){ + for (WarehouseTrayGoodsEntity trayGoodsEntity : sourceTrayGoodsList) { Long associationId = trayGoodsEntity.getAssociationId(); String associationValue = trayGoodsEntity.getAssociationValue(); Long marketId = trayGoodsEntity.getMarketId(); String incomingBatch = trayGoodsEntity.getIncomingBatch(); Integer newNum = trayGoodsEntity.getNum(); QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("association_id",associationId) - .eq("association_value",associationValue) - .eq("market_id",marketId) - .eq("incoming_batch",incomingBatch) - .eq("tray_type_id",trayTypeId); + queryWrapper.eq("association_id", associationId) + .eq("association_value", associationValue) + .eq("market_id", marketId) + .eq("incoming_batch", incomingBatch) + .eq("tray_type_id", trayTypeId); WarehouseTrayGoodsEntity oldTrayGoodsEntity = warehouseTrayGoodsService.getOne(queryWrapper); - if(!Objects.isNull(oldTrayGoodsEntity)){ + if (!Objects.isNull(oldTrayGoodsEntity)) { Integer num = oldTrayGoodsEntity.getNum(); - oldTrayGoodsEntity.setNum(num+newNum); + oldTrayGoodsEntity.setNum(num + newNum); warehouseTrayGoodsService.updateById(oldTrayGoodsEntity); // addList.add(oldTrayGoodsEntity); // sourceTrayGoodsList.remove(trayGoodsEntity); @@ -5391,7 +5386,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl sourceTrayGoodsList, Long filterId, String filterValue,WarehouseTrayTypeEntity targetTrayTypeEntity) { + private void panduanZeroByOrderCode(List sourceTrayGoodsList, Long filterId, String filterValue, WarehouseTrayTypeEntity targetTrayTypeEntity) { Long trayId = targetTrayTypeEntity.getTrayId(); String trayCode = targetTrayTypeEntity.getTrayCode(); Long trayTypeId = targetTrayTypeEntity.getId(); List addList = new ArrayList<>(); - for (WarehouseTrayGoodsEntity trayGoodsEntity:sourceTrayGoodsList){ + for (WarehouseTrayGoodsEntity trayGoodsEntity : sourceTrayGoodsList) { Long associationId = trayGoodsEntity.getAssociationId(); String associationValue = trayGoodsEntity.getAssociationValue(); Integer newNum = trayGoodsEntity.getNum(); QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("association_id",associationId) - .eq("association_value",associationValue) - .eq("tray_type_id",trayTypeId); + queryWrapper.eq("association_id", associationId) + .eq("association_value", associationValue) + .eq("tray_type_id", trayTypeId); WarehouseTrayGoodsEntity oldTrayGoodsEntity = warehouseTrayGoodsService.getOne(queryWrapper); - if(!Objects.isNull(oldTrayGoodsEntity)){ + if (!Objects.isNull(oldTrayGoodsEntity)) { Integer num = oldTrayGoodsEntity.getNum(); - oldTrayGoodsEntity.setNum(num+newNum); + oldTrayGoodsEntity.setNum(num + newNum); warehouseTrayGoodsService.updateById(oldTrayGoodsEntity); // addList.add(oldTrayGoodsEntity); // sourceTrayGoodsList.remove(trayGoodsEntity); @@ -5427,7 +5422,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl sourceTrayGoodsList, Long filterId, String filterValue,WarehouseTrayTypeEntity targetTrayTypeEntity) { + private void panduanZeroByWaybillNo(List sourceTrayGoodsList, Long filterId, String filterValue, WarehouseTrayTypeEntity targetTrayTypeEntity) { Long trayId = targetTrayTypeEntity.getTrayId(); String trayCode = targetTrayTypeEntity.getTrayCode(); Long trayTypeId = targetTrayTypeEntity.getId(); List addList = new ArrayList<>(); - for (WarehouseTrayGoodsEntity trayGoodsEntity:sourceTrayGoodsList){ + for (WarehouseTrayGoodsEntity trayGoodsEntity : sourceTrayGoodsList) { Long associationId = trayGoodsEntity.getAssociationId(); String associationValue = trayGoodsEntity.getAssociationValue(); Integer newNum = trayGoodsEntity.getNum(); QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("association_id",associationId) - .eq("association_value",associationValue) - .eq("tray_type_id",trayTypeId); + queryWrapper.eq("association_id", associationId) + .eq("association_value", associationValue) + .eq("tray_type_id", trayTypeId); WarehouseTrayGoodsEntity oldTrayGoodsEntity = warehouseTrayGoodsService.getOne(queryWrapper); - if(!Objects.isNull(oldTrayGoodsEntity)){ + if (!Objects.isNull(oldTrayGoodsEntity)) { Integer num = oldTrayGoodsEntity.getNum(); - oldTrayGoodsEntity.setNum(num+newNum); + oldTrayGoodsEntity.setNum(num + newNum); warehouseTrayGoodsService.updateById(oldTrayGoodsEntity); // addList.add(oldTrayGoodsEntity); // sourceTrayGoodsList.remove(trayGoodsEntity); @@ -5464,7 +5459,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl sourceTrayGoodsList, Long filterId, String filterValue,WarehouseTrayTypeEntity targetTrayTypeEntity) { + private void panduanPackageByWarehouse(List sourceTrayGoodsList, Long filterId, String filterValue, WarehouseTrayTypeEntity targetTrayTypeEntity) { Long trayId = targetTrayTypeEntity.getTrayId(); String trayCode = targetTrayTypeEntity.getTrayCode(); Long trayTypeId = targetTrayTypeEntity.getId(); - for (WarehouseTrayGoodsEntity trayGoodsEntity:sourceTrayGoodsList){ + for (WarehouseTrayGoodsEntity trayGoodsEntity : sourceTrayGoodsList) { String orderPackageCode = trayGoodsEntity.getAssociationValue(); - log.info("#################panduanPackageByWarehouse: 当前处理的包条 {}",orderPackageCode); - DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode,targetTrayTypeEntity.getWarehouseId()); - if(Objects.isNull(parcelListEntity)){ - log.info("#################panduanPackageByWarehouse: 包件信息不存在 {}",orderPackageCode); + log.info("#################panduanPackageByWarehouse: 当前处理的包条 {}", orderPackageCode); + DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode, targetTrayTypeEntity.getWarehouseId()); + if (Objects.isNull(parcelListEntity)) { + log.info("#################panduanPackageByWarehouse: 包件信息不存在 {}", orderPackageCode); continue; } Long stockArticleId = parcelListEntity.getStockArticleId(); DistributionStockArticleEntity stockArticleEntity = distributionStockArticleClient.findEntityByStockArticleId(stockArticleId); - if(Objects.isNull(stockArticleEntity)){ - log.info("#################panduanPackageByWarehouse: 订单信息不存在 {}",orderPackageCode); + if (Objects.isNull(stockArticleEntity)) { + log.info("#################panduanPackageByWarehouse: 订单信息不存在 {}", orderPackageCode); continue; } String warehouse = stockArticleEntity.getWarehouse(); - if(!warehouse.equals(filterValue)){ + if (!warehouse.equals(filterValue)) { trayGoodsEntity.setIsFleeing("1"); } trayGoodsEntity.setTrayId(trayId); @@ -5502,27 +5497,27 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl sourceTrayGoodsList, Long filterId, String filterValue,WarehouseTrayTypeEntity targetTrayTypeEntity) { + private void panduanPackageByCustomer(List sourceTrayGoodsList, Long filterId, String filterValue, WarehouseTrayTypeEntity targetTrayTypeEntity) { Long trayId = targetTrayTypeEntity.getTrayId(); String trayCode = targetTrayTypeEntity.getTrayCode(); Long trayTypeId = targetTrayTypeEntity.getId(); - for (WarehouseTrayGoodsEntity trayGoodsEntity:sourceTrayGoodsList){ + for (WarehouseTrayGoodsEntity trayGoodsEntity : sourceTrayGoodsList) { String orderPackageCode = trayGoodsEntity.getAssociationValue(); - log.info("#################panduanPackageByCustomer: 当前处理的包条 {}",orderPackageCode); - DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode,targetTrayTypeEntity.getWarehouseId()); - if(Objects.isNull(parcelListEntity)){ - log.info("#################panduanPackageByCustomer: 包件信息不存在 {}",orderPackageCode); + log.info("#################panduanPackageByCustomer: 当前处理的包条 {}", orderPackageCode); + DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode, targetTrayTypeEntity.getWarehouseId()); + if (Objects.isNull(parcelListEntity)) { + log.info("#################panduanPackageByCustomer: 包件信息不存在 {}", orderPackageCode); continue; } Long stockArticleId = parcelListEntity.getStockArticleId(); DistributionStockArticleEntity stockArticleEntity = distributionStockArticleClient.findEntityByStockArticleId(stockArticleId); - if(Objects.isNull(stockArticleEntity)){ - log.info("#################panduanPackageByCustomer: 订单信息不存在 {}",orderPackageCode); + if (Objects.isNull(stockArticleEntity)) { + log.info("#################panduanPackageByCustomer: 订单信息不存在 {}", orderPackageCode); continue; } String customerName = stockArticleEntity.getCustomerName(); String customerTelephone = stockArticleEntity.getCustomerTelephone(); - if(!filterValue.equals(customerName+customerTelephone)){ + if (!filterValue.equals(customerName + customerTelephone)) { trayGoodsEntity.setIsFleeing("1"); } trayGoodsEntity.setTrayId(trayId); @@ -5531,26 +5526,26 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl sourceTrayGoodsList, Long filterId, String filterValue,WarehouseTrayTypeEntity targetTrayTypeEntity) { + private void panduanPackageByStore(List sourceTrayGoodsList, Long filterId, String filterValue, WarehouseTrayTypeEntity targetTrayTypeEntity) { Long trayId = targetTrayTypeEntity.getTrayId(); String trayCode = targetTrayTypeEntity.getTrayCode(); Long trayTypeId = targetTrayTypeEntity.getId(); - for (WarehouseTrayGoodsEntity trayGoodsEntity:sourceTrayGoodsList){ + for (WarehouseTrayGoodsEntity trayGoodsEntity : sourceTrayGoodsList) { String orderPackageCode = trayGoodsEntity.getAssociationValue(); - log.info("#################panduanPackageByStore: 当前处理的包条 {}",orderPackageCode); - DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode,targetTrayTypeEntity.getWarehouseId()); - if(Objects.isNull(parcelListEntity)){ - log.info("#################panduanPackageByStore: 包件信息不存在 {}",orderPackageCode); + log.info("#################panduanPackageByStore: 当前处理的包条 {}", orderPackageCode); + DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode, targetTrayTypeEntity.getWarehouseId()); + if (Objects.isNull(parcelListEntity)) { + log.info("#################panduanPackageByStore: 包件信息不存在 {}", orderPackageCode); continue; } Long stockArticleId = parcelListEntity.getStockArticleId(); DistributionStockArticleEntity stockArticleEntity = distributionStockArticleClient.findEntityByStockArticleId(stockArticleId); - if(Objects.isNull(stockArticleEntity)){ - log.info("#################panduanPackageByStore: 订单信息不存在 {}",orderPackageCode); + if (Objects.isNull(stockArticleEntity)) { + log.info("#################panduanPackageByStore: 订单信息不存在 {}", orderPackageCode); continue; } String storeName = stockArticleEntity.getStoreName(); - if(!storeName.equals(filterValue)){ + if (!storeName.equals(filterValue)) { trayGoodsEntity.setIsFleeing("1"); } trayGoodsEntity.setTrayId(trayId); @@ -5559,26 +5554,26 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl sourceTrayGoodsList, Long filterId, String filterValue,WarehouseTrayTypeEntity targetTrayTypeEntity) { + private void panduanPackageByMarket(List sourceTrayGoodsList, Long filterId, String filterValue, WarehouseTrayTypeEntity targetTrayTypeEntity) { Long trayId = targetTrayTypeEntity.getTrayId(); String trayCode = targetTrayTypeEntity.getTrayCode(); Long trayTypeId = targetTrayTypeEntity.getId(); - for (WarehouseTrayGoodsEntity trayGoodsEntity:sourceTrayGoodsList){ + for (WarehouseTrayGoodsEntity trayGoodsEntity : sourceTrayGoodsList) { String orderPackageCode = trayGoodsEntity.getAssociationValue(); - log.info("#################panduanPackageByMarket: 当前处理的包条 {}",orderPackageCode); - DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode,targetTrayTypeEntity.getWarehouseId()); - if(Objects.isNull(parcelListEntity)){ - log.info("#################panduanPackageByMarket: 包件信息不存在 {}",orderPackageCode); + log.info("#################panduanPackageByMarket: 当前处理的包条 {}", orderPackageCode); + DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode, targetTrayTypeEntity.getWarehouseId()); + if (Objects.isNull(parcelListEntity)) { + log.info("#################panduanPackageByMarket: 包件信息不存在 {}", orderPackageCode); continue; } Long stockArticleId = parcelListEntity.getStockArticleId(); DistributionStockArticleEntity stockArticleEntity = distributionStockArticleClient.findEntityByStockArticleId(stockArticleId); - if(Objects.isNull(stockArticleEntity)){ - log.info("#################panduanPackageByMarket: 订单信息不存在 {}",orderPackageCode); + if (Objects.isNull(stockArticleEntity)) { + log.info("#################panduanPackageByMarket: 订单信息不存在 {}", orderPackageCode); continue; } String mallName = stockArticleEntity.getMallName(); - if(!mallName.equals(filterValue)){ + if (!mallName.equals(filterValue)) { trayGoodsEntity.setIsFleeing("1"); } trayGoodsEntity.setTrayId(trayId); @@ -5587,20 +5582,20 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl sourceTrayGoodsList, Long filterId, String filterValue,WarehouseTrayTypeEntity targetTrayTypeEntity) { + private void panduanPackageByOrderCode(List sourceTrayGoodsList, Long filterId, String filterValue, WarehouseTrayTypeEntity targetTrayTypeEntity) { Long trayId = targetTrayTypeEntity.getTrayId(); String trayCode = targetTrayTypeEntity.getTrayCode(); Long trayTypeId = targetTrayTypeEntity.getId(); - for (WarehouseTrayGoodsEntity trayGoodsEntity:sourceTrayGoodsList){ + for (WarehouseTrayGoodsEntity trayGoodsEntity : sourceTrayGoodsList) { String orderPackageCode = trayGoodsEntity.getAssociationValue(); - log.info("#################panduanPackageByOrderCode: 当前处理的包条 {}",orderPackageCode); - DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode,targetTrayTypeEntity.getWarehouseId()); - if(Objects.isNull(parcelListEntity)){ - log.info("#################panduanPackageByOrderCode: 包件信息不存在 {}",orderPackageCode); + log.info("#################panduanPackageByOrderCode: 当前处理的包条 {}", orderPackageCode); + DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode, targetTrayTypeEntity.getWarehouseId()); + if (Objects.isNull(parcelListEntity)) { + log.info("#################panduanPackageByOrderCode: 包件信息不存在 {}", orderPackageCode); continue; } Long stockArticleId = parcelListEntity.getStockArticleId(); - if(!stockArticleId.equals(filterId)){ + if (!stockArticleId.equals(filterId)) { trayGoodsEntity.setIsFleeing("1"); } trayGoodsEntity.setTrayId(trayId); @@ -5609,20 +5604,20 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl sourceTrayGoodsList, Long filterId, String filterValue,WarehouseTrayTypeEntity targetTrayTypeEntity) { + private void panduanPackageByService(List sourceTrayGoodsList, Long filterId, String filterValue, WarehouseTrayTypeEntity targetTrayTypeEntity) { Long trayId = targetTrayTypeEntity.getTrayId(); String trayCode = targetTrayTypeEntity.getTrayCode(); Long trayTypeId = targetTrayTypeEntity.getId(); - for (WarehouseTrayGoodsEntity trayGoodsEntity:sourceTrayGoodsList){ + for (WarehouseTrayGoodsEntity trayGoodsEntity : sourceTrayGoodsList) { String orderPackageCode = trayGoodsEntity.getAssociationValue(); - log.info("#################panduanPackageByService: 当前处理的包条 {}",orderPackageCode); - DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode,targetTrayTypeEntity.getWarehouseId()); - if(Objects.isNull(parcelListEntity)){ - log.info("#################panduanPackageByService: 包件信息不存在 {}",orderPackageCode); + log.info("#################panduanPackageByService: 当前处理的包条 {}", orderPackageCode); + DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode, targetTrayTypeEntity.getWarehouseId()); + if (Objects.isNull(parcelListEntity)) { + log.info("#################panduanPackageByService: 包件信息不存在 {}", orderPackageCode); continue; } String serviceNumber = parcelListEntity.getServiceNumber(); - if(!serviceNumber.equals(filterValue)){ + if (!serviceNumber.equals(filterValue)) { trayGoodsEntity.setIsFleeing("1"); } trayGoodsEntity.setTrayId(trayId); @@ -5633,9 +5628,9 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl trayGoodsList, WarehouseTrayTypeEntity trayTypeEntity, String bindingType, String remark, String palletizingType) { List ls = new ArrayList<>(); - for (WarehouseTrayGoodsEntity trayGoodsEntity:trayGoodsList){ + for (WarehouseTrayGoodsEntity trayGoodsEntity : trayGoodsList) { WarehouseTrayGoodsLogEntity trayGoodsLogEntity = new WarehouseTrayGoodsLogEntity(); - BeanUtil.copy(trayGoodsEntity,trayGoodsLogEntity); + BeanUtil.copy(trayGoodsEntity, trayGoodsLogEntity); trayGoodsLogEntity.setId(null); trayGoodsLogEntity.setBindingType(bindingType); trayGoodsLogEntity.setRemark(remark); @@ -5646,14 +5641,14 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl