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

Merge remote-tracking branch 'origin/pre-production'

master
zhenghaoyu 5 months ago
parent
2cc0217faf ccecc6f93d
commit
e2797a2853
31 changed files with 776 additions and 40 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. 5
      blade-biz-common/src/main/java/org/springblade/common/model/PackageData.java
  2. 4
      blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java
  3. 3
      blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TrayTypeDataListVO.java
  4. 2
      blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml
  5. 4
      blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalRecordServiceImpl.java
  6. 2
      blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAyscServiceImpl.java
  7. 5
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java
  8. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java
  9. 9
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml
  10. 3
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java
  11. 5
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java
  12. 9
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
  13. 2
      blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/entity/FactoryNodePushEntity.java
  14. 5
      blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/mq/NodeDataPushListener.java
  15. 209
      blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncOrderInfoToPlatform.java
  16. 5
      blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.java
  17. 12
      blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.xml
  18. 3
      blade-service/logpm-patch/src/main/java/com/logpm/patch/service/IWarehouseMappingDataService.java
  19. 10
      blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/WarehouseMappingDataServiceImpl.java
  20. 7
      blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsOrderInfoServiceImpl.java
  21. 25
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java
  22. 5
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.java
  23. 13
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml
  24. 5
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceDetailService.java
  25. 3
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadService.java
  26. 18
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/CarsLoadAsyncServiceImpl.java
  27. 2
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java
  28. 16
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java
  29. 417
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
  30. 2
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayTypeMapper.xml
  31. 4
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java

5
blade-biz-common/src/main/java/org/springblade/common/model/PackageData.java
Unescape View File

@ -8,7 +8,6 @@ import org.springblade.common.enums.PackageTypeEnums;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.List;
/**
* 提送数据
@ -75,10 +74,6 @@ public class PackageData implements Serializable {
*/
private Integer number;
/**
* 数量
*/
private Integer num;
/**
* 重量
*/

4
blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java
Unescape View File

@ -312,5 +312,9 @@ public interface IDistributionParcelListClient {
@GetMapping(API_PREFIX + "/findListByOrderPackageCodeAndStatus")
List<DistributionParcelListEntity> findListByOrderPackageCodeAndStatus(@RequestParam String orderPackageCode, @RequestParam String status);
@GetMapping(API_PREFIX + "/findOneByOrderPackageCode")
DistributionParcelListEntity findOneByOrderPackageCode(@RequestParam String orderPackageCode);
}

3
blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TrayTypeDataListVO.java
Unescape View File

@ -25,6 +25,9 @@ public class TrayTypeDataListVO implements Serializable {
private Integer orderTotalNum;//订单总件数
private Integer residueNum;//剩余件数
private String consigneeUnit;
private String consigneePerson;
private List<PositionVO> positionList = new ArrayList<>();

2
blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml
Unescape View File

@ -164,7 +164,7 @@
<if test="param.handleStatus != null and param.handleStatus == 50 "> and lawo.work_order_status in ('20') and lap.types_of = '2' </if>
<if test="param.handleStatus!= null and param.handleStatus == 30"> and lawo.work_order_status in (21,30) and lap.processing_status = '4' </if>
<if test="param.handleStatus!= null and param.handleStatus == 10 ">and lap.types_of = '2' </if>
<if test="param.handleStatus!= null and param.handleStatus == 20 ">and ((lawo.work_order_status in (80,100,70) OR lacr.warehouse_id=#{param.warehouseId})) </if>
<if test="param.handleStatus!= null and param.handleStatus == 20 ">and lawo.work_order_status in (80,100,70) </if>
<if test="param.workOrderType != null and param.workOrderType != '' ">and lawo.work_order_type = #{param.workOrderType } </if>
<if test="param.discoveryNode != null and param.discoveryNode != '' ">and lawo.discovery_node = #{param.discoveryNode } </if>
<if test="param.workOrderNumber != null and param.workOrderNumber != '' ">and lawo.work_order_number like concat('%',#{param.workOrderNumber },'%') </if>

4
blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalRecordServiceImpl.java
Unescape View File

@ -331,7 +331,7 @@ public class AftersalesAbnormalRecordServiceImpl extends BaseServiceImpl<Aftersa
packageData.setWaybillNumber(orderCode);
packageData.setProductId(goodsId);
packageData.setProductName(zeroPackageDTO.getGoodsName());
packageData.setNum(packageEnterNum);
packageData.setNumber(packageEnterNum);
packageData.setPackageType(PackageTypeEnums.INV);
packageDataList.add(packageData);
});
@ -405,7 +405,7 @@ public class AftersalesAbnormalRecordServiceImpl extends BaseServiceImpl<Aftersa
packageData.setWaybillNumber(orderCode);
packageData.setProductId(goodsId);
packageData.setProductName(goodsName);
packageData.setNum(packageNum);
packageData.setNumber(packageNum);
packageData.setPackageType(PackageTypeEnums.INV);
packageDataList.add(packageData);

2
blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAyscServiceImpl.java
Unescape View File

@ -62,7 +62,7 @@ public class AftersalesAyscServiceImpl implements IAftersalesAyscService {
orderPackageCodeList.forEach(packageCode -> {
PackageData packageData = new PackageData();
packageData.setPackageCode(packageCode);
packageData.setNum(1);
packageData.setNumber(1);
packageData.setPackageType(PackageTypeEnums.CMP);
packageDataList.add(packageData);
});

5
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java
Unescape View File

@ -664,4 +664,9 @@ public class DistributionParcelListClient implements IDistributionParcelListClie
return distributionParcelListService.findListByOrderPackageCodeAndStatus(orderPackageCode,status);
}
@Override
public DistributionParcelListEntity findOneByOrderPackageCode(String orderPackageCode) {
return distributionParcelListService.findOneByOrderPackageCode(orderPackageCode);
}
}

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

@ -342,4 +342,6 @@ public interface DistributionParcelListMapper extends BaseMapper<DistributionPar
void deleteListByOrderPackageCodes(@Param("orderPackageCodeList") List<String> orderPackageCodeList,@Param("warehouseId") Long warehouseId);
List<DistributionParcelListEntity> findListByOrderPackageCodeAndStatus(@Param("orderPackageCode") String orderPackageCode, @Param("status") String status);
DistributionParcelListEntity findOneByOrderPackageCode(@Param("orderPackageCode") String orderPackageCode);
}

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

@ -2284,4 +2284,13 @@
and is_deleted = 0
</select>
<select id="findOneByOrderPackageCode" resultType="com.logpm.distribution.entity.DistributionParcelListEntity">
select *
from logpm_distribution_parcel_list
where order_package_code = #{orderPackageCode}
and is_deleted = 0
order By create_time desc
limit 1
</select>
</mapper>

3
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java
Unescape View File

@ -316,4 +316,7 @@ public interface IDistributionParcelListService extends BaseService<Distribution
DistributionParcelListEntity findOrderPackageCodeAndStatus(String orderPackageCode, String orderPackageStatus);
List<DistributionParcelListEntity> findListByOrderPackageCodeAndStatus(String orderPackageCode, String status);
DistributionParcelListEntity findOneByOrderPackageCode(String orderPackageCode);
}

5
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java
Unescape View File

