java_project
/
logisticsplatform-service
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

add:增加作业节点的数据推送 

文员复核
dist.1.3.0
pref_mail@163.com 7 months ago
parent
43ab208a36
commit
23c5143e17
9 changed files with 155 additions and 46 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 13
      blade-biz-common/src/main/java/org/springblade/common/constant/broadcast/FanoutConstants.java
  2. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java
  3. 13
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.java
  4. 6
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.xml
  5. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscaninvnMapper.java
  6. 6
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscaninvnMapper.xml
  7. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionNodeWorkService.java
  8. 8
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionNodeWorkServiceImpl.java
  9. 149
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java

13
blade-biz-common/src/main/java/org/springblade/common/constant/broadcast/FanoutConstants.java
Unescape View File

@ -228,6 +228,19 @@ public abstract class FanoutConstants {
}
/**
* 复核
*/
interface DeliveryAndrecheck {
String EXCHANGE = "fanout.distribution.recheck" + ModuleNameConstant.DEVAUTH;
// main: {"id":"备货任务ID", "stockupCode":"备货编码", "typeService":"服务类型 1 商 2 市 3 自", "stockupDate":"备货时间"}
interface QUEUE {
}
}
interface signfor {

2
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java
Unescape View File

@ -43,6 +43,7 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springblade.common.model.NodeFanoutMsg;
import org.springblade.common.utils.GaoDeApiUtil;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
@ -358,6 +359,7 @@ public class DistributionSignforController extends BladeController {
distributionStockupInfoService.maintenanceStockUp(distributionSignfor.getReservationId(),1);
}
// return R.status(distributionSignforService.updateById(distributionSignfor));
return r;

13
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.java
Unescape View File

@ -166,14 +166,14 @@ public interface DistributionLoadscanMapper extends BaseMapper<DistributionLoads
/**
* 查询当前客户签收数
* @param reservationId
* @param deliveryId
* @return
*/
Integer selectSigningNumByDeliveryId(@Param("deliveryId")Long deliveryId);
/**
* 查询一个配送任务的装车数
* @param id
* @param deliveryId
* @return
*/
Integer selectLoadingNumByDeliveryId(@Param("deliveryId")Long deliveryId);
@ -181,9 +181,16 @@ public interface DistributionLoadscanMapper extends BaseMapper<DistributionLoads
/**
* 判断零担订单是否完成签收
* @param reservationId
* @param parcelListId
* @param packageId
* @param reservationNum
* @return
*/
Boolean judgmentZeroPackageIsSign(@Param("reservationId") Long reservationId,@Param("packageId") Long packageId,@Param("num") Integer reservationNum);
/**
* 查询在某个预约单下签收的包间和零担
* @param reservationId
* @return
*/
List<DistributionLoadscanEntity> selectSignDataForArticleAndZero(@Param("reservationId") Long reservationId);
}

6
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.xml
Unescape View File

@ -147,4 +147,10 @@
WHERE
reservation_id = #{reservationId} AND package_id = #{packageId}
</select>
<select id="selectSignDataForArticleAndZero"
resultType="com.logpm.distribution.entity.DistributionLoadscanEntity">
SELECT * from logpm_distribution_loadscan where reservation_id=#{reservationId} and signfor_state=2
</select>
</mapper>

2
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscaninvnMapper.java
Unescape View File

@ -60,4 +60,6 @@ public interface DistributionLoadscaninvnMapper extends BaseMapper<DistributionL
Integer statisticsLoadingNum(@Param("deliveryListId") Long deliveryId);
Integer getLoadCountNum(@Param("deliveryId") Long deliveryId);
List<DistributionLoadscaninvnEntity> selectSignDataForStock(@Param("reservationId") Long reservationId);
}

6
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscaninvnMapper.xml
Unescape View File

@ -82,5 +82,11 @@
AND ldl.delivery_id = #{deliveryId}
AND ldl.scan_status != '1'
</select>
<select id="selectSignDataForStock"
resultType="com.logpm.distribution.entity.DistributionLoadscaninvnEntity">
SELECT * from logpm_distribution_loadscaninvn where reservation_id=#{reservationId} and signfor_state=2
</select>
</mapper>

2
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionNodeWorkService.java
Unescape View File

