|
|
|
|
@ -141,6 +141,7 @@ import org.springblade.common.model.NodeFanoutMsg;
|
|
|
|
|
import org.springblade.common.model.PackageData; |
|
|
|
|
import org.springblade.common.model.workNode.DeliveryOfPickupPlanFeiVO; |
|
|
|
|
import org.springblade.common.model.workNode.DeliveryOfPickupPlanVO; |
|
|
|
|
import org.springblade.common.model.workNode.PickUpByReCheckVO; |
|
|
|
|
import org.springblade.common.model.workNode.PickUpByScanVO; |
|
|
|
|
import org.springblade.common.utils.CommonUtil; |
|
|
|
|
import org.springblade.core.log.exception.ServiceException; |
|
|
|
|
@ -3643,7 +3644,6 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
|
|
|
|
|
pickUpByScanVO.setPackageDataList(packageDataList); |
|
|
|
|
billLadingScanEntities.forEach(t -> { |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
PackageData packageData = new PackageData(); |
|
|
|
|
|
|
|
|
|
if ("1".equals(t.getMaterialType())) { |
|
|
|
|
@ -3802,6 +3802,8 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
|
|
|
|
|
List<DistributionPrintEntity> list1 = distributionPrintService.list(Wrappers.<DistributionPrintEntity>query().lambda() |
|
|
|
|
.eq(DistributionPrintEntity::getBillLadingId, s) |
|
|
|
|
); |
|
|
|
|
|
|
|
|
|
List<DistributionBillLadingScanEntity> scanEntityList = new ArrayList<>(); |
|
|
|
|
if (list1.isEmpty()) { |
|
|
|
|
return R.fail("请上传签收图片！！"); |
|
|
|
|
} |
|
|
|
|
@ -3817,7 +3819,6 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
|
|
|
|
|
if (ladingScanEntities.isEmpty()) { |
|
|
|
|
return R.fail("无签收数据!!"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
//修改提货状态
|
|
|
|
|
DistrilbutionBillLadingEntity billLadingEntity = new DistrilbutionBillLadingEntity(); |
|
|
|
|
billLadingEntity.setConditions(BillLadingStatusConstant.yiqianshou.getValue()); |
|
|
|
|
@ -3880,7 +3881,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} catch (Exception e) { |
|
|
|
|
log.error("推送失败：{}", e); |
|
|
|
|
log.error("推送失败", e); |
|
|
|
|
} |
|
|
|
|
for (DistributionBillLadingScanEntity ladingScanEntity : ladingScanEntities) { |
|
|
|
|
// 签收发送消息到工厂
|
|
|
|
|
@ -3917,19 +3918,87 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
|
|
|
|
|
distributionAsyncService.sendFactorySignforInfo(s, myCurrentWarehouse, AuthUtil.getUser()); |
|
|
|
|
} |
|
|
|
|
//处理库存品签收数据
|
|
|
|
|
updateStock(s); |
|
|
|
|
updateStock(s, scanEntityList); |
|
|
|
|
|
|
|
|
|
// 回传老系统自提数据
|
|
|
|
|
sendOldSystem(Long.parseLong(s)); |
|
|
|
|
//整理运单信息
|
|
|
|
|
handletrunklineWaybillSignLog(billLadingEntity.getId()); |
|
|
|
|
|
|
|
|
|
NodeFanoutMsg<PickUpByReCheckVO> nodeFanoutMsg = buildPickUpByReCheckVO(billLadingEntity, ladingScanEntities, myCurrentWarehouse); |
|
|
|
|
|
|
|
|
|
iDistributionNodeWorkService.billofladingSignforCheck(nodeFanoutMsg, AuthUtil.getUser()); |
|
|
|
|
} |
|
|
|
|
// 回传工厂数据
|
|
|
|
|
sendFactory(myCurrentWarehouse, parcelListIds); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return R.success("操作成功"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private NodeFanoutMsg<PickUpByReCheckVO> buildPickUpByReCheckVO(DistrilbutionBillLadingEntity billLadingEntity, List<DistributionBillLadingScanEntity> ladingScanEntities, BasicdataWarehouseEntity myCurrentWarehouse) { |
|
|
|
|
NodeFanoutMsg<org.springblade.common.model.workNode.PickUpByReCheckVO> nodeFanoutMsg = new NodeFanoutMsg(); |
|
|
|
|
nodeFanoutMsg.setBizOperation(BizOperationEnums.ADD); |
|
|
|
|
nodeFanoutMsg.setNode(WorkNodeEnums.SIGN_BILLOFLADING_REVIEW); |
|
|
|
|
nodeFanoutMsg.setWarehouse(myCurrentWarehouse.getName()); |
|
|
|
|
nodeFanoutMsg.setWarehouseId(myCurrentWarehouse.getId()); |
|
|
|
|
nodeFanoutMsg.setOperator(AuthUtil.getNickName()); |
|
|
|
|
nodeFanoutMsg.setOperatorTime(new Date()); |
|
|
|
|
nodeFanoutMsg.setTenantId(myCurrentWarehouse.getTenantId()); |
|
|
|
|
PickUpByReCheckVO pickUpByReCheckVO = new PickUpByReCheckVO(); |
|
|
|
|
pickUpByReCheckVO.setPickupBatch(billLadingEntity.getPickupBatch()); |
|
|
|
|
|
|
|
|
|
List<PackageData> packageDataList = new ArrayList<>(); |
|
|
|
|
pickUpByReCheckVO.setPackageDataList(packageDataList); |
|
|
|
|
ladingScanEntities.forEach(t -> { |
|
|
|
|
|
|
|
|
|
PackageData packageData = new PackageData(); |
|
|
|
|
|
|
|
|
|
if ("1".equals(t.getMaterialType())) { |
|
|
|
|
// 库存
|
|
|
|
|
Long stockListId = t.getStockListId(); |
|
|
|
|
DistributionStockListEntity byId = distributionStockListService.getById(stockListId); |
|
|
|
|
if (byId != null) { |
|
|
|
|
packageData.setPickupBatch(byId.getIncomingBatch()); |
|
|
|
|
packageData.setBrand(byId.getBrandName()); |
|
|
|
|
packageData.setMaterialName(byId.getDescriptionGoods()); |
|
|
|
|
packageData.setMallName(byId.getMallName()); |
|
|
|
|
packageData.setMaterialCode(byId.getCargoNumber()); |
|
|
|
|
packageData.setNumber(t.getQuantity()); |
|
|
|
|
packageData.setPackageType(PackageTypeEnums.INV); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} else if ("2".equals(t.getMaterialType())) { |
|
|
|
|
//定制品
|
|
|
|
|
packageData.setPackageCode(t.getPacketBarCode()); |
|
|
|
|
packageData.setNumber(1); |
|
|
|
|
packageData.setPackageType(PackageTypeEnums.CMP); |
|
|
|
|
} else { |
|
|
|
|
// 零担
|
|
|
|
|
packageData.setPackageType(PackageTypeEnums.LTL); |
|
|
|
|
packageData.setNumber(t.getQuantity()); |
|
|
|
|
DistributionParcelListEntity byId = distributionParcelListService.getById(t.getParcelListId()); |
|
|
|
|
if (Func.isNotEmpty(byId)) { |
|
|
|
|
packageData.setOrderCode(byId.getOrderCode()); |
|
|
|
|
if (Func.isEmpty(byId.getBrandName())) { |
|
|
|
|
DistributionStockArticleEntity stockArticleEntity = distributionStockArticleService.getById(byId.getStockArticleId()); |
|
|
|
|
if (ObjectUtils.isNotNull(stockArticleEntity)) { |
|
|
|
|
packageData.setBrand(stockArticleEntity.getBrand()); |
|
|
|
|
} |
|
|
|
|
} else { |
|
|
|
|
packageData.setBrand(byId.getBrandName()); |
|
|
|
|
} |
|
|
|
|
packageData.setWaybillNumber(byId.getWaybillNumber()); |
|
|
|
|
packageData.setProductName(byId.getFirsts()); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
packageDataList.add(packageData); |
|
|
|
|
}); |
|
|
|
|
nodeFanoutMsg.setMain(pickUpByReCheckVO); |
|
|
|
|
return nodeFanoutMsg; |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 自提签收推淞老系统 |
|
|
|
|
* |
|
|
|
|
@ -4066,12 +4135,11 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
|
|
|
|
|
/** |
|
|
|
|
* 处理提货库存品签收 |
|
|
|
|
*/ |
|
|
|
|
public void updateStock(String billId) { |
|
|
|
|
public void updateStock(String billId, List<DistributionBillLadingScanEntity> scanEntityList) { |
|
|
|
|
List<DisStockListDetailEntity> list = disStockListDetailService.list(Wrappers.<DisStockListDetailEntity>query().lambda() |
|
|
|
|
.eq(DisStockListDetailEntity::getReservationId, billId)); |
|
|
|
|
if (ObjectUtils.isNotNull(list)) { |
|
|
|
|
//处理库存
|
|
|
|
|
List<DistributionBillLadingScanEntity> scanEntityList = new ArrayList<>(); |
|
|
|
|
list.stream().filter(i -> "10".equals(i.getStockSignfoStatus())).forEach(i -> { |
|
|
|
|
//添加自提库存品记录
|
|
|
|
|
DistributionBillLadingScanEntity billLadingScan = new DistributionBillLadingScanEntity(); |
|
|
|
|
|
