diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml
index 3e3bde05d..2a94fd6c1 100644
--- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml
+++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml
@@ -497,6 +497,8 @@
and date_format(from_unixtime(lawo.create_time),'%Y-%m-%d') LIKE date_format(CONCAT('%', #{param.createTime}, '%'),'%Y-%m-%d')
and lawo.process_number LIKE CONCAT('%', #{param.processNumber}, '%')
+ GROUP BY
+ lawo.id
aftersalesWorkOrder, Object workOrderStatus) {
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
index 0d5b9412b..51e8d2dc0 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
@@ -59,6 +59,7 @@ import lombok.extern.slf4j.Slf4j;
import org.jetbrains.annotations.NotNull;
import org.springblade.common.constant.CodeDesEnum;
import org.springblade.common.constant.DictBizConstant;
+import org.springblade.common.constant.Inventory.InventoryStockTypeStatusConstant;
import org.springblade.common.constant.RabbitConstant;
import org.springblade.common.constant.WorkNodeEnums;
import org.springblade.common.constant.common.IsOrNoConstant;
@@ -2389,11 +2390,12 @@ public class DistributionStockupServiceImpl extends BaseServiceImplquery().lambda()
.eq(DisStockOrdercodeRecoEntity::getCode, stockupDTO.getPacketBarCode())
@@ -2404,6 +2406,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl "2".equals(f.getMaterialType())).mapToInt(DistributionBillLadingScanEntity::getQuantity).sum();
- if (integer != sum) {
- //存在资源释放操作
- releaseBillLadingResource(Long.parseLong(s), myCurrentWarehouse, distrilbutionBillLadingEntity.getPickupBatch());
- }
+// if (integer != sum) {
+// //存在资源释放操作
+// releaseBillLadingResource(Long.parseLong(s), myCurrentWarehouse, distrilbutionBillLadingEntity.getPickupBatch());
+// }
try {
if (sum > 0) {
parcelListIds.addAll(ladingScanEntities.stream().map(DistributionBillLadingScanEntity::getParcelListId).collect(Collectors.toSet()));
@@ -4043,7 +4043,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl nodeFanoutMsg = buildPickUpByReCheckVO(billLadingEntity, ladingScanEntities, myCurrentWarehouse);
iDistributionNodeWorkService.billofladingSignforCheck(nodeFanoutMsg, AuthUtil.getUser());
-
+ //推送该自提单的包件运单信息
}
// 回传工厂数据
// sendFactory(myCurrentWarehouse, parcelListIds);
@@ -4051,6 +4051,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl {
- rz.setZeroPackageStatus(ReservationPackageStatusConstant.quxiao.getValue());
- rz.setQuantity(0);
- });
- //进行整个品类释放
- updateReservationZeroPackageEntities.addAll(reservationZeroPackageEntities);
+ for (DistributionReservationZeroPackageEntity reservationZeroPackageEntity : reservationZeroPackageEntities) {
+ DistributionReservationZeroPackageEntity cancelEntity = new DistributionReservationZeroPackageEntity();
+ cancelEntity.setId(reservationZeroPackageEntity.getId());
+ cancelEntity.setQuantity(0);
+ cancelEntity.setZeroPackageStatus(ReservationPackageStatusConstant.quxiao.getValue());
+ updateReservationZeroPackageEntities.add(cancelEntity);
+ }
}
} else {
return 0;
@@ -4133,7 +4135,8 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImplquery().lambda()
.eq(DistributionParcelNumberEntity::getParcelListId, recoveryReservationZeroPackageEntity.getParcelListId())
);
- distributionParcelNumberEntity.setDeliveryQuantity(distributionParcelNumberEntity.getDeliveryQuantity() - recoveryReservationZeroPackageEntity.getQuantity());
+ int i = distributionParcelNumberEntity.getDeliveryQuantity() - recoveryReservationZeroPackageEntity.getQuantity();
+ distributionParcelNumberEntity.setDeliveryQuantity(i);
distributionParcelNumberService.updateById(distributionParcelNumberEntity);
distributionParcelListService.maintenanceZerpPackageInfo(recoveryReservationZeroPackageEntity.getParcelListId());
}
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseConfigServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseConfigServiceImpl.java
index f4201b891..faa1752ae 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseConfigServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseConfigServiceImpl.java
@@ -12,6 +12,7 @@ import com.logpm.warehouse.service.IWarehouseConfigService;
import com.logpm.warehouse.service.IWarehouseLogService;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.apache.logging.log4j.util.Strings;
import org.springblade.common.constant.common.IsOrNoConstant;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.tool.api.R;
@@ -47,7 +48,7 @@ public class WarehouseConfigServiceImpl extends BaseServiceImpl