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

修改自提零担查询

training
caoyizhong 1 year ago
parent
a927fbfc1d
commit
9c8449ee91
9 changed files with 62 additions and 38 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. 2
      blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockListInfoEntity.java
  2. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionBillLadingAppController.java
  3. 33
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java
  4. 5
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java
  5. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml
  6. 3
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
  7. 4
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockServiceImpl.java
  8. 14
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
  9. 35
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java

2
blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockListInfoEntity.java
Unescape View File

@ -171,7 +171,7 @@ public class DistributionStockListInfoEntity extends TenantEntity {
* 在库订单ID
*/
@ApiModelProperty(value = "在库订单ID")
private String stockArticleId;
private Long stockArticleId;
/**
* 工厂车次
*/

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

@ -166,7 +166,7 @@ public class DistributionBillLadingAppController extends BladeController {
if (ObjectUtils.isNull(billLadingAppDTO.getBillLadingId())) {
return R.fail(3002, "自提id不能为空 !");
}
if(billLadingAppDTO.getList().isEmpty()){
if(ObjectUtils.isNull(billLadingAppDTO.getBillLadingZeroVO())){
return R.fail(3002, "零担数据不能为空 !");
}

33
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java
Unescape View File

@ -210,17 +210,20 @@ public class DistributionStockupAppController extends BladeController {
map = convertObjectToMap(distributionStockupSelfVO);
//客户订单
List<DistributionStockupOrderListVO> list = distributionStockupService.selectStockupOrderList(stockupDTO);
List<DistributionStockupOrderListVO> collect = list.stream().filter(i -> {
if (ObjectUtils.isNotNull(i.getTrayId()) && !i.getPallet().contains(",") && !i.isCompleteStact() && ObjectUtils.isNotNull( i.getAllocationId()) ) {
i.setTrayLean(true);
if(!list.isEmpty()){
List<DistributionStockupOrderListVO> collect = list.stream().filter(i -> {
if (ObjectUtils.isNotNull(i.getTrayId()) && !i.getPallet().contains(",") && !i.isCompleteStact() && ObjectUtils.isNotNull( i.getAllocationId()) ) {
i.setTrayLean(true);
}
return true;
}).collect(Collectors.toList());
if(collect.isEmpty()){
map.put("planNum",0);
map.put("scanNum",0);
}
return true;
}).collect(Collectors.toList());
if(collect.isEmpty()){
map.put("planNum",0);
map.put("scanNum",0);
map.put("orderList", collect);
}
map.put("orderList", collect);
} else {
//查询备货区信息
DistributionStockupSelfVO distributionStockupSelfVO = distributionStockupService.selectStockupStockListDetails(reservationId);
@ -242,14 +245,16 @@ public class DistributionStockupAppController extends BladeController {
//根据list列表统计计划件数
Integer planNum = 0;
Integer scanNum = 0;
for (DistributionStockupOrderListVO vo : list) {
planNum = planNum + vo.getPlanNum();
scanNum = scanNum + vo.getScanNum();
if(!list.isEmpty()){
for (DistributionStockupOrderListVO vo : list) {
planNum = planNum + vo.getPlanNum();
scanNum = scanNum + vo.getScanNum();
// Boolean aBoolean = distributionStockupService.getClientStockupTray(reservationId, vo.getAllocationId());
// Boolean aBoolean = distributionReservationPackageService.selectClientStockupState(reservationId, vo.getStockArticleId());
// vo.setTrayLean(aBoolean);
if (ObjectUtils.isNotNull(vo.getTrayId()) && !vo.getPallet().contains(",") && !vo.isCompleteStact() && ObjectUtils.isNotNull( vo.getAllocationId()) ) {
vo.setTrayLean(true);
if (ObjectUtils.isNotNull(vo.getTrayId()) && !vo.getPallet().contains(",") && !vo.isCompleteStact() && ObjectUtils.isNotNull( vo.getAllocationId()) ) {
vo.setTrayLean(true);
}
}
}
map.put("planNum", planNum);

5
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java
Unescape View File

@ -85,11 +85,6 @@ public class DistributionStockArticleController extends BladeController {
// private final IBasicdataWarehouseClient warehouseClient;
final String[] list = new String[]{"10","20","30","40","50","60","70"};
final String[] aaa = new String[]{"10","20","30"};
/**
* 配送在库订单 详情
*/

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

@ -127,7 +127,7 @@
from logpm_distribution_parcel_list ldpl
left join logpm_distribution_bill_lading_scan ldbls on ldbls.parcel_list_id = ldpl.id and ldbls.is_deleted = 0
<where>
and ldpl.is_deleted = 0 and ldpl.order_package_code is not null
ldpl.is_deleted = 0 and ldpl.order_package_code is not null
and ldpl.stock_article_id = #{stockArticleId}
<if test="orderCode != null and orderCode !=''">
and ldpl.order_code = ${orderCode}

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

@ -370,7 +370,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
//查询在库订单信息
DistributionStockArticleEntity distributionStockArticleEntity = baseMapper.selectById(distributionParcelList.getStockArticleId());
if (ObjectUtil.isEmpty(distributionStockArticleEntity.getMallId()) ) {
throw new ServiceException("客户数据异常，无法转换！！");
throw new ServiceException("订单的客户数据异常，无法转换！！");
}
DistributionStockListEntity distributionStockListEntity = new DistributionStockListEntity();
//直接添加
@ -428,6 +428,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
DistributionStockListInfoEntity distributionStockListInfo = new DistributionStockListInfoEntity();
BeanUtil.copyProperties(distributionStockListEntity,distributionStockListInfo);
distributionStockListInfo.setWarehousingTime(distributionStockArticleEntity.getWarehouseEntryTime());
distributionStockListInfo.setStockArticleId(distributionStockArticleEntity.getId());
// distributionStockListInfo.setLicensePlate(distributionStockArticleEntity.get); //车牌
distributionStockListInfo.setDespatch(distributionStockArticleEntity.getWaybillNumber()); //物流单号
distributionStockListInfoService.save(distributionStockListInfo);

4
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockServiceImpl.java
Unescape View File

@ -253,6 +253,9 @@ public class DistributionStockServiceImpl extends BaseServiceImpl<DistributionSt
//修改备货状态 市 商
getUpdateOrderState(distributionStocks.getStockupId(),2,list.size() );
}
//修改已备货的数量
return this.saveBatch(list);
}
@ -331,7 +334,6 @@ public class DistributionStockServiceImpl extends BaseServiceImpl<DistributionSt
//没有完成
getUpdateStockup(pageId,1);
}
break;
}

14
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
Unescape View File

@ -594,6 +594,9 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
if (stockupDTO.getTypeService().equals("3")) {
//查询客户数据 自
List<DistributionStockupOrderListVO> list = distrilbutionBillStockService.selectDistrilbutionBillSelf(reservationId,stockupDTO.getIsZero());
if(!list.isEmpty() && ObjectUtils.isNull(list.get(0))){
return new ArrayList<>();
}
//获取有货位的数据
List<DistributionStockupOrderListVO> collect11 = list.stream().filter(o -> ObjectUtils.isNotNull(o.getAllocationId())).collect(Collectors.toList());
Set<DistributionStockupOrderListVO> listYou = new HashSet<>();
@ -685,11 +688,11 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
wu.setScanNum(wu.getScanNum()+i1);
}
//托盘信息
if(ObjectUtils.isNotNull(wu.getTrayId()) && ObjectUtils.isNotNull(i.getTrayId()) && !wu.getTrayId().equals(i.getTrayId())){
if(ObjectUtils.isNotNull(i.getTrayId()) && !wu.getTrayId().equals(i.getTrayId())){
wu.setPallet(wu.getPallet()+","+i.getPallet());
}
//订单自编号信息
if(ObjectUtils.isNotNull(wu.getOrderCode()) && !wu.getOrderCode().equals(i.getOrderCode())){
if(ObjectUtils.isNotNull(i.getOrderCode()) && !wu.getOrderCode().equals(i.getOrderCode())){
wu.setOrderCode(wu.getOrderCode()+","+i.getOrderCode());
}
//订单ID信息
@ -734,11 +737,11 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
wu.setScanNum(wu.getScanNum()+i1);
}
//托盘信息
if(ObjectUtils.isNotNull(wu.getTrayId()) && ObjectUtils.isNotNull(i.getTrayId()) && !wu.getTrayId().equals(i.getTrayId())){
if( ObjectUtils.isNotNull(i.getTrayId()) && !wu.getTrayId().equals(i.getTrayId())){
wu.setPallet(wu.getPallet()+","+i.getPallet());
}
//订单自编号信息
if(ObjectUtils.isNotNull(wu.getOrderCode()) && !wu.getOrderCode().contains(i.getOrderCode())){
if(ObjectUtils.isNotNull(i.getOrderCode()) && !wu.getOrderCode().contains(i.getOrderCode())){
wu.setOrderCode(wu.getOrderCode()+","+i.getOrderCode());
}
//订单id信息
@ -774,6 +777,9 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
//商 市
//1.根据预约单id 查询到对应的数据
List<DistributionStockupOrderListVO> list = distributionReservationService.selectStockupOrderList(reservationId,stockupDTO.getIsZero());
if(!list.isEmpty() && ObjectUtils.isNull(list.get(0))){
return new ArrayList<>();
}
List<DistributionStockupOrderListVO> collect11 = list.stream().filter(o -> ObjectUtils.isNotNull(o.getAllocationId())).collect(Collectors.toList()); //有货位
Set<DistributionStockupOrderListVO> listYou = new HashSet<>(); //
collect11.forEach( p ->{

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

@ -786,6 +786,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
@Override
public DistrilbutionBillLadingAppVO selectDetailList(Long billLadingId, Integer scanStatus, String orderSelfNumbering) {
//查询提货单数据
DistrilbutionBillLadingAppVO main = baseMapper.selectDataByBillLadingId(billLadingId);
if (Objects.isNull(main)) {
return null;
@ -798,6 +799,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
Integer conpleteNum = 0;
Integer signedNum = 0;
//查询零担数据
List<DistributionReservationZeroPackageEntity> list1 = distributionZeroPackageService.list(Wrappers.<DistributionReservationZeroPackageEntity>query().lambda()
.eq(DistributionReservationZeroPackageEntity::getReservationId, main.getBillLadingId())
.eq(DistributionReservationZeroPackageEntity::getIsDeleted, 0)
@ -1563,6 +1565,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
*/
@Override
public R zeroBillOrderData(BillLadingAppDTO billLadingAppDTO) {
//查询订单
List<DistributionReservationZeroPackageEntity> list = distributionZeroPackageService.list(Wrappers.<DistributionReservationZeroPackageEntity>query().lambda()
.eq(DistributionReservationZeroPackageEntity::getReservationId, billLadingAppDTO.getBillLadingId())
@ -1571,16 +1574,18 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
);
List<DistrilbutionAppBillLadingZeroOrderVO> billLadingZeroOrderVOS = new ArrayList<>();
if(!list.isEmpty()){
list.stream().collect(Collectors.groupingBy(DistributionReservationZeroPackageEntity::getStockArticleId)).
forEach((k,v) ->{
int sum = v.stream().mapToInt(DistributionReservationZeroPackageEntity::getQuantity).sum();
int sum1 = v.stream().mapToInt(DistributionReservationZeroPackageEntity::getRealityQuantity).sum();
DistributionStockArticleEntity byId = distributionStockArticleService.getById(k);
DistrilbutionAppBillLadingZeroOrderVO zeroOrderVO = new DistrilbutionAppBillLadingZeroOrderVO();
BeanUtils.copyProperties(byId,zeroOrderVO);
zeroOrderVO.setReservationQuantity(sum);
zeroOrderVO.setRealityQuantity(sum1);
billLadingZeroOrderVOS.add(zeroOrderVO);
//查询订单信息
list.forEach( i ->{
DistributionStockArticleEntity byId = distributionStockArticleService.getById(i.getStockArticleId());
DistrilbutionAppBillLadingZeroOrderVO zeroOrderVO = new DistrilbutionAppBillLadingZeroOrderVO();
BeanUtils.copyProperties(byId,zeroOrderVO);
zeroOrderVO.setReservationQuantity(i.getQuantity());
zeroOrderVO.setRealityQuantity(i.getRealityQuantity());
billLadingZeroOrderVOS.add(zeroOrderVO);
});
});
}
return R.data(billLadingZeroOrderVOS);
}
@ -1591,6 +1596,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public R zeroBillPack(BillLadingAppDTO billLadingAppDTO) {
DistrilbutionAppBillLadingZeroVO i = billLadingAppDTO.getBillLadingZeroVO();
@ -1612,9 +1618,18 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
.eq(DistrilbutionBillStockEntity::getStockArticleId, i.getStockArticleId())
.eq(DistrilbutionBillStockEntity::getConditions, "2")
);
if(!ObjectUtils.isNotNull(one)){
if(ObjectUtils.isNotNull(one)){
return Resp.scanFail("已签收！","已签收！");
}
//查询这个物料有没有签收
DistributionBillLadingScanEntity one1 = distributionBillLadingScanService.getOne(Wrappers.<DistributionBillLadingScanEntity>query().lambda()
.eq(DistributionBillLadingScanEntity::getBillLadingId, billLadingAppDTO.getBillLadingId())
.eq(DistributionBillLadingScanEntity::getParcelListId, i.getId())
);
if(ObjectUtils.isNotNull(one1)){
return Resp.scanFail("当前物料已签收！","当前物料已签收！");
}
//修改包件签收状态
DistributionParcelListEntity parcelListEntity = new DistributionParcelListEntity();
//判断是否大于总件数的数量

Write Preview
Loading…
Cancel
Save