@ -1600,4 +1600,9 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
public List<DistributionParcelListEntity> findListByOrderPackageCodeAndStatus(String orderPackageCode, String status) {
return baseMapper.findListByOrderPackageCodeAndStatus(orderPackageCode,status);
}
@Override
public DistributionParcelListEntity findOneByOrderPackageCode(String orderPackageCode) {
return baseMapper.findOneByOrderPackageCode(orderPackageCode);
}
}

9
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
Unescape View File

@ -404,7 +404,9 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
//修改零担数据
updetaParcelNum(distrilbutionBillLading);
//修改图片
List<DistributionPrintEntity> printEntityList = distributionPrintService.list(Wrappers.<DistributionPrintEntity>query().lambda().eq(DistributionPrintEntity::getBillLadingId, distrilbutionBillLading.getId()));
List<DistributionPrintEntity> printEntityList = distributionPrintService.list(Wrappers.<DistributionPrintEntity>query().lambda()
.eq(DistributionPrintEntity::getBillLadingId, distrilbutionBillLading.getId())
);
if (!printEntityList.isEmpty()) {
boolean blobFlag = printEntityList.stream().anyMatch(p -> p.getSite().contains("blob"));
if (blobFlag) {
@ -623,7 +625,9 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
}
List<DistributionParcelListEntity> list1 = distributionParcelListService.list(Wrappers.<DistributionParcelListEntity>query().lambda()
.eq(DistributionParcelListEntity::getStockArticleId, i.getStockArticleId()));
.eq(DistributionParcelListEntity::getStockArticleId, i.getStockArticleId())
.eq(DistributionParcelListEntity::getIsTransfer, 0)
);
int sum = list1.stream().filter(ii -> ii.getOrderPackageReservationStatus().equals(OrderPackageReservationStatusConstant.daiyuyue.getValue())).collect(Collectors.toList()).stream().mapToInt(DistributionParcelListEntity::getQuantity).sum();
if (sum == 0) {
log.debug("####{}当前订单备货包件为空，无法创建任务！", byId.getOrderCode());
@ -2292,6 +2296,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
.ne(DistributionParcelListEntity::getOrderPackageLoadingStatus, OrderPackageLoadingStatusConstant.yizhuangche.getValue())
.ne(DistributionParcelListEntity::getOrderPackageStatus, OrderPackageStatusConstant.yichuku.getValue())
.ne(DistributionParcelListEntity::getOrderPackageStatus, OrderPackageStatusConstant.yiqianshou.getValue())
.eq(DistributionParcelListEntity::getIsTransfer, 0)
);
if (!Func.isEmpty(parcelListEntities)) {

2
blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/entity/FactoryNodePushEntity.java
Unescape View File

@ -78,7 +78,7 @@ public class FactoryNodePushEntity extends BaseEntity {
/**
* 节点
*/
@ApiModelProperty(name = "节点", notes = "")
@ApiModelProperty(name = "节点(到达目的站:1030100/包件入库:105010)", notes = "")
private String node;
/**
* 包件

5
blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/mq/NodeDataPushListener.java
Unescape View File

@ -215,7 +215,8 @@ public class NodeDataPushListener {
factoryNodePushService.save(FactoryNodePushEntity.builder()
.orderCode(orderCode)
.type(arriveFor)
.warehouse(StrUtil.equals(arriveFor, "stock") ? filterDatum.getWarehouseName() : null)
.transportNo(transportNo)
.warehouse(filterDatum.getWarehouseName())
.node(FactoryNodeEnums.END_WAREHOUSE_UNLOADING.getCode().toString())
.content(JSONUtil.toJsonStr(js))
.packageCode(packageCode)
@ -273,7 +274,7 @@ public class NodeDataPushListener {
.orderCode(sendOrderCode)
.type(arriveFor)
// 仓配数据记录仓库
.warehouse(StrUtil.equals(arriveFor, "stock") ? filterDatum.getWarehouseName() : null)
.warehouse(filterDatum.getWarehouseName())
.transportNo(transportNo)
.node(FactoryNodeEnums.FINAL_NET_ARRIVE_CAR.getCode().toString())
.content(JSONUtil.toJsonStr(js))

209
blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncOrderInfoToPlatform.java
Unescape View File

@ -3,9 +3,13 @@ package com.logpm.patch.jobhandle;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.json.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.logpm.basicdata.entity.BasicdataClientEntity;
import com.logpm.basicdata.entity.BasicdataStoreBusinessEntity;
import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
import com.logpm.distribution.entity.DistributionParcelListEntity;
import com.logpm.distribution.entity.DistributionStockArticleEntity;
import com.logpm.distribution.feign.IDistributionParcelListClient;
import com.logpm.distribution.feign.IDistributionStockArticleClient;
import com.logpm.oldproject.entity.AdvanceDetailEntity;
import com.logpm.oldproject.entity.AdvanceEntity;
@ -51,6 +55,7 @@ public class SyncOrderInfoToPlatform {
private final IOrderSyncRecordService orderSyncRecordService;
private final ISyncOrderInfoService syncOrderInfoService;
private final IDistributionStockArticleClient distributionStockArticleClient;
private final IDistributionParcelListClient distributionParcelListClient;
private final ITrunklineWaybillOrderClient waybillOrderClient;
private final ITrunklineAdvanceClient trunklineAdvanceClient;
@ -1070,4 +1075,208 @@ public class SyncOrderInfoToPlatform {
@XxlJob("syncUnloadData")
public ReturnT<String> syncUnloadData(String param) {
log.info("############syncUnloadData: 同步卸车数据 开始");
List<JSONObject> ls = warehouseMappingDataService.findAllUnloadData();
for (JSONObject json : ls) {
Integer id = json.getInt("id");
String orderPackageCode = json.getStr("orderPackageCode");
try{
log.info("###############syncUnloadData: 当前处理的包件 orderPackageCode={}",orderPackageCode);
TrunklineAdvanceDetailEntity advanceDetailEntity = trunklineAdvanceDetailClient.findEntityByOrderPackageCode(orderPackageCode);
if(Objects.isNull(advanceDetailEntity)){
log.info("############syncUnloadData: 暂存单不存在 orderPackageCode={}",orderPackageCode);
}else{
String packageStatus = advanceDetailEntity.getPackageStatus();
Long incomingWarehouseId = advanceDetailEntity.getIncomingWarehouseId();
String incomeCategoryName = advanceDetailEntity.getIncomeCategoryName();
Long nowWarehouseId = advanceDetailEntity.getNowWarehouseId();
String nowWarehouseName = advanceDetailEntity.getNowWarehouseName();
Long warehouseId = advanceDetailEntity.getWarehouseId();
String warehouseName = advanceDetailEntity.getWarehouseName();
DistributionParcelListEntity distributionParcelListEntity = distributionParcelListClient.findOneByOrderPackageCode(orderPackageCode);
if(packageStatus.equals("0")){
//未入库 判断当前包件入库最后的仓库有无数据
if(!Objects.isNull(distributionParcelListEntity)){
//如果有数据，则把暂存单入库并
advanceDetailEntity.setPackageStatus("1");
Long parcelListWarehouseId = distributionParcelListEntity.getWarehouseId();
String parcelListWarehouse = distributionParcelListEntity.getWarehouse();
//判断当前包件所在仓与导入仓库是否一致，一致则不插入
if(parcelListWarehouseId.equals(warehouseId)){
advanceDetailEntity.setIncomingWarehouseId(parcelListWarehouseId);
advanceDetailEntity.setIncomingWarehouseName(parcelListWarehouse);
}else{
//如果不一致，则把包件插入到入库仓库状态为60
advanceDetailEntity.setIncomingWarehouseId(warehouseId);
advanceDetailEntity.setIncomingWarehouseName(warehouseName);
log.info("#################syncUnloadData 1111 orderPackageCode={}",orderPackageCode);
//更新包件到指定仓并且状态为20
updateParcelListToWarehouse(advanceDetailEntity,warehouseId,"60");
}
advanceDetailEntity.setNowWarehouseId(parcelListWarehouseId);
advanceDetailEntity.setNowWarehouseName(parcelListWarehouse);
}
}else{
//暂存单包件已入库
if(!Objects.isNull(nowWarehouseId)){
//当前所在仓id不为空
if(!Objects.isNull(distributionParcelListEntity)){
//判断当前所包件所在仓有数据
Long warehouseId1 = distributionParcelListEntity.getWarehouseId();
String warehouse = distributionParcelListEntity.getWarehouse();
if(!nowWarehouseId.equals(warehouseId1)){
//判断当前仓库与包件所在仓库是否一致，不一致则判断当前所在仓包件有无入库
DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode, nowWarehouseId);
if(Objects.isNull(parcelListEntity)){
//未入库
log.info("#################syncUnloadData 22222 orderPackageCode={}",orderPackageCode);
//更新包件到指定仓并且状态为20
updateParcelListToWarehouse(advanceDetailEntity,nowWarehouseId,"20");
}else{
advanceDetailEntity.setNowWarehouseId(warehouseId1);
advanceDetailEntity.setNowWarehouseName(warehouse);
}
}
}else{
if(Objects.isNull(incomingWarehouseId)){
advanceDetailEntity.setIncomingWarehouseId(warehouseId);
advanceDetailEntity.setIncomingWarehouseName(warehouseName);
if(warehouseId.equals(nowWarehouseId)){
log.info("#################syncUnloadData 333333 orderPackageCode={}",orderPackageCode);
//更新包件到指定仓并且状态为20
updateParcelListToWarehouse(advanceDetailEntity,warehouseId,"20");
}else{
log.info("#################syncUnloadData 44444 orderPackageCode={}",orderPackageCode);
//更新包件到指定仓并且状态为20
updateParcelListToWarehouse(advanceDetailEntity,warehouseId,"60");
log.info("#################syncUnloadData 55555 orderPackageCode={}",orderPackageCode);
//更新包件到指定仓并且状态为20
updateParcelListToWarehouse(advanceDetailEntity,nowWarehouseId,"20");
}
}else{
if(nowWarehouseId.equals(incomingWarehouseId)){
log.info("#################syncUnloadData 66666 orderPackageCode={}",orderPackageCode);
//更新包件到指定仓并且状态为20
updateParcelListToWarehouse(advanceDetailEntity,nowWarehouseId,"20");
}else{
log.info("#################syncUnloadData 7777 orderPackageCode={}",orderPackageCode);
//更新包件到指定仓并且状态为20
updateParcelListToWarehouse(advanceDetailEntity,incomingWarehouseId,"60");
log.info("#################syncUnloadData 88888 orderPackageCode={}",orderPackageCode);
//更新包件到指定仓并且状态为20
updateParcelListToWarehouse(advanceDetailEntity,nowWarehouseId,"20");
}
}
}
}else{
if(!Objects.isNull(distributionParcelListEntity)){
Long warehouseId1 = distributionParcelListEntity.getWarehouseId();
String warehouse = distributionParcelListEntity.getWarehouse();
if(Objects.isNull(incomingWarehouseId)){
advanceDetailEntity.setIncomingWarehouseId(warehouseId);
advanceDetailEntity.setIncomingWarehouseName(warehouseName);
advanceDetailEntity.setNowWarehouseId(warehouseId1);
advanceDetailEntity.setNowWarehouseName(warehouse);
log.info("#################syncUnloadData 99999 orderPackageCode={}",orderPackageCode);
//更新包件到指定仓并且状态为20
updateParcelListToWarehouse(advanceDetailEntity,warehouseId,"60");
}else{
advanceDetailEntity.setNowWarehouseId(warehouseId1);
advanceDetailEntity.setNowWarehouseName(warehouse);
if(!incomingWarehouseId.equals(warehouseId1)){
log.info("#################syncUnloadData 000000 orderPackageCode={}",orderPackageCode);
//更新包件到指定仓并且状态为20
updateParcelListToWarehouse(advanceDetailEntity,incomingWarehouseId,"60");
}
}
}else{
if(Objects.isNull(incomingWarehouseId)){
advanceDetailEntity.setIncomingWarehouseId(warehouseId);
advanceDetailEntity.setIncomingWarehouseName(warehouseName);
advanceDetailEntity.setNowWarehouseId(warehouseId);
advanceDetailEntity.setNowWarehouseName(warehouseName);
log.info("#################syncUnloadData aaaaaa orderPackageCode={}",orderPackageCode);
//更新包件到指定仓并且状态为20
updateParcelListToWarehouse(advanceDetailEntity,warehouseId,"20");
}else{
advanceDetailEntity.setIncomingWarehouseId(incomingWarehouseId);
advanceDetailEntity.setIncomingWarehouseName(incomeCategoryName);
advanceDetailEntity.setNowWarehouseId(incomingWarehouseId);
advanceDetailEntity.setNowWarehouseName(incomeCategoryName);
log.info("#################syncUnloadData bbbbbbb orderPackageCode={}",orderPackageCode);
//更新包件到指定仓并且状态为20
updateParcelListToWarehouse(advanceDetailEntity,incomingWarehouseId,"20");
}
}
}
}
}
warehouseMappingDataService.updateSyncUnloadDataStatus(id,1);
}catch (Exception e){
log.warn("###############syncUnloadData: 包件处理失败 orderPackageCode={}", orderPackageCode);
}
}
log.info("############syncUnloadData: 同步卸车数据 完成");
return ReturnT.SUCCESS;
}
private void updateParcelListToWarehouse(TrunklineAdvanceDetailEntity advanceDetailEntity, Long warehouseId, String status) {
String orderPackageCode = advanceDetailEntity.getOrderPackageCode();
String orderCode = advanceDetailEntity.getOrderCode();
if("20".equals(status)){
List<DistributionParcelListEntity> list = distributionParcelListClient.findListByOrderPackageCodeAndStatus(orderPackageCode,"20");
//把list通过warehouseId进行分组
List<DistributionParcelListEntity> updateParceList = new ArrayList<>();
if(CollUtil.isNotEmpty(list)){
list.forEach(distributionParcelListEntity -> {
DistributionParcelListEntity updateEntity = new DistributionParcelListEntity();
updateEntity.setId(distributionParcelListEntity.getId());
updateEntity.setOrderPackageStatus("60");
updateParceList.add(updateEntity);
});
}
distributionParcelListClient.updateList(updateParceList);
}
}
}

5
blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.java
Unescape View File

@ -164,5 +164,10 @@ public interface WarehouseMappingDataMapper {
void deletedOrderByWaybillNo(@Param("waybillNo") String waybillNo);
void deletedBalanceOrderByWaybillNo(@Param("waybillNo") String waybillNo);
void updateSyncUnloadDataStatus(@Param("id") Integer id, @Param("status") int status);
List<JSONObject> findAllUnloadData();
}

12
blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.xml
Unescape View File

@ -553,5 +553,17 @@
where waybill_no = #{waybillNo}
</delete>
<update id="updateSyncUnloadDataStatus">
update sync_unload_data
set status = #{syncStatus}
where id = #{id}
</update>
<select id="findAllUnloadData" resultType="cn.hutool.json.JSONObject">
select id id,
order_package_code orderPackageCode
from sync_unload_data
where status = 0
</select>
</mapper>

3
blade-service/logpm-patch/src/main/java/com/logpm/patch/service/IWarehouseMappingDataService.java
Unescape View File

@ -138,5 +138,8 @@ public interface IWarehouseMappingDataService {
void deleteStatisticsdata(String waybillNo);
void updateSyncUnloadDataStatus(Integer id, int status);
List<JSONObject> findAllUnloadData();
}

10
blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/WarehouseMappingDataServiceImpl.java
Unescape View File

@ -338,4 +338,14 @@ public class WarehouseMappingDataServiceImpl implements IWarehouseMappingDataSer
warehouseMappingDataMapper.deletedBalanceOrderByWaybillNo(waybillNo);
}
@Override
public void updateSyncUnloadDataStatus(Integer id, int status) {
warehouseMappingDataMapper.updateSyncUnloadDataStatus(id,status);
}
@Override
public List<JSONObject> findAllUnloadData() {
return warehouseMappingDataMapper.findAllUnloadData();
}
}

7
blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsOrderInfoServiceImpl.java
Unescape View File

@ -504,12 +504,15 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl<StatisticsOr
for (StatisticsOrderInfoEntity orderInfoEntity : orderInfoEntities) {
if (orderInfoEntity.getTypeService() != null && orderInfoEntity.getTypeService() != 2) {
continue;
}
Integer syncFeeStatus = orderInfoEntity.getSyncFeeStatus();
Long orderId = orderInfoEntity.getId();
String orderCode = orderInfoEntity.getOrderCode();
if(syncFeeStatus == 0){
log.warn("############createReconciliationOrder: 订单还未同步数据 orderId={}",orderId);
return R.fail(405,"订单["+orderCode+"]还未同步数据");
log.warn("############createReconciliationOrder: 订单还未计算价格的数据 orderId={}",orderId);
return R.fail(405,"订单["+orderCode+"]未计算价格的数据");
}
}

25
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java
Unescape View File

@ -1397,6 +1397,9 @@ public class CarsLoadController {
// }
// loadCarsDTO.setWarehouseId(myCurrentWarehouse.getId());
if(Objects.isNull(loadId)){
log.warn(method+"配载计划id为空 loadId={}",loadId);
return R.fail(400,"配载计划id为空");
@ -1413,6 +1416,28 @@ public class CarsLoadController {
}
@ResponseBody
@PostMapping("/syncUnloadData")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "数据修复", notes = "传入loadCarsDTO")
public R syncUnloadData() {
String method = "############syncUnloadData: ";
try{
carsLoadService.syncUnloadData();
return R.success("success");
}catch (CustomerException e){
log.error(e.message,e);
return R.fail(e.code,e.message);
}catch (Exception e){
log.error(method+"系统异常",e);
return R.fail(500,"系统异常");
}
}
@ResponseBody
@PostMapping("/zeroSuppleList")
@ApiOperationSupport(order = 1)

5
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.java
Unescape View File

@ -1,5 +1,6 @@
package com.logpm.trunkline.mapper;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.logpm.trunkline.dto.AdvanceDTO;
@ -93,4 +94,8 @@ public interface TrunklineAdvanceDetailMapper extends BaseMapper<TrunklineAdvanc
Integer findIncomingNumByAdvanceIds(@Param("advanceIds") List<Long> advanceIds);
List<String> findOrderPackageCodesByAdvanceIds(@Param("advanceIds") List<Long> advanceIds);
List<JSONObject> findAllUnloadData();
void updateSyncUnloadDataStatus(@Param("id") Integer id, @Param("status") int status);
}

13
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml
Unescape View File

@ -591,4 +591,17 @@
</foreach>
</select>
<select id="findAllUnloadData" resultType="com.alibaba.fastjson.JSONObject">
select id id,
order_package_code orderPackageCode
from sync_unload_data
where status = 0
</select>
<update id="updateSyncUnloadDataStatus">
update sync_unload_data
set status = #{status}
where id = #{id}
</update>
</mapper>

5
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceDetailService.java
Unescape View File

@ -1,5 +1,6 @@
package com.logpm.trunkline.service;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.logpm.distribution.vo.OrderPackgeCodeDataVO;
import com.logpm.trunkline.dto.AdvanceDTO;
@ -110,4 +111,8 @@ public interface ITrunklineAdvanceDetailService extends BaseService<TrunklineAdv
Integer findIncomingNumByAdvanceIds(List<Long> advanceIds);
List<String> findOrderPackageCodesByAdvanceIds(List<Long> advanceIds);
List<JSONObject> findAllUnloadData();
void updateSyncUnloadDataStatus(Integer id, int status);
}

3
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadService.java
Unescape View File

@ -272,4 +272,7 @@ public interface ITrunklineCarsLoadService extends BaseService<TrunklineCarsLoad
R syncNoSystemData(Long loadId,Long warehouseId,String warehouseName);
R carsLoadDetailInfoNew(LoadCarsDTO loadCarsDTO);
void syncUnloadData();
}

18
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/CarsLoadAsyncServiceImpl.java
Unescape View File

@ -724,7 +724,7 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
packageData.setPackageCode(entity.getScanCode());
packageData.setOrderCode(entity.getOrderCode());
packageData.setWaybillNumber(entity.getWaybillNo());
packageData.setNum(entity.getNum());
packageData.setNumber(entity.getNum());
packageData.setPackageType(PackageTypeEnums.CMP);
packageDataList.add(packageData);
});
@ -742,7 +742,7 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
PackageData packageData = new PackageData();
packageData.setOrderCode(carsLoadScanEntity.getOrderCode());
packageData.setNum(zeroDetailVO.getLoadingNum());
packageData.setNumber(zeroDetailVO.getLoadingNum());
packageData.setPackageType(PackageTypeEnums.LTL);
packageData.setWaybillNumber(carsLoadScanEntity.getWaybillNo());
packageData.setProductId(zeroDetailVO.getGoodsId());
@ -801,7 +801,7 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
packageData.setPackageCode(entity.getScanCode());
packageData.setOrderCode(entity.getOrderCode());
packageData.setWaybillNumber(entity.getWaybillNo());
packageData.setNum(entity.getNum());
packageData.setNumber(entity.getNum());
packageData.setPackageType(PackageTypeEnums.CMP);
packageDataList.add(packageData);
});
@ -819,7 +819,7 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
PackageData packageData = new PackageData();
packageData.setOrderCode(carsLoadScanEntity.getOrderCode());
packageData.setNum(zeroDetailVO.getLoadingNum());
packageData.setNumber(zeroDetailVO.getLoadingNum());
packageData.setPackageType(PackageTypeEnums.LTL);
packageData.setWaybillNumber(carsLoadScanEntity.getWaybillNo());
packageData.setProductId(zeroDetailVO.getGoodsId());
@ -871,7 +871,7 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
packageData.setPackageCode(entity.getScanCode());
packageData.setOrderCode(entity.getOrderCode());
packageData.setWaybillNumber(entity.getWaybillNo());
packageData.setNum(entity.getNum());
packageData.setNumber(entity.getNum());
packageData.setPackageType(PackageTypeEnums.CMP);
packageDataList.add(packageData);
});
@ -889,7 +889,7 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
PackageData packageData = new PackageData();
packageData.setOrderCode(carsLoadScanEntity.getOrderCode());
packageData.setNum(zeroDetailVO.getLoadingNum());
packageData.setNumber(zeroDetailVO.getLoadingNum());
packageData.setPackageType(PackageTypeEnums.LTL);
packageData.setWaybillNumber(carsLoadScanEntity.getWaybillNo());
packageData.setProductId(zeroDetailVO.getGoodsId());
@ -931,7 +931,7 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
orderPackageCodeList.forEach(packageCode -> {
PackageData packageData = new PackageData();
packageData.setPackageCode(packageCode);
packageData.setNum(1);
packageData.setNumber(1);
packageData.setPackageType(PackageTypeEnums.CMP);
packageDataList.add(packageData);
});
@ -967,7 +967,7 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
sendList.forEach(zeroDetailVO -> {
PackageData packageData = new PackageData();
packageData.setOrderCode(carsLoadScanEntity.getOrderCode());
packageData.setNum(zeroDetailVO.getUnloadNum());
packageData.setNumber(zeroDetailVO.getUnloadNum());
packageData.setPackageType(PackageTypeEnums.LTL);
packageData.setWaybillNumber(carsLoadScanEntity.getWaybillNo());
packageData.setProductId(zeroDetailVO.getGoodsId());
@ -1006,7 +1006,7 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
scanEntityList.forEach(scanEntity -> {
PackageData packageData = new PackageData();
packageData.setPackageCode(scanEntity.getScanCode());
packageData.setNum(1);
packageData.setNumber(1);
packageData.setPackageType(PackageTypeEnums.CMP);
packageDataList.add(packageData);
});

2
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java
Unescape View File

@ -1104,7 +1104,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
packageData.setOrderCode(detailEntity.getWaybillNo());
packageData.setProductId(detailEntity.getProductId());
packageData.setProductName(detailEntity.getProductName());
packageData.setNum(detailEntity.getNum());
packageData.setNumber(detailEntity.getNum());
packageData.setWeight(detailEntity.getWeight());
packageData.setVolume(detailEntity.getVolume());
packageData.setPackageType(PackageTypeEnums.LTL);

16
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java
Unescape View File

@ -426,7 +426,7 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl<Trunkline
packageData.setMaterialId(detailEntity.getMaterialId());
packageData.setMaterialCode(detailEntity.getMaterialCode());
packageData.setMaterialName(detailEntity.getMaterialName());
packageData.setNum(detailEntity.getQuantity());
packageData.setNumber(detailEntity.getQuantity());
packageData.setWeight(detailEntity.getWeight());
packageData.setVolume(detailEntity.getVolume());
packageData.setPackageType(PackageTypeEnums.CMP);
@ -477,7 +477,7 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl<Trunkline
packageData.setPackageCode(detailEntity.getOrderPackageCode());
packageData.setOrderCode(detailEntity.getOrderCode());
packageData.setServiceNo(detailEntity.getServiceNum());
packageData.setNum(detailEntity.getQuantity());
packageData.setNumber(detailEntity.getQuantity());
packageData.setWeight(detailEntity.getWeight());
packageData.setVolume(detailEntity.getVolume());
packageData.setPackageType(PackageTypeEnums.CMP);
@ -525,7 +525,7 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl<Trunkline
packageData.setPackageCode(detailEntity.getOrderPackageCode());
packageData.setOrderCode(detailEntity.getOrderCode());
packageData.setServiceNo(detailEntity.getServiceNum());
packageData.setNum(detailEntity.getQuantity());
packageData.setNumber(detailEntity.getQuantity());
packageData.setWeight(detailEntity.getWeight());
packageData.setVolume(detailEntity.getVolume());
packageData.setPackageType(PackageTypeEnums.CMP);
@ -567,4 +567,14 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl<Trunkline
public List<String> findOrderPackageCodesByAdvanceIds(List<Long> advanceIds) {
return baseMapper.findOrderPackageCodesByAdvanceIds(advanceIds);
}
@Override
public List<JSONObject> findAllUnloadData() {
return baseMapper.findAllUnloadData();
}
@Override
public void updateSyncUnloadDataStatus(Integer id, int status) {
baseMapper.updateSyncUnloadDataStatus(id,status);
}
}

417
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
Unescape View File

@ -18,13 +18,13 @@ import com.logpm.aftersales.entity.AftersalesAbnormalRecordEntity;
import com.logpm.aftersales.feign.IAftersalesAbnormalRecordClient;
import com.logpm.aftersales.feign.IAftersalesWorkOrderClient;
import com.logpm.aftersales.vo.DealWithAbnormalVO;
import com.logpm.basic.entity.BasicMaterialEntity;
import com.logpm.basic.feign.IBasicMaterialClient;
import com.logpm.basicdata.entity.BasicdataClientEntity;
import com.logpm.basicdata.entity.BasicdataDriverArteryEntity;
import com.logpm.basicdata.entity.BasicdataTrayEntity;
import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
import com.logpm.basicdata.feign.IBasicdataCodeClient;
import com.logpm.basicdata.feign.IBasicdataDriverArteryClient;
import com.logpm.basicdata.feign.IBasicdataTrayClient;
import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
import com.logpm.basicdata.feign.*;
import com.logpm.distribution.dto.FindParamterDTO;
import com.logpm.distribution.dto.UpdatePackageDTO;
import com.logpm.distribution.entity.DistributionParcelListEntity;
@ -138,6 +138,9 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
private final ITrunklineCarsLoadLinePhotoService carsLoadLinePhotoService;
private final ITrunklineAdvanceService advanceService;
private final BladeRedis bladeRedis;
private final IBasicdataClientClient clientClient;
private final IBasicdataTripartiteMallClient tripartiteMallClient;
private final IBasicMaterialClient basicMaterialClient;
@Override
@ -227,6 +230,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
Integer startCarType = loadCarsDTO.getStartCarType();
Long warehouseId = loadCarsDTO.getWarehouseId();
String fullLoadRate = loadCarsDTO.getFullLoadRate();
String startDate1 = loadCarsDTO.getStartDate();//TODO 加入发车时间
BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(warehouseId);
if (Objects.isNull(warehouseEntity)) {
@ -4549,8 +4553,12 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
BigDecimal countTransportCost = carsLoadEntity.getCountTransportCost();
Integer unloadNumber = carsLoadEntity.getUnloadNumber();
BigDecimal freightPrice = countTransportCost.divide(new BigDecimal(unloadNumber),2, RoundingMode.HALF_UP);
BigDecimal freightPrice;
if(!NumberUtil.equals(unloadNumber,0)){
freightPrice = countTransportCost.divide(new BigDecimal(unloadNumber),2, RoundingMode.HALF_UP);
} else {
freightPrice = BigDecimal.ZERO;
}
List<TrunklineCarsLoadLineEntity> loadLineList = trunklineCarsLoadLineService.findListByLoadId(loadId);
@ -4821,6 +4829,391 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
return R.data(trunklineCarsLoadVO);
}
@Override
public void syncUnloadData() {
log.info("############syncUnloadData: 同步卸车数据 开始");
List<JSONObject> ls = trunklineAdvanceDetailService.findAllUnloadData();
for (JSONObject json : ls) {
Integer id = json.getInteger("id");
String orderPackageCode = json.getString("orderPackageCode");
try{
log.info("###############syncUnloadData: 当前处理的包件 orderPackageCode={}",orderPackageCode);
TrunklineAdvanceDetailEntity advanceDetailEntity = trunklineAdvanceDetailService.findEntityByOrderPackageCode(orderPackageCode);
if(Objects.isNull(advanceDetailEntity)){
log.info("############syncUnloadData: 暂存单不存在 orderPackageCode={}",orderPackageCode);
}else{
String packageStatus = advanceDetailEntity.getPackageStatus();
Long incomingWarehouseId = advanceDetailEntity.getIncomingWarehouseId();
String incomeCategoryName = advanceDetailEntity.getIncomeCategoryName();
Long nowWarehouseId = advanceDetailEntity.getNowWarehouseId();
String nowWarehouseName = advanceDetailEntity.getNowWarehouseName();
Long warehouseId = advanceDetailEntity.getWarehouseId();
String warehouseName = advanceDetailEntity.getWarehouseName();
DistributionParcelListEntity distributionParcelListEntity = distributionParcelListClient.findOneByOrderPackageCode(orderPackageCode);
if(packageStatus.equals("0")){
//未入库 判断当前包件入库最后的仓库有无数据
if(!Objects.isNull(distributionParcelListEntity)){
//如果有数据，则把暂存单入库并
advanceDetailEntity.setPackageStatus("1");
Long parcelListWarehouseId = distributionParcelListEntity.getWarehouseId();
String parcelListWarehouse = distributionParcelListEntity.getWarehouse();
//判断当前包件所在仓与导入仓库是否一致，一致则不插入
if(parcelListWarehouseId.equals(warehouseId)){
advanceDetailEntity.setIncomingWarehouseId(parcelListWarehouseId);
advanceDetailEntity.setIncomingWarehouseName(parcelListWarehouse);
}else{
//如果不一致，则把包件插入到入库仓库状态为60
advanceDetailEntity.setIncomingWarehouseId(warehouseId);
advanceDetailEntity.setIncomingWarehouseName(warehouseName);
log.info("#################syncUnloadData 1111 orderPackageCode={}",orderPackageCode);
//更新包件到指定仓并且状态为20
updateParcelListToWarehouse(advanceDetailEntity,warehouseId,"60");
}
advanceDetailEntity.setNowWarehouseId(parcelListWarehouseId);
advanceDetailEntity.setNowWarehouseName(parcelListWarehouse);
}
}else{
//暂存单包件已入库
if(!Objects.isNull(nowWarehouseId)){
//当前所在仓id不为空
if(!Objects.isNull(distributionParcelListEntity)){
//判断当前所包件所在仓有数据
Long warehouseId1 = distributionParcelListEntity.getWarehouseId();
String warehouse = distributionParcelListEntity.getWarehouse();
if(!nowWarehouseId.equals(warehouseId1)){
//判断当前仓库与包件所在仓库是否一致，不一致则判断当前所在仓包件有无入库
DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode, nowWarehouseId);
if(Objects.isNull(parcelListEntity)){
//未入库
log.info("#################syncUnloadData 22222 orderPackageCode={}",orderPackageCode);
//更新包件到指定仓并且状态为20
updateParcelListToWarehouse(advanceDetailEntity,nowWarehouseId,"20");
}else{
advanceDetailEntity.setNowWarehouseId(warehouseId1);
advanceDetailEntity.setNowWarehouseName(warehouse);
}
}
}else{
if(Objects.isNull(incomingWarehouseId)){
advanceDetailEntity.setIncomingWarehouseId(warehouseId);
advanceDetailEntity.setIncomingWarehouseName(warehouseName);
if(warehouseId.equals(nowWarehouseId)){
log.info("#################syncUnloadData 333333 orderPackageCode={}",orderPackageCode);
//更新包件到指定仓并且状态为20
updateParcelListToWarehouse(advanceDetailEntity,warehouseId,"20");
}else{
log.info("#################syncUnloadData 44444 orderPackageCode={}",orderPackageCode);
//更新包件到指定仓并且状态为20
updateParcelListToWarehouse(advanceDetailEntity,warehouseId,"60");
log.info("#################syncUnloadData 55555 orderPackageCode={}",orderPackageCode);
//更新包件到指定仓并且状态为20
updateParcelListToWarehouse(advanceDetailEntity,nowWarehouseId,"20");
}
}else{
if(nowWarehouseId.equals(incomingWarehouseId)){
log.info("#################syncUnloadData 66666 orderPackageCode={}",orderPackageCode);
//更新包件到指定仓并且状态为20
updateParcelListToWarehouse(advanceDetailEntity,nowWarehouseId,"20");
}else{
log.info("#################syncUnloadData 7777 orderPackageCode={}",orderPackageCode);
//更新包件到指定仓并且状态为20
updateParcelListToWarehouse(advanceDetailEntity,incomingWarehouseId,"60");
log.info("#################syncUnloadData 88888 orderPackageCode={}",orderPackageCode);
//更新包件到指定仓并且状态为20
updateParcelListToWarehouse(advanceDetailEntity,nowWarehouseId,"20");
}
}
}
}else{
if(!Objects.isNull(distributionParcelListEntity)){
Long warehouseId1 = distributionParcelListEntity.getWarehouseId();
String warehouse = distributionParcelListEntity.getWarehouse();
if(Objects.isNull(incomingWarehouseId)){
advanceDetailEntity.setIncomingWarehouseId(warehouseId);
advanceDetailEntity.setIncomingWarehouseName(warehouseName);
advanceDetailEntity.setNowWarehouseId(warehouseId1);
advanceDetailEntity.setNowWarehouseName(warehouse);
log.info("#################syncUnloadData 99999 orderPackageCode={}",orderPackageCode);
//更新包件到指定仓并且状态为20
updateParcelListToWarehouse(advanceDetailEntity,warehouseId,"60");
}else{
advanceDetailEntity.setNowWarehouseId(warehouseId1);
advanceDetailEntity.setNowWarehouseName(warehouse);
if(!incomingWarehouseId.equals(warehouseId1)){
log.info("#################syncUnloadData 000000 orderPackageCode={}",orderPackageCode);
//更新包件到指定仓并且状态为20
updateParcelListToWarehouse(advanceDetailEntity,incomingWarehouseId,"60");
}
}
}else{
if(Objects.isNull(incomingWarehouseId)){
advanceDetailEntity.setIncomingWarehouseId(warehouseId);
advanceDetailEntity.setIncomingWarehouseName(warehouseName);
advanceDetailEntity.setNowWarehouseId(warehouseId);
advanceDetailEntity.setNowWarehouseName(warehouseName);
log.info("#################syncUnloadData aaaaaa orderPackageCode={}",orderPackageCode);
//更新包件到指定仓并且状态为20
updateParcelListToWarehouse(advanceDetailEntity,warehouseId,"20");
}else{
advanceDetailEntity.setIncomingWarehouseId(incomingWarehouseId);
advanceDetailEntity.setIncomingWarehouseName(incomeCategoryName);
advanceDetailEntity.setNowWarehouseId(incomingWarehouseId);
advanceDetailEntity.setNowWarehouseName(incomeCategoryName);
log.info("#################syncUnloadData bbbbbbb orderPackageCode={}",orderPackageCode);
//更新包件到指定仓并且状态为20
updateParcelListToWarehouse(advanceDetailEntity,incomingWarehouseId,"20");
}
}
}
}
}
trunklineAdvanceDetailService.updateSyncUnloadDataStatus(id,1);
}catch (Exception e){
log.warn("###############syncUnloadData: 包件处理失败 orderPackageCode={}", orderPackageCode);
}
}
log.info("############syncUnloadData: 同步卸车数据 完成");
}
private void updateParcelListToWarehouse(TrunklineAdvanceDetailEntity advanceDetailEntity, Long warehouseId, String status) {
String orderPackageCode = advanceDetailEntity.getOrderPackageCode();
String orderCode = advanceDetailEntity.getOrderCode();
String waybillNo = advanceDetailEntity.getWaybillNo();
Long advanceId = advanceDetailEntity.getAdvanceId();
TrunklineAdvanceEntity advanceEntity = advanceService.getById(advanceId);
Integer total = trunklineAdvanceDetailService.findTotalNumByOrderCode(orderCode);
BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(warehouseId);
String warehouseName = warehouseEntity.getName();
if("20".equals(status)){
List<DistributionParcelListEntity> list = distributionParcelListClient.findListByOrderPackageCodeAndStatus(orderPackageCode,"20");
//把list通过warehouseId进行分组
List<DistributionParcelListEntity> updateParceList = new ArrayList<>();
if(CollUtil.isNotEmpty(list)){
list.forEach(distributionParcelListEntity -> {
DistributionParcelListEntity updateEntity = new DistributionParcelListEntity();
updateEntity.setId(distributionParcelListEntity.getId());
updateEntity.setOrderPackageStatus("60");
updateParceList.add(updateEntity);
});
}
distributionParcelListClient.updateList(updateParceList);
}
WarehouseWaybillEntity waybillEntity = warehouseWaybillClient.findByWaybillNo(waybillNo);
Date date = new Date();
Long orderId = null;
DistributionStockArticleEntity stockArticleEntity = distributionStockArticleClient.findStockArticleByOrderCodeAndWarehouseId(orderCode, warehouseId);
if(Objects.isNull(stockArticleEntity)){
stockArticleEntity = new DistributionStockArticleEntity();
stockArticleEntity.setOrderCode(orderCode);
stockArticleEntity.setServiceNumber(advanceEntity.getServiceNum());
stockArticleEntity.setWaybillNumber(waybillNo);
stockArticleEntity.setTotalNumber(total);
stockArticleEntity.setHandQuantity(0);
// stockArticleEntity.setTenantId(TenantNum.HUITONGCODE);// 对应租户ID
stockArticleEntity.setWarehouse(warehouseName);
stockArticleEntity.setWarehouseId(warehouseId);
stockArticleEntity.setBrand(advanceEntity.getBrand());
stockArticleEntity.setDescriptionGoods(advanceEntity.getPackName());
stockArticleEntity.setWarehouseEntryTime(date);
stockArticleEntity.setGenre(1);
String dealerName = advanceEntity.getDealerName();//暂存单经销商名称
stockArticleEntity.setDealerCode(advanceEntity.getDealerCode());
stockArticleEntity.setDealerName(advanceEntity.getDealerName());
stockArticleEntity.setTypeService("1");//默认商配
if (!Objects.isNull(waybillEntity)) {
Long consigneeId = waybillEntity.getConsigneeId();
String consigneeName1 = waybillEntity.getConsignee();
BasicdataClientEntity clientEntity = clientClient.getMallById(consigneeId);
// 如果在入库的时候发现客户信息不存在，则不设置客户信息 默认采用商配
if (!Objects.isNull(clientEntity)) {
stockArticleEntity.setMallId(clientEntity.getId());
stockArticleEntity.setMallName(clientEntity.getClientName());
stockArticleEntity.setMallCode(clientEntity.getClientCode());
stockArticleEntity.setTypeService(clientEntity.getTypeService()+"");
}
String consignee = waybillEntity.getConsignee();
String consigneeName = waybillEntity.getConsigneeName();
String consigneeMobile = waybillEntity.getConsigneeMobile();
String consigneeAddress = waybillEntity.getConsigneeAddress();
stockArticleEntity.setConsigneeUnit(consignee);
stockArticleEntity.setConsigneePerson(consigneeName);
stockArticleEntity.setConsigneeMobile(consigneeMobile);
stockArticleEntity.setConsigneeAddress(consigneeAddress);
} else {
Long clientId = tripartiteMallClient.getClientIdByNameAndBrand(dealerName, advanceEntity.getBrand());
BasicdataClientEntity basicdataClientEntity = clientClient.findEntityById(clientId);
if (!Objects.isNull(basicdataClientEntity)) {
String clientType = basicdataClientEntity.getClientType();
if ("5".equals(clientType)) {
stockArticleEntity.setStoreId(basicdataClientEntity.getId());
stockArticleEntity.setStoreCode(basicdataClientEntity.getClientCode());
stockArticleEntity.setStoreName(basicdataClientEntity.getClientName());
//查询门店的父级商场
Long pid = basicdataClientEntity.getPid();
BasicdataClientEntity pidEntity = clientClient.findEntityById(pid);
if (!Objects.isNull(pidEntity)) {
String pidEntityClientType = pidEntity.getClientType();
if ("2".equals(pidEntityClientType)) {
//商城
stockArticleEntity.setMallId(pidEntity.getId());
stockArticleEntity.setMallName(pidEntity.getClientName());
stockArticleEntity.setMallCode(pidEntity.getClientCode());
stockArticleEntity.setTypeService(pidEntity.getTypeService()+"");
}
}
} else if ("2".equals(clientType)) {
//商城
stockArticleEntity.setMallId(basicdataClientEntity.getId());
stockArticleEntity.setMallName(basicdataClientEntity.getClientName());
stockArticleEntity.setMallCode(basicdataClientEntity.getClientCode());
stockArticleEntity.setTypeService(basicdataClientEntity.getTypeService()+"");
}
}
}
stockArticleEntity.setCustomerName(advanceEntity.getCustomerName());
stockArticleEntity.setCustomerTelephone(advanceEntity.getCustomerPhone());
stockArticleEntity.setCustomerAddress(advanceEntity.getCustomerAddress());
stockArticleEntity.setStockupStatus("10");
stockArticleEntity.setReservationStatus("10");
stockArticleEntity.setOrderStatus("0");
stockArticleEntity.setGroundingStatus("10");
stockArticleEntity.setOrderReceiveStatus("10");
stockArticleEntity.setFreezeStatus("10");
stockArticleEntity.setNotification(2);
stockArticleEntity.setIsHaveData(2);
stockArticleEntity.setTrainNumber(advanceEntity.getTrainNumber());
stockArticleEntity.setSortingQuantity(0);
stockArticleEntity.setDeliveryQuantity(0);
stockArticleEntity.setTransferQuantity(0);
stockArticleEntity.setSigninQuantity(0);
orderId = distributionStockArticleClient.addData(stockArticleEntity);
if(NumberUtil.equals(orderId,0)){
log.warn("################111111: 保存失败");
throw new CustomerException(405,"保存失败");
}
}else{
stockArticleEntity.setGenre(1);
stockArticleEntity.setTotalNumber(total);
orderId = stockArticleEntity.getId();
distributionStockArticleClient.updateEntity(stockArticleEntity);
}
DistributionParcelListEntity parcelList = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode, warehouseId);
if(Objects.isNull(parcelList)){
parcelList = new DistributionParcelListEntity();
parcelList.setWarehouse(warehouseEntity.getName());
parcelList.setWarehouseId(warehouseId);
parcelList.setIsTransfer(1);
if (!Objects.isNull(waybillEntity)) {
parcelList.setWaybillId(waybillEntity.getId());
parcelList.setWaybillNumber(waybillEntity.getWaybillNo());
parcelList.setSendWarehouseId(waybillEntity.getDepartureWarehouseId());
parcelList.setSendWarehouseName(waybillEntity.getDepartureWarehouseName());
Long destinationWarehouseId = waybillEntity.getDestinationWarehouseId();
parcelList.setAcceptWarehouseId(destinationWarehouseId);
parcelList.setAcceptWarehouseName(waybillEntity.getDestinationWarehouseName());
if (warehouseId.equals(destinationWarehouseId)) {
parcelList.setIsTransfer(0);
}
}
parcelList.setConditions(1);
parcelList.setOrderPackageCode(orderPackageCode);
parcelList.setFirsts(advanceDetailEntity.getFirstPackName());
parcelList.setSecond(advanceDetailEntity.getSecondPackName());
parcelList.setThirdProduct(advanceDetailEntity.getThirdPackName());
parcelList.setQuantity(1);
parcelList.setStockArticleId(orderId);
parcelList.setOrderCode(orderCode);
parcelList.setServiceNumber(advanceDetailEntity.getServiceNum());
parcelList.setTrainNumber(advanceDetailEntity.getTrainNumber());
parcelList.setAdvanceId(advanceId);
Long materialId = advanceDetailEntity.getMaterialId();
String materialCode = advanceDetailEntity.getMaterialCode();
String materialName = advanceDetailEntity.getMaterialName();
if (Objects.isNull(materialId)) {
if (StringUtil.isNotBlank(materialCode) && StringUtil.isNotBlank(materialCode) && StringUtil.isNotBlank(materialName)) {
BasicMaterialEntity materialEntity = basicMaterialClient.findEntityByCodeAndName(materialCode, materialName);
if (!Objects.isNull(materialEntity)) {
parcelList.setMaterialId(materialEntity.getId());
parcelList.setMaterialName(materialEntity.getName());
parcelList.setMaterialCode(materialEntity.getProductCode());
parcelList.setMaterialUnit(materialEntity.getSpecification());
}
}
} else {
BasicMaterialEntity materialOwnId = basicMaterialClient.getMaterialOwnId(materialId);
if (!Objects.isNull(materialOwnId)) {
parcelList.setMaterialId(materialOwnId.getId());
parcelList.setMaterialName(materialOwnId.getName());
parcelList.setMaterialCode(materialOwnId.getProductCode());
parcelList.setMaterialUnit(materialOwnId.getSpecification());
}
}
parcelList.setBrandName(advanceDetailEntity.getBrand());
parcelList.setOrderPackageStatus(status);
parcelList.setOrderPackageFreezeStatus("10");
parcelList.setOrderPackageGroundingStatus("10");
parcelList.setOrderPackageStockupStatus("10");
parcelList.setOrderPackageReservationStatus("10");
parcelList.setOrderPackageLoadingStatus("10");
parcelList.setWarehouseEntryTimeEnd(date);
parcelList.setDealerCode(stockArticleEntity.getDealerCode());
parcelList.setDealerName(stockArticleEntity.getDealerName());
distributionParcelListClient.addReturnId(parcelList);
}
}
@Override
public R carsLoadDetailInfo(LoadCarsDTO loadCarsDTO) {
@ -5288,7 +5681,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
String audio = null;
String orders = null;
if (0 == isZero) {
unloadPackage(loadId, orderPackageCode, warehouseId, 1, "卸分一体 卸车", incomingType,palletName,trayCode);
unloadPackage(loadId, orderPackageCode, warehouseId, 1, "卸分一体 卸车", incomingType, palletName, trayCode);
Map<String, Object> map = new HashMap<>();
map.put("trayType", trayType);
map.put("trayCode", trayCode);
@ -7714,13 +8107,19 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
log.warn("############signLoadScanByIds: 车辆还未发车 loadId={}", loadId);
return R.fail(405, "车辆还未发车");
}
if("90".equals(loadStatus)){
log.warn("############signLoadScanByIds: 车辆已签收 loadStatus={}", loadStatus);
return R.fail(405, "车辆已签收");
}
if(!"40".equals(loadStatus)){
if(!"40".equals(loadStatus)||!"91".equals(loadStatus)){
log.warn("############signLoadScanByIds: 车辆还未到达 loadStatus={}", loadStatus);
return R.fail(405, "车辆还未到达");
}
Integer realLoadingNumber = carsLoadEntity.getRealLoadingNumber();
String deliveryType = carsLoadEntity.getDeliveryType();
@ -10747,7 +11146,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
if(exists){
return R.fail("正在同步中，请勿重复操作");
}else{
bladeRedis.set(key,"1");
bladeRedis.setEx(key,"1",60L);
}

2
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayTypeMapper.xml
Unescape View File

@ -62,6 +62,8 @@
select ldsa.id dataId,
ldsa.waybill_number waybillNo,
ldsa.order_code dataCode,
ldsa.consignee_unit consigneeUnit,
ldsa.consignee_person consigneePerson,
ldsa.hand_quantity orderTotalNum
from logpm_distribution_stock_article ldsa
where ldsa.is_deleted = 0

4
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java
Unescape View File

@ -1091,7 +1091,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode, warehouseId);
if (Objects.isNull(parcelListEntity)) {
log.warn("##############orderScanOrderPackageCode: 包件不存在 orderPackageCode={} warehouseId={}", orderPackageCode, warehouseId);
return R.fail(2001, "包件不存在");
return R.fail(2001, "包件不在当前仓");
}
String orderCode = parcelListEntity.getOrderCode();//订单自编码
Long wid = parcelListEntity.getWarehouseId();
@ -1103,7 +1103,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
String orderPackageStatus = parcelListEntity.getOrderPackageStatus();
if (!"20".equals(orderPackageStatus)) {
log.warn("##############orderScanOrderPackageCode: 包件已不在库 orderPackageCode={} warehouseId={}", orderPackageCode, warehouseId);
return R.fail(2001, "包件已不在库");
return R.fail(2001, "包件不在当前仓");
}
// if(conditions.equals(2)){

Write Preview
Loading…
Cancel
Save