|
|
@ -109,6 +109,7 @@ import com.logpm.oldproject.dto.SignPushDataUnitDTO; |
|
|
|
import com.logpm.oldproject.feign.IOldSignPushClient; |
|
|
|
import com.logpm.oldproject.feign.IOldSignPushClient; |
|
|
|
import com.logpm.trunkline.feign.ITrunklinePackageTrackLogClient; |
|
|
|
import com.logpm.trunkline.feign.ITrunklinePackageTrackLogClient; |
|
|
|
import com.logpm.warehouse.feign.IWarehouseUpdownTypeClient; |
|
|
|
import com.logpm.warehouse.feign.IWarehouseUpdownTypeClient; |
|
|
|
|
|
|
|
import com.sun.org.apache.xpath.internal.operations.Bool; |
|
|
|
import lombok.extern.log4j.Log4j2; |
|
|
|
import lombok.extern.log4j.Log4j2; |
|
|
|
import org.apache.logging.log4j.util.Strings; |
|
|
|
import org.apache.logging.log4j.util.Strings; |
|
|
|
import org.jetbrains.annotations.NotNull; |
|
|
|
import org.jetbrains.annotations.NotNull; |
|
|
@ -1266,8 +1267,9 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb |
|
|
|
// 转换仓库ID
|
|
|
|
// 转换仓库ID
|
|
|
|
// modifyWarehouseId(delivery);
|
|
|
|
// modifyWarehouseId(delivery);
|
|
|
|
|
|
|
|
|
|
|
|
Boolean b = oldSystemDataPushClient.pushOldSystemSignInfo(delivery); |
|
|
|
Map<String,Object> map = oldSystemDataPushClient.pushOldSystemSignInfo(delivery); |
|
|
|
return b; |
|
|
|
Boolean flag = (Boolean) map.get("result"); |
|
|
|
|
|
|
|
return flag; |
|
|
|
} catch (Exception e) { |
|
|
|
} catch (Exception e) { |
|
|
|
log.error(">>>>> 推送老系统自提签收信息报错", e); |
|
|
|
log.error(">>>>> 推送老系统自提签收信息报错", e); |
|
|
|
return false; |
|
|
|
return false; |
|
|
@ -3595,7 +3597,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (Func.isNotEmpty(ladingScanEntities)) { |
|
|
|
if (Func.isNotEmpty(ladingScanEntities)) { |
|
|
|
int sum = ladingScanEntities.stream().mapToInt(DistributionBillLadingScanEntity::getQuantity).sum(); |
|
|
|
int sum = ladingScanEntities.stream().filter(f->f.getMaterialType().equals("2")).mapToInt(DistributionBillLadingScanEntity::getQuantity).sum(); |
|
|
|
// if (sum == 0){
|
|
|
|
// if (sum == 0){
|
|
|
|
// //未进行任何签收扫描的操作这里需要进行拦截
|
|
|
|
// //未进行任何签收扫描的操作这里需要进行拦截
|
|
|
|
// throw new ServiceException("无签收数据");
|
|
|
|
// throw new ServiceException("无签收数据");
|
|
|
|