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

Merge branch 'dev' into pre-production

visual
pref_mail@163.com 6 months ago
parent
4c47097b5f 15d2484eab
commit
7b9e53f3e6
6 changed files with 94 additions and 31 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. 3
      blade-service/logpm-business/src/main/java/com/logpm/business/mapper/BusinessPreOrderMapper.xml
  2. 73
      blade-service/logpm-business/src/main/java/com/logpm/business/service/impl/BusinessPreOrderServiceImpl.java
  3. 3
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
  4. 1
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml
  5. 5
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java
  6. 40
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java

3
blade-service/logpm-business/src/main/java/com/logpm/business/mapper/BusinessPreOrderMapper.xml
Unescape View File

@ -25,7 +25,8 @@
firsts,
`SECOND`,
third_product,
quantity,
quantity,unload_num,
load_num,
train_number,
order_code,
service_number,

73
blade-service/logpm-business/src/main/java/com/logpm/business/service/impl/BusinessPreOrderServiceImpl.java
Unescape View File

@ -17,9 +17,11 @@ import com.logpm.business.service.IBusinessAsyncService;
import com.logpm.business.service.IBusinessPreOrderService;
import com.logpm.business.vo.*;
import com.logpm.distribution.entity.DistributionParcelListEntity;
import com.logpm.distribution.entity.DistributionParcelNumberEntity;
import com.logpm.distribution.entity.DistributionStockArticleEntity;
import com.logpm.distribution.feign.IDistributionDeliveryListClient;
import com.logpm.distribution.feign.IDistributionParcelListClient;
import com.logpm.distribution.feign.IDistributionParcelNumberClient;
import com.logpm.distribution.feign.IDistributionStockArticleClient;
import com.logpm.trunkline.dto.InComingDTO;
import com.logpm.trunkline.entity.TrunklineAdvanceDetailEntity;
@ -60,6 +62,7 @@ public class BusinessPreOrderServiceImpl extends BaseServiceImpl<BusinessPreOrde
private final IDistributionDeliveryListClient distributionDeliveryListClient;
private final IDistributionStockArticleClient distributionStockArticleClient;
private final IDistributionParcelListClient distributionParcelListClient;
private final IDistributionParcelNumberClient distributionParcelNumberClient;
@Override
@ -266,10 +269,40 @@ public class BusinessPreOrderServiceImpl extends BaseServiceImpl<BusinessPreOrde
distributionParcelListEntityByOrderCodeAndFirstNameAndTenantId.setCreateTime(null);
distributionParcelListEntityByOrderCodeAndFirstNameAndTenantId.setUpdateTime(null);
distributionParcelListEntityByOrderCodeAndFirstNameAndTenantId.setOrderPackageReservationStatus("10");
distributionParcelListEntityByOrderCodeAndFirstNameAndTenantId.setOrderPackageLoadingStatus("10");
// 卸车数量作为入库数量
distributionParcelListEntityByOrderCodeAndFirstNameAndTenantId.setQuantity(businessSanDTO.getUnloadNum());
distributionParcelListEntityByOrderCodeAndFirstNameAndTenantId.setStockArticleId(distributionStockArticleEntity.getId());
distributionParcelListClient.add(distributionParcelListEntityByOrderCodeAndFirstNameAndTenantId);
distributionParcelListEntityByOrderCodeAndFirstNameAndTenantId.setConditions(3);
distributionParcelListEntityByOrderCodeAndFirstNameAndTenantId.setWarehouseId(myCurrentWarehouse.getId());
distributionParcelListEntityByOrderCodeAndFirstNameAndTenantId.setWarehouse(myCurrentWarehouse.getName());
Long id =distributionParcelListClient.addReturnId(distributionParcelListEntityByOrderCodeAndFirstNameAndTenantId);
// 增加logpm_distribution_parcel_number 的数据
DistributionParcelNumberEntity parcelNumberEntity = new DistributionParcelNumberEntity();
parcelNumberEntity.setStockArticleId(distributionStockArticleEntity.getId());
parcelNumberEntity.setParcelListId(id);
parcelNumberEntity.setQuantity(businessSanDTO.getUnloadNum());
parcelNumberEntity.setHandQuantity(businessSanDTO.getUnloadNum());
parcelNumberEntity.setDeliveryQuantity(0);
parcelNumberEntity.setSigninQuantity(0);
parcelNumberEntity.setOutboundQuantity(0);
parcelNumberEntity.setWarehouseId(myCurrentWarehouse.getId());
List<DistributionParcelNumberEntity> ls = new ArrayList<>();
ls.add(parcelNumberEntity);
distributionParcelNumberClient.addBatch(ls);
distributionStockArticleEntity.setHandQuantity(distributionStockArticleEntity.getHandQuantity()==null?0:distributionStockArticleEntity.getHandQuantity() + businessSanDTO.getUnloadNum());
distributionStockArticleEntity.setIncomingNum(distributionStockArticleEntity.getIncomingNum()==null?0:distributionStockArticleEntity.getIncomingNum() + businessSanDTO.getUnloadNum());
distributionStockArticleClient.saveOrUpdate(distributionStockArticleEntity);
// distributionParcelNumberClient.add(new DistributionParcelNumberEntity(distributionParcelListEntityByOrderCodeAndFirstName.getId(), distributionParcelListEntityByOrderCodeAndFirstName.getOrderPackageCode(), distributionParcelListEntityByOrderCodeAndFirstName.getOrderPackageReservationStatus(), distributionParcelListEntityByOrderCodeAndFirstName.getQuantity()));
temp = businessSanDTO.getUnloadNum();
}
@ -286,9 +319,9 @@ public class BusinessPreOrderServiceImpl extends BaseServiceImpl<BusinessPreOrde
}
distributionStockArticleEntity.setHandQuantity(distributionStockArticleEntity.getHandQuantity() + temp);
distributionStockArticleEntity.setIncomingNum(distributionStockArticleEntity.getIncomingNum() + temp);
distributionStockArticleClient.saveOrUpdate(distributionStockArticleEntity);
// distributionStockArticleEntity.setHandQuantity(distributionStockArticleEntity.getHandQuantity() + temp);
// distributionStockArticleEntity.setIncomingNum(distributionStockArticleEntity.getIncomingNum() + temp);
// distributionStockArticleClient.saveOrUpdate(distributionStockArticleEntity);
// 修改预入库数据
businessPreOrderEntity.setInWarehouse(1);
@ -341,6 +374,7 @@ public class BusinessPreOrderServiceImpl extends BaseServiceImpl<BusinessPreOrde
byOrderSelfNumAndTenantId.setWaybillId(null);
// 对应新增的订单默认在库件数未0
byOrderSelfNumAndTenantId.setHandQuantity(0);
byOrderSelfNumAndTenantId.setIncomingNum(0);
Long id = distributionStockArticleClient.addData(byOrderSelfNumAndTenantId);
byOrderSelfNumAndTenantId.setId(id);
}
@ -462,7 +496,7 @@ public class BusinessPreOrderServiceImpl extends BaseServiceImpl<BusinessPreOrde
// 推送业务系统
distributionDeliveryListClient.mallClientSignfor(selectD.getFromTenantId(), businessSanDTO.getDistrCarNumber(), selectD.getAcceptWarehouseId(), orderPackageCode, AuthUtil.getTenantId());
//distributionDeliveryListClient.mallClientSignfor(selectD.getFromTenantId(), businessSanDTO.getDistrCarNumber(), selectD.getAcceptWarehouseId(), orderPackageCode, AuthUtil.getTenantId());
return Resp.scanSuccess("扫描成功", a + "件");
@ -556,7 +590,7 @@ public class BusinessPreOrderServiceImpl extends BaseServiceImpl<BusinessPreOrde
// 推送业务系统
distributionDeliveryListClient.mallClientSignfor(t.getFromTenantId(), businessSanDTO.getDistrCarNumber(), t.getAcceptWarehouseId(), orderPackageCode, AuthUtil.getTenantId());
//distributionDeliveryListClient.mallClientSignfor(t.getFromTenantId(), businessSanDTO.getDistrCarNumber(), t.getAcceptWarehouseId(), orderPackageCode, AuthUtil.getTenantId());
return Resp.scanSuccess("扫描成功", "异常" + a + "件");
}
@ -792,7 +826,30 @@ public class BusinessPreOrderServiceImpl extends BaseServiceImpl<BusinessPreOrde
// 卸车数量作为入库数量
distributionParcelListEntityByOrderCodeAndFirstNameAndTenantId.setQuantity(t.getUnloadNum());
distributionParcelListEntityByOrderCodeAndFirstNameAndTenantId.setStockArticleId(distributionStockArticleEntity.getId());
distributionParcelListClient.add(distributionParcelListEntityByOrderCodeAndFirstNameAndTenantId);
// distributionParcelListClient.add(distributionParcelListEntityByOrderCodeAndFirstNameAndTenantId);
Long id =distributionParcelListClient.addReturnId(distributionParcelListEntityByOrderCodeAndFirstNameAndTenantId);
// 增加logpm_distribution_parcel_number 的数据
DistributionParcelNumberEntity parcelNumberEntity = new DistributionParcelNumberEntity();
parcelNumberEntity.setStockArticleId(distributionStockArticleEntity.getId());
parcelNumberEntity.setParcelListId(id);
parcelNumberEntity.setQuantity(t.getUnloadNum());
parcelNumberEntity.setHandQuantity(t.getUnloadNum());
parcelNumberEntity.setDeliveryQuantity(0);
parcelNumberEntity.setSigninQuantity(0);
parcelNumberEntity.setOutboundQuantity(0);
parcelNumberEntity.setWarehouseId(myCurrentWarehouse.getId());
List<DistributionParcelNumberEntity> ls = new ArrayList<>();
ls.add(parcelNumberEntity);
distributionParcelNumberClient.addBatch(ls);
distributionStockArticleEntity.setHandQuantity(distributionStockArticleEntity.getHandQuantity()==null?0:distributionStockArticleEntity.getHandQuantity() + t.getUnloadNum());
distributionStockArticleEntity.setIncomingNum(distributionStockArticleEntity.getIncomingNum()==null?0:distributionStockArticleEntity.getIncomingNum() + t.getUnloadNum());
distributionStockArticleClient.saveOrUpdate(distributionStockArticleEntity);
temp = t.getUnloadNum();
}
@ -810,7 +867,7 @@ public class BusinessPreOrderServiceImpl extends BaseServiceImpl<BusinessPreOrde
}
distributionStockArticleEntity.setHandQuantity(distributionStockArticleEntity.getHandQuantity() + temp);
distributionStockArticleEntity.setIncomingNum(distributionStockArticleEntity.getIncomingNum() + temp);
// distributionStockArticleEntity.setIncomingNum(distributionStockArticleEntity.getIncomingNum() + temp);
distributionStockArticleClient.saveOrUpdate(distributionStockArticleEntity);
// 修改预入库数据

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

