diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/DictBizConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/DictBizConstant.java index 33112603b..1c1c6b5af 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/DictBizConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/DictBizConstant.java @@ -94,6 +94,7 @@ public class DictBizConstant { // --------------2023-08-24 --------------------- public static final String RESERVATION_LIST_LOADING_STATUS = "reservation_loading_status";//预约装车状态 public static final String RESERVATION_SIGNFOR_STATUS = "reservation_signfor_status";//预约签收状态 + public static final String YES_NO = "yes_no";//预约签收状态 // --------------2023-09-01 --------------------- public static final String ORDER_PACKAGE_LOADING_STATUS = "order_package_loading_status";//预约签收状态 diff --git a/blade-ops/blade-xxljob-admin/src/main/java/com/xxl/job/admin/JobAdminApplication.java b/blade-ops/blade-xxljob-admin/src/main/java/com/xxl/job/admin/JobAdminApplication.java index cbd785609..f6a1e3e47 100644 --- a/blade-ops/blade-xxljob-admin/src/main/java/com/xxl/job/admin/JobAdminApplication.java +++ b/blade-ops/blade-xxljob-admin/src/main/java/com/xxl/job/admin/JobAdminApplication.java @@ -12,7 +12,6 @@ public class JobAdminApplication { public static void main(String[] args) { - BladeApplication.run(LauncherConstant.APPLICATION_XXLJOB_ADMIN_NAME, JobAdminApplication.class, args); } diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationEntity.java index 0dd00567e..20e3dac27 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationEntity.java @@ -297,6 +297,10 @@ public class DistributionReservationEntity extends TenantEntity { @ApiModelProperty(value = "备货结束时间") private Date endTimeStocking; - + /** + * 是否安装 + */ + @ApiModelProperty(value = "是否安装, 0-否 1- 是") + private Integer isInstall; } diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionReservationVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionReservationVO.java index 1890bd12f..f1b97d8b0 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionReservationVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionReservationVO.java @@ -91,6 +91,12 @@ public class DistributionReservationVO extends DistributionReservationEntity { @ApiModelProperty(value = "签收状态") private String warehouseAddress; + /** + * 是否安装 + */ + @ApiModelProperty(value = "是否安装") + private String isInstallName; + /** * 仓库经度 diff --git a/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/entity/MtPushData.java b/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/entity/MtPushData.java index 71e746cfc..0ab56159c 100644 --- a/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/entity/MtPushData.java +++ b/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/entity/MtPushData.java @@ -65,6 +65,11 @@ public class MtPushData extends BaseEntity { */ @ApiModelProperty(name = "推送状态", notes = " 1 已推送 0 未推送 默认未推送") private Integer pushStatus; + /** + * 推送类型 + */ + @ApiModelProperty(name = "推送类型", notes = "1 签收扫描 2 文员复核") + private Integer pushType; /** 推送时间 */ @ApiModelProperty(name = "推送时间", notes = "") private Date pushTime ; diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTrayServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTrayServiceImpl.java index fe249e30f..514cbcc82 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTrayServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTrayServiceImpl.java @@ -18,7 +18,6 @@ package com.logpm.basicdata.service.impl; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONObject; -import com.alibaba.nacos.common.utils.StringUtils; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -44,7 +43,6 @@ import com.logpm.warehouse.vo.WarehouseTraybarCode; import lombok.AllArgsConstructor; import lombok.extern.log4j.Log4j2; import org.springblade.common.constant.CodeNumConstant; -import org.springblade.common.constant.DictBizConstant; import org.springblade.common.utils.QRCodeUtil; import org.springblade.common.utils.TemplateUtil; import org.springblade.core.log.exception.ServiceException; @@ -53,15 +51,10 @@ import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; -import org.springblade.system.cache.DictBizCache; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import sun.misc.BASE64Encoder; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -233,9 +226,9 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl map = JSONObject.parseObject(JSONObject.toJSONString(trayQRCode), Map.class); String filename = QRCodeUtil.createCodeToFile(trayQRCode.getTrayCode()); - map.put("qrCode", getEmpAutograph(filename)); + map.put("qrCode", QRCodeUtil.getEmpAutograph(filename)); String fileTypeName = QRCodeUtil.createCodeToFileType(trayQRCode.getTrayCode()); - map.put("imgType", getEmpAutograph(fileTypeName)); + map.put("imgType", QRCodeUtil.getEmpAutograph(fileTypeName)); map.put("tenant","汇通物流"); data.add(map); } @@ -243,29 +236,7 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl dataResult, String mallName) { - List orderIdList = dataResult.stream() - .map(BusinessPreOrderEntity::getStockArticleId) + List orderCodeList = dataResult.stream() + .map(BusinessPreOrderEntity::getOrderCode) .collect(Collectors.toList()); R tenantByName = sysClient.getTenantByName(mallName); if (tenantByName.isSuccess()) { @@ -47,7 +48,7 @@ public class BusinessAsyncServiceImpl implements IBusinessAsyncService { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(BusinessPreOrderEntity::getInWarehouse, 0); - lambdaQueryWrapper.in(BusinessPreOrderEntity::getStockArticleId, orderIdList); + lambdaQueryWrapper.in(BusinessPreOrderEntity::getOrderCode, orderCodeList); List list = businessPreOrderService.list(lambdaQueryWrapper); @@ -55,18 +56,23 @@ public class BusinessAsyncServiceImpl implements IBusinessAsyncService { List temsp = new ArrayList<>(); for (BusinessPreOrderEntity distributionBusinessPreOrderEntity : list) { - for (BusinessPreOrderEntity businessPreOrderEntity : dataResult) { - businessPreOrderEntity.setTenantId(tenant.getTenantId()); - + for (int i = 0; i < dataResult.size(); i++) { + BusinessPreOrderEntity businessPreOrderEntity = dataResult.get(i); + businessPreOrderEntity.setTenantId(tenant.getTenantId()); if (businessPreOrderEntity.getStockArticleId().equals(distributionBusinessPreOrderEntity.getStockArticleId())) { // 找到订单 - if (businessPreOrderEntity.getOrderPackageCode().equals(distributionBusinessPreOrderEntity.getOrderPackageCode())) { //找到包件 并标记为删除状态 - temsp.add(distributionBusinessPreOrderEntity.getId()); + if (distributionBusinessPreOrderEntity.getInWarehouse().equals(1)) { + // 需要删除集合中的数据 + dataResult.remove(i); + } else { + temsp.add(distributionBusinessPreOrderEntity.getId()); + } } } + } } if (!temsp.isEmpty()) { diff --git a/blade-service/logpm-business/src/main/java/com/logpm/business/service/impl/BusinessPreOrderServiceImpl.java b/blade-service/logpm-business/src/main/java/com/logpm/business/service/impl/BusinessPreOrderServiceImpl.java index 0139e5a6e..7180e6b59 100644 --- a/blade-service/logpm-business/src/main/java/com/logpm/business/service/impl/BusinessPreOrderServiceImpl.java +++ b/blade-service/logpm-business/src/main/java/com/logpm/business/service/impl/BusinessPreOrderServiceImpl.java @@ -590,6 +590,7 @@ public class BusinessPreOrderServiceImpl extends BaseServiceImpl> traysDetail(DistributionAppDeliveryListDTO distributionDeliveryList, Query query) { - IPage pages = distributionDeliveryListService.getAppDeliveryreservationTraysPage(Condition.getPage(query),distributionDeliveryList); + public R traysDetail(DistributionAppDeliveryListDTO distributionDeliveryList) { + List pages = distributionDeliveryListService.getAppDeliveryreservationTraysPage(distributionDeliveryList); return R.data(pages); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java index 3bdc8d8ee..fe69d7e7f 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java @@ -335,7 +335,6 @@ public class DistributionSignforController extends BladeController { distributionSignforDTO.setId(distributionSignfor.getId()); distributionSignforService.updateSign(distributionSignforDTO); distributionStockupInfoService.maintenanceStockUp(distributionSignfor.getReservationId(),1); - } // return R.status(distributionSignforService.updateById(distributionSignfor)); return r; diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.java index 934c169bc..85c62f3e5 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.java @@ -181,5 +181,5 @@ public interface DistributionDeliveryInfoMapper extends BaseMapper selectAppTarysListPage(IPage page,@Param("reservationId") Long id); + List selectAppTarysListPage(@Param("reservationId") Long id); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java index 1be24666b..b28b5918c 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java @@ -261,7 +261,7 @@ public interface IDistributionDeliveryListService extends BaseService getAppDeliveryreservationTraysPage(IPage page, DistributionAppDeliveryListDTO distributionDeliveryList); + List getAppDeliveryreservationTraysPage(DistributionAppDeliveryListDTO distributionDeliveryList); /** * 异常装车 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index 9035047be..bf4d60bae 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -252,6 +252,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl distrilbutionBillPackageEntities = distrilbutionBillPackageMapper.selectList(distrilbutionBillStockEntityLambdaQueryWrapper); - // 得到所以的订单列表 - List distributionParcelListEntities = null; + List distributionParcelListEntities = new ArrayList<>(); if (!distrilbutionBillPackageEntities.isEmpty()) { List ids = distrilbutionBillPackageEntities.stream().map(DistrilbutionBillPackageEntity::getParceListId).collect(Collectors.toList()); - distributionParcelListEntities = distributionParcelListMapper.selectBatchIds(ids); - + distributionParcelListEntities = distributionParcelListMapper.selectBatchIds(ids); } + + + Map map = new HashMap<>(); map.put("自提单号", distrilbutionBillLadingEntity.getPickupBatch()); String fileTypeName = QRCodeUtil.createCodeToFile(map.get("自提单号").toString()); @@ -4864,9 +4868,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl map, List distrilbutionBillStockEntities, List distributionParcelListEntities, DistrilbutionBillLadingEntity distrilbutionBillLadingEntity) { // 查询订单集合 - Set ids = new HashSet(); - for (DistrilbutionBillStockEntity distrilbutionBillStockEntity : distrilbutionBillStockEntities) { - ids.add(distrilbutionBillStockEntity.getStockArticleId()); - } - // 得到所以的订单列表 - List distributionStockArticleEntities = distributionStockArticleMapper.selectBatchIds(ids); + int a = 1; + List> ls = new ArrayList<>(); + // 获取订单中的商城和收货单位 StringBuilder consigneeUnit = new StringBuilder(); StringBuilder mailNames = new StringBuilder(); - List> ls = new ArrayList<>(); + int hejiNum = 0; + Map m = new HashMap<>(); + + + + // 查询库存品信息 + List detailsEntities = distributionDeliveryDetailsService.list(Wrappers.query().lambda() + .eq(DistributionDeliveryDetailsEntity::getBillLadingId, distrilbutionBillLadingEntity.getId()) + .ne(DistributionDeliveryDetailsEntity::getStockStatus, ReservationOrderStatusConstant.quxiao.getValue()) + ); + if (!detailsEntities.isEmpty()) { + Map> inventoryMap = detailsEntities.stream().collect(Collectors.groupingBy(DistributionDeliveryDetailsEntity::getStockListId)); + List inventoryIds = detailsEntities.stream().map(DistributionDeliveryDetailsEntity::getStockListId).collect(Collectors.toList()); + List distributionStockListEntities = distributionStockListService.listByIds(inventoryIds); + if (!distributionStockListEntities.isEmpty()) { + for (DistributionStockListEntity distributionStockListEntity : distributionStockListEntities) { + Map tempMap = new HashMap<>(); + + tempMap.put("序号", a); + + tempMap.put("运单号", distributionStockListEntity.getIncomingBatch()); + tempMap.put("合同号", distributionStockListEntity.getOrderCode()); + tempMap.put("物料名称", distributionStockListEntity.getDescriptionGoods()); + //构建产品明细 + Map map1 = new HashMap<>(); + map1.put("物料编码",distributionStockListEntity.getCargoNumber()); + map1.put("物料单位",distributionStockListEntity.getCargoUnit()); + map1.put("物料规格",distributionStockListEntity.getCargoNorms()); + //查询此订制品库位信息 + DistributionDeliveryDetailsEntity distributionDeliveryDetailsEntity = inventoryMap.get(distributionStockListEntity.getId()).get(0); + Integer quantity = distributionDeliveryDetailsEntity.getQuantity(); + map1.put("计划数量",quantity); + hejiNum += quantity; + tempMap.put("小计", quantity); + tempMap.put("货位", ""); + tempMap.put("产品明细", map1); + tempMap.put("备货区", ""); + ls.add(tempMap); + a++; + if (!mailNames.toString().contains(distributionStockListEntity.getMarketName())) { + if (!mailNames.toString().isEmpty()) { + mailNames.append(","); + } + mailNames.append(distributionStockListEntity.getMarketName()); + } + if (!consigneeUnit.toString().contains(distributionStockListEntity.getMarketName())) { + if (!consigneeUnit.toString().isEmpty()) { + consigneeUnit.append(","); + } + consigneeUnit.append(distributionStockListEntity.getMarketName()); + } + } + } + } - int a = 1; // 构建产品明细的表头 -- 这里目前只处理了定制品和有数据的库存品，对于零担 还没有处理 List> listMapTemp = new ArrayList<>(); - Map m = new HashMap<>(); - int hejiNum = 0; for (DistributionParcelListEntity distributionParcelListEntity : distributionParcelListEntities) { if (StringUtils.isBlank(distributionParcelListEntity.getThirdProduct())) { distributionParcelListEntity.setThirdProduct("其它"); @@ -4952,98 +5002,111 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl ids = distrilbutionBillStockEntities.stream().map(DistrilbutionBillStockEntity::getStockArticleId).collect(Collectors.toList()); + // 得到所以的订单列表 + List distributionStockArticleEntities = distributionStockArticleMapper.selectBatchIds(ids); + for (DistributionStockArticleEntity distributionStockArticleEntity : distributionStockArticleEntities) { + Map tempMap = new HashMap<>(); + // 需要从所有的包件的 + List ts = new ArrayList<>(); + for (DistributionParcelListEntity distributionParcelListEntity : distributionParcelListEntities) { + if (distributionParcelListEntity.getStockArticleId().equals(distributionStockArticleEntity.getId())) { + ts.add(distributionParcelListEntity); + } + } - for (DistributionStockArticleEntity distributionStockArticleEntity : distributionStockArticleEntities) { - - // 需要从所有的包件的 - List ts = new ArrayList<>(); - for (DistributionParcelListEntity distributionParcelListEntity : distributionParcelListEntities) { - if (distributionParcelListEntity.getStockArticleId().equals(distributionStockArticleEntity.getId())) { - ts.add(distributionParcelListEntity); - } - } + if (!mailNames.toString().contains(distributionStockArticleEntity.getMallName())) { + if (!mailNames.toString().isEmpty()) { + mailNames.append(","); + } + mailNames.append(distributionStockArticleEntity.getMallName()); + } + if (!consigneeUnit.toString().contains(distributionStockArticleEntity.getConsigneeUnit())) { + if (!consigneeUnit.toString().isEmpty()) { + consigneeUnit.append(","); + } + consigneeUnit.append(distributionStockArticleEntity.getConsigneeUnit()); + } - if (!mailNames.toString().contains(distributionStockArticleEntity.getMallName())) { - if (!mailNames.toString().isEmpty()) { - mailNames.append(","); - } - mailNames.append(distributionStockArticleEntity.getMallName()); - } - if (!consigneeUnit.toString().contains(distributionStockArticleEntity.getConsigneeUnit())) { - if (!consigneeUnit.toString().isEmpty()) { - consigneeUnit.append(","); - } - consigneeUnit.append(distributionStockArticleEntity.getConsigneeUnit()); - } - Map tempMap = new HashMap<>(); + tempMap.put("序号", a); + tempMap.put("运单号", distributionStockArticleEntity.getWaybillNumber()); + tempMap.put("合同号", distributionStockArticleEntity.getOrderCode()); + String materialNameStr = buildMaterialNameStr(distributionParcelListEntities); + tempMap.put("物料名称", materialNameStr); - tempMap.put("序号", a); - tempMap.put("运单号", distributionStockArticleEntity.getWaybillNumber()); - tempMap.put("合同号", distributionStockArticleEntity.getOrderCode()); - String materialNameStr = buildMaterialNameStr(distributionParcelListEntities); - tempMap.put("物料名称", materialNameStr); + // 构建产品明细 --对于每一个订单 + buildProductDetail(tempMap, m, ts); - // 构建产品明细 --对于每一个订单 - buildProductDetail(tempMap, m, ts); + Map os = (Map) tempMap.get("产品明细"); - Map os = (Map) tempMap.get("产品明细"); + Set strings = os.keySet(); + int sumNum = 0; + for (String string : strings) { + Object o = os.get(string); + sumNum += (o != null) ? (int) o : 0; + } + tempMap.put("小计", sumNum); + hejiNum += sumNum; + // 查询货物货位 - Set strings = os.keySet(); - int sumNum = 0; - for (String string : strings) { - Object o = os.get(string); - sumNum += (o != null) ? (int) o : 0; - } - tempMap.put("小计", sumNum); - hejiNum += sumNum; - // 查询货物货位 + //通过订单id和预约id查询对应包件的库位信息 + List orderPackageCodes = ts.stream() + .map(DistributionParcelListEntity::getOrderPackageCode) // 获取每个对象的orderPackageCode + .collect(Collectors.toList()); - //通过订单id和预约id查询对应包件的库位信息 - List orderPackageCodes = ts.stream() - .map(DistributionParcelListEntity::getOrderPackageCode) // 获取每个对象的orderPackageCode - .collect(Collectors.toList()); + List orderPackageIds = ts.stream() + .map(DistributionParcelListEntity::getId) // 获取每个对象的包件ID + .collect(Collectors.toList()); + if (Func.isNotEmpty(orderPackageCodes)) { + List allocationStrList = distributionParcelListMapper.selectAllocationInforByOrderPackageCode(orderPackageCodes, distrilbutionBillLadingEntity.getWarehouseId()); + String allocationStr = StringUtils.join(allocationStrList, ","); + tempMap.put("货位", allocationStr); + } - List orderPackageIds = ts.stream() - .map(DistributionParcelListEntity::getId) // 获取每个对象的包件ID - .collect(Collectors.toList()); - if (Func.isNotEmpty(orderPackageCodes)) { - List allocationStrList = distributionParcelListMapper.selectAllocationInforByOrderPackageCode(orderPackageCodes, distrilbutionBillLadingEntity.getWarehouseId()); - String allocationStr = StringUtils.join(allocationStrList, ","); - tempMap.put("货位", allocationStr); - } + //通过订单id和预约id查询对应包件的备货区信息 + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(DistributionStockEntity::getBillLadingId, distrilbutionBillLadingEntity.getId()) + .in(DistributionStockEntity::getParcelListId, orderPackageIds); + List distributionStockEntities = distributionStockMapper.selectList(lambdaQueryWrapper); - //通过订单id和预约id查询对应包件的备货区信息 - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(DistributionStockEntity::getBillLadingId, distrilbutionBillLadingEntity.getId()) - .in(DistributionStockEntity::getParcelListId, orderPackageIds); - List distributionStockEntities = distributionStockMapper.selectList(lambdaQueryWrapper); + Set stockupAreaStrList = distributionStockEntities.stream().map(DistributionStockEntity::getStockupArea).collect(Collectors.toSet()); - Set stockupAreaStrList = distributionStockEntities.stream().map(DistributionStockEntity::getStockupArea).collect(Collectors.toSet()); + String stockupAreaStr = StringUtils.join(stockupAreaStrList, ","); + tempMap.put("备货区", stockupAreaStr); - String stockupAreaStr = StringUtils.join(stockupAreaStrList, ","); - tempMap.put("备货区", stockupAreaStr); + ls.add(tempMap); + a++; - ls.add(tempMap); - a++; + } } + + + + + + map.put("收货单单位", consigneeUnit.toString()); map.put("商场名称", mailNames.toString()); map.put("明细", ls); Map m1 = new HashMap<>(); - m1.put("产品明细", m); + if (!m.isEmpty()) { + m1.put("产品明细", m); + } m1.put("合计数量", hejiNum); map.put("合计", m1); } + /** * 构建分类明细 * @@ -5195,13 +5258,16 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl getAppDeliveryreservationTraysPage(IPage page, DistributionAppDeliveryListDTO distributionDeliveryList) { + public List getAppDeliveryreservationTraysPage( DistributionAppDeliveryListDTO distributionDeliveryList) { // ---------------------------------2023-09-25 新增托盘详情--------------------------------------------------------------------------------------- - List customList = distributionDeliveryInfoMapper.selectAppTarysListPage(page, Long.parseLong(distributionDeliveryList.getReservationId())); + List customList = distributionDeliveryInfoMapper.selectAppTarysListPage( Long.parseLong(distributionDeliveryList.getReservationId())); List a = new ArrayList<>(); customList.forEach(c -> { String trayCode = c.getTrayCode(); - List loadscanEntityList = distributionLoadscanService.list(Wrappers.query().lambda().eq(DistributionLoadscanEntity::getReservationId, distributionDeliveryList.getReservationId()).eq(DistributionLoadscanEntity::getTrayNo, trayCode).ne(DistributionLoadscanEntity::getScanStatus, "1")); + List loadscanEntityList = distributionLoadscanService.list(Wrappers.query().lambda() + .eq(DistributionLoadscanEntity::getReservationId, distributionDeliveryList.getReservationId()) + .eq(DistributionLoadscanEntity::getTrayNo, trayCode) + .ne(DistributionLoadscanEntity::getScanStatus, "1")); c.setIsScan(1); if (Func.isNotEmpty(loadscanEntityList) && loadscanEntityList.size() > 0) { c.setIsScan(2); @@ -5226,7 +5292,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl packageList = new ArrayList<>(); + JSONArray packageList = new JSONArray(); for (PackageInfoVO orderPackageDTO : packages) { advance.set("firstPackName", orderPackageDTO.getMaterialName()); advance.set("firstPackCode", orderPackageDTO.getMaterialCode()); @@ -277,7 +284,7 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl sendMsgMap = new HashMap<>(); // 构建提交参数 buildParam(entries, node, workNodeEnums, orders, noSignNumberMap, nodeOrderMap, nodeConfirmLsit, sendMsgMap); - try { - // 推送给志邦 - if (CollUtil.isNotEmpty(nodeConfirmLsit)) { - for (NodeConfirmParamDTO nodeConfirmParam : nodeConfirmLsit) { + if (CollUtil.isNotEmpty(nodeConfirmLsit)) { + for (NodeConfirmParamDTO nodeConfirmParam : nodeConfirmLsit) { + log.info("zb节点数据推送NodeConfirmParamDTO：{}", JSONUtil.toJsonStr(nodeConfirmParam)); + try { + // 推送给志邦 String key = nodeConfirmParam.getDepartCode() + nodeConfirmParam.getPlatformOrderCode(); String body = JSONUtil.toJsonStr(nodeConfirmParam); String result = null; @@ -224,14 +225,14 @@ public class ZbomNodeDataPushListener { } } } + } catch (Exception e) { + // 处理推送不成功的异常情况 + log.error("zb节点推送数据异常：{}", e); + // 保存日志 + + e.printStackTrace(); } } - } catch (Exception e) { - // 处理推送不成功的异常情况 - log.error("zb节点推送数据异常：{}", e); - // 保存日志 - - e.printStackTrace(); } } } diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/MengTianPushDataJob.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/MengTianPushDataJob.java index 0041966c2..2a70d26cb 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/MengTianPushDataJob.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/MengTianPushDataJob.java @@ -1,6 +1,7 @@ package com.logpm.factory.jobhandler; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; @@ -34,7 +35,7 @@ public class MengTianPushDataJob { private final RabbitTemplate rabbitTemplate; /** - * 定时扫描梦天手动数据 + * 定时扫描梦天手动数据 文员复核 * * @param param * @return @@ -70,12 +71,39 @@ public class MengTianPushDataJob { Map map = new HashMap<>(); String mes = com.alibaba.fastjson.JSONObject.toJSONString(dto); map.put("messageData", mes); - log.info("梦天手动回推签收数据：{}", JSONUtil.toJsonStr(map)); + log.info("梦天手动回推签收文员复核数据：{}", JSONUtil.toJsonStr(map)); rabbitTemplate.convertAndSend(RabbitConstant.MT_BUSINESS_DATA_CLERK_CHECK_2_FACTORY_EXCHANGE, RabbitConstant.MT_BUSINESS_DATA_CLERK_CHECK_2_FACTORY_ROUTING, map); - mtPushDataMapper.customPushNodeDataSended(sendTaskId); + mtPushDataMapper.customPushNodeDataSended(sendTaskId, 2); } return ReturnT.SUCCESS; } + /** + * 定时扫描梦天手动数据 签收扫描 + * + * @param param + * @return + * @throws Exception + */ + @XxlJob("mengTianCustomPushNodeScanData") + public ReturnT mengTianCustomPushNodeScanData(String param) throws Exception { + + JSONObject js = this.mtPushDataMapper.customPushNodeDataScan(); + if (ObjectUtil.isEmpty(js)) { + return ReturnT.SUCCESS; + } + JSONObject entries = new JSONObject(); + entries.set("orderPackageCode", js.getStr("unitNo")); + entries.set("operationTime", js.getStr("operateDate")); + entries.set("distributionContactId", js.getStr("sendTaskId")); + entries.set("destinationWarehouse", js.getStr("warehouse")); + Map map = new HashMap<>(); + map.put("messageData", JSONUtil.toJsonStr(entries)); + log.info("梦天手动回推签收扫描数据：{}", JSONUtil.toJsonStr(map)); + rabbitTemplate.convertAndSend(RabbitConstant.MT_BUSINESS_DATA_2_FACTORY_EXCHANGE, RabbitConstant.MT_BUSINESS_DATA_2_FACTORY_ROUTING, map); + mtPushDataMapper.customPushNodeDataSendedScan(js.getStr("unitNo"), 1); + return ReturnT.SUCCESS; + } + } diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtPushDataMapper.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtPushDataMapper.java index e92cfc747..9dc90ce0a 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtPushDataMapper.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtPushDataMapper.java @@ -4,14 +4,18 @@ import cn.hutool.json.JSONObject; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.logpm.factory.mt.dto.MtReceiveImagesDTO; import com.logpm.factory.mt.entity.MtPushData; +import org.apache.ibatis.annotations.Param; import java.util.List; public interface MtPushDataMapper extends BaseMapper { List customPushNodeData(); + JSONObject customPushNodeDataScan(); List customPushNodeDataImage(String sendTaskId); - void customPushNodeDataSended(String sendTaskId); + void customPushNodeDataSended(@Param("sendTaskId") String sendTaskId, @Param("pushType") int pushType); + + void customPushNodeDataSendedScan(@Param("unitNo") String unitNo, @Param("pushType") int pushType); } diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtPushDataMapper.xml b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtPushDataMapper.xml index 13b5c001f..55ffafb3c 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtPushDataMapper.xml +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtPushDataMapper.xml @@ -14,9 +14,24 @@ from mt_custom_push_data_package t1 join (select t.sendTaskId from mt_custom_push_data_package t - where t.sendStatus = 0 + where t.sendStatus = 0 and t.push_type = 2 group by t.sendTaskId limit 1) t2 on t1.sendTaskId = t2.sendTaskId + where t1.push_type = 2 + + select w.title warehouse, od.unitNo packetBarCode, - c.title cargoTitle, - s.title shelfTitle, - l.title goodsAllocation, ad.firstPackName firsts, ad.secondPackName `second`, ad.thirdPackName thirdProduct, @@ -138,9 +135,6 @@ from ht_order_detail od left join ht_advance_detail ad on ad.unitNo = od.unitNo left join ht_warehouse w on w.id = od.now_warehouse_id - left join ht_location l on od.location_id = l.id - left join ht_shelf s on l.shelf_id = s.id - left join ht_cargo c on s.cargo_id = c.id where od.unitNo = #{unitNo} @@ -171,9 +165,6 @@ SELECT 3 AS type, - count( 1 ) + count( 1 ) AS totalNum FROM logpm_distrilbution_bill_lading @@ -246,7 +246,7 @@ AND is_deleted = 0 AND delivery_type = #{type} - AND warehouse IN + AND warehouse_id IN #{item} @@ -268,7 +268,7 @@ AND ldrp.packet_bar_status != 2 AND ldr.delivery_type = #{type} - AND ldr.warehouse IN + AND ldr.warehouse_id IN #{item} @@ -289,7 +289,7 @@ AND ldrp.packet_bar_status != 2 AND ldr.delivery_type = #{type} - AND ldr.warehouse IN + AND ldr.warehouse_id IN #{item} @@ -311,7 +311,7 @@ AND ldl.is_deleted = 0 AND ldr.delivery_type = #{type} - AND ldr.warehouse IN + AND ldr.warehouse_id IN #{item} @@ -329,7 +329,7 @@ AND ldbp.is_deleted = 0 AND ldbl.is_deleted = 0 - AND ldbl.warehouse IN + AND ldbl.warehouse_id IN #{item} @@ -348,7 +348,7 @@ AND ldbp.is_deleted = 0 AND ldbl.is_deleted = 0 - AND ldbl.warehouse IN + AND ldbl.warehouse_id IN #{item} @@ -367,7 +367,7 @@ AND ldbp.is_deleted = 0 AND ldbl.is_deleted = 0 - AND ldbl.warehouse IN + AND ldbl.warehouse_id IN #{item} @@ -454,5 +454,222 @@ + + + + + + + + + + diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/IWarehouseIndexService.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/IWarehouseIndexService.java index 1cc196c31..572692c59 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/IWarehouseIndexService.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/IWarehouseIndexService.java @@ -3,6 +3,7 @@ package com.logpm.report.service; import com.logpm.report.dto.IndexDTO; import com.logpm.report.vo.*; import com.logpm.report.vo.indexCount.IndexDeliveryDataVO; +import com.logpm.report.vo.indexCount.IndexSignforDataVO; import java.util.List; @@ -27,4 +28,11 @@ public interface IWarehouseIndexService { * @return */ List deliveryData(IndexDTO indexDTO); + + /** + * 查询当前签收率 + * @param indexDTO + * @return + */ + List signforData(IndexDTO indexDTO); } diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/WarehouseIndexServiceImpl.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/WarehouseIndexServiceImpl.java index f6e772f41..1a1230fa0 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/WarehouseIndexServiceImpl.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/WarehouseIndexServiceImpl.java @@ -6,6 +6,7 @@ import com.logpm.report.mapper.WarehouseIndexMapper; import com.logpm.report.service.IWarehouseIndexService; import com.logpm.report.vo.*; import com.logpm.report.vo.indexCount.IndexDeliveryDataVO; +import com.logpm.report.vo.indexCount.IndexSignforDataVO; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.common.constant.DistributionTypeConstant; @@ -14,6 +15,7 @@ import org.springblade.core.tool.utils.Func; import org.springframework.stereotype.Service; import java.math.BigDecimal; +import java.text.SimpleDateFormat; import java.util.*; @Slf4j @@ -249,10 +251,10 @@ public class WarehouseIndexServiceImpl implements IWarehouseIndexService { Integer deLiveryTotalNum = warehouseIndexMapper.findDeLiveryTotalNum(indexDTO, indexDeliveryDataVO.getType()); indexDeliveryDataVO.setTotalDeliveryNum(deLiveryTotalNum); //查询总重量 - BigDecimal totalWeight = warehouseIndexMapper.findDeliveryTotalWeight(indexDTO,indexDeliveryDataVO.getType()); + BigDecimal totalWeight = warehouseIndexMapper.findDeliveryTotalWeight(indexDTO, indexDeliveryDataVO.getType()); indexDeliveryDataVO.setTotalWeight(totalWeight); //查询总包件体积 - BigDecimal totalVolume = warehouseIndexMapper.findDeliveryTotalVolume(indexDTO,indexDeliveryDataVO.getType()); + BigDecimal totalVolume = warehouseIndexMapper.findDeliveryTotalVolume(indexDTO, indexDeliveryDataVO.getType()); indexDeliveryDataVO.setTotalVolume(totalVolume); //查询在途件数 Integer totalRoadNum = warehouseIndexMapper.findDeLiveryTotalRoadNum(indexDTO, indexDeliveryDataVO.getType()); @@ -278,18 +280,100 @@ public class WarehouseIndexServiceImpl implements IWarehouseIndexService { //查询外协信息 IndexDeliveryDataVO indexTripartiteDeliveryDataVO = warehouseIndexMapper.findTripartiteTotal(indexDTO); if (Func.isNotEmpty(indexTripartiteDeliveryDataVO)) { - //查询自提总件数 + //查询外协总件数 Integer tripartiteTotalNum = warehouseIndexMapper.findTripartiteTotalNum(indexDTO); - indexDeliveryDataVO.setTotalDeliveryNum(tripartiteTotalNum); - //查询总重量 + indexTripartiteDeliveryDataVO.setTotalDeliveryNum(tripartiteTotalNum); + //查询外协总重量 BigDecimal tripartiteTotalWeight = warehouseIndexMapper.findTripartiteTotalWeight(indexDTO); - indexDeliveryDataVO.setTotalWeight(tripartiteTotalWeight); - //查询总包件体积 + indexTripartiteDeliveryDataVO.setTotalWeight(tripartiteTotalWeight); + //查询外协总包件体积 BigDecimal tripartiteTotalVolume = warehouseIndexMapper.findTripartiteTotalVolume(indexDTO); - indexDeliveryDataVO.setTotalVolume(tripartiteTotalVolume); - indexDeliveryDataVOList.add(indexDeliveryDataVO); + indexTripartiteDeliveryDataVO.setTotalVolume(tripartiteTotalVolume); + indexDeliveryDataVOList.add(indexTripartiteDeliveryDataVO); } - return indexDeliveryDataVOList; } + + @Override + public List signforData(IndexDTO indexDTO) { + List list = new ArrayList<>(); + Date date = new Date(); + SimpleDateFormat dayFormat = new SimpleDateFormat("yyyy-MM-dd"); + String day = dayFormat.format(date); + indexDTO.setDayStr(day); + IndexSignforDataVO indexSignforDayDataVO = new IndexSignforDataVO(); + indexSignforDayDataVO.setType(1); + //查询当天签收数据 + Integer daySignforNum = warehouseIndexMapper.findSignforDataByDay(indexDTO); + indexSignforDayDataVO.setSignNum(daySignforNum); + //查询当天未签收件数 + Integer dayUnSignforNum = warehouseIndexMapper.findUnSignforDataByDay(indexDTO); + indexSignforDayDataVO.setUnSignNum(dayUnSignforNum); + //计算签收率 + if (daySignforNum > 0 && (daySignforNum + dayUnSignforNum) >0){ + Double daySignforScale = (double) (daySignforNum / (daySignforNum + dayUnSignforNum) * 100); + indexSignforDayDataVO.setSignScale(daySignforScale); + }else { + indexSignforDayDataVO.setSignScale(0.00); + } + //查询当天文员复核数 + Integer dayClerkSignforNum = warehouseIndexMapper.findClerkSignforNumByDay(indexDTO); + indexSignforDayDataVO.setClerkSignNum(dayClerkSignforNum); + //查询当天计划数 + Integer dayPlanByday = warehouseIndexMapper.findPlanNumByDay(indexDTO); + //计算文员签收率 + if (dayClerkSignforNum > 0 && (dayPlanByday + dayClerkSignforNum)>0){ + Double dayClerkSignforScale = (double) (dayClerkSignforNum / (dayPlanByday + dayClerkSignforNum)); + indexSignforDayDataVO.setClerkSignforScale(dayClerkSignforScale); + } else { + indexSignforDayDataVO.setClerkSignforScale(0.00); + + } + //文员超时复核数 + Integer dayClerkOverTimeSignfoNum = warehouseIndexMapper.findClerkOverTimeNumByDay(indexDTO); + indexSignforDayDataVO.setClerkOverTimeSignfoNum(dayClerkOverTimeSignfoNum); + + + indexSignforDayDataVO.setClerkSignNum(dayClerkSignforNum); + list.add(indexSignforDayDataVO); + IndexSignforDataVO indexSignforMonthDataVO = new IndexSignforDataVO(); + indexSignforMonthDataVO.setType(2); + //查询当月签收数据 + Integer monthSignforNum = warehouseIndexMapper.findSignforDataByMonth(indexDTO); + indexSignforMonthDataVO.setSignNum(monthSignforNum); + //查询当月未签收数据 + Integer monthUnSignforNum = warehouseIndexMapper.findUnSignforDataByMonth(indexDTO); + indexSignforMonthDataVO.setUnSignNum(monthUnSignforNum); + //计算签收率 + if (monthSignforNum > 0 && (monthUnSignforNum + monthSignforNum) > 0){ + Double monthSignforScale = (double) (monthSignforNum / (monthUnSignforNum + monthSignforNum)); + indexSignforMonthDataVO.setSignScale(monthSignforScale); + }else { + indexSignforMonthDataVO.setSignScale(0.00); + + } + + //查询当月文员复核数 + Integer monthClerkSignforNum = warehouseIndexMapper.findClerkSignforNumByMonth(indexDTO); + indexSignforMonthDataVO.setClerkSignNum(monthClerkSignforNum); + Integer monthPlanByday = warehouseIndexMapper.findPlanNumByMonth(indexDTO); + if (monthClerkSignforNum > 0 && (monthPlanByday + monthClerkSignforNum)>0){ + Double monthClerkSignforScale = (double) (monthClerkSignforNum / (monthPlanByday + monthClerkSignforNum)); + indexSignforMonthDataVO.setClerkSignforScale(monthClerkSignforScale); + }else { + indexSignforMonthDataVO.setClerkSignforScale(0.00); + } + //查询当月文员复核 + Integer monthClerkOverTimeSignfoNum = warehouseIndexMapper.findClerkOverTimeNumByMonth(indexDTO); + indexSignforMonthDataVO.setClerkOverTimeSignfoNum(monthClerkOverTimeSignfoNum); + if (monthClerkOverTimeSignfoNum >0 && monthPlanByday>0){ + Double monthClerkOverTimeScale = (double) (monthClerkOverTimeSignfoNum / monthPlanByday); + indexSignforMonthDataVO.setClerkOverTimeScale(monthClerkOverTimeScale); + + }else { + indexSignforMonthDataVO.setClerkOverTimeScale(0.00); + } + list.add(indexSignforMonthDataVO); + return list; + } } diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/IndexDeliveryDataVO.java b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/IndexDeliveryDataVO.java index 5cf163b59..e061fc72a 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/IndexDeliveryDataVO.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/IndexDeliveryDataVO.java @@ -11,8 +11,8 @@ public class IndexDeliveryDataVO implements Serializable { private String type ; private Integer totalNum = 0; private Integer totalDeliveryNum = 0; - private BigDecimal totalWeight ; - private BigDecimal totalVolume ; + private BigDecimal totalWeight = BigDecimal.ZERO; + private BigDecimal totalVolume = BigDecimal.ZERO; private Integer totalRoadNum = 0; diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/IndexSignforDataVO.java b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/IndexSignforDataVO.java new file mode 100644 index 000000000..0b606fd4b --- /dev/null +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/IndexSignforDataVO.java @@ -0,0 +1,34 @@ +package com.logpm.report.vo.indexCount; + +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +@Data +public class IndexSignforDataVO implements Serializable { + + //类型 + private Integer type; + //签收数 + private Integer signNum; + //未签收数 + private Integer UnSignNum; + //文员超时为复核数 + private Integer clerkOverTimeSignfoNum; + + //文员超时为复核数 + private Double clerkOverTimeScale; + + //签收率 + private Double signScale; + //复核率 + private Double ClerkSignforScale; + //复核数 + private Integer clerkSignNum; + + + + + +} 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 bb33832da..e6cccdb71 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,15 +494,18 @@ select ltco.id carsOrderId, ltco.waybill_no waybillNo, ltco.order_code orderCode, + lww.create_time createTime, + lww.destination destination, + lww.destination_warehouse_name destinationWarehouseName, + lww.shipper shipper, + lww.consignee consignee, + lww.goods_name goodsName, ltco.plan_num planNum, ltco.real_num realNum, ltco.type type, - ldsa.mall_name consignee, - ldsa.consignee_person consigneeName, - ldsa.consignee_mobile consigneeMobile, - ldsa.consignee_address consigneeAddress, - lww.departure_warehouse_name departureWarehouseName, - lww.destination_warehouse_name destinationWarehouseName + lww.total_freight freight, + lww.remark remark, + lww.total_freight/lww.total_count*ltco.real_num price from logpm_trunkline_cars_order ltco left join logpm_distribution_stock_article ldsa on ldsa.order_code = ltco.order_code left join logpm_warehouse_waybill lww on lww.waybill_no = ltco.waybill_no diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml index add4f0cc9..66ee70422 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml @@ -398,7 +398,6 @@ left join logpm_warehouse_waybill lww on ltcls.waybill_no = lww.waybill_no where ltcls.load_id = #{loadId} and ltcls.warehouse_id = #{warehouseId} - and ltcls.warehouse_id != ltcls.unload_node_id group by ltcls.order_code, ltcls.waybill_no, ltcls.type, @@ -706,7 +705,7 @@