diff --git a/blade-service/logpm-trunkline/pom.xml b/blade-service/logpm-trunkline/pom.xml index 8f65f27b2..b637c5515 100644 --- a/blade-service/logpm-trunkline/pom.xml +++ b/blade-service/logpm-trunkline/pom.xml @@ -65,6 +65,11 @@ 3.2.0.RELEASE compile + + org.springblade + logpm-factory-data-api + 3.2.0.RELEASE + org.springframework.boot diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/dto/LoadScanBrandDTO.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/dto/LoadScanBrandDTO.java new file mode 100644 index 000000000..702c3cc27 --- /dev/null +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/dto/LoadScanBrandDTO.java @@ -0,0 +1,21 @@ +package com.logpm.trunkline.dto; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @author zhaoqiaobo + * @create 2024-04-07 + */ +@Data +public class LoadScanBrandDTO implements Serializable { + /** + * 品牌 + */ + private String brand; + /** + * 包件码 + */ + private String packageCode; +} diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.java index f1288fdef..0d40ababd 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.trunkline.dto.LoadCarsDTO; +import com.logpm.trunkline.dto.LoadScanBrandDTO; import com.logpm.trunkline.entity.TrunklineCarsLoadEntity; import com.logpm.trunkline.vo.CarsLoadAllOrderVO; import com.logpm.trunkline.vo.TripartiteTransferVO; @@ -40,5 +41,6 @@ public interface TrunklineCarsLoadMapper extends BaseMapper carsOrderIdList, @Param("isCustomer") String isCustomer); + List fingPackageCodeByLoadId(@Param("loadId") Long loadId); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml index 36537c10e..aab47ff31 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml @@ -494,6 +494,13 @@ + update logpm_trunkline_cars_order 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 efe564331..43d130b3a 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 @@ -1,5 +1,9 @@ package com.logpm.trunkline.service.impl; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -18,12 +22,74 @@ import com.logpm.distribution.entity.DistributionStockArticleEntity; import com.logpm.distribution.feign.IDistributionParcelListClient; import com.logpm.distribution.feign.IDistributionParcelNumberClient; import com.logpm.distribution.feign.IDistributionStockArticleClient; +import com.logpm.factorydata.enums.BrandEnums; +import com.logpm.factorydata.enums.NodeEnums; +import com.logpm.factorydata.util.FactoryDataMessageSender; +import com.logpm.factorydata.vo.NodePushMsg; import com.logpm.trunkline.bean.Resp; -import com.logpm.trunkline.dto.*; -import com.logpm.trunkline.entity.*; +import com.logpm.trunkline.dto.BatchUnloadDTO; +import com.logpm.trunkline.dto.InComingDTO; +import com.logpm.trunkline.dto.LoadCarsDTO; +import com.logpm.trunkline.dto.LoadScanBrandDTO; +import com.logpm.trunkline.dto.LoadingPackageDTO; +import com.logpm.trunkline.dto.LoadingZeroDTO; +import com.logpm.trunkline.dto.ProductInfoDTO; +import com.logpm.trunkline.dto.TrunklineCarsLoadDTO; +import com.logpm.trunkline.dto.TrunklineCarsLoadLineDTO; +import com.logpm.trunkline.dto.TrunklineCarsOrderDTO; +import com.logpm.trunkline.dto.UnloadPackageDTO; +import com.logpm.trunkline.dto.UnloadZeroDTO; +import com.logpm.trunkline.entity.TrunklineAdvanceDetailEntity; +import com.logpm.trunkline.entity.TrunklineCarsLoadContractEntity; +import com.logpm.trunkline.entity.TrunklineCarsLoadEntity; +import com.logpm.trunkline.entity.TrunklineCarsLoadFinanceEntity; +import com.logpm.trunkline.entity.TrunklineCarsLoadLineEntity; +import com.logpm.trunkline.entity.TrunklineCarsLoadLogEntity; +import com.logpm.trunkline.entity.TrunklineCarsLoadScanEntity; +import com.logpm.trunkline.entity.TrunklineCarsOrderEntity; +import com.logpm.trunkline.entity.TrunklineCostShareRecordEntity; +import com.logpm.trunkline.entity.TrunklineLoadSignOrderEntity; import com.logpm.trunkline.mapper.TrunklineCarsLoadMapper; -import com.logpm.trunkline.service.*; -import com.logpm.trunkline.vo.*; +import com.logpm.trunkline.service.ICarsLoadAsyncService; +import com.logpm.trunkline.service.IInComingService; +import com.logpm.trunkline.service.IOpenOrderAsyncService; +import com.logpm.trunkline.service.ITrunklineAdvanceDetailService; +import com.logpm.trunkline.service.ITrunklineCarsLoadContractService; +import com.logpm.trunkline.service.ITrunklineCarsLoadFinanceService; +import com.logpm.trunkline.service.ITrunklineCarsLoadLineService; +import com.logpm.trunkline.service.ITrunklineCarsLoadLogService; +import com.logpm.trunkline.service.ITrunklineCarsLoadScanService; +import com.logpm.trunkline.service.ITrunklineCarsLoadService; +import com.logpm.trunkline.service.ITrunklineCarsLoadingLogService; +import com.logpm.trunkline.service.ITrunklineCarsOrderService; +import com.logpm.trunkline.service.ITrunklineCarsSignLogService; +import com.logpm.trunkline.service.ITrunklineCarsUnloadLogService; +import com.logpm.trunkline.service.ITrunklineCostShareRecordService; +import com.logpm.trunkline.service.ITrunklineLoadSignOrderService; +import com.logpm.trunkline.service.ITrunklineWaybillOrderService; +import com.logpm.trunkline.vo.CarsLoadAllOrderVO; +import com.logpm.trunkline.vo.CarsLoadOrderInfoVO; +import com.logpm.trunkline.vo.CarsLoadWaybillInfoVO; +import com.logpm.trunkline.vo.HasNotFinalNodeIdDataVO; +import com.logpm.trunkline.vo.LoadScanFinalNodeIdVO; +import com.logpm.trunkline.vo.LoadScanOrderVO; +import com.logpm.trunkline.vo.LoadZeroListVO; +import com.logpm.trunkline.vo.LoadingListGoodsVO; +import com.logpm.trunkline.vo.LoadingListMainVO; +import com.logpm.trunkline.vo.NodeNumDataVO; +import com.logpm.trunkline.vo.OrderScanDetailVO; +import com.logpm.trunkline.vo.SignOrderDetailVO; +import com.logpm.trunkline.vo.SignPackageVO; +import com.logpm.trunkline.vo.SignScanOrderVO; +import com.logpm.trunkline.vo.TripartiteTransferVO; +import com.logpm.trunkline.vo.TrunklineCarsLoadLoadingListVO; +import com.logpm.trunkline.vo.TrunklineCarsLoadScanVO; +import com.logpm.trunkline.vo.TrunklineCarsLoadVO; +import com.logpm.trunkline.vo.TrunklineLoadSignOrderVO; +import com.logpm.trunkline.vo.UnloadPackageVO; +import com.logpm.trunkline.vo.UnloadScanOrderVO; +import com.logpm.trunkline.vo.UnloadZeroVO; +import com.logpm.trunkline.vo.ZeroSuppleVO; import com.logpm.warehouse.entity.WarehouseWayBillDetail; import com.logpm.warehouse.entity.WarehouseWaybillEntity; import com.logpm.warehouse.feign.IWarehouseTrayTypeClient; @@ -53,7 +119,14 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.TreeSet; @Slf4j @Service @@ -90,6 +163,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl loadCarsPageList(LoadCarsDTO loadCarsDTO) { @@ -97,13 +171,13 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl pageList = baseMapper.loadCarsPageList(page,loadCarsDTO); + IPage pageList = baseMapper.loadCarsPageList(page, loadCarsDTO); List records = pageList.getRecords(); - for (TrunklineCarsLoadVO trunklineCarsLoadVO:records){ + for (TrunklineCarsLoadVO trunklineCarsLoadVO : records) { Long loadId = trunklineCarsLoadVO.getId(); QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("is_deleted",0) - .eq("load_id",loadId) + queryWrapper.eq("is_deleted", 0) + .eq("load_id", loadId) .orderByAsc("sort"); List list = trunklineCarsLoadLineService.list(queryWrapper); trunklineCarsLoadVO.setCarsLoadLineList(list); @@ -118,13 +192,13 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl pageList = baseMapper.arriveCarsPageList(page,loadCarsDTO); + IPage pageList = baseMapper.arriveCarsPageList(page, loadCarsDTO); List records = pageList.getRecords(); - for (TrunklineCarsLoadVO trunklineCarsLoadVO:records){ + for (TrunklineCarsLoadVO trunklineCarsLoadVO : records) { Long loadId = trunklineCarsLoadVO.getId(); QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("is_deleted",0) - .eq("load_id",loadId) + queryWrapper.eq("is_deleted", 0) + .eq("load_id", loadId) .orderByAsc("sort"); List list = trunklineCarsLoadLineService.list(queryWrapper); trunklineCarsLoadVO.setCarsLoadLineList(list); @@ -143,9 +217,9 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl brands = this.baseMapper.fingPackageCodeByLoadId(loadId); + NodeEnums node = null; + if (startCarType == 1) { //车辆配载发车 //查询发站仓节点信息 TrunklineCarsLoadLineEntity carsLoadLineEntity = trunklineCarsLoadLineService.findStartNodeByLoadId(loadId); String nodeStatus = carsLoadLineEntity.getNodeStatus();//节点状态 0未到达 1到车 2发车 Date startDate = carsLoadLineEntity.getStartDate(); Long nodeId = carsLoadLineEntity.getNodeId(); - if(!warehouseId.equals(nodeId)){ - log.warn("#############startCarByLoadId: 未有权限进行该操作 warehouseId={} nodeId={}",warehouseId,nodeId); - throw new CustomerException(405,"未有权限进行该操作"); + if (!warehouseId.equals(nodeId)) { + log.warn("#############startCarByLoadId: 未有权限进行该操作 warehouseId={} nodeId={}", warehouseId, nodeId); + throw new CustomerException(405, "未有权限进行该操作"); } - if(!Objects.isNull(startDate)){ - log.warn("#############startCarByLoadId: 车辆已发车 startDate={}",startDate); - throw new CustomerException(405,"车辆已发车"); + if (!Objects.isNull(startDate)) { + log.warn("#############startCarByLoadId: 车辆已发车 startDate={}", startDate); + throw new CustomerException(405, "车辆已发车"); } - if("20".equals(nodeStatus)){ - log.warn("#############startCarByLoadId: 车辆已发车 nodeStatus={}",nodeStatus); - throw new CustomerException(405,"车辆已发车"); + if ("20".equals(nodeStatus)) { + log.warn("#############startCarByLoadId: 车辆已发车 nodeStatus={}", nodeStatus); + throw new CustomerException(405, "车辆已发车"); } - if(!"0".equals(loadStatus)){ - log.warn("#############startCarByLoadId: 车辆已发车 loadStatus={}",loadStatus); - throw new CustomerException(405,"车辆已发车"); + if (!"0".equals(loadStatus)) { + log.warn("#############startCarByLoadId: 车辆已发车 loadStatus={}", loadStatus); + throw new CustomerException(405, "车辆已发车"); } Date date = new Date(); @@ -200,17 +274,20 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl brands, NodeEnums node, String address) { + if (CollUtil.isNotEmpty(brands)) { + for (LoadScanBrandDTO brand : brands) { + String packageCode = brand.getPackageCode(); + if (StrUtil.isEmpty(packageCode)) { + continue; + } + NodePushMsg msg = new NodePushMsg(); + msg.setNode(node); + msg.setBrand(BrandEnums.getByValue(brand.getBrand())); + msg.setOperator(AuthUtil.getUser().getNickName()); + msg.setOperatorTime(new Date()); + msg.setAddress(address); + List contents = new ArrayList<>(); + ArrayList codes = CollUtil.newArrayList(packageCode.split(",")); + if (CollUtil.isNotEmpty(codes)) { + for (String code : codes) { + JSONObject jsonObject = new JSONObject(); + jsonObject.put("packageCode", code); + contents.add(jsonObject); + } + } + msg.setContent(contents); + log.info("推送工厂数据：{}", JSONUtil.toJsonStr(msg)); + factoryDataMessageSender.sendNodeDataByBrand(msg); + } + } } private void createCustomerSignOrder(Long loadId, Long warehouseId) { BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(warehouseId); - if(Objects.isNull(basicdataWarehouseEntity)){ - log.warn("################createCustomerSignOrder: 仓库信息不存在 warehouseId={}",warehouseId); - throw new CustomerException(405,"仓库信息不存在"); + if (Objects.isNull(basicdataWarehouseEntity)) { + log.warn("################createCustomerSignOrder: 仓库信息不存在 warehouseId={}", warehouseId); + throw new CustomerException(405, "仓库信息不存在"); } String warehouseCode = basicdataWarehouseEntity.getWarehouseCode(); - List list = trunklineCarsOrderService.findSignOrderListBy(loadId,warehouseId); + List list = trunklineCarsOrderService.findSignOrderListBy(loadId, warehouseId); for (TrunklineLoadSignOrderEntity trunklineLoadSignOrderEntity : list) { // TrunklineLoadSignOrderEntity trunklineLoadSignOrderEntity = new TrunklineLoadSignOrderEntity(); // BeanUtil.copy(entity,trunklineLoadSignOrderEntity); - trunklineLoadSignOrderEntity.setLoadSignCode(codeClient.getCodeByType(CodeNumConstant.TRUNKLINE_LOAD_SIGN,warehouseCode,"")); + trunklineLoadSignOrderEntity.setLoadSignCode(codeClient.getCodeByType(CodeNumConstant.TRUNKLINE_LOAD_SIGN, warehouseCode, "")); trunklineLoadSignOrderService.save(trunklineLoadSignOrderEntity); } @@ -321,7 +439,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl ls = trunklineCarsOrderService.findCustomerOrderList(loadId,warehouseId,mallName); + List ls = trunklineCarsOrderService.findCustomerOrderList(loadId, warehouseId, mallName); for (TrunklineCarsOrderEntity l : ls) { l.setSignOrderId(signOrderId); } @@ -337,46 +455,46 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl list = trunklineLoadSignOrderService.findAllLoadSignOrderList(loadId,warehouseId); - trunklineLoadSignOrderService.deleteListBySignStatusAndLoadIdAndWarehouseId(loadId,warehouseId); - trunklineCarsOrderService.clearSignOrderId(loadId,warehouseId); + trunklineLoadSignOrderService.deleteListBySignStatusAndLoadIdAndWarehouseId(loadId, warehouseId); + trunklineCarsOrderService.clearSignOrderId(loadId, warehouseId); } @@ -534,31 +652,31 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl 0){ - log.warn("#############cancelArriveCarByLoadId: 当前节点已卸车 unloadNumber={}",unloadNumber); - throw new CustomerException(400,"当前节点已卸车"); + if (unloadNumber > 0) { + log.warn("#############cancelArriveCarByLoadId: 当前节点已卸车 unloadNumber={}", unloadNumber); + throw new CustomerException(400, "当前节点已卸车"); } TrunklineCarsLoadLineEntity startCarsLoadLineEntity = trunklineCarsLoadLineService.findStartNodeByLoadId(loadId); - if(Objects.isNull(startCarsLoadLineEntity)){ - log.warn("#############cancelArriveCarByLoadId: 起始节点信息不存在 loadId={}",loadId); - throw new CustomerException(400,"起始节点信息不存在"); + if (Objects.isNull(startCarsLoadLineEntity)) { + log.warn("#############cancelArriveCarByLoadId: 起始节点信息不存在 loadId={}", loadId); + throw new CustomerException(400, "起始节点信息不存在"); } Long startNodeId = startCarsLoadLineEntity.getNodeId(); @@ -634,23 +752,22 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl brands = this.baseMapper.fingPackageCodeByLoadId(loadId); + NodeEnums node = null; + if (unloadType == 1) { + node = NodeEnums.TRANSFER_WAREHOUSE_UNLOADING; //网点卸车确认 - if("40".equals(loadStatus)){ - log.warn("#############unloadByLoadId: 当前节点为终点 loadId={} loadStatus={}",loadId,loadStatus); - throw new CustomerException(400,"当前节点为终点"); + if ("40".equals(loadStatus)) { + log.warn("#############unloadByLoadId: 当前节点为终点 loadId={} loadStatus={}", loadId, loadStatus); + throw new CustomerException(400, "当前节点为终点"); } - if(!"10".equals(nodeStatus)){ - log.warn("#############unloadByLoadId: 当前节点未到车 nowWarehouseId={} nodeStatus={}",nowWarehouseId,nodeStatus); - throw new CustomerException(400,"当前节点未到车"); + if (!"10".equals(nodeStatus)) { + log.warn("#############unloadByLoadId: 当前节点未到车 nowWarehouseId={} nodeStatus={}", nowWarehouseId, nodeStatus); + throw new CustomerException(400, "当前节点未到车"); } currentCarsLoadLineEntity.setUnloadStatus("1"); @@ -759,57 +877,58 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl map = new HashMap<>(); map.put("messageId", CommonUtil.getUUID()); @@ -818,6 +937,18 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl carsLoadLineList = carsLoadDTO.getAddCarsLoadLineList(); - for (TrunklineCarsLoadLineDTO carsLoadLineDTO:carsLoadLineList){ + for (TrunklineCarsLoadLineDTO carsLoadLineDTO : carsLoadLineList) { TrunklineCarsLoadLineEntity carsLoadLineEntity = new TrunklineCarsLoadLineEntity(); Integer sort = carsLoadLineDTO.getSort(); - BeanUtil.copy(carsLoadLineDTO,carsLoadLineEntity); + BeanUtil.copy(carsLoadLineDTO, carsLoadLineEntity); carsLoadLineEntity.setLoadId(loadId); carsLoadLineEntity.setNodeStatus("0"); - if(sort == 1){ + if (sort == 1) { carsLoadLineEntity.setNodeStatus("10"); } carsLoadLineEntity.setSignStatus("0"); @@ -868,19 +999,19 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl lineCarsOrderList = carsLoadLineDTO.getAddList(); - for (TrunklineCarsOrderDTO carsOrderDTO:lineCarsOrderList){ + for (TrunklineCarsOrderDTO carsOrderDTO : lineCarsOrderList) { Integer planNum = carsOrderDTO.getPlanNum(); String orderCode = carsOrderDTO.getOrderCode(); TrunklineCarsOrderEntity carsOrderEntity = new TrunklineCarsOrderEntity(); - BeanUtil.copy(carsOrderDTO,carsOrderEntity); + BeanUtil.copy(carsOrderDTO, carsOrderEntity); carsOrderEntity.setLoadId(loadId); carsOrderEntity.setNodeId(nodeId); carsOrderEntity.setNodeName(nodeName); @@ -888,21 +1019,21 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl nodeNumDataVOS = trunklineCarsOrderService.findNodeDataByLoadId(loadId); - for (NodeNumDataVO nodeNumDataVO:nodeNumDataVOS){ + for (NodeNumDataVO nodeNumDataVO : nodeNumDataVOS) { Long loadLineId = nodeNumDataVO.getLoadLineId(); Integer planNum = nodeNumDataVO.getPlanNum(); loadPlanNum = loadPlanNum + planNum; - trunklineCarsLoadLineService.updatePlanLoadingNumberByLoadLineId(planNum,loadLineId); + trunklineCarsLoadLineService.updatePlanLoadingNumberByLoadLineId(planNum, loadLineId); } carsLoadEntity.setPlanLoadingNumber(loadPlanNum); updateById(carsLoadEntity); @@ -944,11 +1075,11 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl carsLoadLineList = trunklineCarsLoadLineService.findListByLoadId(loadId); - for (TrunklineCarsLoadLineEntity carsLoadLineEntity:carsLoadLineList){ + for (TrunklineCarsLoadLineEntity carsLoadLineEntity : carsLoadLineList) { Long nodeId = carsLoadLineEntity.getNodeId(); - Integer lineLoadingNum = trunklineCarsLoadScanService.findNumByLoadIdAndNodeId(loadId,nodeId);//节点实际装车数量 - Integer lineUnloadingNum = trunklineCarsLoadScanService.findUnloadNumByLoadIdAndNodeId(loadId,nodeId);//节点实际卸车数量 - Integer lineAbnormalNum = trunklineCarsLoadScanService.findAbnormalNumByLoadIdAndNodeId(loadId,nodeId);//节点实际装车异常数量 + Integer lineLoadingNum = trunklineCarsLoadScanService.findNumByLoadIdAndNodeId(loadId, nodeId);//节点实际装车数量 + Integer lineUnloadingNum = trunklineCarsLoadScanService.findUnloadNumByLoadIdAndNodeId(loadId, nodeId);//节点实际卸车数量 + Integer lineAbnormalNum = trunklineCarsLoadScanService.findAbnormalNumByLoadIdAndNodeId(loadId, nodeId);//节点实际装车异常数量 // Integer lineUnloadingAbnormalNum = trunklineCarsUnloadLogService.findAbnormalNumByLoadIdAndNodeId(loadId,nodeId);//节点实际卸车异常数量 carsLoadLineEntity.setRealLoadingNumber(lineLoadingNum); carsLoadLineEntity.setUnloadNumber(lineUnloadingNum); @@ -956,13 +1087,13 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl carsOrderEntities = trunklineCarsOrderService.findListByLoadIdAndNodeId(loadId,nodeId); - for (TrunklineCarsOrderEntity carsOrderEntity:carsOrderEntities){ + List carsOrderEntities = trunklineCarsOrderService.findListByLoadIdAndNodeId(loadId, nodeId); + for (TrunklineCarsOrderEntity carsOrderEntity : carsOrderEntities) { String orderCode = carsOrderEntity.getOrderCode(); String waybillNo = carsOrderEntity.getWaybillNo(); - Integer orderLoadingNum = trunklineCarsLoadScanService.findNumByLoadIdAndNodeIdAndOrderCodeAndWaybillNo(loadId,nodeId,orderCode,waybillNo);//节点实际装车数量 - Integer orderUnloadingNum = trunklineCarsLoadScanService.findUnloadNumByLoadIdAndNodeIdAndOrderCodeAndWaybillNo(loadId,nodeId,orderCode,waybillNo);//节点实际卸车数量 - Integer orderSignNum = trunklineCarsLoadScanService.findSignNumByLoadIdAndNodeIdAndOrderCodeAndeWaybillNo(loadId,nodeId,orderCode,waybillNo); + Integer orderLoadingNum = trunklineCarsLoadScanService.findNumByLoadIdAndNodeIdAndOrderCodeAndWaybillNo(loadId, nodeId, orderCode, waybillNo);//节点实际装车数量 + Integer orderUnloadingNum = trunklineCarsLoadScanService.findUnloadNumByLoadIdAndNodeIdAndOrderCodeAndWaybillNo(loadId, nodeId, orderCode, waybillNo);//节点实际卸车数量 + Integer orderSignNum = trunklineCarsLoadScanService.findSignNumByLoadIdAndNodeIdAndOrderCodeAndeWaybillNo(loadId, nodeId, orderCode, waybillNo); // Integer orderLoadingAbnormalNum = trunklineCarsLoadScanService.findAbnormalNumByLoadIdAndNodeId(loadId,nodeId,orderCode,waybillNo);//节点实际装车异常数量 // Integer orderUnloadingAbnormalNum = trunklineCarsUnloadLogService.findAbnormalNumByLoadIdAndNodeId(loadId,nodeId,orderCode,waybillNo);//节点实际卸车异常数量 carsOrderEntity.setRealNum(orderLoadingNum); @@ -978,45 +1109,45 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl moreCarsLineList = trunklineCarsLoadLineService.findListMoreSortByLoadId(loadId,sort); List allCarsLineList = trunklineCarsLoadLineService.findListByLoadId(loadId); - Map map = new HashMap<>(); - map.put("carsLoadEntity",loadEntity); - map.put("allCarsLineList",allCarsLineList); + Map map = new HashMap<>(); + map.put("carsLoadEntity", loadEntity); + map.put("allCarsLineList", allCarsLineList); List loadingType = DictBizCache.getList(DictBizConstant.CARS_LOADING_TYPE); - map.put("loadingType",loadingType); + map.put("loadingType", loadingType); List chargeType = DictBizCache.getList(DictBizConstant.BILLLADING_CHARGE_TYPE); - map.put("chargeType",chargeType); + map.put("chargeType", chargeType); List loadType = DictBizCache.getList(DictBizConstant.CARS_LOAD_TYPE); - map.put("loadType",loadType); + map.put("loadType", loadType); BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(warehouseId); - map.put("warehouseId",basicdataWarehouseEntity.getId()); - map.put("warehouseName",basicdataWarehouseEntity.getName()); - map.put("allWarehouseIds",allWarehouseIds.split(",")); + map.put("warehouseId", basicdataWarehouseEntity.getId()); + map.put("warehouseName", basicdataWarehouseEntity.getName()); + map.put("allWarehouseIds", allWarehouseIds.split(",")); // map.put("moreCarsLineList",moreCarsLineList); return R.data(map); } @@ -1073,9 +1204,9 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl removeCarsLoadLineList = carsLoadDTO.getRemoveCarsLoadLineList(); TrunklineCarsLoadEntity carsLoadEntity = baseMapper.selectById(loadId); - if(Objects.isNull(carsLoadEntity)){ - log.warn("###############updateCarsLoadBasicData: 配载计划不存在 loadId={}",loadId); - return R.fail(405,"配载计划不存在"); + if (Objects.isNull(carsLoadEntity)) { + log.warn("###############updateCarsLoadBasicData: 配载计划不存在 loadId={}", loadId); + return R.fail(405, "配载计划不存在"); } carsLoadEntity.setDriverId(driverId); carsLoadEntity.setAssistantId(assistantId); @@ -1110,9 +1241,9 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl" + nodeName; } - if(sort > 1){ - if(StringUtil.isBlank(endWarehouseIds)){ - endWarehouseIds = nodeId+""; + if (sort > 1) { + if (StringUtil.isBlank(endWarehouseIds)) { + endWarehouseIds = nodeId + ""; endWarehouseNames = nodeName; - }else{ + } else { endWarehouseIds = endWarehouseIds + "," + nodeId; endWarehouseNames = endWarehouseNames + "," + nodeName; } @@ -1144,18 +1275,18 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl loadLineEntityList = trunklineCarsLoadLineService.findListByLoadId(loadId); for (TrunklineCarsLoadLineEntity carsLoadLineEntity : loadLineEntityList) { String nodeName = carsLoadLineEntity.getNodeName(); - if(StringUtil.isBlank(loadLineTitleName)){ + if (StringUtil.isBlank(loadLineTitleName)) { loadLineTitleName = nodeName; - }else{ + } else { loadLineTitleName = loadLineTitleName + "->" + nodeName; } } @@ -1210,10 +1341,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl pageList = baseMapper.findAllOrderList(page,loadCarsDTO); + IPage pageList = baseMapper.findAllOrderList(page, loadCarsDTO); return R.data(pageList); } @@ -1269,29 +1400,29 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl lineCarsOrderList = loadCarsDTO.getCarsOrderList(); - for (TrunklineCarsOrderDTO carsOrderDTO:lineCarsOrderList){ + for (TrunklineCarsOrderDTO carsOrderDTO : lineCarsOrderList) { Integer planNum = carsOrderDTO.getPlanNum(); String orderCode = carsOrderDTO.getOrderCode(); TrunklineCarsOrderEntity carsOrderEntity = new TrunklineCarsOrderEntity(); - BeanUtil.copy(carsOrderDTO,carsOrderEntity); + BeanUtil.copy(carsOrderDTO, carsOrderEntity); carsOrderEntity.setLoadId(loadId); carsOrderEntity.setNodeId(warehouseId); carsOrderEntity.setNodeName(currentCarsLoadLineEntity.getNodeName()); carsOrderEntity.setLoadLineId(currentCarsLoadLineEntity.getId()); carsOrderEntity.setRealNum(0); boolean saveCarsOrder = trunklineCarsOrderService.save(carsOrderEntity); - if(!saveCarsOrder){ - log.warn("##############addOrderToFinalNodeId: 保存配载计划节点订单失败 orderCode={}",orderCode); - throw new CustomerException(400,"保存配载计划节点订单失败"); + if (!saveCarsOrder) { + log.warn("##############addOrderToFinalNodeId: 保存配载计划节点订单失败 orderCode={}", orderCode); + throw new CustomerException(400, "保存配载计划节点订单失败"); } //同时当前仓订单加上配载数量 - distributionStockArticleClient.addCarsLoadNum(planNum,orderCode,warehouseId); + distributionStockArticleClient.addCarsLoadNum(planNum, orderCode, warehouseId); } //更新数值 @@ -1309,14 +1440,14 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl 0){ - log.warn("##############removeCarsOrderByCarsOrderId: 订单已有装车数据 carsOrderId={} realNum={}",carsOrderId,realNum); - return R.fail(400,"订单已有装车数据"); + if (realNum > 0) { + log.warn("##############removeCarsOrderByCarsOrderId: 订单已有装车数据 carsOrderId={} realNum={}", carsOrderId, realNum); + return R.fail(400, "订单已有装车数据"); } trunklineCarsOrderService.deleteByCarsOrderId(carsOrderId); @@ -1375,7 +1506,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl pageList = trunklineCarsOrderService.findCustomerCarsOrderList(page,loadCarsDTO); + IPage pageList = trunklineCarsOrderService.findCustomerCarsOrderList(page, loadCarsDTO); return R.data(pageList); } @@ -1391,7 +1522,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl pageList = trunklineCarsOrderService.findCustomerCarsOrderList(page,loadCarsDTO); + IPage pageList = trunklineCarsOrderService.findCustomerCarsOrderList(page, loadCarsDTO); return R.data(pageList); } @@ -1404,15 +1535,15 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl pageList = baseMapper.tripartiteTransferPageList(page,loadCarsDTO); + IPage pageList = baseMapper.tripartiteTransferPageList(page, loadCarsDTO); return pageList; } @@ -1438,13 +1569,13 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl carsLoadLineList = carsLoadDTO.getAddCarsLoadLineList(); - for (TrunklineCarsLoadLineDTO carsLoadLineDTO:carsLoadLineList){ + for (TrunklineCarsLoadLineDTO carsLoadLineDTO : carsLoadLineList) { TrunklineCarsLoadLineEntity carsLoadLineEntity = new TrunklineCarsLoadLineEntity(); - BeanUtil.copy(carsLoadLineDTO,carsLoadLineEntity); + BeanUtil.copy(carsLoadLineDTO, carsLoadLineEntity); carsLoadLineEntity.setLoadId(loadId); carsLoadLineEntity.setNodeStatus("10"); carsLoadLineEntity.setSignStatus("0"); @@ -1476,40 +1607,40 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl lineCarsOrderList = carsLoadLineDTO.getAddList(); - for (TrunklineCarsOrderDTO carsOrderDTO:lineCarsOrderList){ + for (TrunklineCarsOrderDTO carsOrderDTO : lineCarsOrderList) { Integer planNum = carsOrderDTO.getPlanNum(); String orderCode = carsOrderDTO.getOrderCode(); TrunklineCarsOrderEntity carsOrderEntity = new TrunklineCarsOrderEntity(); - BeanUtil.copy(carsOrderDTO,carsOrderEntity); + BeanUtil.copy(carsOrderDTO, carsOrderEntity); carsOrderEntity.setLoadId(loadId); carsOrderEntity.setNodeId(nodeId); carsOrderEntity.setNodeName(nodeName); carsOrderEntity.setLoadLineId(loadLineId); carsOrderEntity.setRealNum(0); boolean saveCarsOrder = trunklineCarsOrderService.save(carsOrderEntity); - if(!saveCarsOrder){ - log.warn("##############saveNew: 保存配载计划节点订单失败 orderCode={}",orderCode); - throw new CustomerException(400,"保存配载计划节点订单失败"); + if (!saveCarsOrder) { + log.warn("##############saveNew: 保存配载计划节点订单失败 orderCode={}", orderCode); + throw new CustomerException(400, "保存配载计划节点订单失败"); } //同时当前仓订单加上配载数量 - distributionStockArticleClient.addCarsLoadNum(planNum,orderCode,warehouseId); + distributionStockArticleClient.addCarsLoadNum(planNum, orderCode, warehouseId); } } } } - try{ + try { TrunklineCarsLoadLineEntity loadLineEntity = trunklineCarsLoadLineService.findEntityByLoadIdAndNodeId(carsLoadEntity.getId(), warehouseId); - trunklineCarsLoadLogService.saveLog(carsLoadEntity,loadLineEntity, CarsLoadLogTypeConstant.CREATE_CARS_LOAD.getValue()); - }catch (Exception e){ + trunklineCarsLoadLogService.saveLog(carsLoadEntity, loadLineEntity, CarsLoadLogTypeConstant.CREATE_CARS_LOAD.getValue()); + } catch (Exception e) { log.warn("#############unloadByLoadId: 存入日志失败"); } //更新数量 @@ -1522,30 +1653,30 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl brands = this.baseMapper.fingPackageCodeByLoadId(loadId); + // 查询详细地址为仓库的地址 + BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(nowWarehouseId); + String warehouseAddress = null; + if (ObjectUtil.isNotEmpty(warehouseEntity)) { + warehouseAddress = warehouseEntity.getWarehouseAddress(); + } + this.sendFactoryData(brands, NodeEnums.TRIPARTITE_TRANSFER_DEPART, warehouseAddress); + } catch (Exception e) { + log.error("三方中转发车节点推送工厂失败", e); + } + + return R.success("发车成功"); } @@ -1571,35 +1716,35 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl pageList = trunklineCarsLoadScanService.loadingDetail(page,loadCarsDTO); + IPage pageList = trunklineCarsLoadScanService.loadingDetail(page, loadCarsDTO); return R.data(pageList); } @Override - public R loadingScan(Long loadId,Long warehouseId,String orderPackageCode,String trayCode,String remark) { + public R loadingScan(Long loadId, Long warehouseId, String orderPackageCode, String trayCode, String remark) { log.info("#################loadingScan: 装车扫描"); TrunklineCarsLoadEntity carsLoadEntity = baseMapper.selectById(loadId); - if(Objects.isNull(carsLoadEntity)){ - log.warn("##################loadingScan: 配载or三方计划不存在 loadId={}",loadId); - return R.fail(405,"计划不存在"); + if (Objects.isNull(carsLoadEntity)) { + log.warn("##################loadingScan: 配载or三方计划不存在 loadId={}", loadId); + return R.fail(405, "计划不存在"); } TrunklineCarsLoadLineEntity carsLoadLineEntity = trunklineCarsLoadLineService.findEntityByLoadIdAndNodeId(loadId, warehouseId); - if(Objects.isNull(carsLoadLineEntity)){ - log.warn("##################loadingScan: 节点信息不存在 loadId={} warehouseId={}",loadId,warehouseId); - return R.fail(405,"节点信息不存在"); + if (Objects.isNull(carsLoadLineEntity)) { + log.warn("##################loadingScan: 节点信息不存在 loadId={} warehouseId={}", loadId, warehouseId); + return R.fail(405, "节点信息不存在"); } String nodeStatus = carsLoadLineEntity.getNodeStatus(); - if(!"10".equals(nodeStatus)){ - log.warn("##################loadingScan: 节点不是到车状态 nodeStatus={}",nodeStatus); - return R.fail(405,"节点不是到车状态"); + if (!"10".equals(nodeStatus)) { + log.warn("##################loadingScan: 节点不是到车状态 nodeStatus={}", nodeStatus); + return R.fail(405, "节点不是到车状态"); } BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(warehouseId); - if(Objects.isNull(basicdataWarehouseEntity)){ - log.warn("##################loadingScan: 仓库信息不存在 warehouseId={}",warehouseId); - return R.fail(405,"仓库信息不存在"); + if (Objects.isNull(basicdataWarehouseEntity)) { + log.warn("##################loadingScan: 仓库信息不存在 warehouseId={}", warehouseId); + return R.fail(405, "仓库信息不存在"); } String warehouseName = basicdataWarehouseEntity.getName(); //判断包条是不是已经装车 - TrunklineCarsLoadScanEntity isExit = trunklineCarsLoadScanService.findEntityByLoadIdAndOrderPackageCode(loadId,orderPackageCode); - if(!Objects.isNull(isExit)){ - log.warn("##################loadingScan: 包件已经装车 orderPackageCode={}",orderPackageCode); - return R.fail(405,"包件已经装车"); + TrunklineCarsLoadScanEntity isExit = trunklineCarsLoadScanService.findEntityByLoadIdAndOrderPackageCode(loadId, orderPackageCode); + if (!Objects.isNull(isExit)) { + log.warn("##################loadingScan: 包件已经装车 orderPackageCode={}", orderPackageCode); + return R.fail(405, "包件已经装车"); } String loadCode = carsLoadEntity.getCarsNo(); @@ -1795,9 +1940,9 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl parcelListEntities = distributionParcelListClient.findAllStockListByOrderPackageCode(orderPackageCode); @@ -1864,9 +2009,9 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("order_code",orderCode) - .eq("load_id",loadId) - .eq("node_id",warehouseId) - .eq("waybill_no",parcelListEntity.getWaybillNumber()); + queryWrapper.eq("order_code", orderCode) + .eq("load_id", loadId) + .eq("node_id", warehouseId) + .eq("waybill_no", parcelListEntity.getWaybillNumber()); TrunklineCarsOrderEntity carsOrderEntity = trunklineCarsOrderService.getOne(queryWrapper); - if(Objects.isNull(carsOrderEntity)){ + if (Objects.isNull(carsOrderEntity)) { //该计划中不存在对应的数据，所以是异常包件 carsLoadScanEntity.setLoadingAbnormal(1); isAbnormal = 1; remark = "有数据,在本仓,不在配载计划中,异常装车"; - }else{ + } else { //有计划 Integer planNum = carsOrderEntity.getPlanNum(); Integer realNum = carsOrderEntity.getRealNum(); - if(realNum+1 > planNum){ + if (realNum + 1 > planNum) { carsLoadScanEntity.setLoadingAbnormal(1); isAbnormal = 1; remark = "有数据,在本仓,在配载计划中,大于计划数量,异常装车"; - }else{ + } else { carsLoadScanEntity.setLoadingAbnormal(0); isAbnormal = 0; remark = "正常装车"; @@ -1950,78 +2095,78 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("load_id",loadId) - .eq("node_id",warehouseId) - .eq("waybill_no",waybillNo) - .eq("order_code",orderCode); + queryWrapper.eq("load_id", loadId) + .eq("node_id", warehouseId) + .eq("waybill_no", waybillNo) + .eq("order_code", orderCode); TrunklineCarsOrderEntity carsOrderEntity = trunklineCarsOrderService.getOne(queryWrapper); - if(Objects.isNull(carsOrderEntity)){ + if (Objects.isNull(carsOrderEntity)) { isAbnormal = 1; remark = "有数据,无计划,异常装车"; - }else{ + } else { finalNodeId = carsOrderEntity.getFinalNodeId(); BasicdataWarehouseEntity finalNode = basicdataWarehouseClient.getEntityWarehouseId(finalNodeId); - if(!Objects.isNull(finalNode)){ + if (!Objects.isNull(finalNode)) { finalNodeName = finalNode.getName(); } planNum = carsOrderEntity.getPlanNum();//计划件数 } Integer useNum = trunklineCarsLoadScanService.findNumByLoadIdAndNodeIdAndOrderCodeAndWaybillNo(loadId, warehouseId, orderCode, waybillNo); - Map param = new HashMap<>(); - param.put("loadId",loadId); - param.put("warehouseId",warehouseId); - param.put("waybillNo",waybillNo); - param.put("type",2); - param.put("goodsName",goodsName); - param.put("trayCode",trayCode); + Map param = new HashMap<>(); + param.put("loadId", loadId); + param.put("warehouseId", warehouseId); + param.put("waybillNo", waybillNo); + param.put("type", 2); + param.put("goodsName", goodsName); + param.put("trayCode", trayCode); TrunklineCarsLoadScanEntity carsLoadScanEntity = trunklineCarsLoadScanService.findEntityByParam(param); - if(Objects.isNull(carsLoadScanEntity)){ + if (Objects.isNull(carsLoadScanEntity)) { - if(enterNum+useNum >handQuantity){ - log.warn("##################loadingZero: 不能大于在库件数 handQuantity={} real={}",handQuantity,enterNum+useNum); - return R.fail(405,"不能大于在库件数"); + if (enterNum + useNum > handQuantity) { + log.warn("##################loadingZero: 不能大于在库件数 handQuantity={} real={}", handQuantity, enterNum + useNum); + return R.fail(405, "不能大于在库件数"); } - if(!Objects.isNull(planNum)){ - if(enterNum+useNum > planNum){ + if (!Objects.isNull(planNum)) { + if (enterNum + useNum > planNum) { isAbnormal = 1; remark = "有数据,有计划,大于计划件数,异常装车"; } @@ -2102,18 +2247,18 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl handQuantity){ - log.warn("##################loadingZero: 不能大于在库件数 handQuantity={} real={}",handQuantity,useNum-num+enterNum); - return R.fail(405,"不能大于在库件数"); + if (useNum - num + enterNum > handQuantity) { + log.warn("##################loadingZero: 不能大于在库件数 handQuantity={} real={}", handQuantity, useNum - num + enterNum); + return R.fail(405, "不能大于在库件数"); } loadScanId = carsLoadScanEntity.getId(); - if(!Objects.isNull(planNum)){ - if(useNum-num+enterNum > planNum){ + if (!Objects.isNull(planNum)) { + if (useNum - num + enterNum > planNum) { isAbnormal = 1; remark = "有数据,有计划,大于计划件数,异常装车"; } @@ -2122,11 +2267,11 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl ls = updownTypeClient.findZeroAllocation(orderCode,warehouseId); - for (JSONObject jsonObject:ls){ + List ls = updownTypeClient.findZeroAllocation(orderCode, warehouseId); + for (JSONObject jsonObject : ls) { Integer num = jsonObject.getInteger("num"); handQuantity = handQuantity - num; } - if(handQuantity > 0){ + if (handQuantity > 0) { JSONObject jsonObject = new JSONObject(); - jsonObject.put("position_code","无库位"); + jsonObject.put("position_code", "无库位"); // jsonObject.put("orderCode",updownGoodsEntity.getAssociationValue()); // jsonObject.put("num",updownGoodsEntity.getNum()); // jsonObject.put("allocationId",allocationId); @@ -2169,14 +2314,14 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl pageList = baseMapper.carsLoadPageList(page,loadCarsDTO); + IPage pageList = baseMapper.carsLoadPageList(page, loadCarsDTO); List records = pageList.getRecords(); - for (TrunklineCarsLoadVO trunklineCarsLoadVO:records){ + for (TrunklineCarsLoadVO trunklineCarsLoadVO : records) { String loadStatus = trunklineCarsLoadVO.getLoadStatus(); String value = DictBizCache.getValue(DictBizConstant.CARS_LOAD_STATUS, loadStatus); Integer realLoadingNumber = trunklineCarsLoadVO.getRealLoadingNumber(); Integer unloadNumber = trunklineCarsLoadVO.getUnloadNumber(); - trunklineCarsLoadVO.setRealLoadingNumber(realLoadingNumber-unloadNumber); + trunklineCarsLoadVO.setRealLoadingNumber(realLoadingNumber - unloadNumber); trunklineCarsLoadVO.setLoadStatus(value); } pageList.setRecords(records); @@ -2195,36 +2340,36 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl pageList = baseMapper.carsLoadPageList(page,loadCarsDTO); + IPage pageList = baseMapper.carsLoadPageList(page, loadCarsDTO); return R.data(pageList); } @Override - public R findLoadFeeByNodeId(Long loadId,Long warehouseId) { + public R findLoadFeeByNodeId(Long loadId, Long warehouseId) { TrunklineCarsLoadEntity carsLoadEntity = baseMapper.selectById(loadId); - if(Objects.isNull(carsLoadEntity)){ - log.warn("##################findLoadFeeByNodeId: 配载or三方计划不存在 loadId={}",loadId); - return R.fail(405,"计划不存在"); + if (Objects.isNull(carsLoadEntity)) { + log.warn("##################findLoadFeeByNodeId: 配载or三方计划不存在 loadId={}", loadId); + return R.fail(405, "计划不存在"); } TrunklineCarsLoadLineEntity carsLoadLineEntity = trunklineCarsLoadLineService.findEntityByLoadIdAndNodeId(loadId, warehouseId); - if(Objects.isNull(carsLoadLineEntity)){ - log.warn("##################findLoadFeeByNodeId: 节点信息不存在 loadId={} warehouseId={}",loadId,warehouseId); - return R.fail(405,"节点信息不存在"); + if (Objects.isNull(carsLoadLineEntity)) { + log.warn("##################findLoadFeeByNodeId: 节点信息不存在 loadId={} warehouseId={}", loadId, warehouseId); + return R.fail(405, "节点信息不存在"); } return R.data(carsLoadLineEntity); } @Override - public R updateLoadFeeByNodeId(TrunklineCarsLoadDTO carsLoadDTO,Long warehouseId,String warehouseName) { + public R updateLoadFeeByNodeId(TrunklineCarsLoadDTO carsLoadDTO, Long warehouseId, String warehouseName) { Long loadId = carsLoadDTO.getId(); StringBuilder str = new StringBuilder(); TrunklineCarsLoadEntity carsLoadEntity = baseMapper.selectById(loadId); - if(Objects.isNull(carsLoadEntity)){ - log.warn("##########updateLoadFeeByNodeId: 配载计划信息不存在 loadId={}",loadId); - return R.fail(405,"配载计划信息不存在"); + if (Objects.isNull(carsLoadEntity)) { + log.warn("##########updateLoadFeeByNodeId: 配载计划信息不存在 loadId={}", loadId); + return R.fail(405, "配载计划信息不存在"); } BigDecimal oldCountTransportCost = carsLoadEntity.getCountTransportCost(); @@ -2253,7 +2398,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl orderScanDetailList = trunklineCarsLoadScanService.findCarsLoadingOrderDetail(loadId,orderCode,warehouseId); + List orderScanDetailList = trunklineCarsLoadScanService.findCarsLoadingOrderDetail(loadId, orderCode, warehouseId); return R.data(orderScanDetailList); } @@ -2448,16 +2593,16 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl loadLineList = trunklineCarsLoadLineService.findListByLoadId(loadId); TrunklineCarsLoadVO trunklineCarsLoadVO = new TrunklineCarsLoadVO(); - BeanUtil.copy(carsLoadEntity,trunklineCarsLoadVO); + BeanUtil.copy(carsLoadEntity, trunklineCarsLoadVO); trunklineCarsLoadVO.setCarsLoadLineList(loadLineList); @@ -2472,25 +2617,25 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl carsLoadOrderInfoList = trunklineCarsOrderService.findCarsLoadOrderInfoList(loadId,waybillNo); + List carsLoadOrderInfoList = trunklineCarsOrderService.findCarsLoadOrderInfoList(loadId, waybillNo); carsLoadWaybillInfoVO.setCarsLoadOrderInfoList(carsLoadOrderInfoList); - TrunklineCostShareRecordEntity costShareRecordEntity = trunklineCostShareRecordService.findTotalUnloadNumByLoadAndWaybillNo(loadId,waybillNo); + TrunklineCostShareRecordEntity costShareRecordEntity = trunklineCostShareRecordService.findTotalUnloadNumByLoadAndWaybillNo(loadId, waybillNo); carsLoadWaybillInfoVO.setCostPiece(costShareRecordEntity.getCostPiece()); carsLoadWaybillInfoVO.setCostZhang(costShareRecordEntity.getCostZhang()); carsLoadWaybillInfoVO.setCostNum(costShareRecordEntity.getNum()); @@ -2509,7 +2654,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl pageList = distributionStockArticleClient.findZeroListByWarehouseId(warehouseId,pageNum,pageSize); - IPage pageList = baseMapper.findZeroListByWarehouseId(page,loadCarsDTO); + IPage pageList = baseMapper.findZeroListByWarehouseId(page, loadCarsDTO); return R.data(pageList); } @@ -2519,7 +2664,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl pageList = baseMapper.useZeroList(page,loadCarsDTO); + IPage pageList = baseMapper.useZeroList(page, loadCarsDTO); return R.data(pageList); @@ -2532,15 +2677,15 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl zeroSuppleList = loadCarsDTO.getZeroSuppleList(); TrunklineCarsLoadEntity carsLoadEntity = baseMapper.selectById(loadId); - if(Objects.isNull(carsLoadEntity)){ - log.warn("##########addZeroSupple: 配载计划信息不存在 loadId={}",loadId); - return R.fail(405,"配载计划信息不存在"); + if (Objects.isNull(carsLoadEntity)) { + log.warn("##########addZeroSupple: 配载计划信息不存在 loadId={}", loadId); + return R.fail(405, "配载计划信息不存在"); } TrunklineCarsLoadLineEntity carsLoadLineEntity = trunklineCarsLoadLineService.findEntityByLoadIdAndNodeId(loadId, warehouseId); - if(Objects.isNull(carsLoadLineEntity)){ - log.warn("##########addZeroSupple: 配载计划节点信息不存在 loadId={} warehouseId={}",loadId,warehouseId); - return R.fail(405,"配载计划节点信息不存在"); + if (Objects.isNull(carsLoadLineEntity)) { + log.warn("##########addZeroSupple: 配载计划节点信息不存在 loadId={} warehouseId={}", loadId, warehouseId); + return R.fail(405, "配载计划节点信息不存在"); } for (ZeroSuppleVO zeroSuppleVO : zeroSuppleList) { @@ -2550,15 +2695,15 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl listMoreSortByLoadId = trunklineCarsLoadLineService.findListMoreSortByLoadId(loadId, sort); List ls = new ArrayList<>(); for (TrunklineCarsLoadLineEntity trunklineCarsLoadLineEntity : listMoreSortByLoadId) { JSONObject jsonObject = new JSONObject(); - jsonObject.put("warehouseId",trunklineCarsLoadLineEntity.getNodeId()); - jsonObject.put("warehouseName",trunklineCarsLoadLineEntity.getNodeName()); + jsonObject.put("warehouseId", trunklineCarsLoadLineEntity.getNodeId()); + jsonObject.put("warehouseName", trunklineCarsLoadLineEntity.getNodeName()); ls.add(jsonObject); } return R.data(ls); @@ -2698,42 +2843,42 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl map = new HashMap<>(); - map.put("trayType",trayType); - map.put("trayCode",trayCode); - map.put("warehouseId",warehouseId); - map.put("orderPackageCode",orderPackageCode); + if (0 == isZero) { + unloadPackage(loadId, orderPackageCode, warehouseId, 1, "卸分一体 卸车"); + Map map = new HashMap<>(); + map.put("trayType", trayType); + map.put("trayCode", trayCode); + map.put("warehouseId", warehouseId); + map.put("orderPackageCode", orderPackageCode); boolean b = trayTypeClient.orderScanOrderPackageCode(map); - if(!b){ - log.warn("##########findNextNodeList: 打托失败 trayCode={} orderPackageCode={}",trayCode,orderPackageCode); - return R.fail(405,"打托失败"); + if (!b) { + log.warn("##########findNextNodeList: 打托失败 trayCode={} orderPackageCode={}", trayCode, orderPackageCode); + return R.fail(405, "打托失败"); } DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode, warehouseId); orders = parcelListEntity.getOrderCode(); - }else{ + } else { - unloadZero(loadId,waybillNo,enterNum,warehouseId,1,null,orderCode,"卸分一体 卸车"); + unloadZero(loadId, waybillNo, enterNum, warehouseId, 1, null, orderCode, "卸分一体 卸车"); - Map map = new HashMap<>(); - map.put("trayType",trayType); - map.put("trayCode",trayCode); - map.put("warehouseId",warehouseId); - map.put("orderCode",orderCode); - map.put("num",enterNum); + Map map = new HashMap<>(); + map.put("trayType", trayType); + map.put("trayCode", trayCode); + map.put("warehouseId", warehouseId); + map.put("orderCode", orderCode); + map.put("num", enterNum); map.put("remark","卸分一体零担打托"); boolean b = trayTypeClient.enterZeroOrderByTrayCode(map); - if(!b){ - log.warn("##########findNextNodeList: 打托失败 trayCode={} orderCode={}",trayCode,orderCode); - return R.fail(405,"打托失败"); + if (!b) { + log.warn("##########findNextNodeList: 打托失败 trayCode={} orderCode={}", trayCode, orderCode); + return R.fail(405, "打托失败"); } orders = orderCode; } - Map map = new HashMap<>(); - map.put("orders",orders); + Map map = new HashMap<>(); + map.put("orders", orders); return R.data(map); } @@ -2741,15 +2886,15 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl list = trunklineCarsLoadScanService.findNoFinalNodeData(loadId,warehouseId); - if(Objects.isNull(list) || list.size() == 0){ + List list = trunklineCarsLoadScanService.findNoFinalNodeData(loadId, warehouseId); + if (Objects.isNull(list) || list.size() == 0) { return R.success("未有需要添加目的仓的数据"); - }else{ + } else { return R.data(list); } } @@ -2761,9 +2906,9 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl loadScanFinalNodeIdList = loadCarsDTO.getLoadScanFinalNodeIdList(); TrunklineCarsLoadEntity carsLoadEntity = baseMapper.selectById(loadId); - if(Objects.isNull(carsLoadEntity)){ - log.error("###########determineHasNoFinalNode: 配载计划不存在 loadId={}",loadId); - return R.fail(405,"配载计划不存在"); + if (Objects.isNull(carsLoadEntity)) { + log.error("###########determineHasNoFinalNode: 配载计划不存在 loadId={}", loadId); + return R.fail(405, "配载计划不存在"); } for (LoadScanFinalNodeIdVO loadScanFinalNodeIdVO : loadScanFinalNodeIdList) { @@ -2771,10 +2916,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl loadScanQueryWrapper = new QueryWrapper<>(); - loadScanQueryWrapper.eq("load_id",loadId) - .eq("scan_code",orderPackageCode) - .eq("scan_status","1"); + loadScanQueryWrapper.eq("load_id", loadId) + .eq("scan_code", orderPackageCode) + .eq("scan_status", "1"); TrunklineCarsLoadScanEntity carsLoadScanEntity = trunklineCarsLoadScanService.getOne(loadScanQueryWrapper); //判断是否有装车扫描记录 - if(Objects.isNull(carsLoadScanEntity)){ + if (Objects.isNull(carsLoadScanEntity)) { //没有装车扫码记录 //不在计划中，则查询在哪个仓库中 DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByOrderPackageCodeAndStatus(orderPackageCode); - if(Objects.isNull(parcelListEntity)){ + if (Objects.isNull(parcelListEntity)) { //没有包件数据 //需要补装车扫记录 TrunklineCarsLoadScanEntity trunklineCarsLoadScanEntity = new TrunklineCarsLoadScanEntity(); @@ -2851,13 +2996,13 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("waybill_no",waybillNo) - .eq("load_id",loadId) - .eq("final_node_id",warehouseId) - .eq("order_code",orderCode); + queryWrapper.eq("waybill_no", waybillNo) + .eq("load_id", loadId) + .eq("final_node_id", warehouseId) + .eq("order_code", orderCode); TrunklineCarsLoadScanEntity carsLoadScanEntity = trunklineCarsLoadScanService.getOne(queryWrapper); - if(Objects.isNull(carsLoadScanEntity)){ - log.warn("#############transferUnloadZero: 零担信息不存在 waybillNo={} order_code={} loadId={} finalNodeId={}",waybillNo,orderCode,loadId,warehouseId); - return R.fail(405,"零担信息不存在"); + if (Objects.isNull(carsLoadScanEntity)) { + log.warn("#############transferUnloadZero: 零担信息不存在 waybillNo={} order_code={} loadId={} finalNodeId={}", waybillNo, orderCode, loadId, warehouseId); + return R.fail(405, "零担信息不存在"); } Integer isAbnormal = 0; @@ -3013,9 +3158,9 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl list = trunklineCarsLoadScanService.findUnloadTrayGoodsList(loadId,warehouseId,trayCode); + List list = trunklineCarsLoadScanService.findUnloadTrayGoodsList(loadId, warehouseId, trayCode); Set set = new TreeSet<>(); for (TrunklineCarsLoadScanEntity carsLoadScanEntity : list) { Integer type = carsLoadScanEntity.getType(); String scanCode = carsLoadScanEntity.getScanCode(); - if(type == 1){ + if (type == 1) { //包件 - transferUnloadPackage(loadId,scanCode,warehouseId,0,"三方中转托盘正常卸车"); - }else if(type == 2){ + transferUnloadPackage(loadId, scanCode, warehouseId, 0, "三方中转托盘正常卸车"); + } else if (type == 2) { String waybillNo = carsLoadScanEntity.getWaybillNo(); Integer num = carsLoadScanEntity.getNum(); String orderCode = carsLoadScanEntity.getOrderCode(); - transferUnloadZero(loadId,waybillNo,num,warehouseId,0,trayCode,orderCode,"三方中装托盘零担正常卸车"); + transferUnloadZero(loadId, waybillNo, num, warehouseId, 0, trayCode, orderCode, "三方中装托盘零担正常卸车"); } } //处理托盘的入库和货物的入库 - trayTypeClient.changeTrayWarehouseInfo(trayCode,warehouseId); + trayTypeClient.changeTrayWarehouseInfo(trayCode, warehouseId); return R.success("卸车成功"); } @@ -3075,15 +3220,15 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl pageList = baseMapper.findWaybillOrderListNoIsToMall(page,loadCarsDTO); + IPage pageList = baseMapper.findWaybillOrderListNoIsToMall(page, loadCarsDTO); return R.data(pageList); } @@ -3162,7 +3307,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl pageList = baseMapper.findWaybillOrderListNoIsToMall(page,loadCarsDTO); + IPage pageList = baseMapper.findWaybillOrderListNoIsToMall(page, loadCarsDTO); return R.data(pageList); } @@ -3180,7 +3325,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl pageList = trunklineLoadSignOrderService.finaSignOrderList(page,loadCarsDTO); + IPage pageList = trunklineLoadSignOrderService.finaSignOrderList(page, loadCarsDTO); return R.data(pageList); } @@ -3217,63 +3362,63 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl signScanOrderList = trunklineCarsOrderService.findSignOrderList(loadId,warehouseId); + List signScanOrderList = trunklineCarsOrderService.findSignOrderList(loadId, warehouseId); for (SignScanOrderVO signScanOrderVO : signScanOrderList) { String waybillNo = signScanOrderVO.getWaybillNo(); String orderCode = signScanOrderVO.getOrderCode(); - List signPackageList = trunklineCarsLoadScanService.findSignPackageList(loadId,warehouseId,orderCode,waybillNo); + List signPackageList = trunklineCarsLoadScanService.findSignPackageList(loadId, warehouseId, orderCode, waybillNo); signScanOrderVO.setSignPackageList(signPackageList); } - List signScanZeroOrderList = trunklineCarsOrderService.findSignZeroOrderList(loadId,warehouseId); + List signScanZeroOrderList = trunklineCarsOrderService.findSignZeroOrderList(loadId, warehouseId); for (SignScanOrderVO signScanOrderVO : signScanZeroOrderList) { String waybillNo = signScanOrderVO.getWaybillNo(); String orderCode = signScanOrderVO.getOrderCode(); - List signPackageList = trunklineCarsLoadScanService.findSignPackageList(loadId,warehouseId,orderCode,waybillNo); + List signPackageList = trunklineCarsLoadScanService.findSignPackageList(loadId, warehouseId, orderCode, waybillNo); signScanOrderVO.setSignPackageList(signPackageList); } - Map map = new HashMap<>(); - map.put("signOrder",signOrderVO); - map.put("signScanOrderList",signScanOrderList); - map.put("signScanZeroOrderList",signScanZeroOrderList); + Map map = new HashMap<>(); + map.put("signOrder", signOrderVO); + map.put("signScanOrderList", signScanOrderList); + map.put("signScanZeroOrderList", signScanZeroOrderList); return R.data(map); } @Override - public R signScanPackageCode(Long signOrderId,String orderPackageCode,String remark) { + public R signScanPackageCode(Long signOrderId, String orderPackageCode, String remark) { TrunklineLoadSignOrderEntity signOrderEntity = trunklineLoadSignOrderService.getById(signOrderId); - if(Objects.isNull(signOrderEntity)){ - log.warn("##############signScanPackageCode: 签收单信息不存在 signOrderId={}",signOrderId); - return R.fail(405,"签收单信息不存在"); + if (Objects.isNull(signOrderEntity)) { + log.warn("##############signScanPackageCode: 签收单信息不存在 signOrderId={}", signOrderId); + return R.fail(405, "签收单信息不存在"); } Long loadId = signOrderEntity.getLoadId(); Long warehouseId = signOrderEntity.getWarehouseId(); String marketName = signOrderEntity.getMallName(); TrunklineCarsLoadEntity carsLoadEntity = baseMapper.selectById(loadId); - if(Objects.isNull(carsLoadEntity)){ - log.warn("##############signScanPackageCode: 配载计划不存在 loadId={}",loadId); - return R.fail(405,"配载计划不存在"); + if (Objects.isNull(carsLoadEntity)) { + log.warn("##############signScanPackageCode: 配载计划不存在 loadId={}", loadId); + return R.fail(405, "配载计划不存在"); } String carsNo = carsLoadEntity.getCarsNo(); TrunklineCarsLoadScanEntity carsLoadScanEntity = trunklineCarsLoadScanService.findEntityByLoadIdAndOrderPackageCode(loadId, orderPackageCode); - if(Objects.isNull(carsLoadScanEntity)){ + if (Objects.isNull(carsLoadScanEntity)) { //因为没有装车记录，补装车记录 DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByOrderPackageCodeAndStatus(orderPackageCode); - if(Objects.isNull(parcelListEntity)){ + if (Objects.isNull(parcelListEntity)) { //没有找到在库的包件信息，所以是无数据包件 carsLoadScanEntity = new TrunklineCarsLoadScanEntity(); carsLoadScanEntity.setLoadId(loadId); @@ -3292,11 +3437,11 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl pageList = trunklineLoadSignOrderService.finaSignOrderList(page,loadCarsDTO); + IPage pageList = trunklineLoadSignOrderService.finaSignOrderList(page, loadCarsDTO); return R.data(pageList); } @@ -3493,7 +3638,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl pageList = trunklineLoadSignOrderService.findSignOrderDetailList(page,loadCarsDTO); + IPage pageList = trunklineLoadSignOrderService.findSignOrderDetailList(page, loadCarsDTO); return R.data(pageList); } @@ -3512,29 +3657,29 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("load_id",loadId) - .eq("node_id",warehouseId) - .eq("order_code",orderCode) - .eq("waybill_no",waybillNo); + queryWrapper.eq("load_id", loadId) + .eq("node_id", warehouseId) + .eq("order_code", orderCode) + .eq("waybill_no", waybillNo); TrunklineCarsOrderEntity one = trunklineCarsOrderService.getOne(queryWrapper); - if(Objects.isNull(one)){ + if (Objects.isNull(one)) { log.warn("############batchSign: 包件不在该车次中 "); - return R.fail(405,"包件不在该车次中"); + return R.fail(405, "包件不在该车次中"); } String isCustomer = one.getIsCustomer(); - if("0".equals(isCustomer)){ - log.warn("############batchSign: 订单不是直发商家订单 orderCode={} waybillNo={}",orderCode,waybillNo); - return R.fail(405,"订单不是直发商家订单"); + if ("0".equals(isCustomer)) { + log.warn("############batchSign: 订单不是直发商家订单 orderCode={} waybillNo={}", orderCode, waybillNo); + return R.fail(405, "订单不是直发商家订单"); } Long signOrderId = one.getSignOrderId(); Integer type = carsLoadScanEntity.getType(); - if(1 == type){ - signScanPackageCode(signOrderId,scanCode,"PC批量签收"); - }else if(2 == type){ - signZeroOrder(signOrderId,loadScanId,num,"PC批量签收"); + if (1 == type) { + signScanPackageCode(signOrderId, scanCode, "PC批量签收"); + } else if (2 == type) { + signZeroOrder(signOrderId, loadScanId, num, "PC批量签收"); } } @@ -3547,15 +3692,15 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl carsOrderEntityList = trunklineCarsOrderService.findListByLoadIdAndNodeId(loadId, warehouseId); for (TrunklineCarsOrderEntity carsOrderEntity : carsOrderEntityList) { Integer type = carsOrderEntity.getType(); - if(type.equals(1)){ + if (type.equals(1)) { //订制品订单 String orderCode = carsOrderEntity.getOrderCode(); Integer planNum = carsOrderEntity.getPlanNum(); - List entityListByOrderCode = distributionParcelListClient.findEntityListByOrderCodeAndStatus(orderCode, warehouseId,"20"); + List entityListByOrderCode = distributionParcelListClient.findEntityListByOrderCodeAndStatus(orderCode, warehouseId, "20"); int size = entityListByOrderCode.size(); - if(planNum.equals(size)){ + if (planNum.equals(size)) { for (DistributionParcelListEntity parcelListEntity : entityListByOrderCode) { String orderPackageCode = parcelListEntity.getOrderPackageCode(); //查询包件是否已经装车 TrunklineCarsLoadScanEntity carsLoadScanEntity = trunklineCarsLoadScanService.findEntityByLoadIdAndOrderPackageCode(loadId, orderPackageCode); - if(Objects.isNull(carsLoadScanEntity)){ - loadingScan(loadId,warehouseId,orderPackageCode,null,"手动一键装车"); + if (Objects.isNull(carsLoadScanEntity)) { + loadingScan(loadId, warehouseId, orderPackageCode, null, "手动一键装车"); } } } - }else if(type.equals(2)){ + } else if (type.equals(2)) { //零担订单 String orderCode = carsOrderEntity.getOrderCode(); String waybillNo = carsOrderEntity.getWaybillNo(); Integer planNum = carsOrderEntity.getPlanNum(); Integer realNum = carsOrderEntity.getRealNum(); - if(realNum.equals(0)){ - loadingZero(loadId,warehouseId,waybillNo,orderCode,null,planNum,"手动一键装车"); + if (realNum.equals(0)) { + loadingZero(loadId, warehouseId, waybillNo, orderCode, null, planNum, "手动一键装车"); } } } @@ -3624,12 +3769,12 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl ls = trunklineCarsLoadScanService.findNotUnloadZeroList(loadId,warehouseId); + List ls = trunklineCarsLoadScanService.findNotUnloadZeroList(loadId, warehouseId); return R.data(ls); } @@ -3640,44 +3785,44 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl loadingMainList = trunklineCarsLoadScanService.findLoadingListDataMain(loadId,warehouseId); + List loadingMainList = trunklineCarsLoadScanService.findLoadingListDataMain(loadId, warehouseId); for (LoadingListMainVO loadingListMainVO : loadingMainList) { Integer type = loadingListMainVO.getType(); - if(type.equals(1)){ + if (type.equals(1)) { String orderCode = loadingListMainVO.getOrderCode(); String waybillNo = loadingListMainVO.getWaybillNo(); - List goodsList = trunklineCarsLoadScanService.findLoadingListGoods(loadId,warehouseId,orderCode,waybillNo); + List goodsList = trunklineCarsLoadScanService.findLoadingListGoods(loadId, warehouseId, orderCode, waybillNo); loadingListMainVO.setGoodsList(goodsList); - }else if(type.equals(2)){ + } else if (type.equals(2)) { List goodsList = new ArrayList<>(); LoadingListGoodsVO loadingListGoodsVO = new LoadingListGoodsVO(); loadingListGoodsVO.setGoodsName("零担"); @@ -3687,7 +3832,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl unloadMainList = trunklineCarsLoadScanService.findUnloadListDataMain(loadId,warehouseId); + List unloadMainList = trunklineCarsLoadScanService.findUnloadListDataMain(loadId, warehouseId); for (LoadingListMainVO unloadMainVO : unloadMainList) { Integer type = unloadMainVO.getType(); if (type.equals(1)) { @@ -3708,15 +3853,15 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl loadScanIds) { - trunklineCarsLoadScanService.updateScanStatus(loadScanIds,"3"); + trunklineCarsLoadScanService.updateScanStatus(loadScanIds, "3"); return R.success("签收成功"); } @@ -3726,7 +3871,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("load_id",loadId) + queryWrapper.eq("load_id", loadId) .orderByAsc("create_time"); List list = trunklineCarsLoadLogService.list(queryWrapper); return R.data(list); @@ -3735,7 +3880,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("load_id",loadId) - .eq("is_deleted",0); + queryWrapper.eq("load_id", loadId) + .eq("is_deleted", 0); List list = carsLoadContractService.list(queryWrapper); return R.data(list); @@ -3757,8 +3902,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("load_id",loadId) - .eq("is_deleted",0); + queryWrapper.eq("load_id", loadId) + .eq("is_deleted", 0); List list = carsLoadFinanceService.list(queryWrapper); return R.data(list); @@ -3768,15 +3913,15 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl ls = abnormalRecordClient.findAbnormalList(carsNo); - Map map = new HashMap<>(); - map.put("abnormalList",ls); + Map map = new HashMap<>(); + map.put("abnormalList", ls); return R.data(map); } @@ -3785,35 +3930,35 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl noDataList = trunklineCarsLoadScanService.findListNoDataByLoadId(loadId); int size = noDataList.size(); - if(size != 0){ - log.warn("#################costShareByLoadId: 配载计划存在未有数据来源的包件 loadId={}",loadId); - return R.fail(405,"配载计划存在未有数据来源的包件，请先处理"); + if (size != 0) { + log.warn("#################costShareByLoadId: 配载计划存在未有数据来源的包件 loadId={}", loadId); + return R.fail(405, "配载计划存在未有数据来源的包件，请先处理"); } TrunklineCarsLoadLineEntity endLoadLineEntity = trunklineCarsLoadLineService.findEndNodeByLoadId(loadId); - if(Objects.isNull(endLoadLineEntity)){ - log.warn("#################costShareByLoadId: 配载计划最终节点信息不存在 loadId={}",loadId); - return R.fail(405,"配载计划最终节点信息不存在"); + if (Objects.isNull(endLoadLineEntity)) { + log.warn("#################costShareByLoadId: 配载计划最终节点信息不存在 loadId={}", loadId); + return R.fail(405, "配载计划最终节点信息不存在"); } String unloadStatus = endLoadLineEntity.getUnloadStatus(); - if(!unloadStatus.equals("2")){ - log.warn("#################costShareByLoadId: 配载计划最终节点还未卸车确认 loadId={}",loadId); - return R.fail(405,"配载计划最终节点还未卸车确认"); + if (!unloadStatus.equals("2")) { + log.warn("#################costShareByLoadId: 配载计划最终节点还未卸车确认 loadId={}", loadId); + return R.fail(405, "配载计划最终节点还未卸车确认"); } - carsLoadAsyncService.costShareByLoadId(loadId,carsLoadEntity); + carsLoadAsyncService.costShareByLoadId(loadId, carsLoadEntity); carsLoadEntity.setCostAllocationType("1"); carsLoadEntity.setCostAllocationAdminId(AuthUtil.getUserId()); @@ -3829,7 +3974,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl ls = trunklineCarsLoadScanService.abnormalList(page,loadCarsDTO); + IPage ls = trunklineCarsLoadScanService.abnormalList(page, loadCarsDTO); return R.data(ls); } @@ -3837,10 +3982,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl ls = trunklineCarsLoadScanService.transitOrderPageList(page,loadCarsDTO); + IPage ls = trunklineCarsLoadScanService.transitOrderPageList(page, loadCarsDTO); return R.data(ls); @@ -3928,17 +4073,17 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl ls = trayTypeClient.findAllGoodsByTrayCodeAndWarehouseId(trayCode,warehouseId); + List ls = trayTypeClient.findAllGoodsByTrayCodeAndWarehouseId(trayCode, warehouseId); List packageList = new ArrayList(); List zeroList = new ArrayList(); - for (JSONObject jsonObject:ls){ + for (JSONObject jsonObject : ls) { String associationType = jsonObject.getString("associationType"); - if("4".equals(associationType)){ + if ("4".equals(associationType)) { log.warn("#############loadingTrayInfo: 托盘上有库存品，不能整托装车"); - return R.fail(405,"托盘上有库存品，不能整托装车"); + return R.fail(405, "托盘上有库存品，不能整托装车"); } - if("1".equals(associationType)){ + if ("1".equals(associationType)) { String orderCode = jsonObject.getString("associationValue"); // JSONArray plDetail = new JSONArray(); // List plList = distributionParcelListClient.findEntityListByOrderCode(orderCode, warehouseId); @@ -3952,21 +4097,21 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl map = new HashMap<>(); - map.put("packageList",packageList); - map.put("zeroList",zeroList); + Map map = new HashMap<>(); + map.put("packageList", packageList); + map.put("zeroList", zeroList); return R.data(map); } @@ -3979,28 +4124,28 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl zeroList = loadCarsDTO.getZeroList(); TrunklineCarsLoadEntity carsLoadEntity = baseMapper.selectById(loadId); - if(Objects.isNull(carsLoadEntity)){ - log.warn("##################loadingTray: 配载or三方计划不存在 loadId={}",loadId); - return R.fail(405,"计划不存在"); + if (Objects.isNull(carsLoadEntity)) { + log.warn("##################loadingTray: 配载or三方计划不存在 loadId={}", loadId); + return R.fail(405, "计划不存在"); } TrunklineCarsLoadLineEntity carsLoadLineEntity = trunklineCarsLoadLineService.findEntityByLoadIdAndNodeId(loadId, warehouseId); - if(Objects.isNull(carsLoadLineEntity)){ - log.warn("##################loadingTray: 节点信息不存在 loadId={} warehouseId={}",loadId,warehouseId); - return R.fail(405,"节点信息不存在"); + if (Objects.isNull(carsLoadLineEntity)) { + log.warn("##################loadingTray: 节点信息不存在 loadId={} warehouseId={}", loadId, warehouseId); + return R.fail(405, "节点信息不存在"); } String nodeStatus = carsLoadLineEntity.getNodeStatus(); - if(!"10".equals(nodeStatus)){ - log.warn("##################loadingTray: 节点不是到车状态 nodeStatus={}",nodeStatus); - return R.fail(405,"节点不是到车状态"); + if (!"10".equals(nodeStatus)) { + log.warn("##################loadingTray: 节点不是到车状态 nodeStatus={}", nodeStatus); + return R.fail(405, "节点不是到车状态"); } Integer pacakagNum = 0; Integer zeroNum = 0; for (LoadingPackageDTO loadingPackageDTO : packageList) { String orderPackageCode = loadingPackageDTO.getOrderPackageCode(); - loadingScan(loadId,warehouseId,orderPackageCode,trayCode,"托盘正常装车"); + loadingScan(loadId, warehouseId, orderPackageCode, trayCode, "托盘正常装车"); pacakagNum = pacakagNum + 1; } @@ -4008,14 +4153,14 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl loadScanOrderList = trunklineCarsOrderService.findLoadScanPackageWithOrder(loadId,warehouseId); + List loadScanOrderList = trunklineCarsOrderService.findLoadScanPackageWithOrder(loadId, warehouseId); //查询已装车的零担 - List zeroList = trunklineCarsOrderService.findZeroList(loadId,warehouseId); + List zeroList = trunklineCarsOrderService.findZeroList(loadId, warehouseId); //查询异常列表 QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("load_id",loadId) - .eq("warehouse_id",warehouseId) - .eq("loading_abnormal",1); + queryWrapper.eq("load_id", loadId) + .eq("warehouse_id", warehouseId) + .eq("loading_abnormal", 1); List exceptionList = trunklineCarsLoadScanService.list(queryWrapper); TrunklineCarsLoadVO trunklineCarsLoadVO = new TrunklineCarsLoadVO(); - BeanUtil.copy(carsLoadEntity,trunklineCarsLoadVO); + BeanUtil.copy(carsLoadEntity, trunklineCarsLoadVO); String loadStatus = trunklineCarsLoadVO.getLoadStatus(); - trunklineCarsLoadVO.setLoadStatus(DictBizCache.getValue(DictBizConstant.CARS_LOAD_STATUS,loadStatus)); + trunklineCarsLoadVO.setLoadStatus(DictBizCache.getValue(DictBizConstant.CARS_LOAD_STATUS, loadStatus)); trunklineCarsLoadVO.setLoadScanOrderList(loadScanOrderList); trunklineCarsLoadVO.setZeroList(zeroList); @@ -4069,47 +4214,47 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl pageList = baseMapper.arriveUnloadPageList(page,loadCarsDTO); + IPage pageList = baseMapper.arriveUnloadPageList(page, loadCarsDTO); List records = pageList.getRecords(); for (TrunklineCarsLoadVO trunklineCarsLoadVO : records) { @@ -4185,12 +4330,12 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl loadScanQueryWrapper = new QueryWrapper<>(); - loadScanQueryWrapper.eq("load_id",loadId) - .eq("scan_code",orderPackageCode) - .eq("scan_status","1"); + loadScanQueryWrapper.eq("load_id", loadId) + .eq("scan_code", orderPackageCode) + .eq("scan_status", "1"); TrunklineCarsLoadScanEntity carsLoadScanEntity = trunklineCarsLoadScanService.getOne(loadScanQueryWrapper); //判断是否有装车扫描记录 - if(Objects.isNull(carsLoadScanEntity)){ + if (Objects.isNull(carsLoadScanEntity)) { //没有装车扫码记录 //不在计划中，则查询在哪个仓库中 DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByOrderPackageCodeAndStatus(orderPackageCode); Long loadScanId = null; - if(Objects.isNull(parcelListEntity)){ + if (Objects.isNull(parcelListEntity)) { //没有包件数据 InComingDTO inComingDTO = new InComingDTO(); @@ -4291,13 +4436,13 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("waybill_no",waybillNo) - .eq("load_id",loadId) - .eq("final_node_id",warehouseId) - .eq("order_code",orderCode); + queryWrapper.eq("waybill_no", waybillNo) + .eq("load_id", loadId) + .eq("final_node_id", warehouseId) + .eq("order_code", orderCode); TrunklineCarsLoadScanEntity carsLoadScanEntity = trunklineCarsLoadScanService.getOne(queryWrapper); - if(Objects.isNull(carsLoadScanEntity)){ - log.warn("#############unloadZero: 零担信息不存在 waybillNo={} order_code={} loadId={} finalNodeId={}",waybillNo,orderCode,loadId,warehouseId); - return R.fail(405,"零担信息不存在"); + if (Objects.isNull(carsLoadScanEntity)) { + log.warn("#############unloadZero: 零担信息不存在 waybillNo={} order_code={} loadId={} finalNodeId={}", waybillNo, orderCode, loadId, warehouseId); + return R.fail(405, "零担信息不存在"); } Integer isAbnormal = 0; @@ -4655,9 +4800,9 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl parcelListEntityList = distributionParcelListClient.findEntityListByOrderCode(orderCode, fromWarehouseId); List ls = new ArrayList<>(); for (DistributionParcelListEntity parcelListEntity : parcelListEntityList) { DistributionParcelListEntity newParcelListEntity = new DistributionParcelListEntity(); - BeanUtil.copy(parcelListEntity,newParcelListEntity); + BeanUtil.copy(parcelListEntity, newParcelListEntity); newParcelListEntity.setId(null); newParcelListEntity.setWarehouseId(warehouseId); newParcelListEntity.setWarehouse(warehouseName); @@ -4717,22 +4862,22 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl parcelListEntityList = distributionParcelListClient.findEntityListByOrderCode(orderCode, warehouseId); - if(parcelListEntityList.isEmpty()){ - log.warn("#############findLoadScanWaybillDetailList: 零担运单品类包件信息不存在 waybillNo={} warehouseId={}",orderCode,warehouseId); - return R.fail(405,"零担运单品类包件信息不存在"); + if (parcelListEntityList.isEmpty()) { + log.warn("#############findLoadScanWaybillDetailList: 零担运单品类包件信息不存在 waybillNo={} warehouseId={}", orderCode, warehouseId); + return R.fail(405, "零担运单品类包件信息不存在"); } QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("load_id",loadId) - .eq("warehouse_id",warehouseId) - .eq("order_code",orderCode); + queryWrapper.eq("load_id", loadId) + .eq("warehouse_id", warehouseId) + .eq("order_code", orderCode); List zeroLoadList = trunklineCarsLoadScanService.list(queryWrapper); List ls = new ArrayList<>(); @@ -4776,9 +4921,9 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl unloadScanOrderList = trunklineCarsLoadScanService.findPackageWithOrderList(loadId,warehouseId); + List unloadScanOrderList = trunklineCarsLoadScanService.findPackageWithOrderList(loadId, warehouseId); for (UnloadScanOrderVO unloadScanOrderVO : unloadScanOrderList) { Integer loadingNum = unloadScanOrderVO.getLoadingNum(); String waybillNo = unloadScanOrderVO.getWaybillNo(); String orderCode = unloadScanOrderVO.getOrderCode(); Integer totalNumber = trunklineAdvanceDetailService.findTotalNumByOrderCode(orderCode); unloadScanOrderVO.setTotalNumber(totalNumber); - List unloadPackageList = trunklineCarsLoadScanService.findUnloadPackageList(loadId,warehouseId,waybillNo,orderCode); + List unloadPackageList = trunklineCarsLoadScanService.findUnloadPackageList(loadId, warehouseId, waybillNo, orderCode); unloadScanOrderVO.setUnloadPackageList(unloadPackageList); } //查询已装车的零担 - List zeroList = trunklineCarsOrderService.findUnloadZeroList(loadId,warehouseId); + List zeroList = trunklineCarsOrderService.findUnloadZeroList(loadId, warehouseId); for (UnloadZeroVO unloadZeroVO : zeroList) { Integer loadingNum = unloadZeroVO.getLoadingNum(); String waybillNo = unloadZeroVO.getWaybillNo(); String orderCode = unloadZeroVO.getOrderCode(); - List unloadPackageList = trunklineCarsLoadScanService.findUnloadPackageList(loadId,warehouseId,waybillNo,orderCode); + List unloadPackageList = trunklineCarsLoadScanService.findUnloadPackageList(loadId, warehouseId, waybillNo, orderCode); unloadZeroVO.setUnloadPackageList(unloadPackageList); } //查询异常列表 QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("load_id",loadId) - .eq("unload_node_id",warehouseId) - .eq("unload_abnormal",1); + queryWrapper.eq("load_id", loadId) + .eq("unload_node_id", warehouseId) + .eq("unload_abnormal", 1); List exceptionList = trunklineCarsLoadScanService.list(queryWrapper); TrunklineCarsLoadVO trunklineCarsLoadVO = new TrunklineCarsLoadVO(); //查询计划卸车数量 - Integer planUnloadNum = trunklineCarsLoadScanService.findPlanUnloadNumByLoadIdAndFinalNodeId(loadId,warehouseId); + Integer planUnloadNum = trunklineCarsLoadScanService.findPlanUnloadNumByLoadIdAndFinalNodeId(loadId, warehouseId); TrunklineCarsLoadLineEntity loadLineEntity = trunklineCarsLoadLineService.findEntityByLoadIdAndNodeId(loadId, warehouseId); - BeanUtil.copy(carsLoadEntity,trunklineCarsLoadVO); + BeanUtil.copy(carsLoadEntity, trunklineCarsLoadVO); Integer realLoadingNumber = trunklineCarsLoadVO.getRealLoadingNumber(); Integer unloadNumber = trunklineCarsLoadVO.getUnloadNumber(); trunklineCarsLoadVO.setUnloadNumber(loadLineEntity.getUnloadNumber()); - trunklineCarsLoadVO.setRealLoadingNumber(realLoadingNumber-unloadNumber); + trunklineCarsLoadVO.setRealLoadingNumber(realLoadingNumber - unloadNumber); trunklineCarsLoadVO.setUnloadScanOrderList(unloadScanOrderList); trunklineCarsLoadVO.setUnloadZeroList(zeroList); trunklineCarsLoadVO.setExceptionList(exceptionList); @@ -4856,53 +5001,53 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl map = new HashMap<>(); + Map map = new HashMap<>(); BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(warehouseId); - if(Objects.isNull(basicdataWarehouseEntity)){ - log.warn("############findLoadInitData: 仓库信息不存在 warehouseId={}",warehouseId); - return R.fail(405,"仓库信息不存在"); + if (Objects.isNull(basicdataWarehouseEntity)) { + log.warn("############findLoadInitData: 仓库信息不存在 warehouseId={}", warehouseId); + return R.fail(405, "仓库信息不存在"); } JSONObject startWarehouseInfo = new JSONObject(); - startWarehouseInfo.put("warehouseId",warehouseId); - startWarehouseInfo.put("warehouseName",basicdataWarehouseEntity.getName()); - startWarehouseInfo.put("linkMan",basicdataWarehouseEntity.getLinkman()); - startWarehouseInfo.put("linkMobile",basicdataWarehouseEntity.getContactNumber()); - startWarehouseInfo.put("linkAddress",basicdataWarehouseEntity.getWarehouseAddress()); + startWarehouseInfo.put("warehouseId", warehouseId); + startWarehouseInfo.put("warehouseName", basicdataWarehouseEntity.getName()); + startWarehouseInfo.put("linkMan", basicdataWarehouseEntity.getLinkman()); + startWarehouseInfo.put("linkMobile", basicdataWarehouseEntity.getContactNumber()); + startWarehouseInfo.put("linkAddress", basicdataWarehouseEntity.getWarehouseAddress()); - map.put("startWarehouseInfo",startWarehouseInfo); + map.put("startWarehouseInfo", startWarehouseInfo); List loadingType = DictBizCache.getList(DictBizConstant.CARS_LOADING_TYPE); - map.put("loadingType",loadingType); + map.put("loadingType", loadingType); List chargeType = DictBizCache.getList(DictBizConstant.BILLLADING_CHARGE_TYPE); - map.put("chargeType",chargeType); + map.put("chargeType", chargeType); List loadType = DictBizCache.getList(DictBizConstant.CARS_LOAD_TYPE); - map.put("loadType",loadType); + map.put("loadType", loadType); List deliveryType = DictBizCache.getList(DictBizConstant.CARS_DELIVERY_TYPE); - map.put("deliveryType",deliveryType); + map.put("deliveryType", deliveryType); List payMethod = DictBizCache.getList(DictBizConstant.CARS_PAY_METHOD); - map.put("payMethod",payMethod); + map.put("payMethod", payMethod); List customerType = DictBizCache.getList(DictBizConstant.CARS_CUSTOMER_TYPE); - map.put("customerType",customerType); + map.put("customerType", customerType); List settlementStatus = DictBizCache.getList(DictBizConstant.CARS_SETTLEMENT_STATUS); - map.put("settlementStatus",settlementStatus); + map.put("settlementStatus", settlementStatus); return R.data(map); } @Override - public R findUnloadTrayGoodsList(Long loadId, String trayCode,Long warehouseId) { + public R findUnloadTrayGoodsList(Long loadId, String trayCode, Long warehouseId) { TrunklineCarsLoadEntity carsLoadEntity = baseMapper.selectById(loadId); - if(Objects.isNull(carsLoadEntity)){ - log.warn("###############findUnloadTrayGoodsList: 配载计划不存在 loadId={}",loadId); - return R.fail(405,"配载计划不存在"); + if (Objects.isNull(carsLoadEntity)) { + log.warn("###############findUnloadTrayGoodsList: 配载计划不存在 loadId={}", loadId); + return R.fail(405, "配载计划不存在"); } //查询该节点有没有该托盘的信息 - List list = trunklineCarsLoadScanService.findUnloadTrayGoodsList(loadId,warehouseId,trayCode); - if(list.isEmpty()){ - log.warn("###############findUnloadTrayGoodsList: 托盘上没有该节点的卸货数据 loadId={} trayCode={} warehouseId={}",loadId,trayCode,warehouseId); - return R.fail(405,"托盘上没有该节点的卸货数据"); + List list = trunklineCarsLoadScanService.findUnloadTrayGoodsList(loadId, warehouseId, trayCode); + if (list.isEmpty()) { + log.warn("###############findUnloadTrayGoodsList: 托盘上没有该节点的卸货数据 loadId={} trayCode={} warehouseId={}", loadId, trayCode, warehouseId); + return R.fail(405, "托盘上没有该节点的卸货数据"); } return R.data(list); @@ -4911,34 +5056,32 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl list = trunklineCarsLoadScanService.findUnloadTrayGoodsList(loadId,warehouseId,trayCode); + List list = trunklineCarsLoadScanService.findUnloadTrayGoodsList(loadId, warehouseId, trayCode); Set set = new TreeSet<>(); for (TrunklineCarsLoadScanEntity carsLoadScanEntity : list) { Integer type = carsLoadScanEntity.getType(); String scanCode = carsLoadScanEntity.getScanCode(); - if(type == 1){ + if (type == 1) { //包件 - unloadPackage(loadId,scanCode,warehouseId,0,"托盘正常卸车"); - }else if(type == 2){ + unloadPackage(loadId, scanCode, warehouseId, 0, "托盘正常卸车"); + } else if (type == 2) { String waybillNo = carsLoadScanEntity.getWaybillNo(); Integer num = carsLoadScanEntity.getNum(); String orderCode = carsLoadScanEntity.getOrderCode(); - unloadZero(loadId,waybillNo,num,warehouseId,0,trayCode,orderCode,"托盘零担正常卸车"); + unloadZero(loadId, waybillNo, num, warehouseId, 0, trayCode, orderCode, "托盘零担正常卸车"); } } //处理托盘的入库和货物的入库 - trayTypeClient.changeTrayWarehouseInfo(trayCode,warehouseId); + trayTypeClient.changeTrayWarehouseInfo(trayCode, warehouseId); return R.success("卸车成功"); } - - }