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

修改备货托盘数据重复

training
caoyizhong 1 year ago
parent
ffe60f21f1
commit
bc378d7ce5
6 changed files with 56 additions and 88 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. 1
      blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupVO.java
  2. 4
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml
  3. 5
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupService.java
  4. 12
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java
  5. 34
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
  6. 88
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java

1
blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupVO.java
Unescape View File

@ -71,6 +71,7 @@ public class DistributionStockupVO extends DistributionStockupEntity {
private Date stockupDate;
private Integer number;
private String goodsAllocation; //货位
private String stockipAllocation; //货位
private Integer reservationStockListNum; //数量
private String reservationId; //预约ID
private String stockListId; //库存品ID

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

@ -183,7 +183,7 @@
lds.assign_status assignStatus, lds.goods_area_id goodsAreaId, lds.forklift_name forkliftName,
lds.loader_name loaderName, lds.forklift_id forkliftId,lds.loader_id loaderId,lds.fix_time fixTime,lds.assign_time assignTime,
lds.type_service typeService,lds.outbound_date outboundDate,lds.stockup_code stockupCode,
(GROUP_CONCAT(lwug.position_code)) stockipAllocation
(GROUP_CONCAT(DISTINCT lwug.position_code)) stockipAllocation
from logpm_distribution_stockup lds
LEFT JOIN logpm_distribution_stockup_info ldsi on ldsi.stockup_id =lds.id
LEFT JOIN logpm_distribution_reservation_package ldrp on ldrp.reservation_id = ldsi.reservation_id
@ -246,7 +246,7 @@
select DISTINCT lds.id,lds.stockup_date stockupDate, lds.stockup_user stockupUser, lds.stockup_status stockupStatus, lds.stockup_area stockupArea,
lds.assign_status assignStatus, lds.goods_area_id goodsAreaId, lds.forklift_name forkliftName,
lds.loader_name loaderName, lds.forklift_id forkliftId,lds.loader_id loaderId,lds.fix_time fixTime,lds.assign_time assignTime,
lds.type_service typeService,lds.outbound_date outboundDate,lds.stockup_code stockupCode,(GROUP_CONCAT(lwtg.tray_code)) stockipAllocation
lds.type_service typeService,lds.outbound_date outboundDate,lds.stockup_code stockupCode,(GROUP_CONCAT(DISTINCT lwtg.tray_code)) stockipAllocation
from logpm_distribution_stockup lds
LEFT JOIN logpm_distribution_stockup_info ldsi on ldsi.stockup_id = lds.id
LEFT JOIN logpm_distrilbution_bill_stock ldbs on ldbs.bill_lading_id = ldsi.reservation_id

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

@ -55,6 +55,11 @@ public interface IDistributionStockupService extends BaseService<DistributionSto
*/
List<DistributionStockupExcel> exportDistributionStockup(Wrapper<DistributionStockupEntity> queryWrapper);
/**
* 指派备货人员信息
* @param distributionStockup
* @return
*/
Boolean saveAssign(DistributionStockupEntity distributionStockup);
IPage<DistributionStockupEntity> pageList(IPage<Object> page, Map<String, Object> distributionStockup);

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

@ -80,6 +80,8 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
private final IDistributionStockListService distributionStockListService;
private final IDistributionReservationZeroPackageService reservationZeroPackageService;
private final IDistrilbutionBillPackageService distrilbutionBillPackageService;
@Override
public IPage<DistributionParcelListEntity> selectDistributionParcelListPage(IPage<DistributionParcelListEntity> page, DistributionParcelListVO distributionParcelList) {
List<BasicdataWarehouseEntity> myWatchWarehouse = basicdataWarehouseClient.getMyWatchWarehouse();
@ -510,11 +512,11 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
IPage<DistributionParcelListEntity> distributionParcelListEntityIPage = baseMapper.pageOweList(page, parcelListEntity);
List<DistributionParcelListEntity> list = new ArrayList<>();
distributionParcelListEntityIPage.getRecords().forEach( i ->{
DistributionReservationZeroPackageEntity one = reservationZeroPackageService.getOne(Wrappers.<DistributionReservationZeroPackageEntity>query().lambda()
.eq(DistributionReservationZeroPackageEntity::getStockArticleId, i.getStockArticleId())
.eq(DistributionReservationZeroPackageEntity::getReservationId, reservationId)
.eq(DistributionReservationZeroPackageEntity::getParcelListId, i.getId())
.apply("zero_package_status in (1,3)")
DistrilbutionBillPackageEntity one = distrilbutionBillPackageService.getOne(Wrappers.<DistrilbutionBillPackageEntity>query().lambda()
.eq(DistrilbutionBillPackageEntity::getStockArticleId, i.getStockArticleId())
.eq(DistrilbutionBillPackageEntity::getBillLadingId, reservationId)
.eq(DistrilbutionBillPackageEntity::getParceListId, i.getId())
.apply("packet_bar_status in (1,3)")
);
DistributionParcelListEntity parcelListVO = new DistributionParcelListEntity();
BeanUtils.copyProperties(i,parcelListVO);

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

@ -204,7 +204,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
//添加库存品数据
DistributionStockupEntity stockupEntity = distributionStockupService.selectById(s);
if (stockupEntity.getTypeService().equals("3")) {
//自提
//自提 添加库存平信息
List<DistributionStockListSelfNumVO> distributionStockListSelfNumVOS = distributionStockupInfoService.selectStockListSelfNum(s);
if (!distributionStockListSelfNumVOS.isEmpty()) {
@ -748,15 +748,15 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
y.setScanNum(y.getScanNum()+i2);
}
//t托盘信息
if(ObjectUtils.isNotNull(y.getTrayId()) && ObjectUtils.isNotNull(i.getTrayId()) && !y.getTrayId().equals(i.getTrayId())){
if(ObjectUtils.isNotNull(y.getTrayId()) && ObjectUtils.isNotNull(i.getTrayId()) && !y.getTrayId().contains(i.getTrayId())){
y.setPallet(y.getPallet()+","+i.getPallet());
}
//订单自编号信息
if(ObjectUtils.isNotNull(y.getOrderCode()) && !y.getOrderCode().equals(i.getOrderCode())){
if(ObjectUtils.isNotNull(y.getOrderCode()) && !y.getOrderCode().contains(i.getOrderCode())){
y.setOrderCode(y.getOrderCode()+","+i.getOrderCode());
}
//订单Id信息
if(ObjectUtils.isNotNull(y.getStockArticleId()) && !y.getStockArticleId().equals(i.getStockArticleId())){
if(ObjectUtils.isNotNull(y.getStockArticleId()) && !y.getStockArticleId().contains(i.getStockArticleId())){
y.setStockArticleId(y.getStockArticleId()+","+i.getStockArticleId());
}
}
@ -819,15 +819,15 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
wu.setScanNum(wu.getScanNum()+i2);
}
//托盘信息
if(ObjectUtils.isNotNull(i.getTrayId()) && !wu.getTrayId().equals(i.getTrayId())){
if(ObjectUtils.isNotNull(i.getTrayId()) && !wu.getTrayId().contains(i.getTrayId())){
wu.setPallet(wu.getPallet()+","+i.getPallet());
}
//订单自编号信息
if(ObjectUtils.isNotNull(i.getOrderCode()) && !wu.getOrderCode().equals(i.getOrderCode())){
if(ObjectUtils.isNotNull(i.getOrderCode()) && !wu.getOrderCode().contains(i.getOrderCode())){
wu.setOrderCode(wu.getOrderCode()+","+i.getOrderCode());
}
//订单ID信息
if(ObjectUtils.isNotNull(wu.getStockArticleId()) && !wu.getStockArticleId().equals(i.getStockArticleId())){
if(ObjectUtils.isNotNull(wu.getStockArticleId()) && !wu.getStockArticleId().contains(i.getStockArticleId())){
wu.setStockArticleId(wu.getStockArticleId()+","+i.getStockArticleId());
}
if(wu.getPlanNum().equals(wu.getScanNum())){
@ -870,7 +870,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
wu.setScanNum(wu.getScanNum()+i2);
}
//托盘信息
if( ObjectUtils.isNotNull(i.getTrayId()) && !wu.getTrayId().equals(i.getTrayId())){
if( ObjectUtils.isNotNull(i.getPallet()) && !wu.getPallet().contains(i.getPallet())){
wu.setPallet(wu.getPallet()+","+i.getPallet());
}
//订单自编号信息
@ -1290,14 +1290,14 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
if(ObjectUtils.isNull(distributionStockupSelfVO.getConsignee())){
distributionStockupSelfVO.setConsignee(i.getConsignee());
}else{
if(ObjectUtils.isNotNull(i.getConsignee()) && !distributionStockupSelfVO.getConsignee().equals(i.getConsignee()) ){
if(ObjectUtils.isNotNull(i.getConsignee()) && !distributionStockupSelfVO.getConsignee().contains(i.getConsignee()) ){
distributionStockupSelfVO.setConsignee(distributionStockupSelfVO.getConsignee()+","+i.getConsignee());
}
}
if(ObjectUtils.isNull(distributionStockupSelfVO.getTrays())){
distributionStockupSelfVO.setTrays(i.getTrays());
}else{
if(ObjectUtils.isNotNull(i.getTrays()) && !distributionStockupSelfVO.getTrays().equals(i.getTrays())){
if(ObjectUtils.isNotNull(i.getTrays()) && !distributionStockupSelfVO.getTrays().contains(i.getTrays())){
distributionStockupSelfVO.setTrays(distributionStockupSelfVO.getTrays()+","+i.getTrays());
}
}
@ -1312,14 +1312,14 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
if(ObjectUtils.isNull(distributionStockupSelfVO.getConsignee())){
distributionStockupSelfVO.setConsignee(i.getConsignee());
}else{
if(ObjectUtils.isNotNull(i.getConsignee()) && !distributionStockupSelfVO.getConsignee().equals(i.getConsignee()) ){
if(ObjectUtils.isNotNull(i.getConsignee()) && !distributionStockupSelfVO.getConsignee().contains(i.getConsignee()) ){
distributionStockupSelfVO.setConsignee(distributionStockupSelfVO.getConsignee()+","+i.getConsignee());
}
}
if(ObjectUtils.isNull(distributionStockupSelfVO.getTrays())){
distributionStockupSelfVO.setTrays(i.getTrays());
}else{
if(ObjectUtils.isNotNull(i.getTrays()) && !distributionStockupSelfVO.getTrays().equals(i.getTrays())){
if(ObjectUtils.isNotNull(i.getTrays()) && !distributionStockupSelfVO.getTrays().contains(i.getTrays())){
distributionStockupSelfVO.setTrays(distributionStockupSelfVO.getTrays()+","+i.getTrays());
}
}
@ -1390,7 +1390,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
if(ObjectUtils.isNull(distributionStockup.getConsignee())){
distributionStockup.setConsignee(i.getConsignee());
}else{
if(ObjectUtils.isNotNull(distributionStockup.getConsignee()) && !distributionStockup.getConsignee().equals(i.getConsignee())){
if(ObjectUtils.isNotNull(distributionStockup.getConsignee()) && !distributionStockup.getConsignee().contains(i.getConsignee())){
String s = distributionStockup.getConsignee() + i.getConsignee();
distributionStockup.setConsignee(s);
}
@ -1398,7 +1398,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
if(ObjectUtils.isNull(distributionStockup.getTrays()) ){
distributionStockup.setTrays(i.getTrays());
}else{
if(ObjectUtils.isNotNull(distributionStockup.getTrays()) && !distributionStockup.getTrays().equals(i.getTrays())){
if(ObjectUtils.isNotNull(distributionStockup.getTrays()) && !distributionStockup.getTrays().contains(i.getTrays())){
String s = distributionStockup.getTrays() + i.getTrays();
distributionStockup.setTrays(s);
}
@ -1406,7 +1406,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
if(ObjectUtils.isNull(distributionStockup.getWarehouseArea()) ){
distributionStockup.setWarehouseArea(i.getWarehouseArea());
}else{
if(ObjectUtils.isNotNull(distributionStockup.getWarehouseArea()) && !distributionStockup.getWarehouseArea().equals(i.getWarehouseArea())){
if(ObjectUtils.isNotNull(distributionStockup.getWarehouseArea()) && !distributionStockup.getWarehouseArea().contains(i.getWarehouseArea())){
String s = distributionStockup.getWarehouseArea() + i.getWarehouseArea();
distributionStockup.setWarehouseArea(s);
}
@ -1426,7 +1426,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
if(ObjectUtils.isNull(distributionStockup.getConsignee())){
distributionStockup.setConsignee(i.getConsignee());
}else{
if(ObjectUtils.isNotNull(i.getConsignee()) && !distributionStockup.getConsignee().equals(i.getConsignee()) ){
if(ObjectUtils.isNotNull(i.getConsignee()) && !distributionStockup.getConsignee().contains(i.getConsignee()) ){
String s = distributionStockup.getConsignee() + i.getConsignee();
distributionStockup.setConsignee(s);
}
@ -1434,7 +1434,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
if(ObjectUtils.isNull(distributionStockup.getTrays())){
distributionStockup.setTrays(i.getTrays());
}else{
if(ObjectUtils.isNotNull(i.getTrays()) && !distributionStockup.getTrays().equals(i.getTrays())){
if(ObjectUtils.isNotNull(i.getTrays()) && !distributionStockup.getTrays().contains(i.getTrays())){
String s = distributionStockup.getTrays() +","+ i.getTrays();
distributionStockup.setTrays(s);
}

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

@ -141,7 +141,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
las = true;
//修改
this.updateById(distrilbutionBillLading);
if(!distrilbutionBillLading.getBillPackageEntityList().isEmpty()){
if(!distrilbutionBillLading.getBillPackageEntityList().isEmpty() || !distrilbutionBillLading.getUnBillPackageEntityList().isEmpty()){
//修改新增包件
//todo 还没有改
updateBillPackeg(distrilbutionBillLading);
@ -359,72 +359,29 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
if(i > 0){
//部分
distributionStockArticle.setReservationStatus(OrderReservationStatusConstant.bufenyuyue.getValue());
}else if(1 == 0){
//全部
distributionStockArticle.setReservationStatus(OrderReservationStatusConstant.yiyueyue.getValue());
}
}else{
//没有包件 查询包件信息
/*List<DistributionParcelListEntity> list1 = distributionParcelListService.list(Wrappers.<DistributionParcelListEntity>query().lambda()
.eq(DistributionParcelListEntity::getStockArticleId, s)
.eq(DistributionParcelListEntity::getConditions, 1)
);
list1.stream().forEach(ss ->{
DistrilbutionBillPackageEntity billPackageEntity = new DistrilbutionBillPackageEntity();
billPackageEntity.setBillLadingId(distrilbutionBillLading.getId());
billPackageEntity.setPacketBarCode(ss.getOrderPackageCode());
billPackageEntity.setPacketBarStatus(1);
billPackageEntity.setParceListId(ss.getId());
billPackageEntity.setStockArticleId(ss.getStockArticleId());
if(byId.getIsZero().equals("1")){
//零担
Optional<DistributionParcelListDTO> first = parcelLisList.stream().filter(i -> i.getStockArticleId().equals(ss.getStockArticleId()) && i.getId().equals(ss.getId())).findFirst();
billPackageEntity.setBillType("2");
billPackageEntity.setPacketNumber(first.get().getQuantity());
}else{
billPackageEntity.setBillType("1");
billPackageEntity.setPacketNumber(ss.getQuantity());
}
packageEntityList.add(billPackageEntity);
});*/
packageEntityList.addAll(billPackInfo(s,distrilbutionBillLading.getId(),parcelLisList,byId));
distributionStockArticle.setReservationStatus(OrderReservationStatusConstant.yiyueyue.getValue());
}
}else{
//没有包件 查询包件信息
/*List<DistributionParcelListEntity> list1 = distributionParcelListService.list(Wrappers.<DistributionParcelListEntity>query().lambda()
.eq(DistributionParcelListEntity::getStockArticleId, s)
.eq(DistributionParcelListEntity::getConditions, 1)
);
list1.stream().forEach(ss ->{
DistrilbutionBillPackageEntity billPackageEntity = new DistrilbutionBillPackageEntity();
billPackageEntity.setBillLadingId(distrilbutionBillLading.getId());
billPackageEntity.setPacketBarCode(ss.getOrderPackageCode());
billPackageEntity.setPacketBarStatus(1);
billPackageEntity.setParceListId(ss.getId());
billPackageEntity.setStockArticleId(ss.getStockArticleId());
if(byId.getIsZero().equals("1")){
//零担
Optional<DistributionParcelListDTO> first = parcelLisList.stream().filter(i -> i.getStockArticleId().equals(ss.getStockArticleId()) && i.getId().equals(ss.getId())).findFirst();
billPackageEntity.setBillType("2");
billPackageEntity.setPacketNumber(first.get().getQuantity());
}else{
billPackageEntity.setBillType("1");
billPackageEntity.setPacketNumber(ss.getQuantity());
}
packageEntityList.add(billPackageEntity);
});*/
packageEntityList.addAll(billPackInfo(s,distrilbutionBillLading.getId(),parcelLisList,byId));
distributionStockArticle.setReservationStatus(OrderReservationStatusConstant.yiyueyue.getValue());
}
// int i1 = byId.getHandQuantity() + byId.getSigninQuantity(); //总数
if(byId.getCompleteSet().equals("1")){
//部分
distributionStockArticle.setReservationStatus(OrderReservationStatusConstant.bufenyuyue.getValue());
}else{
//全部
distributionStockArticle.setReservationStatus(OrderReservationStatusConstant.yiyueyue.getValue());
}
//判断是否改为已预约
List<DistributionParcelNumberEntity> parcelNumberList = distributionParcelNumberService.list(Wrappers.<DistributionParcelNumberEntity>query().lambda()
.eq(DistributionParcelNumberEntity::getStockArticleId, s)
@ -576,21 +533,24 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
DistrilbutionBillPackageEntity billPackageEntity = new DistrilbutionBillPackageEntity();
BeanUtils.copyProperties(i,billPackageEntity);
billPackageEntity.setBillLadingId(distrilbutionBillLading.getId());
billPackageEntity.setPacketNumber(1);
billPackageEntity.setPacketBarStatus(1);
packageEntityList.add(billPackageEntity);
});
distrilbutionBillPackageService.saveBatch(packageEntityList);
}
//删除包件
if(!distrilbutionBillLading.getUnBillPackageEntityList().isEmpty()){
List<Long> collect = distrilbutionBillLading.getUnBillPackageEntityList().stream().map(e -> e.getParceListId()).collect(Collectors.toList());
boolean update = distrilbutionBillPackageService.update(Wrappers.<DistrilbutionBillPackageEntity>update()
.in("parce_list_id", collect)
.set("packet_bar_status", 2));
if(!update){
throw new ServiceException("修改失败！！！");
}
}
});
//删除包件
if(!distrilbutionBillLading.getUnBillPackageEntityList().isEmpty()){
List<Long> collect = distrilbutionBillLading.getUnBillPackageEntityList().stream().map(e -> e.getParceListId()).collect(Collectors.toList());
boolean update = distrilbutionBillPackageService.update(Wrappers.<DistrilbutionBillPackageEntity>update()
.in("parce_list_id", collect)
.set("packet_bar_status", 2));
if(!update){
throw new ServiceException("修改失败！！！");
}
}
return true;
}

Write Preview
Loading…
Cancel
Save