|
|
|
@ -3751,10 +3751,12 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
|
|
|
|
|
distributionLoadscanService.save(distributionLoadscanEntity); |
|
|
|
|
pushList.add(distributionLoadscanEntity); |
|
|
|
|
loadingId = distributionLoadscanEntity.getId(); |
|
|
|
|
pushList.add(distributionLoadscanEntity); |
|
|
|
|
} else { |
|
|
|
|
loadingId = distributionLoadscanEntity.getId(); |
|
|
|
|
content = "包件在" + myCurrentWarehouse.getName() + "由" + loadscanEntity.getSigningUser() + "扫描异常签收,装车方式:扫描装车,配送车次号:" + distributionDeliveryListEntity.getTrainNumber() + "预约任务号:" + reservationEntity.getReservationCode(); |
|
|
|
|
distributionLoadscanService.updateById(distributionLoadscanEntity); |
|
|
|
|
pushList.add(distributionLoadscanEntity); |
|
|
|
|
} |
|
|
|
|
JSONObject trunklinePackageTrackLog = handleLogJSONObject(myCurrentWarehouse, AuthUtil.getUser(), parcelListEntity.getOrderPackageCode(), content, WorkNodeEnums.DISTRIBUTION_ABNORMAL_SIGN_FOR.getCode(), distributionDeliveryListEntity.getId().toString(), parcelListEntity.getWarehouseEntryTimeEnd()); |
|
|
|
|
aaa.add(trunklinePackageTrackLog); |
|
|
|
@ -3762,7 +3764,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
|
|
|
|
|
} else { |
|
|
|
|
return Resp.scanFail("操作失败", "不属于该客户"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
break; |
|
|
|
|
case "2": |
|
|
|
|
//市配
|
|
|
|
|