@ -70,7 +70,7 @@ public interface IDistributionNodeWorkService {
/**
* 签收复核
*/
void signForCheck();
void signForCheck(NodeFanoutMsg<DistributionSignforVO> nodeFanoutMsg, BladeUser user);
/**
* 自提签收扫描

8
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionNodeWorkServiceImpl.java
Unescape View File

@ -177,8 +177,12 @@ public class DistributionNodeWorkServiceImpl implements IDistributionNodeWorkSer
@Override
public void signForCheck() {
public void signForCheck(NodeFanoutMsg<DistributionSignforVO> nodeFanoutMsg, BladeUser user) {
try {
rabbitTemplate.convertAndSend(FanoutConstants.distribution.DeliveryAndrecheck.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg));
} catch (AmqpException e) {
log.error(">>>>>>>>>>>>>>>>>>>>>>>>>> 消息推送失败~ 请联系管理员！ ", e);
}
}
@Override

149
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
Unescape View File

@ -254,6 +254,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
@Autowired
private ILogClient logClient;
private IDistributionNodeWorkService distributionNodeWorkService;
@Override
public IPage<DistributionSignforVO> selectDistributionSignforPage(IPage<DistributionSignforVO> page, DistributionSignforVO distributionSignfor) {
@ -703,6 +704,11 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
distributionAsyncService.sendInstallToPlatform(reservationEntity);
}
// 推送作业节点数据
NodeFanoutMsg<org.springblade.common.model.DistributionSignforVO> nodeFanoutMsg = buildNodeFanoutMsgByReCheck(reservationEntity);
distributionNodeWorkService.signForCheck(nodeFanoutMsg, AuthUtil.getUser());
// // 复核作业节点推送
// iDistributionNodeWorkService.signForCheck(DistributionSignforEntity distributionSignforEntity,DistributionReservationEntity reservationEntity);
@ -712,6 +718,74 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
return R.success("操作成功");
}
private NodeFanoutMsg<org.springblade.common.model.DistributionSignforVO> buildNodeFanoutMsgByReCheck(DistributionReservationEntity reservationEntity) {
// 查询当前预约单下的定制品和零担签收数据
NodeFanoutMsg<org.springblade.common.model.DistributionSignforVO> nodeFanoutMsg = new NodeFanoutMsg();
nodeFanoutMsg.setBizOperation(BizOperationEnums.ADD);
nodeFanoutMsg.setNode(WorkNodeEnums.CLERK_REVIEW);
nodeFanoutMsg.setWarehouse(reservationEntity.getWarehouseName());
nodeFanoutMsg.setWarehouseId(reservationEntity.getWarehouseId());
nodeFanoutMsg.setOperator(AuthUtil.getTenantId());
nodeFanoutMsg.setOperatorTime(reservationEntity.getUpdateTime());
// DistributionTaskVO taskVO = buildDistributionTaskVO(distributionDeliveryListEntity, AuthUtil.getUserId());
org.springblade.common.model.DistributionSignforVO distributionLoadVO = new org.springblade.common.model.DistributionSignforVO();
distributionLoadVO.setReservationCode(reservationEntity.getReservationCode());
nodeFanoutMsg.setMain(distributionLoadVO);
List<PackageData> data = new ArrayList<>();
List<DistributionLoadscanEntity> list = distributionLoadscanMapper.selectSignDataForArticleAndZero(reservationEntity.getId());
for (DistributionLoadscanEntity distributionLoadscanEntity : list) {
PackageData packageData = new PackageData();
// 不是零担
if (distributionLoadscanEntity.getIsZero() == null) {
packageData.setPackageCode(distributionLoadscanEntity.getOrderPackageCode());
packageData.setPackageType(PackageTypeEnums.CMP);
} else {
// 零担
packageData.setPackageType(PackageTypeEnums.LTL);
packageData.setNumber(distributionLoadscanEntity.getReceivedQuantity());
DistributionParcelListEntity byId = distributionParcelListService.getById(distributionLoadscanEntity.getPackageId());
if (Func.isNotEmpty(byId)) {
packageData.setOrderCode(byId.getOrderCode());
packageData.setBrand(byId.getBrandName());
packageData.setWaybillNumber(byId.getWaybillNumber());
packageData.setProductName(byId.getFirsts());
}
}
data.add(packageData);
}
List<DistributionLoadscaninvnEntity> distributionLoadscaninvnEntities = distributionLoadscaninvnMapper.selectSignDataForStock(reservationEntity.getId());
for (DistributionLoadscaninvnEntity distributionLoadscaninvnEntity : distributionLoadscaninvnEntities) {
PackageData packageData = new PackageData();
DistributionStockListEntity byIds = distributionStockListService.getById(distributionLoadscaninvnEntity.getInventoryId());
if (Func.isNotEmpty(byIds)) {
packageData.setPackageCode(distributionLoadscaninvnEntity.getOrderPackageCode());
packageData.setBrand(byIds.getBrandName());
// packageData.setProductName(byId.getDescriptionGoods());
packageData.setMaterialCode(byIds.getCargoNumber());
packageData.setMaterialName(byIds.getDescriptionGoods());
packageData.setPickupBatch(byIds.getIncomingBatch());
packageData.setPackageType(PackageTypeEnums.INV);
}
packageData.setNumber(1);
data.add(packageData);
}
nodeFanoutMsg.setDetails(data);
return nodeFanoutMsg;
}
@Override
public R isSign(Long signingId) {
String method = "#####################DistributionSignforServiceImpl类,方法isSign";
@ -2834,10 +2908,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
// 构建新作业节点回传
NodeFanoutMsg<org.springblade.common.model.DistributionSignforVO> nodeFanoutMsg = buildDistributionSignforVO(deliveryListEntity,pushList);
iDistributionNodeWorkService.signFor(nodeFanoutMsg,AuthUtil.getUser());
NodeFanoutMsg<org.springblade.common.model.DistributionSignforVO> nodeFanoutMsg = buildDistributionSignforVO(deliveryListEntity, pushList);
iDistributionNodeWorkService.signFor(nodeFanoutMsg, AuthUtil.getUser());
return Resp.scanSuccessWithData("签收成功", str, orderPackageCodes);
@ -2865,7 +2938,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
distributionLoadVO.setDriverName(distributionLoadscanEntity.getDriverName());
distributionLoadVO.setVehicleName(distributionLoadscanEntity.getVehicleName());
DistributionReservationEntity byId = distributionReservationService.getById(distributionLoadscanEntity.getReservationId());
if(!Func.isEmpty(byId)){
if (!Func.isEmpty(byId)) {
distributionLoadVO.setReservationCode(byId.getReservationCode());
}
@ -2878,7 +2951,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
PackageData packageData = new PackageData();
DistributionStockListEntity byIds = distributionStockListService.getById(distributionParcelListEntity.getInventoryId());
if (Func.isNotEmpty(byIds)){
if (Func.isNotEmpty(byIds)) {
packageData.setPackageCode(distributionParcelListEntity.getOrderPackageCode());
packageData.setBrand(byIds.getBrandName());
// packageData.setProductName(byId.getDescriptionGoods());
packageData.setMaterialCode(byIds.getCargoNumber());
@ -2913,7 +2987,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
distributionLoadVO.setDriverName(distributionLoadscanEntity.getDriverName());
distributionLoadVO.setVehicleName(distributionLoadscanEntity.getVehicleName());
DistributionReservationEntity byId = distributionReservationService.getById(distributionLoadscanEntity.getReservationId());
if(!Func.isEmpty(byId)){
if (!Func.isEmpty(byId)) {
distributionLoadVO.setReservationCode(byId.getReservationCode());
}
@ -3533,7 +3607,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
}
List<JSONObject> jsonObjects = new ArrayList<>();
JSONObject jsonObject = new JSONObject();
jsonObject.put("code", distributionLoadscanEntity.getOrderPackageCode());
@ -3623,7 +3696,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
}
if (Func.isEmpty(loadscanEntity)) {
loadingId = distributionLoadscanEntity.getId();
distributionLoadscanService.save(distributionLoadscanEntity);
@ -3930,7 +4002,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
return R.fail(403, "配送错误");
}
List<Long> packageLockIds = new ArrayList<>();
List<DistributionLoadscaninvnEntity> pushList =new ArrayList<>();
List<DistributionLoadscaninvnEntity> pushList = new ArrayList<>();
boolean isHaveCode = detailEntities.stream().anyMatch(inven -> Func.isNotEmpty(inven.getStockPackageCode()));
@ -4087,9 +4159,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
// 作业节点数据推送
NodeFanoutMsg<org.springblade.common.model.DistributionSignforVO> nodeFanoutMsg = buildDistributionSignforVOByStock(deliveryListEntity,pushList);
NodeFanoutMsg<org.springblade.common.model.DistributionSignforVO> nodeFanoutMsg = buildDistributionSignforVOByStock(deliveryListEntity, pushList);
iDistributionNodeWorkService.signFor(nodeFanoutMsg,AuthUtil.getUser());
iDistributionNodeWorkService.signFor(nodeFanoutMsg, AuthUtil.getUser());
return Resp.scanSuccess("签收成功", str);
@ -6273,8 +6345,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
distributionLoadscanEntity.setSignforType(LoadScanSigningTypeStatusConstant.sijiqianshou.getValue());
distributionLoadscanEntity.setSigningTime(simpleDateFormat.format(new Date()));
distributionLoadscanEntity.setSigningUser(user.getNickName());
loadedNumber += parcelNumberDTO.getSigningNum() ;
receivedQuantity += parcelNumberDTO.getSigningNum() ;
loadedNumber += parcelNumberDTO.getSigningNum();
receivedQuantity += parcelNumberDTO.getSigningNum();
//进行签收数量的统计
distributionLoadscanService.updateById(distributionLoadscanEntity);
pushList.add(distributionLoadscanEntity);
@ -6399,12 +6471,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
String str = checkSignNum(distrilbutionloadingscanDTO);
// 作业节点推送
NodeFanoutMsg<org.springblade.common.model.DistributionSignforVO> nodeFanoutMsg = buildDistributionSignforVOByZero(deliveryListEntity,pushList);
NodeFanoutMsg<org.springblade.common.model.DistributionSignforVO> nodeFanoutMsg = buildDistributionSignforVOByZero(deliveryListEntity, pushList);
iDistributionNodeWorkService.signFor(nodeFanoutMsg,AuthUtil.getUser());
iDistributionNodeWorkService.signFor(nodeFanoutMsg, AuthUtil.getUser());
return Resp.scanSuccess("签收成功", str);
@ -6427,7 +6497,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
distributionLoadVO.setDriverName(distributionLoadscanEntity.getDriverName());
distributionLoadVO.setVehicleName(distributionLoadscanEntity.getVehicleName());
DistributionReservationEntity byId = distributionReservationService.getById(distributionLoadscanEntity.getReservationId());
if(!Func.isEmpty(byId)){
if (!Func.isEmpty(byId)) {
distributionLoadVO.setReservationCode(byId.getReservationCode());
}
@ -6439,7 +6509,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
packageData.setPackageType(PackageTypeEnums.LTL);
packageData.setNumber(loadscanEntity.getReceivedQuantity());
DistributionParcelListEntity byIds = distributionParcelListService.getById(loadscanEntity.getPackageId());
if(Func.isNotEmpty(byIds)){
if (Func.isNotEmpty(byIds)) {
packageData.setOrderCode(byIds.getOrderCode());
packageData.setBrand(byIds.getBrandName());
packageData.setWaybillNumber(byIds.getWaybillNumber());
@ -6450,7 +6520,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
return nodeFanoutMsg;
}
@Override
@ -6788,9 +6857,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
//查询客户信息
List<SignPushDataContactDTO> customer = distributionReservationMapper.selectPushOldCustomer(distributionSignforEntity.getReservationId());
if (customer.size()>1){
if (customer.size() > 1) {
resultMap.put("result", false);
resultMap.put("msg", "存在多个signfor信息 >>>ReservationId():"+distributionSignforEntity.getReservationId());
resultMap.put("msg", "存在多个signfor信息 >>>ReservationId():" + distributionSignforEntity.getReservationId());
}
if (Func.isNotEmpty(customer)) {
//查询客户订单
@ -6843,14 +6912,14 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
buildReservationNameAndPhone(customer);
//完成客户信息添加
delivery.setSignPushDataContactDTOs(customer);
if (Objects.isNull(delivery.getOutPhone())){
if (Objects.isNull(delivery.getOutPhone())) {
Long signUserId = customer.get(0).getSignUserId();
R<User> signforUser = userClient.userInfoById(signUserId);
if (Objects.equals(signforUser.getCode() , 200)){
if (Objects.equals(signforUser.getCode(), 200)) {
delivery.setOutPhone(signforUser.getData().getPhone());
}else {
} else {
resultMap.put("result", false);
resultMap.put("msg", "外协查询签收人电话失败:"+customer.get(0).getSignUserId());
resultMap.put("msg", "外协查询签收人电话失败:" + customer.get(0).getSignUserId());
}
}
}
@ -6862,7 +6931,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
return resultMap;
} catch (Exception e) {
resultMap.put("result", false);
resultMap.put("msg", "数据准备错误"+e.getMessage());
resultMap.put("msg", "数据准备错误" + e.getMessage());
log.error(">>>>> 推送老系统签收信息报错", e);
}
@ -6871,17 +6940,17 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
}
private List<SignPushDataUnitDTO> handleSignPushDataUnitDTOList(List<SignPushDataUnitDTO> pushOldPackageLoading) {
pushOldPackageLoading.stream().forEach(k->{
if (k.getGoods_type() == 3){
pushOldPackageLoading.stream().forEach(k -> {
if (k.getGoods_type() == 3) {
String unitNo = k.getUnitNo();
int indexOfUnitNo = unitNo.lastIndexOf("-");
if (indexOfUnitNo>0){
if (indexOfUnitNo > 0) {
unitNo.substring(indexOfUnitNo);
k.setUnitNo(unitNo);
}
String orderSelfNum = k.getOrderSelfNum();
int indexOfOrderSelfNum = orderSelfNum.lastIndexOf("-");
if (indexOfUnitNo>0){
if (indexOfUnitNo > 0) {
orderSelfNum.substring(indexOfUnitNo);
k.setOrderSelfNum(orderSelfNum);
}
@ -7059,7 +7128,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
@Override
public Map<String, Object> clerkInventoryCheckPushData(String orderPackageCode) {
Map<String,Object> resultMap = new HashMap<>();
Map<String, Object> resultMap = new HashMap<>();
try {
//查询此包件
List<DistributionLoadscaninvnEntity> loadscaninvnEntityList = distributionLoadscaninvnService.list(Wrappers.<DistributionLoadscaninvnEntity>query().lambda()
@ -7069,14 +7138,14 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
if (!loadscaninvnEntityList.isEmpty()) {
//未进行装车
resultMap.put("result", false);
resultMap.put("msg", orderPackageCode+"没有装车扫描记录");
resultMap.put("msg", orderPackageCode + "没有装车扫描记录");
return resultMap;
}
if (loadscaninvnEntityList.size()>1) {
if (loadscaninvnEntityList.size() > 1) {
//存在多个记录
resultMap.put("result", false);
resultMap.put("msg", orderPackageCode+"存在多个装车扫描记录");
resultMap.put("msg", orderPackageCode + "存在多个装车扫描记录");
return resultMap;
}
DistributionLoadscaninvnEntity loadscaninvnEntity = loadscaninvnEntityList.get(0);
@ -7087,7 +7156,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
if (Func.isEmpty(signforEntity)) {
//存在多个记录
resultMap.put("result", false);
resultMap.put("msg", orderPackageCode+"查询signfor数据错误,id:"+loadscaninvnEntity.getReservationId());
resultMap.put("msg", orderPackageCode + "查询signfor数据错误,id:" + loadscaninvnEntity.getReservationId());
return resultMap;
}
//　得到配送计划
@ -7164,8 +7233,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
if (distributionReservationEntity.getReservationStockListNum() > 0) {
//查询包件扫描签收
//查询包件扫描签收
List<SignPushDataUnitDTO> pushOldInventoryPackageLoading = distributionSignforMapper.selectPushOldSingleInventoryPackageLoading(loadscaninvnEntity.getReservationId(), loadscaninvnEntity.getDeliveryId(),orderPackageCode);
List<SignPushDataUnitDTO> pushOldInventoryPackageSigning = distributionSignforMapper.selectPushOldSingleInventoryPackageSigning(loadscaninvnEntity.getReservationId(), loadscaninvnEntity.getDeliveryId(),orderPackageCode);
List<SignPushDataUnitDTO> pushOldInventoryPackageLoading = distributionSignforMapper.selectPushOldSingleInventoryPackageLoading(loadscaninvnEntity.getReservationId(), loadscaninvnEntity.getDeliveryId(), orderPackageCode);
List<SignPushDataUnitDTO> pushOldInventoryPackageSigning = distributionSignforMapper.selectPushOldSingleInventoryPackageSigning(loadscaninvnEntity.getReservationId(), loadscaninvnEntity.getDeliveryId(), orderPackageCode);
if (Func.isNotEmpty(pushOldInventoryPackageLoading)) {
buildNameAndPhone(pushOldInventoryPackageLoading);
signPushDataUnitDTOS.addAll(pushOldInventoryPackageLoading);
@ -7198,9 +7267,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
log.info(">>>> clerkCheckPushData SignPushDataDTO :{}", delivery);
resultMap = oldSystemDataPushClient.pushOldSystemSignInfo(delivery);
return resultMap;
}catch (Exception e) {
} catch (Exception e) {
resultMap.put("result", false);
resultMap.put("msg", "数据准备错误"+e.getMessage());
resultMap.put("msg", "数据准备错误" + e.getMessage());
log.error(">>>>> 推送老系统签收信息报错", e);
}
resultMap.put("result", false);

Write Preview
Loading…
Cancel
Save