@ -1604,6 +1604,9 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
public void updateOrderInfo(String orderCode, Long warehouseId) {
DistributionStockArticleEntity stockArticleEntity = findStockArticleByOrderCodeAndWarehouseId(orderCode, warehouseId);
if(Objects.isNull(stockArticleEntity)){
return;
}
updateOrderInfoByDistributionStockArticleEntity(stockArticleEntity);
}

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

@ -361,6 +361,7 @@
left join logpm_basicdata_factory_category lbfc on lbfc.brand = ltad.brand and lbfc.firsts = ltad.first_pack_name and lbfc.seconds = ltad.second_pack_name and lbfc.thirds = ltad.third_pack_name
left join logpm_basicdata_category lbc on lbc.id = lbfc.category_id
where ltad.is_deleted = 0
and lbfc.is_deleted=0
and ltad.advance_id in
<foreach collection="advanceIds" item="item" open="(" separator="," close=")">
#{item}

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

@ -819,8 +819,9 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
WarehouseWaybillEntity waybillEntity = finalWaybillEntityMap.get(waybillNo);
if(!Objects.isNull(waybillEntity)){
Long consigneeId = waybillEntity.getConsigneeId();
String consigneeName1= waybillEntity.getConsignee();
BasicdataClientEntity clientEntity = basicdataClientClient.findEntityById(consigneeId);
BasicdataClientEntity clientEntity = basicdataClientClient.findByName(consigneeName1);
if(!Objects.isNull(clientEntity)){
stockArticleEntity.setMallId(clientEntity.getId());
stockArticleEntity.setMallName(clientEntity.getClientName());
@ -835,7 +836,7 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
stockArticleEntity.setConsigneeMobile(consigneeMobile);
stockArticleEntity.setConsigneeAddress(consigneeAddress);
BasicdataStoreBusinessEntity basicdataStoreBusinessEntity = basicdataStoreBusinessClient.findByClientIdAndTypeService(consigneeId, 3);
BasicdataStoreBusinessEntity basicdataStoreBusinessEntity = basicdataStoreBusinessClient.findByClientIdAndTypeService(clientEntity.getId(), 3);
if(!Objects.isNull(basicdataStoreBusinessEntity)){
stockArticleEntity.setTypeService(basicdataStoreBusinessEntity.getMold());
}

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

@ -6819,8 +6819,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
newParcelList.setStockArticleId(orderId);
distributionParcelListClient.add(newParcelList);
stockArticleEntity.setHandQuantity(stockArticleEntity.getHandQuantity() - 1);
distributionStockArticleClient.saveOrUpdate(stockArticleEntity);
// stockArticleEntity.setHandQuantity(stockArticleEntity.getHandQuantity() - 1);
// distributionStockArticleClient.saveOrUpdate(stockArticleEntity);
parcelListEntity.setOrderPackageStatus("60");
distributionParcelListClient.update(parcelListEntity);
return R.success("同步成功");
@ -8118,9 +8118,9 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
distributionParcelListEntity.setOrderPackageLoadingStatus("10");
distributionParcelListEntity.setWarehouseEntryTimeEnd(new Date());
boolean add = distributionParcelListClient.add(distributionParcelListEntity);
if (add) {
distributionStockArticleClient.addIncomingNum(currentOrderId, 1);
}
// if (add) {
// distributionStockArticleClient.addIncomingNum(currentOrderId, 1);
// }
} else {
distributionParcelListEntity.setOrderPackageStatus("20");
if (!Objects.isNull(warehouseWaybillEntity)) {
@ -8295,9 +8295,9 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
distributionParcelListEntity.setOrderPackageLoadingStatus("10");
distributionParcelListEntity.setWarehouseEntryTimeEnd(new Date());
boolean add = distributionParcelListClient.add(distributionParcelListEntity);
if (add) {
distributionStockArticleClient.addIncomingNum(currentOrderId, 1);
}
// if (add) {
// distributionStockArticleClient.addIncomingNum(currentOrderId, 1);
// }
} else {
distributionParcelListEntity.setOrderPackageStatus("20");
if (!Objects.isNull(warehouseWaybillEntity)) {
@ -8444,9 +8444,9 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
distributionParcelListEntity.setOrderPackageLoadingStatus("10");
distributionParcelListEntity.setWarehouseEntryTimeEnd(new Date());
boolean add = distributionParcelListClient.add(distributionParcelListEntity);
if (add) {
distributionStockArticleClient.addIncomingNum(currentOrderId, 1);
}
// if (add) {
// distributionStockArticleClient.addIncomingNum(currentOrderId, 1);
// }
} else {
if (!Objects.isNull(warehouseWaybillEntity)) {
Long destinationWarehouseId = warehouseWaybillEntity.getDestinationWarehouseId();//目的仓
@ -8813,9 +8813,9 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
distributionParcelListEntity.setOrderPackageLoadingStatus("10");
distributionParcelListEntity.setWarehouseEntryTimeEnd(new Date());
boolean add = distributionParcelListClient.add(distributionParcelListEntity);
if (add) {
distributionStockArticleClient.addIncomingNum(currentOrderId, 1);
}
// if (add) {
// distributionStockArticleClient.addIncomingNum(currentOrderId, 1);
// }
} else {
distributionParcelListEntity.setOrderPackageStatus("20");
if (!Objects.isNull(warehouseWaybillEntity)) {
@ -8979,9 +8979,9 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
distributionParcelListEntity.setOrderPackageLoadingStatus("10");
distributionParcelListEntity.setWarehouseEntryTimeEnd(new Date());
boolean add = distributionParcelListClient.add(distributionParcelListEntity);
if (add) {
distributionStockArticleClient.addIncomingNum(currentOrderId, 1);
}
// if (add) {
// distributionStockArticleClient.addIncomingNum(currentOrderId, 1);
// }
} else {
distributionParcelListEntity.setOrderPackageStatus("20");
if (!Objects.isNull(warehouseWaybillEntity)) {
@ -9128,9 +9128,9 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
distributionParcelListEntity.setOrderPackageLoadingStatus("10");
distributionParcelListEntity.setWarehouseEntryTimeEnd(new Date());
boolean add = distributionParcelListClient.add(distributionParcelListEntity);
if (add) {
distributionStockArticleClient.addIncomingNum(currentOrderId, 1);
}
// if (add) {
// distributionStockArticleClient.addIncomingNum(currentOrderId, 1);
// }
} else {
if (!Objects.isNull(warehouseWaybillEntity)) {
Long destinationWarehouseId = warehouseWaybillEntity.getDestinationWarehouseId();//目的仓

Write Preview
Loading…
Cancel
Save