Browse Source

Merge branch 'dev' into pre-production

newStockUp
zhenghaoyu 2 years ago
parent
commit
6b9947e21f
  1. 2
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTaryAllocationMapper.java
  2. 8
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayAllocationMapper.xml
  3. 3
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseTaryAllocationService.java
  4. 5
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTaryAllocationServiceImpl.java
  5. 2
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java
  6. 4
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java

2
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTaryAllocationMapper.java

@ -12,4 +12,6 @@ public interface WarehouseTaryAllocationMapper extends BaseMapper<WarehouseTaryA
BasicdataTrayEntity getTrayByAllocation(@Param("allocationCode") String allocationCode); BasicdataTrayEntity getTrayByAllocation(@Param("allocationCode") String allocationCode);
BasicdataTrayEntity getTrayByAllocationId(@Param("allocationId") Long allocationId); BasicdataTrayEntity getTrayByAllocationId(@Param("allocationId") Long allocationId);
void deleteByTrayIdAndAllocationId(@Param("trayId") Long trayId, @Param("allocationId") Long allocationId);
} }

8
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayAllocationMapper.xml

@ -22,4 +22,12 @@
and lwta.allocation_id = #{allocationId} and lwta.allocation_id = #{allocationId}
</select> </select>
<update id="deleteByTrayIdAndAllocationId" >
update logpm_warehouse_tary_allocation lwta
set lwta.is_deleted = 1
where lwta.tray_id = #{trayId}
and lwta.allocation_id = #{allocationId}
and lwta.is_deleted = 0
</update>
</mapper> </mapper>

3
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseTaryAllocationService.java

@ -13,4 +13,7 @@ public interface IWarehouseTaryAllocationService extends BaseService<WarehouseTa
void deleteById(WarehouseTaryAllocationEntity taryAllocationEntity); void deleteById(WarehouseTaryAllocationEntity taryAllocationEntity);
Long getAllocationIdByTrayId(Long trayId); Long getAllocationIdByTrayId(Long trayId);
void deleteByTrayIdAndAllocationId(Long trayId, Long allocationId);
} }

5
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTaryAllocationServiceImpl.java

@ -43,4 +43,9 @@ public class WarehouseTaryAllocationServiceImpl extends BaseServiceImpl<Warehous
return taryAllocationEntity.getAllocationId(); return taryAllocationEntity.getAllocationId();
} }
} }
@Override
public void deleteByTrayIdAndAllocationId(Long trayId, Long allocationId) {
baseMapper.deleteByTrayIdAndAllocationId(trayId,allocationId);
}
} }

2
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java

@ -1293,7 +1293,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
//存入有数据库存品与托盘绑定关系表 //存入有数据库存品与托盘绑定关系表
warehouseTrayGoodsService.saveEntityStock(materialId, marketId,trayTypeEntity,incomingBatch,cargoNumber,num, "0"); warehouseTrayGoodsService.saveEntityStock(materialId, marketId,trayTypeEntity,incomingBatch,cargoNumber,num, "0");
}else{ }else{
warehouseTrayGoodsService.updateEntityStock(warehouseTrayGoodsEntity,-num); warehouseTrayGoodsService.updateEntityStock(warehouseTrayGoodsEntity,num);
} }
} }
// //添加上拖日志表 // //添加上拖日志表

4
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java

@ -933,6 +933,10 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
if(!Objects.isNull(trayEntity)){ if(!Objects.isNull(trayEntity)){
//绑定了托盘 //绑定了托盘
warehouseTrayTypeService.deleteZeroOrderByTrayCode(orderCode,trayEntity.getPalletCode()); warehouseTrayTypeService.deleteZeroOrderByTrayCode(orderCode,trayEntity.getPalletCode());
//解除托盘与库位绑定
warehouseTaryAllocationService.deleteByTrayIdAndAllocationId(trayEntity.getId(),allocationId);
} }
//全部下架 //全部下架
Integer residue = warehouseUpdownGoodsService.deleteByUpdownGoodsId(updownGoodsId); Integer residue = warehouseUpdownGoodsService.deleteByUpdownGoodsId(updownGoodsId);

Loading…
Cancel
Save